Merge pull request #54 from rhkr8521/fix/#apple-login-logic

[FIX] 애플 로그인 로직 수정

Author: rhkr8521

src/main/java/com/rhkr8521/mapping/api/member/controller/MemberController.java

@@ -35,7 +35,6 @@ public class MemberController {
 
     private final MemberService memberService;
     private final OAuthService oauthService;
-    private final AppleService appleService;
     private final JwtService jwtService;
 
     @Hidden
@@ -70,36 +69,23 @@ public ResponseEntity<ApiResponse<Map<String, Object>>> loginWithKakao(@RequestB
         return ApiResponse.success(SuccessStatus.SEND_LOGIN_SUCCESS, response);
     }
 
+    @Hidden
     @Operation(
             summary = "Apple 로그인 API",
-            description = "Apple OAuth authorization code를 통해 사용자의 정보를 등록 및 토큰을 발급합니다."
+            description = "Apple Authorization Code를 통해 사용자의 정보를 등록 및 토큰을 발급합니다."
     )
     @ApiResponses({
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "로그인 성공"),
-            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "Apple authorization code가 입력되지 않았습니다."),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "Apple Authorization Code가 입력되지 않았습니다."),
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "500", description = "Apple 소셜 로그인 중 오류 발생")
     })
     @PostMapping("/apple-login")
     public ResponseEntity<ApiResponse<Map<String, Object>>> loginWithApple(@RequestParam("code") String code) {
         if (code == null || code.isEmpty()) {
-            throw new BadRequestException("Apple authorization code가 입력되지 않았습니다.");
-        }
-        AppleDTO appleInfo;
-        try {
-            appleInfo = appleService.getAppleInfo(code);
-        } catch (Exception e) {
-            throw new InternalServerException("Apple 소셜 로그인 중 오류 발생: " + e.getMessage());
+            throw new BadRequestException(ErrorStatus.MISSING_APPLE_AUTHORIZATION_CODE_EXCEPTION.getMessage());
         }
-        // Apple 사용자 정보를 통해 회원가입 또는 로그인 처리
-        var member = memberService.registerOrLoginAppleUser(appleInfo);
-        // 토큰 발급
-        Map<String, String> tokens = jwtService.createAccessAndRefreshToken(member.getEmail());
-        Map<String, Object> response = new HashMap<>();
-        response.put("tokens", tokens);
-        response.put("role", member.getRole());
-        response.put("nickname", member.getNickname());
-        response.put("profileImage", member.getImageUrl());
-        response.put("socialId", member.getSocialId());
+
+        Map<String, Object> response = memberService.loginWithApple(code);
         return ApiResponse.success(SuccessStatus.SEND_LOGIN_SUCCESS, response);
     }
 

…521/mapping/api/member/dto/AppleDTO.java …apping/api/member/dto/AppleLoginDTO.javasrc/main/java/com/rhkr8521/mapping/api/member/dto/AppleDTO.java renamed to src/main/java/com/rhkr8521/mapping/api/member/dto/AppleLoginDTO.java src/main/java/com/rhkr8521/mapping/api/member/dto/AppleDTO.java renamed to src/main/java/com/rhkr8521/mapping/api/member/dto/AppleLoginDTO.java

@@ -5,7 +5,7 @@
 
 @Builder
 @Data
