From 1dde5efd61954def49c481d8649fbefa9ee246e0 Mon Sep 17 00:00:00 2001
From: Mikhail Yasnov <yasnov.mi@gmail.com>
Date: Fri, 2 Jul 2021 14:57:29 +0300
Subject: [PATCH] Rename RefreshToken usedAt field

---
 .../ru/touchin/auth/core/tokens/refresh/dto/RefreshToken.kt | 2 +-
 .../auth/core/tokens/refresh/models/RefreshTokenEntity.kt   | 4 ++--
 .../core/tokens/refresh/services/RefreshTokenCoreService.kt | 2 +-
 .../tokens/refresh/services/RefreshTokenCoreServiceImpl.kt  | 6 +++---
 .../core/202107021246__alter_table__refresh_tokens.yml      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/dto/RefreshToken.kt b/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/dto/RefreshToken.kt
index c8a67cd..b9ae985 100644
--- a/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/dto/RefreshToken.kt
+++ b/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/dto/RefreshToken.kt
@@ -6,6 +6,6 @@ import java.time.ZonedDateTime
 data class RefreshToken(
     val value: String,
     val expiresAt: ZonedDateTime,
-    val refreshedAt: ZonedDateTime?,
+    val usedAt: ZonedDateTime?,
     val user: User,
 )
diff --git a/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/models/RefreshTokenEntity.kt b/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/models/RefreshTokenEntity.kt
index 879b43a..5a76bef 100644
--- a/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/models/RefreshTokenEntity.kt
+++ b/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/models/RefreshTokenEntity.kt
@@ -25,7 +25,7 @@ class RefreshTokenEntity : AuditableUuidIdEntity() {
 
     lateinit var expiresAt: ZonedDateTime
 
-    var refreshedAt: ZonedDateTime? = null
+    var usedAt: ZonedDateTime? = null
 
     @ManyToOne
     @JoinColumn(name = "user_id")
@@ -45,7 +45,7 @@ class RefreshTokenEntity : AuditableUuidIdEntity() {
     lateinit var scopes: Set<ScopeEntity>
 
     fun validate(): RefreshTokenEntity = this.apply {
-        if (expiresAt.isExpired() || refreshedAt != null) {
+        if (expiresAt.isExpired() || usedAt != null) {
             throw RefreshTokenExpiredException(value)
         }
     }
diff --git a/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/services/RefreshTokenCoreService.kt b/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/services/RefreshTokenCoreService.kt
index cafe4ad..a1b15bc 100644
--- a/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/services/RefreshTokenCoreService.kt
+++ b/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/services/RefreshTokenCoreService.kt
@@ -7,6 +7,6 @@ interface RefreshTokenCoreService {
 
     fun get(value: String): RefreshToken
     fun create(token: NewRefreshToken): RefreshToken
-    fun setRefreshed(value: String): RefreshToken
+    fun setUsed(value: String): RefreshToken
 
 }
diff --git a/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/services/RefreshTokenCoreServiceImpl.kt b/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/services/RefreshTokenCoreServiceImpl.kt
index 30663d6..b5f572a 100644
--- a/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/services/RefreshTokenCoreServiceImpl.kt
+++ b/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/services/RefreshTokenCoreServiceImpl.kt
@@ -53,11 +53,11 @@ class RefreshTokenCoreServiceImpl(
     }
 
     @Transactional
-    override fun setRefreshed(value: String): RefreshToken {
+    override fun setUsed(value: String): RefreshToken {
         val refreshToken = refreshTokenRepository.findByValueOrThrow(value)
             .validate()
             .apply {
-                refreshedAt = ZonedDateTime.now()
+                usedAt = ZonedDateTime.now()
             }
 
         return refreshTokenRepository.save(refreshToken)
@@ -81,7 +81,7 @@ class RefreshTokenCoreServiceImpl(
             return RefreshToken(
                 value = value,
                 expiresAt = expiresAt,
-                refreshedAt = refreshedAt,
+                usedAt = usedAt,
                 user = user.toDto(device)
             )
         }
diff --git a/auth-jwt-core/src/main/resources/auth/db/changelog/core/202107021246__alter_table__refresh_tokens.yml b/auth-jwt-core/src/main/resources/auth/db/changelog/core/202107021246__alter_table__refresh_tokens.yml
index 39fa49b..e22ba2b 100644
--- a/auth-jwt-core/src/main/resources/auth/db/changelog/core/202107021246__alter_table__refresh_tokens.yml
+++ b/auth-jwt-core/src/main/resources/auth/db/changelog/core/202107021246__alter_table__refresh_tokens.yml
@@ -11,5 +11,5 @@ databaseChangeLog:
             tableName: refresh_tokens
             columns:
               - column:
-                  name: refreshed_at
+                  name: used_at
                   type: TIMESTAMP WITH TIME ZONE