@ichaingo/request 1.2.8 → 1.3.0

package/dist/index.js

@@ -1,10 +1,10 @@
-import x, { isAxiosError as C, AxiosError as A } from "axios";
-import $ from "qs";
-import N from "js-cookie";
-import { logger as _ } from "@ichaingo/logger";
-import O, { isTokenExpired as q, getToken as b } from "@ichaingo/token";
-const P = () => /^(zh-hans|zh-cn|zh-sg|zh-my)$/.test(window == null ? void 0 : window.navigator.language.toLowerCase()), B = () => P() ? "zh-hans" : "";
-async function S(e) {
+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, 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 = N.get("access_token") || "", o = N.get("NEXT_LOCALE") || B() || "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 H(e) {
-  var g, r, I, T, y, h, f, L, U, v, k;
-  const t = (r = (g = e.config) == null ? void 0 : g.method) == null ? void 0 : r.toUpperCase(), o = ((I = e.config) == null ? void 0 : I.baseURL) || "", i = (T = e.config) != null && T.url ? `${o || ""}${e.config.url}` : "", n = (y = e.response) == null ? void 0 : y.status, c = (h = e.response) == null ? void 0 : h.statusText, s = (f = e.response) == null ? void 0 : f.data, a = ((U = (L = e.response) == null ? void 0 : L.headers) == null ? void 0 : U["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 = [
+  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,
@@ -58,34 +58,34 @@ function E(e) {
     responseData: (r = e.response) == null ? void 0 : r.data
   };
 }
-function w(e) {
+function A(e) {
   var n, c, s, a;
-  const t = C(e) ? e : new A(String(e));
+  const t = C(e) ? e : new w(String(e));
   if (t.code === "ECONNABORTED" || /timeout/i.test(t.message || "")) {
     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)), _.error({ message: l, details: t.details, errType: "timeout" }), Promise.reject(t);
+    return t.summary = l, t.details = JSON.stringify(E(t)), R.error({ message: l, details: t.details, errType: "timeout" }), Promise.reject(t);
   }
   const i = H(t);
-  return t.summary = i, t.details = JSON.stringify(E(t)), _.error({ message: i, details: t.details, errType: "server error" }), Promise.reject(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 z(e) {
+function j(e) {
   var o, i, n, c, s, a, u, m, d, l;
   if (e.config.returnFullResponse)
     return e;
   if (e.status === 401)
-    return O.removeAllToken(), window.location.href = `${process.env.NEXT_PUBLIC_AUTH_URL}/login`, e;
+    return q.removeAllToken(), window.location.href = `${process.env.NEXT_PUBLIC_AUTH_URL}/login`, e;
   if (e.status === 200) {
     if ((o = e.headers["content-type"]) != null && o.includes("text/event-stream"))
       return e;
     const g = e.data, r = g.status;
     if (r && typeof r.code == "number" && ![0, 200].includes(r.code)) {
-      const I = new A(
+      const T = new w(
         (r == null ? void 0 : r.msg) || "Business error",
         String(r.code),
         e.config,
         e.request,
         e
-      ), T = `BIZ ${r.code} | ${(n = (i = e.config) == null ? void 0 : i.method) == null ? void 0 : n.toUpperCase()} | ${((c = e.config) == null ? void 0 : c.baseURL) || ""}${((s = e.config) == null ? void 0 : s.url) || ""} | server: ${r == null ? void 0 : r.msg}`, y = {
+      ), y = `BIZ ${r.code} | ${(n = (i = e.config) == null ? void 0 : i.method) == null ? void 0 : n.toUpperCase()} | ${((c = e.config) == null ? void 0 : c.baseURL) || ""}${((s = e.config) == null ? void 0 : s.url) || ""} | server: ${r == null ? void 0 : r.msg}`, L = {
         method: (u = (a = e.config) == null ? void 0 : a.method) == null ? void 0 : u.toUpperCase(),
         url: (m = e.config) != null && m.baseURL ? `${e.config.baseURL}${e.config.url || ""}` : e.config.url,
         params: (d = e.config) == null ? void 0 : d.params,
@@ -104,24 +104,26 @@ function z(e) {
         requestId: ((l = e.headers) == null ? void 0 : l["x-request-id"]) || (r == null ? void 0 : r.requestId),
         responseData: g
       };
-      throw process.env.NODE_ENV !== "development" && _.error({ summary: T, details: y, errType: "business error" }), I;
+      throw process.env.NODE_ENV !== "development" && R.error({ summary: y, details: L, errType: "business error" }), T;
     }
     return g;
   }
   return e;
 }
 let p = null;
-const j = x.create({
-  baseURL: process.env.ICHAINGO_INNER_API_URL || process.env.NEXT_PUBLIC_ICHAINGO_API_URL,
+const M = $.create({
+  baseURL: process.env.NEXT_PUBLIC_AUTH_URL,
   timeout: 1e4,
+  withCredentials: !0,
+  // Always include credentials by default
   paramsSerializer: function(e) {
-    return $.stringify(e, { arrayFormat: "brackets" });
+    return N.stringify(e, { arrayFormat: "brackets" });
   }
 });
-async function M(e) {
+async function J(e) {
   const t = e.headers;
-  return p ? (await p, e) : (q() && (p = (async () => {
-    await j.get("/api/refresh/token", {
+  return p ? (await p, e) : (O() && (p = (async () => {
+    const o = await M.get("/api/refresh/token", {
       params: {
         grant_type: "refresh_token",
         refresh_token: b("refresh_token")
@@ -130,22 +132,23 @@ async function M(e) {
         ...t
       }
     });
+    B(o.data);
   })().finally(() => {
     p = null;
   }), await p), e);
 }
-const R = x.create({
+const U = $.create({
   baseURL: process.env.ICHAINGO_INNER_API_URL || process.env.NEXT_PUBLIC_ICHAINGO_API_URL,
   timeout: 1e4,
   withCredentials: !0,
   // Always include credentials by default
   paramsSerializer: function(e) {
-    return $.stringify(e, { arrayFormat: "brackets" });
+    return N.stringify(e, { arrayFormat: "brackets" });
   }
 });
-R.interceptors.request.use(M);
-R.interceptors.request.use(S, w);
-R.interceptors.response.use(z, w);
+U.interceptors.request.use(J);
+U.interceptors.request.use(z, A);
+U.interceptors.response.use(j, A);
 export {
-  R as default
+  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;AAW1D,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.8",
+  "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.8",
-    "@ichaingo/token": "1.2.8"
+    "@ichaingo/logger": "1.3.0",
+    "@ichaingo/token": "1.3.0"
   },
   "devDependencies": {
     "@types/js-cookie": "^3.0.6",