Feature/50 domain data acc

app/build.gradle.kts

@@ -12,6 +12,7 @@ plugins {
     alias(libs.plugins.firebase.crashlytics.gradle)
     alias(libs.plugins.gms.googleServices)
     alias(libs.plugins.firebase.appdistribution)
+    alias(libs.plugins.kotlin.parcelize)
 }
 
 android {
@@ -184,6 +185,10 @@ dependencies {
 
     //Sign-In
     implementation(libs.play.services.auth)
+
+    //Crypto
+    implementation(libs.crypto)
+
 }
 
 kapt {

app/src/main/java/app/cashadvisor/authorization/data/dto/CredentialsDto.kt

@@ -0,0 +1,12 @@
+package app.cashadvisor.authorization.data.dto
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
+
+@Serializable
+@Parcelize
+data class CredentialsDto(
+    val accessToken: String,
+    val refreshToken: String,
+) : Parcelable

app/src/main/java/app/cashadvisor/authorization/data/impl/CredentialsStorageImpl.kt

@@ -0,0 +1,37 @@
+package app.cashadvisor.authorization.data.impl
+import kotlinx.serialization.json.Json
+import android.content.SharedPreferences
+import app.cashadvisor.authorization.data.dto.CredentialsDto
+import app.cashadvisor.authorization.domain.api.CredentialsStorage
+import kotlinx.serialization.encodeToString
+
+class CredentialsStorageImpl(
+    private val storage: SharedPreferences,
+    private val key: String,
+    private val json: Json
+) : CredentialsStorage {
+
+    /**
+     * todo подумать, чтобы отнаследоваться от CoroutineScope by CoroutineScope(
+     *     Dispatchers.IO +
+     *         SupervisorJob() и транслировать key в asSharedFlow()
+     */
+
+    override fun saveCredentials(credentials: CredentialsDto) {
+        val data = json.encodeToString(credentials)
+        storage.edit().putString(key, data).apply()
+    }
+
+    override fun getCredentials(): CredentialsDto? {
+        val data = storage.getString(key, null)
+        return data?.let { json.decodeFromString<CredentialsDto>(it) }
+    }
+
+    override fun hasCredentials(): Boolean {
+        return storage.contains(key)
+    }
+
+    override fun clearCredentials() {
+        storage.edit().remove(key).apply()
+    }
+}

app/src/main/java/app/cashadvisor/authorization/di/AuthorizationDataModule.kt

@@ -0,0 +1,53 @@
+package app.cashadvisor.authorization.di
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.security.crypto.EncryptedSharedPreferences
+import androidx.security.crypto.MasterKeys
+import app.cashadvisor.authorization.data.impl.CredentialsStorageImpl
+import app.cashadvisor.authorization.domain.api.CredentialsStorage
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import kotlinx.serialization.json.Json
+import javax.inject.Singleton
+
+
+@Module
+@InstallIn(SingletonComponent::class)
+class AuthorizationDataModule {
+
+
+    @Provides
+    @Singleton
+    fun providesMasterKey(): String =
+        MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC)
+
+    @Provides
+    @Singleton
+    fun providesEncriptedSharedPreferences(@ApplicationContext context: Context): SharedPreferences {
+        val masterKey = providesMasterKey()
+        return EncryptedSharedPreferences.create(
+            SECRET_SETTINGS,
+            masterKey,
+            context,
+            EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun providesCredintialsStorage(
+        @ApplicationContext context: Context,
+        storage: SharedPreferences = providesEncriptedSharedPreferences(context),
+        key: String = CREDENTIALS_KEY,
+        gson: Json
+    ): CredentialsStorage = CredentialsStorageImpl(storage, key, gson)
+    companion object {
+        private const val SECRET_SETTINGS = "secret_shared_prefs"
+        private const val CREDENTIALS_KEY = "secret_credentials"
+    }
+}

app/src/main/java/app/cashadvisor/authorization/di/DomainModule.kt → app/src/main/java/app/cashadvisor/authorization/di/AuthorizationInteractorModule.kt

@@ -1,18 +1,20 @@
 package app.cashadvisor.authorization.di
 
-
 import app.cashadvisor.authorization.domain.api.AccountInformationInteractor
+import app.cashadvisor.authorization.domain.api.CredentialsStorage
 import app.cashadvisor.authorization.domain.impl.AccountInformationInteractorImpl
-import dagger.Binds
 import dagger.Module
+import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ViewModelComponent
 
+
 @Module
 @InstallIn(ViewModelComponent::class)
-abstract class DomainModule {
-    @Binds
-    abstract fun bindAccountInformationInteractor(
-        accountInformationInteractorImpl: AccountInformationInteractorImpl
-    ): AccountInformationInteractor
+class AuthorizationInteractorModule {
+    @Provides
+    fun providesAccountInformationInteractor(
+        storage: CredentialsStorage,
+    ): AccountInformationInteractor = AccountInformationInteractorImpl(storage)
+
 }

app/src/main/java/app/cashadvisor/authorization/domain/api/CredentialsStorage.kt

@@ -0,0 +1,12 @@
+package app.cashadvisor.authorization.domain.api
+
+import app.cashadvisor.authorization.data.dto.CredentialsDto
+
+interface CredentialsStorage {
+
+    fun saveCredentials(credentials: CredentialsDto)
+    fun getCredentials(): CredentialsDto?
+    fun hasCredentials(): Boolean
+    fun clearCredentials()
+
+}

app/src/main/java/app/cashadvisor/authorization/domain/impl/AccountInformationInteractorImpl.kt

@@ -1,25 +1,34 @@
 package app.cashadvisor.authorization.domain.impl
 
 import app.cashadvisor.authorization.domain.api.AccountInformationInteractor
+import app.cashadvisor.authorization.domain.api.CredentialsStorage
 import app.cashadvisor.authorization.domain.models.AccountInformation
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import java.util.Date
-import javax.inject.Inject
 
-class AccountInformationInteractorImpl @Inject constructor() : AccountInformationInteractor {
+class AccountInformationInteractorImpl(
+    private val storage: CredentialsStorage
+) : AccountInformationInteractor {
     override fun getAccountInformation(): Flow<AccountInformation> = flow {
-        // todo обновить класс с учетом реальных данных
-        emit(MOCK_ACCOUNT_INFORMATION)
+        if (storage.hasCredentials()) {
+            val data = storage.getCredentials()
+            data?.let {
+                emit(
+                    AccountInformation.Authorized(
+                        accessToken = it.accessToken,
+                        refreshToken = it.refreshToken
+                    )
+                )
+            }
+        } else {
+            emit(AccountInformation.NotAuthorized)
+        }
     }
 
     companion object {
         private val MOCK_ACCOUNT_INFORMATION = AccountInformation.Authorized(
-            email = "test@test.test",
-            token = "123",
+            accessToken = "123",
             refreshToken = "123",
-            isEmailVerified = true,
-            tokenValidTill = Date()
         )
     }
 

app/src/main/java/app/cashadvisor/authorization/domain/models/AccountInformation.kt

@@ -1,15 +1,9 @@
 package app.cashadvisor.authorization.domain.models
 
-import java.util.Date
-
 sealed class AccountInformation {
     object NotAuthorized : AccountInformation()
     data class Authorized(
-        // todo пока модель черновая, перепроверить что тут должно быть
-        val email: String? = null,
-        val token: String? = null,
-        val refreshToken: String? = null,
-        val isEmailVerified: Boolean = false,
-        val tokenValidTill: Date? = null
+        val accessToken: String,
+        val refreshToken: String
     ) : AccountInformation()
 }

app/src/main/java/app/cashadvisor/common/di/DataModule.kt

@@ -0,0 +1,18 @@
+package app.cashadvisor.common.di
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.serialization.json.Json
+import javax.inject.Singleton
+
+
+@Module
+@InstallIn(SingletonComponent::class)
+class DataModule {
+    @Provides
+    @Singleton
+    fun provideJson(): Json = Json { ignoreUnknownKeys = true }
+
+}

app/src/main/java/app/cashadvisor/main/presentation/ui/MainActivity.kt

@@ -2,23 +2,30 @@ package app.cashadvisor.main.presentation.ui
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.Gravity
 import android.view.View
 import android.widget.Button
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.setupWithNavController
 import app.cashadvisor.R
+import app.cashadvisor.authorization.data.dto.CredentialsDto
+import app.cashadvisor.authorization.domain.api.CredentialsStorage
 import app.cashadvisor.databinding.ActivityMainBinding
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityMainBinding
     private lateinit var navController: NavController
 
+    @Inject
+    lateinit var storage: CredentialsStorage
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -71,6 +78,47 @@ class MainActivity : AppCompatActivity() {
         }
         binding.root.addView(logAndCrashButton)
 
+        val storageButton = Button(this).apply {
+            text = "Storage"
+            setOnClickListener {
+                storage.saveCredentials(CredentialsDto(
+                    accessToken = "test",
+                    refreshToken = "test",
+                ))
+                Timber.tag("MainActivity").d("Credentials saved")
+                val credentials = storage.getCredentials()
+                Timber.tag("MainActivity").d("Credentials: $credentials")
+            }
+        }
+        var layoutParams =
+            ConstraintLayout.LayoutParams(ConstraintLayout.LayoutParams.WRAP_CONTENT,
+                ConstraintLayout.LayoutParams.WRAP_CONTENT)
+        layoutParams.topToTop = ConstraintLayout.LayoutParams.PARENT_ID
+        layoutParams.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID
+
+        with(binding.root as ConstraintLayout) {
+            addView(storageButton, layoutParams)
+        }
+
+        val deleteStorageButton = Button(this).apply {
+            text = "Delete Strorage"
+            setOnClickListener {
+                storage.clearCredentials()
+                Timber.tag("MainActivity").d("Credentials removed")
+                val credentials = storage.getCredentials()
+                Timber.tag("MainActivity").d("Credentials: $credentials")
+            }
+        }
+        layoutParams =
+            ConstraintLayout.LayoutParams(ConstraintLayout.LayoutParams.WRAP_CONTENT,
+                ConstraintLayout.LayoutParams.WRAP_CONTENT)
+        layoutParams.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID
+        layoutParams.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID
+
+        with(binding.root as ConstraintLayout) {
+            addView(deleteStorageButton, layoutParams)
+        }
+
 
         // Creates a button that mimics a crash when pressed
         /*val crashButton = TextView(this)

app/src/main/res/xml/backup_rules.xml

@@ -7,7 +7,6 @@
 -->
 <full-backup-content>
     <!--
-   <include domain="sharedpref" path="."/>
-   <exclude domain="sharedpref" path="device.xml"/>
--->
+   <include domain="sharedpref" path="."/>-->
+   <exclude domain="sharedpref" path="secret_shared_prefs.xml"/>
 </full-backup-content>

app/src/main/res/xml/data_extraction_rules.xml

@@ -9,11 +9,13 @@
         <include .../>
         <exclude .../>
         -->
+        <exclude domain="sharedpref" path="secret_shared_prefs.xml"/>
     </cloud-backup>
     <!--
     <device-transfer>
         <include .../>
         <exclude .../>
     </device-transfer>
     -->
+    <exclude domain="sharedpref" path="secret_shared_prefs.xml"/>
 </data-extraction-rules>

build.gradle.kts

@@ -16,4 +16,5 @@ plugins {
     alias(libs.plugins.gms.googleServices) apply false
     alias(libs.plugins.firebase.appdistribution) apply false
     alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.parcelize) apply false
 }

settings.gradle.kts

@@ -47,6 +47,7 @@ dependencyResolutionManagement {
             version("firebase.appdistribution", "4.0.1")
             version("android-library", "8.1.1")
             version("gms-play-services-auth", "20.7.0")
+            version("crypto", "1.0.0-alpha02")
 
             plugin(
                 "android-application",
@@ -98,6 +99,11 @@ dependencyResolutionManagement {
                 "com.android.library"
             ).versionRef("android-library")
 
+            plugin(
+                "kotlin-parcelize",
+                "org.jetbrains.kotlin.plugin.parcelize"
+            ).versionRef("kotlin")
+
             // Core
             library(
                 "androidx-core-ktx",
@@ -297,6 +303,13 @@ dependencyResolutionManagement {
                 "com.google.android.gms",
                 "play-services-auth"
             ).versionRef("gms-play-services-auth")
+
+            library(
+                "crypto",
+                "androidx.security",
+                "security-crypto"
+            ).versionRef("crypto")
+
         }
     }
 }