Pass tablesDatabaseId and tablesDatabaseToken as server context to OpenOps tables operations (#1671)

cezudas · web-flow · commit 52c4f37a43c0 · 2025-11-25T19:12:54.000+02:00
Fixes OPS-3022, OPS-3023, OPS-3024, OPS-3025.  ## Summary by CodeRabbit * **Refactor** * Improved internal server context handling for table operations to enhance system reliability and consistency across database interactions. <sub>✏️ Tip: You can customize this high-level summary in your review settings.</sub>
diff --git a/packages/blocks/openops-tables/src/actions/delete-record-action.ts b/packages/blocks/openops-tables/src/actions/delete-record-action.ts
@@ -33,7 +33,7 @@ export const deleteRecordAction = createAction({
     const tableId = await cacheWrapper.getOrAdd(
       tableCacheKey,
       getTableIdByTableName,
-      [tableName],
+      [tableName, context.server],
     );
 
     const tokenOrResolver = await resolveTokenProvider(context.server);
diff --git a/packages/blocks/openops-tables/src/actions/get-records-action.ts b/packages/blocks/openops-tables/src/actions/get-records-action.ts
@@ -41,14 +41,15 @@ export const getRecordsAction = createAction({
       displayName: '',
       required: true,
       refreshers: ['tableName'],
-      props: async ({ tableName }) => {
+      props: async ({ tableName }, ctx) => {
         if (!tableName) {
           return {};
         }
         const properties: { [key: string]: any } = {};
 
         const tableFields = await getTableFields(
           tableName as unknown as string,
+          ctx.server,
         );
 
         properties['filters'] = Property.Array({
@@ -119,7 +120,7 @@ export const getRecordsAction = createAction({
     const tableId = await cacheWrapper.getOrAdd(
       tableCacheKey,
       getTableIdByTableName,
-      [tableName],
+      [tableName, context.server],
     );
 
     const filtersProps = context.propsValue.filters['filters'] as unknown as {
diff --git a/packages/blocks/openops-tables/src/actions/get-table-url-action.ts b/packages/blocks/openops-tables/src/actions/get-table-url-action.ts
@@ -18,7 +18,7 @@ export const getTableUrlAction = createAction({
   },
   async run(context) {
     const tableName = context.propsValue.tableName as unknown as string;
-    const tableId = await getTableIdByTableName(tableName);
+    const tableId = await getTableIdByTableName(tableName, context.server);
     const baseUrl = system.getOrThrow(SharedSystemProp.FRONTEND_URL);
 
     return (
diff --git a/packages/blocks/openops-tables/src/actions/update-record-action.ts b/packages/blocks/openops-tables/src/actions/update-record-action.ts
@@ -30,12 +30,15 @@ export const updateRecordAction = createAction({
         'The primary key value of the row to update. If the row does not exist, a new row will be created.',
       required: true,
       refreshers: ['tableName'],
-      props: async ({ tableName }) => {
+      props: async ({ tableName }, context) => {
         if (!tableName) {
           return {};
         }
 
-        const fields = await getTableFields(tableName as unknown as string);
+        const fields = await getTableFields(
+          tableName as unknown as string,
+          context.server,
+        );
 
         const primaryKeyField = getPrimaryKeyFieldFromFields(fields);
 
@@ -69,6 +72,7 @@ export const updateRecordAction = createAction({
 
         const tableFields = await getTableFields(
           tableName as unknown as string,
+          context.server,
         );
 
         const properties: { [key: string]: any } = {};
@@ -129,7 +133,7 @@ export const updateRecordAction = createAction({
     const tableId = await cacheWrapper.getOrAdd(
       tableCacheKey,
       getTableIdByTableName,
-      [tableName],
+      [tableName, context.server],
     );
 
     const fieldsCacheKey = `${context.run.id}-${tableId}-fields`;
diff --git a/packages/blocks/openops-tables/test/actions/delete-record-action.test.ts b/packages/blocks/openops-tables/test/actions/delete-record-action.test.ts
@@ -236,12 +236,16 @@ describe('deleteRecordAction', () => {
 });
 
 function validateWrapperCall(context: any) {
+  const expectedServerContext = {
+    tablesDatabaseId: context.server.tablesDatabaseId,
+    tablesDatabaseToken: context.server.tablesDatabaseToken,
+  };
   expect(cacheWrapperMock.getOrAdd).toHaveBeenCalledTimes(2);
   expect(cacheWrapperMock.getOrAdd).toHaveBeenNthCalledWith(
     1,
     `${context.run.id}-table-${context.propsValue.tableName}`,
     getTableIdByTableName,
-    [context.propsValue.tableName],
+    [context.propsValue.tableName, expectedServerContext],
   );
   expect(cacheWrapperMock.getOrAdd).toHaveBeenNthCalledWith(
     2,
diff --git a/packages/blocks/openops-tables/test/actions/get-records-action.test.ts b/packages/blocks/openops-tables/test/actions/get-records-action.test.ts
@@ -100,6 +100,10 @@ describe('getRecordsAction test', () => {
       expect(openopsCommonMock.getTableFields).toHaveBeenCalledTimes(1);
       expect(openopsCommonMock.getTableFields).toHaveBeenCalledWith(
         'Opportunity',
+        {
+          tablesDatabaseId: 1,
+          tablesDatabaseToken: 'token',
+        },
       );
     });
   });
@@ -313,12 +317,16 @@ describe('getRecordsAction test', () => {
 });
 
 function validateWrapperCall(context: any) {
+  const expectedServerContext = {
+    tablesDatabaseId: context.server.tablesDatabaseId,
+    tablesDatabaseToken: context.server.tablesDatabaseToken,
+  };
   expect(cacheWrapperMock.getOrAdd).toHaveBeenCalledTimes(1);
   expect(cacheWrapperMock.getOrAdd).toHaveBeenNthCalledWith(
     1,
     `${context.run.id}-table-${context.propsValue.tableName}`,
     getTableIdByTableName,
-    [context.propsValue.tableName],
+    [context.propsValue.tableName, expectedServerContext],
   );
 }
 
diff --git a/packages/blocks/openops-tables/test/actions/get-table-url-action.test.ts b/packages/blocks/openops-tables/test/actions/get-table-url-action.test.ts
@@ -65,6 +65,10 @@ describe('getTableUrlAction', () => {
     expect(openopsCommonMock.getTableIdByTableName).toHaveBeenCalledTimes(1);
     expect(openopsCommonMock.getTableIdByTableName).toHaveBeenCalledWith(
       'my table',
+      {
+        tablesDatabaseId: 1,
+        tablesDatabaseToken: 'token',
+      },
     );
     expect(systemMock.getOrThrow).toHaveBeenCalledTimes(1);
     expect(systemMock.getOrThrow).toHaveBeenCalledWith('FRONTEND_URL');
diff --git a/packages/blocks/openops-tables/test/actions/update-record-action.test.ts b/packages/blocks/openops-tables/test/actions/update-record-action.test.ts
@@ -373,6 +373,10 @@ describe('fieldsProperties property', () => {
     expect(openopsCommonMock.getTableFields).toHaveBeenCalledTimes(1);
     expect(openopsCommonMock.getTableFields).toHaveBeenCalledWith(
       'Opportunity',
+      {
+        tablesDatabaseId: 1,
+        tablesDatabaseToken: 'token',
+      },
     );
   });
 });
@@ -383,7 +387,13 @@ function validateWrapperCall(context: any) {
     1,
     `${context.run.id}-table-${context.propsValue.tableName}`,
     getTableIdByTableName,
-    [context.propsValue.tableName],
+    [
+      context.propsValue.tableName,
+      {
+        tablesDatabaseId: context.server.tablesDatabaseId,
+        tablesDatabaseToken: context.server.tablesDatabaseToken,
+      },
+    ],
   );
   expect(cacheWrapperMock.getOrAdd).toHaveBeenNthCalledWith(
     2,
diff --git a/packages/openops/src/lib/openops-tables/openops-tables-common-properties.ts b/packages/openops/src/lib/openops-tables/openops-tables-common-properties.ts
@@ -1,6 +1,5 @@
 import { Property, Validators } from '@openops/blocks-framework';
-import { IAxiosRetryConfig } from 'axios-retry';
-import { authenticateDefaultUserInOpenOpsTables } from './auth-user';
+import { resolveTokenProvider, TablesServerContext } from './context-helpers';
 import {
   DateOpenOpsField,
   DurationOpenOpsField,
@@ -35,13 +34,11 @@ export function openopsTablesDropdownProperty(): any {
 
 export async function getTableFields(
   tableName: string,
-  axiosRetryConfig?: IAxiosRetryConfig,
+  serverContext: TablesServerContext,
 ): Promise<OpenOpsField[]> {
-  const { token } = await authenticateDefaultUserInOpenOpsTables();
-
-  const tableId = await getTableIdByTableName(tableName as unknown as string);
-
-  return await getFields(tableId, token, false, axiosRetryConfig);
+  const tableId = await getTableIdByTableName(tableName, serverContext);
+  const tokenOrResolver = await resolveTokenProvider(serverContext);
+  return await getFields(tableId, tokenOrResolver, false);
 }
 
 // https://api.baserow.io/api/redoc/#tag/Database-table-fields/operation/get_database_table_field
diff --git a/packages/openops/src/lib/openops-tables/tables.ts b/packages/openops/src/lib/openops-tables/tables.ts
@@ -1,6 +1,7 @@
 import { makeOpenOpsTablesGet } from '../openops-tables/requests-helpers';
 import { getDefaultDatabaseId } from './applications-service';
 import { authenticateDefaultUserInOpenOpsTables } from './auth-user';
+import { TablesServerContext } from './context-helpers';
 import { createAxiosHeaders } from './create-axios-headers';
 
 async function getTables(
@@ -17,6 +18,7 @@ async function getTables(
 
 export async function getTableIdByTableName(
   tableName: string,
+  _tablesServerContext: TablesServerContext,
 ): Promise<number> {
   const table = await getTableByName(tableName);
 
diff --git a/packages/openops/test/openops-tables/openops-tables-common-properties.test.ts b/packages/openops/test/openops-tables/openops-tables-common-properties.test.ts
@@ -18,6 +18,16 @@ jest.mock('../../src/lib/openops-tables/auth-user', () => {
   };
 });
 
+jest.mock('@openops/server-shared', () => ({
+  ...jest.requireActual('@openops/server-shared'),
+  system: {
+    ...jest.requireActual('@openops/server-shared').system,
+    getBoolean: jest.fn().mockReturnValue(false),
+  },
+}));
+
+import { EncryptedObject } from '@openops/shared';
+import { TablesServerContext } from '../../src/lib/openops-tables/context-helpers';
 import {
   DurationOpenOpsField,
   NumberOpenOpsField,
@@ -28,6 +38,14 @@ import {
   openopsTablesDropdownProperty,
 } from '../../src/lib/openops-tables/openops-tables-common-properties';
 
+const mockTablesServerContext: TablesServerContext = {
+  tablesDatabaseId: 1,
+  tablesDatabaseToken: {
+    iv: 'test-iv',
+    data: 'test-data',
+  } as EncryptedObject,
+};
+
 describe('table property', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -39,7 +57,9 @@ describe('table property', () => {
     });
     getTableNamesMock.mockResolvedValue(['table1', 'table2']);
 
-    const result = await openopsTablesDropdownProperty().options();
+    const result = await openopsTablesDropdownProperty().options(undefined, {
+      server: undefined,
+    });
 
     expect(result).toMatchObject({
       disabled: false,
@@ -54,7 +74,9 @@ describe('table property', () => {
   test('should handle empty tables', async () => {
     getTableNamesMock.mockResolvedValue([]);
 
-    const result = await openopsTablesDropdownProperty().options();
+    const result = await openopsTablesDropdownProperty().options(undefined, {
+      server: undefined,
+    });
 
     expect(result).toMatchObject({
       disabled: false,
@@ -94,7 +116,7 @@ describe('getTableFields', () => {
 
     getTableIdByTableNameMock.mockResolvedValue(1);
 
-    const result = await getTableFields('Opportunity');
+    const result = await getTableFields('Opportunity', mockTablesServerContext);
 
     expect(result).toMatchObject([
       {
@@ -116,7 +138,7 @@ describe('getTableFields', () => {
     ]);
     expect(authenticateDefaultUserInOpenOpsTablesMock).toHaveBeenCalledTimes(1);
     expect(getFieldsMock).toHaveBeenCalledTimes(1);
-    expect(getFieldsMock).toHaveBeenCalledWith(1, 'token', false, undefined); // Adjust this line as needed.
+    expect(getFieldsMock).toHaveBeenCalledWith(1, 'token', false);
   });
 
   test('should handle authentication failure', async () => {
@@ -125,9 +147,9 @@ describe('getTableFields', () => {
     );
     getTableIdByTableNameMock.mockResolvedValue(1);
 
-    await expect(getTableFields('Opportunity')).rejects.toThrow(
-      'Authentication failed',
-    );
+    await expect(
+      getTableFields('Opportunity', mockTablesServerContext),
+    ).rejects.toThrow('Authentication failed');
     expect(authenticateDefaultUserInOpenOpsTablesMock).toHaveBeenCalledTimes(1);
     expect(getFieldsMock).not.toHaveBeenCalled();
   });
@@ -139,12 +161,12 @@ describe('getTableFields', () => {
     getFieldsMock.mockResolvedValue([]);
     getTableIdByTableNameMock.mockResolvedValue(1);
 
-    const result = await getTableFields('Opportunity');
+    const result = await getTableFields('Opportunity', mockTablesServerContext);
 
     expect(result).toMatchObject([]);
     expect(authenticateDefaultUserInOpenOpsTablesMock).toHaveBeenCalledTimes(1);
     expect(getFieldsMock).toHaveBeenCalledTimes(1);
-    expect(getFieldsMock).toHaveBeenCalledWith(1, 'token', false, undefined);
+    expect(getFieldsMock).toHaveBeenCalledWith(1, 'token', false);
   });
 
   test('should return our supported properties for the field', async () => {
@@ -196,7 +218,7 @@ describe('getTableFields', () => {
     ]);
     getTableIdByTableNameMock.mockResolvedValue(2);
 
-    const result = await getTableFields('Opportunity');
+    const result = await getTableFields('Opportunity', mockTablesServerContext);
 
     expect(result).toEqual([
       numberField,
diff --git a/packages/openops/test/openops-tables/tables.test.ts b/packages/openops/test/openops-tables/tables.test.ts
@@ -19,12 +19,30 @@ jest.mock('../../src/lib/openops-tables/applications-service', () => ({
   getDefaultDatabaseId: jest.fn().mockResolvedValue(1),
 }));
 
+jest.mock('@openops/server-shared', () => ({
+  ...jest.requireActual('@openops/server-shared'),
+  system: {
+    ...jest.requireActual('@openops/server-shared').system,
+    getBoolean: jest.fn().mockReturnValue(false),
+  },
+}));
+
+import { EncryptedObject } from '@openops/shared';
+import { TablesServerContext } from '../../src/lib/openops-tables/context-helpers';
 import {
   getTableByName,
   getTableIdByTableName,
   getTableNames,
 } from '../../src/lib/openops-tables/tables';
 
+const mockTablesServerContext: TablesServerContext = {
+  tablesDatabaseId: 1,
+  tablesDatabaseToken: {
+    iv: 'test-iv',
+    data: 'test-data',
+  } as EncryptedObject,
+};
+
 describe('get table names', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -114,7 +132,10 @@ describe('get table id by table name', () => {
     ]);
     createAxiosHeadersMock.mockReturnValue('some header');
 
-    const result = await getTableIdByTableName('table name');
+    const result = await getTableIdByTableName(
+      'table name',
+      mockTablesServerContext,
+    );
 
     expect(result).toBe(1);
     expect(makeOpenOpsTablesGetMock).toBeCalledTimes(1);
@@ -130,9 +151,9 @@ describe('get table id by table name', () => {
     makeOpenOpsTablesGetMock.mockResolvedValue([{ id: 1, name: 'table name' }]);
     createAxiosHeadersMock.mockReturnValue('some header');
 
-    await expect(getTableIdByTableName('table name 2')).rejects.toThrow(
-      "Table 'table name 2' not found",
-    );
+    await expect(
+      getTableIdByTableName('table name 2', mockTablesServerContext),
+    ).rejects.toThrow("Table 'table name 2' not found");
 
     expect(makeOpenOpsTablesGetMock).toBeCalledTimes(1);
     expect(makeOpenOpsTablesGetMock).toHaveBeenCalledWith(
@@ -151,7 +172,10 @@ describe('get table id by table name', () => {
     ]);
     createAxiosHeadersMock.mockReturnValue('some header');
 
-    const result = await getTableIdByTableName('table name');
+    const result = await getTableIdByTableName(
+      'table name',
+      mockTablesServerContext,
+    );
 
     expect(result).toBe(1);
     expect(makeOpenOpsTablesGetMock).toBeCalledTimes(1);
diff --git a/packages/server/api/src/app/database/get-default-user-db-token.ts b/packages/server/api/src/app/database/get-default-user-db-token.ts
diff --git a/packages/server/api/src/app/database/migrations/1741945618000-ReplaceSelectOptionsIdsWithNames.ts b/packages/server/api/src/app/database/migrations/1741945618000-ReplaceSelectOptionsIdsWithNames.ts
diff --git a/packages/server/api/src/app/openops-analytics/analytics-seeding-service.ts b/packages/server/api/src/app/openops-analytics/analytics-seeding-service.ts
diff --git a/packages/server/api/test/unit/openops-analytics/analytics-seeding-service.test.ts b/packages/server/api/test/unit/openops-analytics/analytics-seeding-service.test.ts
