Changeset 25129

Timestamp:

2012-02-22T10:30:17+13:00 (12 years ago)

Author:

sjm84

Message:

If the user enters in an incorrect username or password an appropriate error is produced

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -719 +719 @@
                 request.logout();
             }
-            request.login(username[0], password[0]);
-        }
-
+            
+            try
+            {
+                request.login(username[0], password[0]);
+            }
+            catch(Exception ex)
+            {
+                //The user entered in either the wrong username or the wrong password
+                Element loginPageMessage = this.doc.createElement(GSXML.MESSAGE_ELEM);
+                Element loginPageRequest = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PAGE, "", userContext);
+                loginPageRequest.setAttribute(GSXML.ACTION_ATT, "p");
+                loginPageRequest.setAttribute(GSXML.SUBACTION_ATT, "login");
+                loginPageRequest.setAttribute(GSXML.OUTPUT_ATT, "html");
+                loginPageMessage.appendChild(loginPageRequest);
+
+                Element paramList = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+                loginPageRequest.appendChild(paramList);
+
+                Element messageParam = this.doc.createElement(GSXML.PARAM_ELEM);
+                messageParam.setAttribute(GSXML.NAME_ATT, "loginMessage");
+                messageParam.setAttribute(GSXML.VALUE_ATT, "Either your username or password was incorrect, please try again.");
+                paramList.appendChild(messageParam);
+
+                Element urlParam = this.doc.createElement(GSXML.PARAM_ELEM);
+                urlParam.setAttribute(GSXML.NAME_ATT, "redirectURL");
+                urlParam.setAttribute(GSXML.VALUE_ATT, this.getServletName() + "?" + request.getQueryString().replace("&", "&"));
+                paramList.appendChild(urlParam);
+
+                Node loginPageResponse = this.recept.process(loginPageMessage);
+                out.println(this.converter.getPrettyString(loginPageResponse));
+
+                return;
+            }
+        }
+
+        //If a user is logged in
         if (request.getAuthType() != null)
         {