fix: fix oidc config params

scc-digitalhub · Apr 24, 2024 · 1c08ade · 1c08ade
1 parent d1979f1
commit 1c08ade
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml
@@ -111,10 +111,11 @@ security:
     username: ${DH_AUTH_BASIC_USER:admin}
     password: ${DH_AUTH_BASIC_PASSWORD:}
   jwt:
-    issuer-uri: ${DH_AUTH_JWT_ISSUER_URI:}
+    issuer-uri: ${DH_AUTH_JWT_ISSUER_URI:${security.oidc.issuer-uri}}
     audience: ${DH_AUTH_JWT_AUDIENCE:${security.oidc.client-id}}
     claim: ${DH_AUTH_JWT_CLAIM:roles}
   oidc:    
+    issuer-uri: ${DH_AUTH_OIDC_ISSUER_URI:}
     client-id: ${DH_AUTH_OIDC_CLIENT_ID:}
     scope: ${DH_AUTH_OIDC_SCOPE:openid,email,profile}
 

diff --git a/frontend/src/main/java/it/smartcommunitylabdhub/console/controllers/ConsoleController.java b/frontend/src/main/java/it/smartcommunitylabdhub/console/controllers/ConsoleController.java
@@ -73,7 +73,7 @@ public String console(Model model, HttpServletRequest request) {
 
         if (securityProperties.isOidcAuthEnabled()) {
             config.put("REACT_APP_AUTH_URL", "/api");
-            config.put("REACT_APP_ISSUER_URI", securityProperties.getJwt().getIssuerUri());
+            config.put("REACT_APP_ISSUER_URI", securityProperties.getOidc().getIssuerUri());
             config.put("REACT_APP_CLIENT_ID", securityProperties.getOidc().getClientId());
             if (securityProperties.getOidc().getScope() != null) {
                 config.put("REACT_APP_SCOPE", String.join(" ", securityProperties.getOidc().getScope()));

diff --git a/...les/commons/src/main/java/it/smartcommunitylabdhub/commons/config/SecurityProperties.java b/...les/commons/src/main/java/it/smartcommunitylabdhub/commons/config/SecurityProperties.java
@@ -68,11 +68,12 @@ public boolean isEnabled() {
     @Setter
     public static class OidcAuthenticationProperties {
 
+        private String issuerUri;
         private String clientId;
         private List<String> scope;
 
         public boolean isEnabled() {
-            return StringUtils.hasText(clientId);
+            return StringUtils.hasText(issuerUri) && StringUtils.hasText(clientId);
         }
     }
 }