Skip to content

Revert "fix: Fix JIT userGroups provisioning" #67

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

Closed
wants to merge 1 commit into from
Closed

Revert "fix: Fix JIT userGroups provisioning" #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions ...erver-oauth2-autoconfigure/src/main/kotlin/JitProvisioningAuthenticationSuccessHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ class JitProvisioningAuthenticationSuccessHandler(
).flatMap { organization ->
client.getJitProvisioningSetting(organization.id).flatMap {
if (it.enabled) {
provisionUser(authenticationToken, organization, it)
val userGroupsClaimName = it.userGroupsClaimName ?: GD_USER_GROUPS
provisionUser(authenticationToken, organization, userGroupsClaimName, it.userGroupsDefaults)
} else {
logMessage("JIT provisioning disabled, skipping", "finished", "")
Mono.empty()
Expand All @@ -63,17 +64,16 @@ class JitProvisioningAuthenticationSuccessHandler(
private fun provisionUser(
authenticationToken: OAuth2AuthenticationToken,
organization: Organization,
jitSetting: JitProvisioningSetting,
userGroupsClaimName: String,
userGroups: List<String>? = null
): Mono<User> {
checkMandatoryClaims(authenticationToken, organization.id)
logMessage("Initiating JIT provisioning", "started", organization.id)
val subClaim = authenticationToken.getClaim(organization.oauthSubjectIdClaim)
val firstnameClaim = authenticationToken.getClaim(GIVEN_NAME)
val lastnameClaim = authenticationToken.getClaim(FAMILY_NAME)
val emailClaim = authenticationToken.getClaim(EMAIL)

val userGroupsClaimName = jitSetting.userGroupsClaimName ?: GD_USER_GROUPS
val userGroupsClaim = authenticationToken.getClaimList(userGroupsClaimName) ?: jitSetting.userGroupsDefaults
val userGroupsClaim = authenticationToken.getClaimList(userGroupsClaimName) ?: userGroups

return client.getUserByAuthenticationId(organization.id, subClaim)
.flatMap { user ->
Expand All @@ -83,7 +83,7 @@ class JitProvisioningAuthenticationSuccessHandler(
user.firstname = firstnameClaim
user.lastname = lastnameClaim
user.email = emailClaim
if (jitSetting.userGroupsScopeEnabled && userGroupsClaim != null) {
if (userGroupsClaim != null) {
user.userGroups = userGroupsClaim
}
client.patchUser(organization.id, user)
Expand Down