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

Minor cleanup of the MainViewModelTests and the AuthRepo (#1023)

Browse Source
This commit is contained in:
David Perez
2024-02-15 15:33:19 -06:00
committed by Álison Fernandes
parent 6e3c5930a1
commit 874ead8f3e
2 changed files with 49 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/src/main/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt
View File

@@ -233,8 +233,7 @@ class AuthRepositoryImpl(
private val yubiKeyResultChannel = Channel<YubiKeyResult>(capacity = Int.MAX_VALUE)
override val yubiKeyResultFlow: Flow<YubiKeyResult> = yubiKeyResultChannel.receiveAsFlow()
private val mutableSsoCallbackResultFlow =
bufferedMutableSharedFlow<SsoCallbackResult>()
private val mutableSsoCallbackResultFlow = bufferedMutableSharedFlow<SsoCallbackResult>()
override val ssoCallbackResultFlow: Flow<SsoCallbackResult> =
mutableSsoCallbackResultFlow.asSharedFlow()
@@ -377,15 +376,17 @@ class AuthRepositoryImpl(
password: String?,
twoFactorData: TwoFactorDataModel,
captchaToken: String?,
): LoginResult = identityTokenAuthModel?.let {
loginCommon(
email = email,
password = password,
authModel = it,
twoFactorData = twoFactorData,
captchaToken = captchaToken ?: twoFactorResponse?.captchaToken,
)
} ?: LoginResult.Error(errorMessage = null)
): LoginResult = identityTokenAuthModel
?.let {
loginCommon(
email = email,
password = password,
authModel = it,
twoFactorData = twoFactorData,
captchaToken = captchaToken ?: twoFactorResponse?.captchaToken,
)
}
?: LoginResult.Error(errorMessage = null)
override suspend fun login(
email: String,
@@ -588,17 +589,18 @@ class AuthRepositoryImpl(
}
override suspend fun resendVerificationCodeEmail(): ResendEmailResult =
resendEmailRequestJson?.let { jsonRequest ->
accountsService.resendVerificationCodeEmail(body = jsonRequest).fold(
onFailure = { ResendEmailResult.Error(message = it.message) },
onSuccess = { ResendEmailResult.Success },
)
} ?: ResendEmailResult.Error(message = null)
resendEmailRequestJson
?.let { jsonRequest ->
accountsService.resendVerificationCodeEmail(body = jsonRequest).fold(
onFailure = { ResendEmailResult.Error(message = it.message) },
onSuccess = { ResendEmailResult.Success },
)
}
?: ResendEmailResult.Error(message = null)
@Suppress("ReturnCount")
override fun switchAccount(userId: String): SwitchAccountResult {
val currentUserState = authDiskSource.userState
?: return SwitchAccountResult.NoChange
val currentUserState = authDiskSource.userState ?: return SwitchAccountResult.NoChange
val previousActiveUserId = currentUserState.activeUserId
if (userId == previousActiveUserId) {
@@ -699,9 +701,7 @@ class AuthRepositoryImpl(
}
}
},
onFailure = {
RegisterResult.Error(errorMessage = null)
},
onFailure = { RegisterResult.Error(errorMessage = null) },
)
}
@@ -709,10 +709,7 @@ class AuthRepositoryImpl(
return accountsService.requestPasswordHint(email).fold(
onSuccess = {
when (it) {
is PasswordHintResponseJson.Error -> {
PasswordHintResult.Error(it.errorMessage)
}
is PasswordHintResponseJson.Error -> PasswordHintResult.Error(it.errorMessage)
PasswordHintResponseJson.Success -> PasswordHintResult.Success
}
},
@@ -1133,14 +1130,8 @@ class AuthRepositoryImpl(
password = password,
)
.fold(
onSuccess = {
PasswordStrengthResult.Success(
passwordStrength = it,
)
},
onFailure = {
PasswordStrengthResult.Error
},
onSuccess = { PasswordStrengthResult.Success(passwordStrength = it) },
onFailure = { PasswordStrengthResult.Error },
)
@Suppress("ReturnCount")
@@ -1188,7 +1179,6 @@ class AuthRepositoryImpl(
}
}
@Suppress("CyclomaticComplexMethod", "ReturnCount")
override suspend fun validatePasswordAgainstPolicies(
password: String,
): Boolean = passwordPolicies