From 23ac8d702d0d7fb79a3646f96c1fdf7aa194802c Mon Sep 17 00:00:00 2001
From: Mads Lundegaard <madslun@stud.ntnu.no>
Date: Mon, 23 Mar 2020 21:49:12 +0100
Subject: [PATCH] Added set current user
---
src/main/java/NTNU/IDATT1002/controllers/Login.java | 2 ++
src/main/java/NTNU/IDATT1002/service/UserService.java | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Login.java b/src/main/java/NTNU/IDATT1002/controllers/Login.java
index fb49fe32..8eae735e 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/Login.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/Login.java
@@ -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;
diff --git a/src/main/java/NTNU/IDATT1002/service/UserService.java b/src/main/java/NTNU/IDATT1002/service/UserService.java
index 426c5926..e14166e2 100644
--- a/src/main/java/NTNU/IDATT1002/service/UserService.java
+++ b/src/main/java/NTNU/IDATT1002/service/UserService.java
@@ -1,5 +1,6 @@
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) {
--
GitLab