@0xchain/token 1.1.0-beta.34 → 1.1.0-beta.36

package/dist/index.d.ts

@@ -8,6 +8,8 @@ import { ITokenManager, ITokenManagerResponse } from './type';
  */
 export declare const setToken: (res: ITokenManagerResponse, response?: NextResponse | null) => NextResponse | null;
 export declare const getToken: (key?: string) => string;
+/** 兼容 OAuth 直出与 { data: token } 包装 */
+export declare function normalizeTokenPayload(res: unknown): ITokenManagerResponse | null;
 export declare const removeAllToken: () => void;
 export declare const isTokenExpired: () => Promise<boolean>;
 declare const TokenManager: ITokenManager;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AA+C9D;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,GAAI,KAAK,qBAAqB,EAAE,WAAW,YAAY,GAAG,IAAI,KAAG,YAAY,GAAG,IAyCpG,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,MAAM,MAAM,WAEpC,CAAA;AAED,eAAO,MAAM,cAAc,YAM1B,CAAA;AAID,eAAO,MAAM,cAAc,wBAiC1B,CAAA;AACD,QAAA,MAAM,YAAY,EAAE,aAMnB,CAAA;AACD,eAAe,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AA+C9D;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,GAAI,KAAK,qBAAqB,EAAE,WAAW,YAAY,GAAG,IAAI,KAAG,YAAY,GAAG,IAyCpG,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,MAAM,MAAM,WAEpC,CAAA;AAED,sCAAsC;AACtC,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,OAAO,GACX,qBAAqB,GAAG,IAAI,CAc9B;AAED,eAAO,MAAM,cAAc,YAM1B,CAAA;AAID,eAAO,MAAM,cAAc,wBA2C1B,CAAA;AACD,QAAA,MAAM,YAAY,EAAE,aAMnB,CAAA;AAED,eAAe,YAAY,CAAA"}

package/dist/index.js

@@ -82,6 +82,21 @@ const setToken = (res, response) => {
 const getToken = (key) => {
   return Cookies.get(key || "id_token") || "";
 };
+function normalizeTokenPayload(res) {
+  if (!res || typeof res !== "object") return null;
+  const payload = res;
+  if (typeof payload.access_token === "string") {
+    return payload;
+  }
+  const nested = payload.data;
+  if (nested && typeof nested === "object") {
+    const data = nested;
+    if (typeof data.access_token === "string") {
+      return data;
+    }
+  }
+  return null;
+}
 const removeAllToken = () => {
   Cookies.remove("id_token", { path: COOKIE_PATH, domain: COOKIE_DOMAIN });
   Cookies.remove("access_token", { path: COOKIE_PATH, domain: COOKIE_DOMAIN });
@@ -95,12 +110,14 @@ const removeTokenByKey = (key) => {
 const isTokenExpired = async () => {
   let t;
   let refreshToken;
+  let accessToken;
   if (process.env.IS_SERVER) {
     try {
       const { cookies } = await import("next/headers");
       const cookieStore = await cookies();
       const tokenExpire = cookieStore.get("token_expire")?.value;
       refreshToken = cookieStore.get("refresh_token")?.value;
+      accessToken = cookieStore.get("access_token")?.value;
       t = tokenExpire ? Number(tokenExpire) : void 0;
     } catch {
       return false;
@@ -109,14 +126,22 @@ const isTokenExpired = async () => {
     const rawExpire = Cookies.get("token_expire");
     t = rawExpire ? Number(rawExpire) : void 0;
     refreshToken = Cookies.get("refresh_token");
+    accessToken = Cookies.get("access_token");
   }
-  if (refreshToken && (!t || Number.isNaN(t))) {
-    return true;
-  } else if (t && t - Date.now() < 5 * 60 * 1e3) {
-    return true;
-  } else {
+  const nearExpiry = (expireAt) => expireAt - Date.now() < 5 * 60 * 1e3;
+  if (accessToken) {
+    if (t && !Number.isNaN(t)) {
+      return nearExpiry(t);
+    }
     return false;
   }
+  if (refreshToken) {
+    return true;
+  }
+  if (t && !Number.isNaN(t)) {
+    return nearExpiry(t);
+  }
+  return false;
 };
 const TokenManager = {
   setToken,
@@ -129,6 +154,7 @@ export {
   TokenManager as default,
   getToken,
   isTokenExpired,
+  normalizeTokenPayload,
   removeAllToken,
   setToken
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xchain/token",
-  "version": "1.1.0-beta.34",
+  "version": "1.1.0-beta.36",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",