Merge pull request #213 from devping-kr/dev

deploy

Author: daeundada

src/main/java/devping/nnplanner/domain/auth/controller/AuthController.java

@@ -3,6 +3,7 @@
 import devping.nnplanner.domain.auth.dto.request.AuthSignRequestDTO;
 import devping.nnplanner.domain.auth.dto.request.EmailCodeRequestDTO;
 import devping.nnplanner.domain.auth.dto.request.EmailRequestDTO;
+import devping.nnplanner.domain.auth.dto.request.GoogleLoginRequestDTO;
 import devping.nnplanner.domain.auth.dto.response.AuthResponseDTO;
 import devping.nnplanner.domain.auth.dto.response.AuthTokenResponseDTO;
 import devping.nnplanner.domain.auth.service.AuthService;
@@ -21,7 +22,6 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RequestMapping("/api/auths")
@@ -90,9 +90,9 @@ public ResponseEntity<ApiResponse<String>> loginUrlGoogle() {
 
     @GetMapping("/oauth2/google")
     public ResponseEntity<ApiResponse<AuthResponseDTO>> loginGoogle(
-        @RequestParam(value = "code") String authCode) {
+        @RequestBody @Valid GoogleLoginRequestDTO googleLoginRequestDTO) {
 
-        AuthResponseDTO authResponseDTO = authService.loginGoogle(authCode);
+        AuthResponseDTO authResponseDTO = authService.loginGoogle(googleLoginRequestDTO);
 
         return GlobalResponse.OK("구글 로그인 성공", authResponseDTO);
     }

src/main/java/devping/nnplanner/domain/auth/dto/request/GoogleLoginRequestDTO.java

@@ -0,0 +1,9 @@
+package devping.nnplanner.domain.auth.dto.request;
+
+import lombok.Getter;
+
+@Getter
+public class GoogleLoginRequestDTO {
+
+    private String authCode;
+}

src/main/java/devping/nnplanner/domain/auth/service/AuthService.java

@@ -2,6 +2,7 @@
 
 import devping.nnplanner.domain.auth.dto.request.AuthSignRequestDTO;
 import devping.nnplanner.domain.auth.dto.request.GoogleInfoResponseDTO;
+import devping.nnplanner.domain.auth.dto.request.GoogleLoginRequestDTO;
 import devping.nnplanner.domain.auth.dto.request.GoogleRequestDTO;
 import devping.nnplanner.domain.auth.dto.request.GoogleResponseDTO;
 import devping.nnplanner.domain.auth.dto.response.AuthResponseDTO;
@@ -96,20 +97,20 @@ public void logout(HttpServletRequest httpRequest, UserDetailsImpl userDetails)
 
     public String loginUrlGoogle() {
         return "https://accounts.google.com/o/oauth2/v2/auth?client_id=" + googleClientId
-            + "&redirect_uri=" + oauthUrl + "/api/auths/oauth2/google"
+            + "&redirect_uri=" + oauthUrl
             + "&response_type=code&scope=email%20profile%20openid&access_type=offline";
     }
 
-    public AuthResponseDTO loginGoogle(String authCode) {
+    public AuthResponseDTO loginGoogle(GoogleLoginRequestDTO googleLoginRequestDTO) {
 
         RestTemplate restTemplate = new RestTemplate();
 
         GoogleRequestDTO googleOAuthRequestParam = GoogleRequestDTO
             .builder()
             .clientId(googleClientId)
             .clientSecret(googleClientPw)
-            .code(authCode)
-            .redirectUri(oauthUrl + "/api/auths/oauth2/google")
+            .code(googleLoginRequestDTO.getAuthCode())
+            .redirectUri(oauthUrl)
             .grantType("authorization_code")
             .build();