[Quest/Malawi Core] Feature Request: Disable users from logging in wi…

…thout a complete practitioner details response (#97)
d-tree-org · Aug 14, 2024 · 98f87c7 · 98f87c7
1 parent 736b887
commit 98f87c7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/login/LoginErrorState.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/login/LoginErrorState.kt
@@ -21,4 +21,5 @@ enum class LoginErrorState {
   INVALID_CREDENTIALS,
   MULTI_USER_LOGIN_ATTEMPT,
   ERROR_FETCHING_USER,
+  ACCOUNT_NOT_CONFIGURED_PROPERLY,
 }
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/login/LoginScreen.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/login/LoginScreen.kt
@@ -277,6 +277,11 @@ fun LoginPage(
                   id = R.string.login_error,
                   stringResource(R.string.error_fetching_user_details),
                 )
+              LoginErrorState.ACCOUNT_NOT_CONFIGURED_PROPERLY ->
+                stringResource(
+                  id = R.string.login_error,
+                  stringResource(R.string.error_account_not_configured_properly),
+                )
             },
           modifier =
             modifier

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/login/LoginViewModel.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/ui/login/LoginViewModel.kt
@@ -204,10 +204,13 @@ constructor(
           val practitionerDetailsResult = fetchPractitioner(userInfo.keycloakUuid)
           if (practitionerDetailsResult.isFailure) return
 
-          savePractitionerDetails(practitionerDetailsResult.getOrDefault(Bundle()), userInfo)
+          if (savePractitionerDetails(practitionerDetailsResult.getOrDefault(Bundle()), userInfo)) {
+            updateNavigateHome(true)
+          } else {
+            _loginErrorState.postValue(LoginErrorState.ACCOUNT_NOT_CONFIGURED_PROPERLY)
+          }
 
           _showProgressBar.postValue(false)
-          updateNavigateHome(true)
         }
       }
     } catch (ex: Exception) {
@@ -272,8 +275,8 @@ constructor(
     _navigateToHome.postValue(navigateHome)
   }
 
-  suspend fun savePractitionerDetails(bundle: Bundle, userClaimInfo: UserClaimInfo) {
-    if (bundle.entry.isNullOrEmpty()) return
+  suspend fun savePractitionerDetails(bundle: Bundle, userClaimInfo: UserClaimInfo): Boolean {
+    if (bundle.entry.isNullOrEmpty()) return false
     val practitionerDetails = bundle.entry.first().resource as PractitionerDetails
 
     if (
@@ -293,6 +296,8 @@ constructor(
       practitionerDetails.fhirPractitionerDetails?.practitionerRoles ?: emptyList()
     val practitioners = practitionerDetails.fhirPractitionerDetails?.practitioners ?: emptyList()
 
+    if (organizations.isEmpty() || locations.isEmpty() || careTeams.isEmpty()) return false
+
     val remoteResources =
       careTeams.toTypedArray<Resource>() +
         organizations.toTypedArray() +
@@ -330,6 +335,7 @@ constructor(
         ),
       )
     }
+    return true
   }
 
   fun loadLastLoggedInUsername() {

diff --git a/android/engine/src/main/res/values/strings.xml b/android/engine/src/main/res/values/strings.xml
@@ -112,6 +112,7 @@
     <string name="invalid_form_id">"Invalid form id attached"</string>
     <string name="multi_user_login_attempt">Attempted to login with a different provider</string>
     <string name="error_fetching_user_details">Failed to fetch user details</string>
+    <string name="error_account_not_configured_properly">Account not configured properly</string>
     <string name="no">No</string>
     <string name="yes">Yes</string>
     <string name="required_constraint_validation_error_msg">There is no response to the required field.</string>