DRYD-1417: Set password success login URL to UI authorization page. (#408)

diff --git a/build.properties b/build.properties
index 10b4c33cf10520ed00e4870ef35f90ebff229243..7a9843f6095aab8651b971d23a0e66d0d7eb7998 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -27,7 +27,7 @@ cspace.im.root=
 # UI settings
 cspace.ui.package.name=cspace-ui
 cspace.ui.library.name=cspaceUI
-cspace.ui.version=9.0.0
+cspace.ui.version=9.0.1
 cspace.ui.build.branch=master
 cspace.ui.build.node.ver=14
 service.ui.library.name=${cspace.ui.library.name}-service

diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java b/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java
index 2bcf39e01ef532c4ee856cef14ea0cf25b356e85..27f1c6e0ef3df34f8b68c269fceb4700b10a259b 100644 (file)
--- a/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java
+++ b/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java
@@ -285,8 +285,13 @@ public class AccountResource extends SecurityResourceBase<AccountsCommon, Accoun
             uiConfig.put("csrf", csrfConfig);
         }
 
+        String tenantId = token.getTenantId();
+        TenantBindingConfigReaderImpl tenantBindingConfigReader = ServiceMain.getInstance().getTenantBindingConfigReader();
+        TenantBindingType tenantBinding = tenantBindingConfigReader.getTenantBinding(tenantId);
+
         uiConfig.put("token", tokenId);
-        uiConfig.put("tenantId", token.getTenantId());
+        uiConfig.put("tenantId", tenantId);
+        uiConfig.put("tenantLoginUrl", ConfigUtils.getUILoginSuccessUrl(tenantBinding));
 
         String uiConfigJS;