fix di issues

stslex · stslex · commit ceadd669582a · 2025-08-17T16:12:10.000+03:00
diff --git a/commonApp/src/commonMain/kotlin/com/stslex/atten/di/AppModules.kt b/commonApp/src/commonMain/kotlin/com/stslex/atten/di/AppModules.kt
@@ -5,6 +5,7 @@ import com.stslex.atten.core.core.di.ModuleCore
 import com.stslex.atten.core.database.di.ModuleCoreDatabase
 import com.stslex.atten.core.network.client.di.ModuleCoreNetwork
 import com.stslex.atten.core.paging.di.ModuleCorePaging
+import com.stslex.atten.core.store.di.ModuleCoreStore
 import com.stslex.atten.core.todo.di.ModuleCoreToDo
 import com.stslex.atten.core.ui.kit.utils.ModuleCoreUiUtils
 import com.stslex.atten.feature.details.di.ModuleFeatureDetails
@@ -20,6 +21,7 @@ val appModules: List<Module> = listOf(
     ModuleCorePaging().module,
     ModuleCoreUiUtils().module,
     ModuleCoreAuth().module,
+    ModuleCoreStore().module,
     ModuleCoreNetwork().module,
     ModuleFeatureHome().module,
     ModuleFeatureDetails().module,
diff --git a/core/auth/build.gradle.kts b/core/auth/build.gradle.kts
@@ -8,6 +8,7 @@ kotlin {
             implementation(project(":core:core"))
             implementation(project(":core:ui:kit"))
             implementation(project(":core:network:api"))
+            implementation(project(":core:network:client"))
         }
         androidMain.dependencies {
             implementation(libs.gms.auth)
diff --git a/core/auth/src/androidMain/kotlin/com/stslex/atten/core/auth/controller/GoogleAuthControllerImpl.android.kt b/core/auth/src/androidMain/kotlin/com/stslex/atten/core/auth/controller/GoogleAuthControllerImpl.android.kt
@@ -14,6 +14,7 @@ import com.google.android.gms.auth.api.identity.Identity
 import com.google.android.gms.common.Scopes
 import com.google.android.gms.common.api.Scope
 import com.stslex.atten.core.auth.callback.GoogleAuthCallback
+import com.stslex.atten.core.auth.model.GoogleAuthData
 import com.stslex.atten.core.auth.model.GoogleAuthResult
 import com.stslex.atten.core.core.logger.Log
 import com.stslex.atten.core.ui.kit.utils.ActivityHolder
@@ -34,18 +35,28 @@ internal actual class GoogleAuthControllerImpl actual constructor(
         ) { result ->
             logger.d("activity_result: $result, ${result.data}")
             val activity = checkNotNull(activityHolder.activity as? ComponentActivity)
-            val result = if (result.resultCode == Activity.RESULT_OK) {
-                val authorizationResult = Identity
-                    .getAuthorizationClient(activity)
-                    .getAuthorizationResultFromIntent(result.data)
-                val uiResult = GoogleAuthResult(
-                    accessToken = authorizationResult.accessToken,
-                    serverAuthCode = authorizationResult.serverAuthCode
-                )
-                Result.success(uiResult)
-            } else {
-                val msg = "auth fail with ${result.resultCode} code"
-                Result.failure(IllegalStateException(msg))
+            val result = when (result.resultCode) {
+                Activity.RESULT_OK -> {
+                    val authorizationResult = Identity
+                        .getAuthorizationClient(activity)
+                        .getAuthorizationResultFromIntent(result.data)
+                    val uiResult = GoogleAuthData(
+                        accessToken = authorizationResult.accessToken,
+                        serverAuthCode = authorizationResult.serverAuthCode
+                    )
+                    Result.success(GoogleAuthResult.Success(uiResult))
+                }
+
+                Activity.RESULT_CANCELED -> {
+                    logger.i("auth cancelled by user")
+                    Result.success(GoogleAuthResult.Cancelled)
+                    return@rememberLauncherForActivityResult
+                }
+
+                else -> {
+                    val msg = "auth fail with ${result.resultCode} code"
+                    Result.failure(IllegalStateException(msg))
+                }
             }
             callback.process(result)
         }
@@ -73,11 +84,11 @@ internal actual class GoogleAuthControllerImpl actual constructor(
                         logger.e(e, "Couldn't start Authorization UI: " + e.localizedMessage)
                     }
                 } else {
-                    val uiResult = GoogleAuthResult(
+                    val uiResult = GoogleAuthData(
                         accessToken = result.accessToken,
                         serverAuthCode = result.serverAuthCode
                     )
-                    callback.process(Result.success(uiResult))
+                    callback.process(Result.success(GoogleAuthResult.Success(uiResult)))
                 }
             }
             .addOnFailureListener {
@@ -91,4 +102,5 @@ internal actual class GoogleAuthControllerImpl actual constructor(
         private val logger = Log.tag(TAG)
         private const val TAG = "GOOGLE_AUTH_CONTROLLER"
     }
+
 }
diff --git a/core/auth/src/commonMain/kotlin/com/stslex/atten/core/auth/model/GoogleAuthData.kt b/core/auth/src/commonMain/kotlin/com/stslex/atten/core/auth/model/GoogleAuthData.kt
@@ -0,0 +1,10 @@
+package com.stslex.atten.core.auth.model
+
+import androidx.compose.runtime.Stable
+
+@Stable
+data class GoogleAuthData(
+    val serverAuthCode: String?,
+    val accessToken: String?,
+)
+
diff --git a/core/auth/src/commonMain/kotlin/com/stslex/atten/core/auth/model/GoogleAuthResult.kt b/core/auth/src/commonMain/kotlin/com/stslex/atten/core/auth/model/GoogleAuthResult.kt
@@ -1,9 +1,8 @@
 package com.stslex.atten.core.auth.model
 
-import androidx.compose.runtime.Stable
+sealed interface GoogleAuthResult {
 
-@Stable
-data class GoogleAuthResult(
-    val serverAuthCode: String?,
-    val accessToken: String?,
-)
+    data class Success(val data: GoogleAuthData) : GoogleAuthResult
+
+    data object Cancelled : GoogleAuthResult
+}
diff --git a/core/core/src/commonMain/kotlin/com/stslex/atten/core/core/result/ResultUtils.kt b/core/core/src/commonMain/kotlin/com/stslex/atten/core/core/result/ResultUtils.kt
@@ -30,13 +30,16 @@ object ResultUtils {
         onError: suspend (AppError) -> Unit = { logger.e(it, it.message) },
         onLoading: suspend () -> Unit = {},
         onSuccess: suspend (T) -> Unit,
-    ): Job = scope.launch(this) { result ->
-        when (result) {
-            is AppResult.Success -> onSuccess(result.data)
-            is AppResult.Error -> onError(result.error)
-            AppResult.Loading -> onLoading()
+    ): Job = scope
+        .launch(
+            flow = this,
+            onError = { onError(UnresolveError(it.message, it)) }) { result ->
+            when (result) {
+                is AppResult.Success -> onSuccess(result.data)
+                is AppResult.Error -> onError(result.error)
+                AppResult.Loading -> onLoading()
+            }
         }
-    }
 
     fun <T : Any, R : Any> flowRunCatching(
         mapper: Mapping<T, R>,
diff --git a/core/network/client/build.gradle.kts b/core/network/client/build.gradle.kts
@@ -12,7 +12,7 @@ kotlin {
         commonMain {
             dependencies {
                 implementation(project(":core:core"))
-                implementation(project(":core:network:api"))
+                api(project(":core:network:api"))
                 implementation(project(":core:store"))
                 implementation(libs.bundles.ktor)
             }
diff --git a/core/network/client/src/commonMain/kotlin/com/stslex/atten/core/network/client/client/AppHttpApiImpl.kt b/core/network/client/src/commonMain/kotlin/com/stslex/atten/core/network/client/client/AppHttpApiImpl.kt
@@ -10,7 +10,7 @@ import org.koin.core.annotation.Singleton
 
 @Single
 @Singleton
-class AppHttpApiImpl(
+internal class AppHttpApiImpl(
     private val appDispatcher: AppDispatcher,
     private val appHttpClient: AppHttpClient
 ) : AppHttpApi {
diff --git a/core/network/client/src/commonMain/kotlin/com/stslex/atten/core/network/client/client/AuthApiClientImpl.kt b/core/network/client/src/commonMain/kotlin/com/stslex/atten/core/network/client/client/AuthApiClientImpl.kt
@@ -16,7 +16,7 @@ import org.koin.core.annotation.Singleton
 
 @Single
 @Singleton
-class AuthApiClientImpl(
+internal class AuthApiClientImpl(
     private val appHttpApi: AppHttpApi,
     private val userStore: UserStore,
 ) : AuthApiClient {
diff --git a/feature/settings/src/commonMain/kotlin/com/stslex/atten/feature/settings/mvi/handlers/ClickHandler.kt b/feature/settings/src/commonMain/kotlin/com/stslex/atten/feature/settings/mvi/handlers/ClickHandler.kt
@@ -19,8 +19,8 @@ import org.koin.core.annotation.Scoped
 class ClickHandler(
     private val authController: GoogleAuthController,
     private val repository: AuthRepository,
-    private val store: SettingsHandlerStore
-) : Handler<Action.Click, SettingsHandlerStore>, SettingsHandlerStore by store {
+//    private val store: SettingsHandlerStore
+) : Handler<Action.Click, SettingsHandlerStore> {
 
     private var loginJob: Job? = null
 
@@ -31,21 +31,34 @@ class ClickHandler(
         }
     }
 
-    private fun actionBack() {
-        store.consume(Action.Navigation.NavBack)
+    private fun SettingsHandlerStore.actionBack() {
+        consume(Action.Navigation.NavBack)
     }
 
-    private fun actionLogin() {
+    private fun SettingsHandlerStore.actionLogin() {
         authController.auth { result ->
             result
                 .onSuccess { consumeLogin(it) }
                 .onFailure { logger.e(it, "auth error") }
         }
     }
 
-    private fun consumeLogin(googleInfo: GoogleAuthResult) {
-        logger.i("consumeLogin: $googleInfo")
-        val token = googleInfo.accessToken
+    private fun SettingsHandlerStore.consumeLogin(result: GoogleAuthResult) {
+        logger.i("consumeLogin: $result")
+        val token = when (result) {
+            GoogleAuthResult.Cancelled -> {
+                logger.i("Google auth cancelled by user")
+                return
+            }
+
+            is GoogleAuthResult.Success -> result.data.accessToken.also {
+                if (it.isNullOrBlank()) {
+                    logger.e("Access token is null or empty")
+                    return
+                }
+            }
+        }
+
         if (token.isNullOrEmpty()) {
             logger.e(message = "Access token is null or empty")
             // todo handle error, show message to user
@@ -56,6 +69,6 @@ class ClickHandler(
             .onSuccess { logger.i("login success: $it") }
             .onError { logger.e(it, "login error") }
             .onLoading { logger.i("login loading...") }
-            .collect(store.scope)
+            .collect(scope)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ kotlin {`
`8`	`8`	`implementation(project(":core:core"))`
`9`	`9`	`implementation(project(":core:ui:kit"))`
`10`	`10`	`implementation(project(":core:network:api"))`
	`11`	`+ implementation(project(":core:network:client"))`
`11`	`12`	`}`
`12`	`13`	`androidMain.dependencies {`
`13`	`14`	`implementation(libs.gms.auth)`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ kotlin {`
`12`	`12`	`commonMain {`
`13`	`13`	`dependencies {`
`14`	`14`	`implementation(project(":core:core"))`
`15`		`- implementation(project(":core:network:api"))`
	`15`	`+ api(project(":core:network:api"))`
`16`	`16`	`implementation(project(":core:store"))`
`17`	`17`	`implementation(libs.bundles.ktor)`
`18`	`18`	`}`