github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-06-05 12:16:32 -05:00
Code Issues 1.9k Packages Projects Releases 126 Wiki Activity

BIT-1567: Do process auth requests if feature is disabled (#912)

Browse Source
This commit is contained in:
David Perez
2024-01-31 16:16:50 -06:00
committed by Álison Fernandes
parent 81d0e2f4db
commit bafebb46f3
3 changed files with 72 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PushManagerImpl.kt
View File

@@ -2,6 +2,7 @@ package com.x8bit.bitwarden.data.platform.manager
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSource
import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource
import com.x8bit.bitwarden.data.platform.datasource.network.model.PushTokenRequest
import com.x8bit.bitwarden.data.platform.datasource.network.service.PushService
import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager
@@ -35,8 +36,10 @@ import javax.inject.Inject
/**
* Primary implementation of [PushManager].
*/
@Suppress("LongParameterList")
class PushManagerImpl @Inject constructor(
private val authDiskSource: AuthDiskSource,
private val settingsDiskSource: SettingsDiskSource,
private val pushDiskSource: PushDiskSource,
private val pushService: PushService,
private val clock: Clock,
@@ -118,20 +121,22 @@ class PushManagerImpl @Inject constructor(
if (authDiskSource.uniqueAppId == notification.contextId) return
val userId = activeUserId
val userId = activeUserId ?: return
when (val type = notification.notificationType) {
NotificationType.AUTH_REQUEST,
NotificationType.AUTH_REQUEST_RESPONSE,
-> {
val payload: NotificationPayload.PasswordlessRequestNotification =
json.decodeFromJsonElement(notification.payload)
mutablePasswordlessRequestSharedFlow.tryEmit(
PasswordlessRequestData(
loginRequestId = payload.id,
userId = payload.userId,
),
)
if (settingsDiskSource.getApprovePasswordlessLoginsEnabled(userId) == true) {
val payload: NotificationPayload.PasswordlessRequestNotification =
json.decodeFromJsonElement(notification.payload)
mutablePasswordlessRequestSharedFlow.tryEmit(
PasswordlessRequestData(
loginRequestId = payload.id,
userId = payload.userId,
),
)
}
}
NotificationType.LOG_OUT -> {
@@ -171,7 +176,6 @@ class PushManagerImpl @Inject constructor(
NotificationType.SYNC_SETTINGS,
NotificationType.SYNC_VAULT,
-> {
if (userId == null) return
mutableFullSyncSharedFlow.tryEmit(Unit)
}

2
app/src/main/java/com/x8bit/bitwarden/data/platform/manager/di/PlatformManagerModule.kt
View File

@@ -128,6 +128,7 @@ object PlatformManagerModule {
@Singleton
fun providePushManager(
authDiskSource: AuthDiskSource,
settingsDiskSource: SettingsDiskSource,
pushDiskSource: PushDiskSource,
pushService: PushService,
dispatcherManager: DispatcherManager,
@@ -135,6 +136,7 @@ object PlatformManagerModule {
json: Json,
): PushManager = PushManagerImpl(
authDiskSource = authDiskSource,
settingsDiskSource = settingsDiskSource,
pushDiskSource = pushDiskSource,
pushService = pushService,
dispatcherManager = dispatcherManager,