github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-06-08 16:17:05 -05:00
Code Issues 2.1k Packages Projects Releases 127 Wiki Activity

Create account validations (#137)

Browse Source
This commit is contained in:
Andrew Haisting
2023-10-20 12:24:02 -05:00
committed by Álison Fernandes
parent 79c953b605
commit e9b8bd2e78
4 changed files with 231 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountViewModel.kt
View File

@@ -5,10 +5,10 @@ import android.os.Parcelable
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.RegisterResult
import com.x8bit.bitwarden.data.auth.repository.util.CaptchaCallbackTokenResult
import com.x8bit.bitwarden.data.auth.repository.util.generateUriForCaptcha
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountAction.AcceptPoliciesToggle
import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountAction.CheckDataBreachesToggle
import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountAction.ConfirmPasswordInputChange
@@ -20,6 +20,7 @@ import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountAction.Sub
import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountAction.TermsClick
import com.x8bit.bitwarden.ui.platform.base.BaseViewModel
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.platform.base.util.isValidEmail
import com.x8bit.bitwarden.ui.platform.components.BasicDialogState
import com.x8bit.bitwarden.ui.platform.components.LoadingDialogState
import dagger.hilt.android.lifecycle.HiltViewModel
@@ -130,7 +131,7 @@ class CreateAccountViewModel @Inject constructor(
}
is RegisterResult.Error -> {
// TODO show more robust error messages BIT-763
// TODO parse and display server errors BIT-910
mutableStateFlow.update {
it.copy(
loadingDialogState = LoadingDialogState.Hidden,
@@ -198,6 +199,23 @@ class CreateAccountViewModel @Inject constructor(
}
private fun handleSubmitClick() = when {
mutableStateFlow.value.emailInput.isBlank() -> {
val dialog = BasicDialogState.Shown(
title = R.string.an_error_has_occurred.asText(),
message = R.string.validation_field_required
.asText(R.string.email_address.asText()),
)
mutableStateFlow.update { it.copy(errorDialogState = dialog) }
}
!mutableStateFlow.value.emailInput.isValidEmail() -> {
val dialog = BasicDialogState.Shown(
title = R.string.an_error_has_occurred.asText(),
message = R.string.invalid_email.asText(),
)
mutableStateFlow.update { it.copy(errorDialogState = dialog) }
}
mutableStateFlow.value.passwordInput.length < MIN_PASSWORD_LENGTH -> {
val dialog = BasicDialogState.Shown(
title = R.string.an_error_has_occurred.asText(),
@@ -206,6 +224,22 @@ class CreateAccountViewModel @Inject constructor(
mutableStateFlow.update { it.copy(errorDialogState = dialog) }
}
mutableStateFlow.value.passwordInput != mutableStateFlow.value.confirmPasswordInput -> {
val dialog = BasicDialogState.Shown(
title = R.string.an_error_has_occurred.asText(),
message = R.string.master_password_confirmation_val_message.asText(),
)
mutableStateFlow.update { it.copy(errorDialogState = dialog) }
}
!mutableStateFlow.value.isAcceptPoliciesToggled -> {
val dialog = BasicDialogState.Shown(
title = R.string.an_error_has_occurred.asText(),
message = R.string.accept_policies_error.asText(),
)
mutableStateFlow.update { it.copy(errorDialogState = dialog) }
}
else -> {
submitRegisterAccountRequest(captchaToken = null)
}

8
app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/StringExtensions.kt Normal file
View File

@@ -0,0 +1,8 @@
package com.x8bit.bitwarden.ui.platform.base.util
/**
* Whether or not string is a valid email address.
*
* This just checks if the string contains the "@" symbol.
*/
fun String.isValidEmail(): Boolean = contains("@")