diff --git a/app/stores/AuthStore.js b/app/stores/AuthStore.js index ef1c9936..318e939c 100644 --- a/app/stores/AuthStore.js +++ b/app/stores/AuthStore.js @@ -45,9 +45,9 @@ class AuthStore { this.team = res.data.team; }); } catch (err) { - if (err.data.error === 'user_suspended') { + if (err.error.error === 'user_suspended') { this.isSuspended = true; - this.suspendedContactEmail = err.data.adminEmail; + this.suspendedContactEmail = err.error.data.adminEmail; } } }; diff --git a/app/utils/ApiClient.js b/app/utils/ApiClient.js index 88689709..be832bfb 100644 --- a/app/utils/ApiClient.js +++ b/app/utils/ApiClient.js @@ -84,7 +84,7 @@ class ApiClient { }) .catch(error => { error.response.json().then(json => { - error.data = json; + error.error = json; reject(error); }); }); diff --git a/server/api/index.js b/server/api/index.js index fb41620b..da90ff11 100644 --- a/server/api/index.js +++ b/server/api/index.js @@ -55,7 +55,7 @@ api.use(async (ctx, next) => { error: _.snakeCase(err.id || error), status: err.status, message, - adminEmail: err.adminEmail ? err.adminEmail : undefined, + data: err.errorData ? err.errorData : undefined, }; } }); diff --git a/server/api/middlewares/authentication.test.js b/server/api/middlewares/authentication.test.js index a0a1208c..2adb3066 100644 --- a/server/api/middlewares/authentication.test.js +++ b/server/api/middlewares/authentication.test.js @@ -181,7 +181,7 @@ describe('Authentication middleware', async () => { expect(e.message).toEqual( 'Your access has been suspended by the team admin' ); - expect(e.adminEmail).toEqual(admin.email); + expect(e.errorData.adminEmail).toEqual(admin.email); } }); }); diff --git a/server/errors.js b/server/errors.js index 0c509e99..b35589ab 100644 --- a/server/errors.js +++ b/server/errors.js @@ -22,7 +22,9 @@ export function AdminRequiredError( export function UserSuspendedError({ adminEmail }: { adminEmail: string }) { return httpErrors(403, 'Your access has been suspended by the team admin', { id: 'user_suspended', - adminEmail, + errorData: { + adminEmail, + }, }); }