Merge pull request #96 from TRIP-Side-Project/dev

pr for merge
TRIP-Side-Project · Dec 19, 2023 · 45bf288 · 45bf288
2 parents fce8ee4 + bb04387
commit 45bf288
Show file tree

Hide file tree

Showing 19 changed files with 484 additions and 58 deletions.
diff --git a/src/main/java/com/api/trip/common/exception/ErrorCode.java b/src/main/java/com/api/trip/common/exception/ErrorCode.java
@@ -6,6 +6,20 @@
 @Getter
 public enum ErrorCode {
 
+    // 400
+    EMPTY_REFRESH_TOKEN("RefreshToken이 필요합니다.", HttpStatus.BAD_REQUEST),
+
+    // 401
+    LOGOUTED_TOKEN("이미 로그아웃 처리된 토큰입니다.", HttpStatus.UNAUTHORIZED),
+    SNATCH_TOKEN("Refresh Token 탈취를 감지하여 로그아웃 처리됩니다.", HttpStatus.UNAUTHORIZED),
+    INVALID_TYPE_TOKEN("Token의 타입은 Bearer입니다.", HttpStatus.UNAUTHORIZED),
+    EXPIRED_PERIOD_ACCESS_TOKEN("기한이 만료된 AccessToken입니다.", HttpStatus.UNAUTHORIZED),
+    EXPIRED_PERIOD_REFRESH_TOKEN("기한이 만료된 RefreshToken입니다.", HttpStatus.UNAUTHORIZED),
+    EMPTY_AUTHORITY("권한 정보가 필요합니다.", HttpStatus.UNAUTHORIZED),
+    INVALID_ACCESS_TOKEN("유효하지 않은 AccessToken입니다.", HttpStatus.UNAUTHORIZED),
+    INVALID_REFRESH_TOKEN("유효하지 않은 RefreshToken입니다.", HttpStatus.UNAUTHORIZED),
+
+    // 404
     NOT_FOUND_MEMBER("회원이 존재하지 않습니다.", HttpStatus.NOT_FOUND);
 
     private final String message;

diff --git a/src/main/java/com/api/trip/common/exception/custom_exception/BadRequestException.java b/src/main/java/com/api/trip/common/exception/custom_exception/BadRequestException.java
@@ -0,0 +1,10 @@
+package com.api.trip.common.exception.custom_exception;
+
+import com.api.trip.common.exception.CustomException;
+import com.api.trip.common.exception.ErrorCode;
+
+public class BadRequestException extends CustomException {
+    public BadRequestException(ErrorCode errorCode) {
+        super(errorCode);
+    }
+}
diff --git a/src/main/java/com/api/trip/common/exception/custom_exception/InvalidException.java b/src/main/java/com/api/trip/common/exception/custom_exception/InvalidException.java
@@ -0,0 +1,10 @@
+package com.api.trip.common.exception.custom_exception;
+
+import com.api.trip.common.exception.CustomException;
+import com.api.trip.common.exception.ErrorCode;
+
+public class InvalidException extends CustomException {
+    public InvalidException(ErrorCode errorCode) {
+        super(errorCode);
+    }
+}
diff --git a/src/main/java/com/api/trip/common/security/jwt/JwtTokenFilter.java b/src/main/java/com/api/trip/common/security/jwt/JwtTokenFilter.java
@@ -1,5 +1,6 @@
 package com.api.trip.common.security.jwt;
 
+import com.api.trip.common.security.util.JwtTokenUtils;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -21,19 +22,20 @@ public class JwtTokenFilter extends OncePerRequestFilter {
 
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-        String header = request.getHeader("accessToken");
 
-        if (header == null || !header.startsWith("Bearer ")) {
-            log.error("Error occurs while getting header. header is null or invalid {}", request.getRequestURL());
-            filterChain.doFilter(request, response);
-            return;
-        }
 
-        String accessToken = header.split(" ")[1].trim();
+        String accessToken = JwtTokenUtils.extractBearerToken(request.getHeader("accessToken"));
+
+
 
-        if (jwtTokenProvider.validateAccessToken(accessToken)) {
+        if (!request.getRequestURI().equals("/api/members/rotate") && accessToken != null) { // 토큰 재발급의 요청이 아니면서 accessToken이 존재할 때
+
+            // 토큰이 유효한 경우 and 로그인 상태
             Authentication authentication = jwtTokenProvider.getAuthenticationByAccessToken(accessToken);
+            jwtTokenProvider.checkLogin(authentication.getName());
+
             SecurityContextHolder.getContext().setAuthentication(authentication);
+
         }
 
         filterChain.doFilter(request, response);

diff --git a/src/main/java/com/api/trip/common/security/jwt/JwtTokenProvider.java b/src/main/java/com/api/trip/common/security/jwt/JwtTokenProvider.java
@@ -1,10 +1,10 @@
 package com.api.trip.common.security.jwt;
 
 
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.JwtException;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
+import com.api.trip.common.exception.ErrorCode;
+import com.api.trip.common.exception.custom_exception.InvalidException;
+import com.api.trip.common.security.util.JwtTokenUtils;
+import io.jsonwebtoken.*;
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;
 import lombok.RequiredArgsConstructor;
@@ -30,52 +30,100 @@
 @Slf4j
 public class JwtTokenProvider {
 
+    private final JwtTokenUtils jwtTokenUtils;
+
     @Value("${custom.jwt.token.access-expiration-time}")
     private long accessExpirationTime;
+
+    @Value("${custom.jwt.token.refresh-expiration-time}")
+    private long refreshExpirationTime;
+
     private final Key key;
 
     @Autowired
-    public JwtTokenProvider(@Value("${custom.jwt.token.secret}") String secretKey) {
+    public JwtTokenProvider(@Value("${custom.jwt.token.secret}") String secretKey, JwtTokenUtils jwtTokenUtils) {
+        this.jwtTokenUtils = jwtTokenUtils;
         byte[] keyBytes = Decoders.BASE64.decode(secretKey);
         this.key = Keys.hmacShaKeyFor(keyBytes);
     }
 
     public JwtToken createJwtToken(String email, String authorities) {
 
+        Date now = new Date();
         Claims claims = Jwts.claims().setSubject(email);
         claims.put("roles", authorities);
 
-        String accessToken = Jwts.builder()
+
+        String accessToken = createAccessToken(claims, new Date(now.getTime() + accessExpirationTime));
+        String refreshToken = createRefreshToken(claims, new Date(now.getTime() + refreshExpirationTime));
+
+
+        return new JwtToken(accessToken, refreshToken);
+    }
+    public JwtToken refreshJwtToken(Authentication authentication){
+        String authorities = authentication.getAuthorities().stream()
+                .map(a -> a.getAuthority())
+                .collect(Collectors.joining(","));
+
+        JwtToken jwtToken = createJwtToken(authentication.getName(), authorities);
+
+        jwtTokenUtils.updateRefreshToken(authentication.getName(), jwtToken.getRefreshToken());
+        return jwtToken;
+    }
+
+
+    private String createAccessToken(Claims claims, Date expiredDate) {
+        return  Jwts.builder()
+                .setClaims(claims) // 아이디, 권한정보
+                .setIssuedAt(new Date(System.currentTimeMillis())) // 생성일 설정
+                .setExpiration(expiredDate) // 만료일 설정
+                .signWith(SignatureAlgorithm.HS256, key)
+                .compact();
+    }
+
+    private String createRefreshToken(Claims claims, Date expiredDate) {
+        String refreshToken = Jwts.builder()
                 .setClaims(claims)
                 .setIssuedAt(new Date(System.currentTimeMillis()))
-                .setExpiration(new Date(System.currentTimeMillis() + accessExpirationTime))
+                .setExpiration(expiredDate)
                 .signWith(key, SignatureAlgorithm.HS256)
                 .compact();
+        jwtTokenUtils.setRefreshToken(claims.getSubject(), refreshToken);
 
-        return new JwtToken(accessToken, "refreshToken");
+        return refreshToken;
     }
 
-    public boolean validateAccessToken(String accessToken) {
-        try {
-            parseToken(accessToken);
-            return true;
-        } catch (final JwtException | IllegalArgumentException exception) {
-            return false;
+    /**
+     * @Description
+     * AccessToken 검증 + Return 인증객체
+     */
+    public Authentication getAuthenticationByAccessToken(String accessToken) {
+
+        Claims claims = validateAccessToken(accessToken);
+
+        if (claims.get("roles") == null){
+            throw new InvalidException(ErrorCode.EMPTY_AUTHORITY);
         }
-    }
 
-    private Claims parseToken(final String token) {
-        return Jwts.parserBuilder()
-                .setSigningKey(key)
-                .build()
-                .parseClaimsJws(token)
-                .getBody();
-    }
+        Collection<? extends GrantedAuthority> authorities =
+                Arrays.stream(claims.get("roles").toString().split(","))
+                        .map(SimpleGrantedAuthority::new)
+                        .collect(Collectors.toList());
 
-    public Authentication getAuthenticationByAccessToken(String accessToken) {
+        UserDetails principal = new User(claims.getSubject(), "", authorities);
+        return new UsernamePasswordAuthenticationToken(principal, "", authorities);
+    }
 
-        Claims claims = parseToken(accessToken);
+    /**
+     * @Description
+     * RefreshToken 검증 + Return 인증객체
+     */
+    public Authentication getAuthenticationByRefreshToken(String refreshToken){
+        Claims claims = validateRefreshToken(refreshToken);
 
+        if (claims.get("roles") == null){
+            throw new InvalidException(ErrorCode.EMPTY_AUTHORITY);
+        }
         Collection<? extends GrantedAuthority> authorities =
                 Arrays.stream(claims.get("roles").toString().split(","))
                         .map(SimpleGrantedAuthority::new)
@@ -84,4 +132,42 @@ public Authentication getAuthenticationByAccessToken(String accessToken) {
         UserDetails principal = new User(claims.getSubject(), "", authorities);
         return new UsernamePasswordAuthenticationToken(principal, "", authorities);
     }
+
+
+    /**
+     * @Description
+     * 토큰의 만료여부와 유효성에 대해 검증합니다.
+     */
+    private Claims validateAccessToken(String accessToken) {
+        try {
+            return parseToken(accessToken);
+
+        } catch (ExpiredJwtException e) {
+            throw new InvalidException(ErrorCode.EXPIRED_PERIOD_ACCESS_TOKEN);
+        } catch (final JwtException | IllegalArgumentException e) {
+            throw new InvalidException(ErrorCode.INVALID_ACCESS_TOKEN);
+        }
+    }
+    private Claims validateRefreshToken(String refreshToken) {
+        try {
+            return parseToken(refreshToken);
+        } catch (ExpiredJwtException e) {
+            throw new InvalidException(ErrorCode.EXPIRED_PERIOD_REFRESH_TOKEN);
+        } catch (final JwtException | IllegalArgumentException e) {
+            throw new InvalidException(ErrorCode.INVALID_REFRESH_TOKEN);
+        }
+    }
+
+    private Claims parseToken(final String token) {
+        return Jwts.parserBuilder()
+                .setSigningKey(key)
+                .build()
+                .parseClaimsJws(token)
+                .getBody();
+    }
+
+    public void checkLogin(String email) {
+        if (jwtTokenUtils.isLogin(email) == false)
+            throw new InvalidException(ErrorCode.LOGOUTED_TOKEN);
+    }
 }
diff --git a/src/main/java/com/api/trip/common/security/util/JwtTokenUtils.java b/src/main/java/com/api/trip/common/security/util/JwtTokenUtils.java
@@ -0,0 +1,53 @@
+package com.api.trip.common.security.util;
+
+
+
+import com.api.trip.common.exception.ErrorCode;
+import com.api.trip.common.exception.custom_exception.BadRequestException;
+import com.api.trip.common.redis.RedisService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
+
+@Component
+@RequiredArgsConstructor
+public class JwtTokenUtils {
+
+    private final RedisService redisService;
+
+    @Value("${custom.jwt.token.refresh-expiration-time}")
+    private long refreshExpirationTime;
+    /**
+     * @Description
+     * Bearer토큰의 여부에 대해 검증한 뒤 토큰을 반환합니다.
+     */
+    public static String extractBearerToken(String token) {
+        if(token != null){
+            if(!token.startsWith("Bearer"))
+                throw new BadRequestException(ErrorCode.INVALID_TYPE_TOKEN);
+            return token.split(" ")[1].trim();
+        }
+        return null;
+    }
+
+    public boolean isLogin(String email){
+        return redisService.getData("Login_" + email) != null;
+    }
+    public void setRefreshToken(String username, String refreshToken){
+        redisService.setData("Login_" + username, refreshToken, refreshExpirationTime, TimeUnit.SECONDS);
+    }
+    public void updateRefreshToken(String name, String refreshToken) {
+        setRefreshToken(name, refreshToken);
+    }
+
+    public void deleteRefreshToken(String name) {
+        redisService.deleteData("Login_" + name);
+    }
+
+    public String getRefreshToken(String name) {
+        return redisService.getData("Login_" + name).toString();
+    }
+
+}
diff --git a/src/main/java/com/api/trip/domain/article/controller/ArticleController.java b/src/main/java/com/api/trip/domain/article/controller/ArticleController.java
@@ -45,9 +45,12 @@ public ResponseEntity<ReadArticleResponse> readArticle(@PathVariable Long articl
     @GetMapping
     public ResponseEntity<GetArticlesResponse> getArticles(
             @PageableDefault(size = 8) Pageable pageable,
-            @RequestParam(value = "filter", required = false) String filter
+            @RequestParam(value = "sortCode", defaultValue = "0") int sortCode,
+            @RequestParam(value = "category", required = false) String category,
+            @RequestParam(value = "title", required = false) String title,
+            @RequestParam(value = "tag", required = false) String tagName
     ) {
-        return ResponseEntity.ok(articleService.getArticles(pageable, filter));
+        return ResponseEntity.ok(articleService.getArticles(pageable, sortCode, category, title, tagName));
     }
 
     @GetMapping("/me")

diff --git a/src/main/java/com/api/trip/domain/article/controller/dto/CreateArticleRequest.java b/src/main/java/com/api/trip/domain/article/controller/dto/CreateArticleRequest.java
@@ -4,10 +4,13 @@
 import com.api.trip.domain.member.model.Member;
 import lombok.Getter;
 
+import java.util.List;
+
 @Getter
 public class CreateArticleRequest {
 
     private String title;
+    private List<String> tags;
     private String content;
 
     public Article toEntity(Member writer) {

diff --git a/src/main/java/com/api/trip/domain/article/controller/dto/ReadArticleResponse.java b/src/main/java/com/api/trip/domain/article/controller/dto/ReadArticleResponse.java
@@ -1,12 +1,14 @@
 package com.api.trip.domain.article.controller.dto;
 
 import com.api.trip.domain.article.model.Article;
+import com.api.trip.domain.articletag.model.ArticleTag;
 import com.api.trip.domain.interestarticle.model.InterestArticle;
 import com.api.trip.domain.member.model.Member;
 import lombok.Builder;
 import lombok.Getter;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Getter
 @Builder
@@ -18,13 +20,14 @@ public class ReadArticleResponse {
     private String writerNickname;
     private String writerRole;
     private String writerProfileImg;
+    private List<String> tags;
     private String content;
     private long viewCount;
     private long likeCount;
     private LocalDateTime createdAt;
     private Long interestArticleId;
 
-    public static ReadArticleResponse of(Article article, InterestArticle interestArticle) {
+    public static ReadArticleResponse of(Article article, List<ArticleTag> articleTags, InterestArticle interestArticle) {
         Member writer = article.getWriter();
         return builder()
                 .articleId(article.getId())
@@ -33,6 +36,7 @@ public static ReadArticleResponse of(Article article, InterestArticle interestAr
                 .writerNickname(writer.getNickname())
                 .writerProfileImg(writer.getProfileImg())
                 .writerRole(writer.getRole().name())
+                .tags(articleTags.stream().map(articleTag -> articleTag.getTag().getName()).toList())
                 .content(article.getContent())
                 .viewCount(article.getViewCount() + 1)
                 .likeCount(article.getLikeCount())

diff --git a/src/main/java/com/api/trip/domain/article/controller/dto/UpdateArticleRequest.java b/src/main/java/com/api/trip/domain/article/controller/dto/UpdateArticleRequest.java
@@ -2,9 +2,12 @@
 
 import lombok.Getter;
 
+import java.util.List;
+
 @Getter
 public class UpdateArticleRequest {
 
     private String title;
+    private List<String> tags;
     private String content;
 }