Merge pull request #80 from fourix4/feat/chat

feat : user 정보 조회 기능 구현
fourix4 · Jul 23, 2024 · 6558f71 · 6558f71
2 parents 9345cd8 + 89aaf69
commit 6558f71
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/main/java/com/example/CatchStudy/controller/UsersController.java b/src/main/java/com/example/CatchStudy/controller/UsersController.java
@@ -40,6 +40,11 @@ public class UsersController {
     private final BookingService bookingService;
     private final UsersRepository usersRepository;
 
+    @GetMapping("")
+    public Response getUserInfo() {
+        return Response.success(Result.toResponseDto(usersService.getUserInfo()));
+    }
+
     @PostMapping("/logout")
     public Response logout(HttpServletRequest request) {
         String token = request.getHeader("Authorization");

diff --git a/src/main/java/com/example/CatchStudy/global/jwt/JwtAuthenticationFilter.java b/src/main/java/com/example/CatchStudy/global/jwt/JwtAuthenticationFilter.java
@@ -40,8 +40,6 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
             jwtUtil.validateAccessToken(accessToken);
             Authentication authentication = jwtUtil.getAuthentication(accessToken);
             SecurityContextHolder.getContext().setAuthentication(authentication); // 검증 후 security context 인증 정보 저장
-            System.out.println("-------------- authentication + " + authentication);
-            System.out.println("-------------- 저장 후, " + SecurityContextHolder.getContext().getAuthentication());
         } catch (ExpiredJwtException e) {   // 만료 에러 발생
             // refreshToken 존재시
             if(jwtUtil.validateRefreshToken(accessToken)) response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
@@ -55,8 +53,6 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
     private String resolveToken(HttpServletRequest request) {
 
         String token = request.getHeader("Authorization");
-        System.out.println("--------- token : " + token);
-        System.out.println("--------- request : " + request);
         if (StringUtils.hasText(token) && token.startsWith("Bearer ")) {
             return token.substring(7);
         }

diff --git a/src/main/java/com/example/CatchStudy/service/UsersService.java b/src/main/java/com/example/CatchStudy/service/UsersService.java
@@ -63,6 +63,12 @@ public void deleteUser() {
         usersRepository.deleteByEmail(email);
     }
 
+    public UsersResponseDto getUserInfo() {
+        String email = getEmail();
+
+        return new UsersResponseDto(usersRepository.findByEmail(email));
+    }
+
     private String getEmail() {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         String email = "";