Merge pull request #216 from Juinjang/fix/#199

fix(#199) : 애플 에러처리 수정
Juinjang · Sep 2, 2024 · 34c50dc · 34c50dc
2 parents da26f09 + 0ae0701
commit 34c50dc
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/umc/th/juinjang/service/auth/OAuthService.java b/src/main/java/umc/th/juinjang/service/auth/OAuthService.java
@@ -216,7 +216,7 @@ public LoginResponseDto appleLogin(AppleLoginRequestDto appleLoginRequest) {
         if(findSub.isEmpty() && findEmail.isPresent() && findEmail.get().getProvider().equals(MemberProvider.KAKAO)) {  // 이미 회원가입했지만 Apple 아닌 다른 소셜 로그인 사용
             throw new MemberHandler(MEMBER_NOT_FOUND_IN_APPLE);
         } else if(findSub.isPresent() && findEmail.isPresent()) {  // 재로그인
-            if(!member.getProvider().equals(MemberProvider.APPLE)) {  // 이미 회원가입했지만 apple이 아닌 다른 소셜 로그인 사용
+            if(!findEmail.get().getProvider().equals(MemberProvider.APPLE)) {  // 이미 회원가입했지만 apple이 아닌 다른 소셜 로그인 사용
                 throw new MemberHandler(MEMBER_NOT_FOUND_IN_APPLE);
             } else if(findSub.get().getMemberId() != findEmail.get().getMemberId()) {
                 throw new MemberHandler(FAILED_TO_LOGIN);
@@ -255,9 +255,9 @@ public LoginResponseDto appleSignUp(AppleSignUpRequestDto appleSignUpRequestDto)
 
         Member member = null;
         if(findSub.isPresent() && findEmail.isPresent() && (findSub.get().getMemberId() == findEmail.get().getMemberId())
-                && member.getProvider().equals(MemberProvider.APPLE)) {  // 이미 회원가입한 회원인 경우 -> 에러 발생
+                && findSub.get().getProvider().equals(MemberProvider.APPLE)) {  // 이미 회원가입한 회원인 경우 -> 에러 발생
             throw new MemberHandler(ALREADY_MEMBER);
-        } else if(!findSub.isPresent() && findEmail.isPresent() && member.getProvider().equals(MemberProvider.KAKAO)){
+        } else if(!findSub.isPresent() && findEmail.isPresent() && findEmail.get().getProvider().equals(MemberProvider.KAKAO)){
             throw new MemberHandler(MEMBER_NOT_FOUND_IN_APPLE);
         }else if(!findSub.isPresent() && !findEmail.isPresent()) {
             member = memberRepository.save(