#128 feat: redirectUrl null 처리

masters2023-project-03-second-hand · Oct 2, 2023 · 33b8e08 · 33b8e08
1 parent 71bf293
commit 33b8e08
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/backend/src/main/java/codesquard/app/api/oauth/OauthRestController.java b/backend/src/main/java/codesquard/app/api/oauth/OauthRestController.java
@@ -45,7 +45,7 @@ public class OauthRestController {
 	public ApiResponse<OauthSignUpResponse> signUp(
 		@PathVariable String provider,
 		@RequestParam String code,
-		@RequestParam String redirectUrl,
+		@RequestParam(value = "redirectUrl", required = false) String redirectUrl,
 		@RequestPart(value = "profile", required = false) MultipartFile profile,
 		@Valid @RequestPart(value = "signupData") OauthSignUpRequest request) {
 		log.info("provider : {}, code : {}, requestUrl : {}, profile : {}, request : {}", provider, code, redirectUrl,

diff --git a/backend/src/main/java/codesquard/app/domain/oauth/client/KakaoOauthClient.java b/backend/src/main/java/codesquard/app/domain/oauth/client/KakaoOauthClient.java
@@ -73,6 +73,9 @@ public OauthAccessTokenResponse exchangeAccessTokenByAuthorizationCode(String au
 	@Override
 	public MultiValueMap<String, String> createFormData(String authorizationCode, String redirectUrl) {
 		MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
+		if (redirectUrl == null) {
+			redirectUrl = getRedirectUri();
+		}
 		formData.add("code", authorizationCode);
 		formData.add("client_id", getClientId());
 		formData.add("client_secret", getClientSecret());

diff --git a/backend/src/main/java/codesquard/app/domain/oauth/client/NaverOauthClient.java b/backend/src/main/java/codesquard/app/domain/oauth/client/NaverOauthClient.java
@@ -57,6 +57,9 @@ public OauthAccessTokenResponse exchangeAccessTokenByAuthorizationCode(String au
 	@Override
 	public MultiValueMap<String, String> createFormData(String authorizationCode, String redirectUrl) {
 		MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
+		if (redirectUrl == null) {
+			redirectUrl = getRedirectUri();
+		}
 		formData.add("code", authorizationCode);
 		formData.add("redirect_uri", redirectUrl);
 		formData.add("grant_type", "authorization_code");