Skip to content
Snippets Groups Projects
Commit 23ac8d70 authored by Mads Lundegaard's avatar Mads Lundegaard
Browse files

Added set current user

parent 23e501e2
No related branches found
No related tags found
2 merge requests!104Weekly merge to Master,!72Remove service test
......@@ -3,6 +3,8 @@ package NTNU.IDATT1002.controllers;
import java.io.IOException;
import NTNU.IDATT1002.App;
import NTNU.IDATT1002.ApplicationState;
import NTNU.IDATT1002.models.User;
import NTNU.IDATT1002.service.UserService;
import javafx.event.ActionEvent;
import javafx.scene.control.Button;
......
package NTNU.IDATT1002.service;
import NTNU.IDATT1002.App;
import NTNU.IDATT1002.ApplicationState;
import NTNU.IDATT1002.models.Login;
import NTNU.IDATT1002.models.User;
......@@ -70,7 +71,10 @@ public class UserService {
if (login.isPresent()) {
String salt = login.get().getPasswordSalt();
String hash = login.get().getHash();
return Authentication.isCorrectPassword(salt, password, hash);
if(Authentication.isCorrectPassword(salt, password, hash)) {
ApplicationState.setCurrentUser(login.get().getUser());
return true;
}
}
}
catch (IllegalArgumentException e) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment