mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-03-15 18:58:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

BIT-467: Implement Lock Now functionality (#327)

Browse source
This commit is contained in:
Brian Yencho 2023-12-05 16:41:55 -06:00 • committed by Álison Fernandes
parent a7dc5fe08f
commit c72053f935
5 changed files with 50 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt
View file

@ -53,6 +53,11 @@ interface VaultRepository {
*/
fun getVaultFolderStateFlow(folderId: String): StateFlow<DataState<FolderView?>>
/**
* Locks the vault for the current user if currently unlocked.
*/
fun lockVaultForCurrentUser()
/**
* Locks the vault for the user with the given [userId] if necessary.
*/

6
app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt
View file

@ -159,6 +159,12 @@ class VaultRepositoryImpl constructor(
initialValue = DataState.Loading,
)
override fun lockVaultForCurrentUser() {
authDiskSource.userState?.activeUserId?.let {
lockVaultIfNecessary(it)
}
}
override fun lockVaultIfNecessary(userId: String) {
setVaultToLocked(userId = userId)
}

5
app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModel.kt
View file

@ -5,6 +5,7 @@ import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.viewModelScope
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.vault.repository.VaultRepository
import com.x8bit.bitwarden.ui.platform.base.BaseViewModel
import com.x8bit.bitwarden.ui.platform.base.util.Text
import com.x8bit.bitwarden.ui.platform.base.util.asText
@ -24,6 +25,7 @@ private const val KEY_STATE = "state"
@HiltViewModel
class AccountSecurityViewModel @Inject constructor(
private val authRepository: AuthRepository,
private val vaultRepository: VaultRepository,
savedStateHandle: SavedStateHandle,
) : BaseViewModel<AccountSecurityState, AccountSecurityEvent, AccountSecurityAction>(
initialState = savedStateHandle[KEY_STATE]
@ -99,8 +101,7 @@ class AccountSecurityViewModel @Inject constructor(
}
private fun handleLockNowClick() {
// TODO BIT-467: Lock the app
sendEvent(AccountSecurityEvent.ShowToast("Lock the app.".asText()))
vaultRepository.lockVaultForCurrentUser()
}
private fun handleLoginRequestToggle(action: AccountSecurityAction.LoginRequestToggle) {

25
app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt
View file

@ -469,6 +469,31 @@ class VaultRepositoryTest {
}
}
@Suppress("MaxLineLength")
@Test
fun `lockVaultForCurrentUser should lock the vault for the current user if it is currently unlocked`() =
runTest {
fakeAuthDiskSource.userState = MOCK_USER_STATE
val userId = "mockId-1"
verifyUnlockedVault(userId = userId)
assertEquals(
VaultState(
unlockedVaultUserIds = setOf(userId),
),
vaultRepository.vaultStateFlow.value,
)
vaultRepository.lockVaultForCurrentUser()
assertEquals(
VaultState(
unlockedVaultUserIds = emptySet(),
),
vaultRepository.vaultStateFlow.value,
)
}
@Test
fun `lockVaultIfNecessary should lock the given account if it is currently unlocked`() =
runTest {

16
app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModelTest.kt
View file

@ -3,10 +3,13 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.accountsecurity
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.vault.repository.VaultRepository
import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest
import com.x8bit.bitwarden.ui.platform.base.util.asText
import io.mockk.every
import io.mockk.just
import io.mockk.mockk
import io.mockk.runs
import io.mockk.verify
import kotlinx.coroutines.test.runTest
import org.junit.jupiter.api.Assertions.assertEquals
@ -80,12 +83,13 @@ class AccountSecurityViewModelTest : BaseViewModelTest() {
}
@Test
fun `on LockNowClick should emit ShowToast`() = runTest {
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(AccountSecurityAction.LockNowClick)
assertEquals(AccountSecurityEvent.ShowToast("Lock the app.".asText()), awaitItem())
fun `on LockNowClick should call lockVaultForCurrentUser`() {
val vaultRepository = mockk<VaultRepository>(relaxed = true) {
every { lockVaultForCurrentUser() } just runs
}
val viewModel = createViewModel(vaultRepository = vaultRepository)
viewModel.trySendAction(AccountSecurityAction.LockNowClick)
verify { vaultRepository.lockVaultForCurrentUser() }
}
@Test
@ -230,11 +234,13 @@ class AccountSecurityViewModelTest : BaseViewModelTest() {
private fun createViewModel(
authRepository: AuthRepository = mockk(relaxed = true),
vaultRepository: VaultRepository = mockk(relaxed = true),
savedStateHandle: SavedStateHandle = SavedStateHandle().apply {
set("state", DEFAULT_STATE)
},
): AccountSecurityViewModel = AccountSecurityViewModel(
authRepository = authRepository,
vaultRepository = vaultRepository,
savedStateHandle = savedStateHandle,
)