@asgardeo/react 0.5.0 → 0.5.2

package/dist/cjs/index.js

@@ -119,11 +119,16 @@ __export(index_exports, {
   UsernamePassword: () => UsernamePassword_default,
   createField: () => createField,
   createOrganization: () => createOrganization_default,
+  createPatchOperations: () => import_browser60.createPatchOperations,
   createSignInOption: () => createSignInOption,
   createSignInOptionFromAuthenticator: () => createSignInOptionFromAuthenticator,
-  formatMultiValuedString: () => formatMultiValuedString,
+  getAllOrganizations: () => getAllOrganizations_default,
   getMeOrganizations: () => getMeOrganizations_default,
-  parseMultiValuedString: () => parseMultiValuedString,
+  getMeProfile: () => getScim2Me_default,
+  getOrganization: () => getOrganization_default,
+  getSchemas: () => getSchemas_default,
+  updateMeProfile: () => updateMeProfile_default,
+  updateOrganization: () => updateOrganization_default,
   useAsgardeo: () => useAsgardeo_default,
   useBrowserUrl: () => useBrowserUrl_default,
   useFlow: () => useFlow_default,
@@ -144,11 +149,14 @@ var import_react13 = require("react");
 // src/contexts/Asgardeo/AsgardeoContext.ts
 var import_react = require("react");
 var AsgardeoContext = (0, import_react.createContext)({
-  afterSignInUrl: "",
-  baseUrl: "",
+  signInUrl: void 0,
+  signUpUrl: void 0,
+  afterSignInUrl: void 0,
+  baseUrl: void 0,
   isInitialized: false,
   isLoading: true,
   isSignedIn: false,
+  organization: null,
   signIn: null,
   signOut: null,
   signUp: null,
@@ -507,133 +515,78 @@ AuthAPI.DEFAULT_STATE = {
 };
 var api_default = AuthAPI;
 
-// src/api/scim2/getMeOrganizations.ts
+// src/api/getMeOrganizations.ts
 var import_browser2 = require("@asgardeo/browser");
 var httpClient = import_browser2.AsgardeoSPAClient.getInstance().httpRequest.bind(import_browser2.AsgardeoSPAClient.getInstance());
-var getMeOrganizations = async ({
-  baseUrl,
-  after = "",
-  authorizedAppName = "",
-  before = "",
-  filter = "",
-  limit = 10,
-  recursive = false,
-  ...requestConfig
-}) => {
-  if (!baseUrl) {
-    throw new import_browser2.AsgardeoAPIError(
-      "Base URL is required",
-      "getMeOrganizations-ValidationError-001",
-      "javascript",
-      400,
-      "Invalid Request"
-    );
-  }
-  const queryParams = new URLSearchParams(
-    Object.fromEntries(
-      Object.entries({
-        after,
-        authorizedAppName,
-        before,
-        filter,
-        limit: limit.toString(),
-        recursive: recursive.toString()
-      }).filter(([, value]) => Boolean(value))
-    )
-  );
-  const response = await httpClient({
-    headers: {
-      Accept: "application/json",
-      "Content-Type": "application/json"
-    },
-    method: "GET",
-    url: `${baseUrl}/api/users/v1/me/organizations?${queryParams.toString()}`,
-    ...requestConfig
+var getMeOrganizations = async ({ fetcher, ...requestConfig }) => {
+  const defaultFetcher = async (url, config) => {
+    const response = await httpClient({
+      url,
+      method: config.method || "GET",
+      headers: config.headers
+    });
+    return {
+      ok: response.status >= 200 && response.status < 300,
+      status: response.status,
+      statusText: response.statusText || "",
+      json: () => Promise.resolve(response.data),
+      text: () => Promise.resolve(typeof response.data === "string" ? response.data : JSON.stringify(response.data))
+    };
+  };
+  return (0, import_browser2.getMeOrganizations)({
+    ...requestConfig,
+    fetcher: fetcher || defaultFetcher
   });
-  if (!response.data) {
-    const errorText = await response.text();
-    throw new import_browser2.AsgardeoAPIError(
-      `Failed to fetch associated organizations of the user: ${errorText}`,
-      "getMeOrganizations-ResponseError-001",
-      "javascript",
-      response.status,
-      response.statusText
-    );
-  }
-  return response.data.organizations || [];
 };
 var getMeOrganizations_default = getMeOrganizations;
 
-// src/api/scim2/getMeProfile.ts
+// src/api/getScim2Me.ts
 var import_browser3 = require("@asgardeo/browser");
 var httpClient2 = import_browser3.AsgardeoSPAClient.getInstance().httpRequest.bind(import_browser3.AsgardeoSPAClient.getInstance());
-var getMeProfile = async ({ url, ...requestConfig }) => {
-  try {
-    new URL(url);
-  } catch (error) {
-    throw new import_browser3.AsgardeoAPIError(
-      "Invalid endpoint URL provided",
-      "getMeProfile-ValidationError-001",
-      "javascript",
-      400,
-      "Invalid Request"
-    );
-  }
-  const response = await httpClient2({
-    url,
-    method: "GET",
-    headers: {
-      "Content-Type": "application/scim+json",
-      Accept: "application/json"
-    }
+var getScim2Me = async ({ fetcher, ...requestConfig }) => {
+  const defaultFetcher = async (url, config) => {
+    const response = await httpClient2({
+      url,
+      method: config.method || "GET",
+      headers: config.headers
+    });
+    return {
+      ok: response.status >= 200 && response.status < 300,
+      status: response.status,
+      statusText: response.statusText || "",
+      json: () => Promise.resolve(response.data),
+      text: () => Promise.resolve(typeof response.data === "string" ? response.data : JSON.stringify(response.data))
+    };
+  };
+  return (0, import_browser3.getScim2Me)({
+    ...requestConfig,
+    fetcher: fetcher || defaultFetcher
   });
-  if (!response.data) {
-    const errorText = await response.text();
-    throw new import_browser3.AsgardeoAPIError(
-      `Failed to fetch user profile: ${errorText}`,
-      "getMeProfile-ResponseError-001",
-      "javascript",
-      response.status,
-      response.statusText
-    );
-  }
-  return response.data;
 };
-var getMeProfile_default = getMeProfile;
+var getScim2Me_default = getScim2Me;
 
-// src/api/scim2/getSchemas.ts
+// src/api/getSchemas.ts
 var import_browser4 = require("@asgardeo/browser");
 var httpClient3 = import_browser4.AsgardeoSPAClient.getInstance().httpRequest.bind(import_browser4.AsgardeoSPAClient.getInstance());
-var getSchemas = async ({ url }) => {
-  try {
-    new URL(url);
-  } catch (error) {
-    throw new import_browser4.AsgardeoAPIError(
-      "Invalid endpoint URL provided",
-      "getSchemas-ValidationError-001",
-      "javascript",
-      400,
-      "Invalid Request"
-    );
-  }
-  const response = await httpClient3({
-    url,
-    method: "GET",
-    headers: {
-      "Content-Type": "application/json",
-      Accept: "application/json"
-    }
+var getSchemas = async ({ fetcher, ...requestConfig }) => {
+  const defaultFetcher = async (url, config) => {
+    const response = await httpClient3({
+      url,
+      method: config.method || "GET",
+      headers: config.headers
+    });
+    return {
+      ok: response.status >= 200 && response.status < 300,
+      status: response.status,
+      statusText: response.statusText || "",
+      json: () => Promise.resolve(response.data),
+      text: () => Promise.resolve(typeof response.data === "string" ? response.data : JSON.stringify(response.data))
+    };
+  };
+  return (0, import_browser4.getSchemas)({
+    ...requestConfig,
+    fetcher: fetcher || defaultFetcher
   });
-  if (!response.data) {
-    throw new import_browser4.AsgardeoAPIError(
-      `Failed to fetch SCIM2 schemas`,
-      "getSchemas-ResponseError-001",
-      "javascript",
-      response.status,
-      response.statusText
-    );
-  }
-  return response.data;
 };
 var getSchemas_default = getSchemas;
 
@@ -651,8 +604,8 @@ var AsgardeoReactClient = class extends import_browser5.AsgardeoBrowserClient {
     try {
       const configData = await this.asgardeo.getConfigData();
       const baseUrl = configData?.baseUrl;
-      const profile = await getMeProfile_default({ url: `${baseUrl}/scim2/Me` });
-      const schemas = await getSchemas_default({ url: `${baseUrl}/scim2/Schemas` });
+      const profile = await getScim2Me_default({ baseUrl });
+      const schemas = await getSchemas_default({ baseUrl });
       return (0, import_browser5.generateUserProfile)(profile, (0, import_browser5.flattenUserSchema)(schemas));
     } catch (error) {
       return this.asgardeo.getDecodedIdToken();
@@ -662,8 +615,8 @@ var AsgardeoReactClient = class extends import_browser5.AsgardeoBrowserClient {
     try {
       const configData = await this.asgardeo.getConfigData();
       const baseUrl = configData?.baseUrl;
-      const profile = await getMeProfile_default({ url: `${baseUrl}/scim2/Me` });
-      const schemas = await getSchemas_default({ url: `${baseUrl}/scim2/Schemas` });
+      const profile = await getScim2Me_default({ baseUrl });
+      const schemas = await getSchemas_default({ baseUrl });
       const processedSchemas = (0, import_browser5.flattenUserSchema)(schemas);
       const output = {
         schemas: processedSchemas,
@@ -751,6 +704,9 @@ var AsgardeoReactClient = class extends import_browser5.AsgardeoBrowserClient {
   isSignedIn() {
     return this.asgardeo.isSignedIn();
   }
+  getConfiguration() {
+    return this.asgardeo.getConfigData();
+  }
   async signIn(...args) {
     const arg1 = args[0];
     const arg2 = args[1];
@@ -1093,60 +1049,31 @@ var useAsgardeo = () => {
 };
 var useAsgardeo_default = useAsgardeo;
 
-// src/api/scim2/getAllOrganizations.ts
+// src/api/getAllOrganizations.ts
 var import_browser9 = require("@asgardeo/browser");
 var httpClient4 = import_browser9.AsgardeoSPAClient.getInstance().httpRequest.bind(import_browser9.AsgardeoSPAClient.getInstance());
 var getAllOrganizations = async ({
-  baseUrl,
-  filter = "",
-  limit = 10,
-  recursive = false,
+  fetcher,
   ...requestConfig
 }) => {
-  if (!baseUrl) {
-    throw new import_browser9.AsgardeoAPIError(
-      "Base URL is required",
-      "getAllOrganizations-ValidationError-001",
-      "javascript",
-      400,
-      "Invalid Request"
-    );
-  }
-  const queryParams = new URLSearchParams(
-    Object.fromEntries(
-      Object.entries({
-        filter,
-        limit: limit.toString(),
-        recursive: recursive.toString()
-      }).filter(([, value]) => Boolean(value))
-    )
-  );
-  const response = await httpClient4({
-    headers: {
-      Accept: "application/json",
-      "Content-Type": "application/json"
-    },
-    method: "GET",
-    url: `${baseUrl}/api/server/v1/organizations?${queryParams.toString()}`,
-    ...requestConfig
-  });
-  if (!response.data) {
-    const errorText = await response.text();
-    throw new import_browser9.AsgardeoAPIError(
-      errorText || "Failed to get organizations",
-      "getAllOrganizations-NetworkError-001",
-      "javascript",
-      response.status,
-      response.statusText
-    );
-  }
-  const { data } = response;
-  return {
-    hasMore: data.hasMore,
-    nextCursor: data.nextCursor,
-    organizations: data.organizations || [],
-    totalCount: data.totalCount
+  const defaultFetcher = async (url, config) => {
+    const response = await httpClient4({
+      url,
+      method: config.method || "GET",
+      headers: config.headers
+    });
+    return {
+      ok: response.status >= 200 && response.status < 300,
+      status: response.status,
+      statusText: response.statusText || "",
+      json: () => Promise.resolve(response.data),
+      text: () => Promise.resolve(typeof response.data === "string" ? response.data : JSON.stringify(response.data))
+    };
   };
+  return (0, import_browser9.getAllOrganizations)({
+    ...requestConfig,
+    fetcher: fetcher || defaultFetcher
+  });
 };
 var getAllOrganizations_default = getAllOrganizations;
 
@@ -1430,6 +1357,8 @@ var AsgardeoProvider = ({
   children,
   scopes,
   preferences,
+  signInUrl,
+  signUpUrl,
   ...rest
 }) => {
   const reRenderCheckRef = (0, import_react13.useRef)(false);
@@ -1448,6 +1377,8 @@ var AsgardeoProvider = ({
         baseUrl,
         clientId,
         scopes,
+        signUpUrl,
+        signInUrl,
         ...rest
       });
     })();
@@ -1567,11 +1498,14 @@ var AsgardeoProvider = ({
     AsgardeoContext_default.Provider,
     {
       value: {
+        signInUrl,
+        signUpUrl,
         afterSignInUrl,
         baseUrl,
         isInitialized: isInitializedSync,
         isLoading: asgardeo.isLoading(),
         isSignedIn: isSignedInSync,
+        organization: currentOrganization,
         signIn,
         signOut,
         signUp,
@@ -2242,20 +2176,25 @@ var import_browser17 = require("@asgardeo/browser");
 var import_react23 = require("react");
 var import_jsx_runtime10 = require("react/jsx-runtime");
 var SignInButton = (0, import_react23.forwardRef)(({ children, onClick, preferences, ...rest }, ref) => {
-  const { signIn } = useAsgardeo_default();
+  const { signIn, signInUrl } = useAsgardeo_default();
   const { t } = useTranslation_default(preferences?.i18n);
   const [isLoading, setIsLoading] = (0, import_react23.useState)(false);
   const handleSignIn = async (e) => {
     try {
       setIsLoading(true);
-      await signIn();
+      if (signInUrl) {
+        window.history.pushState(null, "", signInUrl);
+        window.dispatchEvent(new PopStateEvent("popstate", { state: null }));
+      } else {
+        await signIn();
+      }
       if (onClick) {
         onClick(e);
       }
     } catch (error) {
       throw new import_browser17.AsgardeoRuntimeError(
         `Sign in failed: ${error instanceof Error ? error.message : String(error)}`,
-        "handleSignIn-RuntimeError-001",
+        "SignInButton-handleSignIn-RuntimeError-001",
         "react",
         "Something went wrong while trying to sign in. Please try again later."
       );
@@ -2327,7 +2266,7 @@ var SignOutButton = (0, import_react25.forwardRef)(({ children, onClick, prefere
     } catch (error) {
       throw new import_browser19.AsgardeoRuntimeError(
         `Sign out failed: ${error instanceof Error ? error.message : String(error)}`,
-        "handleSignOut-RuntimeError-001",
+        "SignOutButton-handleSignOut-RuntimeError-001",
         "react",
         "Something went wrong while trying to sign out. Please try again later."
       );
@@ -2386,20 +2325,25 @@ var import_browser21 = require("@asgardeo/browser");
 var import_react27 = require("react");
 var import_jsx_runtime14 = require("react/jsx-runtime");
 var SignUpButton = (0, import_react27.forwardRef)(({ children, onClick, preferences, ...rest }, ref) => {
-  const { signUp } = useAsgardeo_default();
+  const { signUp, signUpUrl } = useAsgardeo_default();
   const { t } = useTranslation_default(preferences?.i18n);
   const [isLoading, setIsLoading] = (0, import_react27.useState)(false);
   const handleSignUp = async (e) => {
     try {
       setIsLoading(true);
-      await signUp();
+      if (signUpUrl) {
+        window.history.pushState(null, "", signUpUrl);
+        window.dispatchEvent(new PopStateEvent("popstate", { state: null }));
+      } else {
+        await signUp();
+      }
       if (onClick) {
         onClick(e);
       }
     } catch (error) {
       throw new import_browser21.AsgardeoRuntimeError(
         `Sign up failed: ${error instanceof Error ? error.message : String(error)}`,
-        "handleSignUp-RuntimeError-001",
+        "SignUpButton-handleSignUp-RuntimeError-001",
         "react",
         "Something went wrong while trying to sign up. Please try again later."
       );
@@ -2465,7 +2409,7 @@ var AsgardeoLoading = ({
   }
   return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(import_jsx_runtime17.Fragment, { children });
 };
-AsgardeoLoading.displayName = "Loading";
+AsgardeoLoading.displayName = "AsgardeoLoading";
 var AsgardeoLoading_default = AsgardeoLoading;
 
 // src/components/presentation/SignIn/BaseSignIn.tsx
@@ -3253,13 +3197,6 @@ var Checkbox_default = Checkbox;
 // src/components/factories/FieldFactory.tsx
 var import_browser27 = require("@asgardeo/browser");
 var import_jsx_runtime29 = require("react/jsx-runtime");
-var parseMultiValuedString = (value) => {
-  if (!value || value.trim() === "") return [];
-  return value.split(",").map((item) => item.trim()).filter((item) => item.length > 0);
-};
-var formatMultiValuedString = (values) => {
-  return values.join(", ");
-};
 var validateFieldValue = (value, type, required = false, touched = false) => {
   if (required && touched && (!value || value.trim() === "")) {
     return "This field is required";
@@ -4814,11 +4751,6 @@ var handleWebAuthnAuthentication = async (challengeData) => {
         }))
       }
     };
-    console.log("WebAuthn authentication with options:", {
-      originalRpId: challengeRpId,
-      adjustedRpId: rpIdToUse,
-      currentDomain
-    });
     const credential = await navigator.credentials.get({
       publicKey: adjustedOptions
     });
@@ -4882,6 +4814,7 @@ var BaseSignIn = (props) => /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(FlowPr
 var BaseSignInContent = ({
   afterSignInUrl,
   onInitialize,
+  isLoading: externalIsLoading,
   onSubmit,
   onSuccess,
   onError,
@@ -4896,13 +4829,14 @@ var BaseSignInContent = ({
 }) => {
   const { t } = useTranslation_default();
   const { subtitle: flowSubtitle, title: flowTitle, messages: flowMessages } = useFlow_default();
-  const [isLoading, setIsLoading] = (0, import_react38.useState)(false);
+  const [isSignInInitializationRequestLoading, setIsSignInInitializationRequestLoading] = (0, import_react38.useState)(false);
   const [isInitialized, setIsInitialized] = (0, import_react38.useState)(false);
   const [currentFlow, setCurrentFlow] = (0, import_react38.useState)(null);
   const [currentAuthenticator, setCurrentAuthenticator] = (0, import_react38.useState)(null);
   const [error, setError] = (0, import_react38.useState)(null);
   const [messages, setMessages] = (0, import_react38.useState)([]);
-  const initializationAttemptedRef = (0, import_react38.useRef)(false);
+  const isLoading = externalIsLoading || isSignInInitializationRequestLoading;
+  const reRenderCheckRef = (0, import_react38.useRef)(false);
   const formFields = currentAuthenticator?.metadata?.params?.map((param) => ({
     name: param.param,
     required: currentAuthenticator.requiredParams.includes(param.param),
@@ -4951,7 +4885,7 @@ var BaseSignInContent = ({
     touchAllFields();
   };
   const handleRedirectionIfNeeded = (response) => {
-    if ("nextStep" in response && response.nextStep && response.nextStep.stepType === import_browser38.EmbeddedSignInFlowStepType.AuthenticatorPrompt && response.nextStep.authenticators && response.nextStep.authenticators.length === 1) {
+    if (response && "nextStep" in response && response.nextStep && response.nextStep.stepType === import_browser38.EmbeddedSignInFlowStepType.AuthenticatorPrompt && response.nextStep.authenticators && response.nextStep.authenticators.length === 1) {
       const responseAuthenticator = response.nextStep.authenticators[0];
       if (responseAuthenticator.metadata?.promptType === import_browser38.EmbeddedSignInFlowAuthenticatorPromptType.RedirectionPrompt && responseAuthenticator.metadata?.additionalData?.redirectUrl) {
         const redirectUrl = responseAuthenticator.metadata?.additionalData?.redirectUrl;
@@ -5039,7 +4973,7 @@ var BaseSignInContent = ({
                   });
                   popup.close();
                   onFlowChange?.(response2);
-                  if (response2.flowStatus === import_browser38.EmbeddedSignInFlowStatus.SuccessCompleted) {
+                  if (response2?.flowStatus === import_browser38.EmbeddedSignInFlowStatus.SuccessCompleted) {
                     onSuccess?.(response2.authData);
                   }
                 }
@@ -5064,7 +4998,7 @@ var BaseSignInContent = ({
     if (!validation.isValid) {
       return;
     }
-    setIsLoading(true);
+    setIsSignInInitializationRequestLoading(true);
     setError(null);
     setMessages([]);
     try {
@@ -5080,18 +5014,18 @@ var BaseSignInContent = ({
         url: currentFlow?.links[0].href
       });
       onFlowChange?.(response);
-      if (response.flowStatus === import_browser38.EmbeddedSignInFlowStatus.SuccessCompleted) {
+      if (response?.flowStatus === import_browser38.EmbeddedSignInFlowStatus.SuccessCompleted) {
         onSuccess?.(response.authData);
         return;
       }
-      if (response.flowStatus === import_browser38.EmbeddedSignInFlowStatus.FailCompleted || response.flowStatus === import_browser38.EmbeddedSignInFlowStatus.FailIncomplete) {
+      if (response?.flowStatus === import_browser38.EmbeddedSignInFlowStatus.FailCompleted || response?.flowStatus === import_browser38.EmbeddedSignInFlowStatus.FailIncomplete) {
         setError(t("errors.sign.in.flow.completion.failure"));
         return;
       }
       if (handleRedirectionIfNeeded(response)) {
         return;
       }
-      if ("flowId" in response && "nextStep" in response) {
+      if (response && "flowId" in response && "nextStep" in response) {
         const nextStepResponse = response;
         setCurrentFlow(nextStepResponse);
         if (nextStepResponse.nextStep?.authenticators?.length > 0) {
@@ -5117,7 +5051,7 @@ var BaseSignInContent = ({
       setError(errorMessage);
       onError?.(err);
     } finally {
-      setIsLoading(false);
+      setIsSignInInitializationRequestLoading(false);
     }
   };
   const handleAuthenticatorSelection = async (authenticator, formData) => {
@@ -5127,7 +5061,7 @@ var BaseSignInContent = ({
     if (formData) {
       touchAllFields();
     }
-    setIsLoading(true);
+    setIsSignInInitializationRequestLoading(true);
     setError(null);
     setMessages([]);
     try {
@@ -5152,15 +5086,15 @@ var BaseSignInContent = ({
             url: currentFlow?.links[0].href
           });
           onFlowChange?.(response);
-          if (response.flowStatus === import_browser38.EmbeddedSignInFlowStatus.SuccessCompleted) {
+          if (response?.flowStatus === import_browser38.EmbeddedSignInFlowStatus.SuccessCompleted) {
             onSuccess?.(response.authData);
             return;
           }
-          if (response.flowStatus === import_browser38.EmbeddedSignInFlowStatus.FailCompleted || response.flowStatus === import_browser38.EmbeddedSignInFlowStatus.FailIncomplete) {
+          if (response?.flowStatus === import_browser38.EmbeddedSignInFlowStatus.FailCompleted || response?.flowStatus === import_browser38.EmbeddedSignInFlowStatus.FailIncomplete) {
             setError(t("errors.sign.in.flow.passkeys.completion.failure"));
             return;
           }
-          if ("flowId" in response && "nextStep" in response) {
+          if (response && "flowId" in response && "nextStep" in response) {
             const nextStepResponse = response;
             setCurrentFlow(nextStepResponse);
             if (nextStepResponse.nextStep?.authenticators?.length > 0) {
@@ -5206,7 +5140,7 @@ var BaseSignInContent = ({
           url: currentFlow?.links[0].href
         });
         onFlowChange?.(response);
-        if (response.flowStatus === import_browser38.EmbeddedSignInFlowStatus.SuccessCompleted) {
+        if (response?.flowStatus === import_browser38.EmbeddedSignInFlowStatus.SuccessCompleted) {
           onSuccess?.(response.authData);
           return;
         }
@@ -5229,18 +5163,18 @@ var BaseSignInContent = ({
           url: currentFlow?.links[0].href
         });
         onFlowChange?.(response);
-        if (response.flowStatus === import_browser38.EmbeddedSignInFlowStatus.SuccessCompleted) {
+        if (response?.flowStatus === import_browser38.EmbeddedSignInFlowStatus.SuccessCompleted) {
           onSuccess?.(response.authData);
           return;
         }
-        if (response.flowStatus === import_browser38.EmbeddedSignInFlowStatus.FailCompleted || response.flowStatus === import_browser38.EmbeddedSignInFlowStatus.FailIncomplete) {
+        if (response?.flowStatus === import_browser38.EmbeddedSignInFlowStatus.FailCompleted || response?.flowStatus === import_browser38.EmbeddedSignInFlowStatus.FailIncomplete) {
           setError("Authentication failed. Please check your credentials and try again.");
           return;
         }
         if (handleRedirectionIfNeeded(response)) {
           return;
         }
-        if ("flowId" in response && "nextStep" in response) {
+        if (response && "flowId" in response && "nextStep" in response) {
           const nextStepResponse = response;
           setCurrentFlow(nextStepResponse);
           if (nextStepResponse.nextStep?.authenticators?.length > 0) {
@@ -5280,18 +5214,18 @@ var BaseSignInContent = ({
             url: currentFlow?.links[0].href
           });
           onFlowChange?.(response);
-          if (response.flowStatus === import_browser38.EmbeddedSignInFlowStatus.SuccessCompleted) {
+          if (response?.flowStatus === import_browser38.EmbeddedSignInFlowStatus.SuccessCompleted) {
             onSuccess?.(response.authData);
             return;
           }
-          if (response.flowStatus === import_browser38.EmbeddedSignInFlowStatus.FailCompleted || response.flowStatus === import_browser38.EmbeddedSignInFlowStatus.FailIncomplete) {
+          if (response?.flowStatus === import_browser38.EmbeddedSignInFlowStatus.FailCompleted || response?.flowStatus === import_browser38.EmbeddedSignInFlowStatus.FailIncomplete) {
             setError("Authentication failed. Please try again.");
             return;
           }
           if (handleRedirectionIfNeeded(response)) {
             return;
           }
-          if ("flowId" in response && "nextStep" in response) {
+          if (response && "flowId" in response && "nextStep" in response) {
             const nextStepResponse = response;
             setCurrentFlow(nextStepResponse);
             if (nextStepResponse.nextStep?.authenticators?.length > 0) {
@@ -5322,11 +5256,11 @@ var BaseSignInContent = ({
         }
       }
     } catch (err) {
-      const errorMessage = err instanceof import_browser38.AsgardeoAPIError ? err.message : "Authenticator selection failed";
+      const errorMessage = err instanceof import_browser38.AsgardeoAPIError ? err?.message : "Authenticator selection failed";
       setError(errorMessage);
       onError?.(err);
     } finally {
-      setIsLoading(false);
+      setIsSignInInitializationRequestLoading(false);
     }
   };
   const handleInputChange = (param, value) => {
@@ -5370,52 +5304,52 @@ var BaseSignInContent = ({
   const errorClasses = (0, import_clsx15.clsx)([(0, import_browser38.withVendorCSSClassPrefix)("signin__error")], errorClassName);
   const messageClasses = (0, import_clsx15.clsx)([(0, import_browser38.withVendorCSSClassPrefix)("signin__messages")], messageClassName);
   (0, import_react38.useEffect)(() => {
-    if (!isInitialized && !initializationAttemptedRef.current) {
-      initializationAttemptedRef.current = true;
-      const performInitialization = async () => {
-        setIsLoading(true);
-        setError(null);
-        try {
-          const response = await onInitialize();
-          setCurrentFlow(response);
-          setIsInitialized(true);
-          onFlowChange?.(response);
-          if (response?.flowStatus === import_browser38.EmbeddedSignInFlowStatus.SuccessCompleted) {
-            onSuccess?.(response.authData || {});
-            return;
-          }
-          if (response?.nextStep?.authenticators?.length > 0) {
-            if (response.nextStep.stepType === import_browser38.EmbeddedSignInFlowStepType.MultiOptionsPrompt && response.nextStep.authenticators.length > 1) {
-              setCurrentAuthenticator(null);
-            } else {
-              const authenticator = response.nextStep.authenticators[0];
-              setCurrentAuthenticator(authenticator);
-              setupFormFields(authenticator);
-            }
-          }
-          if (response && "nextStep" in response && response.nextStep && "messages" in response.nextStep) {
-            const stepMessages = response.nextStep.messages || [];
-            setMessages(
-              stepMessages.map((msg) => ({
-                type: msg.type || "INFO",
-                message: msg.message || ""
-              }))
-            );
+    if (isLoading) {
+      return;
+    }
+    if (reRenderCheckRef.current) {
+      return;
+    }
+    reRenderCheckRef.current = true;
+    (async () => {
+      setIsSignInInitializationRequestLoading(true);
+      setError(null);
+      try {
+        const response = await onInitialize();
+        setCurrentFlow(response);
+        setIsInitialized(true);
+        onFlowChange?.(response);
+        if (response?.flowStatus === import_browser38.EmbeddedSignInFlowStatus.SuccessCompleted) {
+          onSuccess?.(response.authData || {});
+          return;
+        }
+        if (response?.nextStep?.authenticators?.length > 0) {
+          if (response.nextStep.stepType === import_browser38.EmbeddedSignInFlowStepType.MultiOptionsPrompt && response.nextStep.authenticators.length > 1) {
+            setCurrentAuthenticator(null);
+          } else {
+            const authenticator = response.nextStep.authenticators[0];
+            setCurrentAuthenticator(authenticator);
+            setupFormFields(authenticator);
           }
-        } catch (err) {
-          const errorMessage = err instanceof import_browser38.AsgardeoAPIError ? err.message : t("errors.sign.in.initialization");
-          setError(errorMessage);
-          onError?.(err);
-        } finally {
-          setIsLoading(false);
         }
-      };
-      performInitialization();
-    }
-    return () => {
-      initializationAttemptedRef.current = false;
-    };
-  }, [isInitialized]);
+        if (response && "nextStep" in response && response.nextStep && "messages" in response.nextStep) {
+          const stepMessages = response.nextStep.messages || [];
+          setMessages(
+            stepMessages.map((msg) => ({
+              type: msg.type || "INFO",
+              message: msg.message || ""
+            }))
+          );
+        }
+      } catch (err) {
+        const errorMessage = err instanceof import_browser38.AsgardeoAPIError ? err.message : t("errors.sign.in.initialization");
+        setError(errorMessage);
+        onError?.(err);
+      } finally {
+        setIsSignInInitializationRequestLoading(false);
+      }
+    })();
+  }, [isLoading]);
   if (!isInitialized && isLoading) {
     return /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Card_default, { className: containerClasses, variant, children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Card_default.Content, { children: /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)("div", { style: { display: "flex", flexDirection: "column", alignItems: "center", padding: "2rem" }, children: [
       /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Spinner_default, { size: "medium" }),
@@ -5575,9 +5509,13 @@ var BaseSignIn_default = BaseSignIn;
 // src/components/presentation/SignIn/SignIn.tsx
 var import_jsx_runtime52 = require("react/jsx-runtime");
 var SignIn = ({ className, size = "medium", variant = "outlined" }) => {
-  const { signIn, afterSignInUrl } = useAsgardeo_default();
-  const handleInitialize = async () => await signIn({ response_mode: "direct" });
-  const handleOnSubmit = async (payload, request) => await signIn(payload, request);
+  const { signIn, afterSignInUrl, isInitialized, isLoading } = useAsgardeo_default();
+  const handleInitialize = async () => {
+    return await signIn({ response_mode: "direct" });
+  };
+  const handleOnSubmit = async (payload, request) => {
+    return await signIn(payload, request);
+  };
   const handleSuccess = (authData) => {
     if (authData && afterSignInUrl) {
       const url = new URL(afterSignInUrl, window.location.origin);
@@ -5592,6 +5530,7 @@ var SignIn = ({ className, size = "medium", variant = "outlined" }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
     BaseSignIn_default,
     {
+      isLoading: isLoading || !isInitialized,
       afterSignInUrl,
       onInitialize: handleInitialize,
       onSubmit: handleOnSubmit,
@@ -6623,12 +6562,12 @@ var BaseOrganization_default = BaseOrganization;
 
 // src/components/presentation/Organization/Organization.tsx
 var import_jsx_runtime66 = require("react/jsx-runtime");
-var Organization6 = ({ children, fallback = null }) => {
+var Organization5 = ({ children, fallback = null }) => {
   const { currentOrganization } = useOrganization_default();
   return /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(BaseOrganization_default, { organization: currentOrganization, fallback, children });
 };
-Organization6.displayName = "Organization";
-var Organization_default = Organization6;
+Organization5.displayName = "Organization";
+var Organization_default = Organization5;
 
 // src/components/presentation/UserProfile/BaseUserProfile.tsx
 var import_browser51 = require("@asgardeo/browser");
@@ -7652,55 +7591,29 @@ var useStyles4 = () => {
 };
 var BaseUserProfile_default = BaseUserProfile;
 
-// src/api/scim2/updateMeProfile.ts
+// src/api/updateMeProfile.ts
 var import_browser52 = require("@asgardeo/browser");
 var httpClient5 = import_browser52.AsgardeoSPAClient.getInstance().httpRequest.bind(import_browser52.AsgardeoSPAClient.getInstance());
-var updateMeProfile = async ({
-  url,
-  payload,
-  ...requestConfig
-}) => {
-  try {
-    new URL(url);
-  } catch (error) {
-    throw new import_browser52.AsgardeoAPIError(
-      "Invalid endpoint URL provided",
-      "updateMeProfile-ValidationError-001",
-      "javascript",
-      400,
-      "Invalid Request"
-    );
-  }
-  const data = {
-    Operations: [
-      {
-        op: "replace",
-        value: payload
-      }
-    ],
-    schemas: ["urn:ietf:params:scim:api:messages:2.0:PatchOp"]
+var updateMeProfile = async ({ fetcher, ...requestConfig }) => {
+  const defaultFetcher = async (url, config) => {
+    const response = await httpClient5({
+      url,
+      method: config.method || "PATCH",
+      headers: config.headers,
+      data: config.body ? JSON.parse(config.body) : void 0
+    });
+    return {
+      ok: response.status >= 200 && response.status < 300,
+      status: response.status,
+      statusText: response.statusText || "",
+      json: () => Promise.resolve(response.data),
+      text: () => Promise.resolve(typeof response.data === "string" ? response.data : JSON.stringify(response.data))
+    };
   };
-  const response = await httpClient5({
-    url,
-    method: "PATCH",
-    headers: {
-      "Content-Type": "application/scim+json",
-      Accept: "application/json"
-    },
-    data,
-    ...requestConfig
+  return (0, import_browser52.updateMeProfile)({
+    ...requestConfig,
+    fetcher: fetcher || defaultFetcher
   });
-  if (!response.data) {
-    const errorText = await response.text();
-    throw new import_browser52.AsgardeoAPIError(
-      `Failed to update user profile: ${errorText}`,
-      "updateMeProfile-ResponseError-001",
-      "javascript",
-      response.status,
-      response.statusText
-    );
-  }
-  return response.data;
 };
 var updateMeProfile_default = updateMeProfile;
 
@@ -7710,7 +7623,7 @@ var UserProfile3 = ({ ...rest }) => {
   const { baseUrl } = useAsgardeo_default();
   const { profile, flattenedProfile, schemas, revalidateProfile } = useUser_default();
   const handleProfileUpdate = async (payload) => {
-    await updateMeProfile_default({ url: `${baseUrl}/scim2/Me`, payload });
+    await updateMeProfile_default({ baseUrl, payload });
     await revalidateProfile();
   };
   return /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(
@@ -8072,7 +7985,7 @@ var UserDropdown = ({
   };
   const handleSignOut = () => {
     signOut();
-    onSignOut();
+    onSignOut && onSignOut();
   };
   const closeProfile = () => {
     setIsProfileOpen(false);
@@ -8751,8 +8664,6 @@ var BaseCreateOrganization = ({
   const styles = useStyles7();
   const { theme } = useTheme_default();
   const { t } = useTranslation_default();
-  const [avatarUrl, setAvatarUrl] = (0, import_react49.useState)("");
-  const [avatarFile, setAvatarFile] = (0, import_react49.useState)(null);
   const [formData, setFormData] = (0, import_react49.useState)({
     description: "",
     handle: "",
@@ -8788,35 +8699,6 @@ var BaseCreateOrganization = ({
       }));
     }
   };
-  const handleAvatarUpload = (event) => {
-    const file = event.target.files?.[0];
-    if (file) {
-      if (!file.type.startsWith("image/")) {
-        setFormErrors((prev) => ({
-          ...prev,
-          avatar: "Please select a valid image file"
-        }));
-        return;
-      }
-      if (file.size > 2 * 1024 * 1024) {
-        setFormErrors((prev) => ({
-          ...prev,
-          avatar: "Image size must be less than 2MB"
-        }));
-        return;
-      }
-      setAvatarFile(file);
-      const reader = new FileReader();
-      reader.onload = (e) => {
-        setAvatarUrl(e.target?.result);
-      };
-      reader.readAsDataURL(file);
-      setFormErrors((prev) => ({
-        ...prev,
-        avatar: void 0
-      }));
-    }
-  };
   const handleNameChange = (value) => {
     handleInputChange("name", value);
     if (!formData.handle || formData.handle === generateHandleFromName(formData.name)) {
@@ -8848,7 +8730,6 @@ var BaseCreateOrganization = ({
       console.error("Form submission error:", submitError);
     }
   };
-  const defaultRenderHeader = () => /* @__PURE__ */ (0, import_jsx_runtime81.jsx)("div", { className: (0, import_browser55.withVendorCSSClassPrefix)("create-organization__header"), style: styles.header, children: /* @__PURE__ */ (0, import_jsx_runtime81.jsx)(Typography_default, { variant: "h6", component: "h2", children: t("organization.create.title") }) });
   const containerStyle = {
     ...styles.root,
     ...cardLayout ? styles.card : {}
@@ -8933,57 +8814,29 @@ var BaseCreateOrganization = ({
   return createOrganizationContent;
 };
 
-// src/api/scim2/createOrganization.ts
+// src/api/createOrganization.ts
 var import_browser56 = require("@asgardeo/browser");
 var httpClient6 = import_browser56.AsgardeoSPAClient.getInstance().httpRequest.bind(import_browser56.AsgardeoSPAClient.getInstance());
-var createOrganization = async ({
-  baseUrl,
-  payload,
-  ...requestConfig
-}) => {
-  if (!baseUrl) {
-    throw new import_browser56.AsgardeoAPIError(
-      "Base URL is required",
-      "createOrganization-ValidationError-001",
-      "javascript",
-      400,
-      "Invalid Request"
-    );
-  }
-  if (!payload) {
-    throw new import_browser56.AsgardeoAPIError(
-      "Organization payload is required",
-      "createOrganization-ValidationError-002",
-      "javascript",
-      400,
-      "Invalid Request"
-    );
-  }
-  const organizationPayload = {
-    ...payload,
-    type: "TENANT"
+var createOrganization = async ({ fetcher, ...requestConfig }) => {
+  const defaultFetcher = async (url, config) => {
+    const response = await httpClient6({
+      url,
+      method: config.method || "POST",
+      headers: config.headers,
+      data: config.body ? JSON.parse(config.body) : void 0
+    });
+    return {
+      ok: response.status >= 200 && response.status < 300,
+      status: response.status,
+      statusText: response.statusText || "",
+      json: () => Promise.resolve(response.data),
+      text: () => Promise.resolve(typeof response.data === "string" ? response.data : JSON.stringify(response.data))
+    };
   };
-  const response = await httpClient6({
-    data: JSON.stringify(organizationPayload),
-    headers: {
-      Accept: "application/json",
-      "Content-Type": "application/json"
-    },
-    method: "POST",
-    url: `${baseUrl}/api/server/v1/organizations`,
-    ...requestConfig
+  return (0, import_browser56.createOrganization)({
+    ...requestConfig,
+    fetcher: fetcher || defaultFetcher
   });
-  if (!response.data) {
-    const errorText = await response.text();
-    throw new import_browser56.AsgardeoAPIError(
-      `Failed to create organization: ${errorText}`,
-      "createOrganization-ResponseError-001",
-      "javascript",
-      response.status,
-      response.statusText
-    );
-  }
-  return response.data;
 };
 var createOrganization_default = createOrganization;
 
@@ -9820,129 +9673,56 @@ var useStyles8 = () => {
 };
 var BaseOrganizationProfile_default = BaseOrganizationProfile;
 
-// src/api/scim2/getOrganization.ts
+// src/api/getOrganization.ts
 var import_browser59 = require("@asgardeo/browser");
 var httpClient7 = import_browser59.AsgardeoSPAClient.getInstance().httpRequest.bind(import_browser59.AsgardeoSPAClient.getInstance());
-var getOrganization = async ({
-  baseUrl,
-  organizationId,
-  ...requestConfig
-}) => {
-  if (!baseUrl) {
-    throw new import_browser59.AsgardeoAPIError(
-      "Base URL is required",
-      "getOrganization-ValidationError-001",
-      "javascript",
-      400,
-      "Invalid Request"
-    );
-  }
-  if (!organizationId) {
-    throw new import_browser59.AsgardeoAPIError(
-      "Organization ID is required",
-      "getOrganization-ValidationError-002",
-      "javascript",
-      400,
-      "Invalid Request"
-    );
-  }
-  const response = await httpClient7({
-    headers: {
-      Accept: "application/json",
-      "Content-Type": "application/json"
-    },
-    method: "GET",
-    url: `${baseUrl}/api/server/v1/organizations/${organizationId}`,
-    ...requestConfig
+var getOrganization = async ({ fetcher, ...requestConfig }) => {
+  const defaultFetcher = async (url, config) => {
+    const response = await httpClient7({
+      url,
+      method: config.method || "GET",
+      headers: config.headers
+    });
+    return {
+      ok: response.status >= 200 && response.status < 300,
+      status: response.status,
+      statusText: response.statusText || "",
+      json: () => Promise.resolve(response.data),
+      text: () => Promise.resolve(typeof response.data === "string" ? response.data : JSON.stringify(response.data))
+    };
+  };
+  return (0, import_browser59.getOrganization)({
+    ...requestConfig,
+    fetcher: fetcher || defaultFetcher
   });
-  if (!response.data) {
-    const errorText = await response.text();
-    throw new import_browser59.AsgardeoAPIError(
-      `Failed to fetch organization details: ${errorText}`,
-      "getOrganization-ResponseError-001",
-      "javascript",
-      response.status,
-      response.statusText
-    );
-  }
-  return response.data;
 };
 var getOrganization_default = getOrganization;
 
-// src/api/scim2/updateOrganization.ts
+// src/api/updateOrganization.ts
 var import_browser60 = require("@asgardeo/browser");
 var httpClient8 = import_browser60.AsgardeoSPAClient.getInstance().httpRequest.bind(import_browser60.AsgardeoSPAClient.getInstance());
 var updateOrganization = async ({
-  baseUrl,
-  organizationId,
-  operations,
+  fetcher,
   ...requestConfig
 }) => {
-  try {
-    new URL(baseUrl);
-  } catch (error) {
-    throw new import_browser60.AsgardeoAPIError(
-      "Invalid base URL provided",
-      "updateOrganization-ValidationError-001",
-      "javascript",
-      400,
-      "Invalid Request"
-    );
-  }
-  if (!organizationId) {
-    throw new import_browser60.AsgardeoAPIError(
-      "Organization ID is required",
-      "updateOrganization-ValidationError-002",
-      "javascript",
-      400,
-      "Invalid Request"
-    );
-  }
-  if (!operations || !Array.isArray(operations) || operations.length === 0) {
-    throw new import_browser60.AsgardeoAPIError(
-      "Operations array is required and cannot be empty",
-      "updateOrganization-ValidationError-003",
-      "javascript",
-      400,
-      "Invalid Request"
-    );
-  }
-  const url = `${baseUrl}/api/server/v1/organizations/${organizationId}`;
-  const response = await httpClient8({
-    url,
-    method: "PATCH",
-    headers: {
-      "Content-Type": "application/json",
-      Accept: "application/json"
-    },
-    data: operations,
-    ...requestConfig
-  });
-  if (!response.data) {
-    const errorText = await response.text();
-    throw new import_browser60.AsgardeoAPIError(
-      `Failed to update organization: ${errorText}`,
-      "updateOrganization-ResponseError-001",
-      "javascript",
-      response.status,
-      response.statusText
-    );
-  }
-  return response.data;
-};
-var createPatchOperations = (payload) => {
-  return Object.entries(payload).map(([key, value]) => {
-    if ((0, import_browser60.isEmpty)(value)) {
-      return {
-        operation: "REMOVE",
-        path: `/${key}`
-      };
-    }
+  const defaultFetcher = async (url, config) => {
+    const response = await httpClient8({
+      url,
+      method: config.method || "PATCH",
+      headers: config.headers,
+      data: config.body ? JSON.parse(config.body) : void 0
+    });
     return {
-      operation: "REPLACE",
-      path: `/${key}`,
-      value
+      ok: response.status >= 200 && response.status < 300,
+      status: response.status,
+      statusText: response.statusText || "",
+      json: () => Promise.resolve(response.data),
+      text: () => Promise.resolve(typeof response.data === "string" ? response.data : JSON.stringify(response.data))
     };
+  };
+  return (0, import_browser60.updateOrganization)({
+    ...requestConfig,
+    fetcher: fetcher || defaultFetcher
   });
 };
 var updateOrganization_default = updateOrganization;
@@ -9993,7 +9773,7 @@ var OrganizationProfile = ({
   const handleOrganizationUpdate = async (payload) => {
     if (!baseUrl || !organizationId) return;
     try {
-      const operations = createPatchOperations(payload);
+      const operations = (0, import_browser60.createPatchOperations)(payload);
       await updateOrganization_default({
         baseUrl,
         organizationId,