@ordentco/addons-auth-provider 0.9.98 → 0.9.100
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -94,14 +94,23 @@ exports.customAxios.interceptors.response.use(function (response) {
|
|
|
94
94
|
var originalRequest = error.config;
|
|
95
95
|
var pathname = window.location.pathname;
|
|
96
96
|
var isMain = pathname === '/main-page';
|
|
97
|
+
var isMainWithParam = pathname === '/main-page?logout=true';
|
|
98
|
+
var isDashboard = pathname === '/homepage';
|
|
97
99
|
// handling error login from main-page
|
|
98
100
|
if (error && isMain) {
|
|
101
|
+
window.location.replace("/main-page?logout=true");
|
|
99
102
|
return Promise.reject(__assign({}, error));
|
|
100
103
|
}
|
|
101
|
-
if (((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) === 401) {
|
|
104
|
+
if (((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !(isMainWithParam || isDashboard || isMain)) {
|
|
102
105
|
document.dispatchEvent(new Event("showDialog"));
|
|
103
106
|
return Promise.reject(__assign({}, error));
|
|
104
107
|
}
|
|
108
|
+
if (error.response.status === 401 && (isMainWithParam || isDashboard || isMain)) {
|
|
109
|
+
localStorage.removeItem("access-token");
|
|
110
|
+
localStorage.removeItem("refresh-token");
|
|
111
|
+
window.location.href = "/main-page?logout=true";
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
105
114
|
if (((_c = (_b = error === null || error === void 0 ? void 0 : error.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.message) === "Another Login Detected" || (error === null || error === void 0 ? void 0 : error.message) === "Another Login Detected") {
|
|
106
115
|
localStorage.removeItem("access-token");
|
|
107
116
|
localStorage.removeItem("refresh-token");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-axios.js","sourceRoot":"","sources":["../../services/custom-axios.ts"],"names":[],"mappings":";AAAA,uDAAuD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEvD,gDAA0B;AAC1B,YAAY;AACZ,wDAA+B;AAC/B,iCAAiC;AACpB,QAAA,WAAW,GAAG,eAAK,CAAC,MAAM,CAAC;IACtC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;IAC3C,OAAO,EAAE;QACP,cAAc,EAAE,kBAAkB;KACnC;CACF,CAAC,CAAC;AAEH,mBAAW,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAClC,UAAO,MAAM;;;QACL,WAAW,GAAG,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAEzD,IAAI,WAAW,EAAE,CAAC;YACV,MAAM,yBACP,MAAM,CAAC,OAAO,KACjB,aAAa,EAAE,iBAAU,WAAW,CAAE,GACvC,CAAA;YACD,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;QAC1B,CAAC;QAED,sBAAO,MAAM,EAAC;;KACf,EACD,UAAC,KAAK,IAAK,OAAA,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAArB,CAAqB,CACjC,CAAC;AAEF,IAAI,YAAY,GAAG,KAAK,CAAC;AACzB,IAAI,WAAW,GAAe,EAAE,CAAC;AAEjC,IAAM,YAAY,GAAG,UAAC,KAAU,EAAE,KAAiB;IAAjB,sBAAA,EAAA,YAAiB;IACjD,WAAW,CAAC,OAAO,CAAC,UAAC,IAAI;QACvB,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,WAAW,GAAG,EAAE,CAAC;AACnB,CAAC,CAAC;AAEF,mBAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CACnC,UAAU,QAAQ;IAChB,OAAO,QAAQ,CAAC;AAClB,CAAC,EACD,UAAU,KAAK;;IACb,IAAM,eAAe,GAAG,KAAK,CAAC,MAAM,CAAC;IACrC,IAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAC1C,IAAM,MAAM,GAAG,QAAQ,KAAK,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"custom-axios.js","sourceRoot":"","sources":["../../services/custom-axios.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/services/custom-axios.ts
CHANGED
|
@@ -51,21 +51,31 @@ customAxios.interceptors.response.use(
|
|
|
51
51
|
const originalRequest = error.config;
|
|
52
52
|
const pathname = window.location.pathname;
|
|
53
53
|
const isMain = pathname === '/main-page';
|
|
54
|
+
const isMainWithParam = pathname === '/main-page?logout=true';
|
|
55
|
+
const isDashboard = pathname === '/homepage';
|
|
54
56
|
|
|
55
57
|
// handling error login from main-page
|
|
56
58
|
if (error && isMain) {
|
|
59
|
+
window.location.replace("/main-page?logout=true");
|
|
57
60
|
return Promise.reject({
|
|
58
61
|
...error,
|
|
59
62
|
});
|
|
60
63
|
}
|
|
61
64
|
|
|
62
|
-
if (error?.response?.status === 401) {
|
|
65
|
+
if (error?.response?.status === 401 && !(isMainWithParam || isDashboard || isMain)) {
|
|
63
66
|
document.dispatchEvent(new Event("showDialog"));
|
|
64
67
|
return Promise.reject({
|
|
65
68
|
...error,
|
|
66
69
|
});
|
|
67
70
|
}
|
|
68
71
|
|
|
72
|
+
if(error.response.status === 401 && (isMainWithParam || isDashboard || isMain)) {
|
|
73
|
+
localStorage.removeItem("access-token");
|
|
74
|
+
localStorage.removeItem("refresh-token");
|
|
75
|
+
window.location.href = "/main-page?logout=true";
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
|
|
69
79
|
if (error?.response?.data?.message === "Another Login Detected" || error?.message === "Another Login Detected") {
|
|
70
80
|
localStorage.removeItem("access-token");
|
|
71
81
|
localStorage.removeItem("refresh-token");
|