commit

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

@@ -97,31 +97,37 @@ public class AuthController extends Controller {
 
 	@PostMapping("/signup")
 	public Result<?> registerUser( @RequestBody TbCfUserInfo signUpRequest) {
-		Optional<TbCfUserInfo> byAccount = userRepository.findByAccount(signUpRequest.getAccount());
-		if ( byAccount.isPresent() ) {
-			return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Error: Username is already taken!");
-		}
+		try {
+			Optional<TbCfUserInfo> byAccount = userRepository.findByAccount(signUpRequest.getAccount());
+			if ( byAccount.isPresent() ) {
+				return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Error: Username is already taken!");
+			}
 
-		Optional<TbCfUserInfo> byEmail = userRepository.findByFirebaseUid(signUpRequest.getEmail());
+			Optional<TbCfUserInfo> byEmail = userRepository.findByFirebaseUid(signUpRequest.getEmail());
 
-		if ( byEmail.isPresent() ) {
-			return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Error: Email is already in use!");
-		}
+			if ( byEmail.isPresent() ) {
+				return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Error: Email is already in use!");
+			}
 
 
-		signUpRequest.setFirebaseUid(signUpRequest.getEmail());
+			signUpRequest.setFirebaseUid(signUpRequest.getEmail());
 
-		signUpRequest.setUserId(IdUtil.createIdbyUUID());
+			signUpRequest.setUserId(IdUtil.createIdbyUUID());
 
-		String password = signUpRequest.getPassword();
+			String password = signUpRequest.getPassword();
 
-		signUpRequest.setPassword(encoder.encode(password));
+			signUpRequest.setPassword(encoder.encode(password));
 
 
-		TbCfUserInfo userInfo = userRepository.save(signUpRequest);
+			TbCfUserInfo userInfo = userRepository.save(signUpRequest);
 
 
-		return authenticateUser(new LoginRequest(userInfo.getFirebaseUid(),password));
+			return authenticateUser(new LoginRequest(userInfo.getFirebaseUid(),password));
+		}
+		catch (Exception e){
+			System.out.println(e.getMessage());
+			return new Result<>(ResultCodeEnum.SERVICE_ERROR.getCode(),e.getMessage());
+		}
 	}