mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-03-16 03:08:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Apply some minor clean up to the AuthRepo (#1263)

Browse source
This commit is contained in:
David Perez 2024-04-12 13:59:23 -05:00 • committed by Álison Fernandes
parent 5f1cfcbbc5
commit d0bda2fe97
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt
View file

@ -91,7 +91,7 @@ import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asSharedFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.filterNot
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.launchIn
@ -127,7 +127,25 @@ class AuthRepositoryImpl(
private val elapsedRealtimeMillisProvider: () -> Long = { SystemClock.elapsedRealtime() },
) : AuthRepository,
AuthRequestManager by authRequestManager {
/**
* A scope intended for use when simply collecting multiple flows in order to combine them. The
* use of [Dispatchers.Unconfined] allows for this to happen synchronously whenever any of
* these flows changes.
*/
private val unconfinedScope = CoroutineScope(dispatcherManager.unconfined)
/**
* A scope intended for use when operating asynchronously.
*/
private val ioScope = CoroutineScope(dispatcherManager.io)
private val mutableHasPendingAccountAdditionStateFlow = MutableStateFlow(false)
/**
* If there is a pending account deletion, continue showing the original UserState until it
* is confirmed. This is accomplished by blocking the emissions of the [userStateFlow]
* whenever set to `true`.
*/
private val mutableHasPendingAccountDeletionStateFlow = MutableStateFlow(false)
/**
@ -155,15 +173,6 @@ class AuthRepositoryImpl(
*/
private var passwordToCheck: String? = null
/**
* A scope intended for use when simply collecting multiple flows in order to combine them. The
* use of [Dispatchers.Unconfined] allows for this to happen synchronously whenever any of
* these flows changes.
*/
private val unconfinedScope = CoroutineScope(dispatcherManager.unconfined)
private val ioScope = CoroutineScope(dispatcherManager.io)
override var twoFactorResponse: GetTokenResponseJson.TwoFactorRequired? = null
override val ssoOrganizationIdentifier: String? get() = organizationIdentifier
@ -216,11 +225,7 @@ class AuthRepositoryImpl(
isDeviceTrustedProvider = ::isDeviceTrusted,
)
}
.filter {
// If there is a pending account deletion, continue showing
// the original UserState until it is confirmed.
!mutableHasPendingAccountDeletionStateFlow.value
}
.filterNot { mutableHasPendingAccountDeletionStateFlow.value }
.stateIn(
scope = unconfinedScope,
started = SharingStarted.Eagerly,
@ -242,8 +247,7 @@ class AuthRepositoryImpl(
captchaTokenChannel.receiveAsFlow()
private val duoTokenChannel = Channel<DuoCallbackTokenResult>(capacity = Int.MAX_VALUE)
override val duoTokenResultFlow: Flow<DuoCallbackTokenResult> =
duoTokenChannel.receiveAsFlow()
override val duoTokenResultFlow: Flow<DuoCallbackTokenResult> = duoTokenChannel.receiveAsFlow()
private val yubiKeyResultChannel = Channel<YubiKeyResult>(capacity = Int.MAX_VALUE)
override val yubiKeyResultFlow: Flow<YubiKeyResult> = yubiKeyResultChannel.receiveAsFlow()
@ -279,6 +283,8 @@ class AuthRepositoryImpl(
refreshAccessTokenSynchronously(userId)
vaultRepository.sync()
}
// This requires the ioScope to ensure that refreshAccessTokenSynchronously
// happens on a background thread
.launchIn(ioScope)
pushManager
@ -638,9 +644,9 @@ class AuthRepositoryImpl(
onSuccess = {
when (it) {
is RegisterResponseJson.CaptchaRequired -> {
it.validationErrors.captchaKeys.firstOrNull()?.let { key ->
RegisterResult.CaptchaRequired(captchaId = key)
} ?: RegisterResult.Error(errorMessage = null)
it.validationErrors.captchaKeys.firstOrNull()
?.let { key -> RegisterResult.CaptchaRequired(captchaId = key) }
?: RegisterResult.Error(errorMessage = null)
}
is RegisterResponseJson.Success -> {