Add initial UI flow for TDE (#1235)

This commit is contained in:
David Perez
2024-06-20 17:08:07 +01:00
committed by Álison Fernandes
parent bfbb8d47a6
commit a6a4c40693
12 changed files with 300 additions and 49 deletions
@@ -14,11 +14,15 @@ import io.mockk.mockk
import io.mockk.verify
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.update
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test
class TrustedDeviceScreenTest : BaseComposeTest() {
private var onNavigateToAdminApprovalEmail: String? = null
private var onNavigateToLoginWithOtherDeviceEmail: String? = null
private val mutableEventFlow = bufferedMutableSharedFlow<TrustedDeviceEvent>()
private val mutableStateFlow = MutableStateFlow(DEFAULT_STATE)
val viewModel = mockk<TrustedDeviceViewModel>(relaxed = true) {
@@ -31,10 +35,26 @@ class TrustedDeviceScreenTest : BaseComposeTest() {
composeTestRule.setContent {
TrustedDeviceScreen(
viewModel = viewModel,
onNavigateToAdminApproval = { onNavigateToAdminApprovalEmail = it },
onNavigateToLoginWithOtherDevice = { onNavigateToLoginWithOtherDeviceEmail = it },
)
}
}
@Test
fun `on NavigateToApproveWithDevice event should invoke onNavigateToAdminApproval`() {
val email = "test@bitwarden.com"
mutableEventFlow.tryEmit(TrustedDeviceEvent.NavigateToApproveWithAdmin(email))
assertEquals(onNavigateToAdminApprovalEmail, email)
}
@Test
fun `on NavigateToApproveWithDevice event should invoke onNavigateToLoginWithOtherDevice`() {
val email = "test@bitwarden.com"
mutableEventFlow.tryEmit(TrustedDeviceEvent.NavigateToApproveWithDevice(email))
assertEquals(onNavigateToLoginWithOtherDeviceEmail, email)
}
@Test
fun `on back click should send BackClick`() {
composeTestRule.onNodeWithContentDescription("Close").performClick()
@@ -3,7 +3,9 @@ package com.x8bit.bitwarden.ui.auth.feature.trusteddevice
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.UserState
import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository
import com.x8bit.bitwarden.data.platform.repository.model.Environment
import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository
import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest
import com.x8bit.bitwarden.ui.platform.base.util.asText
@@ -12,17 +14,32 @@ import io.mockk.just
import io.mockk.mockk
import io.mockk.runs
import io.mockk.verify
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.test.runTest
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
class TrustedDeviceViewModelTest : BaseViewModelTest() {
private val mutableUserStateFlow = MutableStateFlow<UserState?>(DEFAULT_USER_STATE)
private val authRepository: AuthRepository = mockk {
every { userStateFlow } returns mutableUserStateFlow
every { logout() } just runs
}
private val environmentRepo: FakeEnvironmentRepository = FakeEnvironmentRepository()
@Test
fun `on init should logout when trusted device is not present`() {
mutableUserStateFlow.value = DEFAULT_USER_STATE.copy(
accounts = listOf(DEFAULT_ACCOUNT.copy(trustedDevice = null)),
)
createViewModel()
verify(exactly = 1) {
authRepository.logout()
}
}
@Test
fun `on BackClick should logout`() {
val viewModel = createViewModel()
@@ -40,10 +57,10 @@ class TrustedDeviceViewModelTest : BaseViewModelTest() {
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(TrustedDeviceAction.RememberToggle(isRemembered = true))
assertEquals(DEFAULT_STATE.copy(isRemembered = true), awaitItem())
viewModel.trySendAction(TrustedDeviceAction.RememberToggle(isRemembered = false))
assertEquals(DEFAULT_STATE.copy(isRemembered = false), awaitItem())
viewModel.trySendAction(TrustedDeviceAction.RememberToggle(isRemembered = true))
assertEquals(DEFAULT_STATE.copy(isRemembered = true), awaitItem())
}
}
@@ -58,22 +75,30 @@ class TrustedDeviceViewModelTest : BaseViewModelTest() {
}
@Test
fun `on ApproveWithAdminClick emits ShowToast`() = runTest {
fun `on ApproveWithAdminClick emits NavigateToApproveWithAdmin`() = runTest {
every { authRepository.shouldTrustDevice = true } just runs
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(TrustedDeviceAction.ApproveWithAdminClick)
assertEquals(TrustedDeviceEvent.ShowToast("Not yet implemented".asText()), awaitItem())
assertEquals(TrustedDeviceEvent.NavigateToApproveWithAdmin(email = EMAIL), awaitItem())
}
verify(exactly = 1) {
authRepository.shouldTrustDevice = true
}
}
@Test
fun `on ApproveWithDeviceClick emits ShowToast`() = runTest {
fun `on ApproveWithDeviceClick emits NavigateToApproveWithDevice`() = runTest {
every { authRepository.shouldTrustDevice = true } just runs
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(TrustedDeviceAction.ApproveWithDeviceClick)
assertEquals(TrustedDeviceEvent.ShowToast("Not yet implemented".asText()), awaitItem())
assertEquals(TrustedDeviceEvent.NavigateToApproveWithDevice(email = EMAIL), awaitItem())
}
verify(exactly = 1) {
authRepository.shouldTrustDevice = true
}
}
@@ -113,12 +138,44 @@ class TrustedDeviceViewModelTest : BaseViewModelTest() {
)
}
private const val USER_ID: String = "userId"
private const val EMAIL: String = "email@bitwarden.com"
private val DEFAULT_STATE: TrustedDeviceState = TrustedDeviceState(
emailAddress = "email@bitwarden.com",
emailAddress = EMAIL,
environmentLabel = "bitwarden.com",
isRemembered = false,
isRemembered = true,
showContinueButton = false,
showOtherDeviceButton = false,
showRequestAdminButton = false,
showOtherDeviceButton = true,
showRequestAdminButton = true,
showMasterPasswordButton = false,
)
private val TRUSTED_DEVICE = UserState.TrustedDevice(
isDeviceTrusted = false,
hasMasterPassword = false,
hasAdminApproval = true,
hasLoginApprovingDevice = true,
hasResetPasswordPermission = false,
)
private val DEFAULT_ACCOUNT = UserState.Account(
userId = USER_ID,
name = "Active User",
email = EMAIL,
environment = Environment.Us,
avatarColorHex = "#aa00aa",
isPremium = true,
isLoggedIn = true,
isVaultUnlocked = true,
needsPasswordReset = false,
isBiometricsEnabled = false,
organizations = emptyList(),
needsMasterPassword = false,
trustedDevice = TRUSTED_DEVICE,
)
private val DEFAULT_USER_STATE = UserState(
activeUserId = USER_ID,
accounts = listOf(DEFAULT_ACCOUNT),
)
@@ -100,6 +100,15 @@ class RootNavScreenTest : BaseComposeTest() {
)
}
// Make sure navigating to set password works as expected:
rootNavStateFlow.value = RootNavState.TrustedDevice
composeTestRule.runOnIdle {
fakeNavHostController.assertLastNavigation(
route = "trusted_device_graph",
navOptions = expectedNavOptions,
)
}
// Make sure navigating to vault unlocked works as expected:
rootNavStateFlow.value = RootNavState.VaultUnlocked(activeUserId = "userId")
composeTestRule.runOnIdle {
@@ -119,6 +119,75 @@ class RootNavViewModelTest : BaseViewModelTest() {
)
}
@Test
fun `when the active user has an untrusted device the nav state should be TrustedDevice`() {
mutableUserStateFlow.tryEmit(
UserState(
activeUserId = "activeUserId",
accounts = listOf(
UserState.Account(
userId = "activeUserId",
name = "name",
email = "email",
avatarColorHex = "avatarColorHex",
environment = Environment.Us,
isPremium = true,
isLoggedIn = false,
isVaultUnlocked = false,
needsPasswordReset = false,
isBiometricsEnabled = false,
organizations = emptyList(),
needsMasterPassword = false,
trustedDevice = UserState.TrustedDevice(
isDeviceTrusted = false,
hasMasterPassword = false,
hasAdminApproval = true,
hasLoginApprovingDevice = true,
hasResetPasswordPermission = false,
),
),
),
),
)
val viewModel = createViewModel()
assertEquals(RootNavState.TrustedDevice, viewModel.stateFlow.value)
}
@Suppress("MaxLineLength")
@Test
fun `when the active user has an untrusted device but an unlocked vault the nav state should be Auth`() {
mutableUserStateFlow.tryEmit(
UserState(
activeUserId = "activeUserId",
accounts = listOf(
UserState.Account(
userId = "activeUserId",
name = "name",
email = "email",
avatarColorHex = "avatarColorHex",
environment = Environment.Us,
isPremium = true,
isLoggedIn = false,
isVaultUnlocked = true,
needsPasswordReset = false,
isBiometricsEnabled = false,
organizations = emptyList(),
needsMasterPassword = false,
trustedDevice = UserState.TrustedDevice(
isDeviceTrusted = false,
hasMasterPassword = false,
hasAdminApproval = true,
hasLoginApprovingDevice = true,
hasResetPasswordPermission = false,
),
),
),
),
)
val viewModel = createViewModel()
assertEquals(RootNavState.Auth, viewModel.stateFlow.value)
}
@Suppress("MaxLineLength")
@Test
fun `when the active user but there are pending account additions the nav state should be Auth`() {