filipizydorczyk/backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CAS Part 2

Browse Source 
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
This commit is contained in:
Marcin Woźniak
2020-12-03 16:57:53 +01:00
parent 3ebfda5316
commit 453907782a
7 changed files with 51 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
buisnesslogic/src/main/java/com/plannaplan/services/UserService.java
View File

@ -32,8 +32,7 @@ public class UserService {
}
else {
final User newUser = new User(null,null,email.replace("\n", "").trim(),UserRoles.STUDENT);
this.repo.save(newUser);
return newUser;
return this.repo.save(newUser);
}
}
else {
@ -43,19 +42,20 @@ public class UserService {
}
else {
final User newUser = new User(null,null,email.replace("\n", "").trim(),usosId,UserRoles.STUDENT);
this.repo.save(newUser);
return newUser;
return this.repo.save(newUser);
}
}
}
public String login(String authority) throws UserNotFoundException {
User user = this.repo.getByAuthority(authority.replace("\n", "").trim())
.orElseThrow(() -> new UserNotFoundException("Can not find user with given authority"));
public String login(User authority) throws UserNotFoundException {
final String token = UUID.randomUUID().toString();
user.setToken(token);
this.repo.save(user);
try{
authority.setToken(token);
this.repo.save(authority);
}
catch (Exception e){
throw new UserNotFoundException(e.getMessage());
}
return token;
}

15
buisnesslogic/src/test/java/com/plannaplan/services/UserServiceTest.java
View File

@ -32,10 +32,9 @@ public class UserServiceTest {
@Test
public void shouldReturnToken() {
final User testUser = new User(TEST_USER_NAME, TEST_USER_SUERNAME, TEST_USER_MAIL, UserRoles.TEST_USER);
this.userService.save(testUser);
final User testUser = this.userService.save(new User(TEST_USER_NAME, TEST_USER_SUERNAME, TEST_USER_MAIL, UserRoles.TEST_USER));
try {
final String token = this.userService.login(TEST_USER_MAIL);
final String token = this.userService.login(testUser);
System.out.println("Returned token: " + token);
assertTrue(token != null);
assertTrue(this.userService.getUserByEmail(TEST_USER_MAIL).getToken() != null);
@ -45,16 +44,6 @@ public class UserServiceTest {
}
}
@Test
public void shouldThrowException() {
try {
this.userService.login("thiseamilisnotindatabase@gmail.com");
assertTrue(false);
} catch (UserNotFoundException e) {
assertTrue(true);
}
}
@Test
public void shouldFindStudents() {
this.userService.save(new User("Nemo", "TheFish", "Nemo@shouldFindStudents.test", UserRoles.STUDENT));