feat: add configurable additional parameters in admin-ui configuration …

…#7880 (#7881)

Signed-off-by: Arnab Dutta <arnab.bdutta@gmail.com>
Former-commit-id: 61e513b

jans-config-api/plugins/admin-ui-plugin/src/main/java/io/jans/ca/plugin/adminui/model/webhook/KeyValuePair.java → jans-auth-server/model/src/main/java/io/jans/as/model/config/adminui/KeyValuePair.java

@@ -1,10 +1,9 @@
-package io.jans.ca.plugin.adminui.model.webhook;
+package io.jans.as.model.config.adminui;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 import java.io.Serializable;
-
 @JsonPropertyOrder({"key", "value"})
 @JsonIgnoreProperties(
         ignoreUnknown = true

jans-auth-server/model/src/main/java/io/jans/as/model/config/adminui/OIDCClientSettings.java

@@ -19,6 +19,7 @@ public class OIDCClientSettings {
     private String opHost;
     private String clientId;
     private String clientSecret;
+    private List<KeyValuePair> additionalParameters;
 
     public OIDCClientSettings() {
         //Do not remove
@@ -42,6 +43,7 @@ public OIDCClientSettings(OIDCClientSettings oidcClientSettings) {
         this.opHost = oidcClientSettings.getOpHost();
         this.clientId = oidcClientSettings.getClientId();
         this.clientSecret = oidcClientSettings.getClientSecret();
+        this.additionalParameters = oidcClientSettings.getAdditionalParameters();
     }
 
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -91,6 +93,14 @@ public String getIntrospectionEndpoint() {
         return introspectionEndpoint;
     }
 
+    public List<KeyValuePair> getAdditionalParameters() {
+        return additionalParameters;
+    }
+
+    public void setAdditionalParameters(List<KeyValuePair> additionalParameters) {
+        this.additionalParameters = additionalParameters;
+    }
+
     @Override
     public String toString() {
         return "OIDCClientSettings{" +
@@ -104,6 +114,7 @@ public String toString() {
                 ", opHost='" + opHost + '\'' +
                 ", clientId='" + clientId + '\'' +
                 ", clientSecret='" + clientSecret + '\'' +
+                ", additionalParameters='" + additionalParameters + '\'' +
                 '}';
     }
 }

jans-config-api/plugins/admin-ui-plugin/src/main/java/io/jans/ca/plugin/adminui/model/auth/AppConfigResponse.java

@@ -1,7 +1,11 @@
 package io.jans.ca.plugin.adminui.model.auth;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.jans.as.model.config.adminui.KeyValuePair;
 import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.util.List;
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class AppConfigResponse {
     @Schema(description = "Auth Server host", accessMode = Schema.AccessMode.READ_ONLY)
@@ -26,6 +30,16 @@ public class AppConfigResponse {
     private String endSessionEndpoint;
     @Schema(description = "Admin UI Session Timeout", accessMode = Schema.AccessMode.READ_WRITE)
     private Integer sessionTimeoutInMins;
+    @Schema(description = "Additional Authentication Parameters", accessMode = Schema.AccessMode.READ_WRITE)
+    private List<KeyValuePair> additionalParameters;
+
+    public List<KeyValuePair> getAdditionalParameters() {
+        return additionalParameters;
+    }
+
+    public void setAdditionalParameters(List<KeyValuePair> additionalParameters) {
+        this.additionalParameters = additionalParameters;
+    }
 
     public Integer getSessionTimeoutInMins() {
         return sessionTimeoutInMins;

jans-config-api/plugins/admin-ui-plugin/src/main/java/io/jans/ca/plugin/adminui/model/config/AUIConfiguration.java

@@ -1,5 +1,10 @@
 package io.jans.ca.plugin.adminui.model.config;
 
+
+import io.jans.as.model.config.adminui.KeyValuePair;
+
+import java.util.List;
+
 public class AUIConfiguration {
 
     private String appType;
@@ -34,6 +39,15 @@ public class AUIConfiguration {
     private LicenseConfiguration licenseConfiguration;
     //UI session timeout
     private Integer sessionTimeoutInMins;
+    private List<KeyValuePair> additionalParameters;
+
+    public List<KeyValuePair> getAdditionalParameters() {
+        return additionalParameters;
+    }
+
+    public void setAdditionalParameters(List<KeyValuePair> additionalParameters) {
+        this.additionalParameters = additionalParameters;
+    }
 
     public Integer getSessionTimeoutInMins() {
         return sessionTimeoutInMins;
@@ -258,4 +272,5 @@ public LicenseConfiguration getLicenseConfiguration() {
     public void setLicenseConfiguration(LicenseConfiguration licenseConfiguration) {
         this.licenseConfiguration = licenseConfiguration;
     }
+
 }

jans-config-api/plugins/admin-ui-plugin/src/main/java/io/jans/ca/plugin/adminui/model/webhook/WebhookEntry.java

@@ -1,5 +1,6 @@
 package io.jans.ca.plugin.adminui.model.webhook;
 
+import io.jans.as.model.config.adminui.KeyValuePair;
 import io.jans.orm.annotation.AttributeName;
 import io.jans.orm.annotation.DataEntry;
 import io.jans.orm.annotation.JsonObject;

jans-config-api/plugins/admin-ui-plugin/src/main/java/io/jans/ca/plugin/adminui/service/adminui/AdminUIService.java

@@ -51,6 +51,7 @@ public AppConfigResponse getAdminUIEditableConfiguration() throws ApplicationExc
             appConfigResponse.setPostLogoutRedirectUri(auiConfiguration.getAuiWebServerPostLogoutRedirectUri());
             appConfigResponse.setEndSessionEndpoint(auiConfiguration.getAuiWebServerEndSessionEndpoint());
             appConfigResponse.setSessionTimeoutInMins(auiConfiguration.getSessionTimeoutInMins());
+            appConfigResponse.setAdditionalParameters(auiConfiguration.getAdditionalParameters());
 
             return appConfigResponse;
         } catch (Exception e) {
@@ -70,6 +71,10 @@ public AppConfigResponse editAdminUIEditableConfiguration(AppConfigResponse appC
                 adminConf.getMainSettings().getUiConfig().setSessionTimeoutInMins(appConfigResponse.getSessionTimeoutInMins());
                 auiConfigurationService.getAUIConfiguration().setSessionTimeoutInMins(appConfigResponse.getSessionTimeoutInMins());
             }
+            if (!CollectionUtils.isEmpty(appConfigResponse.getAdditionalParameters())) {
+                adminConf.getMainSettings().getOidcConfig().getAuiWebClient().setAdditionalParameters(appConfigResponse.getAdditionalParameters());
+                auiConfigurationService.getAUIConfiguration().setAdditionalParameters(appConfigResponse.getAdditionalParameters());
+            }
             entryManager.merge(adminConf);
             return getAdminUIEditableConfiguration();
         } catch (Exception e) {

jans-config-api/plugins/admin-ui-plugin/src/main/java/io/jans/ca/plugin/adminui/service/config/AUIConfigurationService.java

@@ -117,7 +117,7 @@ private AUIConfiguration addPropertiesToAUIConfiguration(String appType, AdminCo
         auiConfig.setAuiBackendApiServerIntrospectionEndpoint(appConf.getMainSettings().getOidcConfig().getAuiBackendApiClient().getIntrospectionEndpoint());
 
         auiConfig.setSessionTimeoutInMins(appConf.getMainSettings().getUiConfig().getSessionTimeoutInMins());
-
+        auiConfig.setAdditionalParameters(appConf.getMainSettings().getOidcConfig().getAuiWebClient().getAdditionalParameters());
         return auiConfig;
     }
 

jans-config-api/plugins/docs/jans-admin-ui-plugin-swagger.yaml

@@ -1580,6 +1580,18 @@ components:
           type: integer
           description: Admin UI Session Timeout
           format: int32
+        additionalParameters:
+          type: array
+          description: Additional Authentication Parameters
+          items:
+            $ref: '#/components/schemas/KeyValuePair'
+    KeyValuePair:
+      type: object
+      properties:
+        key:
+          type: string
+        value:
+          type: string
     LicenseRequest:
       type: object
       properties:
@@ -1618,13 +1630,6 @@ components:
       properties:
         ssa:
           type: string
-    KeyValuePair:
-      type: object
-      properties:
-        key:
-          type: string
-        value:
-          type: string
     WebhookEntry:
       required:
       - displayName