Changeset f25d07e for phonelux-backend/src/main/java/finki/it/phoneluxbackend/services/UserService.java

Timestamp:

09/07/22 00:51:50 (2 years ago)

Author:

Marko <Marko@…>

Branches:

master

Children:

527b93f

Parents:

dbd4834

Message:

Edited registration and login services

File:

• phonelux-backend/src/main/java/finki/it/phoneluxbackend/services/UserService.java (modified) (5 diffs)

phonelux-backend/src/main/java/finki/it/phoneluxbackend/services/UserService.java

@@ -1 +1 @@
 package finki.it.phoneluxbackend.services;
+
 
 import finki.it.phoneluxbackend.entities.User;
@@ -5 +6 @@
 import finki.it.phoneluxbackend.entities.ConfirmationToken;
 import lombok.AllArgsConstructor;
+
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -12 +15 @@
 
 import java.time.LocalDateTime;
+
 import java.util.UUID;
 
@@ -28 +32 @@
     }
 
-    public String signUpUser(User user)
+    public ResponseEntity<Object> signUpUser(User user)
     {
-       boolean userExists =  userRepository.findByEmail(user.getEmail()).isPresent();
+       boolean userExists = userRepository.findByEmail(user.getEmail()).isPresent();
 
-       if (userExists && user.getEnabled()){
-           throw new IllegalStateException("Email "+user.getEmail()+" already taken!");
+
+       if (userExists){
+           User userToRegister =  userRepository.findByEmail(user.getEmail()).get();
+           if(userToRegister.getEnabled()) {
+               return ResponseEntity.badRequest().body("Error: Email "+user.getEmail()+" already taken!");
+           }
+           else {
+               return ResponseEntity.badRequest().body("Email "+user.getEmail()+" not activated!" );
+           }
        }
 
@@ -49 +60 @@
         confirmationTokenService.saveConfirmationToken(confirmationToken);
 
-        return token;
+        return ResponseEntity.ok().body("token:"+token);
     }