[PM-32009] feat: Add infrastructure for new vault item types

app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkCipherExtensions.kt

@@ -36,6 +36,7 @@ import com.bitwarden.vault.SecureNote
 import com.bitwarden.vault.SecureNoteType
 import com.bitwarden.vault.SshKey
 import com.bitwarden.vault.UriMatchType
+import timber.log.Timber
 
 /**
  * Converts a Bitwarden SDK [Cipher] object to a corresponding
@@ -66,6 +67,9 @@ fun Cipher.toEncryptedNetworkCipher(
         card = card?.toEncryptedNetworkCard(),
         key = key,
         sshKey = sshKey?.toEncryptedNetworkSshKey(),
+        bankAccount = null,
+        driversLicense = null,
+        passport = null,
         archivedDate = archivedDate,
         encryptedFor = encryptedFor,
     )
@@ -96,6 +100,9 @@ fun Cipher.toEncryptedNetworkCipherResponse(
         card = card?.toEncryptedNetworkCard(),
         attachments = attachments?.toNetworkAttachmentList(),
         sshKey = sshKey?.toEncryptedNetworkSshKey(),
+        bankAccount = null,
+        driversLicense = null,
+        passport = null,
         shouldOrganizationUseTotp = organizationUseTotp,
         shouldEdit = edit,
         revisionDate = revisionDate,
@@ -380,7 +387,11 @@ private fun CipherType.toNetworkCipherType(): CipherTypeJson =
  * Bitwarden SDK [Cipher] objects.
  */
 fun List<SyncResponseJson.Cipher>.toEncryptedSdkCipherList(): List<Cipher> =
-    map { it.toEncryptedSdkCipher() }
+    mapNotNull {
+        runCatching { it.toEncryptedSdkCipher() }
+            .onFailure { e -> Timber.w(e, "Failed to convert cipher: %s", it.id) }
+            .getOrNull()
+    }
 
 /**
  * Converts a [SyncResponseJson.Cipher] object to a corresponding
@@ -607,6 +618,10 @@ fun CipherTypeJson.toSdkCipherType(): CipherType =
         CipherTypeJson.CARD -> CipherType.CARD
         CipherTypeJson.IDENTITY -> CipherType.IDENTITY
         CipherTypeJson.SSH_KEY -> CipherType.SSH_KEY
+        CipherTypeJson.BANK_ACCOUNT,
+        CipherTypeJson.DRIVERS_LICENSE,
+        CipherTypeJson.PASSPORT,
+        -> throw IllegalArgumentException("SDK mapping not yet available for $this")
     }
 
 /**

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/components/model/CreateVaultItemType.kt

@@ -34,6 +34,21 @@ enum class CreateVaultItemType(
      */
     SSH_KEY(BitwardenString.type_ssh_key),
 
+    /**
+     * A bank account cipher.
+     */
+    BANK_ACCOUNT(BitwardenString.type_bank_account),
+
+    /**
+     * A driver's license cipher.
+     */
+    DRIVERS_LICENSE(BitwardenString.type_drivers_license),
+
+    /**
+     * A passport cipher.
+     */
+    PASSPORT(BitwardenString.type_passport),
+
     /**
      * A cipher item folder
      */

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/components/util/CreateVaultItemTypeExtensions.kt

@@ -13,5 +13,8 @@ fun CreateVaultItemType.toVaultItemCipherTypeOrNull(): VaultItemCipherType? = wh
     CreateVaultItemType.IDENTITY -> VaultItemCipherType.IDENTITY
     CreateVaultItemType.SECURE_NOTE -> VaultItemCipherType.SECURE_NOTE
     CreateVaultItemType.SSH_KEY -> VaultItemCipherType.SSH_KEY
+    CreateVaultItemType.BANK_ACCOUNT -> VaultItemCipherType.BANK_ACCOUNT
+    CreateVaultItemType.DRIVERS_LICENSE -> VaultItemCipherType.DRIVERS_LICENSE
+    CreateVaultItemType.PASSPORT -> VaultItemCipherType.PASSPORT
     CreateVaultItemType.FOLDER -> null
 }

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditItemContent.kt

