BIT-1575: Update cipher collections functionality (#904)

This commit is contained in:
Ramsey Smith
2024-06-20 17:08:07 +01:00
committed by Álison Fernandes
parent bb0c91ee5a
commit 2d0353d744
11 changed files with 297 additions and 30 deletions
@@ -7,6 +7,7 @@ import com.x8bit.bitwarden.data.vault.datasource.network.api.CiphersApi
import com.x8bit.bitwarden.data.vault.datasource.network.model.CreateCipherInOrganizationJsonRequest
import com.x8bit.bitwarden.data.vault.datasource.network.model.FileUploadType
import com.x8bit.bitwarden.data.vault.datasource.network.model.ShareCipherJsonRequest
import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateCipherCollectionsJsonRequest
import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateCipherResponseJson
import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockAttachmentJsonRequest
import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockAttachmentJsonResponse
@@ -211,6 +212,22 @@ class CiphersServiceTest : BaseServiceTest() {
)
}
@Test
fun `updateCipherCollections should execute the updateCipherCollections API`() = runTest {
server.enqueue(MockResponse().setResponseCode(200))
val result = ciphersService.updateCipherCollections(
cipherId = "mockId-1",
body = UpdateCipherCollectionsJsonRequest(
collectionIds = listOf("mockId-1"),
),
)
assertEquals(
Unit,
result.getOrThrow(),
)
}
@Test
fun `restoreCipher should execute the restoreCipher API`() = runTest {
server.enqueue(MockResponse().setResponseCode(200))
@@ -44,6 +44,7 @@ import com.x8bit.bitwarden.data.vault.datasource.network.model.SendFileResponseJ
import com.x8bit.bitwarden.data.vault.datasource.network.model.SendTypeJson
import com.x8bit.bitwarden.data.vault.datasource.network.model.ShareCipherJsonRequest
import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson
import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateCipherCollectionsJsonRequest
import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateCipherResponseJson
import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateFolderResponseJson
import com.x8bit.bitwarden.data.vault.datasource.network.model.UpdateSendResponseJson
@@ -2748,7 +2749,7 @@ class VaultRepositoryTest {
)
assertEquals(
ShareCipherResult.Error(null),
ShareCipherResult.Error,
result,
)
}
@@ -2818,7 +2819,7 @@ class VaultRepositoryTest {
)
assertEquals(
ShareCipherResult.Error(errorMessage = null),
ShareCipherResult.Error,
result,
)
}
@@ -2853,7 +2854,129 @@ class VaultRepositoryTest {
)
assertEquals(
ShareCipherResult.Error(errorMessage = null),
ShareCipherResult.Error,
result,
)
}
@Test
fun `updateCipherCollections with no active user should return ShareCipherResult Error`() =
runTest {
fakeAuthDiskSource.userState = null
val result = vaultRepository.updateCipherCollections(
cipherId = "cipherId",
cipherView = mockk(),
collectionIds = emptyList(),
)
assertEquals(
ShareCipherResult.Error,
result,
)
}
@Test
@Suppress("MaxLineLength")
fun `updateCipherCollections with cipherService updateCipherCollections success should return ShareCipherResultSuccess`() =
runTest {
fakeAuthDiskSource.userState = MOCK_USER_STATE
val userId = "mockId-1"
coEvery {
vaultSdkSource.encryptCipher(
userId = userId,
cipherView = createMockCipherView(number = 1),
)
} returns createMockSdkCipher(number = 1).asSuccess()
coEvery {
ciphersService.updateCipherCollections(
cipherId = "mockId-1",
body = UpdateCipherCollectionsJsonRequest(
collectionIds = listOf("mockId-1"),
),
)
} returns Unit.asSuccess()
coEvery { vaultDiskSource.saveCipher(userId, any()) } just runs
val result = vaultRepository.updateCipherCollections(
cipherId = "mockId-1",
cipherView = createMockCipherView(number = 1)
.copy(collectionIds = listOf("mockId-1")),
collectionIds = listOf("mockId-1"),
)
assertEquals(
ShareCipherResult.Success,
result,
)
}
@Test
@Suppress("MaxLineLength")
fun `updateCipherCollections with updateCipherCollections shareCipher failure should return ShareCipherResultError`() =
runTest {
fakeAuthDiskSource.userState = MOCK_USER_STATE
val userId = "mockId-1"
coEvery {
vaultSdkSource.encryptCipher(
userId = userId,
cipherView = createMockCipherView(number = 1),
)
} returns createMockSdkCipher(number = 1).asSuccess()
coEvery {
ciphersService.updateCipherCollections(
cipherId = "mockId-1",
body = UpdateCipherCollectionsJsonRequest(
collectionIds = listOf("mockId-1"),
),
)
} returns Throwable("Fail").asFailure()
coEvery { vaultDiskSource.saveCipher(userId, any()) } just runs
val result = vaultRepository.updateCipherCollections(
cipherId = "mockId-1",
cipherView = createMockCipherView(number = 1)
.copy(collectionIds = listOf("mockId-1")),
collectionIds = listOf("mockId-1"),
)
assertEquals(
ShareCipherResult.Error,
result,
)
}
@Test
@Suppress("MaxLineLength")
fun `updateCipherCollections with updateCipherCollections encryptCipher failure should return ShareCipherResultError`() =
runTest {
fakeAuthDiskSource.userState = MOCK_USER_STATE
val userId = "mockId-1"
coEvery {
vaultSdkSource.encryptCipher(
userId = userId,
cipherView = createMockCipherView(number = 1),
)
} returns Throwable("Fail").asFailure()
coEvery {
ciphersService.updateCipherCollections(
cipherId = "mockId-1",
body = UpdateCipherCollectionsJsonRequest(
collectionIds = listOf("mockId-1"),
),
)
} returns Unit.asSuccess()
coEvery { vaultDiskSource.saveCipher(userId, any()) } just runs
val result = vaultRepository.updateCipherCollections(
cipherId = "mockId-1",
cipherView = createMockCipherView(number = 1)
.copy(collectionIds = listOf("mockId-1")),
collectionIds = listOf("mockId-1"),
)
assertEquals(
ShareCipherResult.Error,
result,
)
}
@@ -301,7 +301,7 @@ class VaultMoveToOrganizationViewModelTest : BaseViewModelTest() {
cipherView = createMockCipherView(number = 1),
collectionIds = listOf("mockId-1"),
)
} returns ShareCipherResult.Error(errorMessage = null)
} returns ShareCipherResult.Error
viewModel.stateFlow.test {
assertEquals(
initialState.copy(
@@ -378,6 +378,41 @@ class VaultMoveToOrganizationViewModelTest : BaseViewModelTest() {
}
}
@Test
fun `MoveClick with onlyShowCollections true should invoke updateCipherCollections`() =
runTest {
val viewModel = createViewModel(
savedStateHandle = createSavedStateHandleWithState(
state = createVaultMoveToOrganizationState(
onlyShowCollections = true,
),
),
)
mutableCollectionFlow.tryEmit(value = DataState.Loaded(DEFAULT_COLLECTIONS))
mutableVaultItemFlow.tryEmit(value = DataState.Loaded(createMockCipherView(number = 1)))
coEvery {
vaultRepository.updateCipherCollections(
cipherId = "mockCipherId",
cipherView = createMockCipherView(number = 1),
collectionIds = listOf("mockId-1"),
)
} returns ShareCipherResult.Success
viewModel.eventFlow.test {
viewModel.actionChannel.trySend(VaultMoveToOrganizationAction.MoveClick)
assertEquals(
VaultMoveToOrganizationEvent.NavigateBack,
awaitItem(),
)
}
coVerify {
vaultRepository.updateCipherCollections(
cipherId = "mockCipherId",
cipherView = createMockCipherView(number = 1),
collectionIds = listOf("mockId-1"),
)
}
}
private fun createViewModel(
savedStateHandle: SavedStateHandle = initialSavedStateHandle,
vaultRepo: VaultRepository = vaultRepository,
@@ -403,11 +438,12 @@ class VaultMoveToOrganizationViewModelTest : BaseViewModelTest() {
viewState: VaultMoveToOrganizationState.ViewState = VaultMoveToOrganizationState.ViewState.Loading,
vaultItemId: String = "mockCipherId",
dialogState: VaultMoveToOrganizationState.DialogState? = null,
onlyShowCollections: Boolean = false,
): VaultMoveToOrganizationState = VaultMoveToOrganizationState(
vaultItemId = vaultItemId,
viewState = viewState,
dialogState = dialogState,
onlyShowCollections = false,
onlyShowCollections = onlyShowCollections,
)
}