Refactor Registration Flow to Remove Consent Screen and Anonymous Login and move Invitation Code screen

app/src/androidTest/kotlin/edu/stanford/bdh/engagehf/OnboardingFlowTest.kt

@@ -3,7 +3,9 @@ package edu.stanford.bdh.engagehf
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
+import edu.stanford.bdh.engagehf.simulator.NavigatorSimulator
 import edu.stanford.bdh.engagehf.simulator.OnboardingFlowSimulator
+import edu.stanford.spezi.core.navigation.Navigator
 import edu.stanford.spezi.module.onboarding.invitation.InvitationCodeRepository
 import edu.stanford.spezi.module.onboarding.onboarding.OnboardingRepository
 import edu.stanford.spezi.module.onboarding.sequential.SequentialOnboardingRepository
@@ -31,6 +33,9 @@ class OnboardingFlowTest {
     @Inject
     lateinit var invitationCodeRepository: InvitationCodeRepository
 
+    @Inject
+    lateinit var navigator: Navigator
+
     @Before
     fun init() {
         hiltRule.inject()
@@ -58,7 +63,8 @@ class OnboardingFlowTest {
 
     @Test
     fun `it should navigate and display sequential onboarding correctly`() = runTest {
-        val stepTitle = sequentialOnboardingRepository.getSequentialOnboardingData().steps.first().title
+        val stepTitle =
+            sequentialOnboardingRepository.getSequentialOnboardingData().steps.first().title
         onboardingFlow {
             onboardingScreen {
                 clickContinueButton()
@@ -73,7 +79,7 @@ class OnboardingFlowTest {
     }
 
     @Test
-    fun `it should display and navigate invitation screen correctly`() = runTest {
+    fun `it should display and navigate login screen correctly`() = runTest {
         val steps = sequentialOnboardingRepository.getSequentialOnboardingData().steps
         onboardingFlow {
             onboardingScreen {
@@ -86,18 +92,17 @@ class OnboardingFlowTest {
                 }
             }
 
-            invitationCodeScreen {
-                val screenData = invitationCodeRepository.getScreenData()
-                assertTitle(text = screenData.title)
-                assertDescription(text = screenData.description)
-                assertIsDisplayed()
-                assertMainButtonDisplayed()
-                assertSecondaryButtonDisplayed()
+            navigatorSimulator {
+                assertLoginScreenIsDisplayed()
             }
         }
     }
 
     private fun onboardingFlow(scope: OnboardingFlowSimulator.() -> Unit) {
         OnboardingFlowSimulator(composeTestRule).apply(scope)
     }
+
+    private fun navigatorSimulator(scope: NavigatorSimulator.() -> Unit) {
+        NavigatorSimulator(composeTestRule, navigator).apply(scope)
+    }
 }

app/src/androidTest/kotlin/edu/stanford/bdh/engagehf/simulator/NavigatorSimulator.kt

@@ -76,7 +76,7 @@ class NavigatorSimulator(
     }
 
     fun navigateToLoginScreen() {
-        navigator.navigateTo(AccountNavigationEvent.LoginScreen(false))
+        navigator.navigateTo(AccountNavigationEvent.LoginScreen)
     }
 
     fun navigateToRegisterScreen() {

app/src/main/kotlin/edu/stanford/bdh/engagehf/MainActivity.kt

@@ -120,8 +120,7 @@
         }
 
         composable<Routes.LoginScreen> {
-            val args = it.toRoute<Routes.LoginScreen>()
-            LoginScreen(isAlreadyRegistered = args.isAlreadyRegistered)
+            LoginScreen()
         }
 
         composable<EducationRoutes.VideoDetail>(
@@ -182,9 +181,7 @@
                         )
 
                         is AccountNavigationEvent.LoginScreen -> navHostController.navigate(
-                            Routes.LoginScreen(
-                                isAlreadyRegistered = event.isAlreadyRegistered
-                            )
+                            Routes.LoginScreen()
                         )
 
                         is OnboardingNavigationEvent.InvitationCodeScreen -> navHostController.navigate(

app/src/main/kotlin/edu/stanford/bdh/engagehf/MainActivityViewModel.kt

@@ -51,7 +51,7 @@ class MainActivityViewModel @Inject constructor(
             val startDestination = when (val userState = userSessionManager.getUserState()) {
                 is UserState.NotInitialized, UserState.Anonymous -> Routes.OnboardingScreen
                 is UserState.Registered -> {
-                    if (userState.hasConsented) Routes.AppScreen else Routes.ConsentScreen
+                    if (userState.hasInvitationCodeConfirmed) Routes.AppScreen else Routes.InvitationCodeScreen
                 }
             }
             _uiState.update { MainUiState.Content(startDestination = startDestination) }

app/src/main/kotlin/edu/stanford/bdh/engagehf/onboarding/EngageInvitationCodeRepository.kt

@@ -1,7 +1,7 @@
 package edu.stanford.bdh.engagehf.onboarding
 
+import edu.stanford.bdh.engagehf.navigation.AppNavigationEvent
 import edu.stanford.spezi.core.navigation.Navigator
-import edu.stanford.spezi.module.account.AccountNavigationEvent
 import edu.stanford.spezi.module.onboarding.invitation.InvitationCodeRepository
 import edu.stanford.spezi.module.onboarding.invitation.InvitationCodeScreenData
 import javax.inject.Inject
@@ -18,8 +18,7 @@
         return InvitationCodeScreenData(
             title = "Invitation Code",
             description = "Please enter your invitation code to join the ENGAGE-HF study.",
-            redeemAction = { navigator.navigateTo(AccountNavigationEvent.LoginScreen(false)) },
-            gotAnAccountAction = { navigator.navigateTo(AccountNavigationEvent.LoginScreen(true)) }
+            redeemAction = { navigator.navigateTo(AppNavigationEvent.AppScreen) },
         )
     }
 }

app/src/main/kotlin/edu/stanford/bdh/engagehf/onboarding/EngageSequentialOnboardingRepository.kt

@@ -1,7 +1,7 @@
 package edu.stanford.bdh.engagehf.onboarding
 
 import edu.stanford.spezi.core.navigation.Navigator
-import edu.stanford.spezi.module.onboarding.OnboardingNavigationEvent
+import edu.stanford.spezi.module.account.AccountNavigationEvent
 import edu.stanford.spezi.module.onboarding.sequential.SequentialOnboardingData
 import edu.stanford.spezi.module.onboarding.sequential.SequentialOnboardingRepository
 import edu.stanford.spezi.module.onboarding.sequential.Step
@@ -45,7 +45,7 @@
             ),
             actionText = "Start",
             onAction = {
-                navigator.navigateTo(OnboardingNavigationEvent.InvitationCodeScreen)
+                navigator.navigateTo(AccountNavigationEvent.LoginScreen)
             }
         )
     }

app/src/test/kotlin/edu/stanford/bdh/engagehf/MainActivityViewModelTest.kt

@@ -103,10 +103,10 @@ class MainActivityViewModelTest {
     }
 
     @Test
-    fun `it should have app screen start destination for registered user if consented`() =
+    fun `it should have app screen start destination for registered user if has Invitation Code Confirmed`() =
         runTestUnconfined {
             // given
-            val userState = UserState.Registered(hasConsented = true)
+            val userState = UserState.Registered(hasInvitationCodeConfirmed = true)
             coEvery { userSessionManager.getUserState() } returns userState
 
             // when
@@ -117,17 +117,17 @@ class MainActivityViewModelTest {
         }
 
     @Test
-    fun `it should have consent screen start destination for registered user if not consented`() =
+    fun `it should have consent screen start destination for registered user if has not Invitation Code Confirmed`() =
         runTestUnconfined {
             // given
-            val userState = UserState.Registered(hasConsented = false)
+            val userState = UserState.Registered(hasInvitationCodeConfirmed = false)
             coEvery { userSessionManager.getUserState() } returns userState
 
             // when
             createViewModel()
 
             // then
-            assertStartDestination(startDestination = Routes.ConsentScreen)
+            assertStartDestination(startDestination = Routes.InvitationCodeScreen)
         }
 
     @Test

app/src/test/kotlin/edu/stanford/bdh/engagehf/health/symptoms/SymptomsUiStateMapperTest.kt

@@ -58,7 +58,6 @@ class SymptomsUiStateMapperTest {
         // Given
         val symptomScores = listOf(
             createSymptomScore(day = 1, overallScore = 50.0, physicalLimitsScore = 40.0),
-            createSymptomScore(day = 2, overallScore = 60.0, physicalLimitsScore = 50.0)
         )
 
         // When
@@ -74,8 +73,8 @@ class SymptomsUiStateMapperTest {
         val successStateOverall = resultOverall as SymptomsUiState.Success
         val successStatePhysical = resultPhysical as SymptomsUiState.Success
 
-        assertThat(successStateOverall.data.headerData.formattedValue).isEqualTo("60.0%")
-        assertThat(successStatePhysical.data.headerData.formattedValue).isEqualTo("50.0%")
+        assertThat(successStateOverall.data.headerData.formattedValue).isEqualTo("50.0%")
+        assertThat(successStatePhysical.data.headerData.formattedValue).isEqualTo("40.0%")
     }
 
     @Test

modules/account/src/main/kotlin/edu/stanford/spezi/module/account/AccountNavigationEvent.kt

@@ -9,5 +9,5 @@
         val password: String = "",
     ) : AccountNavigationEvent()
 
-    data class LoginScreen(val isAlreadyRegistered: Boolean) : AccountNavigationEvent()
+    data object LoginScreen : AccountNavigationEvent()
 }

modules/account/src/main/kotlin/edu/stanford/spezi/module/account/login/LoginScreen.kt

@@ -33,6 +33,7 @@
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
@@ -42,26 +43,25 @@
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import edu.stanford.spezi.core.design.component.AsyncTextButton
+import edu.stanford.spezi.core.design.component.VerticalSpacer
 import edu.stanford.spezi.core.design.component.validated.outlinedtextfield.ValidatedOutlinedTextField
 import edu.stanford.spezi.core.design.theme.Colors
 import edu.stanford.spezi.core.design.theme.Spacings
 import edu.stanford.spezi.core.design.theme.SpeziTheme
 import edu.stanford.spezi.core.design.theme.TextStyles.bodyLarge
 import edu.stanford.spezi.core.design.theme.TextStyles.titleLarge
 import edu.stanford.spezi.core.utils.extensions.testIdentifier
+import edu.stanford.spezi.module.account.R
 import edu.stanford.spezi.module.account.login.components.SignInWithGoogleButton
 import edu.stanford.spezi.module.account.login.components.TextDivider
 import edu.stanford.spezi.module.account.register.FieldState
 import edu.stanford.spezi.module.account.register.IconLeadingContent
 import edu.stanford.spezi.core.design.R as DesignR
 
 @Composable
-fun LoginScreen(
-    isAlreadyRegistered: Boolean,
-) {
+fun LoginScreen() {
     val viewModel = hiltViewModel<LoginViewModel>()
     val uiState by viewModel.uiState.collectAsState()
-    viewModel.onAction(Action.SetIsAlreadyRegistered(isAlreadyRegistered))
 
     LoginScreen(
         uiState = uiState, onAction = viewModel::onAction
@@ -94,7 +94,7 @@
         verticalArrangement = Arrangement.Center
     ) {
         Text(
-            text = "Your Account", style = titleLarge
+            text = stringResource(R.string.your_account), style = titleLarge
         )
         Spacer(modifier = Modifier.height(Spacings.large))
         Text(
@@ -131,15 +131,15 @@
                     onValueChange = {
                         onAction(Action.TextFieldUpdate(it, TextFieldType.PASSWORD))
                     },
-                    labelText = "Password",
+                    labelText = stringResource(R.string.password),
                     visualTransformation = if (uiState.passwordVisibility) {
                         VisualTransformation.None
                     } else {
                         PasswordVisualTransformation()
                     },
                     keyboardOptions = KeyboardOptions.Default.copy(imeAction = ImeAction.Done),
                     keyboardActions = KeyboardActions(onDone = {
-                        onAction(Action.Async.PasswordSignInOrSignUp)
+                        onAction(Action.Async.PasswordSignIn)
                     }),
                     trailingIcon = {
                         IconButton(onClick = { onAction(Action.TogglePasswordVisibility) }) {
@@ -150,15 +150,21 @@
                             }
                             Icon(
                                 painter = painterResource(id = iconId),
-                                contentDescription = if (uiState.passwordVisibility) "Hide password" else "Show password"
+                                contentDescription = if (uiState.passwordVisibility) {
+                                    stringResource(
+                                        R.string.hide_password
+                                    )
+                                } else {
+                                    stringResource(R.string.show_password)
+                                }
                             )
                         }
                     }
                 )
             })
         val forgotPasswordAction = Action.Async.ForgotPassword
         AsyncTextButton(
-            text = "Forgot Password?",
+            text = stringResource(R.string.forgot_password),
             isLoading = uiState.pendingActions.contains(forgotPasswordAction),
             containerColor = Colors.transparent,
             contentPadding = PaddingValues(0.dp),
@@ -169,11 +175,11 @@
             modifier = Modifier.align(Alignment.End)
         )
         Spacer(modifier = Modifier.height(Spacings.medium))
-        val passwordSignInOrSignUp = Action.Async.PasswordSignInOrSignUp
+        val passwordSignIn = Action.Async.PasswordSignIn
         AsyncTextButton(
-            isLoading = uiState.pendingActions.contains(passwordSignInOrSignUp),
-            text = if (uiState.isAlreadyRegistered) "Login" else "Register",
-            onClick = { onAction(passwordSignInOrSignUp) },
+            isLoading = uiState.pendingActions.contains(passwordSignIn),
+            text = "Login",
+            onClick = { onAction(passwordSignIn) },
             modifier = Modifier.fillMaxWidth(),
             enabled = uiState.isPasswordSignInEnabled
         )
@@ -183,9 +189,8 @@
             horizontalArrangement = Arrangement.Center,
             verticalAlignment = Alignment.CenterVertically
         ) {
-            Text("Don't have an Account yet?")
+            Text(stringResource(R.string.don_t_have_an_account_yet))
             TextButton(
-                enabled = !uiState.isAlreadyRegistered,
                 onClick = {
                     onAction(Action.NavigateToRegister)
                 },
@@ -194,13 +199,12 @@
             }
         }
         Spacer(modifier = Modifier.height(Spacings.medium))
-        TextDivider(text = "or")
-        Spacer(modifier = Modifier.height(Spacings.medium))
+        TextDivider(stringResource(R.string.or))
+        VerticalSpacer()
         val googleSignInOrSignUp = Action.Async.GoogleSignInOrSignUp
         SignInWithGoogleButton(
             isLoading = uiState.pendingActions.contains(googleSignInOrSignUp),
             onButtonClick = { onAction(googleSignInOrSignUp) },
-            isAlreadyRegistered = uiState.isAlreadyRegistered,
         )
     }
 }
@@ -225,7 +229,6 @@
             email = FieldState("[email protected]"),
             password = FieldState("password"),
             passwordVisibility = true,
-            isAlreadyRegistered = true
         )
     )
 }