Refactor infra

Author: cezudas

packages/openops/src/index.ts

@@ -38,12 +38,14 @@ export * from './lib/aws/pricing';
 export * from './lib/openops-analytics';
 export * from './lib/openops-tables/applications-service';
 export * from './lib/openops-tables/auth-user';
+export * from './lib/openops-tables/context-helpers';
 export * from './lib/openops-tables/fields';
 export * from './lib/openops-tables/filters';
 export * from './lib/openops-tables/openops-tables-common-properties';
 export * from './lib/openops-tables/requests-helpers';
 export * from './lib/openops-tables/rows';
 export * from './lib/openops-tables/tables';
+export * from './lib/openops-tables/token-helpers';
 export * from './lib/openops-tables/types';
 
 export * from './lib/cli-command-wrapper';

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

@@ -1,5 +1,9 @@
 import { ActionContext, PropertyContext } from '@openops/blocks-framework';
-import { encryptUtils } from '@openops/server-shared';
+import { AppSystemProp, encryptUtils, system } from '@openops/server-shared';
+
+export function shouldUseDatabaseToken(): boolean {
+  return system.getBoolean(AppSystemProp.USE_DATABASE_TOKEN) ?? false;
+}
 
 export function getTablesDatabaseTokenFromContext(
   context: ActionContext | PropertyContext,

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

@@ -1,36 +1,69 @@
+import { ActionContext, PropertyContext } from '@openops/blocks-framework';
 import { IAxiosRetryConfig } from 'axios-retry';
-import { makeOpenOpsTablesGet } from '../openops-tables/requests-helpers';
-import { createRequestContext, type RequestContext } from './request-context';
+import {
+  createAxiosHeaders,
+  createAxiosHeadersForOpenOpsTablesBlock,
+  makeOpenOpsTablesGet,
+} from '../openops-tables/requests-helpers';
+import { authenticateDefaultUserInOpenOpsTables } from './auth-user';
+import {
+  getTablesDatabaseTokenFromContext,
+  shouldUseDatabaseToken,
+} from './context-helpers';
+import {
+  getTableIdByTableName,
+  getTableIdByTableNameFromContext,
+} from './tables';
 
-export async function getFieldsWithContext(
+export async function getFieldsFromContext(
   tableId: number,
-  ctx: RequestContext,
+  context: ActionContext | PropertyContext,
   userFieldNames = true,
   axiosRetryConfig?: IAxiosRetryConfig,
 ): Promise<OpenOpsField[]> {
-  const authenticationHeader = ctx.createHeaders(ctx.token);
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  if (!shouldUseDatabaseToken()) {
+    const { token } = await authenticateDefaultUserInOpenOpsTables();
+    return await getFields(tableId, token, userFieldNames, axiosRetryConfig);
+  }
+
+  const token = getTablesDatabaseTokenFromContext(context);
+  const authenticationHeader = createAxiosHeadersForOpenOpsTablesBlock(token);
   const fields = await makeOpenOpsTablesGet<any[]>(
     `api/database/fields/table/${tableId}/?user_field_names=${userFieldNames}`,
     authenticationHeader,
     axiosRetryConfig,
   );
-
   return fields.flatMap((item) => item);
 }
 
-/**
- * @deprecated Use getFieldsWithContext with RequestContext instead
- */
+export async function getTableFieldsFromContext(
+  tableName: string,
+  context: ActionContext | PropertyContext,
+  axiosRetryConfig?: IAxiosRetryConfig,
+): Promise<OpenOpsField[]> {
+  if (!shouldUseDatabaseToken()) {
+    const { token } = await authenticateDefaultUserInOpenOpsTables();
+    const tableId = await getTableIdByTableName(tableName);
+    return await getFields(tableId, token, false, axiosRetryConfig);
+  }
+
+  const tableId = await getTableIdByTableNameFromContext(tableName, context);
+  return getFieldsFromContext(tableId, context, false, axiosRetryConfig);
+}
+
 export async function getFields(
   tableId: number,
   token: string,
   userFieldNames = true,
   axiosRetryConfig?: IAxiosRetryConfig,
-  useJwt = true,
 ): Promise<OpenOpsField[]> {
-  const ctx = createRequestContext(token, useJwt);
-  return getFieldsWithContext(tableId, ctx, userFieldNames, axiosRetryConfig);
+  const authenticationHeader = createAxiosHeaders(token);
+  const fields = await makeOpenOpsTablesGet<any[]>(
+    `api/database/fields/table/${tableId}/?user_field_names=${userFieldNames}`,
+    authenticationHeader,
+    axiosRetryConfig,
+  );
+  return fields.flatMap((item) => item);
 }
 
 export interface OpenOpsField {

packages/openops/src/lib/openops-tables/request-context.ts

@@ -7,6 +7,7 @@ import {
 } from '../openops-tables/filters';
 import {
   createAxiosHeaders,
+  createAxiosHeadersForOpenOpsTablesBlock,
   makeOpenOpsTablesDelete,
   makeOpenOpsTablesGet,
   makeOpenOpsTablesPatch,
@@ -22,6 +23,7 @@ export interface OpenOpsRow {
 export interface RowParams {
   tableId: number;
   token: string;
+  useDatabaseToken?: boolean;
 }
 
 export interface GetRowsParams extends RowParams {
@@ -101,7 +103,9 @@ export async function getRows(getRowsParams: GetRowsParams) {
   const paramsString = params.toString();
   const baseUrl = `api/database/rows/table/${getRowsParams.tableId}/`;
   const url = paramsString ? baseUrl + `?${paramsString}` : baseUrl;
-  const authenticationHeader = createAxiosHeaders(getRowsParams.token);
+  const authenticationHeader = getRowsParams.useDatabaseToken
+    ? createAxiosHeadersForOpenOpsTablesBlock(getRowsParams.token)
+    : createAxiosHeaders(getRowsParams.token);
 
   return executeWithConcurrencyLimit(
     async () => {
@@ -128,7 +132,9 @@ export async function updateRow(updateRowParams: UpdateRowParams) {
 
   return executeWithConcurrencyLimit(
     async () => {
-      const authenticationHeader = createAxiosHeaders(updateRowParams.token);
+      const authenticationHeader = updateRowParams.useDatabaseToken
+        ? createAxiosHeadersForOpenOpsTablesBlock(updateRowParams.token)
+        : createAxiosHeaders(updateRowParams.token);
       return await makeOpenOpsTablesPatch(
         url,
         updateRowParams.fields,
@@ -150,7 +156,9 @@ export async function upsertRow(upsertRowParams: UpsertRowParams) {
 
   return executeWithConcurrencyLimit(
     async () => {
-      const authenticationHeader = createAxiosHeaders(upsertRowParams.token);
+      const authenticationHeader = upsertRowParams.useDatabaseToken
+        ? createAxiosHeadersForOpenOpsTablesBlock(upsertRowParams.token)
+        : createAxiosHeaders(upsertRowParams.token);
       return await makeOpenOpsTablesPut(
         url,
         upsertRowParams.fields,
@@ -172,7 +180,9 @@ export async function addRow(addRowParams: AddRowParams) {
 
   return executeWithConcurrencyLimit(
     async () => {
-      const authenticationHeader = createAxiosHeaders(addRowParams.token);
+      const authenticationHeader = addRowParams.useDatabaseToken
+        ? createAxiosHeadersForOpenOpsTablesBlock(addRowParams.token)
+        : createAxiosHeaders(addRowParams.token);
       return await makeOpenOpsTablesPost(
         url,
         addRowParams.fields,
@@ -194,7 +204,9 @@ export async function deleteRow(deleteRowParams: DeleteRowParams) {
 
   return executeWithConcurrencyLimit(
     async () => {
-      const authenticationHeader = createAxiosHeaders(deleteRowParams.token);
+      const authenticationHeader = deleteRowParams.useDatabaseToken
+        ? createAxiosHeadersForOpenOpsTablesBlock(deleteRowParams.token)
+        : createAxiosHeaders(deleteRowParams.token);
       return await makeOpenOpsTablesDelete(url, authenticationHeader);
     },
     (error) => {
@@ -212,6 +224,7 @@ export async function getRowByPrimaryKeyValue(
   primaryKeyFieldValue: string,
   primaryKeyFieldName: any,
   primaryKeyFieldType: string,
+  useDatabaseToken = false,
 ) {
   const rows = await getRows({
     tableId: tableId,
@@ -223,6 +236,7 @@ export async function getRowByPrimaryKeyValue(
         type: getEqualityFilterType(primaryKeyFieldType),
       },
     ],
+    useDatabaseToken,
   });
 
   if (rows.length > 1) {