From d58e7deaa7e3a1ca23dde48255fa6ece374723c5 Mon Sep 17 00:00:00 2001
From: eojinsarang joo <wndjwlstkfkd@naver.com>
Date: Mon, 2 Jan 2023 00:10:30 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20login=20=EB=8B=A4=EC=A4=91=EA=B8=B0?=
 =?UTF-8?q?=EA=B8=B0=20=EC=A3=BC=EC=84=9D=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ceos/bankids/mapper/AppleMapper.java  | 21 +++++++++----------
 .../com/ceos/bankids/mapper/KakaoMapper.java  | 16 +++++++-------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/ceos/bankids/mapper/AppleMapper.java b/src/main/java/com/ceos/bankids/mapper/AppleMapper.java
index bdfcbe0..a9b54bf 100644
--- a/src/main/java/com/ceos/bankids/mapper/AppleMapper.java
+++ b/src/main/java/com/ceos/bankids/mapper/AppleMapper.java
@@ -1,6 +1,5 @@
 package com.ceos.bankids.mapper;
 
-import com.ceos.bankids.constant.ErrorCode;
 import com.ceos.bankids.controller.request.AppleRequest;
 import com.ceos.bankids.domain.User;
 import com.ceos.bankids.dto.oauth.AppleKeyListDTO;
@@ -31,36 +30,36 @@ public User postAppleLogin(MultiValueMap<String, String> formData) throws BadReq
         AppleRequest appleRequest = appleService.getAppleRequest(formData);
         AppleKeyListDTO appleKeyListDTO = appleService.getAppleIdentityToken();
         AppleSubjectDTO appleSubjectDTO = appleService.verifyIdentityToken(appleRequest,
-            appleKeyListDTO);
+                appleKeyListDTO);
         AppleTokenDTO appleTokenDTO = appleService.getAppleAccessToken(appleRequest, "login");
 
         Optional<User> registeredUser = userService.findUserByAuthenticationCodeNullable(
-            appleSubjectDTO.getAuthenticationCode());
+                appleSubjectDTO.getAuthenticationCode());
 
         User user;
         if (registeredUser.isPresent()) {
             user = registeredUser.get();
 
-            if (user.getExpoToken() != null && user.getExpoToken().contains("ExponentPushToken")) {
-                throw new BadRequestException(ErrorCode.USER_ALREADY_LOGINED.getErrorCode());
-            }
+//            if (user.getExpoToken() != null && user.getExpoToken().contains("ExponentPushToken")) {
+//                throw new BadRequestException(ErrorCode.USER_ALREADY_LOGINED.getErrorCode());
+//            }
         } else {
             user = userService.createNewUser(
-                appleRequest.getUsername(),
-                appleSubjectDTO.getAuthenticationCode(),
-                "apple");
+                    appleRequest.getUsername(),
+                    appleSubjectDTO.getAuthenticationCode(),
+                    "apple");
         }
 
         return user;
     }
 
     public void postAppleRevoke(MultiValueMap<String, String> formData,
-        HttpServletResponse response) throws IOException {
+            HttpServletResponse response) throws IOException {
         try {
             AppleRequest appleRequest = appleService.getAppleRequest(formData);
             AppleKeyListDTO appleKeyListDTO = appleService.getAppleIdentityToken();
             AppleSubjectDTO appleSubjectDTO = appleService.verifyIdentityToken(appleRequest,
-                appleKeyListDTO);
+                    appleKeyListDTO);
             AppleTokenDTO appleTokenDTO = appleService.getAppleAccessToken(appleRequest, "revoke");
             Object appleResponse = appleService.revokeAppleAccount(appleTokenDTO);
 
diff --git a/src/main/java/com/ceos/bankids/mapper/KakaoMapper.java b/src/main/java/com/ceos/bankids/mapper/KakaoMapper.java
index 146fb00..e559714 100644
--- a/src/main/java/com/ceos/bankids/mapper/KakaoMapper.java
+++ b/src/main/java/com/ceos/bankids/mapper/KakaoMapper.java
@@ -1,11 +1,9 @@
 package com.ceos.bankids.mapper;
 
-import com.ceos.bankids.constant.ErrorCode;
 import com.ceos.bankids.controller.request.KakaoRequest;
 import com.ceos.bankids.domain.User;
 import com.ceos.bankids.dto.oauth.KakaoTokenDTO;
 import com.ceos.bankids.dto.oauth.KakaoUserDTO;
-import com.ceos.bankids.exception.BadRequestException;
 import com.ceos.bankids.service.KakaoServiceImpl;
 import com.ceos.bankids.service.UserServiceImpl;
 import java.util.Optional;
@@ -29,20 +27,20 @@ public User postKakaoLogin(KakaoRequest kakaoRequest) {
         KakaoUserDTO kakaoUserDTO = kakaoService.getKakaoUserCode(kakaoTokenDTO);
 
         Optional<User> registeredUser = userService.findUserByAuthenticationCodeNullable(
-            kakaoUserDTO.getAuthenticationCode());
+                kakaoUserDTO.getAuthenticationCode());
 
         User user;
         if (registeredUser.isPresent()) {
             user = registeredUser.get();
 
-            if (user.getExpoToken() != null && user.getExpoToken().contains("ExponentPushToken")) {
-                throw new BadRequestException(ErrorCode.USER_ALREADY_LOGINED.getErrorCode());
-            }
+//            if (user.getExpoToken() != null && user.getExpoToken().contains("ExponentPushToken")) {
+//                throw new BadRequestException(ErrorCode.USER_ALREADY_LOGINED.getErrorCode());
+//            }
         } else {
             user = userService.createNewUser(
-                kakaoUserDTO.getKakaoAccount().getProfile().getNickname(),
-                kakaoUserDTO.getAuthenticationCode(),
-                "kakao");
+                    kakaoUserDTO.getKakaoAccount().getProfile().getNickname(),
+                    kakaoUserDTO.getAuthenticationCode(),
+                    "kakao");
         }
 
         return user;