Merge branch 'cezudas/OPS-3021-move-encrypted-type' into cezudas/OPS-3021-extend-tables-context

Author: cezudas

packages/openops/src/lib/axios-wrapper.ts

@@ -39,7 +39,8 @@ export async function makeHttpRequest<T>(
 
     if (axiosError && axiosError.response?.data) {
       logger.error(logMessage, {
-        ...axiosError.response?.data,
+        error: axiosError,
+        errorResponse: axiosError.response?.data,
         status: axiosError.response?.status,
         statusText: axiosError.response?.statusText,
         timeTaken,

packages/react-ui/src/app/common/auth/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/common/guards/allow-logged-in-user-only-guard.tsx

@@ -4,6 +4,7 @@ import { jwtDecode } from 'jwt-decode';
 import { Suspense, useEffect } from 'react';
 import { Navigate, useLocation, useNavigate } from 'react-router-dom';
 
+import { getFederatedUrlBasedOnFlags } from '@/app/common/auth/lib/utils';
 import { flagsHooks } from '@/app/common/hooks/flags-hooks';
 import { platformHooks } from '@/app/common/hooks/platform-hooks';
 import { projectHooks } from '@/app/common/hooks/project-hooks';
@@ -61,7 +62,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

@@ -15,6 +15,7 @@ import { t } from 'i18next';
 import { SubmitHandler, useForm } from 'react-hook-form';
 import { Link, useNavigate } from 'react-router-dom';
 
+import { getFederatedUrlBasedOnFlags } from '@/app/common/auth/lib/utils';
 import { flagsHooks } from '@/app/common/hooks/flags-hooks';
 import { HttpError, api } from '@/app/lib/api';
 import { authenticationApi } from '@/app/lib/authentication-api';
@@ -26,7 +27,7 @@ import {
   SignInRequest,
   emailRegex,
 } from '@openops/shared';
-import { useEffectOnce } from 'react-use';
+import { useEffect } from 'react';
 import { navigationUtil } from '../../../lib/navigation-util';
 
 const SignInSchema = Type.Object({
@@ -52,11 +53,17 @@ const SignInForm: React.FC = () => {
     mode: 'onChange',
   });
 
-  useEffectOnce(() => {
+  const { data: flags } = flagsHooks.useFlags();
+
+  useEffect(() => {
+    if (!flags) {
+      return;
+    }
     authenticationSession.logOut({
       userInitiated: false,
+      federatedLoginUrl: getFederatedUrlBasedOnFlags(flags),
     });
-  });
+  }, [flags]);
 
   const { data: edition } = flagsHooks.useFlag(FlagId.EDITION);
   const { data: showSignUpLink } = flagsHooks.useFlag(FlagId.SHOW_SIGN_UP_LINK);

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

@@ -1,3 +1,4 @@
+import { getFederatedUrlBasedOnFlags } from '@/app/common/auth/lib/utils';
 import { API_URL, isUrlRelative } from '@/app/lib/api';
 import { authenticationSession } from '@/app/lib/authentication-session';
 import axios, { AxiosError, HttpStatusCode } from 'axios';
@@ -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();
         }
       }

packages/react-ui/src/app/routes/cloud-connection/cloud-connection-page.tsx

@@ -64,11 +64,6 @@ const CloudConnectionPage = () => {
                 secure: true,
                 expires: getExpirationDate(auth.user.accessToken),
               });
-              Cookies.set('cloud-refresh-token', auth.user.refreshToken, {
-                sameSite: 'None',
-                secure: true,
-                expires: getExpirationDate(auth.user.accessToken),
-              });
 
               const originProjectId =
                 sessionStorage.getItem(ORGIN_PROJECT_ID_KEY);

packages/server/api/src/app/app-connection/app-connection.entity.ts

@@ -1,5 +1,9 @@
-import { EncryptedObject } from '@openops/server-shared';
-import { AppConnection, AppConnectionStatus, Project } from '@openops/shared';
+import {
+  AppConnection,
+  AppConnectionStatus,
+  EncryptedObject,
+  Project,
+} from '@openops/shared';
 import { EntitySchema } from 'typeorm';
 import {
   BaseColumnSchemaPart,

packages/server/api/src/app/database/migrations/1759242268873-MigrateAiConfigToAppConnection.ts

@@ -1,4 +1,5 @@
-import { EncryptedObject, encryptUtils, logger } from '@openops/server-shared';
+import { encryptUtils, logger } from '@openops/server-shared';
+import { EncryptedObject } from '@openops/shared';
 import { MigrationInterface, QueryRunner } from 'typeorm';
 
 export class MigrateAiConfigToAppConnection1759242268873

packages/server/api/src/app/flows/step-test-output/flow-step-test-output.service.ts

@@ -1,9 +1,9 @@
 import {
   compressAndEncrypt,
   decryptAndDecompress,
-  EncryptedObject,
 } from '@openops/server-shared';
 import {
+  EncryptedObject,
   FlowStepTestOutput,
   FlowVersionId,
   OpenOpsId,

packages/server/shared/src/lib/security/encrypt-compress.ts

@@ -1,6 +1,6 @@
-import { FileCompression } from '@openops/shared';
+import { EncryptedObject, FileCompression } from '@openops/shared';
 import { fileCompressor } from '../file-compressor';
-import { EncryptedObject, encryptUtils } from './encryption';
+import { encryptUtils } from './encryption';
 
 /**
  * Compress and encrypt an object