Нормальные токены

2026-04-19 22:55:38 +03:00
parent f6400ce3ac
commit 945134f029
15 changed files with 116 additions and 14 deletions
@@ -2,6 +2,7 @@ package auth.data.repository

 import auth.data.remote.api.AuthApi
 import auth.data.remote.dto.AuthRequest
+import auth.data.remote.dto.RefreshTokenRequest
 import auth.domain.model.AuthResult
 import auth.domain.repository.AuthRepository
 import core.network.ServerConfig
@@ -25,12 +26,13 @@ class AuthRepositoryImpl @Inject constructor(
            val token = response.accessToken ?: return Result.failure(Exception("Token is null"))
            val userId = response.userId ?: ""
            
-            tokenManager.saveToken(token, userId)
+            tokenManager.saveToken(token, userId, response.refreshToken)
            _isAuthenticated.value = true
            fetchConfig()
            Result.success(
                AuthResult(
                    token = token,
+                    refreshToken = response.refreshToken,
                    userId = userId,
                    userName = response.username ?: userName,
                    displayName = response.displayName ?: response.username ?: userName,
@@ -48,12 +50,13 @@ class AuthRepositoryImpl @Inject constructor(
            val token = response.accessToken ?: return Result.failure(Exception("Token is null"))
            val userId = response.userId ?: ""

-            tokenManager.saveToken(token, userId)
+            tokenManager.saveToken(token, userId, response.refreshToken)
            _isAuthenticated.value = true
            fetchConfig()
            Result.success(
                AuthResult(
                    token = token,
+                    refreshToken = response.refreshToken,
                    userId = userId,
                    userName = response.username ?: userName,
                    displayName = response.displayName ?: response.username ?: userName,
@@ -95,4 +98,34 @@ class AuthRepositoryImpl @Inject constructor(
            // Silent fail
        }
    }
+
+    override suspend fun refreshToken(): Result<AuthResult> {
+        val currentRefreshToken = tokenManager.getRefreshToken()
+        if (currentRefreshToken == null) {
+            return Result.failure(Exception("Refresh token is null"))
+        }
+
+        return try {
+            val response = api.refreshToken(RefreshTokenRequest(currentRefreshToken))
+            val newAccessToken = response.accessToken ?: return Result.failure(Exception("New access token is null"))
+            val newRefreshToken = response.refreshToken
+            val userId = response.userId ?: ""
+
+            tokenManager.saveToken(newAccessToken, userId, newRefreshToken)
+            _isAuthenticated.value = true
+
+            Result.success(
+                AuthResult(
+                    token = newAccessToken,
+                    refreshToken = newRefreshToken,
+                    userId = userId,
+                    userName = response.username ?: "",
+                    displayName = response.displayName ?: "",
+                    avatarUrl = null
+                )
+            )
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
 }