Merge pull request #47 from GApple-T/redis

🔀::토큰 만료된 게 없을 때 반환되는 DTO 추가
GApple-T · Dec 21, 2023 · 5bfcaf7 · 5bfcaf7
2 parents c32d7ea + 099ad23
commit 5bfcaf7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/src/main/java/com/gapple/weeingback/domain/auth/service/implementation/AuthServiceImpl.java b/src/main/java/com/gapple/weeingback/domain/auth/service/implementation/AuthServiceImpl.java
@@ -103,40 +103,30 @@ public ResponseEntity<AuthLogoutResponse> refresh(String headerAuthorization, St
         }
         String refresh = jwtProvider.resolveToken(headerRefresh);
         String authorization = jwtProvider.resolveToken(headerAuthorization);
-        log.info("Access={}, Refresh={}", authorization, refresh);
-        log.info(SecurityContextHolder.getContext().getAuthentication().getAuthorities().toString());
 
         boolean accessValidate = jwtProvider.validateToken(authorization);
         boolean refreshValidate = jwtProvider.validateToken(refresh);
 
         UUID savedId;
         if(refreshValidate){
                 Authentication refreshToken = jwtProvider.getAuthentication(refresh);
-                log.info("Authorities={}", refreshToken.getAuthorities());
                 savedId = UUID.fromString(refreshToken.getName());
         } else savedId = UUID.fromString(SecurityContextHolder.getContext().getAuthentication().getName());
-        log.info("savedId={}", savedId);
 
         ValueOperations<String, String> stringValueOperations = stringRedisTemplate.opsForValue();
         String token = stringValueOperations.get(savedId.toString());
 
-        log.info("savedToken={}", token);
-
         if(refresh.equals(token)){
             if(!accessValidate && !refreshValidate){
                 throw new RuntimeException();
             } else if(!accessValidate){
                 Member member = memberRepository.findMemberById(savedId);
 
-                log.info(member.getId().toString());
-
                 String password = member.getPassword();
 
                 List<AccessRole> roles = new ArrayList<>();
                 roles.add(AccessRole.valueOf(member.getRole()));
 
-                log.info(roles.toString());
-
                 Authentication authentication =
                         new UsernamePasswordAuthenticationToken(savedId.toString(), password, roles);
 
@@ -146,20 +136,15 @@ public ResponseEntity<AuthLogoutResponse> refresh(String headerAuthorization, St
 
                 return ResponseEntity.ok(new AuthLogoutResponse(newAccessToken, null, "ok"));
             } else if(!refreshValidate){
-                log.info("authorization={}", authorization);
                 Authentication authorizationToken = jwtProvider.getAuthentication(authorization); // 오류 발생지
-                log.info("authorizationToken={}", authorizationToken);
                 UUID id = UUID.fromString(authorizationToken.getName());
-                log.info("id={}", id);
                 String newRefresh = jwtProvider.generateRefreshToken(authorizationToken);
-                log.info("newRefresh={}",newRefresh);
 
                 stringValueOperations.set(id.toString(), newRefresh);
 
                 return ResponseEntity.ok(new AuthLogoutResponse(null, newRefresh, "ok"));
             } else {
-                log.info("ok");
-                return new ResponseEntity<>(HttpStatus.OK);
+                return ResponseEntity.ok().body(new AuthLogoutResponse(null, null, "ok"));
             }
         } else throw new RuntimeException();
     }

diff --git a/src/main/java/com/gapple/weeingback/global/jwt/JwtProvider.java b/src/main/java/com/gapple/weeingback/global/jwt/JwtProvider.java
@@ -63,7 +63,6 @@ public String resolveToken(String token) {
      }
 
      public Authentication getAuthentication(String accessToken) {
-         log.info("createAuthorityList={}", getRole(accessToken));
          return new UsernamePasswordAuthenticationToken(getUsername(accessToken), "", createAuthorityList(getRole(accessToken)));
      }