Merge pull request #72 from Developer-Wikis/feature/#62

Fix : 소셜로그인 url 받는 api 수정
Developer-Wikis · Oct 27, 2022 · 5372d00 · 5372d00
2 parents e3d4892 + baa6b7c
commit 5372d00
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/com/developer/wiki/oauth/controller/OauthController.java b/src/main/java/com/developer/wiki/oauth/controller/OauthController.java
@@ -24,10 +24,10 @@ public ResponseEntity<GoogleResponseDto> getGoogleUserInfo(@RequestParam("code")
         GoogleResponseDto GoogleUser = oauthService.oAuthLogin(code,redirectUrl);
         return new ResponseEntity<>(GoogleUser, HttpStatus.OK);
     }
-    @GetMapping("/google/url")
-    public void getGoogleUrl(@RequestParam String url, HttpServletResponse response) throws IOException {
-        System.out.println("asdasdasd"+url);
+    @GetMapping("/google")
+    public ResponseEntity<String> getGoogleUrl(@RequestParam String url, HttpServletResponse response) throws IOException {
         String redirectUrl=oauthService.googleUrl(url);
-        response.sendRedirect(redirectUrl);
+        //response.sendRedirect(redirectUrl);
+        return ResponseEntity.ok(redirectUrl);
     }
 }
diff --git a/src/main/java/com/developer/wiki/oauth/service/GoogleOauthService.java b/src/main/java/com/developer/wiki/oauth/service/GoogleOauthService.java
@@ -71,7 +71,7 @@ public ResponseEntity<String> requestAccessToken(String code,String redirectUrl)
             return responseEntity;
         }catch (RestClientException e){
             e.printStackTrace();
-            throw new BadRequestException(String.format("인가코드로 구글의 AccessToken을 발급하지 못했습니다. code : %s, redirectUrl : %s",code,redirectUrl));
+            throw new BadRequestException(String.format("인가코드로 구글의 AccessToken을 발급하지 못했습니다. code : %s, redirectUrl : %s,  오류 내용 : %s",code,redirectUrl,e.getMessage()));
         }
     }
 

diff --git a/src/main/java/com/developer/wiki/oauth/service/OauthService.java b/src/main/java/com/developer/wiki/oauth/service/OauthService.java
@@ -18,7 +18,7 @@ public class OauthService {
     private final TokenService tokenService;
     private final UserRepository userRepository;
     public GoogleResponseDto oAuthLogin(String code, String redirectUrl) throws IOException {
-        ResponseEntity<String> accessTokenResponse= googleOauthService.requestAccessToken(code, UrlConverter.of(redirectUrl));
+        ResponseEntity<String> accessTokenResponse= googleOauthService.requestAccessToken(code, redirectUrl);
         GoogleOAuthToken oAuthToken=googleOauthService.getAccessToken(accessTokenResponse);
         ResponseEntity<String> userInfoResponse=googleOauthService.requestUserInfo(oAuthToken);
         GoogleUser googleUser= googleOauthService.getUserInfo(userInfoResponse);