This should fix the errors with the current impl I tried

DreamExposure · Oct 6, 2023 · aa48f65 · aa48f65
1 parent a90b1da
commit aa48f65
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/business/CredentialService.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/business/CredentialService.kt
@@ -19,12 +19,14 @@ class DefaultCredentialService(
         val encryptedRefreshToken = Credential.aes.encrypt(credential.refreshToken).awaitSingle()
         val encryptedAccessToken = Credential.aes.encrypt(credential.accessToken).awaitSingle()
 
-        val saved = credentialsRepository.save(CredentialData(
+        val savedData = credentialsRepository.save(CredentialData(
             credentialNumber = credential.credentialNumber,
             accessToken = encryptedAccessToken,
             refreshToken = encryptedRefreshToken,
             expiresAt = credential.expiresAt.toEpochMilli(),
-        )).map(::Credential).awaitSingle()
+        )).awaitSingle()
+        val saved = Credential(savedData)
+
 
         credentialsCache.put(key = saved.credentialNumber, value = saved)
         return saved
@@ -34,11 +36,10 @@ class DefaultCredentialService(
         var credential = credentialsCache.get(key = number)
         if (credential != null) return credential
 
-        credential = credentialsRepository.findByCredentialNumber(number)
-            .map(::Credential)
-            .awaitSingle()
+        val data = credentialsRepository.findByCredentialNumber(number).awaitSingle()
+        credential = Credential(data)
 
-        if (credential != null) credentialsCache.put(key = number, value = credential)
+        credentialsCache.put(key = number, value = credential)
         return credential
     }
 

diff --git a/...discal/core/cache/RedisCacheRepository.kt → .../core/cache/RedisStringCacheRepository.kt b/...discal/core/cache/RedisCacheRepository.kt → .../core/cache/RedisStringCacheRepository.kt
diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/object/new/Credential.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/object/new/Credential.kt
@@ -7,24 +7,23 @@ import org.dreamexposure.discal.core.database.CredentialData
 import org.dreamexposure.discal.core.extensions.asInstantMilli
 import java.time.Instant
 
-data class Credential(
+
+@Suppress("DataClassPrivateConstructor")
+data class Credential private constructor(
     val credentialNumber: Int,
     var expiresAt: Instant,
+    var refreshToken: String,
+    var accessToken: String,
 ) {
-    lateinit var refreshToken: String
-    lateinit var accessToken: String
-
-    constructor(data: CredentialData) : this(
-        credentialNumber = data.credentialNumber,
-        expiresAt = data.expiresAt.asInstantMilli(),
-    ) {
-        suspend {
-            refreshToken = aes.decrypt(data.refreshToken).awaitSingle()
-            accessToken = aes.decrypt(data.accessToken).awaitSingle()
-        }
-    }
 
     companion object {
         val aes = AESEncryption(Config.SECRET_GOOGLE_CREDENTIAL_KEY.getString())
+
+        suspend operator fun invoke(data: CredentialData) = Credential(
+            credentialNumber = data.credentialNumber,
+            expiresAt = data.expiresAt.asInstantMilli(),
+            refreshToken = aes.decrypt(data.refreshToken).awaitSingle(),
+            accessToken = aes.decrypt(data.accessToken).awaitSingle(),
+        )
     }
 }