minor improvements

Signed-off-by: Stefan Wiedemann <[email protected]>
wistefan · Apr 17, 2024 · a65798d · a65798d
1 parent 3372d3c
commit a65798d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/OID4VCLoginProtocolFactory.java b/services/src/main/java/org/keycloak/protocol/oid4vc/OID4VCLoginProtocolFactory.java
@@ -143,7 +143,7 @@ public void createDefaultClientScopes(RealmModel newRealm, boolean addScopesToEx
         ClientScopeModel naturalPersonScope = KeycloakModelUtils.getClientScopeByName(newRealm, "natural_person");
         if (naturalPersonScope == null) {
             LOGGER.debug("Add natural person scope");
-            naturalPersonScope = newRealm.addClientScope("natural_person");
+            naturalPersonScope = newRealm.addClientScope(String.format("%s_%s", PROTOCOL_ID, "natural_person"));
             naturalPersonScope.setDescription("OIDC$VP Scope, that adds all properties required for a natural person.");
             naturalPersonScope.setProtocol(PROTOCOL_ID);
             naturalPersonScope.addProtocolMapper(builtins.get(SUBJECT_ID_MAPPER));

diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCMapper.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCMapper.java
@@ -22,6 +22,7 @@
 import org.keycloak.models.ProtocolMapperModel;
 import org.keycloak.models.UserSessionModel;
 import org.keycloak.protocol.ProtocolMapper;
+import org.keycloak.protocol.oid4vc.OID4VCEnvironmentProviderFactory;
 import org.keycloak.protocol.oid4vc.OID4VCLoginProtocolFactory;
 import org.keycloak.protocol.oid4vc.model.VerifiableCredential;
 import org.keycloak.provider.ProviderConfigProperty;
@@ -38,7 +39,7 @@
  *
  * @author <a href="https://github.com/wistefan">Stefan Wiedemann</a>
  */
-public abstract class OID4VCMapper implements ProtocolMapper {
+public abstract class OID4VCMapper implements ProtocolMapper, OID4VCEnvironmentProviderFactory {
 
     protected static final String SUPPORTED_CREDENTIALS_KEY = "supportedCredentialTypes";
 

diff --git a/...estsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java b/...estsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java
@@ -226,7 +226,7 @@ public Response revertTestingInfinispanTimeService() {
     @GET
     @Path("/get-client-sessions-count")
     @Produces(MediaType.APPLICATION_JSON)
-    public Integer getClientSessionsCountInssion(@QueryParam("realm") final String name, @QueryParam("session") final String sessionId) {
+    public Integer getClientSessionsCountInUserSession(@QueryParam("realm") final String name, @QueryParam("session") final String sessionId) {
 
         RealmModel realm = getRealmByName(name);