Browse Source
* Use user friendly error messages in login following iOS logic, fix dialog colors. * Use `AlertDialogDefaults` for the default properties of dialogs * Improve Maestro tests with wrong password dialog * Add tests for error messagesmisc/jme/add-logging-to-state-machine
Jorge Martin Espinosa
2 years ago
committed by
GitHub
46 changed files with 300 additions and 113 deletions
@ -0,0 +1 @@
@@ -0,0 +1 @@
|
||||
Use user friendly error messages in login following iOS logic, fix dialog colors. |
@ -0,0 +1,98 @@
@@ -0,0 +1,98 @@
|
||||
/* |
||||
* Copyright (c) 2023 New Vector Ltd |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package io.element.android.features.login.error |
||||
|
||||
import com.google.common.truth.Truth.assertThat |
||||
import org.junit.Test |
||||
import io.element.android.libraries.ui.strings.R |
||||
import org.matrix.rustcomponents.sdk.AuthenticationException |
||||
|
||||
class ErrorFormatterTests { |
||||
|
||||
// region loginError |
||||
@Test |
||||
fun `loginError - invalid unknown error returns unknown error message`() { |
||||
val error = Throwable("Some unknown error") |
||||
assertThat(loginError(error)).isEqualTo(R.string.unknown_error) |
||||
} |
||||
|
||||
@Test |
||||
fun `loginError - invalid auth error returns unknown error message`() { |
||||
val error = AuthenticationException.SlidingSyncNotAvailable("Some message. Also contains M_FORBIDDEN, but won't be parsed") |
||||
assertThat(loginError(error)).isEqualTo(R.string.unknown_error) |
||||
} |
||||
|
||||
@Test |
||||
fun `loginError - unknown error returns unknown error message`() { |
||||
val error = AuthenticationException.Generic("M_UNKNOWN") |
||||
assertThat(loginError(error)).isEqualTo(R.string.unknown_error) |
||||
} |
||||
|
||||
@Test |
||||
fun `loginError - forbidden error returns incorrect credentials message`() { |
||||
val error = AuthenticationException.Generic("M_FORBIDDEN") |
||||
assertThat(loginError(error)).isEqualTo(R.string.auth_invalid_login_param) |
||||
} |
||||
|
||||
@Test |
||||
fun `loginError - user_deactivated error returns deactivated account message`() { |
||||
val error = AuthenticationException.Generic("M_USER_DEACTIVATED") |
||||
assertThat(loginError(error)).isEqualTo(R.string.auth_invalid_login_deactivated_account) |
||||
} |
||||
|
||||
// endregion loginError |
||||
|
||||
// region changeServerError |
||||
|
||||
@Test |
||||
fun `changeServerError - invalid unknown error returns unknown error message`() { |
||||
val error = Throwable("Some unknown error") |
||||
assertThat(changeServerError(error)).isEqualTo(R.string.unknown_error) |
||||
} |
||||
|
||||
@Test |
||||
fun `changeServerError - invalid auth error returns unknown error message`() { |
||||
val error = AuthenticationException.SlidingSyncNotAvailable("Some message. Also contains M_FORBIDDEN, but won't be parsed") |
||||
assertThat(changeServerError(error)).isEqualTo(R.string.unknown_error) |
||||
} |
||||
|
||||
@Test |
||||
fun `changeServerError - unknown error returns unknown error message`() { |
||||
val error = AuthenticationException.Generic("M_UNKNOWN") |
||||
assertThat(changeServerError(error)).isEqualTo(R.string.unknown_error) |
||||
} |
||||
|
||||
@Test |
||||
fun `changeServerError - forbidden error returns unknown error message`() { |
||||
val error = AuthenticationException.Generic("M_FORBIDDEN") |
||||
assertThat(changeServerError(error)).isEqualTo(R.string.unknown_error) |
||||
} |
||||
|
||||
@Test |
||||
fun `changeServerError - user_deactivated error returns unknown error message`() { |
||||
val error = AuthenticationException.Generic("M_USER_DEACTIVATED") |
||||
assertThat(changeServerError(error)).isEqualTo(R.string.unknown_error) |
||||
} |
||||
|
||||
@Test |
||||
fun `changeServerError - invalid server name error returns invalid server name error message`() { |
||||
val error = AuthenticationException.InvalidServerName("Server is not valid") |
||||
assertThat(changeServerError(error)).isEqualTo(R.string.login_error_homeserver_not_found) |
||||
} |
||||
|
||||
// endregion changeServerError |
||||
} |
@ -0,0 +1,34 @@
@@ -0,0 +1,34 @@
|
||||
/* |
||||
* Copyright (c) 2023 New Vector Ltd |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package io.element.android.libraries.matrix.api.auth |
||||
|
||||
import org.matrix.rustcomponents.sdk.AuthenticationException |
||||
|
||||
enum class AuthErrorCode(val value: String) { |
||||
UNKNOWN("M_UNKNOWN"), |
||||
USER_DEACTIVATED("M_USER_DEACTIVATED"), |
||||
FORBIDDEN("M_FORBIDDEN") |
||||
} |
||||
|
||||
// This is taken from the iOS version. It seems like currently there's no better way to extract error codes |
||||
val AuthenticationException.errorCode: AuthErrorCode |
||||
get() { |
||||
val message = (this as? AuthenticationException.Generic)?.message ?: return AuthErrorCode.UNKNOWN |
||||
return enumValues<AuthErrorCode>() |
||||
.firstOrNull { message.contains(it.value) } |
||||
?: AuthErrorCode.UNKNOWN |
||||
} |
@ -0,0 +1,49 @@
@@ -0,0 +1,49 @@
|
||||
/* |
||||
* Copyright (c) 2023 New Vector Ltd |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package io.element.android.libraries.matrix.api.auth |
||||
|
||||
import com.google.common.truth.Truth.assertThat |
||||
import org.junit.Test |
||||
import org.matrix.rustcomponents.sdk.AuthenticationException |
||||
|
||||
class AuthErrorCodeTests { |
||||
|
||||
@Test |
||||
fun `errorCode finds UNKNOWN code`() { |
||||
val error = AuthenticationException.Generic("M_UNKNOWN") |
||||
assertThat(error.errorCode).isEqualTo(AuthErrorCode.UNKNOWN) |
||||
} |
||||
|
||||
@Test |
||||
fun `errorCode finds USER_DEACTIVATED code`() { |
||||
val error = AuthenticationException.Generic("M_USER_DEACTIVATED") |
||||
assertThat(error.errorCode).isEqualTo(AuthErrorCode.USER_DEACTIVATED) |
||||
} |
||||
|
||||
@Test |
||||
fun `errorCode finds FORBIDDEN code`() { |
||||
val error = AuthenticationException.Generic("M_FORBIDDEN") |
||||
assertThat(error.errorCode).isEqualTo(AuthErrorCode.FORBIDDEN) |
||||
} |
||||
|
||||
@Test |
||||
fun `errorCode cannot find code so it returns UNKNOWN`() { |
||||
val error = AuthenticationException.Generic("Some other error") |
||||
assertThat(error.errorCode).isEqualTo(AuthErrorCode.UNKNOWN) |
||||
} |
||||
|
||||
} |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in new issue