Refactor API methods to support instance ID for multi-instance functionality

Author: kavindadimuthu

packages/react/src/api/createOrganization.ts

@@ -26,8 +26,6 @@ import {
   CreateOrganizationPayload,
 } from '@asgardeo/browser';
 
-const httpClient: HttpInstance = AsgardeoSPAClient.getInstance().httpRequest.bind(AsgardeoSPAClient.getInstance());
-
 /**
  * Configuration for the createOrganization request (React-specific)
  */
@@ -37,6 +35,10 @@ export interface CreateOrganizationConfig extends Omit<BaseCreateOrganizationCon
    * which is a wrapper around axios http.request
    */
   fetcher?: (url: string, config: RequestInit) => Promise<Response>;
+  /**
+   * Optional instance ID for multi-instance support. Defaults to 0.
+   */
+  instanceId?: number;
 }
 
 /**
@@ -90,8 +92,11 @@ export interface CreateOrganizationConfig extends Omit<BaseCreateOrganizationCon
  * }
  * ```
  */
-const createOrganization = async ({fetcher, ...requestConfig}: CreateOrganizationConfig): Promise<Organization> => {
+const createOrganization = async ({fetcher, instanceId = 0, ...requestConfig}: CreateOrganizationConfig): Promise<Organization> => {
   const defaultFetcher = async (url: string, config: RequestInit): Promise<Response> => {
+    const httpClient: HttpInstance = AsgardeoSPAClient.getInstance(instanceId).httpRequest.bind(
+      AsgardeoSPAClient.getInstance(instanceId)
+    );
     const response = await httpClient({
       url,
       method: config.method || 'POST',

packages/react/src/api/getAllOrganizations.ts

@@ -25,8 +25,6 @@ import {
   AllOrganizationsApiResponse,
 } from '@asgardeo/browser';
 
-const httpClient: HttpInstance = AsgardeoSPAClient.getInstance().httpRequest.bind(AsgardeoSPAClient.getInstance());
-
 /**
  * Configuration for the getAllOrganizations request (React-specific)
  */
@@ -36,6 +34,10 @@ export interface GetAllOrganizationsConfig extends Omit<BaseGetAllOrganizationsC
    * which is a wrapper around axios http.request
    */
   fetcher?: (url: string, config: RequestInit) => Promise<Response>;
+  /**
+   * Optional instance ID for multi-instance support. Defaults to 0.
+   */
+  instanceId?: number;
 }
 
 /**
@@ -83,9 +85,13 @@ export interface GetAllOrganizationsConfig extends Omit<BaseGetAllOrganizationsC
  */
 const getAllOrganizations = async ({
   fetcher,
+  instanceId = 0,
   ...requestConfig
 }: GetAllOrganizationsConfig): Promise<AllOrganizationsApiResponse> => {
   const defaultFetcher = async (url: string, config: RequestInit): Promise<Response> => {
+    const httpClient: HttpInstance = AsgardeoSPAClient.getInstance(instanceId).httpRequest.bind(
+      AsgardeoSPAClient.getInstance(instanceId)
+    );
     const response = await httpClient({
       url,
       method: config.method || 'GET',

packages/react/src/api/getMeOrganizations.ts

@@ -25,8 +25,6 @@ import {
   GetMeOrganizationsConfig as BaseGetMeOrganizationsConfig,
 } from '@asgardeo/browser';
 
-const httpClient: HttpInstance = AsgardeoSPAClient.getInstance().httpRequest.bind(AsgardeoSPAClient.getInstance());
-
 /**
  * Configuration for the getMeOrganizations request (React-specific)
  */
@@ -36,6 +34,10 @@ export interface GetMeOrganizationsConfig extends Omit<BaseGetMeOrganizationsCon
    * which is a wrapper around axios http.request
    */
   fetcher?: (url: string, config: RequestInit) => Promise<Response>;
+  /**
+   * Optional instance ID for multi-instance support. Defaults to 0.
+   */
+  instanceId?: number;
 }
 
 /**
@@ -85,8 +87,11 @@ export interface GetMeOrganizationsConfig extends Omit<BaseGetMeOrganizationsCon
  * }
  * ```
  */
-const getMeOrganizations = async ({fetcher, ...requestConfig}: GetMeOrganizationsConfig): Promise<Organization[]> => {
+const getMeOrganizations = async ({fetcher, instanceId = 0, ...requestConfig}: GetMeOrganizationsConfig): Promise<Organization[]> => {
   const defaultFetcher = async (url: string, config: RequestInit): Promise<Response> => {
+    const httpClient: HttpInstance = AsgardeoSPAClient.getInstance(instanceId).httpRequest.bind(
+      AsgardeoSPAClient.getInstance(instanceId)
+    );
     const response = await httpClient({
       url,
       method: config.method || 'GET',

packages/react/src/api/getOrganization.ts

@@ -25,8 +25,6 @@ import {
   OrganizationDetails,
 } from '@asgardeo/browser';
 
-const httpClient: HttpInstance = AsgardeoSPAClient.getInstance().httpRequest.bind(AsgardeoSPAClient.getInstance());
-
 /**
  * Configuration for the getOrganization request (React-specific)
  */
@@ -36,6 +34,10 @@ export interface GetOrganizationConfig extends Omit<BaseGetOrganizationConfig, '
    * which is a wrapper around axios http.request
    */
   fetcher?: (url: string, config: RequestInit) => Promise<Response>;
+  /**
+   * Optional instance ID for multi-instance support. Defaults to 0.
+   */
+  instanceId?: number;
 }
 
 /**
@@ -77,8 +79,11 @@ export interface GetOrganizationConfig extends Omit<BaseGetOrganizationConfig, '
  * }
  * ```
  */
-const getOrganization = async ({fetcher, ...requestConfig}: GetOrganizationConfig): Promise<OrganizationDetails> => {
+const getOrganization = async ({fetcher, instanceId = 0, ...requestConfig}: GetOrganizationConfig): Promise<OrganizationDetails> => {
   const defaultFetcher = async (url: string, config: RequestInit): Promise<Response> => {
+    const httpClient: HttpInstance = AsgardeoSPAClient.getInstance(instanceId).httpRequest.bind(
+      AsgardeoSPAClient.getInstance(instanceId)
+    );
     const response = await httpClient({
       url,
       method: config.method || 'GET',

packages/react/src/api/getSchemas.ts

@@ -25,8 +25,6 @@ import {
   GetSchemasConfig as BaseGetSchemasConfig,
 } from '@asgardeo/browser';
 
-const httpClient: HttpInstance = AsgardeoSPAClient.getInstance().httpRequest.bind(AsgardeoSPAClient.getInstance());
-
 /**
  * Configuration for the getSchemas request (React-specific)
  */
@@ -36,6 +34,10 @@ export interface GetSchemasConfig extends Omit<BaseGetSchemasConfig, 'fetcher'>
    * which is a wrapper around axios http.request
    */
   fetcher?: (url: string, config: RequestInit) => Promise<Response>;
+  /**
+   * Optional instance ID for multi-instance support. Defaults to 0.
+   */
+  instanceId?: number;
 }
 
 /**
@@ -75,8 +77,11 @@ export interface GetSchemasConfig extends Omit<BaseGetSchemasConfig, 'fetcher'>
  * }
  * ```
  */
-const getSchemas = async ({fetcher, ...requestConfig}: GetSchemasConfig): Promise<Schema[]> => {
+const getSchemas = async ({fetcher, instanceId = 0, ...requestConfig}: GetSchemasConfig): Promise<Schema[]> => {
   const defaultFetcher = async (url: string, config: RequestInit): Promise<Response> => {
+    const httpClient: HttpInstance = AsgardeoSPAClient.getInstance(instanceId).httpRequest.bind(
+      AsgardeoSPAClient.getInstance(instanceId)
+    );
     const response = await httpClient({
       url,
       method: config.method || 'GET',

packages/react/src/api/getScim2Me.ts

@@ -26,8 +26,6 @@ import {
   GetScim2MeConfig as BaseGetScim2MeConfig
 } from '@asgardeo/browser';
 
-const httpClient: HttpInstance = AsgardeoSPAClient.getInstance().httpRequest.bind(AsgardeoSPAClient.getInstance());
-
 /**
  * Configuration for the getScim2Me request (React-specific)
  */
@@ -37,6 +35,10 @@ export interface GetScim2MeConfig extends Omit<BaseGetScim2MeConfig, 'fetcher'>
    * which is a wrapper around axios http.request
    */
   fetcher?: (url: string, config: RequestInit) => Promise<Response>;
+  /**
+   * Optional instance ID for multi-instance support. Defaults to 0.
+   */
+  instanceId?: number;
 }
 
 /**
@@ -76,8 +78,11 @@ export interface GetScim2MeConfig extends Omit<BaseGetScim2MeConfig, 'fetcher'>
  * }
  * ```
  */
-const getScim2Me = async ({fetcher, ...requestConfig}: GetScim2MeConfig): Promise<User> => {
+const getScim2Me = async ({fetcher, instanceId = 0, ...requestConfig}: GetScim2MeConfig): Promise<User> => {
   const defaultFetcher = async (url: string, config: RequestInit): Promise<Response> => {
+    const httpClient: HttpInstance = AsgardeoSPAClient.getInstance(instanceId).httpRequest.bind(
+      AsgardeoSPAClient.getInstance(instanceId)
+    );
     const response = await httpClient({
       url,
       method: config.method || 'GET',

packages/react/src/api/updateMeProfile.ts

@@ -25,8 +25,6 @@ import {
   UpdateMeProfileConfig as BaseUpdateMeProfileConfig,
 } from '@asgardeo/browser';
 
-const httpClient: HttpInstance = AsgardeoSPAClient.getInstance().httpRequest.bind(AsgardeoSPAClient.getInstance());
-
 /**
  * Configuration for the updateMeProfile request (React-specific)
  */
@@ -36,6 +34,10 @@ export interface UpdateMeProfileConfig extends Omit<BaseUpdateMeProfileConfig, '
    * which is a wrapper around axios http.request
    */
   fetcher?: (url: string, config: RequestInit) => Promise<Response>;
+  /**
+   * Optional instance ID for multi-instance support. Defaults to 0.
+   */
+  instanceId?: number;
 }
 
 /**
@@ -63,8 +65,11 @@ export interface UpdateMeProfileConfig extends Omit<BaseUpdateMeProfileConfig, '
  * });
  * ```
  */
-const updateMeProfile = async ({fetcher, ...requestConfig}: UpdateMeProfileConfig): Promise<User> => {
+const updateMeProfile = async ({fetcher, instanceId = 0, ...requestConfig}: UpdateMeProfileConfig): Promise<User> => {
   const defaultFetcher = async (url: string, config: RequestInit): Promise<Response> => {
+    const httpClient: HttpInstance = AsgardeoSPAClient.getInstance(instanceId).httpRequest.bind(
+      AsgardeoSPAClient.getInstance(instanceId)
+    );
     const response = await httpClient({
       url,
       method: config.method || 'PATCH',

packages/react/src/api/updateOrganization.ts

@@ -26,8 +26,6 @@ import {
   createPatchOperations,
 } from '@asgardeo/browser';
 
-const httpClient: HttpInstance = AsgardeoSPAClient.getInstance().httpRequest.bind(AsgardeoSPAClient.getInstance());
-
 /**
  * Configuration for the updateOrganization request (React-specific)
  */
@@ -37,6 +35,10 @@ export interface UpdateOrganizationConfig extends Omit<BaseUpdateOrganizationCon
    * which is a wrapper around axios http.request
    */
   fetcher?: (url: string, config: RequestInit) => Promise<Response>;
+  /**
+   * Optional instance ID for multi-instance support. Defaults to 0.
+   */
+  instanceId?: number;
 }
 
 /**
@@ -86,9 +88,13 @@ export interface UpdateOrganizationConfig extends Omit<BaseUpdateOrganizationCon
  */
 const updateOrganization = async ({
   fetcher,
+  instanceId = 0,
   ...requestConfig
 }: UpdateOrganizationConfig): Promise<OrganizationDetails> => {
   const defaultFetcher = async (url: string, config: RequestInit): Promise<Response> => {
+    const httpClient: HttpInstance = AsgardeoSPAClient.getInstance(instanceId).httpRequest.bind(
+      AsgardeoSPAClient.getInstance(instanceId)
+    );
     const response = await httpClient({
       url,
       method: config.method || 'PATCH',