@asgardeo/react 0.5.16 → 0.5.17

package/dist/index.js

@@ -556,31 +556,35 @@ var AsgardeoReactClient = class extends AsgardeoBrowserClient {
     }
   }
   async getDecodedIdToken(sessionId) {
-    return this.asgardeo.getDecodedIdToken(sessionId);
+    return this.withLoading(async () => {
+      return this.asgardeo.getDecodedIdToken(sessionId);
+    });
   }
   async getUserProfile(options) {
-    try {
-      let baseUrl = options?.baseUrl;
-      if (!baseUrl) {
-        const configData = await this.asgardeo.getConfigData();
-        baseUrl = configData?.baseUrl;
+    return this.withLoading(async () => {
+      try {
+        let baseUrl = options?.baseUrl;
+        if (!baseUrl) {
+          const configData = await this.asgardeo.getConfigData();
+          baseUrl = configData?.baseUrl;
+        }
+        const profile = await getScim2Me_default({ baseUrl });
+        const schemas = await getSchemas_default({ baseUrl });
+        const processedSchemas = flattenUserSchema(schemas);
+        const output = {
+          schemas: processedSchemas,
+          flattenedProfile: generateFlattenedUserProfile(profile, processedSchemas),
+          profile
+        };
+        return output;
+      } catch (error) {
+        return {
+          schemas: [],
+          flattenedProfile: extractUserClaimsFromIdToken(await this.getDecodedIdToken()),
+          profile: extractUserClaimsFromIdToken(await this.getDecodedIdToken())
+        };
       }
-      const profile = await getScim2Me_default({ baseUrl });
-      const schemas = await getSchemas_default({ baseUrl });
-      const processedSchemas = flattenUserSchema(schemas);
-      const output = {
-        schemas: processedSchemas,
-        flattenedProfile: generateFlattenedUserProfile(profile, processedSchemas),
-        profile
-      };
-      return output;
-    } catch (error) {
-      return {
-        schemas: [],
-        flattenedProfile: extractUserClaimsFromIdToken(await this.getDecodedIdToken()),
-        profile: extractUserClaimsFromIdToken(await this.getDecodedIdToken())
-      };
-    }
+    });
   }
   async getMyOrganizations(options, sessionId) {
     try {
@@ -617,12 +621,14 @@ var AsgardeoReactClient = class extends AsgardeoBrowserClient {
     }
   }
   async getCurrentOrganization() {
-    const idToken = await this.getDecodedIdToken();
-    return {
-      orgHandle: idToken?.org_handle,
-      name: idToken?.org_name,
-      id: idToken?.org_id
-    };
+    return this.withLoading(async () => {
+      const idToken = await this.getDecodedIdToken();
+      return {
+        orgHandle: idToken?.org_handle,
+        name: idToken?.org_name,
+        id: idToken?.org_id
+      };
+    });
   }
   async switchOrganization(organization, sessionId) {
     return this.withLoading(async () => {
@@ -667,8 +673,8 @@ var AsgardeoReactClient = class extends AsgardeoBrowserClient {
   async isInitialized() {
     return this.asgardeo.isInitialized();
   }
-  isSignedIn() {
-    return this.asgardeo.isSignedIn();
+  async isSignedIn() {
+    return await this.asgardeo.isSignedIn();
   }
   getConfiguration() {
     return this.asgardeo.getConfigData();
@@ -730,7 +736,9 @@ var AsgardeoReactClient = class extends AsgardeoBrowserClient {
     return this.asgardeo.httpRequestAll(requestConfigs);
   }
   async getAccessToken(sessionId) {
-    return this.asgardeo.getAccessToken(sessionId);
+    return this.withLoading(async () => {
+      return this.asgardeo.getAccessToken(sessionId);
+    });
   }
 };
 var AsgardeoReactClient_default = AsgardeoReactClient;
@@ -1401,6 +1409,7 @@ var AsgardeoProvider = ({
     syncSession,
     ...rest
   });
+  const [isUpdatingSession, setIsUpdatingSession] = useState7(false);
   const [brandingPreference, setBrandingPreference] = useState7(null);
   const [isBrandingLoading, setIsBrandingLoading] = useState7(false);
   const [brandingError, setBrandingError] = useState7(null);
@@ -1425,11 +1434,14 @@ var AsgardeoProvider = ({
     }
     reRenderCheckRef.current = true;
     (async () => {
-      if (await asgardeo.isSignedIn()) {
+      const isAlreadySignedIn = await asgardeo.isSignedIn();
+      if (isAlreadySignedIn) {
         await updateSession();
         return;
       }
-      if (hasAuthParams(new URL(window.location.href), afterSignInUrl)) {
+      const currentUrl = new URL(window.location.href);
+      const hasAuthParamsResult = hasAuthParams(currentUrl, afterSignInUrl);
+      if (hasAuthParamsResult) {
         try {
           await signIn(
             { callOnlyOnRedirect: true }
@@ -1441,6 +1453,7 @@ var AsgardeoProvider = ({
           if (error && Object.prototype.hasOwnProperty.call(error, "code")) {
           }
         }
+      } else {
       }
     })();
   }, []);
@@ -1458,6 +1471,7 @@ var AsgardeoProvider = ({
               clearInterval(interval);
             }
           }, 1e3);
+        } else {
         }
       } catch (error) {
         setIsSignedInSync(false);
@@ -1481,28 +1495,40 @@ var AsgardeoProvider = ({
   }, [asgardeo]);
   useEffect5(() => {
     const checkLoadingState = () => {
-      const loadingState = asgardeo.isLoading();
-      setIsLoadingSync(loadingState);
+      if (isUpdatingSession) {
+        return;
+      }
+      setIsLoadingSync(asgardeo.isLoading());
     };
     checkLoadingState();
     const interval = setInterval(checkLoadingState, 100);
     return () => {
       clearInterval(interval);
     };
-  }, [asgardeo]);
+  }, [asgardeo, isLoadingSync, isSignedInSync, isUpdatingSession]);
   const updateSession = async () => {
     try {
+      setIsUpdatingSession(true);
       setIsLoadingSync(true);
       let _baseUrl2 = baseUrl;
-      if ((await asgardeo.getDecodedIdToken())?.["user_org"]) {
+      const decodedToken = await asgardeo.getDecodedIdToken();
+      if (decodedToken?.["user_org"]) {
         _baseUrl2 = `${(await asgardeo.getConfiguration()).baseUrl}/o`;
         setBaseUrl(_baseUrl2);
       }
-      setUser(await asgardeo.getUser({ baseUrl: _baseUrl2 }));
-      setUserProfile(await asgardeo.getUserProfile({ baseUrl: _baseUrl2 }));
-      setCurrentOrganization(await asgardeo.getCurrentOrganization());
-      setMyOrganizations(await asgardeo.getMyOrganizations());
+      const user2 = await asgardeo.getUser({ baseUrl: _baseUrl2 });
+      const userProfile2 = await asgardeo.getUserProfile({ baseUrl: _baseUrl2 });
+      const currentOrganization2 = await asgardeo.getCurrentOrganization();
+      const myOrganizations2 = await asgardeo.getMyOrganizations();
+      setUser(user2);
+      setUserProfile(userProfile2);
+      setCurrentOrganization(currentOrganization2);
+      setMyOrganizations(myOrganizations2);
+      const currentSignInStatus = await asgardeo.isSignedIn();
+      setIsSignedInSync(await asgardeo.isSignedIn());
+    } catch (error) {
     } finally {
+      setIsUpdatingSession(false);
       setIsLoadingSync(asgardeo.isLoading());
     }
   };
@@ -1552,6 +1578,7 @@ var AsgardeoProvider = ({
   ]);
   const signIn = async (...args) => {
     try {
+      setIsUpdatingSession(true);
       setIsLoadingSync(true);
       const response = await asgardeo.signIn(...args);
       if (await asgardeo.isSignedIn()) {
@@ -1561,11 +1588,13 @@ var AsgardeoProvider = ({
     } catch (error) {
       throw new Error(`Error while signing in: ${error}`);
     } finally {
+      setIsUpdatingSession(false);
       setIsLoadingSync(asgardeo.isLoading());
     }
   };
   const signInSilently = async (options) => {
     try {
+      setIsUpdatingSession(true);
       setIsLoadingSync(true);
       const response = await asgardeo.signInSilently(options);
       if (await asgardeo.isSignedIn()) {
@@ -1580,11 +1609,13 @@ var AsgardeoProvider = ({
         "An error occurred while trying to sign in silently."
       );
     } finally {
+      setIsUpdatingSession(false);
       setIsLoadingSync(asgardeo.isLoading());
     }
   };
   const switchOrganization = async (organization) => {
     try {
+      setIsUpdatingSession(true);
       setIsLoadingSync(true);
       await asgardeo.switchOrganization(organization);
       if (await asgardeo.isSignedIn()) {
@@ -1598,6 +1629,7 @@ var AsgardeoProvider = ({
         "An error occurred while switching to the specified organization."
       );
     } finally {
+      setIsUpdatingSession(false);
       setIsLoadingSync(asgardeo.isLoading());
     }
   };