github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Show better message for improperly formatted emails (#6168)

Browse Source 
Closes #6115
This commit is contained in:
Rijk van Zanten
2021-06-09 17:14:56 -04:00
committed by GitHub
parent fb908efe8f
commit c2c57ef567
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/routes/login/components/login-form/login-form.vue
View File

@@ -47,7 +47,7 @@ export default defineComponent({
const loggingIn = ref(false);
const email = ref<string | null>(null);
const password = ref<string | null>(null);
const error = ref<RequestError | null>(null);
const error = ref<RequestError | string | null>(null);
const otp = ref<string | null>(null);
const requiresTFA = ref(false);
const userStore = useUserStore();
@@ -57,6 +57,11 @@ export default defineComponent({
});
const errorFormatted = computed(() => {
// Show "Wrong username or password" for wrongly formatted emails as well
if (error.value === 'INVALID_PAYLOAD') {
return translateAPIError('INVALID_CREDENTIALS');
}
if (error.value) {
return translateAPIError(error.value);
}
@@ -89,7 +94,7 @@ export default defineComponent({
if (err.response?.data?.errors?.[0]?.extensions?.code === 'INVALID_OTP' && requiresTFA.value === false) {
requiresTFA.value = true;
} else {
error.value = err;
error.value = err.response?.data?.errors?.[0]?.extensions?.code || err;
}
} finally {
loggingIn.value = false;