@idp.global/sdk 14.3.0 → 14.4.1

package/ts/00_commitinfo_data.ts

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

package/ts_browser/classes.idpclient.ts

@@ -1,6 +1,13 @@
 import { IdpRequests } from './classes.idprequests.js';
 import * as plugins from './plugins.js';
 
+export type TIdpClientTransport = 'websocket' | 'http';
+
+export interface IIdpClientOptions {
+  transport?: TIdpClientTransport;
+  loginBaseUrl?: string;
+}
+
 export class IdpClient {
   private helpers = {
     async extractDataFromJwtString(jwtString: string): Promise<plugins.idpInterfaces.data.IJwt> {
@@ -13,10 +20,13 @@ export class IdpClient {
   public organizationsReplaySubject = new plugins.smartrx.rxjs.ReplaySubject(1);
 
   public parsedReceptionUrl: plugins.smarturl.Smarturl;
+  public parsedLoginUrl: plugins.smarturl.Smarturl;
+  public readonly transport: TIdpClientTransport;
 
   constructor(
     receptionBaseUrlArg: string,
-    transferTargetArg?: plugins.idpInterfaces.data.ITransferTarget
+    transferTargetArg?: plugins.idpInterfaces.data.ITransferTarget,
+    optionsArg: IIdpClientOptions = {},
   ) {
     if (receptionBaseUrlArg.endsWith('/')) {
       receptionBaseUrlArg = receptionBaseUrlArg.slice(0, -1);
@@ -25,6 +35,9 @@ export class IdpClient {
       receptionBaseUrlArg = `${receptionBaseUrlArg}/typedrequest`;
     }
     this.parsedReceptionUrl = plugins.smarturl.Smarturl.createFromUrl(receptionBaseUrlArg);
+    const loginBaseUrl = optionsArg.loginBaseUrl || this.parsedReceptionUrl.origin;
+    this.parsedLoginUrl = plugins.smarturl.Smarturl.createFromUrl(loginBaseUrl);
+    this.transport = optionsArg.transport || 'websocket';
     this.#transferTargetAppUrl = this.normalizeTransferTargetAppUrl(
       transferTargetArg || {
         appUrl: typeof window !== 'undefined' ? window.location.origin : '',
@@ -38,6 +51,27 @@ export class IdpClient {
 
   public requests = new IdpRequests(this);
 
+  public createTypedRequest<
+    TRequest extends plugins.typedrequestInterfaces.ITypedRequest,
+  >(methodArg: TRequest['method']) {
+    if (this.transport === 'http') {
+      return new plugins.typedrequest.TypedRequest<TRequest>(
+        this.parsedReceptionUrl.href,
+        methodArg,
+      );
+    }
+    if (!this.typedsocket) {
+      throw new Error('TypedSocket has not been enabled for this IdpClient.');
+    }
+    return this.typedsocket.createTypedRequest<TRequest>(methodArg);
+  }
+
+  private async ensureTransportReady(): Promise<void> {
+    if (this.transport === 'websocket') {
+      await this.enableTypedSocket();
+    }
+  }
+
   public checkWetherOnReceptionDomain() {
     return plugins.smarturl.Smarturl.createFromUrl(window.location.href).hostname ===
       this.parsedReceptionUrl.hostname;
@@ -129,8 +163,8 @@ export class IdpClient {
       return null;
     }
 
-    await this.enableTypedSocket();
-    const refreshJwtReq = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_RefreshJwt>('refreshJwt');
+    await this.ensureTransportReady();
+    const refreshJwtReq = this.createTypedRequest<plugins.idpInterfaces.request.IReq_RefreshJwt>('refreshJwt');
     const response = await refreshJwtReq.fire({ refreshToken }).catch(async (error) => {
       if (this.isAuthInvalidResponse(error)) {
         await this.clearAuthState();
@@ -162,8 +196,8 @@ export class IdpClient {
   }
 
   private async validateJwtWithServer(jwtStringArg: string): Promise<boolean> {
-    await this.enableTypedSocket();
-    const whoIs = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_WhoIs>('whoIs');
+    await this.ensureTransportReady();
+    const whoIs = this.createTypedRequest<plugins.idpInterfaces.request.IReq_WhoIs>('whoIs');
     try {
       await whoIs.fire({ jwt: jwtStringArg });
       return true;
@@ -189,8 +223,8 @@ export class IdpClient {
     if (!refreshToken) {
       return null;
     }
-    await this.enableTypedSocket();
-    const getTransferToken = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_ExchangeRefreshTokenAndTransferToken>('exchangeRefreshTokenAndTransferToken');
+    await this.ensureTransportReady();
+    const getTransferToken = this.createTypedRequest<plugins.idpInterfaces.request.IReq_ExchangeRefreshTokenAndTransferToken>('exchangeRefreshTokenAndTransferToken');
     const response = await getTransferToken.fire({
       refreshToken,
       transferTarget: transferTargetArg,
@@ -228,8 +262,8 @@ export class IdpClient {
     const transferToken = url.searchParams['transfertoken'];
     if (transferToken) {
       this.scrubTransferTokenFromCurrentUrl();
-      await this.enableTypedSocket();
-      const getTransferToken = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_ExchangeRefreshTokenAndTransferToken>('exchangeRefreshTokenAndTransferToken');
+      await this.ensureTransportReady();
+      const getTransferToken = this.createTypedRequest<plugins.idpInterfaces.request.IReq_ExchangeRefreshTokenAndTransferToken>('exchangeRefreshTokenAndTransferToken');
       const response = await getTransferToken.fire({
         transferToken,
         transferTarget: this.transferTarget,
@@ -271,7 +305,7 @@ export class IdpClient {
     }
     if (requireLoginArg) {
       const urlInstance = plugins.smarturl.Smarturl.createFromUrl(
-        this.parsedReceptionUrl.clone().set('path', '/login').toString(),
+        this.parsedLoginUrl.clone().set('path', '/login').toString(),
         {
           searchParams: {
             transfertarget: plugins.smartjson.stringifyBase64(this.transferTarget),
@@ -291,8 +325,8 @@ export class IdpClient {
    * available.
    */
   public async discoverSsoForEmail(emailArg: string): Promise<{ ssoAvailable: boolean; loginUrl?: string }> {
-    await this.enableTypedSocket();
-    const discoverTr = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_DiscoverSsoForEmail>('discoverSsoForEmail');
+    await this.ensureTransportReady();
+    const discoverTr = this.createTypedRequest<plugins.idpInterfaces.request.IReq_DiscoverSsoForEmail>('discoverSsoForEmail');
     return await discoverTr.fire({ email: emailArg });
   }
 
@@ -331,8 +365,8 @@ export class IdpClient {
       }
       return;
     }
-    await this.enableTypedSocket();
-    const logoutTr = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.ILogoutRequest>('logout');
+    await this.ensureTransportReady();
+    const logoutTr = this.createTypedRequest<plugins.idpInterfaces.request.ILogoutRequest>('logout');
     await logoutTr.fire({ refreshToken });
     await this.clearAuthState();
     if (!redirect) {
@@ -348,6 +382,9 @@ export class IdpClient {
   public typedsocketDeferred = plugins.smartpromise.defer<plugins.typedsocket.TypedSocket>();
 
   public async enableTypedSocket() {
+    if (this.transport !== 'websocket') {
+      throw new Error('This IdpClient is configured for HTTP transport.');
+    }
     if (this.typedsocketDeferred.claimed) {
       return this.typedsocketDeferred.promise;
     }
@@ -382,15 +419,19 @@ export class IdpClient {
   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>();
+    try {
+      await this.typedsocket?.stop();
+    } finally {
+      if (this.typedsocketDeferred.status === 'fulfilled') {
+        this.typedsocketDeferred = plugins.smartpromise.defer<plugins.typedsocket.TypedSocket>();
+      }
+      await this.ssoStore.close();
     }
   }
 
   public async createOrganization(orgNameArg: string, orgSlugArg: string, modeArg: 'checkAvailability' | 'manifest') {
-    await this.enableTypedSocket();
-    const validateOrg = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_CreateOrganization>('createOrganization');
+    await this.ensureTransportReady();
+    const validateOrg = this.createTypedRequest<plugins.idpInterfaces.request.IReq_CreateOrganization>('createOrganization');
     return validateOrg.fire({
       jwt: await this.getJwt(),
       action: modeArg,
@@ -401,8 +442,8 @@ export class IdpClient {
   }
 
   public async getRolesAndOrganizations() {
-    await this.enableTypedSocket();
-    const rolesAndOrganizationsForUserId = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_GetRolesAndOrganizationsForUserId>('getRolesAndOrganizationsForUserId');
+    await this.ensureTransportReady();
+    const rolesAndOrganizationsForUserId = this.createTypedRequest<plugins.idpInterfaces.request.IReq_GetRolesAndOrganizationsForUserId>('getRolesAndOrganizationsForUserId');
     return rolesAndOrganizationsForUserId.fire({
       jwt: await this.getJwt(),
       userId: (await this.getJwtData()).id,
@@ -410,8 +451,8 @@ export class IdpClient {
   }
 
   public async updatePaddleCheckoutId(orgIdArg: string, checkoutIdArg: string) {
-    await this.enableTypedSocket();
-    const updateBillingPlan = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_UpdatePaymentMethod>('updatePaymentMethod');
+    await this.ensureTransportReady();
+    const updateBillingPlan = this.createTypedRequest<plugins.idpInterfaces.request.IReq_UpdatePaymentMethod>('updatePaymentMethod');
     return updateBillingPlan.fire({
       jwtString: await this.getJwt(),
       orgId: orgIdArg,
@@ -420,8 +461,8 @@ export class IdpClient {
   }
 
   public async whoIs() {
-    await this.enableTypedSocket();
-    const whoIs = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_WhoIs>('whoIs');
+    await this.ensureTransportReady();
+    const whoIs = this.createTypedRequest<plugins.idpInterfaces.request.IReq_WhoIs>('whoIs');
     return whoIs.fire({ jwt: await this.getJwt() });
   }
 }