@idp.global/sdk 6.0.0 → 6.1.0

package/changelog.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 2026-07-03 - 6.1.0
+
+### Features
+
+- browser client: `logout()` accepts an optional `{ redirect?: boolean }`; with `redirect: false` it revokes the session and clears local auth state without navigating, so apps on the reception origin can render their own signed-out screen (default behavior unchanged)
+- allow logout without redirecting (browser-client)
+  - Added an optional `{ redirect?: boolean }` parameter to `logout()`.
+  - When `redirect` is `false`, logout revokes the session and clears local auth state without navigating.
+  - Default logout redirect behavior remains unchanged.
+
+## 2026-07-01 - 6.0.1
+
+### Fixes
+
+- validate persisted JWTs and reset typed socket lifecycle (browser-auth)
+  - Validate stored JWTs with whoIs before treating the browser client as logged in
+  - Clear auth state only for invalid JWT or missing user responses while rethrowing other refresh errors
+  - Abort in-flight typed socket startup on stop and reset deferred socket state after failures
+
 ## 2026-06-25 - 6.0.0
 
 ### Breaking Changes

package/dist_ts/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@idp.global/sdk',
-    version: '6.0.0',
+    version: '6.1.0',
     description: 'Reusable browser and server SDK for idp.global authentication.'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxpQkFBaUI7SUFDdkIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLGdFQUFnRTtDQUM5RSxDQUFBIn0=

package/dist_ts_browser/classes.idpclient.d.ts

