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

Changed token response in controller

Browse Source
This commit is contained in:
Filip Izydorczyk
2020-12-07 21:46:47 +01:00
parent 3061fb1edf
commit f9baed5df7
7 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* Service of UserService which can get(By Email), login, save user.
* Service of UserService which can get(By Email), login, save user.
*/
@Service
public class UserService {
@ -26,37 +26,33 @@ public class UserService {
public User checkForUser(String email, String usosId) {
if (usosId == null) {
Optional <User> user = this.repo.getByAuthority(email.replace("\n", "").trim());
if (user.isPresent()){
Optional<User> user = this.repo.getByAuthority(email.replace("\n", "").trim());
if (user.isPresent()) {
return user.get();
}
else {
final User newUser = new User(null,null,email.replace("\n", "").trim(),UserRoles.STUDENT);
} else {
final User newUser = new User(null, null, email.replace("\n", "").trim(), UserRoles.STUDENT);
return this.repo.save(newUser);
}
}
else {
Optional <User> user = this.repo.getByUsosId(usosId.replace("\n", "").trim());
if (user.isPresent()){
} else {
Optional<User> user = this.repo.getByUsosId(usosId.replace("\n", "").trim());
if (user.isPresent()) {
return user.get();
}
else {
final User newUser = new User(null,null,email.replace("\n", "").trim(),usosId,UserRoles.STUDENT);
} else {
final User newUser = new User(null, null, email.replace("\n", "").trim(), usosId, UserRoles.STUDENT);
return this.repo.save(newUser);
}
}
}
public String login(User authority) throws UserNotFoundException {
public User login(User authority) throws UserNotFoundException {
final String token = UUID.randomUUID().toString();
try{
try {
authority.setToken(token);
this.repo.save(authority);
}
catch (Exception e){
} catch (Exception e) {
throw new UserNotFoundException(e.getMessage());
}
return token;
return authority;
}
public User save(User user) {

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

@ -32,11 +32,12 @@ public class UserServiceTest {
@Test
public void shouldReturnToken() {
final User testUser = this.userService.save(new User(TEST_USER_NAME, TEST_USER_SUERNAME, TEST_USER_MAIL, UserRoles.TEST_USER));
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(testUser);
System.out.println("Returned token: " + token);
assertTrue(token != null);
testUser = this.userService.login(testUser);
System.out.println("Returned token: " + testUser.getToken());
assertTrue(testUser.getToken() != null);
assertTrue(this.userService.getUserByEmail(TEST_USER_MAIL).getToken() != null);
} catch (UserNotFoundException e) {
e.printStackTrace();
@ -84,17 +85,17 @@ public class UserServiceTest {
}
@Test
public void shouldCreateUser(){
public void shouldCreateUser() {
final User user = this.userService.checkForUser("shouldCreateUser@UserService.test", null);
assertTrue(user.getId() != null);
}
@Test
public void shouldReturnExistingUser(){
public void shouldReturnExistingUser() {
final String email = "shouldReturnExistingUser@UserService.test";
this.userService.save(new User("Tom","Smieszne",email,UserRoles.TEST_USER));
this.userService.save(new User("Tom", "Smieszne", email, UserRoles.TEST_USER));
final User user = this.userService.checkForUser(email, null);
assertTrue(user.getName() != "Tom");