-public class AppleDTO {
+public class AppleLoginDTO {
     private String id;
     private String token;
     private String email;

src/main/java/com/rhkr8521/mapping/api/member/service/AppleService.java

@@ -8,7 +8,7 @@
 import com.nimbusds.jose.crypto.ECDSASigner;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
-import com.rhkr8521.mapping.api.member.dto.AppleDTO;
+import com.rhkr8521.mapping.api.member.dto.AppleLoginDTO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.minidev.json.JSONObject;
@@ -54,7 +54,7 @@ public class AppleService {
     /**
      * Apple authorization code를 받아 토큰 교환 후 사용자 정보를 파싱
      */
-    public AppleDTO getAppleInfo(String code) throws Exception {
+    public AppleLoginDTO getAppleInfo(String code) throws Exception {
         if (code == null) throw new Exception("authorization code가 없습니다.");
 
         String clientSecret = createClientSecret();
@@ -101,7 +101,7 @@ public AppleDTO getAppleInfo(String code) throws Exception {
             throw new Exception("Apple API 호출 실패", e);
         }
 
-        return AppleDTO.builder()
+        return AppleLoginDTO.builder()
                 .id(userId)
                 .token(accessToken)
                 .email(email)

src/main/java/com/rhkr8521/mapping/api/member/service/MemberService.java

@@ -1,7 +1,7 @@
 package com.rhkr8521.mapping.api.member.service;
 
 import com.rhkr8521.mapping.api.aws.s3.S3Service;
-import com.rhkr8521.mapping.api.member.dto.AppleDTO;
+import com.rhkr8521.mapping.api.member.dto.AppleLoginDTO;
 import com.rhkr8521.mapping.api.member.dto.BlockedUserResponseDTO;
 import com.rhkr8521.mapping.api.member.dto.KakaoUserInfoDTO;
 import com.rhkr8521.mapping.api.member.dto.UserInfoResponseDTO;
@@ -33,6 +33,7 @@ public class MemberService {
     private final JwtService jwtService;
     private final OAuthService oAuthService;
     private final S3Service s3Service;
+    private final AppleService appleService;
     private final MemberBlockRepository memberBlockRepository;
 
     private static final List<String> FIRST_WORDS = Arrays.asList(
@@ -49,35 +50,6 @@ public class MemberService {
             "해파리", "코알라", "낙타", "아기돼지", "강치", "이구아나", "오징어", "문어", "갈매기", "오소리"
     );
 
-    @Transactional
-    public Member registerOrLoginAppleUser(AppleDTO appleUserInfo) {
-        Optional<Member> optionalMember = memberRepository.findBySocialId(appleUserInfo.getId());
-        if (optionalMember.isPresent()) {
-            Member member = optionalMember.get();
-            // 탈퇴한 회원인 경우 복구 처리
-            if (member.isDeleted()) {
-                member = member.toBuilder()
-                        .deleted(false)
-                        .deletedAt(null)
-                        .build();
-                memberRepository.save(member);
-            }
-            return member;
-        } else {
-            Member member = Member.builder()
-                    .socialId(appleUserInfo.getId())
-                    .email(appleUserInfo.getEmail() != null ? appleUserInfo.getEmail() : UUID.randomUUID() + "@socialUser.com")
-                    .nickname(generateRandomNickname())
-                    .imageUrl(null)
-                    .role(Role.USER)
-                    .deleted(false)
-                    .deletedAt(null)
-                    .build();
-            memberRepository.save(member);
-            return member;
-        }
-    }
-
     private static String generateRandomNickname() {
         Random random = new Random();
 
@@ -152,6 +124,59 @@ private Member registerNewKakaoUser(KakaoUserInfoDTO kakaoUserInfo) {
         return member;
     }
 
+    @Transactional
+    public Map<String, Object> loginWithApple(String code) {
+        if (code == null || code.isEmpty()) {
+            throw new BadRequestException(ErrorStatus.MISSING_APPLE_AUTHORIZATION_CODE_EXCEPTION.getMessage());
+        }
+        AppleLoginDTO appleInfo;
+        try {
+            appleInfo = appleService.getAppleInfo(code);
+        } catch (Exception e) {
+            throw new BadRequestException(ErrorStatus.FAIL_ACCESS_APPLE_OAUTH_SERVICE.getMessage() + e.getMessage());
+        }
+        // Apple 사용자 정보를 통한 회원가입 또는 로그인 처리
+        Member member = registerOrLoginAppleUser(appleInfo);
+        // JWT 토큰 발급
+        Map<String, String> tokens = jwtService.createAccessAndRefreshToken(member.getEmail());
+        Map<String, Object> response = new HashMap<>();
+        response.put("tokens", tokens);
+        response.put("role", member.getRole());
+        response.put("nickname", member.getNickname());
+        response.put("profileImage", member.getImageUrl());
+        return response;
+    }
+
+    // 애플 사용자 정보를 사용해 회원가입 또는 로그인 처리
+    @Transactional
+    public Member registerOrLoginAppleUser(AppleLoginDTO appleUserInfo) {
+        Optional<Member> optionalMember = memberRepository.findBySocialId(appleUserInfo.getId());
+        if (optionalMember.isPresent()) {
+            Member member = optionalMember.get();
+            // 탈퇴한 회원 복구 처리
+            if (member.isDeleted()) {
+                member = member.toBuilder()
+                        .deleted(false)
+                        .deletedAt(null)
+                        .build();
+                memberRepository.save(member);
+            }
+            return member;
+        } else {
+            Member member = Member.builder()
+                    .socialId(appleUserInfo.getId())
+                    .email(appleUserInfo.getEmail() != null ? appleUserInfo.getEmail() : UUID.randomUUID() + "@socialUser.com")
+                    .nickname(generateRandomNickname())
+                    .imageUrl(null)
+                    .role(Role.USER)
+                    .deleted(false)
+                    .deletedAt(null)
+                    .build();
+            memberRepository.save(member);
+            return member;
+        }
+    }
+
     @Transactional(readOnly = true)
     public Long getUserIdByEmail(String email) {
         Member member = memberRepository.findByEmail(email)

src/main/java/com/rhkr8521/mapping/common/response/ErrorStatus.java

@@ -32,6 +32,7 @@ public enum ErrorStatus {
     CANT_ACCESS_BLOCK_USER_MEMO_EXCEPTION(HttpStatus.BAD_REQUEST,"차단한 사용자의 메모는 조회할 수 없습니다."),
     ALREADY_BLOCK_USER_EXCEPTION(HttpStatus.BAD_REQUEST,"이미 차단한 사용자입니다."),
     NOT_BLOCK_USER_EXCEPTION(HttpStatus.BAD_REQUEST,"차단한 사용자가 아닙니다."),
+    MISSING_APPLE_AUTHORIZATION_CODE_EXCEPTION(HttpStatus.BAD_REQUEST,"Apple Authorization Code가 입력되지 않았습니다."),
 
     /**
      * 401 UNAUTHORIZED
@@ -57,6 +58,7 @@ public enum ErrorStatus {
     FAIL_UPLOAD_PROFILE_IMAGE(HttpStatus.INTERNAL_SERVER_ERROR, "프로필 사진이 변경되지 않았습니다."),
     FAIL_REQUEST_KAKAO_USER_INFO(HttpStatus.INTERNAL_SERVER_ERROR, "카카오 사용자 정보 요청 중 오류가 발생했습니다."),
     FAIL_PARSE_KAKAO_USER_INFO(HttpStatus.INTERNAL_SERVER_ERROR, "카카오 사용자 정보를 가져오지 못했습니다."),
+    FAIL_ACCESS_APPLE_OAUTH_SERVICE(HttpStatus.INTERNAL_SERVER_ERROR,"Apple 소셜 로그인 중 오류 발생:"),
     SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "서버 내부 오류"),
 
     ;