From 4af1cbf95b4a6a8ca3b23bfaf13a6d7cced6a377 Mon Sep 17 00:00:00 2001 From: minseong Date: Wed, 31 May 2023 02:34:02 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20Oauth2.0=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=EB=B0=8F=20=EC=BA=90=EC=8A=A4=ED=8C=85=20=EB=B2=84=EA=B7=B8?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Get /jwt-test 테스트 - casting User to UserDetails 버그 수정 --- .../jwt/filter/JwtAuthenticationProcessingFilter.java | 6 +++--- .../global/oauth/handler/OAuth2LoginSuccessHandler.java | 2 +- .../classmate/user/controller/UserController.java | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/classmate/src/main/java/devteamOne/classmate/global/jwt/filter/JwtAuthenticationProcessingFilter.java b/classmate/src/main/java/devteamOne/classmate/global/jwt/filter/JwtAuthenticationProcessingFilter.java index c76569a..0cc46d9 100644 --- a/classmate/src/main/java/devteamOne/classmate/global/jwt/filter/JwtAuthenticationProcessingFilter.java +++ b/classmate/src/main/java/devteamOne/classmate/global/jwt/filter/JwtAuthenticationProcessingFilter.java @@ -74,10 +74,10 @@ private void saveAuthentication(User user) { password = PasswordUtil.generateRandomPassword(); } - UserDetails userDetails = (UserDetails) User.builder() - .email(user.getEmail()) + UserDetails userDetails = org.springframework.security.core.userdetails.User.builder() + .username(user.getEmail()) .password(password) - .role(user.getRole()) + .roles(user.getRole().name()) .build(); Authentication authentication = diff --git a/classmate/src/main/java/devteamOne/classmate/global/oauth/handler/OAuth2LoginSuccessHandler.java b/classmate/src/main/java/devteamOne/classmate/global/oauth/handler/OAuth2LoginSuccessHandler.java index 1fa2dba..16cfe4d 100644 --- a/classmate/src/main/java/devteamOne/classmate/global/oauth/handler/OAuth2LoginSuccessHandler.java +++ b/classmate/src/main/java/devteamOne/classmate/global/oauth/handler/OAuth2LoginSuccessHandler.java @@ -33,7 +33,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo if (oAuth2User.getRole() == Role.GUEST) { String accessToken = jwtService.createAccessToken(oAuth2User.getEmail()); response.addHeader(jwtService.getAccessHeader(), "Bearer " + accessToken); - response.sendRedirect("oauth2/sign-up"); +// response.sendRedirect("oauth2/sign-up"); jwtService.sendAccessAndRefreshToken(response, accessToken, null); } else { diff --git a/classmate/src/main/java/devteamOne/classmate/user/controller/UserController.java b/classmate/src/main/java/devteamOne/classmate/user/controller/UserController.java index 6331b23..2bf9463 100644 --- a/classmate/src/main/java/devteamOne/classmate/user/controller/UserController.java +++ b/classmate/src/main/java/devteamOne/classmate/user/controller/UserController.java @@ -5,6 +5,7 @@ import devteamOne.classmate.user.service.UserService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -24,4 +25,9 @@ public ResponseEntity signUp(@RequestBody UserSignUpDto userSignU BasicResponse.from("S-00", "회원 가입 성공") ); } + + @GetMapping("/jwt-test") + public String jwtTest() { + return "jwtTest 요청 성공"; + } }