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

BIT-2236: Trusted Device screen logs out when unauthenticated (#1253)

Browse Source
This commit is contained in:
David Perez
2024-04-10 18:10:54 -05:00
committed by Álison Fernandes
parent 0bddd70d2a
commit b81b79e215
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/trusteddevice/TrustedDeviceViewModel.kt
View File

@@ -5,6 +5,7 @@ import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.viewModelScope
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.AuthState
import com.x8bit.bitwarden.data.auth.repository.model.NewSsoUserResult
import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository
import com.x8bit.bitwarden.ui.platform.base.BaseViewModel
@@ -30,9 +31,10 @@ class TrustedDeviceViewModel @Inject constructor(
) : BaseViewModel<TrustedDeviceState, TrustedDeviceEvent, TrustedDeviceAction>(
initialState = savedStateHandle[KEY_STATE]
?: run {
val isAuthenticated = authRepository.authStateFlow.value is AuthState.Authenticated
val account = authRepository.userStateFlow.value?.activeAccount
val trustedDevice = account?.trustedDevice
if (trustedDevice == null) authRepository.logout()
if (trustedDevice == null || !isAuthenticated) authRepository.logout()
TrustedDeviceState(
dialogState = null,
emailAddress = account?.email.orEmpty(),