mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-11-25 02:46:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

trackEvent should not suspend (#3331)

Browse source
This commit is contained in:
David Perez 2024-06-20 16:03:42 -05:00 committed by GitHub
parent ae15372d8d
commit 5183832e35
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 72 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManager.kt
View file

@ -9,5 +9,5 @@ interface OrganizationEventManager {
/**
* Tracks a specific event to be uploaded at a different time.
*/
suspend fun trackEvent(eventType: OrganizationEventType, cipherId: String? = null)
fun trackEvent(eventType: OrganizationEventType, cipherId: String? = null)
}

37
app/src/main/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerImpl.kt
View file

@ -58,28 +58,31 @@ class OrganizationEventManagerImpl(
}
@Suppress("ReturnCount")
override suspend fun trackEvent(eventType: OrganizationEventType, cipherId: String?) {
override fun trackEvent(eventType: OrganizationEventType, cipherId: String?) {
val userId = authRepository.activeUserId ?: return
if (authRepository.authStateFlow.value !is AuthState.Authenticated) return
val organizations = authRepository.organizations.filter { it.shouldUseEvents }
if (organizations.none()) return
cipherId?.let { id ->
val cipherOrganizationId = vaultRepository
.getVaultItemStateFlow(itemId = id)
.first { it.data != null }
.data
?.organizationId
?: return
if (organizations.none { it.id == cipherOrganizationId }) return
ioScope.launch {
cipherId?.let { id ->
val cipherOrganizationId = vaultRepository
.getVaultItemStateFlow(itemId = id)
.first { it.data != null }
.data
?.organizationId
?: return@launch
if (organizations.none { it.id == cipherOrganizationId }) return@launch
}
eventDiskSource.addOrganizationEvent(
userId = userId,
event = OrganizationEvent(
type = eventType,
cipherId = cipherId,
date = ZonedDateTime.now(clock),
),
)
}
eventDiskSource.addOrganizationEvent(
userId = userId,
event = OrganizationEvent(
type = eventType,
cipherId = cipherId,
date = ZonedDateTime.now(clock),
),
)
}
private suspend fun uploadEvents() {

104
app/src/test/java/com/x8bit/bitwarden/data/platform/manager/event/OrganizationEventManagerTest.kt
View file

@ -121,7 +121,7 @@ class OrganizationEventManagerTest {
}
@Test
fun `trackEvent should do nothing if there is no active user`() = runTest {
fun `trackEvent should do nothing if there is no active user`() {
every { authRepository.activeUserId } returns null
organizationEventManager.trackEvent(
@ -135,7 +135,7 @@ class OrganizationEventManagerTest {
}
@Test
fun `trackEvent should do nothing if the active user is not authenticated`() = runTest {
fun `trackEvent should do nothing if the active user is not authenticated`() {
organizationEventManager.trackEvent(
eventType = OrganizationEventType.CIPHER_UPDATED,
cipherId = CIPHER_ID,
@ -147,71 +147,69 @@ class OrganizationEventManagerTest {
}
@Test
fun `trackEvent should do nothing if the active user has no organizations that use events`() =
runTest {
mutableAuthStateFlow.value = AuthState.Authenticated(accessToken = "access-token")
val organization = createMockOrganization(number = 1)
every { authRepository.organizations } returns listOf(organization)
fun `trackEvent should do nothing if the active user has no organizations that use events`() {
mutableAuthStateFlow.value = AuthState.Authenticated(accessToken = "access-token")
val organization = createMockOrganization(number = 1)
every { authRepository.organizations } returns listOf(organization)
organizationEventManager.trackEvent(
eventType = OrganizationEventType.CIPHER_UPDATED,
cipherId = CIPHER_ID,
)
organizationEventManager.trackEvent(
eventType = OrganizationEventType.CIPHER_UPDATED,
cipherId = CIPHER_ID,
)
coVerify(exactly = 0) {
eventDiskSource.addOrganizationEvent(userId = any(), event = any())
}
coVerify(exactly = 0) {
eventDiskSource.addOrganizationEvent(userId = any(), event = any())
}
}
@Suppress("MaxLineLength")
@Test
fun `trackEvent should do nothing if the cipher does not belong to an organization that uses events`() =
runTest {
mutableAuthStateFlow.value = AuthState.Authenticated(accessToken = "access-token")
val organization = createMockOrganization(number = 1).copy(shouldUseEvents = true)
every { authRepository.organizations } returns listOf(organization)
val cipherView = createMockCipherView(number = 1)
mutableVaultItemStateFlow.value = DataState.Loaded(data = cipherView)
fun `trackEvent should do nothing if the cipher does not belong to an organization that uses events`() {
mutableAuthStateFlow.value = AuthState.Authenticated(accessToken = "access-token")
val organization = createMockOrganization(number = 1).copy(shouldUseEvents = true)
every { authRepository.organizations } returns listOf(organization)
val cipherView = createMockCipherView(number = 1)
mutableVaultItemStateFlow.value = DataState.Loaded(data = cipherView)
organizationEventManager.trackEvent(
eventType = OrganizationEventType.CIPHER_UPDATED,
cipherId = CIPHER_ID,
)
organizationEventManager.trackEvent(
eventType = OrganizationEventType.CIPHER_UPDATED,
cipherId = CIPHER_ID,
)
coVerify(exactly = 0) {
eventDiskSource.addOrganizationEvent(userId = any(), event = any())
}
coVerify(exactly = 0) {
eventDiskSource.addOrganizationEvent(userId = any(), event = any())
}
}
@Test
fun `trackEvent should add the event to disk if the ciphers organization allows it`() =
runTest {
mutableAuthStateFlow.value = AuthState.Authenticated(accessToken = "access-token")
val organization = createMockOrganization(number = 1).copy(
id = "mockOrganizationId-1",
shouldUseEvents = true,
)
every { authRepository.organizations } returns listOf(organization)
val cipherView = createMockCipherView(number = 1)
mutableVaultItemStateFlow.value = DataState.Loaded(data = cipherView)
val eventType = OrganizationEventType.CIPHER_UPDATED
fun `trackEvent should add the event to disk if the ciphers organization allows it`() {
mutableAuthStateFlow.value = AuthState.Authenticated(accessToken = "access-token")
val organization = createMockOrganization(number = 1).copy(
id = "mockOrganizationId-1",
shouldUseEvents = true,
)
every { authRepository.organizations } returns listOf(organization)
val cipherView = createMockCipherView(number = 1)
mutableVaultItemStateFlow.value = DataState.Loaded(data = cipherView)
val eventType = OrganizationEventType.CIPHER_UPDATED
organizationEventManager.trackEvent(
eventType = eventType,
cipherId = CIPHER_ID,
)
organizationEventManager.trackEvent(
eventType = eventType,
cipherId = CIPHER_ID,
)
coVerify(exactly = 1) {
eventDiskSource.addOrganizationEvent(
userId = USER_ID,
event = OrganizationEvent(
type = eventType,
cipherId = CIPHER_ID,
date = ZonedDateTime.now(fixedClock),
),
)
}
dispatcher.scheduler.runCurrent()
coVerify(exactly = 1) {
eventDiskSource.addOrganizationEvent(
userId = USER_ID,
event = OrganizationEvent(
type = eventType,
cipherId = CIPHER_ID,
date = ZonedDateTime.now(fixedClock),
),
)
}
}
}
private const val CIPHER_ID: String = "mockId-1"