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

KEYCLOAK-8414 use the clientId when the ClientScopeModel is an instance of ClientModel

Browse source
This commit is contained in:
Stefan Guilhen 2018-11-16 23:58:55 -02:00 committed by Marek Posolda
parent 55f90ff09f
commit 8af1ca8fc3
4 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java
View file

@ -570,7 +570,14 @@ public final class KeycloakModelUtils {
return clientScope;
}
}
// check if we are referencing a client instead of a scope
if (realm.getClients() != null) {
for (ClientModel client : realm.getClients()) {
if (clientScopeName.equals(client.getClientId())) {
return client;
}
}
}
return null;
}

6
server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java
View file

@ -660,7 +660,11 @@ public class ModelToRepresentation {
List<String> grantedClientScopes = new LinkedList<>();
for (ClientScopeModel clientScope : model.getGrantedClientScopes()) {
grantedClientScopes.add(clientScope.getName());
if (clientScope instanceof ClientModel) {
grantedClientScopes.add(((ClientModel) clientScope).getClientId());
} else {
grantedClientScopes.add(clientScope.getName());
}
}
UserConsentRepresentation consentRep = new UserConsentRepresentation();

7
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportUtil.java
View file

@ -59,6 +59,7 @@ import org.keycloak.testsuite.client.KeycloakTestingClient;
import org.keycloak.testsuite.util.RealmRepUtil;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedList;
@ -368,7 +369,7 @@ public class ExportImportUtil {
Map<String, Object> appAdminConsent = findConsentByClientId(consents, application.getClientId());
Assert.assertNotNull(appAdminConsent);
Assert.assertTrue(isClientScopeGranted(appAdminConsent, OAuth2Constants.OFFLINE_ACCESS));
Assert.assertTrue(isClientScopeGranted(appAdminConsent, OAuth2Constants.OFFLINE_ACCESS, "roles", "profile", "email", "account", "web-origins"));
Map<String, Object> otherAppAdminConsent = findConsentByClientId(consents, otherApp.getClientId());//admin.getConsentByClient(otherApp.getId());
Assert.assertFalse(isClientScopeGranted(otherAppAdminConsent, OAuth2Constants.OFFLINE_ACCESS));
@ -392,9 +393,9 @@ public class ExportImportUtil {
}
private static boolean isClientScopeGranted(Map<String, Object> consent, String clientScopeName) {
private static boolean isClientScopeGranted(Map<String, Object> consent, String... clientScopeNames) {
if (consent.get("grantedClientScopes") == null) return false;
return ((List)consent.get("grantedClientScopes")).contains(clientScopeName);
return ((List)consent.get("grantedClientScopes")).containsAll(Arrays.asList(clientScopeNames));
}

5
testsuite/integration-arquillian/tests/base/src/test/resources/model/testrealm.json
View file

@ -179,7 +179,8 @@
"grantedRealmRoles": [ "offline_access" ],
"grantedClientRoles": {
"Application": [ "app-admin" ]
}
},
"grantedClientScopes" : [ "roles", "profile", "email", "account", "web-origins" ]
},
{
"clientId": "OtherApp",
@ -535,6 +536,4 @@
]
}
}