| /MentaRefAppWithService/trunk/src/test/java/org/menta/action/LoginActionTest.java |
|---|
| 38,13 → 38,8 |
| String result, errorId; |
| User user = new User(); |
| // test wrong password... |
| input.setValue("username", "testUser"); |
| input.setValue("password", "wrong_pass"); |
| input.inject(user); |
| result = login.execute(user); |
| result = login.execute("testUser", "wrong_pass"); |
| errorId = login.getError("username"); |
| 52,11 → 47,8 |
| Assert.assertEquals(Type.WRONG_PASSWORD.toString(), errorId); |
| // test success... |
| result = login.execute("testUser", "abc123"); |
| input.setValue("password", "abc123"); |
| input.inject(user); |
| result = login.execute(user); |
| Assert.assertEquals(SUCCESS, result); |
| } |
| /MentaRefAppWithService/trunk/src/main/java/org/menta/service/UserService.java |
|---|
| 15,6 → 15,6 |
| * @return User if username and password match |
| * @throws LoginException if username or password doesn't match |
| */ |
| public User login(User user) throws LoginException; |
| public User login(String username, String password) throws LoginException; |
| } |
| /MentaRefAppWithService/trunk/src/main/java/org/menta/service/impl/UserServiceImpl.java |
|---|
| 84,18 → 84,18 |
| } |
| @Override |
| public User login(final User user) throws LoginException { |
| public User login(final String username, String password) throws LoginException { |
| final User userFinded = userDAO.findByUsername(user.getUsername()); |
| final User userFound = userDAO.findByUsername(username); |
| if (userFinded == null) { |
| if (userFound == null) { |
| throw new LoginException(Type.USERNAME_NOTFOUND); |
| } |
| if (!userFinded.getPassword().equals(user.getPassword())) { |
| if (!userFound.getPassword().equals(password)) { |
| throw new LoginException(Type.WRONG_PASSWORD); |
| } |
| return userFinded; |
| return userFound; |
| } |
| } |
| /MentaRefAppWithService/trunk/src/main/java/org/menta/AppManager.java |
|---|
| 154,6 → 154,7 |
| .all(ajax(new ResultRenderer())); // return text/plain with the result... |
| action("/Login", LoginAction.class) |
| .pojoParams("username", "password") |
| .on(ERROR, fwd("/jsp/login.jsp")) |
| .on(SUCCESS, redir("/jsp/index.jsp")); |
| /MentaRefAppWithService/trunk/src/main/java/org/menta/action/LoginAction.java |
|---|
| 16,15 → 16,15 |
| this.userService = userService; |
| } |
| public String execute(User user) { |
| public String execute(String username, String password) { |
| try { |
| User userFinded = userService.login(user); |
| User userFound = userService.login(username, password); |
| setSessionObj(userFinded); |
| setSessionGroups(userFinded.getGroup()); |
| setSessionLocale(userFinded.getLocale()); |
| setSessionObj(userFound); |
| setSessionGroups(userFound.getGroup()); |
| setSessionLocale(userFound.getLocale()); |
| return SUCCESS; |