refactor: 에러 코드 변경 및 uri 분리 #214

bankidz · Sep 9, 2022 · ac9ffb0 · ac9ffb0
1 parent 49fab88
commit ac9ffb0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/com/ceos/bankids/constant/ErrorCode.java b/src/main/java/com/ceos/bankids/constant/ErrorCode.java
@@ -74,6 +74,7 @@ public enum ErrorCode implements EnumMapperType {
     APPLE_KEY_UNAVAILABLE("E400-80002"),
     APPLE_TOKEN_EXPIRED("E400-80003"),
     APPLE_NONCE_INCORRECT("E400-80004"),
+    APPLE_ACCESS_TOKEN_ERROR("E400-80005"),
 
     // S3
     PRESIGNEDURI_ERROR("E400-60001"),

diff --git a/src/main/java/com/ceos/bankids/controller/AppleController.java b/src/main/java/com/ceos/bankids/controller/AppleController.java
@@ -44,7 +44,7 @@ public void postAppleLogin(
         AppleSubjectDTO appleSubjectDTO = appleService.verifyIdentityToken(appleRequest,
             appleKeyListDTO);
 
-        AppleTokenDTO appleTokenDTO = appleService.getAppleAccessToken(appleRequest);
+        AppleTokenDTO appleTokenDTO = appleService.getAppleAccessToken(appleRequest, "login");
 
         LoginDTO loginDTO = userService.loginWithAppleAuthenticationCode(
             appleSubjectDTO.getAuthenticationCode(), appleRequest);
@@ -70,7 +70,7 @@ public void deleteAppleLogin(
         AppleSubjectDTO appleSubjectDTO = appleService.verifyIdentityToken(appleRequest,
             appleKeyListDTO);
 
-        AppleTokenDTO appleTokenDTO = appleService.getAppleAccessToken(appleRequest);
+        AppleTokenDTO appleTokenDTO = appleService.getAppleAccessToken(appleRequest, "revoke");
 
         Object appleResponse = appleService.revokeAppleAccount(appleTokenDTO);
 

diff --git a/src/main/java/com/ceos/bankids/service/AppleService.java b/src/main/java/com/ceos/bankids/service/AppleService.java
@@ -15,7 +15,7 @@ public interface AppleService {
     public AppleSubjectDTO verifyIdentityToken(AppleRequest appleRequest,
         AppleKeyListDTO appleKeyListDTO);
 
-    public AppleTokenDTO getAppleAccessToken(AppleRequest appleRequest);
+    public AppleTokenDTO getAppleAccessToken(AppleRequest appleRequest, String option);
 
     public Object revokeAppleAccount(AppleTokenDTO appleTokenDTO);
 

diff --git a/src/main/java/com/ceos/bankids/service/AppleServiceImpl.java b/src/main/java/com/ceos/bankids/service/AppleServiceImpl.java
@@ -140,13 +140,13 @@ public AppleSubjectDTO verifyIdentityToken(AppleRequest appleRequest,
     }
 
     @Override
-    public AppleTokenDTO getAppleAccessToken(AppleRequest appleRequest) {
+    public AppleTokenDTO getAppleAccessToken(AppleRequest appleRequest, String option) {
         APPLE_SECRET = makeClientSecret();
 
         String getTokenURL =
             "https://appleid.apple.com/auth/token?client_id=" + APPLE_CLIENT_ID + "&client_secret="
                 + APPLE_SECRET + "&grant_type=authorization_code&code=" + appleRequest.getCode()
-                + "&redirect_uri=" + APPLE_URI;
+                + "&redirect_uri=" + APPLE_URI + option;
 
         WebClient.ResponseSpec responseSpec = webClient.post().uri(getTokenURL).retrieve();
 
@@ -155,7 +155,7 @@ public AppleTokenDTO getAppleAccessToken(AppleRequest appleRequest) {
             return appleTokenDTO;
         } catch (Exception e) {
             e.printStackTrace();
-            throw new BadRequestException(ErrorCode.APPLE_BAD_REQUEST.getErrorCode());
+            throw new BadRequestException(ErrorCode.APPLE_ACCESS_TOKEN_ERROR.getErrorCode());
         }
     }