commit

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

@@ -173,6 +173,8 @@ public class AuthController extends Controller {
 //        }
 
 		// Check if firebase token is valid
+
+		try {
 			boolean isTokenValid = user.getToken() != null && validateFirebaseToken(user.getToken());
 
 
@@ -187,7 +189,6 @@ public class AuthController extends Controller {
 
 					String userid = IdUtil.createIdbyUUID();
 
-				try{
 					user.setPassword(encoder.encode(user.getFirebaseUid()));
 					user.setUserId(userid);
 
@@ -198,9 +199,6 @@ public class AuthController extends Controller {
 
 					//赠送用户优惠券
 					fixCoupon(user);
-				}catch (Exception e){
-					System.out.println(e.getMessage());
-				}
 				} else {
 					TbCfUserInfo userInfo = optional.get();
 
@@ -248,7 +246,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(),ResultCodeEnum.ILLEGAL_ARGUMENT.getDesc());
 	}