twoFa -> validation naming; fixes for preview for screens (separating view model from ui); some improvements & fixes
This commit is contained in:
@@ -75,7 +75,7 @@ data class InvalidCredentialsError(
|
||||
)
|
||||
|
||||
@JsonClass(generateAdapter = true)
|
||||
data class WrongTwoFaCodeError(
|
||||
data class WrongValidationCodeError(
|
||||
@Json(name = "error") override val error: String, // "invalid_request"
|
||||
@Json(name = "error_description") override val errorDescription: String,
|
||||
@Json(name = "error_type") override val errorType: String // "wrong_otp"
|
||||
@@ -86,7 +86,7 @@ data class WrongTwoFaCodeError(
|
||||
)
|
||||
|
||||
@JsonClass(generateAdapter = true)
|
||||
data class WrongTwoFaCodeFormatError(
|
||||
data class WrongValidationCodeFormatError(
|
||||
@Json(name = "error") override val error: String, // "invalid_request"
|
||||
@Json(name = "error_description") override val errorDescription: String,
|
||||
@Json(name = "error_type") override val errorType: String // "otp_format_is_incorrect"
|
||||
@@ -140,12 +140,12 @@ fun OAuthError.toDomain(): OAuthErrorDomain? = when (this) {
|
||||
OAuthErrorDomain.InvalidCredentialsError
|
||||
}
|
||||
|
||||
is WrongTwoFaCodeError -> {
|
||||
OAuthErrorDomain.WrongTwoFaCode
|
||||
is WrongValidationCodeError -> {
|
||||
OAuthErrorDomain.WrongValidationCode
|
||||
}
|
||||
|
||||
is WrongTwoFaCodeFormatError -> {
|
||||
OAuthErrorDomain.WrongTwoFaCodeFormat
|
||||
is WrongValidationCodeFormatError -> {
|
||||
OAuthErrorDomain.WrongValidationCodeFormat
|
||||
}
|
||||
|
||||
is TooManyTriesError -> {
|
||||
|
||||
@@ -25,8 +25,8 @@ sealed class OAuthErrorDomain {
|
||||
) : OAuthErrorDomain()
|
||||
|
||||
data object InvalidCredentialsError : OAuthErrorDomain()
|
||||
data object WrongTwoFaCode : OAuthErrorDomain()
|
||||
data object WrongTwoFaCodeFormat : OAuthErrorDomain()
|
||||
data object WrongValidationCode : OAuthErrorDomain()
|
||||
data object WrongValidationCodeFormat : OAuthErrorDomain()
|
||||
data object TooManyTriesError: OAuthErrorDomain()
|
||||
|
||||
data object UnknownError : OAuthErrorDomain()
|
||||
|
||||
@@ -128,12 +128,12 @@ internal class ResultCall<R : Any, E : OAuthError>(
|
||||
"invalid_request" -> {
|
||||
when (val type = baseError.errorType) {
|
||||
"wrong_otp" -> {
|
||||
moshi.adapter(WrongTwoFaCodeError::class.java)
|
||||
moshi.adapter(WrongValidationCodeError::class.java)
|
||||
.fromJson(errorBodyString.orEmpty())
|
||||
}
|
||||
|
||||
"otp_format_is_incorrect" -> {
|
||||
moshi.adapter(WrongTwoFaCodeFormatError::class.java)
|
||||
moshi.adapter(WrongValidationCodeFormatError::class.java)
|
||||
.fromJson(errorBodyString.orEmpty())
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user