commit commit

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

@@ -228,16 +228,18 @@ public class AuthController extends Controller {
 //            "token":"token",
 //        }
 
-        try {
+
             // Check if firebase token is valid
             boolean isTokenValid = user.getToken() != null && validateFirebaseToken(user.getToken());
 
             boolean gotFromOld = false;
 
+            String firebaseUid = user.getFirebaseUid();
+
             // if valid do sign in if firebase Uid exist in database or register as new user
             if (isTokenValid) {
                 //Query to find user from database by firebase uid
-                Optional<TbCfUserInfo> optional = userRepository.findByFirebaseUid(user.getFirebaseUid());
+                Optional<TbCfUserInfo> optional = userRepository.findByFirebaseUid(firebaseUid);
 
                 if (!optional.isPresent() && user.getEmail() != null && !user.getEmail().isEmpty() && userRepository.existsByAccount(user.getEmail())) {
                     optional = userRepository.findFirstByAccount(user.getEmail());
@@ -254,7 +256,7 @@ public class AuthController extends Controller {
 
                     String userid = IdUtil.createIdbyUUID();
 
-                    user.setPassword(encoder.encode(user.getFirebaseUid()));
+                    user.setPassword(encoder.encode(firebaseUid));
                     user.setUserId(userid);
 
                     fillUserNecessayInfo(user);
@@ -306,7 +308,7 @@ public class AuthController extends Controller {
                 // generate token codes has been moved downwards from if condition of checking if user doesn't exist in database, because even if
                 // user exist we have to generate token also
                 if (user.getPassword() == null || gotFromOld) {
-                    user.setPassword(encoder.encode(user.getFirebaseUid()));// Assign user from database to the user we have to return back to request
+                    user.setPassword(encoder.encode(firebaseUid));// Assign user from database to the user we have to return back to request
                 }
 
 
@@ -318,7 +320,7 @@ public class AuthController extends Controller {
                 userRepository.save(user);
                 //注册成功 创建token
 
-                LoginRequest loginRequest = new LoginRequest(user.getFirebaseUid(), user.getFirebaseUid());
+                LoginRequest loginRequest = new LoginRequest(firebaseUid, firebaseUid);
 
                 loginRequest.setVeryOldPassword(very);
 
@@ -328,11 +330,7 @@ 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());
       
-        }
 
     }