@singularlogic/coreplatts 0.0.2 → 0.0.4

package/dist/index.js

@@ -272,16 +272,30 @@ var BucketConsumer = class extends BaseConsumer {
 function withValidToken(fn, accountsAPI) {
   return function(...args) {
     return __async(this, null, function* () {
-      const isStorageAvailable = typeof localStorage !== "undefined";
-      const now = Math.floor(Date.now() / 1e3);
-      if (!isStorageAvailable) {
-        console.warn("\u26A0\uFE0F localStorage not available. You must pass token manually.");
+      var _a;
+      const isBrowser = typeof window !== "undefined";
+      const storage = isBrowser ? (_a = window.sessionStorage) != null ? _a : window.localStorage : void 0;
+      if (!storage) {
+        console.warn("\u26A0\uFE0F sessionStorage or localStorage not available. You must pass token manually.");
         return Promise.resolve(fn.apply(this, args));
       }
-      let token = localStorage.getItem("token");
-      const refreshToken = localStorage.getItem("refresh_token");
-      const exp = Number(localStorage.getItem("exp") || "0");
-      const refreshExp = Number(localStorage.getItem("refresh_exp") || "0");
+      const now = Math.floor(Date.now() / 1e3);
+      let token = storage.getItem("access_token");
+      let refreshToken = storage.getItem("refresh_token");
+      let exp = Number(storage.getItem("exp") || "0");
+      let refreshExp = Number(storage.getItem("refresh_exp") || "0");
+      if ((!exp || !refreshExp) && storage.getItem("id_token_claims_obj")) {
+        try {
+          const claims = JSON.parse(storage.getItem("id_token_claims_obj"));
+          if (claims.exp) exp = claims.exp;
+          if (claims.iat && claims.exp) {
+            const estimatedDuration = claims.exp - claims.iat;
+            refreshExp = claims.iat + 3 * estimatedDuration;
+          }
+        } catch (err) {
+          console.warn("\u26A0\uFE0F Could not parse id_token_claims_obj:", err);
+        }
+      }
       if (!token || now >= exp) {
         if (!refreshToken || now >= refreshExp) {
           console.warn("\u26A0\uFE0F Session expired. Please log in again.");
@@ -297,10 +311,10 @@ function withValidToken(fn, accountsAPI) {
           const session = yield response.json();
           const newExp = now + session.expires_in;
           const newRefreshExp = now + session.refresh_expires_in;
-          localStorage.setItem("token", session.access_token);
-          localStorage.setItem("refresh_token", session.refresh_token);
-          localStorage.setItem("exp", String(newExp));
-          localStorage.setItem("refresh_exp", String(newRefreshExp));
+          storage.setItem("access_token", session.access_token);
+          storage.setItem("refresh_token", session.refresh_token);
+          storage.setItem("exp", String(newExp));
+          storage.setItem("refresh_exp", String(newRefreshExp));
           token = session.access_token;
         } catch (e) {
           console.error("\u{1F510} Token refresh failed:", e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@singularlogic/coreplatts",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [