Refactor code for improved readability and consistency in multi-instance handling

kavindadimuthu · kavindadimuthu · commit 85452aae5f29 · 2026-02-16T18:45:43.000+05:30
diff --git a/packages/javascript/src/__legacy__/client.ts b/packages/javascript/src/__legacy__/client.ts
@@ -250,7 +250,7 @@ export class AsgardeoAuthClient<T> {
         authRequestConfig['client_secret'] = configData.clientSecret;
       }
 
-      authRequestConfig['state'] = 'instance_' + this.getInstanceId() + '-' + configData.clientId; 
+      authRequestConfig['state'] = `instance_${this.getInstanceId()}-${configData.clientId}`;
 
       const authorizeRequestParams: Map<string, string> = getAuthorizeRequestUrlParams(
         {
diff --git a/packages/react/src/api/createOrganization.ts b/packages/react/src/api/createOrganization.ts
@@ -92,7 +92,11 @@ export interface CreateOrganizationConfig extends Omit<BaseCreateOrganizationCon
  * }
  * ```
  */
-const createOrganization = async ({fetcher, instanceId = 0, ...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)
diff --git a/packages/react/src/api/getAllOrganizations.ts b/packages/react/src/api/getAllOrganizations.ts
@@ -91,7 +91,7 @@ const getAllOrganizations = async ({
 }: GetAllOrganizationsConfig): Promise<AllOrganizationsApiResponse> => {
   const defaultFetcher = async (url: string, config: RequestInit): Promise<Response> => {
     const httpClient: HttpInstance = AsgardeoSPAClient.getInstance(instanceId).httpRequest.bind(
-      AsgardeoSPAClient.getInstance(instanceId)
+      AsgardeoSPAClient.getInstance(instanceId),
     );
     const response: HttpResponse<any> = await httpClient({
       headers: config.headers as Record<string, string>,
diff --git a/packages/react/src/api/getMeOrganizations.ts b/packages/react/src/api/getMeOrganizations.ts
@@ -88,7 +88,11 @@ export interface GetMeOrganizationsConfig extends Omit<BaseGetMeOrganizationsCon
  * }
  * ```
  */
-const getMeOrganizations = async ({fetcher, instanceId = 0, ...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)
diff --git a/packages/react/src/api/getOrganization.ts b/packages/react/src/api/getOrganization.ts
@@ -80,7 +80,11 @@ export interface GetOrganizationConfig extends Omit<BaseGetOrganizationConfig, '
  * }
  * ```
  */
-const getOrganization = async ({fetcher, instanceId = 0, ...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)
diff --git a/packages/react/src/api/getSchemas.ts b/packages/react/src/api/getSchemas.ts
@@ -81,7 +81,7 @@ export interface GetSchemasConfig extends Omit<BaseGetSchemasConfig, 'fetcher'>
 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)
+      AsgardeoSPAClient.getInstance(instanceId),
     );
     const response: HttpResponse<any> = await httpClient({
       headers: config.headers as Record<string, string>,
diff --git a/packages/react/src/api/getScim2Me.ts b/packages/react/src/api/getScim2Me.ts
@@ -81,7 +81,7 @@ export interface GetScim2MeConfig extends Omit<BaseGetScim2MeConfig, 'fetcher'>
 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)
+      AsgardeoSPAClient.getInstance(instanceId),
     );
     const response: HttpResponse<any> = await httpClient({
       headers: config.headers as Record<string, string>,
diff --git a/packages/react/src/api/updateMeProfile.ts b/packages/react/src/api/updateMeProfile.ts
@@ -69,7 +69,7 @@ export interface UpdateMeProfileConfig extends Omit<BaseUpdateMeProfileConfig, '
 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)
+      AsgardeoSPAClient.getInstance(instanceId),
     );
     const response: HttpResponse<any> = await httpClient({
       data: config.body ? JSON.parse(config.body as string) : undefined,
diff --git a/packages/react/src/api/updateOrganization.ts b/packages/react/src/api/updateOrganization.ts
@@ -94,7 +94,7 @@ const updateOrganization = async ({
 }: UpdateOrganizationConfig): Promise<OrganizationDetails> => {
   const defaultFetcher = async (url: string, config: RequestInit): Promise<Response> => {
     const httpClient: HttpInstance = AsgardeoSPAClient.getInstance(instanceId).httpRequest.bind(
-      AsgardeoSPAClient.getInstance(instanceId)
+      AsgardeoSPAClient.getInstance(instanceId),
     );
     const response: HttpResponse<any> = await httpClient({
       data: config.body ? JSON.parse(config.body as string) : undefined,
diff --git a/packages/react/src/components/presentation/CreateOrganization/CreateOrganization.tsx b/packages/react/src/components/presentation/CreateOrganization/CreateOrganization.tsx
@@ -108,11 +108,11 @@ export const CreateOrganization: FC<CreateOrganizationProps> = ({
 
         result = await createOrganization({
           baseUrl,
+          instanceId,
           payload: {
             ...payload,
             parentId,
           },
-          instanceId,
         });
       }
 
diff --git a/packages/react/src/components/presentation/OrganizationProfile/OrganizationProfile.tsx b/packages/react/src/components/presentation/OrganizationProfile/OrganizationProfile.tsx
@@ -158,8 +158,8 @@ const OrganizationProfile: FC<OrganizationProfileProps> = ({
     try {
       const orgData: any = await getOrganization({
         baseUrl,
-        organizationId,
         instanceId,
+        organizationId,
       });
       setOrganization(orgData);
     } catch (err) {
@@ -181,9 +181,9 @@ const OrganizationProfile: FC<OrganizationProfileProps> = ({
 
       await updateOrganization({
         baseUrl,
+        instanceId,
         operations,
         organizationId,
-        instanceId,
       });
       // Refetch organization data after update
       await fetchOrganization();
diff --git a/packages/react/src/components/presentation/UserProfile/UserProfile.tsx b/packages/react/src/components/presentation/UserProfile/UserProfile.tsx
@@ -75,7 +75,7 @@ const UserProfile: FC<UserProfileProps> = ({...rest}: UserProfileProps): ReactEl
     setError(null);
 
     try {
-      const response: User = await updateMeProfile({baseUrl, payload, instanceId});
+      const response: User = await updateMeProfile({baseUrl, instanceId, payload});
       onUpdateProfile(response);
     } catch (caughtError: unknown) {
       let message: string = t('user.profile.update.generic.error');
diff --git a/packages/react/src/contexts/Asgardeo/AsgardeoContext.ts b/packages/react/src/contexts/Asgardeo/AsgardeoContext.ts
@@ -144,12 +144,12 @@ export type AsgardeoContextProps = {
   signUp: (...args: any[]) => Promise<any>;
 
   signUpUrl: string | undefined;
-
-  user: any;
   /**
    * Instance ID for multi-instance support.
    */
   instanceId: number;
+
+  user: any;
 } & Pick<AsgardeoReactConfig, 'storage' | 'platform'> &
   Pick<AsgardeoReactClient, 'clearSession' | 'switchOrganization'>;
 
@@ -185,8 +185,8 @@ const AsgardeoContext: Context<AsgardeoContextProps | null> = createContext<null
   signUpUrl: undefined,
   storage: 'sessionStorage',
   switchOrganization: null,
-  user: null,
   instanceId: 0,
+  user: null,
 });
 
 AsgardeoContext.displayName = 'AsgardeoContext';
diff --git a/packages/react/src/contexts/Asgardeo/AsgardeoProvider.tsx b/packages/react/src/contexts/Asgardeo/AsgardeoProvider.tsx
@@ -586,8 +586,8 @@ const AsgardeoProvider: FC<PropsWithChildren<AsgardeoProviderProps>> = ({
       signUpUrl,
       switchOrganization,
       syncSession,
-      user,
       instanceId,
+      user,
     }),
     [
       applicationId,

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ export class AsgardeoAuthClient<T> {`
`250`	`250`	`authRequestConfig['client_secret'] = configData.clientSecret;`
`251`	`251`	`}`
`252`	`252`
`253`		`- authRequestConfig['state'] = 'instance_' + this.getInstanceId() + '-' + configData.clientId;`
	`253`	+ authRequestConfig['state'] = `instance_${this.getInstanceId()}-${configData.clientId}`;
`254`	`254`
`255`	`255`	`const authorizeRequestParams: Map<string, string> = getAuthorizeRequestUrlParams(`
`256`	`256`	`{`