Introduce bean for aliasEntitiesEnabled configuration property

cloudfoundry · Jun 3, 2024 · 823fc2f · 823fc2f
1 parent 31ebf13
commit 823fc2f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/alias/AliasEntitiesConfig.java b/server/src/main/java/org/cloudfoundry/identity/uaa/alias/AliasEntitiesConfig.java
@@ -0,0 +1,13 @@
+package org.cloudfoundry.identity.uaa.alias;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class AliasEntitiesConfig {
+    @Bean
+    public boolean aliasEntitiesEnabled(@Value("${login.aliasEntitiesEnabled:false}") final boolean enabled) {
+        return enabled;
+    }
+}
diff --git a/...er/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderAliasHandler.java b/...er/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderAliasHandler.java
@@ -33,7 +33,7 @@ public class IdentityProviderAliasHandler extends EntityAliasHandler<IdentityPro
     public IdentityProviderAliasHandler(
             @Qualifier("identityZoneProvisioning") final IdentityZoneProvisioning identityZoneProvisioning,
             final IdentityProviderProvisioning identityProviderProvisioning,
-            @Value("${login.aliasEntitiesEnabled:false}") final boolean aliasEntitiesEnabled
+            @Qualifier("aliasEntitiesEnabled") final boolean aliasEntitiesEnabled
     ) {
         super(identityZoneProvisioning, aliasEntitiesEnabled);
         this.identityProviderProvisioning = identityProviderProvisioning;

diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderEndpoints.java
@@ -80,7 +80,7 @@ public class IdentityProviderEndpoints implements ApplicationEventPublisherAware
 
     protected static Logger logger = LoggerFactory.getLogger(IdentityProviderEndpoints.class);
 
-    @Value("${login.aliasEntitiesEnabled:false}")
+    @Qualifier("aliasEntitiesEnabled")
     private boolean aliasEntitiesEnabled;
     private final IdentityProviderProvisioning identityProviderProvisioning;
     private final ScimGroupExternalMembershipManager scimGroupExternalMembershipManager;

diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/ScimUserAliasHandler.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/ScimUserAliasHandler.java
@@ -29,7 +29,7 @@ protected ScimUserAliasHandler(
             final ScimUserProvisioning scimUserProvisioning,
             final IdentityProviderProvisioning identityProviderProvisioning,
             final IdentityZoneManager identityZoneManager,
-            @Value("${login.aliasEntitiesEnabled:false}") final boolean aliasEntitiesEnabled
+            @Qualifier("aliasEntitiesEnabled") final boolean aliasEntitiesEnabled
     ) {
         super(identityZoneProvisioning, aliasEntitiesEnabled);
         this.scimUserProvisioning = scimUserProvisioning;