github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-01 04:38:52 -05:00
Code Issues 936 Packages Projects Releases 122 Wiki Activity

[PM-11982] On Passwordless flow switch activeAccount to match PasswordlessRequest userId (#4066)

Browse Source
This commit is contained in:
aj-rosado
2024-10-14 17:31:20 +02:00
committed by GitHub
parent 4756040c4a
commit 9b5c88e990
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/test/java/com/x8bit/bitwarden/MainViewModelTest.kt
View File

@@ -608,7 +608,7 @@ class MainViewModelTest : BaseViewModelTest() {
fun `on ReceiveFirstIntent with a passwordless request data should set the special circumstance to PasswordlessRequest`() {
val viewModel = createViewModel()
val mockIntent = mockk<Intent>()
val passwordlessRequestData = mockk<PasswordlessRequestData>()
val passwordlessRequestData = DEFAULT_PASSWORDLESS_REQUEST_DATA
every {
mockIntent.getPasswordlessRequestDataIntentOrNull()
} returns passwordlessRequestData
@@ -917,7 +917,7 @@ class MainViewModelTest : BaseViewModelTest() {
fun `on ReceiveNewIntent with a passwordless auth request data should set the special circumstance to PasswordlessRequest`() {
val viewModel = createViewModel()
val mockIntent = mockk<Intent>()
val passwordlessRequestData = mockk<PasswordlessRequestData>()
val passwordlessRequestData = DEFAULT_PASSWORDLESS_REQUEST_DATA
every {
mockIntent.getPasswordlessRequestDataIntentOrNull()
} returns passwordlessRequestData
@@ -1054,6 +1054,33 @@ class MainViewModelTest : BaseViewModelTest() {
}
}
@Suppress("MaxLineLength")
@Test
fun `on ReceiveNewIntent with a passwordless auth request data userId that doesn't match activeUserId should switchAccount`() {
val viewModel = createViewModel()
val mockIntent = mockk<Intent>()
val passwordlessRequestData = mockk<PasswordlessRequestData>()
every {
mockIntent.getPasswordlessRequestDataIntentOrNull()
} returns passwordlessRequestData
every { mockIntent.getTotpDataOrNull() } returns null
every { mockIntent.getAutofillSaveItemOrNull() } returns null
every { mockIntent.getAutofillSelectionDataOrNull() } returns null
every { mockIntent.getCompleteRegistrationDataIntentOrNull() } returns null
every { intentManager.getShareDataFromIntent(mockIntent) } returns null
every { mockIntent.isMyVaultShortcut } returns false
every { mockIntent.isPasswordGeneratorShortcut } returns false
every { passwordlessRequestData.userId } returns "userId"
viewModel.trySendAction(
MainAction.ReceiveNewIntent(
intent = mockIntent,
),
)
verify { authRepository.switchAccount("userId") }
}
private fun createViewModel(
initialSpecialCircumstance: SpecialCircumstance? = null,
) = MainViewModel(
@@ -1109,6 +1136,11 @@ private val DEFAULT_USER_STATE = UserState(
accounts = listOf(DEFAULT_ACCOUNT),
)
private val DEFAULT_PASSWORDLESS_REQUEST_DATA = PasswordlessRequestData(
userId = "activeUserId",
loginRequestId = "",
)
private fun createMockFido2RegistrationIntent(
fido2CredentialRequest: Fido2CredentialRequest = createMockFido2CredentialRequest(number = 1),
): Intent = mockk<Intent> {