Merge pull request #87 from Genti2024/fix/oauth-redirect-properties

Fix: Oauth redirect url 프로퍼티 읽어오는 방식 수정
Genti2024 · Jul 29, 2024 · 6e494ff · 6e494ff
2 parents b05ac0a + e8d52ad
commit 6e494ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/genti-api/src/main/java/com/gt/genti/user/service/social/GoogleOauthStrategy.java b/genti-api/src/main/java/com/gt/genti/user/service/social/GoogleOauthStrategy.java
@@ -39,10 +39,6 @@ public class GoogleOauthStrategy implements SocialLoginStrategy, SocialAuthStrat
 	private String googleClientSecret;
 	@Value("${google.redirect-url}")
 	private String googleRedirectUrl;
-	@Value("${server.domain}")
-	private String serverBaseUri;
-	@Value("${server.port}")
-	private String serverPort;
 
 	@Value("${google.scope}")
 	private List<String> scope;
@@ -58,7 +54,7 @@ public class GoogleOauthStrategy implements SocialLoginStrategy, SocialAuthStrat
 	public String getAuthUri() {
 		Map<String, Object> params = new HashMap<>();
 		params.put("client_id", googleClientId);
-		params.put("redirect_uri", serverBaseUri + ":" + serverPort + googleRedirectUrl);
+		params.put("redirect_uri", googleRedirectUrl);
 		params.put("response_type", "code");
 		params.put("scope", String.join("%20", scope));
 
@@ -75,7 +71,7 @@ public SocialLoginResponse webLogin(SocialLoginRequest request) {
 			request.getCode(),
 			googleClientId,
 			googleClientSecret,
-			serverBaseUri + ":" + serverPort + googleRedirectUrl,
+			googleRedirectUrl,
 			"authorization_code"
 		);
 		GoogleInfoResponse userResponse = googleApiClient.googleInfo("Bearer " + tokenResponse.accessToken());

diff --git a/genti-api/src/main/java/com/gt/genti/user/service/social/KakaoOauthStrategy.java b/genti-api/src/main/java/com/gt/genti/user/service/social/KakaoOauthStrategy.java
@@ -37,10 +37,6 @@ public class KakaoOauthStrategy implements SocialLoginStrategy, SocialAuthStrate
 	private String kakaoClientId;
 	@Value("${kakao.redirect-uri}")
 	private String kakaoRedirectUri;
-	@Value("${server.domain}")
-	private String serverBaseUri;
-	@Value("${server.port}")
-	private String serverPort;
 	@Value("${kakao.client-secret}")
 	private String kakaoClientSecret;
 
@@ -55,7 +51,7 @@ public class KakaoOauthStrategy implements SocialLoginStrategy, SocialAuthStrate
 	public String getAuthUri() {
 		Map<String, Object> params = new HashMap<>();
 		params.put("client_id", kakaoClientId);
-		params.put("redirect_uri", serverBaseUri + ":" + serverPort + kakaoRedirectUri);
+		params.put("redirect_uri", kakaoRedirectUri);
 		params.put("response_type", "code");
 
 		String paramStr = params.entrySet().stream()
@@ -71,7 +67,7 @@ public SocialLoginResponse webLogin(SocialLoginRequest request) {
 			"authorization_code",
 			kakaoClientId,
 			kakaoClientSecret,
-			serverBaseUri + ":" + serverPort + kakaoRedirectUri,
+			kakaoRedirectUri,
 			request.getCode()
 		);
 
@@ -112,7 +108,8 @@ private SocialLoginResponse getUserInfo(OauthPlatform oauthPlatform, String acce
 			.userId(user.getId().toString())
 			.role(user.getUserRole().getRoles())
 			.build();
-		OauthJwtResponse oauthJwtResponse = new OauthJwtResponse(jwtTokenProvider.generateAccessToken(tokenGenerateCommand),
+		OauthJwtResponse oauthJwtResponse = new OauthJwtResponse(
+			jwtTokenProvider.generateAccessToken(tokenGenerateCommand),
 			jwtTokenProvider.generateRefreshToken(tokenGenerateCommand), user.getUserRole().getStringValue());
 		return SocialLoginResponse.of(user.getId(), user.getUsername(), user.getEmail(), isNewUser, oauthJwtResponse);
 	}