Skip to content

Bugfix #2617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonredfern merged 2 commits into from
Sep 17, 2025
Merged

Bugfix #2617

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
470236e
bugfix/Add props experimental_become_user_that_created_consent
constantine2nd Sep 17, 2025
52c7b76
Merge remote-tracking branch 'upstream/develop' into develop
constantine2nd Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions obp-api/src/main/scala/code/api/util/ConsentUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,10 +430,13 @@ object Consent extends MdcLoggable {
implicit val dateFormats = CustomJsonFormats.formats

def applyConsentRules(consent: ConsentJWT): Future[(Box[User], Option[CallContext])] = {
val cc = callContext
if(consent.createdByUserId.nonEmpty) { // Populate on behalf of user in case of OBP Consent
val temp = callContext
// updated context if createdByUserId is present
val cc = if (consent.createdByUserId.nonEmpty) {
val onBehalfOfUser = Users.users.vend.getUserByUserId(consent.createdByUserId)
cc.copy(onBehalfOfUser = onBehalfOfUser.toOption)
temp.copy(onBehalfOfUser = onBehalfOfUser.toOption)
} else {
temp
}
if (cc.onBehalfOfUser.nonEmpty &&
APIUtil.getPropsAsBoolValue(nameOfProperty = "experimental_become_user_that_created_consent", defaultValue = false)) {
Expand All @@ -448,14 +451,14 @@ object Consent extends MdcLoggable {
case (Full(user), newUser) =>
// 2. Assign entitlements to the User
addEntitlements(user, consent) match {
case (Full(user)) =>
case Full(user) =>
// 3. Copy Auth Context to the User
copyAuthContextOfConsentToUser(consent.jti, user.userId, newUser) match {
case Full(_) =>
// 4. Assign views to the User
(grantAccessToViews(user, consent), Some(cc))
case failure@Failure(_, _, _) => // Handled errors
(failure, Some(callContext))
(failure, Some(cc))
case _ =>
(Failure(ErrorMessages.UnknownError), Some(cc))
}
Expand All @@ -470,6 +473,7 @@ object Consent extends MdcLoggable {
}
}


JwtUtil.getSignedPayloadAsJson(consentAsJwt) match {
case Full(jsonAsString) =>
try {
Expand Down