Добавлено локальное хранение токена авторизации

app/build.gradle.kts

@@ -54,6 +54,7 @@ dependencies {
     implementation(project(":core:navigation-api"))
     implementation(project(":core:ui"))
     implementation(project(":core:navigation-impl"))
+    implementation(project(":core:datastore-impl"))
 
     //Timber
     implementation(libs.timber)

app/src/main/java/ru/yeahub/Application.kt

@@ -3,6 +3,7 @@ package ru.yeahub
 import android.app.Application
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
+import ru.yeahub.datastore_api.di.datastoreModule
 import ru.yeahub.detail_question.impl.di.detailQuestionFeatureModule
 import ru.yeahub.example_details.impl.detailsFeatureModule
 import ru.yeahub.example_home.impl.data.di.questionsMainFeatureModule
@@ -45,6 +46,7 @@ class Application : Application() {
             modules(
                 networkModule,
                 navigationPathModule,
+                datastoreModule,
                 questionsModule,
                 profileFeatureModule,
                 questionsMainFeatureModule,

core/datastore-api/build.gradle.kts

@@ -0,0 +1,43 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace = "ru.yeahub.datastore_api"
+    compileSdk = 35
+
+    defaultConfig {
+        minSdk = 24
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
+dependencies {
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}

core/datastore-api/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

core/datastore-api/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

core/datastore-api/src/main/java/ru/yeahub/datastore_api/TokenDataStore.kt

@@ -0,0 +1,16 @@
+package ru.yeahub.datastore_api
+
+/**
+ * Контракт локального хранения токена авторизации:
+ * - saveAccessToken - сохраняет access token
+ * - getAccessToken - возвращает сохранённый access token
+ * - clearTokens - очищает токены авторизации
+ */
+interface TokenDataStore {
+
+    suspend fun saveAccessToken(accessToken: String)
+
+    suspend fun getAccessToken(): String?
+
+    suspend fun clearTokens()
+}

core/datastore-impl/build.gradle.kts

@@ -0,0 +1,46 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace = "ru.yeahub.datastore_impl"
+    compileSdk = 35
+
+    defaultConfig {
+        minSdk = 24
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
+dependencies {
+    implementation(project(":core:datastore-api"))
+    implementation(libs.androidx.datastore.preferences)
+    implementation(libs.koin.core)
+    implementation(libs.koin.android)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}

core/datastore-impl/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

core/datastore-impl/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

core/datastore-impl/src/main/java/ru/yeahub/datastore_api/TokenDataStoreImpl.kt

@@ -0,0 +1,38 @@
+package ru.yeahub.datastore_api
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import kotlinx.coroutines.flow.first
+
+/**
+ * Реализация локального хранения токена через Preferences DataStore:
+ * - сохраняет access token
+ * - читает access token
+ * - очищает токены авторизации
+ */
+class TokenDataStoreImpl(
+    private val dataStore: DataStore<Preferences>,
+) : TokenDataStore {
+
+    override suspend fun saveAccessToken(accessToken: String) {
+        dataStore.edit { preferences ->
+            preferences[ACCESS_TOKEN_KEY] = accessToken
+        }
+    }
+
+    override suspend fun getAccessToken(): String? {
+        return dataStore.data.first()[ACCESS_TOKEN_KEY]
+    }
+
+    override suspend fun clearTokens() {
+        dataStore.edit { preferences ->
+            preferences.remove(ACCESS_TOKEN_KEY)
+        }
+    }
+
+    private companion object {
+        private val ACCESS_TOKEN_KEY = stringPreferencesKey("access_token")
+    }
+}

core/datastore-impl/src/main/java/ru/yeahub/datastore_api/di/DatastoreModule.kt

@@ -0,0 +1,42 @@
+package ru.yeahub.datastore_api.di
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.emptyPreferences
+import androidx.datastore.preferences.preferencesDataStoreFile
+import androidx.datastore.preferences.core.PreferenceDataStoreFactory
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.module
+import ru.yeahub.datastore_api.TokenDataStore
+import ru.yeahub.datastore_api.TokenDataStoreImpl
+
+/**
+ * DI модуль локального хранения:
+ * - создаёт Preferences DataStore
+ * - регистрирует TokenDataStore
+ */
+val datastoreModule = module {
+    single<DataStore<Preferences>> {
+        PreferenceDataStoreFactory.create(
+            corruptionHandler = ReplaceFileCorruptionHandler(
+                produceNewData = {
+                    emptyPreferences()
+                },
+            ),
+            produceFile = {
+                androidContext().preferencesDataStoreFile(
+                    name = DATASTORE_FILE_NAME,
+                )
+            },
+        )
+    }
+
+    singleOf(::TokenDataStoreImpl) {
+        bind<TokenDataStore>()
+    }
+}
+
+private const val DATASTORE_FILE_NAME = "auth_preferences"

feature/authentication/impl/build.gradle.kts

@@ -46,6 +46,7 @@ android {
 }
 
 dependencies {
+    implementation(project(":core:datastore-api"))
     implementation(project(":core:navigation-api"))
     implementation(project(":core:network-api"))
     implementation(libs.androidx.compose.material.icons.extended)

feature/authentication/impl/src/main/java/ru/yeahub/authentication/impl/login/data/repository/LoginRepositoryImpl.kt

@@ -12,6 +12,7 @@ import ru.yeahub.authentication.impl.login.domain.entity.LoginError
 import ru.yeahub.authentication.impl.login.domain.entity.LoginException
 import ru.yeahub.authentication.impl.login.domain.entity.LoginModel
 import ru.yeahub.authentication.impl.login.domain.repository.LoginRepositoryApi
+import ru.yeahub.datastore_api.TokenDataStore
 import ru.yeahub.network_api.models.ErrorResponseDto
 import java.io.IOException
 
@@ -26,14 +27,28 @@ class LoginRepositoryImpl(
     private val remoteDataSourceApi: LoginRemoteDataSourceApi,
     private val domainToDataMapper: LoginDomainToDataMapper,
     private val responseToDomainMapper: LoginResponseToDomainMapper,
+    private val tokenDataStore: TokenDataStore,
     private val gson: Gson,
 ) : LoginRepositoryApi {
 
+    /**
+     * Выполняет авторизацию пользователя:
+     * - преобразует LoginModel в request DTO
+     * - вызывает backend
+     * - преобразует response DTO в AuthResult
+     * - сохраняет access token в локальное хранилище
+     */
     override suspend fun login(loginModel: LoginModel): AuthResult {
         return try {
             val request = domainToDataMapper.map(loginModel)
             val response = remoteDataSourceApi.login(request)
-            responseToDomainMapper.map(response)
+            val authResult = responseToDomainMapper.map(response)
+
+            tokenDataStore.saveAccessToken(
+                accessToken = authResult.tokens.accessToken,
+            )
+
+            authResult
         } catch (exception: CancellationException) {
             throw exception
         } catch (exception: IOException) {

feature/authentication/impl/src/main/java/ru/yeahub/authentication/impl/login/di/LoginFeatureModule.kt

@@ -12,7 +12,9 @@ import ru.yeahub.authentication.impl.login.data.repository.remote.LoginRemoteDat
 import ru.yeahub.authentication.impl.login.data.repository.LoginRepositoryImpl
 import ru.yeahub.authentication.impl.login.data.repository.remote.LoginRemoteDataSourceImpl
 import ru.yeahub.authentication.impl.login.domain.repository.LoginRepositoryApi
+import ru.yeahub.authentication.impl.login.domain.usecase.CheckAuthStateUseCase
 import ru.yeahub.authentication.impl.login.domain.usecase.LoginUseCase
+import ru.yeahub.authentication.impl.login.domain.usecase.LogoutUseCase
 import ru.yeahub.authentication.impl.login.presentation.mapper.LoginStateMapper
 import ru.yeahub.authentication.impl.login.presentation.viewmodel.LoginViewModel
 
@@ -38,7 +40,9 @@ val loginFeatureModule = module {
         bind<LoginRepositoryApi>()
     }
 
+    factoryOf(::CheckAuthStateUseCase)
     factoryOf(::LoginUseCase)
+    factoryOf(::LogoutUseCase)
 
     singleOf(::LoginStateMapper)
     viewModelOf(::LoginViewModel)

feature/authentication/impl/src/main/java/ru/yeahub/authentication/impl/login/domain/usecase/CheckAuthStateUseCase.kt

@@ -0,0 +1,16 @@
+package ru.yeahub.authentication.impl.login.domain.usecase
+
+import ru.yeahub.datastore_api.TokenDataStore
+
+/**
+ * UseCase проверки авторизации пользователя:
+ * - возвращает true, если access token сохранён
+ */
+class CheckAuthStateUseCase(
+    private val tokenDataStore: TokenDataStore,
+) {
+
+    suspend operator fun invoke(): Boolean {
+        return tokenDataStore.getAccessToken().isNullOrBlank().not()
+    }
+}

feature/authentication/impl/src/main/java/ru/yeahub/authentication/impl/login/domain/usecase/LogoutUseCase.kt

@@ -0,0 +1,16 @@
+package ru.yeahub.authentication.impl.login.domain.usecase
+
+import ru.yeahub.datastore_api.TokenDataStore
+
+/**
+ * UseCase выхода из аккаунта:
+ * - очищает сохранённые токены авторизации
+ */
+class LogoutUseCase(
+    private val tokenDataStore: TokenDataStore,
+) {
+
+    suspend operator fun invoke() {
+        tokenDataStore.clearTokens()
+    }
+}

gradle/libs.versions.toml

@@ -34,6 +34,7 @@ runtimeVersion = "1.10.2"
 ui = "1.10.2"
 foundation = "1.10.2"
 material3 = "1.4.0"
+datastorePreferences = "1.2.1"
 
 [libraries]
 androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
@@ -59,6 +60,9 @@ androidx-icons = { group = "androidx.compose.material", name = "material-icons-e
 compose-markdown = { group = "com.github.jeziellago", name = "compose-markdown", version = "0.5.7" }
 #androidx-material = { module = "androidx.compose.material:material", version.ref = "composeBom" }
 
+#DATASTORE
+androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" }
+
 #RETROFIT
 retrofit-core = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
 retrofit-gsonConverter = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" }