Feat: 토큰 재발급 api 연동

Author: wjdrjs00

core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/storage/AuthTokenDataStore.kt

@@ -5,14 +5,8 @@ import kotlinx.coroutines.flow.Flow
 
 interface AuthTokenDataStore {
     val tokenFlow: Flow<AuthToken>
-
-    suspend fun hasToken(): Boolean
-
     suspend fun updateAuthToken(accessToken: String, refreshToken: String)
-
     suspend fun updateAccessToken(accessToken: String)
-
     suspend fun updateRefreshToken(refreshToken: String)
-
     suspend fun clearAuthToken()
 }

core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/storage/AuthTokenDataStoreImpl.kt

@@ -3,24 +3,12 @@ package com.threegap.bitnagil.datastore.auth.storage
 import androidx.datastore.core.DataStore
 import com.threegap.bitnagil.datastore.auth.model.AuthToken
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.firstOrNull
 
 class AuthTokenDataStoreImpl(
     private val dataStore: DataStore<AuthToken>,
 ) : AuthTokenDataStore {
     override val tokenFlow: Flow<AuthToken> = dataStore.data
 
-    override suspend fun hasToken(): Boolean {
-        return try {
-            val currentToken = dataStore.data.firstOrNull()
-            currentToken?.let {
-                !it.accessToken.isNullOrEmpty() && !it.refreshToken.isNullOrEmpty()
-            } ?: false
-        } catch (e: Exception) {
-            false
-        }
-    }
-
     override suspend fun updateAuthToken(accessToken: String, refreshToken: String) {
         try {
             dataStore.updateData {
@@ -58,8 +46,4 @@ class AuthTokenDataStoreImpl(
             throw e
         }
     }
-
-    companion object {
-        private const val TAG = "AuthTokenDataStore"
-    }
 }

data/src/main/java/com/threegap/bitnagil/data/auth/datasource/AuthLocalDataSource.kt

@@ -1,9 +1,7 @@
 package com.threegap.bitnagil.data.auth.datasource
 
 interface AuthLocalDataSource {
-    suspend fun hasToken(): Boolean
-
+    suspend fun getRefreshToken(): String?
     suspend fun updateAuthToken(accessToken: String, refreshToken: String): Result<Unit>
-
     suspend fun clearAuthToken(): Result<Unit>
 }

data/src/main/java/com/threegap/bitnagil/data/auth/datasource/AuthRemoteDataSource.kt

@@ -6,10 +6,8 @@ import com.threegap.bitnagil.data.auth.model.response.LoginResponseDto
 
 interface AuthRemoteDataSource {
     suspend fun login(socialAccessToken: String, loginRequestDto: LoginRequestDto): Result<LoginResponseDto>
-
     suspend fun submitAgreement(termsAgreementRequestDto: TermsAgreementRequestDto): Result<Unit>
-
     suspend fun logout(): Result<Unit>
-
     suspend fun withdrawal(): Result<Unit>
+    suspend fun reissueToken(refreshToken: String): Result<LoginResponseDto>
 }

data/src/main/java/com/threegap/bitnagil/data/auth/datasourceimpl/AuthLocalDataSourceImpl.kt

@@ -2,13 +2,17 @@ package com.threegap.bitnagil.data.auth.datasourceimpl
 
 import com.threegap.bitnagil.data.auth.datasource.AuthLocalDataSource
 import com.threegap.bitnagil.datastore.auth.storage.AuthTokenDataStore
+import kotlinx.coroutines.flow.firstOrNull
 import javax.inject.Inject
 
 class AuthLocalDataSourceImpl @Inject constructor(
     private val authTokenDataStore: AuthTokenDataStore,
 ) : AuthLocalDataSource {
 
-    override suspend fun hasToken(): Boolean = authTokenDataStore.hasToken()
+    override suspend fun getRefreshToken(): String? {
+        val refreshToken = authTokenDataStore.tokenFlow.firstOrNull()?.refreshToken
+        return refreshToken
+    }
 
     override suspend fun updateAuthToken(accessToken: String, refreshToken: String): Result<Unit> =
         runCatching {

data/src/main/java/com/threegap/bitnagil/data/auth/datasourceimpl/AuthRemoteDataSourceImpl.kt

@@ -31,4 +31,9 @@ class AuthRemoteDataSourceImpl @Inject constructor(
         safeUnitApiCall {
             authService.postWithdrawal()
         }
+
+    override suspend fun reissueToken(refreshToken: String): Result<LoginResponseDto> =
+        safeApiCall {
+            authService.postReissueToken(refreshToken)
+        }
 }

data/src/main/java/com/threegap/bitnagil/data/auth/repositoryimpl/AuthRepositoryImpl.kt

@@ -18,11 +18,6 @@ class AuthRepositoryImpl @Inject constructor(
         authRemoteDataSource.login(socialAccessToken, LoginRequestDto(socialType))
             .map { it.toDomain() }
 
-    override suspend fun hasToken(): Boolean = authLocalDataSource.hasToken()
-
-    override suspend fun updateAuthToken(accessToken: String, refreshToken: String): Result<Unit> =
-        authLocalDataSource.updateAuthToken(accessToken, refreshToken)
-
     override suspend fun submitAgreement(termsAgreement: TermsAgreement): Result<Unit> =
         authRemoteDataSource.submitAgreement(
             termsAgreement.toDto(),
@@ -39,4 +34,16 @@ class AuthRepositoryImpl @Inject constructor(
             if (it.isSuccess) authLocalDataSource.clearAuthToken()
         }
     }
+
+    override suspend fun reissueToken(refreshToken: String): Result<AuthSession> =
+        authRemoteDataSource.reissueToken(refreshToken).map { it.toDomain() }
+
+    override suspend fun getRefreshToken(): String? =
+        authLocalDataSource.getRefreshToken()
+
+    override suspend fun updateAuthToken(accessToken: String, refreshToken: String): Result<Unit> =
+        authLocalDataSource.updateAuthToken(accessToken, refreshToken)
+
+    override suspend fun clearAuthToken(): Result<Unit> =
+        authLocalDataSource.clearAuthToken()
 }

data/src/main/java/com/threegap/bitnagil/data/auth/service/AuthService.kt

@@ -27,4 +27,10 @@ interface AuthService {
 
     @POST("/api/v1/auth/logout")
     suspend fun postLogout(): BaseResponse<Unit>
+
+    @POST("/api/v1/auth/token/reissue")
+    @Headers("No-Service-Token: true")
+    suspend fun postReissueToken(
+        @Header("Refresh-Token") refreshToken: String,
+    ): BaseResponse<LoginResponseDto>
 }