ACS-6603 Use enum type

Alfresco · Feb 12, 2024 · d1fb4df · d1fb4df
1 parent 6ecdef0
commit d1fb4df
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/...fresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBean.java b/...fresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBean.java
@@ -29,8 +29,8 @@
 import static java.util.Optional.ofNullable;
 import static java.util.function.Predicate.not;
 
-import static org.alfresco.repo.security.authentication.identityservice.IdentityServiceMetadataKeys.AUDIENCE_METADATA;
-import static org.alfresco.repo.security.authentication.identityservice.IdentityServiceMetadataKeys.SCOPES_SUPPORTED_METADATA;
+import static org.alfresco.repo.security.authentication.identityservice.IdentityServiceMetadataKey.AUDIENCE;
+import static org.alfresco.repo.security.authentication.identityservice.IdentityServiceMetadataKey.SCOPES_SUPPORTED;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -476,11 +476,11 @@ private Map<String, Object> createMetadata(OIDCProviderMetadata metadata)
             Map<String, Object> configurationMetadata = new LinkedHashMap<>();
             if(metadata.getScopes() != null)
             {
-                configurationMetadata.put(SCOPES_SUPPORTED_METADATA, metadata.getScopes());
+                configurationMetadata.put(SCOPES_SUPPORTED.getValue(), metadata.getScopes());
             }
             if(StringUtils.isNotBlank(config.getAudience()))
             {
-                configurationMetadata.put(AUDIENCE_METADATA, config.getAudience());
+                configurationMetadata.put(AUDIENCE.getValue(), config.getAudience());
             }
             return configurationMetadata;
         }

diff --git a/...yservice/IdentityServiceMetadataKeys.java → ...tyservice/IdentityServiceMetadataKey.java b/...yservice/IdentityServiceMetadataKeys.java → ...tyservice/IdentityServiceMetadataKey.java
@@ -25,8 +25,20 @@
  */
 package org.alfresco.repo.security.authentication.identityservice;
 
-public class IdentityServiceMetadataKeys
+public enum IdentityServiceMetadataKey
 {
-    public static final String AUDIENCE_METADATA = "audience";
-    public static final String SCOPES_SUPPORTED_METADATA = "scopes_supported";
-}
+    AUDIENCE("audience"),
+    SCOPES_SUPPORTED("scopes_supported");
+
+    private String value;
+
+    IdentityServiceMetadataKey(String value)
+    {
+        this.value = value;
+    }
+
+    public String getValue()
+    {
+        return value;
+    }
+}
diff --git a/...fresco/repo/security/authentication/identityservice/SpringBasedIdentityServiceFacade.java b/...fresco/repo/security/authentication/identityservice/SpringBasedIdentityServiceFacade.java
@@ -28,7 +28,7 @@
 
 import static java.util.Objects.requireNonNull;
 
-import static org.alfresco.repo.security.authentication.identityservice.IdentityServiceMetadataKeys.AUDIENCE_METADATA;
+import static org.alfresco.repo.security.authentication.identityservice.IdentityServiceMetadataKey.AUDIENCE;
 
 import java.io.IOException;
 import java.net.URI;
@@ -256,7 +256,7 @@ private static OAuth2AccessTokenResponseClient<OAuth2PasswordGrantRequest> creat
         Optional.of(clientRegistration)
             .map(ClientRegistration::getProviderDetails)
             .map(ProviderDetails::getConfigurationMetadata)
-            .map(metadata -> metadata.get(AUDIENCE_METADATA))
+            .map(metadata -> metadata.get(AUDIENCE.getValue()))
             .filter(String.class::isInstance)
             .map(String.class::cast)
             .ifPresent(audienceValue -> {

diff --git a/...curity/authentication/identityservice/admin/IdentityServiceAdminConsoleAuthenticator.java b/...curity/authentication/identityservice/admin/IdentityServiceAdminConsoleAuthenticator.java
@@ -26,7 +26,7 @@
 package org.alfresco.repo.security.authentication.identityservice.admin;
 
 import static org.alfresco.repo.security.authentication.identityservice.IdentityServiceFacade.AuthorizationGrant.authorizationCode;
-import static org.alfresco.repo.security.authentication.identityservice.IdentityServiceMetadataKeys.SCOPES_SUPPORTED_METADATA;
+import static org.alfresco.repo.security.authentication.identityservice.IdentityServiceMetadataKey.SCOPES_SUPPORTED;
 
 import java.io.IOException;
 import java.net.URI;
@@ -216,7 +216,7 @@ private Set<String> getScopes(ClientRegistration clientRegistration)
     {
         return Optional.ofNullable(clientRegistration.getProviderDetails())
             .map(ProviderDetails::getConfigurationMetadata)
-            .map(metadata -> metadata.get(SCOPES_SUPPORTED_METADATA))
+            .map(metadata -> metadata.get(SCOPES_SUPPORTED.getValue()))
             .filter(Scope.class::isInstance)
             .map(Scope.class::cast)
             .map(this::getSupportedScopes)