strapi-custom-auth 1.2.34 → 1.2.36
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/admin/index.js +15 -1
- package/dist/admin/index.mjs +15 -1
- package/package.json +1 -1
package/dist/admin/index.js
CHANGED
|
@@ -70,16 +70,20 @@ const originalFetch = window.fetch;
|
|
|
70
70
|
const fetchInterceptor = (storage) => {
|
|
71
71
|
window.fetch = async (input, init = {}) => {
|
|
72
72
|
console.log("---input---", JSON.stringify(input));
|
|
73
|
+
console.log("---init---", JSON.stringify(init));
|
|
73
74
|
const url = input instanceof Request ? input.url : input;
|
|
74
75
|
console.log("---url---", url);
|
|
75
76
|
const byPass = init.headers ? await init.headers.get("x-by-pass") : false;
|
|
76
77
|
if (url.includes("/admin/renew-token") || url.includes("/auth/login") || url.includes("repos/strapi/strapi/releases/latest") || url.includes("/admin/init") || init.body instanceof FormData || byPass == true) {
|
|
77
78
|
console.log("---skip renewal---");
|
|
78
79
|
try {
|
|
80
|
+
const _token = storage.getItem("jwtToken").replace(/"/g, "");
|
|
81
|
+
console.log("---skip renewal, _token---", _token);
|
|
82
|
+
init.headers.set("Authorization", `Bearer ${_token}`);
|
|
83
|
+
console.log("---skip renewal, init---", JSON.stringify(init));
|
|
79
84
|
const response = await originalFetch(input, init);
|
|
80
85
|
console.log("---response--", JSON.stringify(response));
|
|
81
86
|
console.log("---response, json--", await response.json());
|
|
82
|
-
console.log("---response, text--", await response.text());
|
|
83
87
|
return response;
|
|
84
88
|
} catch (e) {
|
|
85
89
|
console.log("----fetch---, e", e);
|
|
@@ -90,10 +94,14 @@ const fetchInterceptor = (storage) => {
|
|
|
90
94
|
let token = storage.getItem("jwtToken").replace(/"/g, "");
|
|
91
95
|
console.log("---token---", token);
|
|
92
96
|
if (isTokenExpired(token)) {
|
|
97
|
+
console.log("---Token IS EXPIRED---");
|
|
93
98
|
try {
|
|
94
99
|
token = await renewToken(storage, originalFetch);
|
|
100
|
+
console.log("---Token IS EXPIRED---, token", token);
|
|
95
101
|
console.log("Token renewed successfully");
|
|
96
102
|
} catch (error) {
|
|
103
|
+
console.log("---Token IS EXPIRED---, error", error);
|
|
104
|
+
console.log("---Token IS EXPIRED---, error", JSON.stringify(error));
|
|
97
105
|
console.error("Token renewal failed. Logging out...");
|
|
98
106
|
storage.clear();
|
|
99
107
|
if (!window.location.pathname.includes("/admin/auth/login")) {
|
|
@@ -120,8 +128,14 @@ const fetchInterceptor = (storage) => {
|
|
|
120
128
|
};
|
|
121
129
|
try {
|
|
122
130
|
const response = await originalFetch(input, modifiedInit);
|
|
131
|
+
console.log("----originalFetch /2, input", input);
|
|
132
|
+
console.log("----originalFetch /2, input", JSON.stringify(input));
|
|
133
|
+
console.log("----originalFetch /2, modifiedInit", modifiedInit);
|
|
134
|
+
console.log("----originalFetch /2, modifiedInit", JSON.stringify(modifiedInit));
|
|
135
|
+
console.log("----originalFetch /2, response", response);
|
|
123
136
|
if (!response.ok) {
|
|
124
137
|
const errorData = await response.json();
|
|
138
|
+
console.log("----originalFetch /2, errorData", JSON.stringify(errorData));
|
|
125
139
|
console.log("Fetch error:", errorData.error?.message);
|
|
126
140
|
if (response.status === 401) {
|
|
127
141
|
storage.clear();
|
package/dist/admin/index.mjs
CHANGED
|
@@ -69,16 +69,20 @@ const originalFetch = window.fetch;
|
|
|
69
69
|
const fetchInterceptor = (storage) => {
|
|
70
70
|
window.fetch = async (input, init = {}) => {
|
|
71
71
|
console.log("---input---", JSON.stringify(input));
|
|
72
|
+
console.log("---init---", JSON.stringify(init));
|
|
72
73
|
const url = input instanceof Request ? input.url : input;
|
|
73
74
|
console.log("---url---", url);
|
|
74
75
|
const byPass = init.headers ? await init.headers.get("x-by-pass") : false;
|
|
75
76
|
if (url.includes("/admin/renew-token") || url.includes("/auth/login") || url.includes("repos/strapi/strapi/releases/latest") || url.includes("/admin/init") || init.body instanceof FormData || byPass == true) {
|
|
76
77
|
console.log("---skip renewal---");
|
|
77
78
|
try {
|
|
79
|
+
const _token = storage.getItem("jwtToken").replace(/"/g, "");
|
|
80
|
+
console.log("---skip renewal, _token---", _token);
|
|
81
|
+
init.headers.set("Authorization", `Bearer ${_token}`);
|
|
82
|
+
console.log("---skip renewal, init---", JSON.stringify(init));
|
|
78
83
|
const response = await originalFetch(input, init);
|
|
79
84
|
console.log("---response--", JSON.stringify(response));
|
|
80
85
|
console.log("---response, json--", await response.json());
|
|
81
|
-
console.log("---response, text--", await response.text());
|
|
82
86
|
return response;
|
|
83
87
|
} catch (e) {
|
|
84
88
|
console.log("----fetch---, e", e);
|
|
@@ -89,10 +93,14 @@ const fetchInterceptor = (storage) => {
|
|
|
89
93
|
let token = storage.getItem("jwtToken").replace(/"/g, "");
|
|
90
94
|
console.log("---token---", token);
|
|
91
95
|
if (isTokenExpired(token)) {
|
|
96
|
+
console.log("---Token IS EXPIRED---");
|
|
92
97
|
try {
|
|
93
98
|
token = await renewToken(storage, originalFetch);
|
|
99
|
+
console.log("---Token IS EXPIRED---, token", token);
|
|
94
100
|
console.log("Token renewed successfully");
|
|
95
101
|
} catch (error) {
|
|
102
|
+
console.log("---Token IS EXPIRED---, error", error);
|
|
103
|
+
console.log("---Token IS EXPIRED---, error", JSON.stringify(error));
|
|
96
104
|
console.error("Token renewal failed. Logging out...");
|
|
97
105
|
storage.clear();
|
|
98
106
|
if (!window.location.pathname.includes("/admin/auth/login")) {
|
|
@@ -119,8 +127,14 @@ const fetchInterceptor = (storage) => {
|
|
|
119
127
|
};
|
|
120
128
|
try {
|
|
121
129
|
const response = await originalFetch(input, modifiedInit);
|
|
130
|
+
console.log("----originalFetch /2, input", input);
|
|
131
|
+
console.log("----originalFetch /2, input", JSON.stringify(input));
|
|
132
|
+
console.log("----originalFetch /2, modifiedInit", modifiedInit);
|
|
133
|
+
console.log("----originalFetch /2, modifiedInit", JSON.stringify(modifiedInit));
|
|
134
|
+
console.log("----originalFetch /2, response", response);
|
|
122
135
|
if (!response.ok) {
|
|
123
136
|
const errorData = await response.json();
|
|
137
|
+
console.log("----originalFetch /2, errorData", JSON.stringify(errorData));
|
|
124
138
|
console.log("Fetch error:", errorData.error?.message);
|
|
125
139
|
if (response.status === 401) {
|
|
126
140
|
storage.clear();
|
package/package.json
CHANGED