fix/GH-147-token-entity (#40)

SWM-REPL · Jul 26, 2023 · f304edb · f304edb
2 parents 45336d7 + 350f042
commit f304edb
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 60 deletions.
diff --git a/...o/repl/gifthub/auth/entity/UserToken.java → ...repl/gifthub/auth/entity/DeviceToken.java b/...o/repl/gifthub/auth/entity/UserToken.java → ...repl/gifthub/auth/entity/DeviceToken.java
@@ -1,25 +1,18 @@
 package org.swmaestro.repl.gifthub.auth.entity;
 
-import java.time.LocalDateTime;
-
-import org.springframework.data.annotation.CreatedDate;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedDate;
+
+import java.time.LocalDateTime;
 
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class UserToken {
+public class DeviceToken {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
@@ -36,7 +29,7 @@ public class UserToken {
 	private LocalDateTime createdAt;
 
 	@Builder
-	public UserToken(Long id, Member member, String token, LocalDateTime createdAt) {
+	public DeviceToken(Long id, Member member, String token, LocalDateTime createdAt) {
 		this.id = id;
 		this.member = member;
 		this.token = token;

diff --git a/src/main/java/org/swmaestro/repl/gifthub/auth/entity/RefreshToken.java b/src/main/java/org/swmaestro/repl/gifthub/auth/entity/RefreshToken.java
@@ -1,35 +1,37 @@
 package org.swmaestro.repl.gifthub.auth.entity;
 
-import org.swmaestro.repl.gifthub.util.BaseTimeEntity;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
+import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedDate;
+
+import java.time.LocalDateTime;
 
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class RefreshToken extends BaseTimeEntity {
+public class RefreshToken {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
 
 	@Column(nullable = false)
-	private String refreshToken;
+	private String token;
 
 	@Column(length = 60, nullable = false)
 	private String username;
 
+	@CreatedDate
+	@Column(nullable = false)
+	private LocalDateTime createdAt;
+
 	@Builder
-	public RefreshToken(Long id, String refreshToken, String username) {
+	public RefreshToken(Long id, String token, String username, LocalDateTime createdAt) {
 		this.id = id;
-		this.refreshToken = refreshToken;
+		this.token = token;
 		this.username = username;
+		this.createdAt = createdAt;
 	}
 }
diff --git a/src/main/java/org/swmaestro/repl/gifthub/auth/repository/DeviceTokenRepository.java b/src/main/java/org/swmaestro/repl/gifthub/auth/repository/DeviceTokenRepository.java
@@ -0,0 +1,7 @@
+package org.swmaestro.repl.gifthub.auth.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.swmaestro.repl.gifthub.auth.entity.DeviceToken;
+
+public interface DeviceTokenRepository extends JpaRepository<DeviceToken, Long> {
+}
diff --git a/src/main/java/org/swmaestro/repl/gifthub/auth/repository/UserTokenRepository.java b/src/main/java/org/swmaestro/repl/gifthub/auth/repository/UserTokenRepository.java
diff --git a/src/main/java/org/swmaestro/repl/gifthub/auth/service/RefreshTokenService.java b/src/main/java/org/swmaestro/repl/gifthub/auth/service/RefreshTokenService.java
@@ -23,8 +23,9 @@ public class RefreshTokenService {
 	@Transactional
 	public void storeRefreshToken(TokenDto tokenDto, String username) {
 		RefreshToken refreshToken = RefreshToken.builder()
-				.refreshToken(tokenDto.getRefreshToken())
+				.token(tokenDto.getRefreshToken())
 				.username(username)
+				.createdAt(jwtProvider.getIssuedAt(tokenDto.getRefreshToken()))
 				.build();
 
 		if (refreshTokenRepository.findByUsername(username).isPresent()) {

diff --git a/src/main/java/org/swmaestro/repl/gifthub/util/JwtProvider.java b/src/main/java/org/swmaestro/repl/gifthub/util/JwtProvider.java
@@ -1,9 +1,9 @@
 package org.swmaestro.repl.gifthub.util;
 
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-import java.util.Date;
-
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jws;
+import io.jsonwebtoken.Jwts;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -15,10 +15,10 @@
 import org.swmaestro.repl.gifthub.exception.ErrorCode;
 import org.swmaestro.repl.gifthub.security.JpaUserDetailsService;
 
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jws;
-import io.jsonwebtoken.Jwts;
-import jakarta.servlet.http.HttpServletRequest;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
 
 @Component
 @PropertySource("classpath:application.yml")
@@ -30,8 +30,8 @@ public class JwtProvider {
 	private final RefreshTokenRepository refreshTokenRepository;
 
 	public JwtProvider(@Value("${jwt.secret-key}") String secretKey, @Value("${jwt.expiration-time}") long expiration,
-		@Value("${issuer}") String issuer, JpaUserDetailsService userDetailsService,
-		RefreshTokenRepository refreshTokenRepository) {
+	                   @Value("${issuer}") String issuer, JpaUserDetailsService userDetailsService,
+	                   RefreshTokenRepository refreshTokenRepository) {
 		this.secretKey = secretKey;
 		this.expiration = expiration;
 		this.issuer = issuer;
@@ -47,12 +47,12 @@ public JwtProvider(@Value("${jwt.secret-key}") String secretKey, @Value("${jwt.e
 	 */
 	public String generateToken(String username) {
 		return io.jsonwebtoken.Jwts.builder()
-			.setSubject(username)
-			.setIssuer(issuer)
-			.setIssuedAt(new java.util.Date(System.currentTimeMillis()))
-			.setExpiration(new java.util.Date(System.currentTimeMillis() + expiration))
-			.signWith(io.jsonwebtoken.SignatureAlgorithm.HS512, secretKey.getBytes())
-			.compact();
+				.setSubject(username)
+				.setIssuer(issuer)
+				.setIssuedAt(new java.util.Date(System.currentTimeMillis()))
+				.setExpiration(new java.util.Date(System.currentTimeMillis() + expiration))
+				.signWith(io.jsonwebtoken.SignatureAlgorithm.HS512, secretKey.getBytes())
+				.compact();
 	}
 
 	/**
@@ -106,11 +106,11 @@ public Authentication getAuthentication(String token) {
 	 */
 	public String getUsername(String token) {
 		return Jwts.parserBuilder()
-			.setSigningKey(secretKey.getBytes())
-			.build()
-			.parseClaimsJws(token)
-			.getBody()
-			.getSubject();
+				.setSigningKey(secretKey.getBytes())
+				.build()
+				.parseClaimsJws(token)
+				.getBody()
+				.getSubject();
 	}
 
 	/**
@@ -121,12 +121,12 @@ public String getUsername(String token) {
 	 */
 	public String generateRefreshToken(String username) {
 		return io.jsonwebtoken.Jwts.builder()
-			.setSubject(username)
-			.setIssuer(issuer)
-			.setIssuedAt(new java.util.Date(System.currentTimeMillis()))
-			.setExpiration(Date.from(Instant.now().plus(15, ChronoUnit.DAYS)))
-			.signWith(io.jsonwebtoken.SignatureAlgorithm.HS512, secretKey.getBytes())
-			.compact();
+				.setSubject(username)
+				.setIssuer(issuer)
+				.setIssuedAt(new java.util.Date(System.currentTimeMillis()))
+				.setExpiration(Date.from(Instant.now().plus(15, ChronoUnit.DAYS)))
+				.signWith(io.jsonwebtoken.SignatureAlgorithm.HS512, secretKey.getBytes())
+				.compact();
 	}
 
 	/**
@@ -137,11 +137,30 @@ public String generateRefreshToken(String username) {
 	 */
 	public String reissueAccessToken(String refreshToken) {
 		String username = getUsername(refreshToken);
-		String storedRefreshToken = refreshTokenRepository.findByUsername(username).get().getRefreshToken();
+		String storedRefreshToken = refreshTokenRepository.findByUsername(username).get().getToken();
 
 		if (!refreshToken.equals(storedRefreshToken)) {
 			throw new BusinessException("RefreshToken이 유효하지 않습니다.", ErrorCode.INVALID_AUTHENTICATION);
 		}
 		return generateToken(username);
 	}
+
+	/**
+	 * 토큰 발급 시간을 가져오는 메소드
+	 *
+	 * @param token
+	 * @return 발급 시간
+	 */
+	public LocalDateTime getIssuedAt(String token) {
+		return Jwts.parserBuilder()
+				.setSigningKey(secretKey.getBytes())
+				.build()
+				.parseClaimsJws(token)
+				.getBody()
+				.getIssuedAt()
+				.toInstant()
+				.atZone(java.time.ZoneId.systemDefault())
+				.toLocalDateTime();
+
+	}
 }