@0xchain/request 1.1.0-beta.35 → 1.1.0-beta.36

package/dist/index.js

@@ -1,6 +1,6 @@
 import axios, { isAxiosError, AxiosError } from "axios";
 import qs from "qs";
-import jsCookie from "js-cookie";
+import Cookies from "js-cookie";
 import { logger } from "@0xchain/logger";
 import TokenManager, { isTokenExpired, getToken, removeAllToken, setToken } from "@0xchain/token";
 const isSimplifiedChinese = () => {
@@ -76,8 +76,8 @@ async function commonHeader(config) {
       }
     }
   } else {
-    access_token = jsCookie.get("access_token") || "";
-    language = jsCookie.get("NEXT_LOCALE") || matchSystemLanguage() || "en";
+    access_token = Cookies.get("access_token") || "";
+    language = Cookies.get("NEXT_LOCALE") || matchSystemLanguage() || "en";
   }
   const isRefreshToken = config.headers?.["isRefreshToken"];
   setHeader(config, "Accept-Language", language);
@@ -244,6 +244,15 @@ function ResponseInterceptor(response) {
   }
   return response;
 }
+function setAuthHeader(config, accessToken) {
+  const value = `Bearer ${accessToken}`;
+  const h = config.headers;
+  if (h?.set && typeof h.set === "function") {
+    h.set("Authorization", value);
+  } else {
+    h.Authorization = value;
+  }
+}
 let refreshPromise = null;
 const axiosInstance$1 = axios.create({
   baseURL: process.env.AUTH_INNER_API_URL || process.env.NEXT_PUBLIC_AUTH_URL,
@@ -264,6 +273,10 @@ async function refreshToken(config) {
   const headers = config.headers;
   if (refreshPromise) {
     await refreshPromise;
+    const accessAfterWait = Cookies.get("access_token") || getToken("access_token");
+    if (accessAfterWait) {
+      setAuthHeader(config, accessAfterWait);
+    }
     return config;
   }
   let expired = false;
@@ -280,6 +293,10 @@ async function refreshToken(config) {
     }
     if (refreshPromise) {
       await refreshPromise;
+      const accessAfterWait = Cookies.get("access_token") || getToken("access_token");
+      if (accessAfterWait) {
+        setAuthHeader(config, accessAfterWait);
+      }
       return config;
     }
     const refreshHeaders = { ...headers };
@@ -309,6 +326,10 @@ async function refreshToken(config) {
       refreshPromise = null;
     });
     await refreshPromise;
+    const accessAfterRefresh = Cookies.get("access_token") || getToken("access_token");
+    if (accessAfterRefresh) {
+      setAuthHeader(config, accessAfterRefresh);
+    }
   }
   return config;
 }

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,4CAsEnC"}
+{"version":3,"file":"refreshToken.d.ts","sourceRoot":"","sources":["../../src/interceptors/refreshToken.ts"],"names":[],"mappings":"AAAA,OAAc,EAAoB,0BAA0B,EAAE,MAAM,OAAO,CAAC;AAuB5E,wBAA8B,YAAY,CACxC,MAAM,EAAE,0BAA0B,4CAkFnC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xchain/request",
-  "version": "1.1.0-beta.35",
+  "version": "1.1.0-beta.36",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -18,22 +18,22 @@
     "!**/*.tsbuildinfo"
   ],
   "peerDependencies": {
-    "axios": "1.13.2",
-    "js-cookie": "3.0.5",
-    "next": "16.1.6",
-    "qs": "6.14.0"
+    "axios": "catalog:",
+    "js-cookie": "catalog:",
+    "next": "catalog:",
+    "qs": "catalog:"
   },
   "devDependencies": {
-    "@types/js-cookie": "3.0.6",
-    "@types/qs": "6.14.0",
-    "axios": "1.13.2",
-    "js-cookie": "3.0.5",
-    "next": "16.1.6",
-    "qs": "6.14.0"
+    "@types/js-cookie": "catalog:",
+    "@types/qs": "catalog:",
+    "axios": "catalog:",
+    "js-cookie": "catalog:",
+    "next": "catalog:",
+    "qs": "catalog:"
   },
   "dependencies": {
-    "@0xchain/logger": "1.1.0-beta.35",
-    "@0xchain/token": "1.1.0-beta.35"
+    "@0xchain/logger": "workspace:*",
+    "@0xchain/token": "workspace:*"
   },
   "nx": {
     "tags": [
@@ -43,4 +43,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024-present 0xchain
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.