Merge pull request #337 from kavindadimuthu/fix/multi-http-clients

Fix failure of calling authenticated APIs from secondary AsgardeoProvider Instances (Multi-Provider Support)

Author: DonOmalVindula

.changeset/light-queens-rest.md

@@ -0,0 +1,5 @@
+---
+'@asgardeo/browser': minor
+---
+
+Fix failure of calling authenticated APIs from secondary AsgardeoProvider Instances in Multi Provider scenarios

packages/browser/src/__legacy__/clients/main-thread-client.ts

@@ -85,7 +85,7 @@ export const MainThreadClient = async (
 
   let _getSignOutURLFromSessionStorage: boolean = false;
 
-  const _httpClient: HttpClientInstance = HttpClient.getInstance();
+  const _httpClient: HttpClientInstance = HttpClient.getInstance(instanceID);
   let _isHttpHandlerEnabled: boolean = true;
   let _httpErrorCallback: (error: HttpError) => void | Promise<void>;
   let _httpFinishCallback: () => void;

packages/browser/src/__legacy__/clients/web-worker-client.ts

@@ -365,8 +365,8 @@ export const WebWorkerClient = async (
       }
     };
 
-    const message: Message<AuthClientConfig<WebWorkerClientConfig>> = {
-      data: config,
+    const message: Message<AuthClientConfig<WebWorkerClientConfig> & {instanceID: number}> = {
+      data: {...config, instanceID},
       type: INIT,
     };
 

packages/browser/src/__legacy__/http-client/clients/axios-http-client.ts

@@ -41,9 +41,9 @@ import {HttpClientInstance, HttpClientInterface, HttpClientStatic} from '../mode
  */
 @staticDecorator<HttpClientStatic<HttpClientInstance>>()
 export class HttpClient implements HttpClientInterface<HttpRequestConfig, HttpResponse, HttpError> {
-  private static axiosInstance: HttpClientInstance;
-  private static clientInstance: HttpClient;
-  private static isHandlerEnabled: boolean;
+  private static instances: Map<number, HttpClientInstance> = new Map();
+  private static clientInstances: Map<number, HttpClient> = new Map();
+  private isHandlerEnabled: boolean = true;
   private attachToken: (request: HttpRequestConfig) => Promise<void> = () => Promise.resolve();
   private requestStartCallback: (request: HttpRequestConfig) => void = () => null;
   private requestSuccessCallback: (response: HttpResponse) => void = () => null;
@@ -59,55 +59,78 @@ export class HttpClient implements HttpClientInterface<HttpRequestConfig, HttpRe
    */
   private constructor() {
     this.init = this.init.bind(this);
+    this.enableHandler = this.enableHandler.bind(this);
+    this.disableHandler = this.disableHandler.bind(this);
+    this.disableHandlerWithTimeout = this.disableHandlerWithTimeout.bind(this);
     this.setHttpRequestErrorCallback = this.setHttpRequestErrorCallback.bind(this);
     this.setHttpRequestFinishCallback = this.setHttpRequestFinishCallback.bind(this);
     this.setHttpRequestStartCallback = this.setHttpRequestStartCallback.bind(this);
     this.setHttpRequestSuccessCallback = this.setHttpRequestSuccessCallback.bind(this);
   }
 
   /**
-   * Returns an aggregated instance of type `HttpInstance` of `HttpClient`.
+   * Returns an instance-specific HttpClient instance.
+   * Each instance ID gets its own axios instance and HttpClient to avoid state conflicts.
    *
-   * @return {any}
+   * @param instanceId - The instance ID for multi-auth context support. Defaults to 0.
+   * @return {HttpClientInstance}
    */
-  public static getInstance(): HttpClientInstance {
-    if (this.axiosInstance) {
-      return this.axiosInstance;
+  public static getInstance(instanceId: number = 0): HttpClientInstance {
+    if (this.instances.has(instanceId)) {
+      return this.instances.get(instanceId)!;
     }
 
-    this.axiosInstance = axios.create({
+    const axiosInstance = axios.create({
       withCredentials: true,
-    });
+    }) as HttpClientInstance;
 
-    if (!this.clientInstance) {
-      this.clientInstance = new HttpClient();
-    }
+    const clientInstance = new HttpClient();
+    this.clientInstances.set(instanceId, clientInstance);
 
     // Register request interceptor
-    this.axiosInstance.interceptors.request.use(async (request: InternalAxiosRequestConfig) => await this.clientInstance.requestHandler(request as HttpRequestConfig) as InternalAxiosRequestConfig);
+    axiosInstance.interceptors.request.use(async (request: InternalAxiosRequestConfig) => await clientInstance.requestHandler(request as HttpRequestConfig) as InternalAxiosRequestConfig);
 
     // Register response interceptor
-    this.axiosInstance.interceptors.response.use(
-      response => this.clientInstance.successHandler(response),
-      error => this.clientInstance.errorHandler(error),
+    axiosInstance.interceptors.response.use(
+      response => clientInstance.successHandler(response),
+      error => clientInstance.errorHandler(error),
     );
 
     // Add the missing helper methods from axios
-    this.axiosInstance.all = axios.all;
-    this.axiosInstance.spread = axios.spread;
+    axiosInstance.all = axios.all;
+    axiosInstance.spread = axios.spread;
 
     // Add the init method from the `HttpClient` instance.
-    this.axiosInstance.init = this.clientInstance.init;
+    axiosInstance.init = clientInstance.init;
 
     // Add the handler enabling & disabling methods to the instance.
-    this.axiosInstance.enableHandler = this.clientInstance.enableHandler;
-    this.axiosInstance.disableHandler = this.clientInstance.disableHandler;
-    this.axiosInstance.disableHandlerWithTimeout = this.clientInstance.disableHandlerWithTimeout;
-    this.axiosInstance.setHttpRequestStartCallback = this.clientInstance.setHttpRequestStartCallback;
-    this.axiosInstance.setHttpRequestSuccessCallback = this.clientInstance.setHttpRequestSuccessCallback;
-    this.axiosInstance.setHttpRequestErrorCallback = this.clientInstance.setHttpRequestErrorCallback;
-    this.axiosInstance.setHttpRequestFinishCallback = this.clientInstance.setHttpRequestFinishCallback;
-    return this.axiosInstance;
+    axiosInstance.enableHandler = clientInstance.enableHandler;
+    axiosInstance.disableHandler = clientInstance.disableHandler;
+    axiosInstance.disableHandlerWithTimeout = clientInstance.disableHandlerWithTimeout;
+    axiosInstance.setHttpRequestStartCallback = clientInstance.setHttpRequestStartCallback;
+    axiosInstance.setHttpRequestSuccessCallback = clientInstance.setHttpRequestSuccessCallback;
+    axiosInstance.setHttpRequestErrorCallback = clientInstance.setHttpRequestErrorCallback;
+    axiosInstance.setHttpRequestFinishCallback = clientInstance.setHttpRequestFinishCallback;
+    
+    this.instances.set(instanceId, axiosInstance);
+    return axiosInstance;
+  }
+
+  /**
+   * Destroys and cleans up an HttpClient instance.
+   * This should be called during provider teardown to prevent memory leaks.
+   *
+   * @param instanceId - The instance ID to destroy. Defaults to 0.
+   */
+  public static destroyInstance(instanceId: number = 0): void {
+    const axiosInstance = this.instances.get(instanceId);
+    if (axiosInstance) {
+      // Eject interceptors to prevent memory leaks
+      axiosInstance.interceptors.request.clear();
+      axiosInstance.interceptors.response.clear();
+    }
+    this.instances.delete(instanceId);
+    this.clientInstances.delete(instanceId);
   }
 
   /**
@@ -134,7 +157,7 @@ export class HttpClient implements HttpClientInterface<HttpRequestConfig, HttpRe
 
     request.startTimeInMs = new Date().getTime();
 
-    if (HttpClient.isHandlerEnabled) {
+    if (this.isHandlerEnabled) {
       if (this.requestStartCallback && typeof this.requestStartCallback === 'function') {
         this.requestStartCallback(request);
       }
@@ -151,7 +174,7 @@ export class HttpClient implements HttpClientInterface<HttpRequestConfig, HttpRe
    * @return {HttpError}
    */
   public errorHandler(error: HttpError): HttpError {
-    if (HttpClient.isHandlerEnabled) {
+    if (this.isHandlerEnabled) {
       if (this.requestErrorCallback && typeof this.requestErrorCallback === 'function') {
         this.requestErrorCallback(error);
       }
@@ -171,7 +194,7 @@ export class HttpClient implements HttpClientInterface<HttpRequestConfig, HttpRe
    * @return {HttpResponse}
    */
   public successHandler(response: HttpResponse): HttpResponse {
-    if (HttpClient.isHandlerEnabled) {
+    if (this.isHandlerEnabled) {
       if (this.requestSuccessCallback && typeof this.requestSuccessCallback === 'function') {
         this.requestSuccessCallback(response);
       }
@@ -195,22 +218,22 @@ export class HttpClient implements HttpClientInterface<HttpRequestConfig, HttpRe
     isHandlerEnabled = true,
     attachToken: (request: HttpRequestConfig) => Promise<void>,
   ): Promise<void> {
-    HttpClient.isHandlerEnabled = isHandlerEnabled;
+    this.isHandlerEnabled = isHandlerEnabled;
     this.attachToken = attachToken;
   }
 
   /**
    * Enables the handler.
    */
   public enableHandler(): void {
-    HttpClient.isHandlerEnabled = true;
+    this.isHandlerEnabled = true;
   }
 
   /**
    * Disables the handler.
    */
   public disableHandler(): void {
-    HttpClient.isHandlerEnabled = false;
+    this.isHandlerEnabled = false;
   }
 
   /**
@@ -219,10 +242,10 @@ export class HttpClient implements HttpClientInterface<HttpRequestConfig, HttpRe
    * @param {number} timeout - Timeout in milliseconds.
    */
   public disableHandlerWithTimeout(timeout: number = HttpClient.DEFAULT_HANDLER_DISABLE_TIMEOUT): void {
-    HttpClient.isHandlerEnabled = false;
+    this.isHandlerEnabled = false;
 
     setTimeout(() => {
-      HttpClient.isHandlerEnabled = true;
+      this.isHandlerEnabled = true;
     }, timeout);
   }
 

packages/browser/src/__legacy__/http-client/models/http-client.ts

@@ -23,7 +23,7 @@ import { HttpError, HttpResponse } from "../../models";
  * Http client interface with static functions.
  */
 export interface HttpClientStatic<S> {
-    getInstance(): S;
+    getInstance(instanceId?: number): S;
 }
 
 /**

packages/browser/src/__legacy__/worker/worker-core.ts

@@ -42,6 +42,7 @@ import {MemoryStore} from '../stores';
 import {SPACryptoUtils} from '../utils/crypto-utils';
 
 export const WebWorkerCore = async (
+  instanceID: number,
   config: AuthClientConfig<WebWorkerClientConfig>,
   getAuthHelper: (
     authClient: AsgardeoAuthClient<WebWorkerClientConfig>,
@@ -51,7 +52,7 @@ export const WebWorkerCore = async (
   const _store: Storage = new MemoryStore();
   const _cryptoUtils: SPACryptoUtils = new SPACryptoUtils();
   const _authenticationClient = new AsgardeoAuthClient<WebWorkerClientConfig>();
-  await _authenticationClient.initialize(config, _store, _cryptoUtils);
+  await _authenticationClient.initialize(config, _store, _cryptoUtils, instanceID);
 
   const _spaHelper = new SPAHelper<WebWorkerClientConfig>(_authenticationClient);
 
@@ -62,7 +63,7 @@ export const WebWorkerCore = async (
 
   const _dataLayer = _authenticationClient.getStorageManager();
 
-  const _httpClient: HttpClientInstance = HttpClient.getInstance();
+  const _httpClient: HttpClientInstance = HttpClient.getInstance(instanceID);
 
   const attachToken = async (request: HttpRequestConfig): Promise<void> => {
     await _authenticationHelper.attachTokenToRequestConfig(request);

packages/browser/src/__legacy__/worker/worker-receiver.ts

@@ -84,8 +84,9 @@ export const workerReceiver = (
     switch (data.type) {
       case INIT:
         try {
-          const config: AuthClientConfig<WebWorkerClientConfig> = {...data.data};
-          webWorker = await WebWorkerCore(config, getAuthHelper);
+          const {instanceID = 0, ...configData} = data.data;
+          const config: AuthClientConfig<WebWorkerClientConfig> = {...configData};
+          webWorker = await WebWorkerCore(instanceID, config, getAuthHelper);
           webWorker.setHttpRequestFinishCallback(onRequestFinishCallback);
           webWorker.setHttpRequestStartCallback(onRequestStartCallback);
           webWorker.setHttpRequestSuccessCallback(onRequestSuccessCallback);