BIT-529 Added the ability to create custom type fields (#374)

This commit is contained in:
Oleg Semenenko
2024-06-20 17:08:07 +01:00
committed by Álison Fernandes
parent 4e686fcc2e
commit 0148512bf8
22 changed files with 782 additions and 189 deletions
@@ -542,18 +542,6 @@ class VaultAddItemScreenTest : BaseComposeTest() {
.assertTextContains("NewNote")
}
@Suppress("MaxLineLength")
@Test
fun `in ItemType_Login state clicking New Custom Field button should trigger AddNewCustomFieldClick`() {
composeTestRule
.onNodeWithTextAfterScroll(text = "New custom field")
.performClick()
verify {
viewModel.trySendAction(VaultAddItemAction.ItemType.LoginType.AddNewCustomFieldClick)
}
}
@Test
fun `in ItemType_Login state clicking a Ownership option should send OwnershipChange action`() {
// Opens the menu
@@ -793,22 +781,6 @@ class VaultAddItemScreenTest : BaseComposeTest() {
.assertTextContains("NewNote")
}
@Suppress("MaxLineLength")
@Test
fun `in ItemType_SecureNotes state clicking New Custom Field button should trigger AddNewCustomFieldClick`() {
mutableStateFlow.value = DEFAULT_STATE_SECURE_NOTES
composeTestRule
.onNodeWithTextAfterScroll(text = "New custom field")
.performClick()
verify {
viewModel.trySendAction(
VaultAddItemAction.ItemType.SecureNotesType.AddNewCustomFieldClick,
)
}
}
@Suppress("MaxLineLength")
@Test
fun `in ItemType_SecureNotes state clicking a Ownership option should send OwnershipChange action`() {
@@ -587,21 +587,6 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
assertEquals(VaultAddItemEvent.ShowToast("Tooltip"), awaitItem())
}
}
@Test
fun `AddNewCustomFieldClick should emit ShowToast with 'Add New Custom Field' message`() =
runTest {
val viewModel = createAddVaultItemViewModel()
viewModel.eventFlow.test {
viewModel
.actionChannel
.trySend(
VaultAddItemAction.ItemType.LoginType.AddNewCustomFieldClick,
)
assertEquals(VaultAddItemEvent.ShowToast("Add New Custom Field"), awaitItem())
}
}
}
@Nested
@@ -734,19 +719,6 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
assertEquals(VaultAddItemEvent.ShowToast("Not yet implemented"), awaitItem())
}
}
@Test
fun `AddNewCustomFieldClick should emit ShowToast with 'Add New Custom Field' message`() =
runTest {
viewModel.eventFlow.test {
viewModel
.actionChannel
.trySend(
VaultAddItemAction.ItemType.SecureNotesType.AddNewCustomFieldClick,
)
assertEquals(VaultAddItemEvent.ShowToast("Not yet implemented"), awaitItem())
}
}
}
@Suppress("LongParameterList")
@@ -4,8 +4,6 @@ import com.bitwarden.core.CardView
import com.bitwarden.core.CipherRepromptType
import com.bitwarden.core.CipherType
import com.bitwarden.core.CipherView
import com.bitwarden.core.FieldType
import com.bitwarden.core.FieldView
import com.bitwarden.core.IdentityView
import com.bitwarden.core.LoginUriView
import com.bitwarden.core.LoginView
@@ -65,6 +63,7 @@ class CipherViewExtensionsTest {
ownership = "",
availableFolders = emptyList(),
availableOwners = emptyList(),
customFieldData = emptyList(),
),
result,
)
@@ -87,6 +86,7 @@ class CipherViewExtensionsTest {
ownership = "",
availableFolders = emptyList(),
availableOwners = emptyList(),
customFieldData = emptyList(),
),
result,
)
@@ -113,38 +113,7 @@ private val DEFAULT_BASE_CIPHER_VIEW: CipherView = CipherView(
viewPassword = false,
localData = null,
attachments = null,
fields = listOf(
FieldView(
name = "text",
value = "value",
type = FieldType.TEXT,
linkedId = null,
),
FieldView(
name = "hidden",
value = "value",
type = FieldType.HIDDEN,
linkedId = null,
),
FieldView(
name = "boolean",
value = "true",
type = FieldType.BOOLEAN,
linkedId = null,
),
FieldView(
name = "linked username",
value = null,
type = FieldType.LINKED,
linkedId = 100U,
),
FieldView(
name = "linked password",
value = null,
type = FieldType.LINKED,
linkedId = 101U,
),
),
fields = emptyList(),
passwordHistory = listOf(
PasswordHistoryView(
password = "old_password",
@@ -23,6 +23,7 @@ import com.x8bit.bitwarden.ui.util.assertScrollableNodeDoesNotExist
import com.x8bit.bitwarden.ui.util.isProgressBar
import com.x8bit.bitwarden.ui.util.onFirstNodeWithTextAfterScroll
import com.x8bit.bitwarden.ui.util.onNodeWithTextAfterScroll
import com.x8bit.bitwarden.ui.vault.model.VaultLinkedFieldType
import io.mockk.every
import io.mockk.just
import io.mockk.mockk
@@ -712,11 +713,11 @@ private val DEFAULT_LOGIN_VIEW_STATE: VaultItemState.ViewState.Content.Login =
),
VaultItemState.ViewState.Content.Custom.LinkedField(
name = "linked username",
id = 100U,
vaultLinkedFieldType = VaultLinkedFieldType.USERNAME,
),
VaultItemState.ViewState.Content.Custom.LinkedField(
name = "linked password",
id = 101U,
vaultLinkedFieldType = VaultLinkedFieldType.PASSWORD,
),
),
requiresReprompt = true,
@@ -14,6 +14,7 @@ import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.vault.feature.item.util.DEFAULT_EMPTY_LOGIN_VIEW_STATE
import com.x8bit.bitwarden.ui.vault.feature.item.util.toViewState
import com.x8bit.bitwarden.ui.vault.model.VaultLinkedFieldType
import io.mockk.coEvery
import io.mockk.coVerify
import io.mockk.every
@@ -626,11 +627,11 @@ private val DEFAULT_LOGIN_VIEW_STATE: VaultItemState.ViewState.Content.Login =
),
VaultItemState.ViewState.Content.Custom.LinkedField(
name = "linked username",
id = 100U,
vaultLinkedFieldType = VaultLinkedFieldType.USERNAME,
),
VaultItemState.ViewState.Content.Custom.LinkedField(
name = "linked password",
id = 101U,
vaultLinkedFieldType = VaultLinkedFieldType.PASSWORD,
),
),
requiresReprompt = true,
@@ -9,6 +9,7 @@ import com.bitwarden.core.LoginUriView
import com.bitwarden.core.LoginView
import com.bitwarden.core.PasswordHistoryView
import com.x8bit.bitwarden.ui.vault.feature.item.VaultItemState
import com.x8bit.bitwarden.ui.vault.model.VaultLinkedFieldType
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.BeforeEach
@@ -192,11 +193,11 @@ val DEFAULT_FULL_LOGIN_VIEW_STATE: VaultItemState.ViewState.Content.Login =
),
VaultItemState.ViewState.Content.Custom.LinkedField(
name = "linked username",
id = 100U,
vaultLinkedFieldType = VaultLinkedFieldType.USERNAME,
),
VaultItemState.ViewState.Content.Custom.LinkedField(
name = "linked password",
id = 101U,
vaultLinkedFieldType = VaultLinkedFieldType.PASSWORD,
),
),
requiresReprompt = true,
@@ -3,8 +3,6 @@ package com.x8bit.bitwarden.ui.vault.feature.vault.util
import com.bitwarden.core.CipherRepromptType
import com.bitwarden.core.CipherType
import com.bitwarden.core.CipherView
import com.bitwarden.core.FieldType
import com.bitwarden.core.FieldView
import com.bitwarden.core.LoginUriView
import com.bitwarden.core.LoginView
import com.bitwarden.core.PasswordHistoryView
@@ -159,7 +157,7 @@ class VaultDataExtensionsTest {
viewPassword = true,
localData = null,
attachments = null,
fields = null,
fields = emptyList(),
passwordHistory = null,
creationDate = Instant.MIN,
deletedDate = null,
@@ -183,6 +181,7 @@ class VaultDataExtensionsTest {
masterPasswordReprompt = false,
notes = "mockNotes-1",
ownership = "mockOwnership-1",
customFieldData = emptyList(),
)
val result = loginItemType.toCipherView()
@@ -208,7 +207,7 @@ class VaultDataExtensionsTest {
),
favorite = true,
reprompt = CipherRepromptType.NONE,
fields = null,
fields = emptyList(),
passwordHistory = listOf(
PasswordHistoryView(
password = "old_password",
@@ -256,7 +255,7 @@ class VaultDataExtensionsTest {
viewPassword = true,
localData = null,
attachments = null,
fields = null,
fields = emptyList(),
passwordHistory = null,
creationDate = Instant.MIN,
deletedDate = null,
@@ -277,6 +276,7 @@ class VaultDataExtensionsTest {
masterPasswordReprompt = true,
notes = "mockNotes-1",
ownership = "mockOwnership-1",
customFieldData = emptyList(),
)
val result = secureNotesItemType.toCipherView()
@@ -288,7 +288,7 @@ class VaultDataExtensionsTest {
type = CipherType.SECURE_NOTE,
secureNote = SecureNoteView(SecureNoteType.GENERIC),
reprompt = CipherRepromptType.PASSWORD,
fields = null,
fields = emptyList(),
),
result,
)
@@ -315,38 +315,7 @@ private val DEFAULT_BASE_CIPHER_VIEW: CipherView = CipherView(
viewPassword = false,
localData = null,
attachments = null,
fields = listOf(
FieldView(
name = "text",
value = "value",
type = FieldType.TEXT,
linkedId = null,
),
FieldView(
name = "hidden",
value = "value",
type = FieldType.HIDDEN,
linkedId = null,
),
FieldView(
name = "boolean",
value = "true",
type = FieldType.BOOLEAN,
linkedId = null,
),
FieldView(
name = "linked username",
value = null,
type = FieldType.LINKED,
linkedId = 100U,
),
FieldView(
name = "linked password",
value = null,
type = FieldType.LINKED,
linkedId = 101U,
),
),
fields = emptyList(),
passwordHistory = listOf(
PasswordHistoryView(
password = "old_password",