CAS Part 2

Signed-off-by: Marcin Woźniak <y0rune@aol.com>

buisnesslogic/src/main/java/com/plannaplan/services/UserService.java

@@ -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;
     }