fix: Update server config not working

core/datastore/src/commonMain/kotlin/com/mifos/core/datastore/UserPreferencesDataSource.kt

@@ -10,6 +10,7 @@
 package com.mifos.core.datastore
 
 import com.mifos.core.common.utils.ServerConfig
+import com.mifos.core.common.utils.getInstanceUrl
 import com.mifos.core.datastore.model.AppSettings
 import com.mifos.core.datastore.model.AppTheme
 import com.mifos.core.datastore.model.UserData
@@ -30,8 +31,6 @@ private const val USER_DATA = "userData"
 private const val AUTH_USER = "user_details"
 private const val SERVER_CONFIG_KEY = "server_config"
 private const val USER_STATUS = "user_status"
-private const val AUTH_USERNAME = "auth_username"
-private const val AUTH_PASSWORD = "auth_password"
 private const val APP_SETTINGS = "appSettings"
 
 @OptIn(ExperimentalSerializationApi::class, ExperimentalSettingsApi::class)
@@ -92,22 +91,14 @@ class UserPreferencesDataSource(
     val userStatus: Boolean
         get() = settings.getBoolean(USER_STATUS, false)
 
-    var usernamePassword: Pair<String, String>
-        get() = Pair(
-            settings.getString(AUTH_USERNAME, "") ?: "",
-            settings.getString(AUTH_PASSWORD, "") ?: "",
-        )
-        set(value) {
-            settings.putString(AUTH_USERNAME, value.first)
-            settings.putString(AUTH_PASSWORD, value.second)
-        }
-
     val isAuthenticated: Boolean
         get() = _userData.value.isAuthenticated
 
     val token: String
         get() = _userData.value.base64EncodedAuthenticationKey?.let { "Basic $it" } ?: ""
 
+    val instanceUrl: String get() = _serverConfig.value.getInstanceUrl()
+
     fun updateUserStatus(status: Boolean) {
         settings.putBoolean(USER_STATUS, status)
     }
@@ -142,7 +133,7 @@ class UserPreferencesDataSource(
 
     suspend fun clearInfo() {
         withContext(dispatcher) {
-            settings.clear()
+            settings.putAuth(User())
         }
     }
 

core/datastore/src/commonMain/kotlin/com/mifos/core/datastore/UserPreferencesRepository.kt

@@ -22,9 +22,10 @@ interface UserPreferencesRepository {
     val userInfo: Flow<UserData>
     val userData: Flow<User>
     val settingsInfo: Flow<AppSettings>
-    val serverConfig: Flow<ServerConfig>
     val token: String?
+    val instanceUrl: String
     val appTheme: StateFlow<AppTheme>
+    val getServerConfig: StateFlow<ServerConfig>
 
     suspend fun updateUser(user: User): DataState<Unit>
     suspend fun updateUserStatus(status: Boolean): DataState<Unit>
@@ -37,6 +38,4 @@ interface UserPreferencesRepository {
     suspend fun updateUserInfo(user: UserData): DataState<Unit>
 
     suspend fun updateTheme(theme: AppTheme): DataState<Unit>
-
-    val getServerConfig: StateFlow<ServerConfig>
 }

core/datastore/src/commonMain/kotlin/com/mifos/core/datastore/UserPreferencesRepositoryImpl.kt

@@ -40,9 +40,6 @@ class UserPreferencesRepositoryImpl(
     override val userData: Flow<User>
         get() = preferenceManager.userData
 
-    override val serverConfig: Flow<ServerConfig>
-        get() = preferenceManager.serverConfig
-
     override val appTheme: StateFlow<AppTheme>
         get() = preferenceManager.appTheme.stateIn(
             scope = unconfinedScope,
@@ -64,6 +61,9 @@ class UserPreferencesRepositoryImpl(
     override val token: String?
         get() = preferenceManager.token
 
+    override val instanceUrl: String
+        get() = preferenceManager.instanceUrl
+
     override suspend fun updateTheme(theme: AppTheme): DataState<Unit> {
         return try {
             val result = preferenceManager.updateTheme(theme)
@@ -94,11 +94,7 @@ class UserPreferencesRepositoryImpl(
     }
 
     override val getServerConfig: StateFlow<ServerConfig>
-        get() = preferenceManager.serverConfig.stateIn(
-            scope = unconfinedScope,
-            initialValue = ServerConfig.DEFAULT,
-            started = SharingStarted.Eagerly,
-        )
+        get() = preferenceManager.serverConfig
 
     override suspend fun updateUser(user: User): DataState<Unit> {
         return withContext(ioDispatcher) {

core/network/src/commonMain/kotlin/com/mifos/core/network/di/NetworkModule.kt

@@ -12,7 +12,6 @@ package com.mifos.core.network.di
 import com.mifos.core.common.utils.getInstanceUrl
 import com.mifos.core.datastore.UserPreferencesRepository
 import com.mifos.core.network.BaseApiManager
-import com.mifos.core.network.BaseUrl
 import com.mifos.core.network.KtorHttpClient
 import com.mifos.core.network.KtorfitClient
 import com.mifos.core.network.MifosInterceptor
@@ -25,6 +24,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import org.koin.dsl.module
+import kotlin.coroutines.EmptyCoroutineContext.get
 
 val NetworkModule = module {
     single<HttpClient>(KtorClient) {
@@ -38,10 +38,15 @@ val NetworkModule = module {
         }
     }
 
+    single<String>(BaseUrl) {
+        val preferencesRepository = get<UserPreferencesRepository>()
+        preferencesRepository.instanceUrl
+    }
+
     single<KtorfitClient>(MifosClient) {
         KtorfitClient.builder()
             .httpClient(get(KtorClient))
-            .baseURL(BaseUrl().url)
+            .baseURL(get<String>(BaseUrl))
             .build()
     }
 
@@ -51,7 +56,7 @@ val NetworkModule = module {
 
     single<Ktorfit> {
         Ktorfit.Builder()
-            .baseUrl(BaseUrl().url)
+            .baseUrl(get<String>(BaseUrl))
             .httpClient(get<HttpClient>(KtorClient))
             .converterFactories(FlowConverterFactory())
             .build()

core/network/src/commonMain/kotlin/com/mifos/core/network/di/Qualifier.kt

@@ -13,3 +13,4 @@ import org.koin.core.qualifier.named
 
 val MifosClient = named("MifosClient")
 val KtorClient = named("KtorClient")
+val BaseUrl = named("baseUrl")

feature/settings/src/commonMain/kotlin/com/mifos/feature/settings/updateServer/UpdateServerConfigViewModel.kt

@@ -119,6 +119,7 @@ class UpdateServerConfigViewModel(
                     ).any { it.value != null }
 
                     if (!hasAnyError) {
+                        prefManager.logOut()
                         prefManager.updateServerConfig(_state.value)
                         _result.emit(true)
                     }