feat: isLoading state (#577)

Co-authored-by: Patrick Ammann <patrick.ammann@siemens.com>
bjerkio · Apr 10, 2021 · b24e9ff · b24e9ff
1 parent 57536f2
commit b24e9ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/AuthContext.tsx b/src/AuthContext.tsx
@@ -79,6 +79,7 @@ export const AuthProvider: FC<AuthProviderProps> = ({
   location = window.location,
   ...props
 }) => {
+  const [isLoading, setIsLoading] = useState(true);
   const [userData, setUserData] = useState<User | null>(null);
 
   const userManager = initUserManager(props);
@@ -109,6 +110,7 @@ export const AuthProvider: FC<AuthProviderProps> = ({
       if (hasCodeInUrl(location)) {
         const user = await userManager.signinCallback();
         setUserData(user);
+        setIsLoading(false);
         onSignIn && onSignIn(user);
         return;
       }
@@ -117,8 +119,9 @@ export const AuthProvider: FC<AuthProviderProps> = ({
       if ((!user || user.expired) && autoSignIn) {
         onBeforeSignIn && onBeforeSignIn();
         userManager.signinRedirect();
-      } else {
-        isMountedRef.current && setUserData(user);
+      } else if (isMountedRef.current) {
+        setUserData(user);
+        setIsLoading(false);
       }
       return;
     };
@@ -156,6 +159,7 @@ export const AuthProvider: FC<AuthProviderProps> = ({
         },
         userManager,
         userData,
+        isLoading,
       }}
     >
       {children}

diff --git a/src/AuthContextInterface.ts b/src/AuthContextInterface.ts
@@ -117,7 +117,6 @@ export interface AuthProviderProps {
 }
 
 export interface AuthContextProps {
-
   /**
    * Alias for userManager.signInRedirect
    */
@@ -142,4 +141,8 @@ export interface AuthContextProps {
    * See [User](https://github.com/IdentityModel/oidc-client-js/wiki#user) for more details.
    */
   userData?: User | null;
+  /**
+   * Auth state: True until the library has been initialized.
+   */
+  isLoading: boolean;
 }