#57 [MERGE] merge kakao callback redirectUrl 변경 적용

TEAM-TATTOUR · Aug 9, 2023 · 99b364a · 99b364a
2 parents 487523b + d4976a9
commit 99b364a
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 33 deletions.
diff --git a/server/src/main/java/org/tattour/server/domain/sticker/service/StickerServiceImpl.java b/server/src/main/java/org/tattour/server/domain/sticker/service/StickerServiceImpl.java
@@ -219,8 +219,10 @@ private void sortStickerListByStickerSort(List<Sticker> stickers, StickerSort so
 				break;
 			case PRICE_HIGH:
 				Collections.sort(stickers, (o1, o2) -> o2.getPrice() - o1.getPrice());
+				break;
 			case PRICE_LOW:
 				Collections.sort(stickers, (o1, o2) -> o1.getPrice() - o2.getPrice());
+				break;
 		}
 	}
 }
diff --git a/server/src/main/java/org/tattour/server/domain/user/controller/UserController.java b/server/src/main/java/org/tattour/server/domain/user/controller/UserController.java
@@ -8,6 +8,7 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
@@ -85,10 +86,11 @@ public class UserController {
     @PostMapping("/signup")
     public ResponseEntity<?> signup(
             @Parameter(description = "Authentication Code", required = true) @RequestHeader("code") String code,
-            @RequestBody @Valid PostLoginReq req) {
+            @RequestBody @Valid PostLoginReq req,
+            HttpServletRequest request) {
 
         return BaseResponse.success(SuccessType.LOGIN_SUCCESS,
-                userFacade.signup(CreateLoginReq.of(req.getSocialPlatform(), code)));
+                userFacade.signup(CreateLoginReq.of(req.getSocialPlatform(), code, request.getHeader("referer"))));
     }
 
 
@@ -428,4 +430,4 @@ public ResponseEntity<?> getOneUserCustomInfo(
         CustomInfo response = CustomInfo.of(custom);
         return BaseResponse.success(SuccessType.READ_ONE_CUSTOM_SUCCESS, response);
     }
