Fix whitelist config read

opexdev · Dec 5, 2023 · 3c58f37 · 3c58f37
1 parent 602efad
commit 3c58f37
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/...ak-gateway/src/main/kotlin/co/nilin/opex/auth/gateway/extension/UserManagementResource.kt b/...ak-gateway/src/main/kotlin/co/nilin/opex/auth/gateway/extension/UserManagementResource.kt
@@ -53,13 +53,13 @@ class UserManagementResource(private val session: KeycloakSession) : RealmResour
     private val forgotUrl by lazy {
         ApplicationContextHolder.getCurrentContext()!!.environment.resolvePlaceholders("\${forgot-redirect-url}")
     }
+    private val registerWhitelistIsEnable by lazy {
+        ApplicationContextHolder.getCurrentContext()!!.environment.resolvePlaceholders("\${app.whitelist.register.enabled}")
+    }
     private val kafkaTemplate by lazy {
         ApplicationContextHolder.getCurrentContext()!!.getBean("authKafkaTemplate") as KafkaTemplate<String, AuthEvent>
     }
 
-    @Value("\${app.whitelist.register.enable}")
-    private var registerWhitelistIsEnable: Boolean? = true
-
     @POST
     @Path("user")
     @Consumes(MediaType.APPLICATION_JSON)

diff --git a/...-gateway/src/main/kotlin/co/nilin/opex/auth/gateway/providers/CustomOIDCProtocolMapper.kt b/...-gateway/src/main/kotlin/co/nilin/opex/auth/gateway/providers/CustomOIDCProtocolMapper.kt
@@ -1,5 +1,6 @@
 package co.nilin.opex.auth.gateway.providers
 
+import co.nilin.opex.auth.gateway.ApplicationContextHolder
 import co.nilin.opex.auth.gateway.model.WhiteListModel
 import co.nilin.opex.utility.error.data.OpexError
 import co.nilin.opex.utility.error.data.OpexException
@@ -22,16 +23,16 @@ import java.util.stream.Collectors
 import javax.persistence.EntityManager
 import javax.ws.rs.core.Response
 
-class CustomOIDCProtocolMapper() : AbstractOIDCProtocolMapper(), OIDCAccessTokenMapper, OIDCIDTokenMapper,
+class CustomOIDCProtocolMapper : AbstractOIDCProtocolMapper(), OIDCAccessTokenMapper, OIDCIDTokenMapper,
     UserInfoTokenMapper {
     private val logger = LoggerFactory.getLogger(CustomOIDCProtocolMapper::class.java)
 
     private val PROVIDER_ID = "oidc-customprotocolmapper"
     private val configProperties: List<ProviderConfigProperty> = ArrayList()
 
-    @Value("\${app.whitelist.login.enable}")
-    private var loginWhitelistIsEnable: Boolean? = true
-
+    private val loginWhitelistIsEnable by lazy {
+        ApplicationContextHolder.getCurrentContext()!!.environment.resolvePlaceholders("\${app.whitelist.login.enabled}")
+    }
 
     override fun getConfigProperties(): List<ProviderConfigProperty>? {
         return configProperties