Merge pull request #102 from CrisisCleanup/accept-tos

Accept tos

.maestro/README.md

@@ -11,4 +11,6 @@ List devices
 
 Full test command
 `MAESTRO_APP_ID=com.crisiscleanup.demo.debug maestro --device emulator-5554 test auth-tests`
-`MAESTRO_APP_ID=com.crisiscleanup.dev maestro --device device-uuid-from-list test auth-tests`
+`MAESTRO_APP_ID=com.crisiscleanup.dev maestro --device device-uuid-from-list test auth-tests`
+
+[Flow file structure](https://maestro.mobile.dev/api-reference/configuration/flow-configuration)

.maestro/auth-tests/login-password-toggle.yaml

@@ -14,7 +14,7 @@ env:
 - assertVisible:
     id: ccuLogo
 - assertVisible:
-    id: loginHeaderText
+    id: loginEmailHeaderText
 - assertVisible:
     id: loginEmailTextField
 - assertVisible:

.maestro/auth-tests/login-view.yaml

@@ -12,10 +12,10 @@ tags:
 - assertVisible:
     id: ccuLogo
 - assertVisible:
-    id: loginHeaderText
+    id: loginEmailHeaderText
 - assertVisible:
     id: loginEmailTextField
 - assertVisible:
     id: loginPasswordTextField
 - assertVisible:
-    id: loginLoginBtn
+    id: loginLoginAction

.maestro/auth-tests/login.yaml

@@ -16,7 +16,7 @@ tags:
     id: loginPasswordTextField
 - inputText: ${MAESTRO_APP_PASSWORD}
 - tapOn:
-    id: loginLoginBtn
+    id: loginLoginAction
 - assertVisible:
     id: navItem_Work
 - assertVisible:

.maestro/auth-tests/logout.yaml

@@ -23,4 +23,4 @@ onFlowStart:
 - assertVisible:
     id: ccuLogo
 - assertVisible:
-    id: loginHeaderText
+    id: loginEmailHeaderText

app/src/main/java/com/crisiscleanup/MainActivityViewModel.kt

@@ -1,11 +1,16 @@
 package com.crisiscleanup
 
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.crisiscleanup.core.common.AppEnv
+import com.crisiscleanup.core.common.AppSettingsProvider
 import com.crisiscleanup.core.common.AppVersionProvider
 import com.crisiscleanup.core.common.KeyResourceTranslator
+import com.crisiscleanup.core.common.NetworkMonitor
+import com.crisiscleanup.core.common.event.AuthEventBus
 import com.crisiscleanup.core.common.event.ExternalEventBus
 import com.crisiscleanup.core.common.event.UserPersistentInvite
 import com.crisiscleanup.core.common.log.AppLogger
@@ -14,9 +19,11 @@ import com.crisiscleanup.core.common.log.Logger
 import com.crisiscleanup.core.common.network.CrisisCleanupDispatchers.IO
 import com.crisiscleanup.core.common.network.Dispatcher
 import com.crisiscleanup.core.common.sync.SyncPuller
+import com.crisiscleanup.core.common.throttleLatest
 import com.crisiscleanup.core.data.IncidentSelector
 import com.crisiscleanup.core.data.repository.AccountDataRefresher
 import com.crisiscleanup.core.data.repository.AccountDataRepository
+import com.crisiscleanup.core.data.repository.AccountUpdateRepository
 import com.crisiscleanup.core.data.repository.AppDataManagementRepository
 import com.crisiscleanup.core.data.repository.LocalAppMetricsRepository
 import com.crisiscleanup.core.data.repository.LocalAppPreferencesRepository
@@ -31,6 +38,7 @@ import com.crisiscleanup.core.model.data.UserData
 import com.google.firebase.analytics.FirebaseAnalytics
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
@@ -40,9 +48,11 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import kotlinx.datetime.Clock
 import java.util.concurrent.atomic.AtomicReference
 import javax.inject.Inject
@@ -55,14 +65,18 @@ class MainActivityViewModel @Inject constructor(
     accountDataRepository: AccountDataRepository,
     incidentSelector: IncidentSelector,
     appDataRepository: AppDataManagementRepository,
-    accountDataRefresher: AccountDataRefresher,
+    private val accountDataRefresher: AccountDataRefresher,
+    private val accountUpdateRepository: AccountUpdateRepository,
     val translator: KeyResourceTranslator,
     private val syncPuller: SyncPuller,
     private val appVersionProvider: AppVersionProvider,
+    appSettingsProvider: AppSettingsProvider,
     private val appEnv: AppEnv,
     firebaseAnalytics: FirebaseAnalytics,
     externalEventBus: ExternalEventBus,
-    @Dispatcher(IO) ioDispatcher: CoroutineDispatcher,
+    private val authEventBus: AuthEventBus,
+    private val networkMonitor: NetworkMonitor,
+    @Dispatcher(IO) private val ioDispatcher: CoroutineDispatcher,
     @Logger(CrisisCleanupLoggers.App) private val logger: AppLogger,
 ) : ViewModel() {
     /**
@@ -92,12 +106,33 @@ class MainActivityViewModel @Inject constructor(
     /**
      * API account tokens need re-issuing
      */
-    var isAccountExpired = mutableStateOf(false)
+    var isAccountExpired by mutableStateOf(false)
+        private set
+
+    val termsOfServiceUrl = "${appSettingsProvider.baseUrl}/terms?view=plain"
+    var hasAcceptedTerms by mutableStateOf(false)
+        private set
+    var isAcceptingTerms by mutableStateOf(false)
+    val isFetchingTermsAcceptance = MutableStateFlow(false)
+    private val isUpdatingTermsAcceptance = MutableStateFlow(false)
+    val isLoadingTermsAcceptance = combine(
+        isFetchingTermsAcceptance,
+        isUpdatingTermsAcceptance,
+        ::Pair,
+    )
+        .map { (b0, b1) -> b0 || b1 }
+        .stateIn(
+            scope = viewModelScope,
+            initialValue = false,
+            started = SharingStarted.WhileSubscribed(),
+        )
+    var acceptTermsErrorMessage by mutableStateOf("")
         private set
 
     val authState = accountDataRepository.accountData
         .map {
-            isAccountExpired.value = !it.areTokensValid
+            isAccountExpired = !it.areTokensValid
+            hasAcceptedTerms = it.hasAcceptedTerms
 
             if (it.hasAuthenticated) {
                 AuthState.Authenticated(it)
@@ -179,6 +214,24 @@ class MainActivityViewModel @Inject constructor(
         syncPuller.appPullLanguage()
         syncPuller.appPullStatuses()
 
+        accountDataRepository.accountData
+            .mapLatest { it.hasAcceptedTerms }
+            .filter { !it }
+            .throttleLatest(250)
+            .onEach {
+                isAcceptingTerms = false
+
+                withContext(ioDispatcher) {
+                    isFetchingTermsAcceptance.value = true
+                    try {
+                        accountDataRefresher.updateAcceptedTerms()
+                    } finally {
+                        isFetchingTermsAcceptance.value = false
+                    }
+                }
+            }
+            .launchIn(viewModelScope)
+
         val switchProductionApiManager = SwitchProductionApiManager(
             appMetricsRepository,
             appDataRepository,
@@ -207,6 +260,43 @@ class MainActivityViewModel @Inject constructor(
             }
         }
     }
+
+    fun onRejectTerms() {
+        acceptTermsErrorMessage = ""
+        authEventBus.onLogout()
+    }
+
+    fun onAcceptTerms() {
+        acceptTermsErrorMessage = ""
+
+        if (!isAcceptingTerms) {
+            acceptTermsErrorMessage =
+                translator("~~You must check the box accepting the terms of service.")
+            return
+        }
+
+        if (isUpdatingTermsAcceptance.value) {
+            return
+        }
+        isUpdatingTermsAcceptance.value = true
+        viewModelScope.launch(ioDispatcher) {
+            try {
+                val isAccepted = accountUpdateRepository.acceptTerms()
+                if (isAccepted) {
+                    accountDataRefresher.updateAcceptedTerms()
+                } else {
+                    val errorMessage = if (networkMonitor.isOnline.first()) {
+                        translator("~~Something went wrong. Please try again later")
+                    } else {
+                        translator("~~Connect to the internet and try again.")
+                    }
+                    acceptTermsErrorMessage = errorMessage
+                }
+            } finally {
+                isUpdatingTermsAcceptance.value = false
+            }
+        }
+    }
 }
 
 sealed interface MainActivityUiState {

app/src/main/java/com/crisiscleanup/navigation/CrisisCleanupAuthNavHost.kt

@@ -6,8 +6,8 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.NavController
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
-import com.crisiscleanup.core.appnav.RouteConstant
 import com.crisiscleanup.core.appnav.RouteConstant.authGraphRoutePattern
+import com.crisiscleanup.core.appnav.RouteConstant.authRoute
 import com.crisiscleanup.feature.authentication.navigation.authGraph
 import com.crisiscleanup.feature.authentication.navigation.emailLoginLinkScreen
 import com.crisiscleanup.feature.authentication.navigation.forgotPasswordScreen
@@ -28,10 +28,7 @@ import com.crisiscleanup.feature.authentication.navigation.resetPasswordScreen
 import com.crisiscleanup.feature.authentication.navigation.volunteerOrgScreen
 
 private fun NavController.popToAuth() {
-    popBackStack()
-    while (currentBackStackEntry?.destination?.route?.let { it != RouteConstant.authRoute } == true) {
-        popBackStack()
-    }
+    popBackStack(authRoute, false, saveState = false)
 }
 
 @Composable
@@ -43,6 +40,7 @@ fun CrisisCleanupAuthNavHost(
     modifier: Modifier = Modifier,
     startDestination: String = authGraphRoutePattern,
 ) {
+    val navToAuth = remember(navController) { { navController.popToAuth() } }
     val navToLoginWithEmail =
         remember(navController) {
             {
@@ -67,6 +65,7 @@ fun CrisisCleanupAuthNavHost(
             nestedGraphs = {
                 loginWithEmailScreen(
                     onBack = onBack,
+                    onAuthenticated = navToAuth,
                     closeAuthentication = closeAuthentication,
                     openForgotPassword = navToForgotPassword,
                     openEmailMagicLink = navToEmailMagicLink,
@@ -81,6 +80,7 @@ fun CrisisCleanupAuthNavHost(
                 )
                 loginWithPhoneScreen(
                     onBack = onBack,
+                    onAuthenticated = navToAuth,
                     closeAuthentication = closeAuthentication,
                 )
                 volunteerOrgScreen(
@@ -102,6 +102,7 @@ fun CrisisCleanupAuthNavHost(
                 )
                 magicLinkLoginScreen(
                     onBack = onBack,
+                    onAuthenticated = navToAuth,
                     closeAuthentication = closeAuthentication,
                 )
                 requestAccessScreen(