libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Client Scopes: Added ModelIllegalStateException to handle lazy loading exception.

Browse source 
Closes #9645
This commit is contained in:
vramik 2022-02-02 13:55:09 +01:00 committed by Hynek Mlnařík
parent 165791b1d7
commit 7bd0dbb3ce
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientscope/delegate/JpaClientScopeDelegateProvider.java
View file

@ -28,47 +28,47 @@ import org.keycloak.models.map.clientscope.MapClientScopeEntity;
import org.keycloak.models.map.clientscope.MapClientScopeEntityFields;
import org.keycloak.models.map.common.EntityField;
import org.keycloak.models.map.common.delegate.DelegateProvider;
import org.keycloak.models.map.storage.jpa.JpaDelegateProvider;
import org.keycloak.models.map.storage.jpa.clientscope.entity.JpaClientScopeEntity;
public class JpaClientScopeDelegateProvider implements DelegateProvider<MapClientScopeEntity> {
public class JpaClientScopeDelegateProvider extends JpaDelegateProvider<JpaClientScopeEntity> implements DelegateProvider<MapClientScopeEntity> {
private JpaClientScopeEntity delegate;
private final EntityManager em;
public JpaClientScopeDelegateProvider(JpaClientScopeEntity delegate, EntityManager em) {
this.delegate = delegate;
super(delegate);
this.em = em;
}
@Override
public MapClientScopeEntity getDelegate(boolean isRead, Enum<? extends EntityField<MapClientScopeEntity>> field, Object... parameters) {
if (delegate.isMetadataInitialized()) return delegate;
if (getDelegate().isMetadataInitialized()) return getDelegate();
if (isRead) {
if (field instanceof MapClientScopeEntityFields) {
switch ((MapClientScopeEntityFields) field) {
case ID:
case REALM_ID:
case NAME:
return delegate;
return getDelegate();
case ATTRIBUTES:
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<JpaClientScopeEntity> query = cb.createQuery(JpaClientScopeEntity.class);
Root<JpaClientScopeEntity> root = query.from(JpaClientScopeEntity.class);
root.fetch("attributes", JoinType.INNER);
query.select(root).where(cb.equal(root.get("id"), UUID.fromString(delegate.getId())));
query.select(root).where(cb.equal(root.get("id"), UUID.fromString(getDelegate().getId())));
delegate = em.createQuery(query).getSingleResult();
setDelegate(em.createQuery(query).getSingleResult());
break;
default:
delegate = em.find(JpaClientScopeEntity.class, UUID.fromString(delegate.getId()));
setDelegate(em.find(JpaClientScopeEntity.class, UUID.fromString(getDelegate().getId())));
}
} else throw new IllegalStateException("Not a valid client scope field: " + field);
} else {
delegate = em.find(JpaClientScopeEntity.class, UUID.fromString(delegate.getId()));
setDelegate(em.find(JpaClientScopeEntity.class, UUID.fromString(getDelegate().getId())));
}
return delegate;
return getDelegate();
}
}

1
model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientscope/entity/JpaClientScopeEntity.java
View file

@ -135,6 +135,7 @@ public class JpaClientScopeEntity extends AbstractClientScopeEntity implements J
metadata.setEntityVersion(entityVersion);
}
@Override
public int getVersion() {
return version;
}