@0xchain/token 1.1.0-beta.33 → 1.1.0-beta.35

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,eAAO,MAAM,cAAc,YAM1B,CAAA;AAID,eAAO,MAAM,cAAc,wBAiC1B,CAAA;AACD,QAAA,MAAM,YAAY,EAAE,aAMnB,CAAA;AACD,eAAe,YAAY,CAAA"}

package/dist/index.js

@@ -3,30 +3,36 @@ 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: Date.now() + data?.expires_in * 1e3,
+    expires: accessExpires,
     domain: COOKIE_DOMAIN,
     sameSite: COOKIE_SAME_SITE,
     secure: COOKIE_SECURE,
     path: COOKIE_PATH
   });
   Cookies.set("refresh_token", data?.refresh_token, {
-    expires: 60 * 60 * 24 * 7,
+    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: Date.now() + data?.expires_in * 1e3,
+    expires: accessExpires,
     domain: COOKIE_DOMAIN,
     sameSite: COOKIE_SAME_SITE,
     secure: COOKIE_SECURE,
     path: COOKIE_PATH
   });
-  Cookies.set("token_expire", (Date.now() + data?.expires_in * 1e3).toString(), {
-    expires: Date.now() + data?.expires_in * 1e3,
+  Cookies.set("token_expire", (Date.now() + expiresIn * 1e3).toString(), {
+    expires: accessExpires,
     domain: COOKIE_DOMAIN,
     sameSite: COOKIE_SAME_SITE,
     secure: COOKIE_SECURE,
@@ -100,10 +106,11 @@ const isTokenExpired = async () => {
       return false;
     }
   } else {
-    t = Number(Cookies.get("token_expire"));
+    const rawExpire = Cookies.get("token_expire");
+    t = rawExpire ? Number(rawExpire) : void 0;
     refreshToken = Cookies.get("refresh_token");
   }
-  if (!t && refreshToken) {
+  if (refreshToken && (!t || Number.isNaN(t))) {
     return true;
   } else if (t && t - Date.now() < 5 * 60 * 1e3) {
     return true;

package/package.json

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