Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add SESSION_TIMEOUT_IN_MINUTES to admin-ui configuration in persistence #7792 #7793

Merged
merged 2 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public class MainSettings {

private OIDCSettings oidcConfig;
private LicenseConfig licenseConfig;
private UIConfiguration uiConfig;

public OIDCSettings getOidcConfig() {
return oidcConfig;
Expand All @@ -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;
}
}
Original file line number Diff line number Diff line change
@@ -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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down