Merge pull request #89 from noeyeyh/fix/google

#88 Fix: 구글 로그인 redirect uri 설정

Author: noeyeyh

src/main/java/com/memesphere/domain/user/controller/UserController.java

@@ -49,8 +49,18 @@ public ApiResponse<LoginResponse> kakaoLogin(@RequestParam("code") String code)
 
     @PostMapping("/login/oauth2/google")
     @Operation(summary = "구글 로그인/회원가입 API")
-    public ApiResponse<LoginResponse> googleLogin(@RequestParam("code") String code) throws IOException {
-        TokenResponse googleTokenResponse = googleServiceImpl.getAccessTokenFromGoogle(code);
+    public ApiResponse<LoginResponse> googleLogin(HttpServletRequest request, @RequestParam("code") String code) throws IOException {
+        TokenResponse googleTokenResponse = null;
+        String origin = request.getHeader("Origin");
+
+        if (origin.equals("http://localhost:3000")) {
+            googleTokenResponse = googleServiceImpl.getAccessTokenFromGoogle(code, "http://localhost:3000/user/login/oauth2/google");
+        } else if (origin.equals("http://localhost:8080")) {
+            googleTokenResponse = googleServiceImpl.getAccessTokenFromGoogle(code, "http://localhost:8080/user/login/oauth2/google");
+        } else if (origin.equals("https://15.164.103.195.nip.io")) {
+            googleTokenResponse = googleServiceImpl.getAccessTokenFromGoogle(code, "https://15.164.103.195.nip.io/user/login/oauth2/google");
+        }
+
         GoogleUserInfoResponse googleUserInfoResponse = googleServiceImpl.getUserInfo(googleTokenResponse.getAccessToken());
         LoginResponse loginResponse = googleServiceImpl.handleUserLogin(googleUserInfoResponse);
 

src/main/java/com/memesphere/domain/user/service/GoogleService.java

@@ -5,7 +5,7 @@
 import com.memesphere.domain.user.dto.response.TokenResponse;
 
 public interface GoogleService {
-    TokenResponse getAccessTokenFromGoogle(String code);
+    TokenResponse getAccessTokenFromGoogle(String code, String redirectUri);
     GoogleUserInfoResponse getUserInfo(String accessToken);
     LoginResponse handleUserLogin(GoogleUserInfoResponse userInfo);
 }

src/main/java/com/memesphere/domain/user/service/GoogleServiceImpl.java

@@ -33,9 +33,6 @@ public class GoogleServiceImpl implements GoogleService{
     @Value("${security.oauth2.client.registration.google.client-secret}")
     private String clientSecret;
 
-    @Value("${security.oauth2.client.registration.google.redirect-uri}")
-    private String redirectUri;
-
     @Value("${security.oauth2.client.registration.google.authorization-grant-type}")
     private String authorizationCode;
 
@@ -46,7 +43,7 @@ public class GoogleServiceImpl implements GoogleService{
     private String userInfoUri;
 
 
-    public TokenResponse getAccessTokenFromGoogle(String code) {
+    public TokenResponse getAccessTokenFromGoogle(String code, String redirectUri) {
         try {
             String decodedCode = URLDecoder.decode(code, StandardCharsets.UTF_8);