[PM-13428] Remove ownership option

BitwardenShared/Core/Vault/Repositories/TestHelpers/MockVaultRepository.swift

@@ -59,6 +59,9 @@ class MockVaultRepository: VaultRepository {
 
     var getTOTPKeyIfAllowedToCopyResult: Result<String?, Error> = .success(nil)
 
+    var hasOrganizationsCalled = false
+    var hasOrganizationsResult: Result<Bool, Error> = .success(false)
+
     var isVaultEmptyCalled = false
     var isVaultEmptyResult: Result<Bool, Error> = .success(false)
 
@@ -224,6 +227,11 @@ class MockVaultRepository: VaultRepository {
         return try isVaultEmptyResult.get()
     }
 
+    func hasOrganizations() async throws -> Bool {
+        hasOrganizationsCalled = true
+        return try hasOrganizationsResult.get()
+    }
+
     func organizationsPublisher() async throws -> AsyncThrowingPublisher<AnyPublisher<[Organization], Error>> {
         organizationsPublisherCalled = true
         if let organizationsPublisherError {

BitwardenShared/Core/Vault/Repositories/VaultRepository.swift

@@ -114,6 +114,10 @@ public protocol VaultRepository: AnyObject {
     /// - Returns: The TOTP if the user/org has the necessary permissions for it to be copied.
     func getTOTPKeyIfAllowedToCopy(cipher: CipherView) async throws -> String?
 
+    /// Returns whether the user has organizations.
+    ///  - Returns: Whether the user has organizations.
+    func hasOrganizations() async throws -> Bool
+
     /// Returns whether the user's vault is empty.
     ///
     /// - Returns: Whether the user's vault is empty.
@@ -1114,6 +1118,11 @@ extension DefaultVaultRepository: VaultRepository {
         return totp
     }
 
+    func hasOrganizations() async throws -> Bool {
+        let organizations = try await organizationService.fetchAllOrganizations()
+        return !organizations.isEmpty
+    }
+
     func isVaultEmpty() async throws -> Bool {
         try await cipherService.cipherCount() == 0
     }

BitwardenShared/Core/Vault/Repositories/VaultRepositoryTests.swift

@@ -1094,6 +1094,22 @@ class VaultRepositoryTests: BitwardenTestCase { // swiftlint:disable:this type_b
         XCTAssertTrue(syncService.needsSyncOnlyCheckLocalData)
     }
 
+    /// `hasOrganizations()` returns true when there's at least one organization.
+    func test_hasOrganizations_hasAtLeastOne() async throws {
+        organizationService.fetchAllOrganizationsResult =
+            .success([.fixture(id: "One")])
+        let result = try await subject.hasOrganizations()
+        XCTAssertTrue(result)
+    }
+
+    /// `hasOrganizations()` returns false when there's no organizations.
+    func test_hasOrganizations_returnsFalse() async throws {
+        organizationService.fetchAllOrganizationsResult =
+            .success([])
+        let result = try await subject.hasOrganizations()
+        XCTAssertFalse(result)
+    }
+
     /// `isVaultEmpty()` throws an error if one occurs.
     func test_isVaultEmpty_error() async {
         cipherService.cipherCountResult = .failure(BitwardenTestError.example)

BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditItemProcessor.swift

@@ -284,6 +284,7 @@ final class AddEditItemProcessor: StateProcessor<// swiftlint:disable:this type_
                 state.collections.contains(where: { $0.id == collectionId })
             }
 
+            state.hasOrganizations = try await services.vaultRepository.hasOrganizations()
             state.isPersonalOwnershipDisabled = isPersonalOwnershipDisabled
             state.ownershipOptions = ownershipOptions
             if isPersonalOwnershipDisabled, state.organizationId == nil {

BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditItemState.swift

@@ -45,6 +45,9 @@ protocol AddEditItemState: Sendable {
     /// The state for guided tour view.
     var guidedTourViewState: GuidedTourViewState { get set }
 
+    /// Whether the user belongs to any organization.
+    var hasOrganizations: Bool { get set }
+
     /// The state for a identity type item.
     var identityState: IdentityItemState { get set }
 

BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditItemView.swift

@@ -166,7 +166,7 @@ struct AddEditItemView: View {
                 )
                 .accessibilityIdentifier("FolderPicker")
 
-                if store.state.configuration.isAdding, let owner = store.state.owner {
+                if let owner = store.state.owner, store.state.hasOrganizations {
                     ContentBlock(dividerLeadingPadding: 16) {
                         BitwardenMenuField(
                             title: Localizations.owner,
@@ -176,7 +176,7 @@ struct AddEditItemView: View {
                                 get: { _ in owner },
                                 send: AddEditItemAction.ownerChanged
                             )
-                        )
+                        ).disabled(!store.state.configuration.isAdding && !owner.isPersonal)
 
                         ForEach(store.state.collectionsForOwner, id: \.id) { collection in
                             if let collectionId = collection.id {

BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditItemViewTests.swift

@@ -228,6 +228,7 @@ class AddEditItemViewTests: BitwardenTestCase { // swiftlint:disable:this type_b
             CipherOwner.personal(email: "user@bitwarden.com"),
             organizationOwner,
         ]
+        processor.state.hasOrganizations = true
         let menu = try subject.inspect().find(bitwardenMenuField: Localizations.owner)
         try menu.select(newValue: organizationOwner)
         XCTAssertEqual(processor.dispatchedActions.last, .ownerChanged(organizationOwner))
@@ -681,6 +682,7 @@ class AddEditItemViewTests: BitwardenTestCase { // swiftlint:disable:this type_b
         processor.state.ownershipOptions.append(.organization(id: "1", name: "Organization"))
         processor.state.owner = .organization(id: "1", name: "Organization")
         processor.state.collectionIds = ["2"]
+        processor.state.hasOrganizations = true
 
         assertSnapshot(of: subject.navStackWrapped, as: .tallPortrait)
     }
@@ -689,6 +691,7 @@ class AddEditItemViewTests: BitwardenTestCase { // swiftlint:disable:this type_b
     func test_snapshot_add_login_collectionsNone() {
         processor.state.ownershipOptions.append(.organization(id: "1", name: "Organization"))
         processor.state.owner = .organization(id: "1", name: "Organization")
+        processor.state.hasOrganizations = true
 
         assertSnapshot(of: subject.navStackWrapped, as: .tallPortrait)
     }
@@ -723,7 +726,13 @@ class AddEditItemViewTests: BitwardenTestCase { // swiftlint:disable:this type_b
 
     @MainActor
     func test_snapshot_add_personalOwnershipPolicy() {
+        processor.state.ownershipOptions.append(.organization(id: "1", name: "Organization"))
+        processor.state.owner = .organization(id: "1", name: "Organization")
+        processor.state.hasOrganizations = true
         processor.state.isPersonalOwnershipDisabled = true
+        processor.state.collections = [
+            .fixture(id: "1", name: "Default collection", organizationId: "1"),
+        ]
         assertSnapshot(of: subject.navStackWrapped, as: .defaultPortrait)
     }
 
@@ -741,6 +750,41 @@ class AddEditItemViewTests: BitwardenTestCase { // swiftlint:disable:this type_b
         assertSnapshot(of: subject.navStackWrapped, as: .tallPortrait)
     }
 
+    @MainActor
+    func test_snapshot_edit_full_disabledOwnership() {
+        processor.state = CipherItemState(
+            existing: CipherView.loginFixture(
+                organizationId: "1"
+            ),
+            hasPremium: true
+        )!
+        processor.state.loginState = .fixture(
+            canViewPassword: true,
+            fido2Credentials: [.fixture()],
+            isPasswordVisible: true,
+            password: "password1!",
+            uris: [
+                .init(uri: URL.example.absoluteString),
+            ],
+            username: "username"
+        )
+        processor.state.type = .login
+        processor.state.name = "Name"
+        processor.state.isAdditionalOptionsExpanded = true
+        processor.state.isFavoriteOn = true
+        processor.state.isMasterPasswordRePromptOn = true
+        processor.state.notes = "Notes"
+        processor.state.folderId = "1"
+        processor.state.folders = [.custom(.fixture(id: "1", name: "Folder"))]
+        processor.state.ownershipOptions.append(.organization(id: "1", name: "Organization"))
+        processor.state.owner = .organization(id: "1", name: "Organization")
+        processor.state.collections = [
+            .fixture(id: "1", name: "Default collection", organizationId: "1"),
+        ]
+
+        assertSnapshot(of: subject.navStackWrapped, as: .tallPortrait)
+    }
+
     @MainActor
     func test_snapshot_edit_full_disabledViewPassword() {
         processor.state = CipherItemState(

BitwardenShared/UI/Vault/VaultItem/CipherItemState.swift

@@ -64,6 +64,9 @@ struct CipherItemState: Equatable {
         ]
     )
 
+    /// Whether the user has organizations.
+    var hasOrganizations: Bool
+
     /// The state for a identity type item.
     var identityState: IdentityItemState
 
@@ -195,6 +198,7 @@ struct CipherItemState: Equatable {
         configuration: Configuration,
         customFields: [CustomFieldState],
         folderId: String?,
+        hasOrganizations: Bool,
         identityState: IdentityItemState,
         isFavoriteOn: Bool,
         isMasterPasswordRePromptOn: Bool,
@@ -213,6 +217,7 @@ struct CipherItemState: Equatable {
         collections = []
         customFieldsState = AddEditCustomFieldsState(cipherType: type, customFields: customFields)
         self.folderId = folderId
+        self.hasOrganizations = hasOrganizations
         self.identityState = identityState
         self.isFavoriteOn = isFavoriteOn
         self.isMasterPasswordRePromptOn = isMasterPasswordRePromptOn
@@ -235,6 +240,7 @@ struct CipherItemState: Equatable {
         collectionIds: [String] = [],
         customFields: [CustomFieldState] = [],
         folderId: String? = nil,
+        hasOrganizations: Bool = false,
         hasPremium: Bool,
         name: String? = nil,
         organizationId: String? = nil,
@@ -250,6 +256,7 @@ struct CipherItemState: Equatable {
             configuration: .add,
             customFields: customFields,
             folderId: folderId,
+            hasOrganizations: hasOrganizations,
             identityState: .init(),
             isFavoriteOn: false,
             isMasterPasswordRePromptOn: false,
@@ -278,6 +285,7 @@ struct CipherItemState: Equatable {
             configuration: .add,
             customFields: cipherView.customFields,
             folderId: cipherView.folderId,
+            hasOrganizations: cipherView.organizationId != nil,
             identityState: cipherView.identityItemState(),
             isFavoriteOn: cipherView.favorite,
             isMasterPasswordRePromptOn: cipherView.reprompt == .password,
@@ -305,6 +313,7 @@ struct CipherItemState: Equatable {
             configuration: .existing(cipherView: cipherView),
             customFields: cipherView.customFields,
             folderId: cipherView.folderId,
+            hasOrganizations: cipherView.organizationId != nil,
             identityState: cipherView.identityItemState(),
             isFavoriteOn: cipherView.favorite,
             isMasterPasswordRePromptOn: cipherView.reprompt == .password,