fixes

Author: alexandrudanpop

packages/react-ui/src/app/common/guards/allow-logged-in-user-only-guard.tsx

@@ -10,6 +10,8 @@ import { projectHooks } from '@/app/common/hooks/project-hooks';
 import { userSettingsHooks } from '@/app/common/hooks/user-settings-hooks';
 import { SocketProvider } from '@/app/common/providers/socket-provider';
 // eslint-disable-next-line import/no-restricted-paths
+import { getFederatedUrlBasedOnFlags } from '@/app/features/authentication/lib/utils';
+// eslint-disable-next-line import/no-restricted-paths
 import { appConnectionsHooks } from '@/app/features/connections/lib/app-connections-hooks';
 import { authenticationSession } from '@/app/lib/authentication-session';
 import { navigationUtil } from '@/app/lib/navigation-util';
@@ -61,7 +63,7 @@ export const AllowOnlyLoggedInUserOnlyGuard = ({
         await authenticationSession.logOut({
           userInitiated: false,
           navigate,
-          federatedLoginUrl: flags?.FRONTEGG_URL as string | undefined,
+          federatedLoginUrl: getFederatedUrlBasedOnFlags(flags),
         });
       } catch (e) {
         if (isMounted) {

packages/react-ui/src/app/features/authentication/components/sign-in-form.tsx

@@ -28,6 +28,7 @@ import {
 } from '@openops/shared';
 import { useEffect } from 'react';
 import { navigationUtil } from '../../../lib/navigation-util';
+import { getFederatedUrlBasedOnFlags } from '../lib/utils';
 
 const SignInSchema = Type.Object({
   email: Type.String({
@@ -60,7 +61,7 @@ const SignInForm: React.FC = () => {
     }
     authenticationSession.logOut({
       userInitiated: false,
-      federatedLoginUrl: flags?.FRONTEGG_URL as string | undefined,
+      federatedLoginUrl: getFederatedUrlBasedOnFlags(flags),
     });
   }, [flags]);
 

packages/react-ui/src/app/features/authentication/lib/utils.ts

@@ -0,0 +1,6 @@
+import { FlagsMap } from '@/app/lib/flags-api';
+
+export const getFederatedUrlBasedOnFlags = (flags: FlagsMap) =>
+  flags.FEDERATED_LOGIN_ENABLED
+    ? (flags.FRONTEGG_URL as string | undefined)
+    : undefined;

packages/react-ui/src/app/interceptors.ts

@@ -3,6 +3,7 @@ import { authenticationSession } from '@/app/lib/authentication-session';
 import axios, { AxiosError, HttpStatusCode } from 'axios';
 import { OPENOPS_CLOUD_USER_INFO_API_URL } from './constants/cloud';
 import { QueryKeys } from './constants/query-keys';
+import { getFederatedUrlBasedOnFlags } from './features/authentication/lib/utils';
 import { FlagsMap } from './lib/flags-api';
 import { queryClient } from './lib/query-client';
 
@@ -60,12 +61,13 @@ axios.interceptors.response.use(
       if (url !== OPENOPS_CLOUD_USER_INFO_API_URL && !isSignInRoute) {
         console.warn('JWT expired logging out');
 
-        const flags = queryClient.getQueryData<FlagsMap>([QueryKeys.flags]);
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const flags = queryClient.getQueryData<FlagsMap>([QueryKeys.flags])!;
         authenticationSession.logOut({
           userInitiated: false,
-          federatedLoginUrl: flags?.FRONTEGG_URL as string | undefined,
+          federatedLoginUrl: getFederatedUrlBasedOnFlags(flags),
         });
-        if (!flags?.FRONTEGG_URL) {
+        if (!flags?.FEDERATED_LOGIN_ENABLED) {
           window.location.reload();
         }
       }