udac creates UserBean and returns early if an user was found

diff --git a/src/org/mcb/services/loginmanager.java b/src/org/mcb/services/loginmanager.java
index 31d7680..5caa349 100644 (file)
--- a/src/org/mcb/services/loginmanager.java
+++ b/src/org/mcb/services/loginmanager.java
@@ -17,7 +17,7 @@ public class loginmanager extends HttpServlet {
        private static final long serialVersionUID = 1L;
        private transient PasswordService passwordservice;
        private transient udac udac;
-       
+
        @Override
        public void init() throws ServletException {
                super.init();
@@ -40,11 +40,9 @@ public class loginmanager extends HttpServlet {
         */
        protected void processRequest(HttpServletRequest request,
                        HttpServletResponse response) throws ServletException, IOException {
-               UserBean user = new UserBean();
-               user.setUserId(request.getParameter("txt_userid"));
-               user.setPassword(request.getParameter("txt_pass"));
-               user = udac.login(user);
-               if (user.isValid()) {
+               UserBean user = udac.login(request.getParameter("txt_userid"), request
+                               .getParameter("txt_pass"));
+               if (user != null) {
                        HttpSession session = request.getSession(true);
                        session.setAttribute("user", user);
                        session.setAttribute("user_id", user.getUserId());
@@ -52,21 +50,13 @@ public class loginmanager extends HttpServlet {
                        session.setAttribute("role_id", user.getRole());
                        session.setAttribute("role_desc", user.getRoleDesc());
                        session.setAttribute("last_login", user.getLastLogin());
-                       // response.sendRedirect("main.jsp"); //logged-in page
-                       // response.sendRedirect(response.encodeRedirectURL("main.jsp"));
                        response.sendRedirect(request.getContextPath()
                                        + response.encodeRedirectURL("/main.jsp"));
                        return;
                } else {
-                       // response.sendRedirect("index.jsp?user="+user.isValid());
-                       // //revert back to login page
-                       // response.sendRedirect(response.encodeRedirectURL("index.jsp?user="+user.isValid()));
-                       // //revert back to login page
                        response.sendRedirect(request.getContextPath()
-                                       + response.encodeRedirectURL("/index.jsp") + "?user="
-                                       + user.isValid());
+                                       + response.encodeRedirectURL("/index.jsp?user=false")); // user.isValid == false
                        return;
-                       // + java.net.URLEncoder.encode());
 
                }
        }

diff --git a/src/org/mcb/services/udac.java b/src/org/mcb/services/udac.java
index c4b4369..8ac58a0 100644 (file)
--- a/src/org/mcb/services/udac.java
+++ b/src/org/mcb/services/udac.java
@@ -16,13 +16,11 @@ public class udac {
                this.passwordservice = passwordservice;
        }
 
-       public UserBean login(UserBean user) {
+       public UserBean login(String userId, String password) {
                // preparing some objects for connection
                Connection currentCon = null;
                ResultSet rs = null;
                Statement stmt = null;
-               String userid = user.getUserId();
-               String password = user.getPassword();
                String epass = null;
                String name = null;
                String user_id = null;
@@ -36,7 +34,7 @@ public class udac {
                        System.out.println(e);
                }
                String searchQuery = "SELECT a.USER_ID,a.NAME, a.BRANCH_CODE, a.PASSWORD, a.LAST_LOGIN_DATE, a.ROLE_ID, b.ROLE_DESC FROM LOGIN_INFORMATION a, ROLES b WHERE a.ACTIVE = 'A' AND a.ROLE_ID = b.ROLE_ID ";
-               searchQuery = searchQuery + "AND LOWER(a.USER_ID) = LOWER('" + userid
+               searchQuery = searchQuery + "AND LOWER(a.USER_ID) = LOWER('" + userId
                                + "') AND a.PASSWORD = '" + epass + "'";
                try {
                        // connect to DB
@@ -45,6 +43,7 @@ public class udac {
                        rs = stmt.executeQuery(searchQuery);
                        boolean hasdata = false;
                        while (rs.next()) {
+                               UserBean user = new UserBean();
                                hasdata = true;
                                name = rs.getString("NAME");
                                user_id = rs.getString("USER_ID");
@@ -59,12 +58,12 @@ public class udac {
                                user.setLastLogin(last_login);
                                user.setRoleDesc(role_desc);
                                user.setValid(true);
+                               return user;
                        }
                        if (!hasdata) {
                                System.out
                                                .println("Sorry, you are not a registered user! Please sign up first "
                                                                + searchQuery);
-                               user.setValid(false);
                        }
                } catch (Exception ex) {
                        System.out.println("Log In failed: An Exception has occurred! "
@@ -97,7 +96,6 @@ public class udac {
                                currentCon = null;
                        }
                }
-               return user;
-
+               return null;
        }
 }