feat: add acrValues property in admin-ui configuration. #1016 (#1017)

* feat: add acrValues property in admin-ui configuration. #1016 * fix: update acr value Co-authored-by: Mohammad Abudayyeh <47318409+moabu@users.noreply.github.com>
JanssenProject · Mar 14, 2022 · 88b591a · 88b591a
1 parent b4fa3ae
commit 88b591a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/docker-jans-config-api/plugins/admin-ui/auiConfiguration.properties.tmpl b/docker-jans-config-api/plugins/admin-ui/auiConfiguration.properties.tmpl
@@ -3,6 +3,7 @@ authserver.clientId=%(admin_ui_client_id)s
 authserver.clientSecret=%(admin_ui_client_pw)s
 authserver.authzBaseUrl=https://%(hostname)s/jans-auth/restv1/authorize
 authserver.scope=openid+profile+email+user_name
+authserver.acrValues=basic
 authserver.redirectUrl=https://%(hostname)s/admin
 authserver.frontChannelLogoutUrl=https://%(hostname)s/admin/logout
 authserver.postLogoutRedirectUri=https://%(hostname)s/admin
@@ -17,6 +18,7 @@ tokenServer.clientId=%(token_server_admin_ui_client_id)s
 tokenServer.clientSecret=%(token_server_admin_ui_client_pw)s
 tokenServer.authzBaseUrl=%(token_server_authz_url)s
 tokenServer.scope=openid+profile+email+user_name
+tokenServer.acrValues=basic
 tokenServer.redirectUrl=https://%(hostname)s/admin
 tokenServer.logoutUrl=https://%(hostname)s/admin/logout
 tokenServer.tokenEndpoint=%(token_server_token_url)s

diff --git a/...dmin-ui-plugin/src/main/java/io/jans/ca/plugin/adminui/model/config/AUIConfiguration.java b/...dmin-ui-plugin/src/main/java/io/jans/ca/plugin/adminui/model/config/AUIConfiguration.java
@@ -7,6 +7,7 @@ public class AUIConfiguration {
     private String authServerClientId;
     private String authServerClientSecret;
     private String authServerScope;
+    private String authServerAcrValues;
     private String authServerRedirectUrl;
     private String authServerFrontChannelLogoutUrl;
     private String authServerPostLogoutRedirectUri;
@@ -19,6 +20,7 @@ public class AUIConfiguration {
     private String tokenServerClientId;
     private String tokenServerClientSecret;
     private String tokenServerScope;
+    private String tokenServerAcrValues;
     private String tokenServerRedirectUrl;
     private String tokenServerFrontChannelLogoutUrl;
     private String tokenServerPostLogoutRedirectUri;
@@ -223,4 +225,19 @@ public void setLicenseConfiguration(LicenseConfiguration licenseConfiguration) {
         this.licenseConfiguration = licenseConfiguration;
     }
 
+    public String getAuthServerAcrValues() {
+        return authServerAcrValues;
+    }
+
+    public void setAuthServerAcrValues(String authServerAcrValues) {
+        this.authServerAcrValues = authServerAcrValues;
+    }
+
+    public String getTokenServerAcrValues() {
+        return tokenServerAcrValues;
+    }
+
+    public void setTokenServerAcrValues(String tokenServerAcrValues) {
+        this.tokenServerAcrValues = tokenServerAcrValues;
+    }
 }
diff --git a/...ins/admin-ui-plugin/src/main/java/io/jans/ca/plugin/adminui/rest/auth/OAuth2Resource.java b/...ins/admin-ui-plugin/src/main/java/io/jans/ca/plugin/adminui/rest/auth/OAuth2Resource.java
@@ -52,7 +52,7 @@ public Response getOAuth2Config() {
         oauth2Config.setResponseType("code");
         oauth2Config.setScope(auiConfiguration.getAuthServerScope());
         oauth2Config.setRedirectUrl(auiConfiguration.getAuthServerRedirectUrl());
-        oauth2Config.setAcrValues("simple_password_auth");
+        oauth2Config.setAcrValues(auiConfiguration.getAuthServerAcrValues());
         oauth2Config.setFrontChannelLogoutUrl(auiConfiguration.getAuthServerFrontChannelLogoutUrl());
         oauth2Config.setPostLogoutRedirectUri(auiConfiguration.getAuthServerPostLogoutRedirectUri());
         oauth2Config.setEndSessionEndpoint(auiConfiguration.getAuthServerEndSessionEndpoint());

diff --git a/...lugin/src/main/java/io/jans/ca/plugin/adminui/service/config/AUIConfigurationService.java b/...lugin/src/main/java/io/jans/ca/plugin/adminui/service/config/AUIConfigurationService.java
@@ -51,6 +51,7 @@ private AUIConfiguration addPropertiesToAUIConfiguration(Properties props) {
         auiConfig.setAuthServerIntrospectionEndpoint(props.getProperty("authserver.introspectionEndpoint"));
         auiConfig.setAuthServerUserInfoEndpoint(props.getProperty("authserver.userInfoEndpoint"));
         auiConfig.setAuthServerEndSessionEndpoint(props.getProperty("authserver.endSessionEndpoint"));
+        auiConfig.setAuthServerAcrValues(props.getProperty("authserver.acrValues"));
 
         auiConfig.setTokenServerClientId(props.getProperty("tokenServer.clientId"));
         auiConfig.setTokenServerClientSecret(props.getProperty("tokenServer.clientSecret"));
@@ -63,6 +64,7 @@ private AUIConfiguration addPropertiesToAUIConfiguration(Properties props) {
         auiConfig.setTokenServerIntrospectionEndpoint(props.getProperty("tokenServer.introspectionEndpoint"));
         auiConfig.setTokenServerUserInfoEndpoint(props.getProperty("tokenServer.userInfoEndpoint"));
         auiConfig.setTokenServerEndSessionEndpoint(props.getProperty("tokenServer.endSessionEndpoint"));
+        auiConfig.setTokenServerAcrValues(props.getProperty("tokenServer.acrValues"));
 
         LicenseConfiguration licenseConfiguration = new LicenseConfiguration();
         licenseConfiguration.setApiKey(props.getProperty("licenseSpring.apiKey"));