fix: 애플 로그인 로직 수정 (#280)

* feat: 외부 API 호출 툴 Feign 설정

* feat: Apple 로그인 구현 + 회원가입 Reqeust Provider 추가

* fix: Claims sub 항목 빼서 쓰게 수정

* fix: AuthorizationCode Request 제거

* fix: 애플 로그인 로직 수정

Author: sejineer

src/main/java/com/shallwe/domain/auth/application/AuthService.java

@@ -72,34 +72,6 @@ public AuthRes signUp(final SignUpReq signUpReq) {
         return getUserAuthRes(newUser);
     }
 
-    @Transactional
-    public AuthRes appleSignUp(AppleSignUpReq appleSignUpReq) {
-        Claims claims = appleJwtUtils.getClaimsBy(appleSignUpReq.getIdentityToken());
-        String providerId = claims.get("sub").toString();
-
-        if (userRepository.existsByProviderId(providerId)) {
-            throw new AlreadyExistsProviderIdException();
-        }
-
-        String appleRefreshToken = appleJwtUtils.getAppleToken(appleSignUpReq.getAuthorizationCode());
-        AppleToken appleTokenReq = AppleToken.builder()
-                .providerId(providerId)
-                .refreshToken(appleRefreshToken)
-                .build();
-        appleTokenRepository.save(appleTokenReq);
-
-        User newUser = User.builder()
-                .providerId(providerId)
-                .provider(Provider.APPLE)
-                .email(appleSignUpReq.getEmail())
-                .password(passwordEncoder.encode(providerId))
-                .role(Role.USER)
-                .build();
-        userRepository.save(newUser);
-
-        return getUserAuthRes(newUser);
-    }
-
     @Transactional
     public AuthRes signIn(final SignInReq signInReq) {
         User user = userRepository.findByEmailAndStatus(signInReq.getEmail(), Status.ACTIVE)
@@ -116,7 +88,29 @@ public AuthRes appleSignIn(AppleSignInReq appleSignInReq) {
         Claims claims = appleJwtUtils.getClaimsBy(appleSignInReq.getIdentityToken());
         String providerId = claims.get("sub").toString();
 
-        User user = userRepository.findByProviderId(providerId).orElseThrow(InvalidProviderIdException::new);
+        Optional<User> optionalUser = userRepository.findByProviderId(providerId);
+
+        if (optionalUser.isEmpty()) {
+            String appleRefreshToken = appleJwtUtils.getAppleToken(appleSignInReq.getAuthorizationCode());
+            AppleToken appleTokenReq = AppleToken.builder()
+                    .providerId(providerId)
+                    .refreshToken(appleRefreshToken)
+                    .build();
+            appleTokenRepository.save(appleTokenReq);
+
+            User newUser = User.builder()
+                    .providerId(providerId)
+                    .provider(Provider.APPLE)
+                    .password(passwordEncoder.encode(providerId))
+                    .role(Role.USER)
+                    .build();
+            userRepository.save(newUser);
+
+            optionalUser = Optional.of(newUser);
+        }
+
+        User user = optionalUser.get();
+
         if (user.getName() == null || user.getPhoneNumber() == null || user.getAge() == null || user.getGender() == null) {
             throw new UnRegisteredUserException();
         }

src/main/java/com/shallwe/domain/auth/dto/request/AppleSignInReq.java

@@ -6,7 +6,13 @@
 @Data
 public class AppleSignInReq {
 
+    @Schema(type = "String", description = "애플 로그인을 위한 ProviderId")
+    private String providerId;
+
     @Schema(type = "String", description = "애플 로그인을 위한 IdentityToken")
     private String identityToken;
 
+    @Schema(type = "String", description = "애플 로그인을 위한 AuthorizationCode")
+    private String authorizationCode;
+
 }

src/main/java/com/shallwe/domain/auth/exception/UnRegisteredUserException.java

@@ -3,7 +3,7 @@
 public class UnRegisteredUserException extends RuntimeException {
 
     public UnRegisteredUserException() {
-        super("회원가입이 완료되지 않은 유저입니다.");
+        super("유저정보 입력이 완료되지 않은 유저입니다.");
     }
 
 }

src/main/java/com/shallwe/domain/auth/presentation/AuthController.java

@@ -48,18 +48,6 @@ public ResponseCustom<AuthRes> signUp(
         return ResponseCustom.OK(authService.signUp(signUpReq));
     }
 
-    @Operation(summary = "애플 유저 회원가입", description = "애플 유저 회원가입을 수행합니다.")
-    @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "애플 회원가입 성공", content = { @Content(mediaType = "application/json", schema = @Schema(implementation = AuthRes.class) ) } ),
-            @ApiResponse(responseCode = "400", description = "애플 회원가입 실패", content = { @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class) ) } ),
-    })
-    @PostMapping(value="/sign-up/apple")
-    public ResponseCustom<AuthRes> signUp(
-            @Parameter(description = "AppleSignUpReq Schema를 확인해주세요.", required = true) @RequestBody AppleSignUpReq appleSignUpReq
-    ) {
-        return ResponseCustom.OK(authService.appleSignUp(appleSignUpReq));
-    }
-
     @Operation(summary = "유저 로그인", description = "유저 로그인을 수행합니다.")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "로그인 성공", content = { @Content(mediaType = "application/json", schema = @Schema(implementation = AuthRes.class) ) } ),