@ichaingo/request 1.2.9 → 1.3.0

package/dist/index.js

@@ -2,9 +2,9 @@ import $, { isAxiosError as C, AxiosError as w } from "axios";
 import N from "qs";
 import x from "js-cookie";
 import { logger as R } from "@ichaingo/logger";
-import q, { isTokenExpired as O, getToken as b } from "@ichaingo/token";
-const B = () => /^(zh-hans|zh-cn|zh-sg|zh-my)$/.test(window == null ? void 0 : window.navigator.language.toLowerCase()), P = () => B() ? "zh-hans" : "";
-async function S(e) {
+import q, { isTokenExpired as O, getToken as b, setToken as B } from "@ichaingo/token";
+const P = () => /^(zh-hans|zh-cn|zh-sg|zh-my)$/.test(window == null ? void 0 : window.navigator.language.toLowerCase()), S = () => P() ? "zh-hans" : "";
+async function z(e) {
   var n;
   let t = "", o = "";
   if (process.env.IS_SERVER) {
@@ -23,13 +23,13 @@ async function S(e) {
       console.error("Error accessing cookies in server component:", s);
     }
   } else
-    t = x.get("access_token") || "", o = x.get("NEXT_LOCALE") || P() || "en";
+    t = x.get("access_token") || "", o = x.get("NEXT_LOCALE") || S() || "en";
   const i = e.headers.isRefreshToken;
   return e.headers["Accept-Language"] = o, t && !i && (e.headers.Authorization = `Bearer ${t}`), e.headers.devicetype = 1, e;
 }
-function z(e) {
-  var g, r, T, y, L, h, f, _, I, v, k;
-  const t = (r = (g = e.config) == null ? void 0 : g.method) == null ? void 0 : r.toUpperCase(), o = ((T = e.config) == null ? void 0 : T.baseURL) || "", i = (y = e.config) != null && y.url ? `${o || ""}${e.config.url}` : "", n = (L = e.response) == null ? void 0 : L.status, c = (h = e.response) == null ? void 0 : h.statusText, s = (f = e.response) == null ? void 0 : f.data, a = ((I = (_ = e.response) == null ? void 0 : _.headers) == null ? void 0 : I["x-request-id"]) || ((v = s == null ? void 0 : s.status) == null ? void 0 : v.requestId), u = (s == null ? void 0 : s.message) || (s == null ? void 0 : s.msg) || ((k = s == null ? void 0 : s.status) == null ? void 0 : k.msg), m = [
+function H(e) {
+  var g, r, T, y, L, h, f, _, I, k, v;
+  const t = (r = (g = e.config) == null ? void 0 : g.method) == null ? void 0 : r.toUpperCase(), o = ((T = e.config) == null ? void 0 : T.baseURL) || "", i = (y = e.config) != null && y.url ? `${o || ""}${e.config.url}` : "", n = (L = e.response) == null ? void 0 : L.status, c = (h = e.response) == null ? void 0 : h.statusText, s = (f = e.response) == null ? void 0 : f.data, a = ((I = (_ = e.response) == null ? void 0 : _.headers) == null ? void 0 : I["x-request-id"]) || ((k = s == null ? void 0 : s.status) == null ? void 0 : k.requestId), u = (s == null ? void 0 : s.message) || (s == null ? void 0 : s.msg) || ((v = s == null ? void 0 : s.status) == null ? void 0 : v.msg), m = [
     n ? `HTTP ${n}` : "HTTP ERROR",
     t,
     i,
@@ -65,10 +65,10 @@ function A(e) {
     const u = (c = (n = t.config) == null ? void 0 : n.method) == null ? void 0 : c.toUpperCase(), m = ((s = t.config) == null ? void 0 : s.baseURL) || "", d = (a = t.config) != null && a.url ? `${m || ""}${t.config.url}` : "", l = ["TIMEOUT", u, d].filter(Boolean).join(" | ");
     return t.summary = l, t.details = JSON.stringify(E(t)), R.error({ message: l, details: t.details, errType: "timeout" }), Promise.reject(t);
   }
-  const i = z(t);
+  const i = H(t);
   return t.summary = i, t.details = JSON.stringify(E(t)), R.error({ message: i, details: t.details, errType: "server error" }), Promise.reject(t);
 }
-function H(e) {
+function j(e) {
   var o, i, n, c, s, a, u, m, d, l;
   if (e.config.returnFullResponse)
     return e;
@@ -111,7 +111,7 @@ function H(e) {
   return e;
 }
 let p = null;
-const j = $.create({
+const M = $.create({
   baseURL: process.env.NEXT_PUBLIC_AUTH_URL,
   timeout: 1e4,
   withCredentials: !0,
@@ -120,10 +120,10 @@ const j = $.create({
     return N.stringify(e, { arrayFormat: "brackets" });
   }
 });
-async function M(e) {
+async function J(e) {
   const t = e.headers;
   return p ? (await p, e) : (O() && (p = (async () => {
-    await j.get("/api/refresh/token", {
+    const o = await M.get("/api/refresh/token", {
       params: {
         grant_type: "refresh_token",
         refresh_token: b("refresh_token")
@@ -132,6 +132,7 @@ async function M(e) {
         ...t
       }
     });
+    B(o.data);
   })().finally(() => {
     p = null;
   }), await p), e);
@@ -145,9 +146,9 @@ const U = $.create({
     return N.stringify(e, { arrayFormat: "brackets" });
   }
 });
-U.interceptors.request.use(M);
-U.interceptors.request.use(S, A);
-U.interceptors.response.use(H, A);
+U.interceptors.request.use(J);
+U.interceptors.request.use(z, A);
+U.interceptors.response.use(j, A);
 export {
   U as default
 };

package/dist/interceptors/refreshToken.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refreshToken.d.ts","sourceRoot":"","sources":["../../src/interceptors/refreshToken.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,0BAA0B,EAAE,MAAM,OAAO,CAAC;AAY1D,wBAA8B,YAAY,CACxC,MAAM,EAAE,0BAA0B,4CA0BnC"}
+{"version":3,"file":"refreshToken.d.ts","sourceRoot":"","sources":["../../src/interceptors/refreshToken.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,0BAA0B,EAAE,MAAM,OAAO,CAAC;AAY1D,wBAA8B,YAAY,CACxC,MAAM,EAAE,0BAA0B,4CA2BnC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ichaingo/request",
-  "version": "1.2.9",
+  "version": "1.3.0",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -22,8 +22,8 @@
     "js-cookie": "3.0.5",
     "next": "^15.4.5",
     "qs": "6.14.0",
-    "@ichaingo/logger": "1.2.9",
-    "@ichaingo/token": "1.2.9"
+    "@ichaingo/logger": "1.3.0",
+    "@ichaingo/token": "1.3.0"
   },
   "devDependencies": {
     "@types/js-cookie": "^3.0.6",