@opexa/portal-sdk 0.59.96 → 0.59.97

package/dist/index.js

@@ -394,6 +394,7 @@ var SessionManager = class {
   v4AccessToken = null;
   v4AccessTokenExpiresAt = null;
   v4RefreshPromise = null;
+  invalidReason = null;
   refreshTokenStore;
   constructor(config) {
     this.authService = config.authService;
@@ -425,6 +426,7 @@ var SessionManager = class {
       }
       this.v4AccessToken = data.accessToken;
       this.v4AccessTokenExpiresAt = addMinutes(now, 4).getTime();
+      this.invalidReason = null;
       if (data.refreshToken) {
         await this.refreshTokenStore.set(data.refreshToken);
       }
@@ -434,6 +436,7 @@ var SessionManager = class {
       );
       return true;
     }
+    this.invalidReason = null;
     localStorage.setItem(
       this.storageKey,
       JSON.stringify({
@@ -659,6 +662,20 @@ var SessionManager = class {
       };
     }
   }
+  async getV4(session) {
+    const now = /* @__PURE__ */ new Date();
+    if (this.v4AccessToken && this.v4AccessTokenExpiresAt && !isAfter(now, new Date(this.v4AccessTokenExpiresAt))) {
+      return {
+        ok: true,
+        data: {
+          session,
+          accessToken: this.v4AccessToken,
+          accessTokenExpiresAt: this.v4AccessTokenExpiresAt
+        }
+      };
+    }
+    return await this.refreshV4(session);
+  }
   async refresh() {
     if (this.isServer) {
       this.logger.warn("'localStorage' is not available on the server.");
@@ -728,20 +745,6 @@ var SessionManager = class {
       };
     }
   }
-  async getV4(session) {
-    const now = /* @__PURE__ */ new Date();
-    if (this.v4AccessToken && this.v4AccessTokenExpiresAt && !isAfter(now, new Date(this.v4AccessTokenExpiresAt))) {
-      return {
-        ok: true,
-        data: {
-          session,
-          accessToken: this.v4AccessToken,
-          accessTokenExpiresAt: this.v4AccessTokenExpiresAt
-        }
-      };
-    }
-    return await this.refreshV4(session);
-  }
   async refreshV4(session) {
     if (this.v4RefreshPromise) return await this.v4RefreshPromise;
     this.v4RefreshPromise = this.requestV4Refresh(session);
@@ -760,6 +763,8 @@ var SessionManager = class {
         this.logger.warn("No stored refresh token. Session expired.");
         this.v4AccessToken = null;
         this.v4AccessTokenExpiresAt = null;
+        this.invalidReason = "REFRESH_TOKEN_EXPIRED";
+        localStorage.removeItem(this.storageKey);
         return {
           ok: false,
           error: {
@@ -771,20 +776,25 @@ var SessionManager = class {
     }
     this.refreshing = true;
     const res = await this.authService.refreshSession(refreshToken, 4);
-    this.refreshing = false;
     if (!res.ok) {
       this.logger.error(`Failed to refresh session: ${res.error.message}`);
-      if (res.error.name === "InvalidTokenError" || res.error.name === "AccountBlacklistedError" || res.error.name === "VerificationLockedError" || res.error.name === "SessionExpiredError") {
+      const terminal = res.error.name === "InvalidTokenError" || res.error.name === "AccountBlacklistedError" || res.error.name === "VerificationLockedError" || res.error.name === "SessionExpiredError";
+      if (terminal) {
         this.v4AccessToken = null;
         this.v4AccessTokenExpiresAt = null;
-        await this.refreshTokenStore.remove();
+        this.invalidReason = res.error.name === "SessionExpiredError" ? "REFRESH_TOKEN_EXPIRED" : "INVALID_SESSION";
+        localStorage.removeItem(this.storageKey);
       }
+      this.refreshing = false;
+      if (terminal) await this.refreshTokenStore.remove();
       return {
         ok: false,
         error: res.error
       };
     }
+    this.refreshing = false;
     this.logger.success("Session refreshed!");
+    this.invalidReason = null;
     if (res.data.refreshToken) {
       await this.refreshTokenStore.set(res.data.refreshToken);
     }
@@ -820,6 +830,7 @@ var SessionManager = class {
     }
     this.v4AccessToken = null;
     this.v4AccessTokenExpiresAt = null;
+    this.invalidReason = null;
     await this.refreshTokenStore.remove();
     localStorage.removeItem(this.storageKey);
   }
@@ -828,6 +839,9 @@ var SessionManager = class {
       this.logger.warn("'localStorage' is not available on the server.");
       return { valid: true };
     }
+    if (this.invalidReason) {
+      return { valid: false, reason: this.invalidReason };
+    }
     const val = localStorage.getItem(this.storageKey);
     if (val) {
       try {
@@ -842,11 +856,13 @@ var SessionManager = class {
     }
     const s = await this.get();
     if (s.error?.name === "InvalidTokenError" || s.error?.name === "SessionExpiredError" || s.error?.name === "AccountBlacklistedError") {
+      this.invalidReason = "INVALID_SESSION";
       return { valid: false, reason: "INVALID_SESSION" };
     }
     if (!s.data) return { valid: true };
     const v = await this.authService.verifySession(s.data.accessToken);
     if (!v) {
+      this.invalidReason = "INVALID_SESSION";
       localStorage.removeItem(this.storageKey);
     }
     return v ? { valid: true } : { valid: false, reason: "INVALID_SESSION" };
@@ -854,16 +870,16 @@ var SessionManager = class {
   async verifyV4(session) {
     if (!this.v4AccessToken || !this.v4AccessTokenExpiresAt || isAfter(/* @__PURE__ */ new Date(), new Date(this.v4AccessTokenExpiresAt))) {
       const res = await this.refreshV4(session);
-      return res.ok ? { valid: true } : {
-        valid: false,
-        reason: res.error.name === "SessionExpiredError" ? "REFRESH_TOKEN_EXPIRED" : "INVALID_SESSION"
-      };
+      if (res.ok) return { valid: true };
+      if (!this.invalidReason) return { valid: true };
+      return { valid: false, reason: this.invalidReason };
     }
     const v = await this.authService.verifySession(this.v4AccessToken);
     if (!v) {
       localStorage.removeItem(this.storageKey);
       this.v4AccessToken = null;
       this.v4AccessTokenExpiresAt = null;
+      this.invalidReason = "INVALID_SESSION";
       await this.refreshTokenStore.remove();
     }
     return v ? { valid: true } : { valid: false, reason: "INVALID_SESSION" };
@@ -901,6 +917,7 @@ var SessionManagerCookie = class {
   v4AccessToken = null;
   v4AccessTokenExpiresAt = null;
   v4RefreshPromise = null;
+  invalidReason = null;
   refreshTokenStore;
   constructor(config) {
     this.authService = config.authService;
@@ -916,6 +933,7 @@ var SessionManagerCookie = class {
   }
   async persist(data, version) {
     const now = /* @__PURE__ */ new Date();
+    this.invalidReason = null;
     if (version === 4) {
       this.v4AccessToken = data.accessToken ?? null;
       this.v4AccessTokenExpiresAt = addMinutes(now, 5).getTime();
@@ -1131,6 +1149,20 @@ var SessionManagerCookie = class {
       };
     }
   }
+  async getV4(session) {
+    const now = /* @__PURE__ */ new Date();
+    if (this.v4AccessToken && this.v4AccessTokenExpiresAt && !isAfter(now, new Date(this.v4AccessTokenExpiresAt))) {
+      return {
+        ok: true,
+        data: {
+          session,
+          accessToken: this.v4AccessToken,
+          accessTokenExpiresAt: this.v4AccessTokenExpiresAt
+        }
+      };
+    }
+    return await this.refreshV4(session);
+  }
   async refresh() {
     if (this.isServer) {
       this.logger.warn("'client cookies' is not available on the server.");
@@ -1202,20 +1234,6 @@ var SessionManagerCookie = class {
       };
     }
   }
-  async getV4(session) {
-    const now = /* @__PURE__ */ new Date();
-    if (this.v4AccessToken && this.v4AccessTokenExpiresAt && !isAfter(now, new Date(this.v4AccessTokenExpiresAt))) {
-      return {
-        ok: true,
-        data: {
-          session,
-          accessToken: this.v4AccessToken,
-          accessTokenExpiresAt: this.v4AccessTokenExpiresAt
-        }
-      };
-    }
-    return await this.refreshV4(session);
-  }
   async refreshV4(session) {
     if (this.v4RefreshPromise) return await this.v4RefreshPromise;
     this.v4RefreshPromise = this.requestV4Refresh(session);
@@ -1234,6 +1252,8 @@ var SessionManagerCookie = class {
         this.logger.warn("No stored refresh token. Session expired.");
         this.v4AccessToken = null;
         this.v4AccessTokenExpiresAt = null;
+        this.invalidReason = "REFRESH_TOKEN_EXPIRED";
+        cookies.remove(this.storageKey);
         return {
           ok: false,
           error: {
@@ -1245,20 +1265,25 @@ var SessionManagerCookie = class {
     }
     this.refreshing = true;
     const res = await this.authService.refreshSession(refreshToken, 4);
-    this.refreshing = false;
     if (!res.ok) {
       this.logger.error(`Failed to refresh session: ${res.error.message}`);
-      if (res.error.name === "InvalidTokenError" || res.error.name === "AccountBlacklistedError" || res.error.name === "VerificationLockedError" || res.error.name === "SessionExpiredError") {
+      const terminal = res.error.name === "InvalidTokenError" || res.error.name === "AccountBlacklistedError" || res.error.name === "VerificationLockedError" || res.error.name === "SessionExpiredError";
+      if (terminal) {
         this.v4AccessToken = null;
         this.v4AccessTokenExpiresAt = null;
-        await this.refreshTokenStore.remove();
+        this.invalidReason = res.error.name === "SessionExpiredError" ? "REFRESH_TOKEN_EXPIRED" : "INVALID_SESSION";
+        cookies.remove(this.storageKey);
       }
+      this.refreshing = false;
+      if (terminal) await this.refreshTokenStore.remove();
       return {
         ok: false,
         error: res.error
       };
     }
+    this.refreshing = false;
     this.logger.success("Session refreshed!");
+    this.invalidReason = null;
     if (res.data.refreshToken) {
       await this.refreshTokenStore.set(res.data.refreshToken);
     }
@@ -1294,6 +1319,7 @@ var SessionManagerCookie = class {
     }
     this.v4AccessToken = null;
     this.v4AccessTokenExpiresAt = null;
+    this.invalidReason = null;
     await this.refreshTokenStore.remove();
     cookies.remove(this.storageKey);
   }
@@ -1302,6 +1328,9 @@ var SessionManagerCookie = class {
       this.logger.warn("'client cookies' is not available on the server.");
       return { valid: true };
     }
+    if (this.invalidReason) {
+      return { valid: false, reason: this.invalidReason };
+    }
     const val = cookies.get(this.storageKey);
     if (val) {
       try {
@@ -1316,11 +1345,13 @@ var SessionManagerCookie = class {
     }
     const s = await this.get();
     if (s.error?.name === "InvalidTokenError" || s.error?.name === "SessionExpiredError" || s.error?.name === "AccountBlacklistedError") {
+      this.invalidReason = "INVALID_SESSION";
       return { valid: false, reason: "INVALID_SESSION" };
     }
     if (!s.data) return { valid: true };
     const v = await this.authService.verifySession(s.data.accessToken);
     if (!v) {
+      this.invalidReason = "INVALID_SESSION";
       cookies.remove(this.storageKey);
     }
     return v ? { valid: true } : { valid: false, reason: "INVALID_SESSION" };
@@ -1328,16 +1359,16 @@ var SessionManagerCookie = class {
   async verifyV4(session) {
     if (!this.v4AccessToken || !this.v4AccessTokenExpiresAt || isAfter(/* @__PURE__ */ new Date(), new Date(this.v4AccessTokenExpiresAt))) {
       const res = await this.refreshV4(session);
-      return res.ok ? { valid: true } : {
-        valid: false,
-        reason: res.error.name === "SessionExpiredError" ? "REFRESH_TOKEN_EXPIRED" : "INVALID_SESSION"
-      };
+      if (res.ok) return { valid: true };
+      if (!this.invalidReason) return { valid: true };
+      return { valid: false, reason: this.invalidReason };
     }
     const v = await this.authService.verifySession(this.v4AccessToken);
     if (!v) {
       cookies.remove(this.storageKey);
       this.v4AccessToken = null;
       this.v4AccessTokenExpiresAt = null;
+      this.invalidReason = "INVALID_SESSION";
       await this.refreshTokenStore.remove();
     }
     return v ? { valid: true } : { valid: false, reason: "INVALID_SESSION" };
@@ -3643,9 +3674,18 @@ var Sdk = class {
     let counter = 0;
     let timeout = null;
     let isForeground = true;
+    let stopped = false;
     const listener = App.addListener("appStateChange", ({ isActive }) => {
       isForeground = isActive;
     });
+    const stop = () => {
+      stopped = true;
+      if (timeout) {
+        clearTimeout(timeout);
+        timeout = null;
+      }
+      listener.then((handle) => handle.remove());
+    };
     const assignTimeout = () => {
       const duration = counter <= 0 ? interval * 0.5 : interval;
       return setTimeout(async () => {
@@ -3654,10 +3694,13 @@ var Sdk = class {
           try {
             res = await this.sessionManager.verify();
           } catch {
-            res = { valid: false, reason: "INVALID_SESSION" };
+            res = null;
           }
-          if (!res.valid) {
+          if (stopped) return;
+          if (res && !res.valid) {
+            stop();
             await input.onInvalid(res.reason ?? "INVALID_SESSION");
+            return;
           }
         }
         counter += 1;
@@ -3666,10 +3709,7 @@ var Sdk = class {
     };
     timeout = assignTimeout();
     return function unsubscribe() {
-      if (timeout) {
-        clearTimeout(timeout);
-      }
-      listener.then((handle) => handle.remove());
+      stop();
     };
   }
   async session() {