diff --git a/src/components/helper/RequireAuth.tsx b/src/components/helper/RequireAuth.tsx index aa7f81b2..a4c9f5e0 100644 --- a/src/components/helper/RequireAuth.tsx +++ b/src/components/helper/RequireAuth.tsx @@ -29,8 +29,8 @@ const RequireAuth = ({ children }: RequireAuthProps) => { >('/sso/userinfo', httpClientFetcher, { shouldRetryOnError: false, - // refresh every 13 minutes - refreshInterval: 13 * 60 * 1000, + // refresh every 12 minutes + refreshInterval: 12 * 60 * 1000, }); useEffect(() => { @@ -61,12 +61,20 @@ const RequireAuth = ({ children }: RequireAuthProps) => { async () => { await AuthApi.refresh(); }, - 13 * 60 * 1000 + 12 * 60 * 1000 ); return () => clearInterval(interval); }, []); + useEffect(() => { + const refreshUserSession = async () => { + await AuthApi.refresh(); + }; + + refreshUserSession(); + }, []); + if ( (isLoadingUserResponse && !userResponse && !userErrorResponse) || (!userResponse && !userErrorResponse) @@ -78,7 +86,7 @@ const RequireAuth = ({ children }: RequireAuthProps) => { ); } - if (userErrorResponse) { + if (!isLoadingUserResponse && userErrorResponse) { return (

Authentication Failed

@@ -86,10 +94,7 @@ const RequireAuth = ({ children }: RequireAuthProps) => { Please try refreshing the page or contact support if the problem persists.

-