commit

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

@@ -173,21 +173,22 @@ public class AuthController extends Controller {
 //        }
 
 		// Check if firebase token is valid
-		boolean isTokenValid = user.getToken() != null && validateFirebaseToken(user.getToken());
+
+		try {
+			boolean isTokenValid = user.getToken() != null && validateFirebaseToken(user.getToken());
 
 
-		// 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());
-			if ( !optional.isPresent() ) {
+			// 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());
+				if ( !optional.isPresent() ) {
 
 
 
 
-				String userid = IdUtil.createIdbyUUID();
+					String userid = IdUtil.createIdbyUUID();
 
-				try{
 					user.setPassword(encoder.encode(user.getFirebaseUid()));
 					user.setUserId(userid);
 
@@ -198,57 +199,58 @@ public class AuthController extends Controller {
 
 					//赠送用户优惠券
 					fixCoupon(user);
-				}catch (Exception e){
-					System.out.println(e.getMessage());
-				}
-			} else {
-				TbCfUserInfo userInfo = optional.get();
+				} else {
+					TbCfUserInfo userInfo = optional.get();
 
-				if( user.hasFcm() ){
-					userInfo.setFcm(user.getFcm());
-				}
+					if( user.hasFcm() ){
+						userInfo.setFcm(user.getFcm());
+					}
 
-				String property = domainProperties.getProperty("user.avatar");
+					String property = domainProperties.getProperty("user.avatar");
 
-				property = property == null ? "" : property;
+					property = property == null ? "" : property;
 
-				boolean b = property.equals(userInfo.getAvatar()) || userInfo.getAvatar() == null || userInfo.getAvatar().isEmpty();
+					boolean b = property.equals(userInfo.getAvatar()) || userInfo.getAvatar() == null || userInfo.getAvatar().isEmpty();
 
 
-				if( user.getAvatar() != null && b){
-					userInfo.setAvatar(user.getAvatar());
-				}
-				boolean b1 = userInfo.getNick() == null || userInfo.getNick().isEmpty();
-				if( user.getNick() != null && b1){
-					userInfo.setNick(user.getNick());
-				}
+					if( user.getAvatar() != null && b){
+						userInfo.setAvatar(user.getAvatar());
+					}
+					boolean b1 = userInfo.getNick() == null || userInfo.getNick().isEmpty();
+					if( user.getNick() != null && b1){
+						userInfo.setNick(user.getNick());
+					}
 
-				user = userInfo;
+					user = userInfo;
 
-			}
-			// 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 ){
-				user.setPassword(encoder.encode(user.getFirebaseUid()));// Assign user from database to the user we have to return back to request
-			}
+				}
+				// 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 ){
+					user.setPassword(encoder.encode(user.getFirebaseUid()));// Assign user from database to the user we have to return back to request
+				}
 
 
 
-			fixCode(user);
+				fixCode(user);
 
-			//addToNetwork(user);
+				//addToNetwork(user);
 
-			user.setLastLoginTime(new Date());
-			userRepository.save(user);
-			//注册成功 创建token
+				user.setLastLoginTime(new Date());
+				userRepository.save(user);
+				//注册成功 创建token
 
-			return authenticateUser(new LoginRequest(user.getFirebaseUid(),user.getFirebaseUid()));
+				return authenticateUser(new LoginRequest(user.getFirebaseUid(),user.getFirebaseUid()));
 
 
-		} else {
-			return new Result<>(ResultCodeEnum.ILLEGAL_ARGUMENT.getCode(),ResultCodeEnum.ILLEGAL_ARGUMENT.getDesc());
+			} 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());
 	}