Merge pull request #343 from mosu-dev/develop

[배포] KMC 회원, 카카오 중복 회원가입 에러 처리

Author: wlgns12370

src/main/java/life/mosu/mosuserver/application/oauth/OAuthUserPersistenceProcessor.java

@@ -4,6 +4,7 @@
 import life.mosu.mosuserver.domain.user.entity.UserJpaEntity;
 import life.mosu.mosuserver.domain.user.entity.UserRole;
 import life.mosu.mosuserver.domain.user.repository.UserJpaRepository;
+import life.mosu.mosuserver.global.exception.OAuthException;
 import life.mosu.mosuserver.global.processor.StepProcessor;
 import life.mosu.mosuserver.global.util.PhoneNumberUtil;
 import lombok.RequiredArgsConstructor;
@@ -28,9 +29,9 @@ public UserJpaEntity process(final OAuthUserInfo info) {
         return userRepository.findByPhoneNumber(
                         PhoneNumberUtil.formatPhoneNumber(info.phoneNumber()))
                 .map(existingUser -> {
-//                    if (existingUser.isMosuUser()) {
-//                        throw new IllegalArgumentException("이미 모수 회원입니다.");
-//                    }
+                    if (existingUser.isMosuUser()) {
+                        throw new OAuthException("DUPLICATE");
+                    }
                     existingUser.updateOAuthUser(
                             info.gender(),
                             info.name(),

src/main/java/life/mosu/mosuserver/global/exception/OAuthException.java

@@ -0,0 +1,10 @@
+package life.mosu.mosuserver.global.exception;
+
+import org.springframework.security.core.AuthenticationException;
+
+public class OAuthException extends AuthenticationException {
+
+    public OAuthException(String msg) {
+        super(msg);
+    }
+}

src/main/java/life/mosu/mosuserver/global/handler/OAuth2LoginFailureHandler.java

@@ -6,7 +6,6 @@
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import life.mosu.mosuserver.presentation.auth.dto.request.LoginResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.AuthenticationException;
@@ -27,8 +26,11 @@ public class OAuth2LoginFailureHandler implements
     public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response,
             AuthenticationException exception) throws IOException, ServletException {
 
-        LoginResponse loginResponse = LoginResponse.from();
-        String jsonResponse = UriUtils.encode(objectMapper.writeValueAsString(loginResponse),
+        OAuthErrorType errorType = OAuthErrorType.from(exception.getMessage());
+        OAuthFailureResponse oAuthFailureResponse = OAuthFailureResponse.from(
+                errorType.getMessage());
+
+        String jsonResponse = UriUtils.encode(objectMapper.writeValueAsString(oAuthFailureResponse),
                 StandardCharsets.UTF_8);
 
         final String redirectWithAccessToken = UriComponentsBuilder.fromUriString(

src/main/java/life/mosu/mosuserver/global/handler/OAuthErrorType.java

@@ -0,0 +1,27 @@
+package life.mosu.mosuserver.global.handler;
+
+import lombok.Getter;
+
+@Getter
+public enum OAuthErrorType {
+    CANCELED("CANCELED"),
+    DUPLICATE("DUPLICATE"),
+    UNKNOWN("UNKNOWN");
+
+    private final String message;
+
+    OAuthErrorType(String message) {
+        this.message = message;
+    }
+
+    public static OAuthErrorType from(String text) {
+        if (text == null) {
+            return UNKNOWN;
+        }
+        return switch (text) {
+            case "DUPLICATE" -> DUPLICATE;
+            case "[access_denied] User denied access" -> CANCELED;
+            default -> UNKNOWN;
+        };
+    }
+}

src/main/java/life/mosu/mosuserver/global/handler/OAuthFailureResponse.java

@@ -0,0 +1,11 @@
+package life.mosu.mosuserver.global.handler;
+
+public record OAuthFailureResponse(
+        Boolean isProfileRegistered,
+        String errorCode
+) {
+
+    public static OAuthFailureResponse from(String errorCode) {
+        return new OAuthFailureResponse(null, errorCode);
+    }
+}

src/main/java/life/mosu/mosuserver/presentation/auth/dto/request/LoginResponse.java

@@ -21,8 +21,4 @@ public static LoginResponse from(Boolean isProfileRegistered, final UserJpaEntit
         }
         return new LoginResponse(false, LoginUserResponse.from(user));
     }
-
-    public static LoginResponse from() {
-        return new LoginResponse(null, null);
-    }
 }