Merge pull request #144 from Nexters/feature/140

common 패키지 Global 패키지로 분리 및 예외처리 플로우 재설계
Nexters · Aug 21, 2023 · e397d3a · e397d3a
2 parents 5c91029 + c708c7e
commit e397d3a
Show file tree

Hide file tree

Showing 226 changed files with 1,154 additions and 1,077 deletions.
diff --git a/src/main/java/com/nexters/keyme/auth/application/AuthService.java b/src/main/java/com/nexters/keyme/auth/application/AuthService.java
diff --git a/src/main/java/com/nexters/keyme/clienttest/application/ClientTestService.java b/src/main/java/com/nexters/keyme/clienttest/application/ClientTestService.java
diff --git a/src/main/java/com/nexters/keyme/clienttest/presentation/controller/ClientTestController.java b/src/main/java/com/nexters/keyme/clienttest/presentation/controller/ClientTestController.java
diff --git a/src/main/java/com/nexters/keyme/common/exceptions/AccessDeniedException.java b/src/main/java/com/nexters/keyme/common/exceptions/AccessDeniedException.java
diff --git a/src/main/java/com/nexters/keyme/common/exceptions/AuthenticationFailedException.java b/src/main/java/com/nexters/keyme/common/exceptions/AuthenticationFailedException.java
diff --git a/src/main/java/com/nexters/keyme/common/exceptions/InvalidRequestException.java b/src/main/java/com/nexters/keyme/common/exceptions/InvalidRequestException.java
diff --git a/src/main/java/com/nexters/keyme/common/exceptions/ResourceAlreadyExistsException.java b/src/main/java/com/nexters/keyme/common/exceptions/ResourceAlreadyExistsException.java
diff --git a/src/main/java/com/nexters/keyme/common/exceptions/ResourceNotFoundException.java b/src/main/java/com/nexters/keyme/common/exceptions/ResourceNotFoundException.java
diff --git a/src/main/java/com/nexters/keyme/common/exceptions/errorcode/ErrorCode.java b/src/main/java/com/nexters/keyme/common/exceptions/errorcode/ErrorCode.java
diff --git a/src/main/java/com/nexters/keyme/common/exceptions/handler/GlobalExceptionHandler.java b/src/main/java/com/nexters/keyme/common/exceptions/handler/GlobalExceptionHandler.java
diff --git a/src/main/java/com/nexters/keyme/domain/auth/application/AuthService.java b/src/main/java/com/nexters/keyme/domain/auth/application/AuthService.java
@@ -0,0 +1,9 @@
+package com.nexters.keyme.domain.auth.application;
+
+
+import com.nexters.keyme.domain.auth.presentation.dto.request.LoginRequest;
+import com.nexters.keyme.domain.member.presentation.dto.response.MemberWithTokenResponse;
+
+public interface AuthService {
+    MemberWithTokenResponse getMemberWithToken(LoginRequest request);
+}
diff --git a/...yme/auth/application/AuthServiceImpl.java → ...ain/auth/application/AuthServiceImpl.java b/...yme/auth/application/AuthServiceImpl.java → ...ain/auth/application/AuthServiceImpl.java
@@ -1,20 +1,21 @@
-package com.nexters.keyme.auth.application;
+package com.nexters.keyme.domain.auth.application;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.nexters.keyme.auth.domain.client.AppleClient;
-import com.nexters.keyme.auth.domain.client.KakaoClient;
-import com.nexters.keyme.auth.domain.internaldto.AppleJwtBodyInfo;
-import com.nexters.keyme.auth.domain.internaldto.OAuthUserInfo;
-import com.nexters.keyme.auth.presentation.dto.request.LoginRequest;
-import com.nexters.keyme.auth.presentation.dto.response.AppleAuthKeysResponse;
-import com.nexters.keyme.auth.presentation.dto.response.KakaoUserInfoResponse;
-import com.nexters.keyme.auth.presentation.dto.response.TokenResponse;
-import com.nexters.keyme.auth.domain.helper.ApplePublicKeyProvider;
-import com.nexters.keyme.common.util.JwtTokenProvider;
-import com.nexters.keyme.common.enums.OAuthType;
-import com.nexters.keyme.member.application.MemberService;
-import com.nexters.keyme.member.presentation.dto.response.MemberWithTokenResponse;
+import com.nexters.keyme.domain.auth.domain.client.AppleClient;
+import com.nexters.keyme.domain.auth.domain.client.KakaoClient;
+import com.nexters.keyme.domain.auth.domain.exceptions.InvalidAppleTokenException;
+import com.nexters.keyme.domain.auth.domain.internaldto.AppleJwtBodyInfo;
+import com.nexters.keyme.domain.auth.domain.internaldto.OAuthUserInfo;
+import com.nexters.keyme.domain.auth.presentation.dto.request.LoginRequest;
+import com.nexters.keyme.domain.auth.presentation.dto.response.AppleAuthKeysResponse;
+import com.nexters.keyme.domain.auth.presentation.dto.response.KakaoUserInfoResponse;
+import com.nexters.keyme.domain.auth.presentation.dto.response.TokenResponse;
+import com.nexters.keyme.domain.auth.domain.helper.ApplePublicKeyProvider;
+import com.nexters.keyme.global.util.JwtTokenProvider;
+import com.nexters.keyme.global.enums.OAuthType;
+import com.nexters.keyme.domain.member.application.MemberService;
+import com.nexters.keyme.domain.member.presentation.dto.response.MemberWithTokenResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -49,8 +50,6 @@ public MemberWithTokenResponse getMemberWithToken(LoginRequest request) {
         TokenResponse tokenObject = new TokenResponse(jwtToken);
         memberResponse.setToken(tokenObject);
 
-        // refresh 토큰정책 있으면 member에 저장
-
         return memberResponse;
     }
 
