BZ-1099378 - WAS: no error message shown when user tries to login wit…

…h invalid credentials
kiegroup · May 21, 2014 · ebed6e3 · ebed6e3
1 parent b312885
commit ebed6e3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/modules/dashboard-webapp/src/main/webapp/login.jsp b/modules/dashboard-webapp/src/main/webapp/login.jsp
@@ -164,7 +164,8 @@
             SessionInitializer.PreferredLocale preferredLocale =  SessionInitializer.getPreferredLocale(request);
             if (preferredLocale != null) currentLocale = preferredLocale.asLocale();
             ResourceBundle i18nBundle = LocaleManager.lookup().getBundle("org.jboss.dashboard.login.messages", currentLocale);
-            String messageKey = request.getParameter("message");
+
+            String messageKey = (String) request.getSession().getAttribute("login.message");
             if (messageKey == null) messageKey = "login.hint";
         %>
         <h3><%= i18nBundle.getString(messageKey) %></h3>

diff --git a/modules/dashboard-webapp/src/main/webapp/login_failed.jsp b/modules/dashboard-webapp/src/main/webapp/login_failed.jsp
@@ -16,8 +16,6 @@
 
 --%>
 <%
-    request.getSession().invalidate();
-    // BZ-1025763: Redirect to the context path, not login.jsp page.
-    String redirectURL = request.getContextPath()  +"?message=login.invalid_credentials";
-    response.sendRedirect(redirectURL);
+  request.getSession().setAttribute("login.message", "login.invalid_credentials");
+  response.sendRedirect(request.getContextPath());
 %>
diff --git a/modules/dashboard-webapp/src/main/webapp/not_authorized.jsp b/modules/dashboard-webapp/src/main/webapp/not_authorized.jsp
@@ -16,7 +16,6 @@
 
 --%>
 <%
-    request.getSession().invalidate();
-    String redirectURL = request.getContextPath()  +"?message=login.not_authorized";
-    response.sendRedirect(redirectURL);
+  request.getSession().setAttribute("login.message", "login.not_authorized");
+  response.sendRedirect(request.getContextPath());
 %>