github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-26 10:48:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #166 from directus/tfa-login

Browse Source 
Use new error structure, show otp field on login
This commit is contained in:
Rijk van Zanten
2020-08-25 13:36:49 -06:00
committed by GitHub
parent 69469e9c99 359da90423
commit 5603d4d02c
5 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/api.ts
View File

@@ -51,7 +51,7 @@ export const onError = async (error: RequestError) => {
/* istanbul ignore next */
const status = error.response?.status;
/* istanbul ignore next */
const code = error.response?.data?.error?.code;
const code = error.response?.data?.errors?.[0]?.extensions?.code;
if (status === 401 && code === 'INVALID_CREDENTIALS' && error.request.responseURL.includes('refresh') === false) {
try {

2
app/src/components/v-error/v-error.vue
View File

@@ -24,7 +24,7 @@ export default defineComponent({
},
setup(props) {
const code = computed(() => {
return props.error?.response?.data?.error?.code || 'UNKNOWN';
return props.error?.response?.data?.errors?.[0]?.extensions?.code || 'UNKNOWN';
});
const copied = ref(false);

26
app/src/lang/en-US/index.json
View File

@@ -434,22 +434,16 @@
"auto_format_casing": "Auto-format casing",
"errors": {
"3": "Only super admins have access to this",
"4": "Super Admin Token not provided",
"11": "Can't Reach Database",
"12": "Field has invalid regular expression",
"100": "Incorrect Email/Password",
"101": "Logged-out from Inactivity",
"102": "Logged-out from Inactivity",
"103": "User Suspended",
"105": "Reset link expired",
"106": "Incorrect Email/Password",
"107": "User Not Found",
"111": "Enter One-Time Password",
"112": "Wrong One-Time Password",
"114": "Incorrect Email/Password",
"115": "SSO is not allowed when 2FA is enabled",
"503": "Email couldn't be sent. Please verify the API's configuration",
"COLLECTION_NOT_FOUND": "Collection doesn't exist.",
"FIELD_NOT_FOUND": "Field not found.",
"NO_PERMISSION": "Forbidden.",
"INVALID_CREDENTIALS": "Wrong username or password.",
"INVALID_OTP": "Wrong one-time password.",
"INVALID_PAYLOAD": "Invalid payload.",
"INVALID_QUERY": "Invalid query.",
"ITEM_LIMIT_REACHED": "Item limit reached.",
"ITEM_NOT_FOUND": "Item not found.",
"ROUTE_NOT_FOUND": "Not found.",
"-1": "Couldn't Reach API"
},

4
app/src/lang/index.ts
View File

@@ -100,13 +100,13 @@ export async function setLanguage(lang: Language): Promise<boolean> {
export default i18n;
export function translateAPIError(error: RequestError | number) {
export function translateAPIError(error: RequestError | string) {
const defaultMsg = i18n.t('unexpected_error');
let code = error;
if (typeof error === 'object') {
code = error?.response?.data?.error?.code;
code = error?.response?.data?.errors?.[0]?.extensions?.code;
}
if (!error) return defaultMsg;

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

@@ -127,7 +127,10 @@ export default defineComponent({
router.push(lastPage || '/collections');
} catch (err) {
/** @todo use new error code */
if (err.response?.data?.error?.code === 111) {
if (
err.response?.data?.errors?.[0]?.extensions?.code === 'INVALID_OTP' &&
requiresTFA.value === false
) {
requiresTFA.value = true;
} else {
error.value = err;