@0xchain/token 1.1.0-beta.6 → 1.1.0-beta.60

package/LICENSE

@@ -0,0 +1,21 @@
+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.

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;AAqC9D;;;;;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,wBAgC1B,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

@@ -1,92 +1,160 @@
-import n from "js-cookie";
-const o = ".ichatgo.ai", t = "/", s = "lax", c = process.env.NODE_ENV === "production", x = (e) => {
-  n.set("access_token", e == null ? void 0 : e.access_token, {
-    expires: Date.now() + (e == null ? void 0 : e.expires_in) * 1e3,
-    domain: o,
-    sameSite: s,
-    secure: c,
-    path: t
-  }), n.set("refresh_token", e == null ? void 0 : e.refresh_token, {
-    expires: 3600 * 24 * 7,
-    domain: o,
-    sameSite: s,
-    secure: c,
-    path: t
-  }), n.set("id_token", e == null ? void 0 : e.id_token, {
-    expires: Date.now() + (e == null ? void 0 : e.expires_in) * 1e3,
-    domain: o,
-    sameSite: s,
-    secure: c,
-    path: t
-  }), n.set("token_expire", (Date.now() + (e == null ? void 0 : e.expires_in) * 1e3).toString(), {
-    expires: Date.now() + (e == null ? void 0 : e.expires_in) * 1e3,
-    domain: o,
-    sameSite: s,
-    secure: c,
-    path: t
+import Cookies from "js-cookie";
+const COOKIE_DOMAIN = ".ichatgo.ai";
+const COOKIE_PATH = "/";
+const COOKIE_SAME_SITE = "lax";
+const COOKIE_SECURE = process.env.NODE_ENV === "production";
+const REFRESH_TOKEN_COOKIE_DAYS = 7;
+function expiresFromSeconds(seconds) {
+  return new Date(Date.now() + Math.max(seconds, 0) * 1e3);
+}
+const cookieSetToken = (data) => {
+  const expiresIn = data?.expires_in ?? 3600;
+  const accessExpires = expiresFromSeconds(expiresIn);
+  Cookies.set("access_token", data?.access_token, {
+    expires: accessExpires,
+    domain: COOKIE_DOMAIN,
+    sameSite: COOKIE_SAME_SITE,
+    secure: COOKIE_SECURE,
+    path: COOKIE_PATH
   });
-}, l = (e, i) => {
-  if (i)
-    i.cookies.set("access_token", e == null ? void 0 : e.access_token, {
-      httpOnly: !1,
-      maxAge: e == null ? void 0 : e.expires_in,
-      domain: o,
-      sameSite: s,
-      secure: c,
-      path: t
-    }), i.cookies.set("refresh_token", e == null ? void 0 : e.refresh_token, {
-      httpOnly: !1,
-      maxAge: 3600 * 24 * 7,
-      domain: o,
-      sameSite: s,
-      secure: c,
-      path: t
-    }), i.cookies.set("id_token", e == null ? void 0 : e.id_token, {
-      httpOnly: !1,
-      maxAge: e == null ? void 0 : e.expires_in,
-      domain: o,
-      sameSite: s,
-      secure: c,
-      path: t
-    }), i.cookies.set("token_expire", (Date.now() + (e == null ? void 0 : e.expires_in) * 1e3).toString(), {
-      httpOnly: !1,
-      maxAge: e == null ? void 0 : e.expires_in,
-      domain: o,
-      sameSite: s,
-      secure: c,
-      path: t
+  Cookies.set("refresh_token", data?.refresh_token, {
+    expires: REFRESH_TOKEN_COOKIE_DAYS,
+    domain: COOKIE_DOMAIN,
+    sameSite: COOKIE_SAME_SITE,
+    secure: COOKIE_SECURE,
+    path: COOKIE_PATH
+  });
+  Cookies.set("id_token", data?.id_token, {
+    expires: accessExpires,
+    domain: COOKIE_DOMAIN,
+    sameSite: COOKIE_SAME_SITE,
+    secure: COOKIE_SECURE,
+    path: COOKIE_PATH
+  });
+  Cookies.set("token_expire", (Date.now() + expiresIn * 1e3).toString(), {
+    expires: accessExpires,
+    domain: COOKIE_DOMAIN,
+    sameSite: COOKIE_SAME_SITE,
+    secure: COOKIE_SECURE,
+    path: COOKIE_PATH
+  });
+};
+const setToken = (res, response) => {
+  if (!response) {
+    cookieSetToken(res);
+    return null;
+  } else {
+    response.cookies.set("access_token", res?.access_token, {
+      httpOnly: false,
+      maxAge: res?.expires_in,
+      domain: COOKIE_DOMAIN,
+      sameSite: COOKIE_SAME_SITE,
+      secure: COOKIE_SECURE,
+      path: COOKIE_PATH
+    });
+    response.cookies.set("refresh_token", res?.refresh_token, {
+      httpOnly: false,
+      maxAge: 60 * 60 * 24 * 7,
+      domain: COOKIE_DOMAIN,
+      sameSite: COOKIE_SAME_SITE,
+      secure: COOKIE_SECURE,
+      path: COOKIE_PATH
+    });
+    response.cookies.set("id_token", res?.id_token, {
+      httpOnly: false,
+      maxAge: res?.expires_in,
+      domain: COOKIE_DOMAIN,
+      sameSite: COOKIE_SAME_SITE,
+      secure: COOKIE_SECURE,
+      path: COOKIE_PATH
+    });
+    response.cookies.set("token_expire", (Date.now() + res?.expires_in * 1e3).toString(), {
+      httpOnly: false,
+      maxAge: res?.expires_in,
+      domain: COOKIE_DOMAIN,
+      sameSite: COOKIE_SAME_SITE,
+      secure: COOKIE_SECURE,
+      path: COOKIE_PATH
     });
-  else
-    return x(e), null;
-  return i;
-}, u = (e) => n.get(e || "id_token") || "", f = () => {
-  n.remove("id_token", { path: t, domain: o }), n.remove("access_token", { path: t, domain: o }), n.remove("refresh_token", { path: t, domain: o }), n.remove("sign_session", { domain: o }), n.remove("token_expire", { path: t, domain: o });
-}, S = (e) => {
-  n.remove(e || "id_token", { path: t, domain: o });
-}, g = async () => {
-  var k, r;
-  let e, i;
-  if (process.env.IS_SERVER)
+  }
+  return 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 });
+  Cookies.remove("refresh_token", { path: COOKIE_PATH, domain: COOKIE_DOMAIN });
+  Cookies.remove(`sign_session`, { domain: COOKIE_DOMAIN });
+  Cookies.remove("token_expire", { path: COOKIE_PATH, domain: COOKIE_DOMAIN });
+};
+const removeTokenByKey = (key) => {
+  Cookies.remove(key || "id_token", { path: COOKIE_PATH, domain: COOKIE_DOMAIN });
+};
+const isTokenExpired = async () => {
+  let t;
+  let refreshToken;
+  let accessToken;
+  if (process.env.IS_SERVER) {
     try {
-      const { cookies: p } = await import("./headers-tT97v9z0.js").then((h) => h.h), _ = await p(), m = (k = _.get("token_expire")) == null ? void 0 : k.value;
-      i = (r = _.get("refresh_token")) == null ? void 0 : r.value, e = m ? Number(m) : void 0;
+      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 !1;
+      return false;
+    }
+  } else {
+    const rawExpire = Cookies.get("token_expire");
+    t = rawExpire ? Number(rawExpire) : void 0;
+    refreshToken = Cookies.get("refresh_token");
+    accessToken = Cookies.get("access_token");
+  }
+  const nearExpiry = (expireAt) => expireAt - Date.now() < 5 * 60 * 1e3;
+  if (accessToken) {
+    if (t && !Number.isNaN(t)) {
+      return nearExpiry(t);
     }
-  else
-    e = Number(n.get("token_expire")), i = n.get("refresh_token");
-  return !e && i ? !0 : !!(e && e - Date.now() < 300 * 1e3);
-}, O = {
-  setToken: l,
-  getToken: u,
-  removeAllToken: f,
-  removeTokenByKey: S,
-  isTokenExpired: g
+    return false;
+  }
+  if (refreshToken) {
+    return true;
+  }
+  if (t && !Number.isNaN(t)) {
+    return nearExpiry(t);
+  }
+  return false;
+};
+const TokenManager = {
+  setToken,
+  getToken,
+  removeAllToken,
+  removeTokenByKey,
+  isTokenExpired
 };
 export {
-  O as default,
-  u as getToken,
-  g as isTokenExpired,
-  f as removeAllToken,
-  l as setToken
+  TokenManager as default,
+  getToken,
+  isTokenExpired,
+  normalizeTokenPayload,
+  removeAllToken,
+  setToken
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xchain/token",
-  "version": "1.1.0-beta.6",
+  "version": "1.1.0-beta.60",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -17,13 +17,19 @@
     "dist",
     "!**/*.tsbuildinfo"
   ],
+  "peerDependencies": {
+    "js-cookie": "3.0.5",
+    "next": "16.1.6"
+  },
   "devDependencies": {
     "@types/js-cookie": "3.0.6",
-    "@types/next": "9.0.0"
-  },
-  "dependencies": {
     "js-cookie": "3.0.5",
-    "next": "15.5.6"
+    "next": "16.1.6"
+  },
+  "nx": {
+    "tags": [
+      "type:util"
+    ]
   },
   "publishConfig": {
     "access": "public"