From 4aaa9955234304f627b97ba0e4e2d1944eac28e9 Mon Sep 17 00:00:00 2001
From: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com>
Date: Fri, 5 Aug 2022 12:48:41 +0530
Subject: [PATCH] fix(ui): oidc login stuck at loading (#6597)

---
 .../authentication/authenticators/OidcAuthenticator.tsx   | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/authentication/authenticators/OidcAuthenticator.tsx b/openmetadata-ui/src/main/resources/ui/src/authentication/authenticators/OidcAuthenticator.tsx
index a15e13cc97c..550955f3af0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/authentication/authenticators/OidcAuthenticator.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/authentication/authenticators/OidcAuthenticator.tsx
@@ -86,7 +86,6 @@ const OidcAuthenticator = forwardRef<AuthenticatorRef, Props>(
 
     const logout = () => {
       setLoadingIndicator(true);
-      setIsAuthenticated(false);
       userManager.removeUser();
       onLogoutSuccess();
     };
@@ -110,7 +109,7 @@ const OidcAuthenticator = forwardRef<AuthenticatorRef, Props>(
 
     const AppWithAuth = getAuthenticator(childComponentType, userManager);
 
-    return !loading ? (
+    return (
       <>
         <Switch>
           <Route exact path={ROUTES.HOME}>
@@ -140,7 +139,6 @@ const OidcAuthenticator = forwardRef<AuthenticatorRef, Props>(
                     onLoginSuccess(user as OidcUser);
                   }}
                 />
-                <Loader />
               </>
             )}
           />
@@ -154,7 +152,6 @@ const OidcAuthenticator = forwardRef<AuthenticatorRef, Props>(
                     localStorage.setItem(oidcTokenKey, user.id_token);
                   }}
                 />
-                <Loader />
               </>
             )}
           />
@@ -166,9 +163,8 @@ const OidcAuthenticator = forwardRef<AuthenticatorRef, Props>(
             <AppWithAuth />
           )}
         </Switch>
+        {loading && <Loader />}
       </>
-    ) : (
-      <Loader />
     );
   }
 );