@@ -26,13 +26,24 @@ export declare class IdpClient {
     clearAuthState(): Promise<void>;
     performJwtHousekeeping(): Promise<string>;
     refreshJwt(refreshTokenArg?: string): Promise<string | null>;
+    private isAuthInvalidResponse;
+    private validateJwtWithServer;
     getTransferToken(appDataArg?: plugins.idpInterfaces.data.IAppLegacy): Promise<string | null>;
     getTransferTokenAndSwitchToLocation(newLocationArg: string): Promise<void>;
     private scrubTransferTokenFromCurrentUrl;
     processTransferToken(): Promise<boolean>;
     checkJwtPresent(): Promise<boolean>;
     determineLoginStatus(requireLoginArg?: boolean): Promise<boolean>;
-    logout(): Promise<void>;
+    /**
+     * Revokes the current session and clears local auth state.
+     * With `redirect: false` the page is left where it is so the calling app
+     * can decide what to render next (e.g. a dedicated signed-out screen).
+     */
+    logout(optionsArg?: {
+        redirect?: boolean;
+    }): Promise<void>;
+    private typedsocketStopRequested;
+    private typedsocketAbortController?;
     typedsocketDeferred: plugins.smartpromise.Deferred<plugins.typedsocket.TypedSocket>;
     enableTypedSocket(): Promise<plugins.typedsocket.TypedSocket>;
     stop(): Promise<void>;

package/dist_ts_browser/classes.idpclient.js

@@ -104,13 +104,14 @@ export class IdpClient {
         if (!refreshToken) {
             return null;
         }
-        await this.typedsocketDeferred.promise;
+        await this.enableTypedSocket();
         const refreshJwtReq = this.typedsocket.createTypedRequest('refreshJwt');
-        const response = await refreshJwtReq
-            .fire({ refreshToken })
-            .catch(async () => {
-            await this.clearAuthState();
-            return null;
+        const response = await refreshJwtReq.fire({ refreshToken }).catch(async (error) => {
+            if (this.isAuthInvalidResponse(error)) {
+                await this.clearAuthState();
+                return null;
+            }
+            throw error;
         });
         if (!response?.jwt) {
             await this.clearAuthState();
@@ -124,13 +125,36 @@ export class IdpClient {
         this.statusObservable.next(response.status);
         return response.jwt;
     }
+    isAuthInvalidResponse(errorArg) {
+        if (!errorArg || typeof errorArg !== 'object') {
+            return false;
+        }
+        const errorText = errorArg.errorText;
+        return errorText === 'Invalid JWT' || errorText === 'User not found';
+    }
+    async validateJwtWithServer(jwtStringArg) {
+        await this.enableTypedSocket();
+        const whoIs = this.typedsocket.createTypedRequest('whoIs');
+        try {
+            await whoIs.fire({ jwt: jwtStringArg });
+            return true;
+        }
+        catch (error) {
+            if (this.isAuthInvalidResponse(error)) {
+                await this.clearAuthState();
+                this.statusObservable.next('loggedOut');
+                return false;
+            }
+            throw error;
+        }
+    }
     async getTransferToken(appDataArg) {
         await this.performJwtHousekeeping();
         const refreshToken = await this.getRefreshToken();
         if (!refreshToken) {
             return null;
         }
-        await this.typedsocketDeferred.promise;
+        await this.enableTypedSocket();
         const getTransferToken = this.typedsocket.createTypedRequest('exchangeRefreshTokenAndTransferToken');
         const response = await getTransferToken.fire({
             refreshToken,
@@ -165,7 +189,7 @@ export class IdpClient {
         const transferToken = url.searchParams['transfertoken'];
         if (transferToken) {
             this.scrubTransferTokenFromCurrentUrl();
-            await this.typedsocketDeferred.promise;
+            await this.enableTypedSocket();
             const getTransferToken = this.typedsocket.createTypedRequest('exchangeRefreshTokenAndTransferToken');
             const response = await getTransferToken.fire({
                 transferToken,
@@ -184,13 +208,15 @@ export class IdpClient {
     }
     async checkJwtPresent() {
         const jwt = await this.performJwtHousekeeping();
-        return !!jwt;
+        if (!jwt) {
+            return false;
+        }
+        return this.validateJwtWithServer(jwt);
     }
     async determineLoginStatus(requireLoginArg = false) {
         const jwtPresent = await this.checkJwtPresent();
         if (jwtPresent) {
-            const jwt = await this.performJwtHousekeeping();
-            return !!jwt;
+            return true;
         }
         const refreshToken = await this.getRefreshToken();
         if (refreshToken) {
@@ -215,23 +241,36 @@ export class IdpClient {
         }
         return false;
     }
-    async logout() {
+    /**
+     * Revokes the current session and clears local auth state.
+     * With `redirect: false` the page is left where it is so the calling app
+     * can decide what to render next (e.g. a dedicated signed-out screen).
+     */
+    async logout(optionsArg) {
+        const redirect = optionsArg?.redirect !== false;
         const idpLogoutUrl = this.parsedReceptionUrl.clone().set('path', '/logout');
         const refreshToken = await this.getRefreshToken();
         if (!globalThis.location.href.startsWith(idpLogoutUrl.origin)) {
             await this.clearAuthState();
-            globalThis.location.href = idpLogoutUrl.toString();
+            if (redirect) {
+                globalThis.location.href = idpLogoutUrl.toString();
+            }
             return;
         }
         if (!refreshToken) {
             await this.clearAuthState();
-            window.location.href = this.parsedReceptionUrl.origin;
+            if (redirect) {
+                window.location.href = this.parsedReceptionUrl.origin;
+            }
             return;
         }
         await this.enableTypedSocket();
         const logoutTr = this.typedsocket.createTypedRequest('logout');
         await logoutTr.fire({ refreshToken });
         await this.clearAuthState();
+        if (!redirect) {
+            return;
+        }
         const appData = await this.getAppDataOnSsoDomain();
         if (appData) {
             window.location.href = appData.appUrl;
@@ -240,21 +279,47 @@ export class IdpClient {
             window.location.href = this.parsedReceptionUrl.origin;
         }
     }
+    typedsocketStopRequested = false;
+    typedsocketAbortController;
     typedsocketDeferred = plugins.smartpromise.defer();
     async enableTypedSocket() {
         if (this.typedsocketDeferred.claimed) {
             return this.typedsocketDeferred.promise;
         }
+        this.typedsocketStopRequested = false;
+        const abortController = new AbortController();
+        this.typedsocketAbortController = abortController;
         this.typedsocketDeferred.claim();
-        this.typedsocket = await plugins.typedsocket.TypedSocket.createClient(this.typedrouter, this.parsedReceptionUrl.toString());
-        this.typedsocketDeferred.resolve(this.typedsocket);
-        return this.typedsocketDeferred.promise;
+        try {
+            const typedsocket = await plugins.typedsocket.TypedSocket.createClient(this.typedrouter, this.parsedReceptionUrl.toString(), { abortSignal: abortController.signal });
+            if (this.typedsocketStopRequested) {
+                await typedsocket.stop();
+                throw new Error('TypedSocket start was stopped');
+            }
+            this.typedsocket = typedsocket;
+            this.typedsocketDeferred.resolve(this.typedsocket);
+            return this.typedsocket;
+        }
+        catch (error) {
+            if (this.typedsocketAbortController === abortController) {
+                this.typedsocketAbortController = undefined;
+            }
+            void this.typedsocketDeferred.promise.catch(() => { });
+            this.typedsocketDeferred.reject(error);
+            this.typedsocketDeferred = plugins.smartpromise.defer();
+            throw error;
+        }
     }
     async stop() {
+        this.typedsocketStopRequested = true;
+        this.typedsocketAbortController?.abort();
         await this.typedsocket?.stop();
+        if (this.typedsocketDeferred.status === 'fulfilled') {
+            this.typedsocketDeferred = plugins.smartpromise.defer();
+        }
     }
     async createOrganization(orgNameArg, orgSlugArg, modeArg) {
-        await this.typedsocketDeferred.promise;
+        await this.enableTypedSocket();
         const validateOrg = this.typedsocket.createTypedRequest('createOrganization');
         return validateOrg.fire({
             jwt: await this.getJwt(),
@@ -265,7 +330,7 @@ export class IdpClient {
         });
     }
     async getRolesAndOrganizations() {
-        await this.typedsocketDeferred.promise;
+        await this.enableTypedSocket();
         const rolesAndOrganizationsForUserId = this.typedsocket.createTypedRequest('getRolesAndOrganizationsForUserId');
         return rolesAndOrganizationsForUserId.fire({
             jwt: await this.getJwt(),
@@ -273,7 +338,7 @@ export class IdpClient {
         });
     }
     async updatePaddleCheckoutId(orgIdArg, checkoutIdArg) {
-        await this.typedsocketDeferred.promise;
+        await this.enableTypedSocket();
         const updateBillingPlan = this.typedsocket.createTypedRequest('updatePaymentMethod');
         return updateBillingPlan.fire({
             jwtString: await this.getJwt(),
@@ -282,9 +347,9 @@ export class IdpClient {
         });
     }
     async whoIs() {
-        await this.typedsocketDeferred.promise;
+        await this.enableTypedSocket();
         const whoIs = this.typedsocket.createTypedRequest('whoIs');
         return whoIs.fire({ jwt: await this.getJwt() });
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.idpclient.js","sourceRoot":"","sources":["../ts_browser/classes.idpclient.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.idpclient.js","sourceRoot":"","sources":["../ts_browser/classes.idpclient.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idp.global/sdk",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "private": false,
   "description": "Reusable browser and server SDK for idp.global authentication.",
   "type": "module",

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@idp.global/sdk',
-  version: '6.0.0',
+  version: '6.1.0',
   description: 'Reusable browser and server SDK for idp.global authentication.'
 }

package/ts_browser/classes.idpclient.ts

@@ -126,14 +126,15 @@ export class IdpClient {
       return null;
     }
 
-    await this.typedsocketDeferred.promise;
+    await this.enableTypedSocket();
     const refreshJwtReq = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_RefreshJwt>('refreshJwt');
-    const response = await refreshJwtReq
-      .fire({ refreshToken })
-      .catch(async () => {
+    const response = await refreshJwtReq.fire({ refreshToken }).catch(async (error) => {
+      if (this.isAuthInvalidResponse(error)) {
         await this.clearAuthState();
         return null;
-      });
+      }
+      throw error;
+    });
 
     if (!response?.jwt) {
       await this.clearAuthState();
@@ -149,13 +150,37 @@ export class IdpClient {
     return response.jwt;
   }
 
+  private isAuthInvalidResponse(errorArg: unknown): boolean {
+    if (!errorArg || typeof errorArg !== 'object') {
+      return false;
+    }
+    const errorText = (errorArg as { errorText?: unknown }).errorText;
+    return errorText === 'Invalid JWT' || errorText === 'User not found';
+  }
+
+  private async validateJwtWithServer(jwtStringArg: string): Promise<boolean> {
+    await this.enableTypedSocket();
+    const whoIs = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_WhoIs>('whoIs');
+    try {
+      await whoIs.fire({ jwt: jwtStringArg });
+      return true;
+    } catch (error) {
+      if (this.isAuthInvalidResponse(error)) {
+        await this.clearAuthState();
+        this.statusObservable.next('loggedOut');
+        return false;
+      }
+      throw error;
+    }
+  }
+
   public async getTransferToken(appDataArg?: plugins.idpInterfaces.data.IAppLegacy): Promise<string | null> {
     await this.performJwtHousekeeping();
     const refreshToken = await this.getRefreshToken();
     if (!refreshToken) {
       return null;
     }
-    await this.typedsocketDeferred.promise;
+    await this.enableTypedSocket();
     const getTransferToken = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_ExchangeRefreshTokenAndTransferToken>('exchangeRefreshTokenAndTransferToken');
     const response = await getTransferToken.fire({
       refreshToken,
@@ -193,7 +218,7 @@ export class IdpClient {
     const transferToken = url.searchParams['transfertoken'];
     if (transferToken) {
       this.scrubTransferTokenFromCurrentUrl();
-      await this.typedsocketDeferred.promise;
+      await this.enableTypedSocket();
       const getTransferToken = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_ExchangeRefreshTokenAndTransferToken>('exchangeRefreshTokenAndTransferToken');
       const response = await getTransferToken.fire({
         transferToken,
@@ -212,14 +237,16 @@ export class IdpClient {
 
   public async checkJwtPresent() {
     const jwt = await this.performJwtHousekeeping();
-    return !!jwt;
+    if (!jwt) {
+      return false;
+    }
+    return this.validateJwtWithServer(jwt);
   }
 
   public async determineLoginStatus(requireLoginArg: boolean = false): Promise<boolean> {
     const jwtPresent = await this.checkJwtPresent();
     if (jwtPresent) {
-      const jwt = await this.performJwtHousekeeping();
-      return !!jwt;
+      return true;
     }
     const refreshToken = await this.getRefreshToken();
     if (refreshToken) {
@@ -248,23 +275,36 @@ export class IdpClient {
     return false;
   }
 
-  public async logout() {
+  /**
+   * Revokes the current session and clears local auth state.
+   * With `redirect: false` the page is left where it is so the calling app
+   * can decide what to render next (e.g. a dedicated signed-out screen).
+   */
+  public async logout(optionsArg?: { redirect?: boolean }) {
+    const redirect = optionsArg?.redirect !== false;
     const idpLogoutUrl = this.parsedReceptionUrl.clone().set('path', '/logout');
     const refreshToken = await this.getRefreshToken();
     if (!globalThis.location.href.startsWith(idpLogoutUrl.origin)) {
       await this.clearAuthState();
-      globalThis.location.href = idpLogoutUrl.toString();
+      if (redirect) {
+        globalThis.location.href = idpLogoutUrl.toString();
+      }
       return;
     }
     if (!refreshToken) {
       await this.clearAuthState();
-      window.location.href = this.parsedReceptionUrl.origin;
+      if (redirect) {
+        window.location.href = this.parsedReceptionUrl.origin;
+      }
       return;
     }
     await this.enableTypedSocket();
     const logoutTr = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.ILogoutRequest>('logout');
     await logoutTr.fire({ refreshToken });
     await this.clearAuthState();
+    if (!redirect) {
+      return;
+    }
     const appData = await this.getAppDataOnSsoDomain();
     if (appData) {
       window.location.href = appData.appUrl;
@@ -273,27 +313,53 @@ export class IdpClient {
     }
   }
 
+  private typedsocketStopRequested = false;
+  private typedsocketAbortController?: AbortController;
   public typedsocketDeferred = plugins.smartpromise.defer<plugins.typedsocket.TypedSocket>();
 
   public async enableTypedSocket() {
     if (this.typedsocketDeferred.claimed) {
       return this.typedsocketDeferred.promise;
     }
+    this.typedsocketStopRequested = false;
+    const abortController = new AbortController();
+    this.typedsocketAbortController = abortController;
     this.typedsocketDeferred.claim();
-    this.typedsocket = await plugins.typedsocket.TypedSocket.createClient(
-      this.typedrouter,
-      this.parsedReceptionUrl.toString(),
-    );
-    this.typedsocketDeferred.resolve(this.typedsocket);
-    return this.typedsocketDeferred.promise;
+    try {
+      const typedsocket = await plugins.typedsocket.TypedSocket.createClient(
+        this.typedrouter,
+        this.parsedReceptionUrl.toString(),
+        { abortSignal: abortController.signal },
+      );
+      if (this.typedsocketStopRequested) {
+        await typedsocket.stop();
+        throw new Error('TypedSocket start was stopped');
+      }
+      this.typedsocket = typedsocket;
+      this.typedsocketDeferred.resolve(this.typedsocket);
+      return this.typedsocket;
+    } catch (error) {
+      if (this.typedsocketAbortController === abortController) {
+        this.typedsocketAbortController = undefined;
+      }
+      void this.typedsocketDeferred.promise.catch(() => {});
+      this.typedsocketDeferred.reject(error);
+      this.typedsocketDeferred = plugins.smartpromise.defer<plugins.typedsocket.TypedSocket>();
+      throw error;
+    }
   }
 
   public async stop() {
+    this.typedsocketStopRequested = true;
+    this.typedsocketAbortController?.abort();
     await this.typedsocket?.stop();
+    if (this.typedsocketDeferred.status === 'fulfilled') {
+      this.typedsocketDeferred = plugins.smartpromise.defer<plugins.typedsocket.TypedSocket>();
+    }
   }
 
   public async createOrganization(orgNameArg: string, orgSlugArg: string, modeArg: 'checkAvailability' | 'manifest') {
-    await this.typedsocketDeferred.promise;
+    await this.enableTypedSocket();
     const validateOrg = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_CreateOrganization>('createOrganization');
     return validateOrg.fire({
       jwt: await this.getJwt(),
@@ -305,7 +371,7 @@ export class IdpClient {
   }
 
   public async getRolesAndOrganizations() {
-    await this.typedsocketDeferred.promise;
+    await this.enableTypedSocket();
     const rolesAndOrganizationsForUserId = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_GetRolesAndOrganizationsForUserId>('getRolesAndOrganizationsForUserId');
     return rolesAndOrganizationsForUserId.fire({
       jwt: await this.getJwt(),
@@ -314,7 +380,7 @@ export class IdpClient {
   }
 
   public async updatePaddleCheckoutId(orgIdArg: string, checkoutIdArg: string) {
-    await this.typedsocketDeferred.promise;
+    await this.enableTypedSocket();
     const updateBillingPlan = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_UpdatePaymentMethod>('updatePaymentMethod');
     return updateBillingPlan.fire({
       jwtString: await this.getJwt(),
@@ -324,7 +390,7 @@ export class IdpClient {
   }
 
   public async whoIs() {
-    await this.typedsocketDeferred.promise;
+    await this.enableTypedSocket();
     const whoIs = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_WhoIs>('whoIs');
     return whoIs.fire({ jwt: await this.getJwt() });
   }