From 61bdcb3b96ebc2ed1e46db9318d0537265874328 Mon Sep 17 00:00:00 2001 From: Saeid Date: Mon, 17 Aug 2020 15:08:07 +0430 Subject: [PATCH] fix: fix errorHandler --- .../js/Global/services/errorHandler.services.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/resources/js/Global/services/errorHandler.services.js b/resources/js/Global/services/errorHandler.services.js index eed4df6..0443352 100644 --- a/resources/js/Global/services/errorHandler.services.js +++ b/resources/js/Global/services/errorHandler.services.js @@ -6,9 +6,9 @@ import commonRoute from "@Global/utils/common/routes"; import toast from "./toast.service"; +import Vue from "vue"; function errorResponseHandler(error) { - // check for errorHandle config if ( error.config.hasOwnProperty("errorHandle") && @@ -19,15 +19,15 @@ function errorResponseHandler(error) { // if has response show the error if (error.response) { - if(error.response.status == 401) { + if(error.response.status === 401) { TokenService.removeToken(); ApiService.removeAuthHeader(); store.commit('auth/logout', {}, {root: true}); - if (commonRoute.login() != window.location.pathname) { + if (commonRoute.login() !== window.location.pathname) { window.location.href = commonRoute.login(); } toast.error('نام کاربری یا رمز عبور اشتباه است', 'خطا'); - } else if(error.response.status == 422) { + } else if(error.response.status === 422) { if(typeof error.response.data.errors !== 'undefined') { for (const key in error.response.data.errors) { if (error.response.data.errors.hasOwnProperty(key)) { @@ -35,13 +35,14 @@ function errorResponseHandler(error) { } } } - } else if(error.response.status == 500) { + } else if(error.response.status === 500) { toast.error('مشکل از سمت سرور', 'خطا'); } } + return Promise.reject(error); } function successHandler(response) { - if(response.status == 200 || response.status == 201) { + if(response.status === 200 || response.status === 201) { if(typeof response.data.message !== 'undefined' && typeof response.data.message.content !== 'undefined') { toast.success(response.data.message.content, response.data.message.title || 'موفق'); } @@ -51,5 +52,5 @@ function successHandler(response) { // apply interceptor on response axios.interceptors.response.use(successHandler, errorResponseHandler); +Vue.prototype.$axios = axios; -export default errorResponseHandler; \ No newline at end of file