Merge pull request #78 from GoormJeans/develop

Develop
GoormJeans · Dec 27, 2023 · f8436c0 · f8436c0
2 parents cd0ab43 + 03ae9da
commit f8436c0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/idemainserver/src/main/java/com/goojeans/idemainserver/controller/UserController.java b/idemainserver/src/main/java/com/goojeans/idemainserver/controller/UserController.java
@@ -40,6 +40,8 @@ public class UserController {
     private final JwtService jwtService;
     private final LoginService loginService;
 
+    private ObjectMapper objectMapper = new ObjectMapper(); // JSON 변환을 위한 ObjectMapper
+
 
 
 
@@ -102,15 +104,26 @@ public ResponseDto<?> updateUser(@RequestParam(required = true) String blog,
     }
 
 
-
     // OAuth login 성공 후 사용자 정보
-    @GetMapping("/oauth/sign-up")
+    // social platform -> backendserver -> frontendserver
+   // @GetMapping("/oauth/sign-up")
+    @GetMapping("/oauth/info")
     public ResponseDto<OAuthUserInfoDto> oauthSignup(@RequestParam(name="token")String token, HttpServletResponse response){
-
-        log.info("신규회원");
         return userService.getOAuthUserInfoDto(token);
     }
 
+    @GetMapping("/oauth/sign-up")
+    public void redirect(String token, HttpServletResponse response){
+        // 리다이렉트 할 프론트 서버 주소
+        String redirectUrl = "https://goojeans-50163.web.app/oauth/callback?token=" + token;
+        try{
+            response.sendRedirect(redirectUrl);
+        }catch (Exception e){
+            log.error("프론트 서버 보내기 실패");
+        }
+    }
+
+
     // 사용자 정보
     @PostMapping("/api/userInfo")
     public ResponseDto<?> userInfo(HttpServletRequest request, HttpServletResponse response){

diff --git a/...m/goojeans/idemainserver/util/TokenAndLogin/oauth2/handler/OAuth2LoginSuccessHandler.java b/...m/goojeans/idemainserver/util/TokenAndLogin/oauth2/handler/OAuth2LoginSuccessHandler.java
@@ -40,7 +40,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
             String nickname = user.get().getNickname();
 
             // User의 Role이 GUEST일 경우 처음 요청한 회원이므로 회원가입 페이지로 리다이렉트
-            if(oAuth2User.getRole() == Role.GUEST) {
+            if(oAuth2User.getRole() == Role.GUEST || oAuth2User.getRole() == Role.USER) {
                 String accessToken = jwtService.createAccessToken(oAuth2User.getEmail(),id,nickname);
 
                 log.info("accessToken={}",accessToken);