diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceConfig.java b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceConfig.java index 7593e982e9..f5e31bbb87 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceConfig.java +++ b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceConfig.java @@ -76,6 +76,17 @@ public class IdentityServiceConfig private String lastNameAttribute; private String emailAttribute; private long jwtClockSkewMs; + private String webScriptHomeRedirectPath; + + public String getWebScriptHomeRedirectPath() + { + return webScriptHomeRedirectPath; + } + + public void setWebScriptHomeRedirectPath(String webScriptHomeRedirectPath) + { + this.webScriptHomeRedirectPath = webScriptHomeRedirectPath; + } /** * diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/admin/IdentityServiceAdminConsoleAuthenticator.java b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/admin/IdentityServiceAdminConsoleAuthenticator.java index 9b2bcecb5c..2545128ecf 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/admin/IdentityServiceAdminConsoleAuthenticator.java +++ b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/admin/IdentityServiceAdminConsoleAuthenticator.java @@ -70,7 +70,6 @@ public class IdentityServiceAdminConsoleAuthenticator implements AdminConsoleAut private static final String ALFRESCO_ACCESS_TOKEN = "ALFRESCO_ACCESS_TOKEN"; private static final String ALFRESCO_REFRESH_TOKEN = "ALFRESCO_REFRESH_TOKEN"; private static final String ALFRESCO_TOKEN_EXPIRATION = "ALFRESCO_TOKEN_EXPIRATION"; - private static final String ALFRESCO_WEB_SCRIPT_PATH = "/alfresco/s/index"; private IdentityServiceConfig identityServiceConfig; private IdentityServiceFacade identityServiceFacade; @@ -241,7 +240,7 @@ public class IdentityServiceAdminConsoleAuthenticator implements AdminConsoleAut { URI originalUri = new URI(requestURL); String redirectPath = identityServiceConfig.getAdminConsoleRedirectPath(); - if (originalUri.getPath().equals(ALFRESCO_WEB_SCRIPT_PATH)) + if (originalUri.getPath().equals(identityServiceConfig.getWebScriptHomeRedirectPath())) { redirectPath = originalUri.getPath(); } diff --git a/repository/src/main/resources/alfresco/subsystems/Authentication/identity-service/identity-service-authentication-context.xml b/repository/src/main/resources/alfresco/subsystems/Authentication/identity-service/identity-service-authentication-context.xml index 8bc16b3c06..6c90e0680a 100644 --- a/repository/src/main/resources/alfresco/subsystems/Authentication/identity-service/identity-service-authentication-context.xml +++ b/repository/src/main/resources/alfresco/subsystems/Authentication/identity-service/identity-service-authentication-context.xml @@ -179,6 +179,9 @@ ${identity-service.jwt-clock-skew-ms:0} + + ${identity-service.webscript-home.redirect-path} + diff --git a/repository/src/main/resources/alfresco/subsystems/Authentication/identity-service/identity-service-authentication.properties b/repository/src/main/resources/alfresco/subsystems/Authentication/identity-service/identity-service-authentication.properties index e6d517c1ad..777251e597 100644 --- a/repository/src/main/resources/alfresco/subsystems/Authentication/identity-service/identity-service-authentication.properties +++ b/repository/src/main/resources/alfresco/subsystems/Authentication/identity-service/identity-service-authentication.properties @@ -12,6 +12,7 @@ identity-service.resource=alfresco identity-service.credentials.secret= identity-service.public-client=true identity-service.admin-console.redirect-path=/alfresco/s/admin/admin-communitysummary +identity-service.webscript-home.redirect-path=/alfresco/s/index identity-service.signature-algorithms=RS256,PS256 identity-service.first-name-attribute=given_name identity-service.last-name-attribute=family_name