fix: Fixed Login Issue & API (#2323)

Author: niyajali

README.md

@@ -1,7 +1,7 @@
 <div align="center">
 <img src="https://user-images.githubusercontent.com/37406965/51083189-d5dc3a80-173b-11e9-8ca0-28015e0893ac.png" alt="Android Client" />
 
-# Android-Client Android Application for MifosX
+# Android-Client - Field Officer Application For MifosX
 
 This Android application is built on the powerful [MifosX](https://mifosforge.jira.com/wiki/spaces/MIFOSX/overview) platform and written in Kotlin. MifosX is a comprehensive core banking platform designed for field officers to efficiently process transactions, manage client data, track center records, group details, and handle various types of accounts such as loans, savings, and recurring accounts. The application's primary goal is to streamline field operations, making them easier and more efficient.
 
@@ -20,15 +20,20 @@ One of the standout features of this application is its offline capability, allo
 [![Slack](https://img.shields.io/badge/Slack-4A154B?style=flat-square&logo=slack&logoColor=white)](https://join.slack.com/t/mifos/shared_invite/zt-2wvi9t82t-DuSBdqdQVOY9fsqsLjkKPA)
 [![Jira](https://img.shields.io/badge/jira-%230A0FFF.svg?style=flat-square&logo=jira&logoColor=white)](https://mifosforge.jira.com/jira/software/c/projects/MIFOSAC/issues/?filter=allissues&jql=project%20%3D%20%22MM%22%20ORDER%20BY%20created%20DESC)
 [![Zoom](https://img.shields.io/badge/Zoom-2D8CFF?style=flat-square&logo=zoom&logoColor=white)](https://us02web.zoom.us/meeting/register/PIZxFF_3Qi2H056amyjj2Q#/registration)
+
 </div>
 
-> \[!Note]
+> \[!Important]
 > **We're moving towards to Jira for issue tracking. Please use [Jira](https://mifosforge.jira.com/jira/software/c/projects/MIFOSAC/issues/) for issue tracking.**
 > **And Join our [slack](https://join.slack.com/t/mifos/shared_invite/zt-2wvi9t82t-DuSBdqdQVOY9fsqsLjkKPA) community channel `android-client` to discuss all things about Android Client development. Please keep discussions focused and avoid cross-posting across channels.**
 > **Please join our daily Mobile Stand-Up on [Zoom](https://us02web.zoom.us/meeting/register/PIZxFF_3Qi2H056amyjj2Q#/registration).**
 
-## Demo credentials
-- **Fineract Instance**: `gsoc.mifos.community`
+## Download The Latest App
+[<img  alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' height="80" />](https://play.google.com/store/apps/details?id=com.mifos.mifosxdroid)
+[<img alt='Get it on Github' src='https://github.com/user-attachments/assets/28de125a-29d3-42a6-9a2b-66f06c72325f' height="80" />](https://github.com/openMF/android-client/releases/latest)
+
+## Demo Credentials
+- **Fineract Instance**: `tt.mifos.community`
 - **Username**: `mifos`
 - **Password**: `password`
 
@@ -71,3 +76,11 @@ Special thanks to the incredible code contributors who continue to drive this pr
 <a href="https://github.com/openMF/android-client/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=openMF/android-client" />
 </a>
+
+---
+## Join the beta
+Try new features before they're officially released and give feedback.
+
+[<img src="https://github.com/user-attachments/assets/a123e5a9-1c99-4b1b-880b-2fdd6e3f56cb" alt="firebase" />](https://appdistribution.firebase.dev/i/0786ea6feeba9468)
+![]()
+[<img src="https://github.com/user-attachments/assets/4a3c98aa-699c-464c-b171-0252383bd52d" alt="playstore" />](https://play.google.com/apps/testing/com.mifos.mifosxdroid)

core/common/src/main/java/com/mifos/core/common/utils/BaseUrl.kt

@@ -9,6 +9,11 @@
  */
 package com.mifos.core.common.utils
 
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+
 /**
  * Created by Aditya Gupta on 11/02/24.
  */
@@ -21,3 +26,8 @@ sealed class Resource<T>(val data: T? = null, val message: String? = null) {
 
     class Loading<T>(data: T? = null) : Resource<T>(data)
 }
+
+fun <T> Flow<T>.asResourceFlow(): Flow<Resource<T>> =
+    map<T, Resource<T>> { Resource.Success(it) }
+        .onStart { emit(Resource.Loading()) }
+        .catch { emit(Resource.Error(it.message ?: "Unknown error", null)) }

core/common/src/main/java/com/mifos/core/common/utils/Page.kt

@@ -9,19 +9,21 @@
  */
 package com.mifos.core.data.repository
 
+import com.mifos.core.common.utils.Resource
 import com.mifos.core.objects.noncore.IdentifierCreationResponse
 import com.mifos.core.objects.noncore.IdentifierPayload
 import com.mifos.core.objects.noncore.IdentifierTemplate
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Created by Aditya Gupta on 16/08/23.
  */
 interface ClientIdentifierDialogRepository {
 
-    suspend fun getClientIdentifierTemplate(clientId: Int): IdentifierTemplate
+    fun getClientIdentifierTemplate(clientId: Int): Flow<Resource<IdentifierTemplate>>
 
-    suspend fun createClientIdentifier(
+    fun createClientIdentifier(
         clientId: Int,
         identifierPayload: IdentifierPayload,
-    ): IdentifierCreationResponse
+    ): Flow<Resource<IdentifierCreationResponse>>
 }

core/common/src/main/java/com/mifos/core/common/utils/Resource.kt

@@ -9,11 +9,13 @@
  */
 package com.mifos.core.data.repositoryImp
 
+import com.mifos.core.common.utils.Resource
 import com.mifos.core.data.repository.ClientIdentifierDialogRepository
 import com.mifos.core.network.datamanager.DataManagerClient
 import com.mifos.core.objects.noncore.IdentifierCreationResponse
 import com.mifos.core.objects.noncore.IdentifierPayload
 import com.mifos.core.objects.noncore.IdentifierTemplate
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 /**
@@ -22,14 +24,14 @@ import javax.inject.Inject
 class ClientIdentifierDialogRepositoryImp @Inject constructor(private val dataManagerClient: DataManagerClient) :
     ClientIdentifierDialogRepository {
 
-    override suspend fun getClientIdentifierTemplate(clientId: Int): IdentifierTemplate {
+    override fun getClientIdentifierTemplate(clientId: Int): Flow<Resource<IdentifierTemplate>> {
         return dataManagerClient.getClientIdentifierTemplate(clientId)
     }
 
-    override suspend fun createClientIdentifier(
+    override fun createClientIdentifier(
         clientId: Int,
         identifierPayload: IdentifierPayload,
-    ): IdentifierCreationResponse {
+    ): Flow<Resource<IdentifierCreationResponse>> {
         return dataManagerClient.createClientIdentifier(clientId, identifierPayload)
     }
 }

core/data/src/main/java/com/mifos/core/data/repository/ClientIdentifierDialogRepository.kt

@@ -9,6 +9,7 @@
  */
 package com.mifos.core.data.repositoryImp
 
+import android.util.Log
 import com.mifos.core.data.repository.LoginRepository
 import com.mifos.core.network.datamanger.DataManagerAuth
 import org.openapitools.client.models.PostAuthenticationResponse
@@ -18,10 +19,16 @@ import javax.inject.Inject
  * Created by Aditya Gupta on 06/08/23.
  */
 
-class LoginRepositoryImp @Inject constructor(private val dataManagerAuth: DataManagerAuth) :
-    LoginRepository {
+class LoginRepositoryImp @Inject constructor(
+    private val dataManagerAuth: DataManagerAuth,
+) : LoginRepository {
 
     override suspend fun login(username: String, password: String): PostAuthenticationResponse {
-        return dataManagerAuth.login(username, password)
+        return try {
+            dataManagerAuth.login(username, password)
+        } catch (e: Exception) {
+            Log.e("Login", "${e.message}")
+            throw e
+        }
     }
 }

core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifierDialogRepositoryImp.kt

@@ -100,6 +100,7 @@ data class Client(
 
     @Column
     var externalId: String? = null,
+
 ) : MifosBaseModel(), Parcelable {
 
     /**

core/data/src/main/java/com/mifos/core/data/repositoryImp/LoginRepositoryImp.kt

@@ -14,21 +14,15 @@ import com.mifos.core.data.repository.ClientIdentifierDialogRepository
 import com.mifos.core.objects.noncore.IdentifierCreationResponse
 import com.mifos.core.objects.noncore.IdentifierPayload
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
 import javax.inject.Inject
 
-class CreateClientIdentifierUseCase @Inject constructor(private val repository: ClientIdentifierDialogRepository) {
+class CreateClientIdentifierUseCase @Inject constructor(
+    private val repository: ClientIdentifierDialogRepository,
+) {
 
-    suspend operator fun invoke(
+    operator fun invoke(
         clientId: Int,
         identifierPayload: IdentifierPayload,
-    ): Flow<Resource<IdentifierCreationResponse>> = flow {
-        try {
-            emit(Resource.Loading())
-            val response = repository.createClientIdentifier(clientId, identifierPayload)
-            emit(Resource.Success(response))
-        } catch (exception: Exception) {
-            emit(Resource.Error(exception.message.toString()))
-        }
-    }
+    ): Flow<Resource<IdentifierCreationResponse>> =
+        repository.createClientIdentifier(clientId, identifierPayload)
 }

core/database/src/main/java/com/mifos/core/objects/client/Client.kt

@@ -13,18 +13,11 @@ import com.mifos.core.common.utils.Resource
 import com.mifos.core.data.repository.ClientIdentifierDialogRepository
 import com.mifos.core.objects.noncore.IdentifierTemplate
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
 import javax.inject.Inject
 
-class GetClientIdentifierTemplateUseCase @Inject constructor(private val repository: ClientIdentifierDialogRepository) {
-
-    suspend operator fun invoke(clientId: Int): Flow<Resource<IdentifierTemplate>> = flow {
-        try {
-            emit(Resource.Loading())
-            val response = repository.getClientIdentifierTemplate(clientId)
-            emit(Resource.Success(response))
-        } catch (exception: Exception) {
-            emit(Resource.Error(exception.message.toString()))
-        }
-    }
+class GetClientIdentifierTemplateUseCase @Inject constructor(
+    private val repository: ClientIdentifierDialogRepository,
+) {
+    operator fun invoke(clientId: Int): Flow<Resource<IdentifierTemplate>> =
+        repository.getClientIdentifierTemplate(clientId)
 }

core/domain/src/main/java/com/mifos/core/domain/useCases/CreateClientIdentifierUseCase.kt

@@ -26,7 +26,7 @@ data class ServerConfig(
     companion object {
         val DEFAULT = ServerConfig(
             protocol = "https://",
-            endPoint = "dev.mifos.io",
+            endPoint = "tt.mifos.community",
             apiPath = "/fineract-provider/api/v1/",
             port = "80",
             tenant = "default",

core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifierTemplateUseCase.kt

@@ -13,6 +13,7 @@ import com.google.gson.GsonBuilder
 import com.mifos.core.datastore.PrefManager
 import com.mifos.core.model.getInstanceUrl
 import com.mifos.core.network.adapter.FlowCallAdapterFactory
+import com.mifos.core.network.services.AuthService
 import com.mifos.core.network.services.CenterService
 import com.mifos.core.network.services.ChargeService
 import com.mifos.core.network.services.CheckerInboxService
@@ -85,6 +86,8 @@ class BaseApiManager @Inject constructor(
         get() = Companion.noteApi
     val runReportsService: RunReportsService
         get() = Companion.runReportsService
+    val authApi: AuthService
+        get() = Companion.authApi
 
     companion object {
         private var mRetrofit: Retrofit? = null
@@ -105,59 +108,27 @@ class BaseApiManager @Inject constructor(
         private lateinit var noteApi: NoteService
         private lateinit var collectionSheetApi: CollectionSheetService
         private lateinit var checkerInboxApi: CheckerInboxService
+        private lateinit var authApi: AuthService
 
         fun init() {
-            centerApi = createApi(
-                CenterService::class.java,
-            )
-            accountsApi = createApi(
-                ClientAccountsService::class.java,
-            )
-            clientsApi = createApi(
-                ClientService::class.java,
-            )
-            dataTableApi = createApi(
-                DataTableService::class.java,
-            )
-            loanApi = createApi(
-                LoanService::class.java,
-            )
-            savingsApi = createApi(
-                SavingsAccountService::class.java,
-            )
-            searchApi = createApi(
-                SearchService::class.java,
-            )
-            groupApi = createApi(
-                GroupService::class.java,
-            )
-            documentApi = createApi(
-                DocumentService::class.java,
-            )
-            officeApi = createApi(
-                OfficeService::class.java,
-            )
-            staffApi = createApi(
-                StaffService::class.java,
-            )
-            surveyApi = createApi(
-                SurveyService::class.java,
-            )
-            chargeApi = createApi(
-                ChargeService::class.java,
-            )
-            runReportsService = createApi(
-                RunReportsService::class.java,
-            )
-            noteApi = createApi(
-                NoteService::class.java,
-            )
-            collectionSheetApi = createApi(
-                CollectionSheetService::class.java,
-            )
-            checkerInboxApi = createApi(
-                CheckerInboxService::class.java,
-            )
+            centerApi = createApi(CenterService::class.java)
+            accountsApi = createApi(ClientAccountsService::class.java)
+            clientsApi = createApi(ClientService::class.java)
+            dataTableApi = createApi(DataTableService::class.java)
+            loanApi = createApi(LoanService::class.java)
+            savingsApi = createApi(SavingsAccountService::class.java)
+            searchApi = createApi(SearchService::class.java)
+            groupApi = createApi(GroupService::class.java)
+            documentApi = createApi(DocumentService::class.java)
+            officeApi = createApi(OfficeService::class.java)
+            staffApi = createApi(StaffService::class.java)
+            surveyApi = createApi(SurveyService::class.java)
+            chargeApi = createApi(ChargeService::class.java)
+            runReportsService = createApi(RunReportsService::class.java)
+            noteApi = createApi(NoteService::class.java)
+            collectionSheetApi = createApi(CollectionSheetService::class.java)
+            checkerInboxApi = createApi(CheckerInboxService::class.java)
+            authApi = createApi(AuthService::class.java)
         }
 
         private fun <T> createApi(clazz: Class<T>): T {