libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Create workaround for "identifier of an instance altered"

Browse source 
Related to: #19323
This commit is contained in:
Alexander Schwartz 2023-03-24 21:10:41 +01:00 committed by Václav Muzikář
parent adb47ac874
commit ad82252a44
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProvider.java
View file

@ -927,7 +927,16 @@ public class JpaUserProvider implements UserProvider, UserCredentialStore {
query.setParameter("identityProvider", identityProvider);
query.setLockMode(lockMode);
List<FederatedIdentityEntity> results = query.getResultList();
return results.size() > 0 ? results.get(0) : null;
FederatedIdentityEntity federatedIdentityEntity = results.size() > 0 ? results.get(0) : null;
if (federatedIdentityEntity != null) {
// When upgrading from Hibernate 5 to Hibernate 6.2.0.CR3, the `user` wasn't filled in the returned row any more.
// This serves as a workaround until the cause has been found and the upstream project can provide a fix
// https://github.com/keycloak/keycloak/issues/19323
if (federatedIdentityEntity.getUser() == null) {
federatedIdentityEntity.setUser(userEntity);
}
}
return federatedIdentityEntity;
}

5
model/jpa/src/main/java/org/keycloak/models/jpa/entities/FederatedIdentityEntity.java
View file

@ -156,6 +156,11 @@ public class FederatedIdentityEntity {
result = 31 * result + (identityProvider != null ? identityProvider.hashCode() : 0);
return result;
}
@Override
public String toString() {
return "FederatedIdentityEntity.Key [user=" + (user != null ? user.getId() : null) + ", identityProvider=" + identityProvider + "]";
}
}
@Override