commit commit

src/main/java/com/example/afrishop_v3/controllers/AuthController.java

@@ -228,6 +228,7 @@ public class AuthController extends Controller {
 //            "token":"token",
 //        }
 
+        try {
             // Check if firebase token is valid
             boolean isTokenValid = user.getToken() != null && validateFirebaseToken(user.getToken());
 
@@ -238,13 +239,13 @@ public class AuthController extends Controller {
                 //Query to find user from database by firebase uid
                 Optional<TbCfUserInfo> optional = userRepository.findByFirebaseUid(user.getFirebaseUid());
 
-            if ( !optional.isPresent() && user.getEmail() != null && !user.getEmail().isEmpty() && userRepository.existsByAccount(user.getEmail())) {
+                if (!optional.isPresent() && user.getEmail() != null && !user.getEmail().isEmpty() && userRepository.existsByAccount(user.getEmail())) {
                     optional = userRepository.findFirstByAccount(user.getEmail());
                     gotFromOld = optional.isPresent();
                 }
 
-            if ( !optional.isPresent() && user.getPhone() != null && !user.getPhone().isEmpty() && userRepository.existsByAccount(user.getPhone().replace("+",""))) {
-                optional = userRepository.findFirstByAccount(user.getPhone().replace("+",""));
+                if (!optional.isPresent() && user.getPhone() != null && !user.getPhone().isEmpty() && userRepository.existsByAccount(user.getPhone().replace("+", ""))) {
+                    optional = userRepository.findFirstByAccount(user.getPhone().replace("+", ""));
                     gotFromOld = optional.isPresent();
                 }
 
@@ -327,6 +328,11 @@ public class AuthController extends Controller {
             } else {
                 return new Result<>(ResultCodeEnum.ILLEGAL_ARGUMENT.getCode(), ResultCodeEnum.ILLEGAL_ARGUMENT.getDesc());
             }
+        }catch (Exception e){
+            System.out.println(e.getMessage());
+            return new Result<>(ResultCodeEnum.ILLEGAL_ARGUMENT.getCode(), e.getMessage());
+
+        }
 
     }