From 160e00b5a9d5d6c995369499c72a8cb17cf98ac8 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Mon, 17 Apr 2023 21:49:01 +0000 Subject: [PATCH] improve error handling on `handleAfterRequest` --- packages/app/src/cores/api/index.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/app/src/cores/api/index.js b/packages/app/src/cores/api/index.js index e3fcd8e7..de285df0 100755 --- a/packages/app/src/cores/api/index.js +++ b/packages/app/src/cores/api/index.js @@ -153,7 +153,7 @@ export default class ApiCore extends Core { } handleAfterRequest = async (data, callback) => { - // handle 401 responses + // handle 401, 403 responses if (data instanceof Error) { if (data.response.status === 401) { // check if the server issue a refresh token on data @@ -164,12 +164,17 @@ export default class ApiCore extends Core { await this.handleRegenerationEvent(data.response.data.refreshToken) return await callback() - } else { + } + + // check if route is from "session" namespace + if (data.config.url.includes("/session")) { return window.app.eventBus.emit("session.invalid", "Session expired, but the server did not issue a refresh token") } } if (data.response.status === 403) { - return window.app.eventBus.emit("session.invalid", "Session not valid or not existent") + if (data.config.url.includes("/session")) { + return window.app.eventBus.emit("session.invalid", "Session not valid or not existent") + } } } }