@@ -60,18 +59,20 @@ private OAuthUserInfo getOAuthInfoOfApple(String identityToken) {
         PublicKey key = applePublicKeyProvider.getPublicKey(jwtHeaderString, authKeys);
         Boolean isVerified  = jwtTokenProvider.verifyToken(identityToken, key);
 
-        if (!isVerified) { throw new RuntimeException(); }
+        if (!isVerified) {
+            throw new InvalidAppleTokenException();
+        }
 
+        String jwtBodyString = jwtTokenProvider.extractJwtBodyString(identityToken);
         try {
-            String jwtBodyString = jwtTokenProvider.extractJwtBodyString(identityToken);
             AppleJwtBodyInfo jwtBody = objectMapper.readValue(jwtBodyString, AppleJwtBodyInfo.class);
 
             return OAuthUserInfo.builder()
                     .id(jwtBody.getSub())
                     .oauthType(OAuthType.APPLE)
                     .build();
         } catch(JsonProcessingException e) {
-            throw new RuntimeException();
+            throw new InvalidAppleTokenException();
         }
     }
 

diff --git a/...keyme/auth/domain/client/AppleClient.java → ...omain/auth/domain/client/AppleClient.java b/...keyme/auth/domain/client/AppleClient.java → ...omain/auth/domain/client/AppleClient.java
@@ -1,6 +1,6 @@
-package com.nexters.keyme.auth.domain.client;
+package com.nexters.keyme.domain.auth.domain.client;
 
-import com.nexters.keyme.auth.presentation.dto.response.AppleAuthKeysResponse;
+import com.nexters.keyme.domain.auth.presentation.dto.response.AppleAuthKeysResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 

diff --git a/...keyme/auth/domain/client/KakaoClient.java → ...omain/auth/domain/client/KakaoClient.java b/...keyme/auth/domain/client/KakaoClient.java → ...omain/auth/domain/client/KakaoClient.java
@@ -1,6 +1,6 @@
-package com.nexters.keyme.auth.domain.client;
+package com.nexters.keyme.domain.auth.domain.client;
 
-import com.nexters.keyme.auth.presentation.dto.response.KakaoUserInfoResponse;
+import com.nexters.keyme.domain.auth.presentation.dto.response.KakaoUserInfoResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;

diff --git a/src/main/java/com/nexters/keyme/domain/auth/domain/exceptions/InvalidAppleKeyException.java b/src/main/java/com/nexters/keyme/domain/auth/domain/exceptions/InvalidAppleKeyException.java
@@ -0,0 +1,10 @@
+package com.nexters.keyme.domain.auth.domain.exceptions;
+
+import com.nexters.keyme.domain.auth.domain.exceptions.code.AuthErrorCode;
+import com.nexters.keyme.global.exceptions.KeymeBadRequestException;
+
+public class InvalidAppleKeyException extends KeymeBadRequestException {
+    public InvalidAppleKeyException() {
+        super(AuthErrorCode.INVALID_APPLE_KEY.getMessage(), AuthErrorCode.INVALID_APPLE_KEY.getCode());
+    }
+}
diff --git a/...main/java/com/nexters/keyme/domain/auth/domain/exceptions/InvalidAppleTokenException.java b/...main/java/com/nexters/keyme/domain/auth/domain/exceptions/InvalidAppleTokenException.java
@@ -0,0 +1,11 @@
+package com.nexters.keyme.domain.auth.domain.exceptions;
+
+import com.nexters.keyme.domain.auth.domain.exceptions.code.AuthErrorCode;
+import com.nexters.keyme.global.exceptions.KeymeBadRequestException;
+import org.springframework.http.HttpStatus;
+
+public class InvalidAppleTokenException extends KeymeBadRequestException {
+    public InvalidAppleTokenException() {
+        super(AuthErrorCode.INVALID_APPLE_TOKEN.getMessage(), AuthErrorCode.INVALID_APPLE_TOKEN.getCode());
+    }
+}
diff --git a/src/main/java/com/nexters/keyme/domain/auth/domain/exceptions/code/AuthErrorCode.java b/src/main/java/com/nexters/keyme/domain/auth/domain/exceptions/code/AuthErrorCode.java
@@ -0,0 +1,15 @@
+package com.nexters.keyme.domain.auth.domain.exceptions.code;
+
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum AuthErrorCode {
+    INVALID_APPLE_TOKEN(400, "잘못된 IdentityToken 입니다."),
+    INVALID_APPLE_KEY(400, "IdentityToken 검증에 실패하였습니다.");
+
+    private final int code;
+    private final String message;
+}