Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Team 14 - IDATT1002
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Eirik Steira
Team 14 - IDATT1002
Commits
8da1fad2
Commit
8da1fad2
authored
4 years ago
by
Mads Lundegaard
Browse files
Options
Downloads
Patches
Plain Diff
Added new Constructro to logn model and started using the new constructor in UserService
parent
bb78581a
No related branches found
No related tags found
2 merge requests
!104
Weekly merge to Master
,
!89
Added new Constructro to logn model and started using the new constructor in UserService
Pipeline
#77746
passed
4 years ago
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/NTNU/IDATT1002/models/Login.java
+4
-0
4 additions, 0 deletions
src/main/java/NTNU/IDATT1002/models/Login.java
src/main/java/NTNU/IDATT1002/service/UserService.java
+1
-1
1 addition, 1 deletion
src/main/java/NTNU/IDATT1002/service/UserService.java
with
5 additions
and
1 deletion
src/main/java/NTNU/IDATT1002/models/Login.java
+
4
−
0
View file @
8da1fad2
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/NTNU/IDATT1002/service/UserService.java
+
1
−
1
View file @
8da1fad2
...
...
@@ -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
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment