From 1dcfad44511ab791e796617137776ec3a698f8a5 Mon Sep 17 00:00:00 2001 From: David Perez Date: Tue, 4 Jun 2024 11:38:39 -0500 Subject: [PATCH] BIT-2403: Update process for moving item to organization (#1421) --- .../vault/datasource/sdk/VaultSdkSource.kt | 9 +++++++ .../datasource/sdk/VaultSdkSourceImpl.kt | 13 ++++++++++ .../data/vault/repository/VaultRepository.kt | 1 + .../vault/repository/VaultRepositoryImpl.kt | 4 +++- .../VaultMoveToOrganizationViewModel.kt | 5 ++-- .../datasource/sdk/VaultSdkSourceTest.kt | 24 +++++++++++++++++++ .../vault/repository/VaultRepositoryTest.kt | 16 ++++++++++--- .../VaultMoveToOrganizationViewModelTest.kt | 6 +++++ 8 files changed, 71 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt index 434b2af763..4dcb276c41 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt @@ -355,6 +355,15 @@ interface VaultSdkSource { time: DateTime, ): Result + /** + * Re-encrypts the [cipherView] with the organizations encryption key. + */ + suspend fun moveToOrganization( + userId: String, + organizationId: String, + cipherView: CipherView, + ): Result + /** * Validates that the given password matches the password hash. */ diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt index d094f6f1aa..4fe432602d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt @@ -25,6 +25,7 @@ import com.bitwarden.sdk.BitwardenException import com.bitwarden.sdk.Client import com.bitwarden.sdk.ClientVault import com.x8bit.bitwarden.data.platform.manager.SdkClientManager +import com.x8bit.bitwarden.data.platform.util.flatMap import com.x8bit.bitwarden.data.vault.datasource.sdk.model.InitializeCryptoResult import java.io.File @@ -371,6 +372,18 @@ class VaultSdkSourceImpl( ) } + override suspend fun moveToOrganization( + userId: String, + organizationId: String, + cipherView: CipherView, + ): Result = runCatching { + getClient(userId = userId) + .vault() + .ciphers() + .moveToOrganization(cipher = cipherView, organizationId = organizationId) + } + .flatMap { encryptCipher(userId = userId, cipherView = it) } + override suspend fun validatePassword( userId: String, password: String, diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt index e59e5777ab..20bdd2a2d1 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt @@ -260,6 +260,7 @@ interface VaultRepository : VaultLockManager { */ suspend fun shareCipher( cipherId: String, + organizationId: String, cipherView: CipherView, collectionIds: List, ): ShareCipherResult diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt index 10c473d7c4..63ceccb6c9 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt @@ -811,13 +811,15 @@ class VaultRepositoryImpl( override suspend fun shareCipher( cipherId: String, + organizationId: String, cipherView: CipherView, collectionIds: List, ): ShareCipherResult { val userId = activeUserId ?: return ShareCipherResult.Error return vaultSdkSource - .encryptCipher( + .moveToOrganization( userId = userId, + organizationId = organizationId, cipherView = cipherView, ) .flatMap { cipher -> diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt index b38946cddd..7068b60d1f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt @@ -298,9 +298,8 @@ class VaultMoveToOrganizationViewModel @Inject constructor( VaultMoveToOrganizationAction.Internal.ShareCipherResultReceive( shareCipherResult = vaultRepository.shareCipher( cipherId = state.vaultItemId, - cipherView = cipherView.copy( - organizationId = contentState.selectedOrganizationId, - ), + organizationId = contentState.selectedOrganizationId, + cipherView = cipherView, collectionIds = collectionIds, ), successToast = R.string.moved_item_to_org.asText( diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt index ab2d9f9f61..b70bea4166 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt @@ -24,6 +24,7 @@ import com.bitwarden.crypto.TrustDeviceResponse import com.bitwarden.sdk.BitwardenException import com.bitwarden.sdk.Client import com.bitwarden.sdk.ClientAuth +import com.bitwarden.sdk.ClientCiphers import com.bitwarden.sdk.ClientCrypto import com.bitwarden.sdk.ClientExporters import com.bitwarden.sdk.ClientPasswordHistory @@ -849,6 +850,29 @@ class VaultSdkSourceTest { coVerify { sdkClientManager.getOrCreateClient(userId = userId) } } + @Test + fun `moveToOrganization should call SDK and a Result with correct data`() = runTest { + val userId = "userId" + val organizationId = "organizationId" + val mockCipher = mockk() + val expectedResult = mockk() + val clientCipher = mockk { + coEvery { + moveToOrganization(cipher = mockCipher, organizationId = organizationId) + } returns mockCipher + coEvery { encrypt(cipherView = mockCipher) } returns expectedResult + } + every { clientVault.ciphers() } returns clientCipher + + val result = vaultSdkSource.moveToOrganization( + userId = userId, + organizationId = organizationId, + cipherView = mockCipher, + ) + + assertEquals(expectedResult.asSuccess(), result) + } + @Test fun `validatePassword should call SDK and a Result with correct data`() = runTest { val userId = "userId" diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt index 729db269a8..af06f65623 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt @@ -3094,6 +3094,7 @@ class VaultRepositoryTest { val result = vaultRepository.shareCipher( cipherId = "cipherId", + organizationId = "organizationId", cipherView = mockk(), collectionIds = emptyList(), ) @@ -3110,9 +3111,11 @@ class VaultRepositoryTest { runTest { fakeAuthDiskSource.userState = MOCK_USER_STATE val userId = "mockId-1" + val organizationId = "organizationId" coEvery { - vaultSdkSource.encryptCipher( + vaultSdkSource.moveToOrganization( userId = userId, + organizationId = organizationId, cipherView = createMockCipherView(number = 1), ) } returns createMockSdkCipher(number = 1, clock = clock).asSuccess() @@ -3135,6 +3138,7 @@ class VaultRepositoryTest { val result = vaultRepository.shareCipher( cipherId = "mockId-1", + organizationId = organizationId, cipherView = createMockCipherView(number = 1), collectionIds = listOf("mockId-1"), ) @@ -3151,9 +3155,11 @@ class VaultRepositoryTest { runTest { fakeAuthDiskSource.userState = MOCK_USER_STATE val userId = "mockId-1" + val organizationId = "organizationId" coEvery { - vaultSdkSource.encryptCipher( + vaultSdkSource.moveToOrganization( userId = userId, + organizationId = organizationId, cipherView = createMockCipherView(number = 1), ) } returns createMockSdkCipher(number = 1, clock = clock).asSuccess() @@ -3170,6 +3176,7 @@ class VaultRepositoryTest { val result = vaultRepository.shareCipher( cipherId = "mockId-1", + organizationId = organizationId, cipherView = createMockCipherView(number = 1), collectionIds = listOf("mockId-1"), ) @@ -3186,9 +3193,11 @@ class VaultRepositoryTest { runTest { fakeAuthDiskSource.userState = MOCK_USER_STATE val userId = "mockId-1" + val organizationId = "organizationId" coEvery { - vaultSdkSource.encryptCipher( + vaultSdkSource.moveToOrganization( userId = userId, + organizationId = organizationId, cipherView = createMockCipherView(number = 1), ) } returns Throwable("Fail").asFailure() @@ -3205,6 +3214,7 @@ class VaultRepositoryTest { val result = vaultRepository.shareCipher( cipherId = "mockId-1", + organizationId = organizationId, cipherView = createMockCipherView(number = 1), collectionIds = listOf("mockId-1"), ) diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt index f3dde47e0d..ee0fb8751c 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt @@ -240,6 +240,7 @@ class VaultMoveToOrganizationViewModelTest : BaseViewModelTest() { coEvery { vaultRepository.shareCipher( cipherId = "mockCipherId", + organizationId = "mockOrganizationId-1", cipherView = createMockCipherView(number = 1), collectionIds = listOf("mockId-1"), ) @@ -284,6 +285,7 @@ class VaultMoveToOrganizationViewModelTest : BaseViewModelTest() { coVerify { vaultRepository.shareCipher( cipherId = "mockCipherId", + organizationId = "mockOrganizationId-1", cipherView = createMockCipherView(number = 1), collectionIds = listOf("mockId-1"), ) @@ -298,6 +300,7 @@ class VaultMoveToOrganizationViewModelTest : BaseViewModelTest() { coEvery { vaultRepository.shareCipher( cipherId = "mockCipherId", + organizationId = "mockOrganizationId-1", cipherView = createMockCipherView(number = 1), collectionIds = listOf("mockId-1"), ) @@ -344,6 +347,7 @@ class VaultMoveToOrganizationViewModelTest : BaseViewModelTest() { coVerify { vaultRepository.shareCipher( cipherId = "mockCipherId", + organizationId = "mockOrganizationId-1", cipherView = createMockCipherView(number = 1), collectionIds = listOf("mockId-1"), ) @@ -358,6 +362,7 @@ class VaultMoveToOrganizationViewModelTest : BaseViewModelTest() { coEvery { vaultRepository.shareCipher( cipherId = "mockCipherId", + organizationId = "mockOrganizationId-1", cipherView = createMockCipherView(number = 1), collectionIds = listOf("mockId-1"), ) @@ -381,6 +386,7 @@ class VaultMoveToOrganizationViewModelTest : BaseViewModelTest() { coVerify { vaultRepository.shareCipher( cipherId = "mockCipherId", + organizationId = "mockOrganizationId-1", cipherView = createMockCipherView(number = 1), collectionIds = listOf("mockId-1"), )