Remove service test
2 unresolved threads
2 unresolved threads
Removed the service test
Merge request reports
Activity
added 20 commits
-
9ae33786...8ca521cb - 12 commits from branch
dev - a6848957 - Adding login method to login controller
- 1eef7285 - Removed the methods from loginRepository and added the to userService instead
- 41586b0b - Also commented out userService test
- 79795186 - Writing some sexy tests for userService
- 41826e36 - Test fix
- 3a6d3cf0 - BugFix
- 31f48e29 - Removed test for service
- df41b0c2 - Merge remote-tracking branch 'origin/remove_serviceTest' into remove_serviceTest
Toggle commit list-
9ae33786...8ca521cb - 12 commits from branch
65 65 * @return 66 66 */ 67 67 public boolean logIn(String username, String password) { 68 if(loginRepository.logIn(username, password)) { 69 User user = loginRepository.findById(username).get().getUser(); 70 ApplicationState.setCurrentUser(user); 71 return true; 68 try { 69 Optional<Login> login = loginRepository.findById(username); 70 if (login.isPresent()) { 71 String salt = login.get().getPasswordSalt(); 72 String hash = login.get().getHash(); 73 return Authentication.isCorrectPassword(salt, password, hash); changed this line in version 6 of the diff
65 66 * @return 66 67 */ 67 68 public boolean logIn(String username, String password) { 68 if(loginRepository.logIn(username, password)) { 69 User user = loginRepository.findById(username).get().getUser(); 70 ApplicationState.setCurrentUser(user); 71 return true; 69 try { 70 Optional<Login> login = loginRepository.findById(username); 71 if (login.isPresent()) { 72 String salt = login.get().getPasswordSalt(); 73 String hash = login.get().getHash(); 74 if(Authentication.isCorrectPassword(salt, password, hash)) { 75 ApplicationState.setCurrentUser(login.get().getUser()); mentioned in commit b86549ba
Please register or sign in to reply