feat: add SESSION_TIMEOUT_IN_MINUTES to admin-ui configuration in per…

…sistence #7792 Signed-off-by: Arnab Dutta <arnab.bdutta@gmail.com>
JanssenProject · Feb 20, 2024 · 9abcbc5 · 9abcbc5
1 parent fc99a49
commit 9abcbc5
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 0 deletions.
diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/config/adminui/MainSettings.java b/jans-auth-server/model/src/main/java/io/jans/as/model/config/adminui/MainSettings.java
@@ -8,6 +8,7 @@ public class MainSettings {
 
     private OIDCSettings oidcConfig;
     private LicenseConfig licenseConfig;
+    private UIConfiguration uiConfig;
 
     public OIDCSettings getOidcConfig() {
         return oidcConfig;
@@ -24,4 +25,12 @@ public LicenseConfig getLicenseConfig() {
     public void setLicenseConfig(LicenseConfig licenseConfig) {
         this.licenseConfig = licenseConfig;
     }
+
+    public UIConfiguration getUiConfig() {
+        return uiConfig;
+    }
+
+    public void setUiConfig(UIConfiguration uiConfig) {
+        this.uiConfig = uiConfig;
+    }
 }
diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/config/adminui/UIConfiguration.java b/jans-auth-server/model/src/main/java/io/jans/as/model/config/adminui/UIConfiguration.java
@@ -0,0 +1,17 @@
+package io.jans.as.model.config.adminui;
+
+public class UIConfiguration {
+    private Integer sessionTimeoutInMins;
+
+    public UIConfiguration() {
+        //Do not remove
+    }
+
+    public Integer getSessionTimeoutInMins() {
+        return sessionTimeoutInMins;
+    }
+
+    public void setSessionTimeoutInMins(Integer sessionTimeoutInMins) {
+        this.sessionTimeoutInMins = sessionTimeoutInMins;
+    }
+}
diff --git a/...in-ui-plugin/src/main/java/io/jans/ca/plugin/adminui/model/auth/OAuth2ConfigResponse.java b/...in-ui-plugin/src/main/java/io/jans/ca/plugin/adminui/model/auth/OAuth2ConfigResponse.java
@@ -12,6 +12,15 @@ public class OAuth2ConfigResponse {
     private String frontChannelLogoutUrl;
     private String postLogoutRedirectUri;
     private String endSessionEndpoint;
+    private Integer sessionTimeoutInMins;
+
+    public Integer getSessionTimeoutInMins() {
+        return sessionTimeoutInMins;
+    }
+
+    public void setSessionTimeoutInMins(Integer sessionTimeoutInMins) {
+        this.sessionTimeoutInMins = sessionTimeoutInMins;
+    }
 
     public String getAuthServerHost() {
         return authServerHost;

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
@@ -32,6 +32,16 @@ public class AUIConfiguration {
     private String auiBackendApiServerEndSessionEndpoint;
     // LicenseSpring
     private LicenseConfiguration licenseConfiguration;
+    //UI session timeout
+    private Integer sessionTimeoutInMins;
+
+    public Integer getSessionTimeoutInMins() {
+        return sessionTimeoutInMins;
+    }
+
+    public void setSessionTimeoutInMins(Integer sessionTimeoutInMins) {
+        this.sessionTimeoutInMins = sessionTimeoutInMins;
+    }
 
     public String getAppType() {
         return appType;

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
@@ -58,6 +58,7 @@ public Response getOAuth2Config(@PathParam("appType") String appType) {
             oauth2Config.setFrontChannelLogoutUrl(auiConfiguration.getAuiWebServerFrontChannelLogoutUrl());
             oauth2Config.setPostLogoutRedirectUri(auiConfiguration.getAuiWebServerPostLogoutRedirectUri());
             oauth2Config.setEndSessionEndpoint(auiConfiguration.getAuiWebServerEndSessionEndpoint());
+            oauth2Config.setSessionTimeoutInMins(auiConfiguration.getSessionTimeoutInMins());
 
             return Response.ok(oauth2Config).build();
         } catch (ApplicationException e) {

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
@@ -116,6 +116,8 @@ private AUIConfiguration addPropertiesToAUIConfiguration(String appType, AdminCo
         auiConfig.setAuiBackendApiServerTokenEndpoint(appConf.getMainSettings().getOidcConfig().getAuiBackendApiClient().getTokenEndpoint());
         auiConfig.setAuiBackendApiServerIntrospectionEndpoint(appConf.getMainSettings().getOidcConfig().getAuiBackendApiClient().getIntrospectionEndpoint());
 
+        auiConfig.setSessionTimeoutInMins(appConf.getMainSettings().getUiConfig().getSessionTimeoutInMins());
+
         return auiConfig;
     }