Rev 20 | Rev 26 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 20 | Rev 23 | ||
---|---|---|---|
Line 30... | Line 30... | ||
30 | 30 | ||
31 | public String doLogin() { |
31 | public String doLogin() { |
32 | 32 | ||
33 | //If password or user name are empty, the login fails.
|
33 | //If password or user name are empty, the login fails.
|
34 | if("".equals(getUserName()) || "".equals(getPw()) || getUserName() == null || getPw() == null) { |
34 | if("".equals(getUserName()) || "".equals(getPw()) || getUserName() == null || getPw() == null) { |
35 | return "failed"; |
35 | return ERROR; |
36 | }
|
36 | }
|
37 | 37 | ||
38 | String verifiedUser = verifyUser(getUserName(), getPw()); |
38 | String verifiedUser = verifyUser(getUserName(), getPw()); |
39 | if(verifiedUser.equals("failed")) { |
39 | if(verifiedUser.equals("failed")) { |
40 | return "failed"; |
40 | return ERROR; |
41 | } else { |
41 | } else { |
42 | 42 | ||
43 | //Put user name, password into session
|
43 | //Put user name, password into session
|
44 | session.put("username", getUserName()); |
44 | session.put("username", getUserName()); |
45 | session.put("pw", getPw()); |
45 | session.put("pw", getPw()); |
Line 62... | Line 62... | ||
62 | //DB Query
|
62 | //DB Query
|
63 | User u = userDAO.searchUsername(username); |
63 | User u = userDAO.searchUsername(username); |
64 | 64 | ||
65 | //User does not exist
|
65 | //User does not exist
|
66 | if(u == null) |
66 | if(u == null) |
67 | return "failed"; |
67 | return ERROR; |
68 | 68 | ||
69 | //User password does not match
|
69 | //User password does not match
|
70 | if(!u.getPassword().equals(password)) |
70 | if(!u.getPassword().equals(password)) |
71 | return "failed"; |
71 | return ERROR; |
72 | 72 | ||
73 | //User credentials are fine, check for admin rights
|
73 | //User credentials are fine, check for admin rights
|
74 | if(u.isAdmin()) { |
74 | if(u.isAdmin()) { |
75 | return "admin"; |
75 | return "admin"; |
76 | } else { |
76 | } else { |
Line 96... | Line 96... | ||
96 | 96 | ||
97 | @Override |
97 | @Override |
98 | public User getModel() { |
98 | public User getModel() { |
99 | return user; |
99 | return user; |
100 | }
|
100 | }
|
101 | - | ||
102 | - | ||
103 | - | ||
104 | - | ||
105 | }
|
101 | }
|