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

[KEYCLOAK-4102] - Removing create-resources configuration option

Browse source
This commit is contained in:
pedroigor 2018-03-21 11:05:21 -03:00
parent ffeb0420bf
commit e9e376419d
3 changed files with 3 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/authorization/PolicyEnforcer.java
View file

@ -168,35 +168,10 @@ public class PolicyEnforcer {
} }
if (resource == null) { if (resource == null) {
if (enforcerConfig.isCreateResources()) {
LOGGER.debugf("Creating resource on server for path [%s].", pathConfig);
ResourceRepresentation representation = new ResourceRepresentation();
representation.setName(resourceName);
representation.setType(pathConfig.getType());
representation.setUri(path);
HashSet<ScopeRepresentation> scopes = new HashSet<>();
for (String scopeName : pathConfig.getScopes()) {
ScopeRepresentation scope = new ScopeRepresentation();
scope.setName(scopeName);
scopes.add(scope);
}
representation.setScopes(scopes);
ResourceRepresentation registrationResponse = protectedResource.create(representation);
pathConfig.setId(registrationResponse.getId());
} else {
throw new RuntimeException("Could not find matching resource on server with uri [" + path + "] or name [" + resourceName + "]. Make sure you have created a resource on the server that matches with the path configuration."); throw new RuntimeException("Could not find matching resource on server with uri [" + path + "] or name [" + resourceName + "]. Make sure you have created a resource on the server that matches with the path configuration.");
} }
} else {
pathConfig.setId(resource.getId()); pathConfig.setId(resource.getId());
}
PathConfig existingPath = null; PathConfig existingPath = null;

12
core/src/main/java/org/keycloak/representations/adapters/config/PolicyEnforcerConfig.java
View file

@ -29,10 +29,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
*/ */
public class PolicyEnforcerConfig { public class PolicyEnforcerConfig {
@JsonProperty("create-resources")
@JsonInclude(JsonInclude.Include.NON_NULL)
private Boolean createResources = Boolean.FALSE;
@JsonProperty("enforcement-mode") @JsonProperty("enforcement-mode")
private EnforcementMode enforcementMode = EnforcementMode.ENFORCING; private EnforcementMode enforcementMode = EnforcementMode.ENFORCING;
@ -48,10 +44,6 @@ public class PolicyEnforcerConfig {
@JsonInclude(JsonInclude.Include.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
private UserManagedAccessConfig userManagedAccess; private UserManagedAccessConfig userManagedAccess;
public Boolean isCreateResources() {
return this.createResources;
}
public List<PathConfig> getPaths() { public List<PathConfig> getPaths() {
return this.paths; return this.paths;
} }
@ -68,10 +60,6 @@ public class PolicyEnforcerConfig {
return this.userManagedAccess; return this.userManagedAccess;
} }
public void setCreateResources(Boolean createResources) {
this.createResources = createResources;
}
public void setPaths(List<PathConfig> paths) { public void setPaths(List<PathConfig> paths) {
this.paths = paths; this.paths = paths;
} }

1
services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCClientInstallation.java
View file

@ -155,7 +155,6 @@ public class KeycloakOIDCClientInstallation implements ClientInstallationProvide
PolicyEnforcerConfig enforcerConfig = new PolicyEnforcerConfig(); PolicyEnforcerConfig enforcerConfig = new PolicyEnforcerConfig();
enforcerConfig.setEnforcementMode(null); enforcerConfig.setEnforcementMode(null);
enforcerConfig.setCreateResources(null);
rep.setEnforcerConfig(enforcerConfig); rep.setEnforcerConfig(enforcerConfig);