refactor authentication

stslex · Aug 29, 2023 · 503f8d8 · 503f8d8
1 parent 4dc9526
commit 503f8d8
Show file tree

Hide file tree

Showing 28 changed files with 677 additions and 106 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/src/main/java/com/stslex/aproselection/controller/AuthControllerImpl.kt b/app/src/main/java/com/stslex/aproselection/controller/AuthControllerImpl.kt
@@ -1,7 +1,6 @@
 package com.stslex.aproselection.controller
 
 import com.stslex.aproselection.core.datastore.AppDataStore
-import com.stslex.aproselection.core.network.client.NetworkClient
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -12,7 +11,6 @@ import kotlin.coroutines.coroutineContext
 
 class AuthControllerImpl(
     private val dataStore: AppDataStore,
-    private val networkClient: NetworkClient,
 ) : AuthController {
 
     private val _isAuth = MutableStateFlow<Boolean?>(null)
@@ -22,15 +20,7 @@ class AuthControllerImpl(
     override suspend fun init() {
         dataStore.token
             .onEach { token ->
-                if (token.isBlank()) {
-                    networkClient.regenerateToken()
-                }
-            }
-            .launchIn(CoroutineScope(coroutineContext))
-
-        dataStore.uuid
-            .onEach { uuid ->
-                _isAuth.emit(uuid.isNotBlank())
+                _isAuth.emit(token.isNotBlank())
             }
             .launchIn(CoroutineScope(coroutineContext))
     }

diff --git a/core/datastore/src/main/java/com/stslex/aproselection/core/datastore/AppDataStore.kt b/core/datastore/src/main/java/com/stslex/aproselection/core/datastore/AppDataStore.kt
@@ -4,13 +4,13 @@ import kotlinx.coroutines.flow.StateFlow
 
 interface AppDataStore {
 
-    val uuid: StateFlow<String>
     val token: StateFlow<String>
-
-    suspend fun setUuid(uuid: String)
+    val credential: StateFlow<UserCredential>
 
     suspend fun setToken(token: String)
 
+    suspend fun setCredential(credential: UserCredential)
+
     suspend fun clear()
 
     suspend fun init()