[KEYCLOAK-883] - Minor changes to the configuration of identity providers for clients.
This commit is contained in:
1 parent
8d4d497063
commit
6e38964838
12 files changed
+120
-41
No files matched your search
@@ -473,6 +473,17 @@ public class RepresentationToModel {
|
||||
applicationModel.setProtocolMappers(ids);
|
||||
}
|
||||
|
||||
List<String> allowedIdentityProviders = resourceRep.getAllowedIdentityProviders();
|
||||
|
||||
if (allowedIdentityProviders == null || allowedIdentityProviders.isEmpty()) {
|
||||
allowedIdentityProviders = new ArrayList<String>();
|
||||
|
||||
for (IdentityProviderModel identityProvider : realm.getIdentityProviders()) {
|
||||
allowedIdentityProviders.add(identityProvider.getId());
|
||||
}
|
||||
}
|
||||
|
||||
applicationModel.updateAllowedIdentityProviders(allowedIdentityProviders);
|
||||
|
||||
return applicationModel;
|
||||
}
|
||||
@@ -601,6 +612,19 @@ public class RepresentationToModel {
|
||||
|
||||
public static OAuthClientModel createOAuthClient(OAuthClientRepresentation rep, RealmModel realm) {
|
||||
OAuthClientModel model = createOAuthClient(rep.getId(), rep.getName(), realm);
|
||||
|
||||
List<String> allowedIdentityProviders = rep.getAllowedIdentityProviders();
|
||||
|
||||
if (allowedIdentityProviders == null || allowedIdentityProviders.isEmpty()) {
|
||||
allowedIdentityProviders = new ArrayList<String>();
|
||||
|
||||
for (IdentityProviderModel identityProvider : realm.getIdentityProviders()) {
|
||||
allowedIdentityProviders.add(identityProvider.getId());
|
||||
}
|
||||
}
|
||||
|
||||
model.updateAllowedIdentityProviders(allowedIdentityProviders);
|
||||
|
||||
updateOAuthClient(rep, model);
|
||||
return model;
|
||||
}
|
||||
|
||||
-4
@@ -130,10 +130,6 @@ public class CachedClient {
|
||||
}
|
||||
|
||||
public boolean hasIdentityProvider(String providerId) {
|
||||
if (this.allowedIdentityProviders.isEmpty()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return this.allowedIdentityProviders.contains(providerId);
|
||||
}
|
||||
|
||||
|
||||
@@ -343,11 +343,6 @@ public abstract class ClientAdapter implements ClientModel {
|
||||
@Override
|
||||
public boolean hasIdentityProvider(String providerId) {
|
||||
List<String> allowedIdentityProviders = getAllowedIdentityProviders();
|
||||
|
||||
if (allowedIdentityProviders.isEmpty()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return allowedIdentityProviders.contains(providerId);
|
||||
}
|
||||
|
||||
|
||||
-5
@@ -341,11 +341,6 @@ public abstract class ClientAdapter<T extends MongoIdentifiableEntity> extends A
|
||||
@Override
|
||||
public boolean hasIdentityProvider(String providerId) {
|
||||
List<String> allowedIdentityProviders = getMongoEntityAsClient().getAllowedIdentityProviders();
|
||||
|
||||
if (allowedIdentityProviders.isEmpty()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return allowedIdentityProviders.contains(providerId);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user