login error fix after reset password processed

Evolveum · Jan 23, 2023 · 9a2cc94 · 9a2cc94
1 parent d385ffa
commit 9a2cc94
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/forgotpassword/PageResetPassword.java b/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/forgotpassword/PageResetPassword.java
@@ -89,7 +89,6 @@ protected void finishChangePassword(final OperationResult result, AjaxRequestTar
 
                 if (result.getStatus() == OperationResultStatus.SUCCESS) {
                     result.setMessage(getString("PageResetPassword.reset.successful"));
-                    setResponsePage(new RedirectPage("/"));
 
                     PrismObject<? extends FocusType> focus = getPrincipalFocus().asPrismObject();
                     if (focus == null) {
@@ -114,6 +113,7 @@ protected void finishChangePassword(final OperationResult result, AjaxRequestTar
                     showResult(result);
                     target.add(getFeedbackPanel());
                     AuthUtil.clearMidpointAuthentication();
+                    setResponsePage(getMidpointApplication().getHomePage());
                 } else if (showFeedback) {
                     showResult(result);
                 }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
@@ -173,15 +173,6 @@ protected String getErrorMessageKey() {
         return "PageError.message";
     }
 
-    private String getUrlForLogout() {
-        ModuleAuthentication moduleAuthentication = AuthUtil.getAuthenticatedModule();
-
-        if (moduleAuthentication == null) {
-            return SecurityUtils.DEFAULT_LOGOUT_PATH;
-        }
-        return SecurityUtils.getPathForLogoutWithContextPath(getRequest().getContextPath(), moduleAuthentication.getPrefix());
-    }
-
     @Override
     protected void createBreadcrumb() {
         //don't create breadcrumb for error page