Make fields and rows openops tables helpers use database token authentication helpers

Author: cezudas

packages/openops/src/lib/openops-tables/applications-service.ts

@@ -3,6 +3,10 @@ import { Application } from './types';
 
 export const OPENOPS_DEFAULT_DATABASE_NAME = 'OpenOps Dataset';
 
+/*
+@deprecated The tablesDatabaseId is now stored in the project.
+This function will be removed once flag ENABLE_TABLES_DATABASE_TOKEN is removed.
+*/
 export async function getDefaultDatabaseId(
   token: string,
   databaseName = OPENOPS_DEFAULT_DATABASE_NAME, // TODO: remove this when all environments are migrated

packages/openops/src/lib/openops-tables/fields.ts

@@ -3,21 +3,21 @@ import {
   createAxiosHeaders,
   makeOpenOpsTablesGet,
 } from '../openops-tables/requests-helpers';
+import { TokenOrResolver } from './context-helpers';
 
 export async function getFields(
   tableId: number,
-  token: string,
+  contextOrToken: TokenOrResolver,
   userFieldNames = true,
   axiosRetryConfig?: IAxiosRetryConfig,
 ): Promise<OpenOpsField[]> {
-  const authenticationHeader = createAxiosHeaders(token);
+  const authenticationHeader = createAxiosHeaders(contextOrToken);
   const fields = await makeOpenOpsTablesGet<any[]>(
     `api/database/fields/table/${tableId}/?user_field_names=${userFieldNames}`,
     authenticationHeader,
     axiosRetryConfig,
   );
-
-  return fields.flatMap((item) => item);
+  return fields.flat();
 }
 
 export interface OpenOpsField {

packages/openops/src/lib/openops-tables/requests-helpers.ts

@@ -4,13 +4,7 @@ import { AxiosError, AxiosHeaders, AxiosResponse, Method } from 'axios';
 import { IAxiosRetryConfig } from 'axios-retry';
 import { StatusCodes } from 'http-status-codes';
 import { makeHttpRequest } from '../axios-wrapper';
-
-export function createAxiosHeaders(token: string): AxiosHeaders {
-  return new AxiosHeaders({
-    'Content-Type': 'application/json',
-    Authorization: `JWT ${token}`,
-  });
-}
+export { createAxiosHeaders } from './create-axios-headers';
 
 const RETRY_DELAY_MS = 1000;
 

packages/openops/src/lib/openops-tables/rows.ts

@@ -13,6 +13,7 @@ import {
   makeOpenOpsTablesPost,
   makeOpenOpsTablesPut,
 } from '../openops-tables/requests-helpers';
+import { TokenOrResolver } from './context-helpers';
 
 export interface OpenOpsRow {
   id: number;
@@ -21,7 +22,7 @@ export interface OpenOpsRow {
 
 export interface RowParams {
   tableId: number;
-  token: string;
+  token: TokenOrResolver;
 }
 
 export interface GetRowsParams extends RowParams {
@@ -207,22 +208,22 @@ export async function deleteRow(deleteRowParams: DeleteRowParams) {
 }
 
 export async function getRowByPrimaryKeyValue(
-  token: string,
+  tokenOrResolver: TokenOrResolver,
   tableId: number,
   primaryKeyFieldValue: string,
   primaryKeyFieldName: any,
   primaryKeyFieldType: string,
 ) {
   const rows = await getRows({
     tableId: tableId,
-    token: token,
     filters: [
       {
         fieldName: primaryKeyFieldName,
         value: primaryKeyFieldValue,
         type: getEqualityFilterType(primaryKeyFieldType),
       },
     ],
+    token: tokenOrResolver,
   });
 
   if (rows.length > 1) {

packages/openops/test/openops-tables/request-helpers.test.ts

@@ -5,6 +5,9 @@ jest.mock('../../src/lib/axios-wrapper', () => ({
 
 const systemMock = {
   get: jest.fn(),
+  getNumber: jest.fn(),
+  getBoolean: jest.fn(),
+  getOrThrow: jest.fn(),
 };
 
 jest.mock('@openops/server-shared', () => ({
@@ -30,6 +33,9 @@ describe('axios request', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     systemMock.get.mockReturnValue('https://mockapi.com');
+    systemMock.getNumber.mockReturnValue(60);
+    systemMock.getBoolean.mockReturnValue(false);
+    systemMock.getOrThrow.mockReturnValue('mock-value');
   });
 
   const header = new AxiosHeaders({ some: 'header' });

packages/openops/test/openops-tables/rows.test.ts

@@ -4,18 +4,19 @@ const makeOpenOpsTablesPostMock = jest.fn();
 const makeOpenOpsTablesDeleteMock = jest.fn();
 const createAxiosHeadersMock = jest.fn();
 
-const actualRequestsHelpers = jest.requireActual(
-  '../../src/lib/openops-tables/requests-helpers',
-);
-
-jest.mock('../../src/lib/openops-tables/requests-helpers', () => ({
-  ...actualRequestsHelpers,
-  makeOpenOpsTablesGet: makeOpenOpsTablesGetMock,
-  makeOpenOpsTablesPatch: makeOpenOpsTablesPatchMock,
-  makeOpenOpsTablesPost: makeOpenOpsTablesPostMock,
-  makeOpenOpsTablesDelete: makeOpenOpsTablesDeleteMock,
-  createAxiosHeaders: createAxiosHeadersMock,
-}));
+jest.mock('../../src/lib/openops-tables/requests-helpers', () => {
+  const actualRequestsHelpers = jest.requireActual(
+    '../../src/lib/openops-tables/requests-helpers',
+  );
+  return {
+    ...actualRequestsHelpers,
+    makeOpenOpsTablesGet: makeOpenOpsTablesGetMock,
+    makeOpenOpsTablesPatch: makeOpenOpsTablesPatchMock,
+    makeOpenOpsTablesPost: makeOpenOpsTablesPostMock,
+    makeOpenOpsTablesDelete: makeOpenOpsTablesDeleteMock,
+    createAxiosHeaders: createAxiosHeadersMock,
+  };
+});
 
 jest.mock('@openops/server-shared', () => ({
   ...jest.requireActual('@openops/server-shared'),