From 7c929c37133bc0be8334dc97ae7ddcec417e9590 Mon Sep 17 00:00:00 2001 From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com> Date: Tue, 16 Dec 2025 10:38:16 -0500 Subject: [PATCH] [PM-29842] Add organization event types for item migration acceptance and rejection (#6273) --- .../manager/model/OrganizationEvent.kt | 20 +++++++++++++++++++ .../network/model/OrganizationEventType.kt | 6 ++++++ 2 files changed, 26 insertions(+) diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/model/OrganizationEvent.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/model/OrganizationEvent.kt index 66014a232d..4c40957771 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/model/OrganizationEvent.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/model/OrganizationEvent.kt @@ -114,4 +114,24 @@ sealed class OrganizationEvent { override val type: OrganizationEventType get() = OrganizationEventType.USER_CLIENT_EXPORTED_VAULT } + + /** + * Tracks when a user's personal ciphers have been migrated to their organization's My Items + * folder as required by the organization's personal vault ownership policy. + */ + data object ItemOrganizationAccepted : OrganizationEvent() { + override val cipherId: String? = null + override val type: OrganizationEventType + get() = OrganizationEventType.ORGANIZATION_ITEM_ORGANIZATION_ACCEPTED + } + + /** + * Tracks when a user chooses to leave an organization instead of migrating their personal + * ciphers to their organization's My Items folder. + */ + data object ItemOrganizationDeclined : OrganizationEvent() { + override val cipherId: String? = null + override val type: OrganizationEventType + get() = OrganizationEventType.ORGANIZATION_ITEM_ORGANIZATION_DECLINED + } } diff --git a/network/src/main/kotlin/com/bitwarden/network/model/OrganizationEventType.kt b/network/src/main/kotlin/com/bitwarden/network/model/OrganizationEventType.kt index 91bbece85e..51a8e13393 100644 --- a/network/src/main/kotlin/com/bitwarden/network/model/OrganizationEventType.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/OrganizationEventType.kt @@ -126,6 +126,12 @@ enum class OrganizationEventType { @SerialName("1601") ORGANIZATION_PURGED_VAULT, + + @SerialName("1618") + ORGANIZATION_ITEM_ORGANIZATION_ACCEPTED, + + @SerialName("1619") + ORGANIZATION_ITEM_ORGANIZATION_DECLINED, } @Keep