-}
+}
diff --git a/server/src/main/java/org/tattour/server/domain/user/facade/dto/request/CreateLoginReq.java b/server/src/main/java/org/tattour/server/domain/user/facade/dto/request/CreateLoginReq.java
@@ -12,8 +12,10 @@
 public class CreateLoginReq {
     private SocialPlatform socialPlatform;
     private String code;
+    // TODO : prod에서는 수정해야함
+    private String referer;
 
-    public static CreateLoginReq of(SocialPlatform socialPlatform, String code) {
-        return new CreateLoginReq(socialPlatform, code);
+    public static CreateLoginReq of(SocialPlatform socialPlatform, String code, String referer) {
+        return new CreateLoginReq(socialPlatform, code, referer);
     }
 }
diff --git a/server/src/main/java/org/tattour/server/domain/user/facade/impl/UserFacadeImpl.java b/server/src/main/java/org/tattour/server/domain/user/facade/impl/UserFacadeImpl.java
@@ -47,13 +47,13 @@ public class UserFacadeImpl implements UserFacade {
 
     @Override
     public PostLoginRes signup(CreateLoginReq req) {
-        SocialService socialService = socialServiceProvider.getSocialService(
-                req.getSocialPlatform());
+        SocialService socialService = socialServiceProvider
+                .getSocialService(req.getSocialPlatform());
 
         // 로그인
         KakaoLoginInfo kakaoLoginInfo =
                 (KakaoLoginInfo) socialService.getSocialLoginResponse(
-                        GetSocialLoginReq.of(req.getCode()));
+                        GetSocialLoginReq.of(req.getCode(), req.getReferer()));
 
         // 중복 확인
         boolean isUserExist = userProvider.checkDuplicationByKakaoId(

diff --git a/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/KakaoApiClient.java b/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/KakaoApiClient.java
@@ -4,7 +4,7 @@
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
-import org.tattour.server.infra.socialLogin.client.kakao.dto.response.KakaoUserInfoRes;
+import org.tattour.server.infra.socialLogin.client.kakao.service.dto.request.response.KakaoUserInfoRes;
 
 @FeignClient(name = "kakaoApiClient", url = "https://kapi.kakao.com")
 public interface KakaoApiClient {

diff --git a/...r/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/KakaoAuthApiClient.java b/...r/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/KakaoAuthApiClient.java
@@ -4,7 +4,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.tattour.server.infra.socialLogin.client.kakao.dto.response.KakaoAccessTokenRes;
+import org.tattour.server.infra.socialLogin.client.kakao.service.dto.request.response.KakaoAccessTokenRes;
 
 @FeignClient(name = "kakaoAuthApiClient", url = "https://kauth.kakao.com")
 public interface KakaoAuthApiClient {

diff --git a/.../tattour/server/infra/socialLogin/client/kakao/service/dto/request/GetSocialLoginReq.java b/.../tattour/server/infra/socialLogin/client/kakao/service/dto/request/GetSocialLoginReq.java
@@ -9,8 +9,10 @@
 public class GetSocialLoginReq {
 
     private String code;
+    // TODO : prod에서는 수정해야함
+    private String referer;
 
-    public static GetSocialLoginReq of(String code) {
-        return new GetSocialLoginReq(code);
+    public static GetSocialLoginReq of(String code, String referer) {
+        return new GetSocialLoginReq(code, referer);
     }
 }
diff --git a/...kao/dto/response/KakaoAccessTokenRes.java → ...request/response/KakaoAccessTokenRes.java b/...kao/dto/response/KakaoAccessTokenRes.java → ...request/response/KakaoAccessTokenRes.java
@@ -1,11 +1,7 @@
-package org.tattour.server.infra.socialLogin.client.kakao.dto.response;
+package org.tattour.server.infra.socialLogin.client.kakao.service.dto.request.response;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 @ToString

diff --git a/...ient/kakao/dto/response/KakaoAccount.java → ...ce/dto/request/response/KakaoAccount.java b/...ient/kakao/dto/response/KakaoAccount.java → ...ce/dto/request/response/KakaoAccount.java
@@ -1,4 +1,4 @@
-package org.tattour.server.infra.socialLogin.client.kakao.dto.response;
+package org.tattour.server.infra.socialLogin.client.kakao.service.dto.request.response;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;

diff --git a/.../kakao/dto/response/KakaoUserInfoRes.java → ...to/request/response/KakaoUserInfoRes.java b/.../kakao/dto/response/KakaoUserInfoRes.java → ...to/request/response/KakaoUserInfoRes.java
@@ -1,13 +1,8 @@
-package org.tattour.server.infra.socialLogin.client.kakao.dto.response;
+package org.tattour.server.infra.socialLogin.client.kakao.service.dto.request.response;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.tattour.server.infra.socialLogin.client.kakao.service.vo.SocialLoginInfo;
 
 @ToString
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)

diff --git a/...ao/dto/response/SocialAccessTokenRes.java → ...equest/response/SocialAccessTokenRes.java b/...ao/dto/response/SocialAccessTokenRes.java → ...equest/response/SocialAccessTokenRes.java
@@ -1,4 +1,4 @@
-package org.tattour.server.infra.socialLogin.client.kakao.dto.response;
+package org.tattour.server.infra.socialLogin.client.kakao.service.dto.request.response;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

diff --git a/...kakao/dto/response/SocialUserInfoRes.java → ...o/request/response/SocialUserInfoRes.java b/...kakao/dto/response/SocialUserInfoRes.java → ...o/request/response/SocialUserInfoRes.java
@@ -1,4 +1,4 @@
-package org.tattour.server.infra.socialLogin.client.kakao.dto.response;
+package org.tattour.server.infra.socialLogin.client.kakao.service.dto.request.response;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

diff --git a/...va/org/tattour/server/infra/socialLogin/client/kakao/service/impl/KakaoSocialService.java b/...va/org/tattour/server/infra/socialLogin/client/kakao/service/impl/KakaoSocialService.java
@@ -5,8 +5,8 @@
 import org.springframework.stereotype.Service;
 import org.tattour.server.infra.socialLogin.client.kakao.KakaoApiClient;
 import org.tattour.server.infra.socialLogin.client.kakao.KakaoAuthApiClient;
-import org.tattour.server.infra.socialLogin.client.kakao.dto.response.KakaoAccessTokenRes;
-import org.tattour.server.infra.socialLogin.client.kakao.dto.response.KakaoUserInfoRes;
+import org.tattour.server.infra.socialLogin.client.kakao.service.dto.request.response.KakaoAccessTokenRes;
+import org.tattour.server.infra.socialLogin.client.kakao.service.dto.request.response.KakaoUserInfoRes;
 import org.tattour.server.infra.socialLogin.client.kakao.service.SocialService;
 import org.tattour.server.infra.socialLogin.client.kakao.service.dto.request.GetSocialLoginReq;
 import org.tattour.server.domain.user.provider.impl.UserProviderImpl;
@@ -27,11 +27,17 @@ public class KakaoSocialService extends SocialService {
 
     @Override
     public KakaoLoginInfo getSocialLoginResponse(GetSocialLoginReq req) {
+        // TODO : prod에서는 수정해야함
+        // 요청자의 redirect url로 변경
+        String redirectUrl = req.getReferer() + "login/oauth2/callback";
+
         // Authorization code로 Access Token 불러오기
         KakaoAccessTokenRes tokenResponse = kakaoAuthApiClient.getOAuth2AccessToken(
                 "authorization_code",
                 clientId,
-                "http://localhost:5173/login/oauth2/callback",
+                redirectUrl,
+//                "https://tattour.kr/login/oauth2/callback",
+//                "http://localhost:5173/login/oauth2/callback",
                 req.getCode()
         );
 

diff --git a/...ain/java/org/tattour/server/infra/socialLogin/client/kakao/service/vo/KakaoLoginInfo.java b/...ain/java/org/tattour/server/infra/socialLogin/client/kakao/service/vo/KakaoLoginInfo.java
@@ -1,8 +1,8 @@
 package org.tattour.server.infra.socialLogin.client.kakao.service.vo;
 
 import lombok.Getter;
-import org.tattour.server.infra.socialLogin.client.kakao.dto.response.KakaoAccessTokenRes;
-import org.tattour.server.infra.socialLogin.client.kakao.dto.response.KakaoUserInfoRes;
+import org.tattour.server.infra.socialLogin.client.kakao.service.dto.request.response.KakaoAccessTokenRes;
+import org.tattour.server.infra.socialLogin.client.kakao.service.dto.request.response.KakaoUserInfoRes;
 
 @Getter
 public class KakaoLoginInfo extends SocialLoginInfo {

diff --git a/...in/java/org/tattour/server/infra/socialLogin/client/kakao/service/vo/SocialLoginInfo.java b/...in/java/org/tattour/server/infra/socialLogin/client/kakao/service/vo/SocialLoginInfo.java
@@ -4,8 +4,8 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.tattour.server.infra.socialLogin.client.kakao.dto.response.SocialAccessTokenRes;
-import org.tattour.server.infra.socialLogin.client.kakao.dto.response.SocialUserInfoRes;
+import org.tattour.server.infra.socialLogin.client.kakao.service.dto.request.response.SocialAccessTokenRes;
+import org.tattour.server.infra.socialLogin.client.kakao.service.dto.request.response.SocialUserInfoRes;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)