From 8da1fad2bb058cf09e5b8fd1303fa0671b920bc4 Mon Sep 17 00:00:00 2001
From: Mads Lundegaard <madslun@stud.ntnu.no>
Date: Mon, 30 Mar 2020 12:55:17 +0200
Subject: [PATCH] Added new Constructro to logn model and started using the new
constructor in UserService
---
src/main/java/NTNU/IDATT1002/models/Login.java | 4 ++++
src/main/java/NTNU/IDATT1002/service/UserService.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/java/NTNU/IDATT1002/models/Login.java b/src/main/java/NTNU/IDATT1002/models/Login.java
index 2f3af412..f1d851ac 100644
--- a/src/main/java/NTNU/IDATT1002/models/Login.java
+++ b/src/main/java/NTNU/IDATT1002/models/Login.java
@@ -25,6 +25,10 @@ public class Login {
public Login() {
}
+ public Login(User user) {
+ this.username = user.getUsername();
+ }
+
public Login(User user, String passwordSalt , String hash) {
this.username = user.getUsername();
this.user = user;
diff --git a/src/main/java/NTNU/IDATT1002/service/UserService.java b/src/main/java/NTNU/IDATT1002/service/UserService.java
index 0a5046fb..7b549630 100644
--- a/src/main/java/NTNU/IDATT1002/service/UserService.java
+++ b/src/main/java/NTNU/IDATT1002/service/UserService.java
@@ -46,7 +46,7 @@ public class UserService {
*/
public Optional<User> createUser(String email, String username, String firstName, String lastName, String callingCode, String phoneNumber, Date birthDate, String password) {
User user = new User(username, email, firstName, lastName, callingCode, phoneNumber, birthDate);
- Login login = new Login(user, "", "");
+ Login login = new Login(user);
setPassword(login, password);
return userRepository.save(user);
}
--
GitLab