Skip to content

Fix Keycloak User federation issue #2631

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
Nov 19, 2025
Merged

Fix Keycloak User federation issue #2631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffff1f8
bugfix/Fix Keycloak User federation issue
constantine2nd Nov 18, 2025
2a8db66
Merge remote-tracking branch 'upstream/develop' into develop
constantine2nd Nov 18, 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
2 changes: 1 addition & 1 deletion obp-api/src/main/scala/code/api/OAuth2.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ object OAuth2Login extends RestHelper with MdcLoggable {
case Right(fedRef) => // Users log on via Keycloak, which uses User Federation to access the external OBP database.
logger.debug(s"External ID = ${fedRef.externalId}")
logger.debug(s"Storage Provider ID = ${fedRef.storageProviderId}")
Users.users.vend.getUserByResourceUserId(fedRef.externalId)
Users.users.vend.getUserByUserId(fedRef.externalId.toString)
case Left(error) =>
logger.debug(s"Parse error: $error")
Users.users.vend.getUserByProviderId(provider = provider, idGivenByProvider = uniqueIdGivenByProvider).or { // Find a user
Expand Down
12 changes: 6 additions & 6 deletions obp-api/src/main/scala/code/api/util/KeycloakFederatedUserReference.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import java.util.UUID
import scala.util.Try

final case class KeycloakFederatedUserReference(
prefix: Char,
storageProviderId: UUID, // Keycloak component UUID
externalId: Long // autoincrement PK in external DB
)
prefix: Char,
storageProviderId: UUID, // Keycloak component UUID
externalId: UUID // unique user id in external DB
)

object KeycloakFederatedUserReference {
// Pattern: f:<storageProviderId>:<externalId>
private val Pattern =
"^([A-Za-z]):([0-9a-fA-F-]{8}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{12}):(\\d+)$".r
"^([A-Za-z]):([0-9a-fA-F-]{8}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{12}):([0-9a-fA-F-]{8}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{12})$".r

/** Safe parser */
def parse(s: String): Either[String, KeycloakFederatedUserReference] =
Expand All @@ -21,7 +21,7 @@ object KeycloakFederatedUserReference {
for {
providerId <- Try(UUID.fromString(providerIdStr))
.toEither.left.map(_ => s"Invalid storageProviderId: $providerIdStr")
externalId <- Try(externalIdStr.toLong)
externalId <- Try(UUID.fromString(externalIdStr))
.toEither.left.map(_ => s"Invalid externalId: $externalIdStr")
} yield KeycloakFederatedUserReference('f', providerId, externalId)

Expand Down