@@ -73,6 +73,9 @@ fun CoachMarkScope<AddEditItemCoachMark>.VaultAddEditContent(
 
                 is VaultAddEditState.ViewState.Content.ItemType.Identity -> Unit
                 is VaultAddEditState.ViewState.Content.ItemType.SshKey -> Unit
+                is VaultAddEditState.ViewState.Content.ItemType.BankAccount -> Unit
+                is VaultAddEditState.ViewState.Content.ItemType.DriversLicense -> Unit
+                is VaultAddEditState.ViewState.Content.ItemType.Passport -> Unit
                 is VaultAddEditState.ViewState.Content.ItemType.Login -> {
                     loginItemTypeHandlers.onSetupTotpClick(isGranted)
                 }
@@ -275,6 +278,10 @@ fun CoachMarkScope<AddEditItemCoachMark>.VaultAddEditContent(
                     sshKeyTypeHandlers = sshKeyItemTypeHandlers,
                 )
             }
+
+            is VaultAddEditState.ViewState.Content.ItemType.BankAccount -> Unit
+            is VaultAddEditState.ViewState.Content.ItemType.DriversLicense -> Unit
+            is VaultAddEditState.ViewState.Content.ItemType.Passport -> Unit
         }
 
         vaultAddEditAdditionalOptions(

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt

@@ -89,6 +89,7 @@ import com.x8bit.bitwarden.ui.vault.model.VaultCardExpirationMonth
 import com.x8bit.bitwarden.ui.vault.model.VaultCollection
 import com.x8bit.bitwarden.ui.vault.model.VaultIdentityTitle
 import com.x8bit.bitwarden.ui.vault.model.VaultItemCipherType
+import com.x8bit.bitwarden.ui.vault.model.VaultBankAccountType
 import com.x8bit.bitwarden.ui.vault.model.VaultLinkedFieldType
 import com.x8bit.bitwarden.ui.vault.util.detectCardBrand
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -439,6 +440,14 @@ class VaultAddEditViewModel @Inject constructor(
 
     @Suppress("LongMethod")
     private fun handleSaveClick() = onContent { content ->
+        if (!content.type.isSdkSupported) {
+            sendEvent(
+                VaultAddEditEvent.ShowSnackbar(
+                    message = BitwardenString.an_error_has_occurred.asText(),
+                ),
+            )
+            return@onContent
+        }
         if (hasValidationErrors(content)) return@onContent
 
         mutableStateFlow.update {
@@ -2552,6 +2561,9 @@ data class VaultAddEditState(
                 VaultItemCipherType.IDENTITY -> BitwardenString.new_identity.asText()
                 VaultItemCipherType.SECURE_NOTE -> BitwardenString.new_note.asText()
                 VaultItemCipherType.SSH_KEY -> BitwardenString.new_ssh_key.asText()
+                VaultItemCipherType.BANK_ACCOUNT -> BitwardenString.new_bank_account.asText()
+                VaultItemCipherType.DRIVERS_LICENSE -> BitwardenString.new_drivers_license.asText()
+                VaultItemCipherType.PASSPORT -> BitwardenString.new_passport.asText()
             }
 
             is VaultAddEditType.EditItem -> when (cipherType) {
@@ -2560,6 +2572,9 @@ data class VaultAddEditState(
                 VaultItemCipherType.IDENTITY -> BitwardenString.edit_identity.asText()
                 VaultItemCipherType.SECURE_NOTE -> BitwardenString.edit_note.asText()
                 VaultItemCipherType.SSH_KEY -> BitwardenString.edit_ssh_key.asText()
+                VaultItemCipherType.BANK_ACCOUNT -> BitwardenString.edit_bank_account.asText()
+                VaultItemCipherType.DRIVERS_LICENSE -> BitwardenString.edit_drivers_license.asText()
+                VaultItemCipherType.PASSPORT -> BitwardenString.edit_passport.asText()
             }
         }
 
@@ -2653,6 +2668,9 @@ data class VaultAddEditState(
         IDENTITY(BitwardenString.type_identity),
         SECURE_NOTES(BitwardenString.type_secure_note),
         SSH_KEYS(BitwardenString.type_ssh_key),
+        BANK_ACCOUNT(BitwardenString.type_bank_account),
+        DRIVERS_LICENSE(BitwardenString.type_drivers_license),
+        PASSPORT(BitwardenString.type_passport),
     }
 
     /**
@@ -2761,6 +2779,11 @@ data class VaultAddEditState(
                  */
                 abstract val vaultLinkedFieldTypes: ImmutableList<VaultLinkedFieldType>
 
+                /**
+                 * Whether this item type has SDK support for save operations.
+                 */
+                open val isSdkSupported: Boolean get() = true
+
                 /**
                  * Represents the login item information.
                  *
@@ -2936,6 +2959,83 @@ data class VaultAddEditState(
                     override val vaultLinkedFieldTypes: ImmutableList<VaultLinkedFieldType>
                         get() = persistentListOf()
                 }
+
+                /**
+                 * Represents the bank account item information.
+                 */
+                @Parcelize
+                data class BankAccount(
+                    val bankName: String = "",
+                    val nameOnAccount: String = "",
+                    val accountType: VaultBankAccountType = VaultBankAccountType.SELECT,
+                    val accountNumber: String = "",
+                    val routingNumber: String = "",
+                    val branchNumber: String = "",
+                    val pin: String = "",
+                    val swiftCode: String = "",
+                    val iban: String = "",
+                    val bankContactPhone: String = "",
+                ) : ItemType() {
+                    override val itemTypeOption: ItemTypeOption
+                        get() = ItemTypeOption.BANK_ACCOUNT
+
+                    override val isSdkSupported: Boolean get() = false
+
+                    override val vaultLinkedFieldTypes: ImmutableList<VaultLinkedFieldType>
+                        get() = persistentListOf()
+                }
+
+                /**
+                 * Represents the driver's license item information.
+                 */
+                @Parcelize
+                data class DriversLicense(
+                    val firstName: String = "",
+                    val middleName: String = "",
+                    val lastName: String = "",
+                    val licenseNumber: String = "",
+                    val issuingCountry: String = "",
+                    val issuingState: String = "",
+                    val expirationMonth: String = "",
+                    val expirationYear: String = "",
+                    val licenseClass: String = "",
+                ) : ItemType() {
+                    override val itemTypeOption: ItemTypeOption
+                        get() = ItemTypeOption.DRIVERS_LICENSE
+
+                    override val isSdkSupported: Boolean get() = false
+
+                    override val vaultLinkedFieldTypes: ImmutableList<VaultLinkedFieldType>
+                        get() = persistentListOf()
+                }
+
+                /**
+                 * Represents the passport item information.
+                 */
+                @Parcelize
+                data class Passport(
+                    val surname: String = "",
+                    val givenName: String = "",
+                    val dobMonth: String = "",
+                    val dobYear: String = "",
+                    val nationality: String = "",
+                    val passportNumber: String = "",
+                    val passportType: String = "",
+                    val issuingCountry: String = "",
+                    val issuingAuthority: String = "",
+                    val issueMonth: String = "",
+                    val issueYear: String = "",
+                    val expirationMonth: String = "",
+                    val expirationYear: String = "",
+                ) : ItemType() {
+                    override val itemTypeOption: ItemTypeOption
+                        get() = ItemTypeOption.PASSPORT
+
+                    override val isSdkSupported: Boolean get() = false
+
+                    override val vaultLinkedFieldTypes: ImmutableList<VaultLinkedFieldType>
+                        get() = persistentListOf()
+                }
             }
 
             /**

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/model/CustomFieldType.kt

@@ -67,4 +67,7 @@ private val VaultAddEditState.ViewState.Content.ItemType.defaultLinkedFieldTypeO
         is VaultAddEditState.ViewState.Content.ItemType.Login -> VaultLinkedFieldType.USERNAME
         is VaultAddEditState.ViewState.Content.ItemType.SecureNotes -> null
         is VaultAddEditState.ViewState.Content.ItemType.SshKey -> null
+        is VaultAddEditState.ViewState.Content.ItemType.BankAccount -> null
+        is VaultAddEditState.ViewState.Content.ItemType.DriversLicense -> null
+        is VaultAddEditState.ViewState.Content.ItemType.Passport -> null
     }

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/VaultAddEditExtensions.kt

@@ -26,4 +26,10 @@ fun VaultItemCipherType.toItemType(): VaultAddEditState.ViewState.Content.ItemTy
         VaultItemCipherType.IDENTITY -> VaultAddEditState.ViewState.Content.ItemType.Identity()
         VaultItemCipherType.SECURE_NOTE -> VaultAddEditState.ViewState.Content.ItemType.SecureNotes
         VaultItemCipherType.SSH_KEY -> VaultAddEditState.ViewState.Content.ItemType.SshKey()
+        VaultItemCipherType.BANK_ACCOUNT ->
+            VaultAddEditState.ViewState.Content.ItemType.BankAccount()
+        VaultItemCipherType.DRIVERS_LICENSE ->
+            VaultAddEditState.ViewState.Content.ItemType.DriversLicense()
+        VaultItemCipherType.PASSPORT ->
+            VaultAddEditState.ViewState.Content.ItemType.Passport()
     }

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt

@@ -1460,6 +1460,9 @@ data class VaultItemState(
             VaultItemCipherType.IDENTITY -> BitwardenString.view_identity.asText()
             VaultItemCipherType.SECURE_NOTE -> BitwardenString.view_note.asText()
             VaultItemCipherType.SSH_KEY -> BitwardenString.view_ssh_key.asText()
+            VaultItemCipherType.BANK_ACCOUNT -> BitwardenString.view_bank_account.asText()
+            VaultItemCipherType.DRIVERS_LICENSE -> BitwardenString.view_drivers_license.asText()
+            VaultItemCipherType.PASSPORT -> BitwardenString.view_passport.asText()
         }
 
     /**

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt

@@ -114,6 +114,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.toPersistentList
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
@@ -152,7 +153,7 @@ class VaultItemListingViewModel @Inject constructor(
     private val relyingPartyParser: RelyingPartyParser,
     private val toastManager: ToastManager,
     snackbarRelayManager: SnackbarRelayManager<SnackbarRelay>,
-    featureFlagManager: FeatureFlagManager,
+    private val featureFlagManager: FeatureFlagManager,
 ) : BaseViewModel<VaultItemListingState, VaultItemListingEvent, VaultItemListingsAction>(
     initialState = run {
         val userState = requireNotNull(authRepository.userStateFlow.value)
@@ -706,6 +707,9 @@ class VaultItemListingViewModel @Inject constructor(
             CreateVaultItemType.IDENTITY,
             CreateVaultItemType.SECURE_NOTE,
             CreateVaultItemType.SSH_KEY,
+            CreateVaultItemType.BANK_ACCOUNT,
+            CreateVaultItemType.DRIVERS_LICENSE,
+            CreateVaultItemType.PASSPORT,
                 -> {
                 vaultItemType
                     .toVaultItemCipherTypeOrNull()
@@ -842,8 +846,15 @@ class VaultItemListingViewModel @Inject constructor(
     }
 
     private fun createVaultItemTypeSelectionExcludedOptions(): ImmutableList<CreateVaultItemType> {
+        val isNewItemTypesEnabled = featureFlagManager
+            .getFeatureFlag(FlagKey.NewItemTypes)
+        val newItemTypeExclusions = listOfNotNull(
+            CreateVaultItemType.BANK_ACCOUNT.takeUnless { isNewItemTypesEnabled },
+            CreateVaultItemType.DRIVERS_LICENSE.takeUnless { isNewItemTypesEnabled },
+            CreateVaultItemType.PASSPORT.takeUnless { isNewItemTypesEnabled },
+        )
         // If policy is enable for any organization, exclude the card option
-        return if (state.restrictItemTypesPolicyOrgIds.isNotEmpty()) {
+        val baseExclusions = if (state.restrictItemTypesPolicyOrgIds.isNotEmpty()) {
             persistentListOf(
                 CreateVaultItemType.CARD,
                 CreateVaultItemType.FOLDER,
@@ -855,6 +866,7 @@ class VaultItemListingViewModel @Inject constructor(
                 CreateVaultItemType.FOLDER,
             )
         }
+        return (baseExclusions + newItemTypeExclusions).toPersistentList()
     }
 
     private fun handleAddVaultItemClick() {

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt

@@ -117,7 +117,7 @@ class VaultViewModel @Inject constructor(
     private val browserAutofillDialogManager: BrowserAutofillDialogManager,
     private val credentialExchangeRegistryManager: CredentialExchangeRegistryManager,
     private val buildInfoManager: BuildInfoManager,
-    featureFlagManager: FeatureFlagManager,
+    private val featureFlagManager: FeatureFlagManager,
     snackbarRelayManager: SnackbarRelayManager<SnackbarRelay>,
 ) : BaseViewModel<VaultState, VaultEvent, VaultAction>(
     initialState = run {
@@ -433,12 +433,17 @@ class VaultViewModel @Inject constructor(
     }
 
     private fun handleSelectAddItemType() {
+        val isNewItemTypesEnabled = featureFlagManager
+            .getFeatureFlag(FlagKey.NewItemTypes)
         // If policy is enable for any organization, exclude the card option
         val excludedOptions = persistentListOfNotNull(
             CreateVaultItemType.SSH_KEY,
             CreateVaultItemType.CARD.takeUnless {
                 state.restrictItemTypesPolicyOrgIds.isEmpty()
             },
+            CreateVaultItemType.BANK_ACCOUNT.takeUnless { isNewItemTypesEnabled },
+            CreateVaultItemType.DRIVERS_LICENSE.takeUnless { isNewItemTypesEnabled },
+            CreateVaultItemType.PASSPORT.takeUnless { isNewItemTypesEnabled },
         )
 
         mutableStateFlow.update {
@@ -499,6 +504,9 @@ class VaultViewModel @Inject constructor(
             CreateVaultItemType.IDENTITY,
             CreateVaultItemType.SECURE_NOTE,
             CreateVaultItemType.SSH_KEY,
+            CreateVaultItemType.BANK_ACCOUNT,
+            CreateVaultItemType.DRIVERS_LICENSE,
+            CreateVaultItemType.PASSPORT,
                 -> {
                 vaultItemType
                     .toVaultItemCipherTypeOrNull()

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultAddItemStateExtensions.kt

@@ -80,6 +80,10 @@ private fun VaultAddEditState.ViewState.Content.ItemType.toCipherType(): CipherT
         is VaultAddEditState.ViewState.Content.ItemType.Login -> CipherType.LOGIN
         is VaultAddEditState.ViewState.Content.ItemType.SecureNotes -> CipherType.SECURE_NOTE
         is VaultAddEditState.ViewState.Content.ItemType.SshKey -> CipherType.SSH_KEY
+        is VaultAddEditState.ViewState.Content.ItemType.BankAccount,
+        is VaultAddEditState.ViewState.Content.ItemType.DriversLicense,
+        is VaultAddEditState.ViewState.Content.ItemType.Passport,
+        -> throw IllegalArgumentException("SDK mapping not yet available for $this")
     }
 
 private fun VaultAddEditState.ViewState.Content.ItemType.toSshKeyView(): SshKeyView? =