[merge] Validation 적용 - #107

TeamDATEROAD · Jul 16, 2024 · 1f865d8 · 1f865d8
2 parents 4cf7462 + 937c640
commit 1f865d8
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 61 deletions.
diff --git a/dateroad-api/src/main/java/org/dateroad/user/service/AuthService.java b/dateroad-api/src/main/java/org/dateroad/user/service/AuthService.java
@@ -157,15 +157,15 @@ private User getUserByUserId(final long userId) {
     }
 
     //태그 리스트 사이즈 검증
-    private void validateUserTagSize(final List<DateTagType> userTags) {
+    public void validateUserTagSize(final List<DateTagType> userTags) {
         if (userTags.isEmpty() || userTags.size() > 3) {
             throw new InvalidValueException((FailureCode.WRONG_USER_TAG_SIZE));
         }
     }
 
     private RefreshToken getRefreshTokenByToken(final String refreshToken) {
         try {
-            return refreshTokenRepository.findByToken(refreshToken)
+            return refreshTokenRepository.findRefreshTokenByToken(refreshToken)
                     .orElseThrow(() -> new UnauthorizedException(FailureCode.UNAUTHORIZED));
         } catch (IllegalArgumentException e) {
             log.error(e.getMessage());

diff --git a/dateroad-api/src/main/java/org/dateroad/user/service/UserService.java b/dateroad-api/src/main/java/org/dateroad/user/service/UserService.java
@@ -26,6 +26,7 @@
 @RequiredArgsConstructor
 public class UserService {
 
+    private final AuthService authService;
     @Value("${aws-property.s3-bucket-name}")
     private String path;
 
@@ -59,6 +60,7 @@ public void editUserProfile(final Long userId,
 
         //tag 변경
         userTagRepository.deleteAllByUserId(foundUser.getId());
+        authService.validateUserTagSize(tags);
         saveUserTag(foundUser, tags);
 
         //이미지 변경

diff --git a/...oad-domain/src/main/java/org/dateroad/refreshtoken/repository/RefreshTokenRepository.java b/...oad-domain/src/main/java/org/dateroad/refreshtoken/repository/RefreshTokenRepository.java
@@ -7,7 +7,7 @@
 
 public interface RefreshTokenRepository extends JpaRepository<RefreshToken, String> {
 
-    Optional<RefreshToken> findByToken(String token);
+    Optional<RefreshToken> findRefreshTokenByToken(String token);
 
     void deleteRefreshTokenByUserId(final Long userId);
 }
diff --git a/dateroad-external/src/main/java/org/dateroad/feign/apple/AppleFeignProvider.java b/dateroad-external/src/main/java/org/dateroad/feign/apple/AppleFeignProvider.java
@@ -22,6 +22,7 @@ public class AppleFeignProvider {
     private final AppleClientSecretGenerator appleClientSecretGenerator;
     private final AppleProperties appleProperties;
 
+    //AuthService에서 호출
     public String getApplePlatformUserId(final String identityToken) {
         Map<String, String> tokenHeaders = appleIdentityJWTParser.parseHeader(identityToken);
         ApplePublicKeys applePublicKey = appleFeignApi.getApplePublicKeys();

diff --git a/dateroad-external/src/main/java/org/dateroad/feign/apple/AppleIdentityJWTParser.java b/dateroad-external/src/main/java/org/dateroad/feign/apple/AppleIdentityJWTParser.java
@@ -19,12 +19,13 @@
 public class AppleIdentityJWTParser {
     private final ObjectMapper objectMapper;
     private static final int HEADER_INDEX = 0;
+    private static final String SPLIYBY = "\\.";
 
     public Map<String, String> parseHeader(final String identityToken) {
         try {
 
             //헤더, 페이로드, 서명에서 첫 인덱스인 헤더를 가져옴
-            String encodedHeader = identityToken.split("\\.")[HEADER_INDEX];
+            String encodedHeader = identityToken.split(SPLIYBY)[HEADER_INDEX];
             String decodedHeader = new String(Base64.getUrlDecoder().decode(encodedHeader), StandardCharsets.UTF_8);
             return objectMapper.readValue(decodedHeader, Map.class);
         } catch (JsonProcessingException | ArrayIndexOutOfBoundsException e) {

diff --git a/dateroad-external/src/main/java/org/dateroad/feign/kakao/KakaoFeignProvider.java b/dateroad-external/src/main/java/org/dateroad/feign/kakao/KakaoFeignProvider.java
@@ -20,7 +20,7 @@ public class KakaoFeignProvider {
     private final KakaoFeignApi kakaoFeignApi;
     private final ObjectMapper objectMapper;
 
-    private final String TARGETIDTYPE = "user_id";
+    private static final  String TARGETIDTYPE = "user_id";
 
     //AuthService에서 호출 : 카카오에서 주는 userId 받아오기
     public String getKakaoPlatformUserId(final String kakaoAccessToken) {
@@ -31,7 +31,7 @@ public String getKakaoPlatformUserId(final String kakaoAccessToken) {
 
     //AuthService에서 호출 : 회원탈퇴 할 때, 카카오톡과 연결 끊기
     public void unLinkWithKakao(final String kakaoPlatformUserId) {
-        String kakaoRequestHeader = getKakaoRequestHeader(KakaoRequestType.UN_LINK, kakaoPlatformUserId);
+        String kakaoRequestHeader = getKakaoRequestHeader(KakaoRequestType.UN_LINK, null);
         try {
             kakaoFeignApi.unlink(kakaoRequestHeader, TARGETIDTYPE, Long.valueOf(kakaoPlatformUserId));
         } catch (FeignException e) {

diff --git a/dateroad-external/src/main/java/org/dateroad/feign/kakao/KakaoPlatformUserIdProvider.java b/dateroad-external/src/main/java/org/dateroad/feign/kakao/KakaoPlatformUserIdProvider.java