@orbe-agro/client-core 5.6.60 → 5.6.61
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.
- package/dist/@ecme/services/axios/AxiosResponseIntrceptorErrorCallback.js +8 -0
- package/dist/@ecme/services/axios/AxiosResponseIntrceptorErrorCallback.js.map +1 -1
- package/dist/@types/@ecme/services/axios/AxiosResponseIntrceptorErrorCallback.d.ts.map +1 -1
- package/dist/@types/base/@types/models/user.d.ts +1 -0
- package/dist/@types/base/@types/models/user.d.ts.map +1 -1
- package/lib/@ecme/services/axios/AxiosResponseIntrceptorErrorCallback.ts +9 -0
- package/lib/base/@types/models/user.ts +1 -0
- package/package.json +1 -1
|
@@ -1,10 +1,18 @@
|
|
|
1
1
|
import { useToken, useSessionUser } from "../../store/authStore.js";
|
|
2
2
|
const unauthorizedCode = [401, 403, 419, 440];
|
|
3
|
+
const authLoginPaths = ["/auth/api/auth/login"];
|
|
3
4
|
const AxiosResponseIntrceptorErrorCallback = (error) => {
|
|
4
5
|
const { response } = error;
|
|
5
6
|
const { setToken } = useToken();
|
|
7
|
+
const requestUrl = response?.config?.url ?? "";
|
|
8
|
+
const isLoginRequest = authLoginPaths.some(
|
|
9
|
+
(path) => requestUrl.includes(path)
|
|
10
|
+
);
|
|
6
11
|
if (response && unauthorizedCode.includes(response.status)) {
|
|
7
12
|
if (response.status === 403) {
|
|
13
|
+
if (isLoginRequest) {
|
|
14
|
+
return Promise.reject(error);
|
|
15
|
+
}
|
|
8
16
|
window.location.href = "/access-denied";
|
|
9
17
|
return new Promise(() => {
|
|
10
18
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AxiosResponseIntrceptorErrorCallback.js","sources":["../../../../lib/@ecme/services/axios/AxiosResponseIntrceptorErrorCallback.ts"],"sourcesContent":["import { useSessionUser, useToken } from \"@/store/authStore\";\nimport type { AxiosError } from \"axios\";\n\nconst unauthorizedCode = [401, 403, 419, 440];\n\nconst AxiosResponseIntrceptorErrorCallback = (error: AxiosError) => {\n const { response } = error;\n const { setToken } = useToken();\n\n if (response && unauthorizedCode.includes(response.status)) {\n if (response.status === 403) {\n window.location.href = \"/access-denied\";\n return new Promise(() => {});\n }\n\n setToken(\"\");\n useSessionUser.getState().setUser({});\n useSessionUser.getState().setSessionSignedIn(false);\n }\n\n return Promise.reject(error);\n};\n\nexport default AxiosResponseIntrceptorErrorCallback;\n"],"names":[],"mappings":";AAGA,MAAM,mBAAmB,CAAC,KAAK,KAAK,KAAK,GAAG;
|
|
1
|
+
{"version":3,"file":"AxiosResponseIntrceptorErrorCallback.js","sources":["../../../../lib/@ecme/services/axios/AxiosResponseIntrceptorErrorCallback.ts"],"sourcesContent":["import { useSessionUser, useToken } from \"@/store/authStore\";\nimport type { AxiosError } from \"axios\";\n\nconst unauthorizedCode = [401, 403, 419, 440];\nconst authLoginPaths = [\"/auth/api/auth/login\"];\n\nconst AxiosResponseIntrceptorErrorCallback = (error: AxiosError) => {\n const { response } = error;\n const { setToken } = useToken();\n const requestUrl = response?.config?.url ?? \"\";\n const isLoginRequest = authLoginPaths.some((path) =>\n requestUrl.includes(path)\n );\n\n if (response && unauthorizedCode.includes(response.status)) {\n if (response.status === 403) {\n if (isLoginRequest) {\n return Promise.reject(error);\n }\n\n window.location.href = \"/access-denied\";\n return new Promise(() => {});\n }\n\n setToken(\"\");\n useSessionUser.getState().setUser({});\n useSessionUser.getState().setSessionSignedIn(false);\n }\n\n return Promise.reject(error);\n};\n\nexport default AxiosResponseIntrceptorErrorCallback;\n"],"names":[],"mappings":";AAGA,MAAM,mBAAmB,CAAC,KAAK,KAAK,KAAK,GAAG;AAC5C,MAAM,iBAAiB,CAAC,sBAAsB;AAE9C,MAAM,uCAAuC,CAAC,UAAsB;AAClE,QAAM,EAAE,aAAa;AACrB,QAAM,EAAE,SAAA,IAAa,SAAA;AACrB,QAAM,aAAa,UAAU,QAAQ,OAAO;AAC5C,QAAM,iBAAiB,eAAe;AAAA,IAAK,CAAC,SAC1C,WAAW,SAAS,IAAI;AAAA,EAAA;AAG1B,MAAI,YAAY,iBAAiB,SAAS,SAAS,MAAM,GAAG;AAC1D,QAAI,SAAS,WAAW,KAAK;AAC3B,UAAI,gBAAgB;AAClB,eAAO,QAAQ,OAAO,KAAK;AAAA,MAC7B;AAEA,aAAO,SAAS,OAAO;AACvB,aAAO,IAAI,QAAQ,MAAM;AAAA,MAAC,CAAC;AAAA,IAC7B;AAEA,aAAS,EAAE;AACX,mBAAe,SAAA,EAAW,QAAQ,EAAE;AACpC,mBAAe,SAAA,EAAW,mBAAmB,KAAK;AAAA,EACpD;AAEA,SAAO,QAAQ,OAAO,KAAK;AAC7B;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AxiosResponseIntrceptorErrorCallback.d.ts","sourceRoot":"","sources":["../../../../../lib/@ecme/services/axios/AxiosResponseIntrceptorErrorCallback.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"AxiosResponseIntrceptorErrorCallback.d.ts","sourceRoot":"","sources":["../../../../../lib/@ecme/services/axios/AxiosResponseIntrceptorErrorCallback.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAKxC,QAAA,MAAM,oCAAoC,GAAI,OAAO,UAAU,qBAwB9D,CAAC;AAEF,eAAe,oCAAoC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../../lib/base/@types/models/user.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../../lib/base/@types/models/user.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,13 +2,22 @@ import { useSessionUser, useToken } from "@/store/authStore";
|
|
|
2
2
|
import type { AxiosError } from "axios";
|
|
3
3
|
|
|
4
4
|
const unauthorizedCode = [401, 403, 419, 440];
|
|
5
|
+
const authLoginPaths = ["/auth/api/auth/login"];
|
|
5
6
|
|
|
6
7
|
const AxiosResponseIntrceptorErrorCallback = (error: AxiosError) => {
|
|
7
8
|
const { response } = error;
|
|
8
9
|
const { setToken } = useToken();
|
|
10
|
+
const requestUrl = response?.config?.url ?? "";
|
|
11
|
+
const isLoginRequest = authLoginPaths.some((path) =>
|
|
12
|
+
requestUrl.includes(path)
|
|
13
|
+
);
|
|
9
14
|
|
|
10
15
|
if (response && unauthorizedCode.includes(response.status)) {
|
|
11
16
|
if (response.status === 403) {
|
|
17
|
+
if (isLoginRequest) {
|
|
18
|
+
return Promise.reject(error);
|
|
19
|
+
}
|
|
20
|
+
|
|
12
21
|
window.location.href = "/access-denied";
|
|
13
22
|
return new Promise(() => {});
|
|
14
23
|
}
|