@opexa/portal-sdk 0.59.76 → 0.59.78

package/dist/index.cjs

@@ -4500,7 +4500,7 @@ var AuthService = class {
   }
   async createSession(input, version = 1) {
     const headers = new Headers(this.headers);
-    if (version === 3) {
+    if (version === 3 || version === 4) {
       const fingerprint = await getFingerPrint();
       if (fingerprint) {
         headers.append("Fingerprint", fingerprint);
@@ -4544,26 +4544,26 @@ var AuthService = class {
         body: JSON.stringify(input),
         ...version === 4 && { credentials: "include" }
       });
-      const data = await res.json();
+      const body = await res.json();
       if (res.ok) {
         return {
           ok: true,
-          data
+          data: version !== 1 ? body.data ?? body : body
         };
       }
-      if (data.code === "ACCOUNT_BLACKLISTED") {
+      if (body.code === "ACCOUNT_BLACKLISTED") {
         return {
           ok: false,
           error: createOperationError("AccountBlacklistedError")
         };
       }
-      if (data.code === "MEMBER_ACCOUNT_SUSPENDED") {
+      if (body.code === "MEMBER_ACCOUNT_SUSPENDED") {
         return {
           ok: false,
           error: createOperationError("AccountSuspendedError")
         };
       }
-      if (data.code === "INVALID_RECAPTCHA_RESPONSE") {
+      if (body.code === "INVALID_RECAPTCHA_RESPONSE") {
         return {
           ok: false,
           error: createOperationError("InvalidReCAPTCHAResponseError")
@@ -4629,29 +4629,35 @@ var AuthService = class {
     if (version !== 4) {
       headers.append("Authorization", `Bearer ${refreshToken}`);
     }
+    if (version === 3 || version === 4) {
+      const fingerprint = await getFingerPrint();
+      if (fingerprint) {
+        headers.append("Fingerprint", fingerprint);
+      }
+    }
     try {
       const res = await fetch(
-        `${this.url}${version === 4 ? "/v4/session/refresh" : "/session:refresh"}`,
+        `${this.url}${version !== 1 ? `/v${version}/session/refresh` : "/session:refresh"}`,
         {
           method: "POST",
           headers,
           ...version === 4 && { credentials: "include" }
         }
       );
-      const data = await res.json();
+      const body = await res.json();
       if (res.ok) {
         return {
           ok: true,
-          data
+          data: version !== 1 ? body.data ?? body : body
         };
       }
-      if (data.code === "ACCOUNT_BLACKLISTED") {
+      if (body.code === "ACCOUNT_BLACKLISTED") {
         return {
           ok: false,
           error: createOperationError("AccountBlacklistedError")
         };
       }
-      if (data.code === "MEMBER_ACCOUNT_SUSPENDED") {
+      if (body.code === "MEMBER_ACCOUNT_SUSPENDED") {
         return {
           ok: false,
           error: createOperationError("AccountSuspendedError")
@@ -4674,14 +4680,18 @@ var AuthService = class {
       };
     }
   }
-  async destroySession(accessToken) {
+  async destroySession(accessToken, version = 1) {
     const headers = new Headers(this.headers);
     headers.append("Authorization", `Bearer ${accessToken}`);
     try {
-      const res = await fetch(`${this.url}/session`, {
-        method: "DELETE",
-        headers
-      });
+      const res = await fetch(
+        `${this.url}${version !== 1 ? `/v${version}/session` : "/session"}`,
+        {
+          method: "DELETE",
+          headers,
+          ...version === 4 && { credentials: "include" }
+        }
+      );
       return res.ok ? { ok: true } : { ok: false, error: statusCodeToOperationError(res.status) };
     } catch {
       return { ok: false, error: statusCodeToOperationError(500) };
@@ -7459,9 +7469,18 @@ var SessionManagerCookie = class {
       this.logger.warn("'client cookies' is not available on the server.");
       return;
     }
+    let version = 1;
+    const val = cookies__default.default.get(this.storageKey);
+    if (val) {
+      try {
+        const stored = JSON.parse(val);
+        version = stored.version ?? 1;
+      } catch {
+      }
+    }
     const res = await this.get();
     if (res.data?.accessToken) {
-      await this.authService.destroySession(res.data.accessToken);
+      await this.authService.destroySession(res.data.accessToken, version);
     }
     this.v4AccessToken = null;
     this.v4AccessTokenExpiresAt = null;
@@ -7517,6 +7536,7 @@ var SessionManager = class {
    */
   v4AccessToken = null;
   v4AccessTokenExpiresAt = null;
+  v4RefreshPromise = null;
   constructor(config) {
     this.authService = config.authService;
     this.walletService = config.walletService;
@@ -7535,13 +7555,19 @@ var SessionManager = class {
   persist(data, version) {
     const now = /* @__PURE__ */ new Date();
     if (version === 4) {
-      this.v4AccessToken = data.accessToken ?? null;
+      if (!data.session || !data.accessToken) {
+        this.logger.error(
+          "Malformed session response: expected 'session' and 'accessToken'."
+        );
+        return false;
+      }
+      this.v4AccessToken = data.accessToken;
       this.v4AccessTokenExpiresAt = addMinutes(now, 5).getTime();
       localStorage.setItem(
         this.storageKey,
         JSON.stringify({ version, session: data.session })
       );
-      return;
+      return true;
     }
     localStorage.setItem(
       this.storageKey,
@@ -7552,6 +7578,16 @@ var SessionManager = class {
         refreshTokenExpiresAt: subMinutes(addDays(now, 30), 2).getTime()
       })
     );
+    return true;
+  }
+  malformedResponseError() {
+    return {
+      ok: false,
+      error: {
+        name: "UnknownError",
+        message: "Something went wrong."
+      }
+    };
   }
   async create(input, version = 1) {
     if (this.isServer) {
@@ -7589,7 +7625,7 @@ var SessionManager = class {
         maxAttempt: 5
       })();
       if (!r1.ok) return r1;
-      this.persist(r1.data, version);
+      if (!this.persist(r1.data, version)) return this.malformedResponseError();
       return {
         ok: true,
         data: null
@@ -7598,7 +7634,7 @@ var SessionManager = class {
     if (input.type === "MOBILE_NUMBER") {
       const res2 = await this.authService.createSession(input, version);
       if (res2.ok) {
-        this.persist(res2.data, version);
+        if (!this.persist(res2.data, version)) return this.malformedResponseError();
         return {
           ok: true,
           data: null
@@ -7616,7 +7652,7 @@ var SessionManager = class {
         version
       );
       if (res2.ok) {
-        this.persist(res2.data, version);
+        if (!this.persist(res2.data, version)) return this.malformedResponseError();
         return {
           ok: true,
           data: null
@@ -7628,7 +7664,7 @@ var SessionManager = class {
       localStorage.setItem(this.platformStorageKey, "CABINET");
       const res2 = await this.authService.createSession(input, version);
       if (res2.ok) {
-        this.persist(res2.data, version);
+        if (!this.persist(res2.data, version)) return this.malformedResponseError();
         return {
           ok: true,
           data: null
@@ -7646,7 +7682,7 @@ var SessionManager = class {
         }
       };
     }
-    this.persist(res.data, version);
+    if (!this.persist(res.data, version)) return this.malformedResponseError();
     return {
       ok: true,
       data: null
@@ -7657,8 +7693,8 @@ var SessionManager = class {
     if (res.ok) {
       if (this.isServer) {
         this.logger.warn("'localStorage' is not available on the server.");
-      } else {
-        this.persist(res.data, 1);
+      } else if (!this.persist(res.data, 1)) {
+        return this.malformedResponseError();
       }
       return { ok: true };
     } else {
@@ -7837,6 +7873,15 @@ var SessionManager = class {
     return await this.refreshV4(session);
   }
   async refreshV4(session) {
+    if (this.v4RefreshPromise) return await this.v4RefreshPromise;
+    this.v4RefreshPromise = this.requestV4Refresh(session);
+    try {
+      return await this.v4RefreshPromise;
+    } finally {
+      this.v4RefreshPromise = null;
+    }
+  }
+  async requestV4Refresh(session) {
     this.logger.info("Refreshing session...");
     this.refreshing = true;
     const res = await this.authService.refreshSession(void 0, 4);
@@ -7871,9 +7916,18 @@ var SessionManager = class {
       this.logger.warn("'localStorage' is not available on the server.");
       return;
     }
+    let version = 1;
+    const val = localStorage.getItem(this.storageKey);
+    if (val) {
+      try {
+        const stored = JSON.parse(val);
+        version = stored.version ?? 1;
+      } catch {
+      }
+    }
     const res = await this.get();
     if (res.data?.accessToken) {
-      await this.authService.destroySession(res.data.accessToken);
+      await this.authService.destroySession(res.data.accessToken, version);
     }
     this.v4AccessToken = null;
     this.v4AccessTokenExpiresAt = null;