From c5e6c68519c3a301c13839492483c3e95ad3355b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=B0=AC=EB=AF=B8?= Date: Sat, 22 Jul 2023 10:17:24 +0900 Subject: [PATCH 1/4] Update KakaoSocialService.java --- .../client/kakao/service/impl/KakaoSocialService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/service/impl/KakaoSocialService.java b/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/service/impl/KakaoSocialService.java index 14075543..3d1e4383 100644 --- a/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/service/impl/KakaoSocialService.java +++ b/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/service/impl/KakaoSocialService.java @@ -37,8 +37,9 @@ public SocialLoginResponse login(SocialLoginRequest req) { KakaoAccessTokenResponse tokenResponse = kakaoAuthApiClient.getOAuth2AccessToken( "authorization_code", clientId, - "http://localhost:5173/login/oauth2/callback", -// "http://localhost:8080/kakao/callback", + "https://tattour.kr/kakao/callback", + // "http://localhost:5173/login/oauth2/callback", + // "http://localhost:8080/kakao/callback", req.getCode() ); @@ -72,4 +73,4 @@ public SocialLoginResponse login(SocialLoginRequest req) { return SocialLoginResponse.of(userId, isUserExist); } -} \ No newline at end of file +} From 47e4177266bf0848f8fb517513eb3c6c8ce2c0aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=B0=AC=EB=AF=B8?= Date: Sat, 22 Jul 2023 10:31:07 +0900 Subject: [PATCH 2/4] [FIX] Update KakaoSocialService.java --- .../client/kakao/service/impl/KakaoSocialService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/service/impl/KakaoSocialService.java b/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/service/impl/KakaoSocialService.java index 3d1e4383..e0347543 100644 --- a/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/service/impl/KakaoSocialService.java +++ b/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/service/impl/KakaoSocialService.java @@ -37,7 +37,7 @@ public SocialLoginResponse login(SocialLoginRequest req) { KakaoAccessTokenResponse tokenResponse = kakaoAuthApiClient.getOAuth2AccessToken( "authorization_code", clientId, - "https://tattour.kr/kakao/callback", + "https://tattour.kr/login/oauth2/callback", // "http://localhost:5173/login/oauth2/callback", // "http://localhost:8080/kakao/callback", req.getCode() From c6eb4ad33e15b4edee61206d6bd6004e8a4a3ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B2=E1=84=89=E1=85=A5=E1=84=85=E1=85=B5?= =?UTF-8?q?=E1=86=AB?= Date: Sat, 22 Jul 2023 15:09:53 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=20#56=20[FIX]=20=EA=B0=80=EA=B2=A9=20?= =?UTF-8?q?=EB=86=92=EC=9D=80=20=EC=88=9C=20=EC=A0=95=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/domain/sticker/service/StickerServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 index 48a0c857..aa82599e 100644 --- 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 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; } } } From b09725a2f34e1b0ab537505f8978bd3903a31c25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B2=E1=84=89=E1=85=A5=E1=84=85=E1=85=B5?= =?UTF-8?q?=E1=86=AB?= Date: Mon, 7 Aug 2023 13:42:12 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=20#56=20[FIX]=20:=20kakao=20login=20callba?= =?UTF-8?q?ck=20url=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/domain/user/controller/UserController.java | 10 ++++++++-- .../kakao/service/dto/request/SocialLoginRequest.java | 6 ++++-- .../client/kakao/service/impl/KakaoSocialService.java | 5 ++++- 3 files changed, 16 insertions(+), 5 deletions(-) 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 index 552698ef..1c946ccd 100644 --- 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; @@ -56,6 +57,8 @@ import org.tattour.server.global.exception.BusinessException; import org.tattour.server.global.exception.ErrorType; import org.tattour.server.infra.sms.provider.impl.PhoneNumberVerificationCodeProviderImpl; +import org.tattour.server.infra.socialLogin.client.kakao.dto.response.KakaoAccessTokenResponse; +import org.tattour.server.infra.socialLogin.client.kakao.dto.response.KakaoUserRes; import org.tattour.server.infra.socialLogin.client.kakao.service.SocialService; import org.tattour.server.infra.socialLogin.client.kakao.service.SocialServiceProvider; import org.tattour.server.infra.socialLogin.client.kakao.service.dto.request.SocialLoginRequest; @@ -108,12 +111,15 @@ public class UserController { @PostMapping("/signup") public ResponseEntity login( @Parameter(description = "Authentication Code", required = true) @RequestHeader("code") String code, - @RequestBody @Valid LoginReq req) { + @RequestBody @Valid LoginReq req, + HttpServletRequest request) { SocialService socialService = socialServiceProvider.getSocialService( req.getSocialPlatform()); + String redirectUri = request.getHeader("referer"); + // 로그인 - SocialLoginResponse response = socialService.login(SocialLoginRequest.of(code)); + SocialLoginResponse response = socialService.login(SocialLoginRequest.of(code, redirectUri)); // jwt 토큰 발급 return BaseResponse.success(SuccessType.LOGIN_SUCCESS, diff --git a/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/service/dto/request/SocialLoginRequest.java b/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/service/dto/request/SocialLoginRequest.java index d32a596b..5be92d2d 100644 --- a/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/service/dto/request/SocialLoginRequest.java +++ b/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/service/dto/request/SocialLoginRequest.java @@ -9,8 +9,10 @@ public class SocialLoginRequest { private String code; + private String redirectUri; - public static SocialLoginRequest of(String code) { - return new SocialLoginRequest(code); + + public static SocialLoginRequest of(String code, String redirectUri) { + return new SocialLoginRequest(code, redirectUri); } } diff --git a/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/service/impl/KakaoSocialService.java b/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/service/impl/KakaoSocialService.java index 14075543..c7ba3468 100644 --- a/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/service/impl/KakaoSocialService.java +++ b/server/src/main/java/org/tattour/server/infra/socialLogin/client/kakao/service/impl/KakaoSocialService.java @@ -33,11 +33,14 @@ public class KakaoSocialService extends SocialService { public SocialLoginResponse login(SocialLoginRequest req) { System.out.println(clientId); + String kakaoCallBack = req.getRedirectUri() + "login/oauth2/callback"; + // Authorization code로 Access Token 불러오기 KakaoAccessTokenResponse tokenResponse = kakaoAuthApiClient.getOAuth2AccessToken( "authorization_code", clientId, - "http://localhost:5173/login/oauth2/callback", + kakaoCallBack, +// "http://localhost:5173/login/oauth2/callback", // "http://localhost:8080/kakao/callback", req.getCode() );