Merge branch 'main' into cezudas/OPS-3021-infrastructure

cezudas · cezudas · commit b7378509c3b3 · 2025-11-20T19:00:19.000+02:00
diff --git a/packages/blocks/framework/src/lib/context.ts b/packages/blocks/framework/src/lib/context.ts
@@ -1,5 +1,6 @@
 import {
   AppConnectionValue,
+  EncryptedObject,
   ExecutionType,
   FlowRunId,
   PauseMetadata,
@@ -126,10 +127,7 @@ export type ServerContext = {
   publicUrl: string;
   token: string;
   tablesDatabaseId: number;
-  tablesDatabaseToken: {
-    iv: string;
-    data: string;
-  };
+  tablesDatabaseToken: EncryptedObject;
 };
 export type BaseActionContext<
   ET extends ExecutionType,
diff --git a/packages/engine/src/lib/handler/context/engine-constants.ts b/packages/engine/src/lib/handler/context/engine-constants.ts
@@ -1,5 +1,5 @@
 import {
-  EncryptedDatabaseToken,
+  EncryptedObject,
   ExecuteFlowOperation,
   ExecutePropsOptions,
   ExecuteStepOperation,
@@ -39,8 +39,6 @@ export class EngineConstants {
   public static readonly BLOCK_SOURCES =
     process.env.OPS_BLOCKS_SOURCE ?? 'FILE';
 
-  private project: Project | null = null;
-
   public get baseCodeDirectory(): string {
     return EngineConstants.BASE_CODE_DIRECTORY;
   }
@@ -69,13 +67,18 @@ export class EngineConstants {
     public readonly testRunActionLimits: TestRunLimitSettings,
     public readonly isTestRun: boolean,
     public readonly tablesDatabaseId: number,
-    public readonly tablesDatabaseToken: EncryptedDatabaseToken,
+    public readonly tablesDatabaseToken: EncryptedObject,
     public readonly resumePayload?: ResumePayload,
   ) {}
 
-  public static fromExecuteFlowInput(
+  public static async fromExecuteFlowInput(
     input: ExecuteFlowOperation,
-  ): EngineConstants {
+  ): Promise<EngineConstants> {
+    const project = await EngineConstants.fetchProject(
+      input.internalApiUrl,
+      input.engineToken,
+    );
+
     return new EngineConstants(
       input.executionCorrelationId,
       input.flowVersion.flowId,
@@ -99,17 +102,22 @@ export class EngineConstants {
       input.serverHandlerId ?? null,
       input.flowVersion.testRunActionLimits,
       input.runEnvironment === 'TESTING',
-      input.tablesDatabaseId,
-      input.tablesDatabaseToken,
+      project.tablesDatabaseId,
+      project.tablesDatabaseToken,
       input.executionType === ExecutionType.RESUME
         ? input.resumePayload
         : undefined,
     );
   }
 
-  public static fromExecuteStepInput(
+  public static async fromExecuteStepInput(
     input: ExecuteStepOperation,
-  ): EngineConstants {
+  ): Promise<EngineConstants> {
+    const project = await EngineConstants.fetchProject(
+      input.internalApiUrl,
+      input.engineToken,
+    );
+
     return new EngineConstants(
       null,
       input.flowVersion.flowId,
@@ -133,14 +141,19 @@ export class EngineConstants {
       null,
       input.flowVersion.testRunActionLimits,
       true,
-      input.tablesDatabaseId,
-      input.tablesDatabaseToken,
+      project.tablesDatabaseId,
+      project.tablesDatabaseToken,
     );
   }
 
-  public static fromExecutePropertyInput(
+  public static async fromExecutePropertyInput(
     input: ExecutePropsOptions,
-  ): EngineConstants {
+  ): Promise<EngineConstants> {
+    const project = await EngineConstants.fetchProject(
+      input.internalApiUrl,
+      input.engineToken,
+    );
+
     return new EngineConstants(
       null,
       input.flowVersion.flowId,
@@ -164,14 +177,19 @@ export class EngineConstants {
       null,
       input.flowVersion.testRunActionLimits,
       true,
-      input.tablesDatabaseId,
-      input.tablesDatabaseToken,
+      project.tablesDatabaseId,
+      project.tablesDatabaseToken,
     );
   }
 
-  public static fromExecuteTriggerInput(
+  public static async fromExecuteTriggerInput(
     input: ExecuteTriggerOperation<TriggerHookType>,
-  ): EngineConstants {
+  ): Promise<EngineConstants> {
+    const project = await EngineConstants.fetchProject(
+      input.internalApiUrl,
+      input.engineToken,
+    );
+
     return new EngineConstants(
       null,
       input.flowVersion.flowId,
@@ -195,26 +213,26 @@ export class EngineConstants {
       null,
       input.flowVersion.testRunActionLimits,
       input.test,
-      input.tablesDatabaseId,
-      input.tablesDatabaseToken,
+      project.tablesDatabaseId,
+      project.tablesDatabaseToken,
     );
   }
 
-  private async getProject(): Promise<Project> {
-    if (this.project) {
-      return this.project;
-    }
-
-    const getWorkerProjectEndpoint = `${this.internalApiUrl}v1/worker/project`;
+  private static async fetchProject(
+    internalApiUrl: string,
+    engineToken: string,
+  ): Promise<Project> {
+    const getWorkerProjectEndpoint = `${addTrailingSlashIfMissing(
+      internalApiUrl,
+    )}v1/worker/project`;
 
     const response = await fetch(getWorkerProjectEndpoint, {
       headers: {
-        Authorization: `Bearer ${this.engineToken}`,
+        Authorization: `Bearer ${engineToken}`,
       },
     });
 
-    this.project = (await response.json()) as Project;
-    return this.project;
+    return (await response.json()) as Project;
   }
 }
 
diff --git a/packages/engine/src/lib/operations.ts b/packages/engine/src/lib/operations.ts
@@ -45,7 +45,7 @@ const executeFlow = async (
   context: FlowExecutorContext,
 ): Promise<EngineResponse<Pick<FlowRunResponse, 'status' | 'error'>>> => {
   try {
-    const constants = EngineConstants.fromExecuteFlowInput(input);
+    const constants = await EngineConstants.fromExecuteFlowInput(input);
 
     const response = await flowExecutor.triggerFlowExecutor({
       trigger: input.flowVersion.trigger,
@@ -92,7 +92,7 @@ async function executeStep(
       engineToken: input.engineToken,
       stepTestOutputs: input.stepTestOutputs,
     }),
-    constants: EngineConstants.fromExecuteStepInput(input),
+    constants: await EngineConstants.fromExecuteStepInput(input),
   });
 
   const stepResult = output.steps[step.name];
@@ -203,7 +203,7 @@ export async function execute(
             stepTestOutputs: input.stepTestOutputs,
           }),
           searchValue: input.searchValue,
-          constants: EngineConstants.fromExecutePropertyInput(input),
+          constants: await EngineConstants.fromExecutePropertyInput(input),
         });
 
         return {
@@ -222,7 +222,7 @@ export async function execute(
 
         const output = await triggerHelper.executeTrigger({
           params: input,
-          constants: EngineConstants.fromExecuteTriggerInput(input),
+          constants: await EngineConstants.fromExecuteTriggerInput(input),
         });
 
         return {
diff --git a/packages/engine/src/lib/resolve-variable.ts b/packages/engine/src/lib/resolve-variable.ts
@@ -9,7 +9,7 @@ export async function resolveVariable(
   input: ResolveVariableOperation,
 ): Promise<ResolveVariableResponse> {
   try {
-    const constants = EngineConstants.fromExecuteStepInput({
+    const constants = await EngineConstants.fromExecuteStepInput({
       projectId: input.projectId,
       engineToken: input.engineToken,
       internalApiUrl: input.internalApiUrl,
diff --git a/packages/engine/test/resolve-variable.test.ts b/packages/engine/test/resolve-variable.test.ts
@@ -62,7 +62,7 @@ describe('resolveVariable', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
-    mockEngineConstants.fromExecuteStepInput = jest.fn().mockReturnValue(mockConstants);
+    mockEngineConstants.fromExecuteStepInput = jest.fn().mockResolvedValue(mockConstants);
     mockTestExecutionContext.stateFromFlowVersion = jest.fn().mockResolvedValue(mockExecutionState);
   });
 
diff --git a/packages/openops/src/lib/axios-wrapper.ts b/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,
diff --git a/packages/react-ui/src/app/common/auth/lib/utils.ts b/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;
diff --git a/packages/react-ui/src/app/common/guards/allow-logged-in-user-only-guard.tsx b/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) {
diff --git a/packages/react-ui/src/app/features/authentication/components/sign-in-form.tsx b/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);
diff --git a/packages/react-ui/src/app/interceptors.ts b/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();
         }
       }
diff --git a/packages/react-ui/src/app/routes/cloud-connection/cloud-connection-page.tsx b/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);
diff --git a/packages/server/api/src/app/app-connection/app-connection.entity.ts b/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,
diff --git a/packages/server/api/src/app/database/migrations/1759242268873-MigrateAiConfigToAppConnection.ts b/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
diff --git a/packages/server/api/src/app/flows/step-test-output/flow-step-test-output.service.ts b/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,
diff --git a/packages/server/shared/src/lib/security/encrypt-compress.ts b/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
diff --git a/packages/server/shared/src/lib/security/encryption.ts b/packages/server/shared/src/lib/security/encryption.ts
@@ -1,4 +1,8 @@
-import { assertNotNullOrUndefined, isNil } from '@openops/shared';
+import {
+  assertNotNullOrUndefined,
+  EncryptedObject,
+  isNil,
+} from '@openops/shared';
 import * as crypto from 'crypto';
 import { randomBytes } from 'node:crypto';
 import { promisify } from 'util';
@@ -9,11 +13,6 @@ let secret: string | null;
 const algorithm = 'aes-256-cbc';
 const ivLength = 16;
 
-export type EncryptedObject = {
-  iv: string;
-  data: string;
-};
-
 const loadEncryptionKey = async (
   queueMode: QueueMode,
 ): Promise<string | null> => {
diff --git a/packages/shared/src/lib/common/security/encrypted-object.ts b/packages/shared/src/lib/common/security/encrypted-object.ts
@@ -0,0 +1,4 @@
+export type EncryptedObject = {
+  iv: string;
+  data: string;
+};
diff --git a/packages/shared/src/lib/common/security/index.ts b/packages/shared/src/lib/common/security/index.ts
@@ -1 +1,2 @@
+export * from './encrypted-object';
 export * from './permission';
