Skip to content
Open
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.keycloak.admin.client.resource.UserResource;
import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.representations.idm.GroupRepresentation;
import org.keycloak.representations.idm.RoleRepresentation;
import org.keycloak.representations.idm.UserRepresentation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -204,6 +205,10 @@ public User syncUser(String userId) {
dbUser.setEmail(keycloakUser.getEmail());
dbUser.setFirstName(keycloakUser.getFirstName());
dbUser.setLastName(keycloakUser.getLastName());
var kcRoleNames = userResource.roles().realmLevel().listEffective().stream()
.map(RoleRepresentation::getName)
.toList();
dbUser.setRealmRoles(RealmRole.fromKcNames(kcRoleNames).stream().map(RealmRole::kcName).toArray(String[]::new));

var attrs = keycloakUser.getAttributes();
if (attrs != null && attrs.containsKey("picture")) {
Expand Down Expand Up @@ -283,12 +288,7 @@ public void updateUserRoles(String userId, Set<RealmRole> roles) {
var rolesToSet = EnumSet.noneOf(RealmRole.class);
rolesToSet.addAll(roles);

// 1. sync to db (roll back if kc update fails):
User dbUser = userRepo.findByIdOptional(userId).orElseThrow(NotFoundException::new);
dbUser.setRealmRoles(rolesToSet.stream().map(RealmRole::kcName).toArray(String[]::new));
userRepo.persist(dbUser);

// 2. sync to kc:
// 1. sync to kc:
UserResource userResource = realm.users().get(userId);
var roleMappings = userResource.roles().realmLevel();
if (!rolesToRemove.isEmpty()) {
Expand All @@ -297,6 +297,14 @@ public void updateUserRoles(String userId, Set<RealmRole> roles) {
if (!rolesToSet.isEmpty()) {
roleMappings.add(rolesToSet.stream().map(realmRoles::getRealmRole).toList());
}

// 2. sync effective roles from kc to db:
User dbUser = userRepo.findByIdOptional(userId).orElseThrow(NotFoundException::new);
var kcRoleNames = roleMappings.listEffective().stream()
.map(RoleRepresentation::getName)
.toList();
dbUser.setRealmRoles(RealmRole.fromKcNames(kcRoleNames).stream().map(RealmRole::kcName).toArray(String[]::new));
userRepo.persist(dbUser);
}

// Group management methods
Expand Down
Loading