[gatein-commits] gatein SVN: r1948 - portal/trunk/component/web/src/main/java/org/exoplatform/web/login.

[do-not-reply at jboss.org]

Author: julien_viet
Date: 2010-03-03 10:40:30 -0500 (Wed, 03 Mar 2010)
New Revision: 1948

Modified:
   portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java
   portal/trunk/component/web/src/main/java/org/exoplatform/web/login/PortalLoginController.java
Log:
- actually now makes initialURI more useable than what it used to be
- minor improvement


Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java	2010-03-03 15:21:59 UTC (rev 1947)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java	2010-03-03 15:40:30 UTC (rev 1948)
@@ -48,8 +48,10 @@
     */
    private static final long serialVersionUID = -2553824531076121642L;
 
+   /** . */
    public static final String COOKIE_NAME = "rememberme";
 
+   /** . */
    public static final String CREDENTIALS = "credentials";
 
    @Override

Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/PortalLoginController.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/login/PortalLoginController.java	2010-03-03 15:21:59 UTC (rev 1947)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/login/PortalLoginController.java	2010-03-03 15:40:30 UTC (rev 1948)
@@ -48,21 +48,31 @@
       //
       String username = req.getParameter("username");
       String password = req.getParameter("password");
+
+      //
+      if (username == null)
+      {
+         resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "No username provided");
+      }
+      if (password == null)
+      {
+         resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "No password provided");
+      }
+
+      //
       Credentials credentials = new Credentials(username, password);
       req.getSession().setAttribute(InitiateLoginServlet.CREDENTIALS, credentials);
 
-      String uri = (String)req.getSession().getAttribute("initialURI");
+      // Obtain initial URI
+      String uri = req.getParameter("initialURI");
+
+      // otherwise compute one
       if (uri == null || uri.length() == 0)
       {
-         String pathInfo = req.getPathInfo();
-         if (pathInfo == null)
-         {
-            pathInfo = "/";
-         }
-         uri = req.getContextPath() + "/private" + pathInfo;
+         uri = req.getContextPath() + "/private/classic";
       }
 
-      //
+      // if we do have a remember me
       String rememberme = req.getParameter("rememberme");
       if ("true".equals(rememberme))
       {
@@ -78,6 +88,8 @@
             resp.addCookie(cookie);
          }
       }
+
+      //
       resp.sendRedirect(uri);
    }