bitwarden · LRNcardozoWDF · Feb 10, 2025 · Nov 7, 2024 · Feb 4, 2025 · Feb 4, 2025
@@ -154,15 +154,16 @@ final class VaultCoordinator: Coordinator, HasStackNavigator { // swiftlint:disa
         switch route {
         case .addAccount:
             delegate?.didTapAddAccount()
-        case let .addItem(allowTypeSelection, group, newCipherOptions):
+        case let .addItem(allowTypeSelection, group, newCipherOptions, organizationId):
             Task {
                 let hasPremium = try? await services.vaultRepository.doesActiveAccountHavePremium()
                 showVaultItem(
                     route: .addItem(
                         allowTypeSelection: allowTypeSelection,
                         group: group,
                         hasPremium: hasPremium ?? false,
-                        newCipherOptions: newCipherOptions
+                        newCipherOptions: newCipherOptions,
+                        organizationId: organizationId
                     ),
                     delegate: context as? CipherItemOperationDelegate
                 )

@@ -126,7 +126,12 @@ final class VaultListProcessor: StateProcessor<
         switch action {
         case .addItemPressed:
             setProfileSwitcher(visible: false)
-            coordinator.navigate(to: .addItem())
+            switch state.vaultFilterType {
+            case let .organization(organization):
+                coordinator.navigate(to: .addItem(organizationId: organization.id))
+            default:
+                coordinator.navigate(to: .addItem())
+            }
             reviewPromptTask?.cancel()
         case .clearURL:
             state.url = nil

@@ -1137,6 +1137,17 @@ class VaultListProcessorTests: BitwardenTestCase { // swiftlint:disable:this typ
         XCTAssertTrue(subject.reviewPromptTask!.isCancelled)
     }
 
+    /// `receive(_:)` with `.addItemPressed` when an organization was selected in the filter navigates
+    /// to the `.addItem` route with the corresponding organization id.
+    @MainActor
+    func test_receive_addItemPressed_organizationSelected() {
+        subject.state.vaultFilterType = .organization(Organization.fixture())
+
+        subject.receive(.addItemPressed)
+
+        XCTAssertEqual(coordinator.routes.last, .addItem(organizationId: "organization-1"))
+    }
+
     /// `receive(_:)` with `.clearURL` clears the url in the state.
     @MainActor
     func test_receive_clearURL() {

@@ -14,11 +14,13 @@ public enum VaultRoute: Equatable, Hashable {
     ///   - allowTypeSelection: Whether the user should be able to select the type of item to add.
     ///   - group: An optional `VaultListGroup` that the user wants to add an item for.
     ///   - newCipherOptions: Options that can be used to pre-populate the add item screen.
+    ///   - organizationId: The organization id in case an organization was selected in the vault filter.
     ///
     case addItem(
         allowTypeSelection: Bool = true,
         group: VaultListGroup? = nil,
-        newCipherOptions: NewCipherOptions? = nil
+        newCipherOptions: NewCipherOptions? = nil,
+        organizationId: String? = nil
     )
 
     /// A route to the autofill list screen.

@@ -84,13 +84,15 @@ class VaultItemCoordinator: NSObject, Coordinator, HasStackNavigator { // swiftl
             allowTypeSelection,
             group,
             hasPremium,
-            newCipherOptions
+            newCipherOptions,
+            organizationId
         ):
             showAddItem(
                 for: group,
                 allowTypeSelection: allowTypeSelection,
                 hasPremium: hasPremium,
                 newCipherOptions: newCipherOptions,
+                organizationId: organizationId,
                 delegate: context as? CipherItemOperationDelegate
             )
         case let .attachments(cipher):
@@ -152,6 +154,7 @@ class VaultItemCoordinator: NSObject, Coordinator, HasStackNavigator { // swiftl
     ///   - allowTypeSelection: Whether the user should be able to select the type of item to add.
     ///   - hasPremium: Whether the user has premium,
     ///   - newCipherOptions: Options that can be used to pre-populate the add item screen.
+    ///   - organizationId: The organization id in case an organization was selected in the vault filter.
     ///   - delegate: A `CipherItemOperationDelegate` delegate that is notified when specific circumstances
     ///     in the add/edit/delete item view have occurred.
     ///
@@ -160,6 +163,7 @@ class VaultItemCoordinator: NSObject, Coordinator, HasStackNavigator { // swiftl
         allowTypeSelection: Bool,
         hasPremium: Bool,
         newCipherOptions: NewCipherOptions?,
+        organizationId: String?,
         delegate: CipherItemOperationDelegate?
     ) {
         let state = CipherItemState(
@@ -169,7 +173,7 @@ class VaultItemCoordinator: NSObject, Coordinator, HasStackNavigator { // swiftl
             folderId: group?.folderId,
             hasPremium: hasPremium,
             name: newCipherOptions?.name,
-            organizationId: group?.organizationId,
+            organizationId: organizationId ?? group?.organizationId,
             password: newCipherOptions?.password,
             totpKeyString: newCipherOptions?.totpKey,
             uri: newCipherOptions?.uri,

@@ -190,6 +190,25 @@ class VaultItemCoordinatorTests: BitwardenTestCase { // swiftlint:disable:this t
         XCTAssertEqual(view.store.state.folderId, "12345")
     }
 
+    /// `navigate(to:)` with `.addItem` with an organization ID, pushes the add item view onto the
+    /// stack navigator and sets organization's ID on the new item.
+    @MainActor
+    func test_navigateTo_addItem_withOrganizationId() throws {
+        subject.navigate(
+            to: .addItem(
+                organizationId: "org-12345"
+            )
+        )
+
+        let action = try XCTUnwrap(stackNavigator.actions.last)
+        XCTAssertEqual(action.type, .replaced)
+        XCTAssertTrue(action.view is AddEditItemView)
+
+        let view = try XCTUnwrap(action.view as? AddEditItemView)
+        XCTAssertEqual(view.store.state.type, .login)
+        XCTAssertEqual(view.store.state.organizationId, "org-12345")
+    }
+
     /// `navigate(to:)` with `.cloneItem()` triggers the show clone item flow.
     @MainActor
     func test_navigateTo_cloneItem_nonPremium() throws {

@@ -12,12 +12,14 @@ enum VaultItemRoute: Equatable, Hashable {
     ///   - group: An optional `VaultListGroup` that the user wants to add an item for.
     ///   - hasPremium: Whether the user has premium.
     ///   - newCipherOptions: Optional options for creating a new cipher.
+    ///   - organizationId: The organization id in case an organization was selected in the vault filter.
     ///
     case addItem(
         allowTypeSelection: Bool = true,
         group: VaultListGroup? = nil,
         hasPremium: Bool = false,
-        newCipherOptions: NewCipherOptions? = nil
+        newCipherOptions: NewCipherOptions? = nil,
+        organizationId: String? = nil
     )
 
     /// A route to view the attachments.