Remove feature flag to use Database tokens

Author: MarceloRGonc

packages/blocks/openops-tables/src/actions/delete-record-action.ts

@@ -7,7 +7,7 @@ import {
   getTableIdByTableName,
   OpenOpsField,
   openopsTablesDropdownProperty,
-  resolveTokenProvider,
+  createTokenProvider,
   TokenOrResolver,
 } from '@openops/common';
 import { cacheWrapper } from '@openops/server-shared';
@@ -36,7 +36,7 @@ export const deleteRecordAction = createAction({
       [tableName, context.server],
     );
 
-    const tokenOrResolver = await resolveTokenProvider(context.server);
+    const tokenOrResolver = await createTokenProvider(context.server);
 
     const fieldsCacheKey = `${context.run.id}-${tableId}-fields`;
     const fields = await cacheWrapper.getOrAdd<

packages/blocks/openops-tables/src/actions/get-records-action.ts

@@ -7,7 +7,7 @@ import {
   getTableIdByTableName,
   isSingleValueFilter,
   openopsTablesDropdownProperty,
-  resolveTokenProvider,
+  createTokenProvider,
   ViewFilterTypesEnum,
 } from '@openops/common';
 import { cacheWrapper } from '@openops/server-shared';
@@ -141,7 +141,7 @@ export const getRecordsAction = createAction({
       };
     });
     const filterType = context.propsValue.filterType as FilterType;
-    const tokenOrResolver = await resolveTokenProvider(context.server);
+    const tokenOrResolver = await createTokenProvider(context.server);
 
     const rows = await getRows({
       tableId: tableId,

packages/blocks/openops-tables/src/actions/update-record-action.ts

@@ -1,13 +1,13 @@
 import { BlockAuth, createAction, Property } from '@openops/blocks-framework';
 import {
+  createTokenProvider,
   getFields,
   getPrimaryKeyFieldFromFields,
   getPropertyFromField,
   getTableFields,
   getTableIdByTableName,
   OpenOpsField,
   openopsTablesDropdownProperty,
-  resolveTokenProvider,
   TokenOrResolver,
   upsertRow,
 } from '@openops/common';
@@ -137,7 +137,7 @@ export const updateRecordAction = createAction({
     );
 
     const fieldsCacheKey = `${context.run.id}-${tableId}-fields`;
-    const tokenOrResolver = await resolveTokenProvider(context.server);
+    const tokenOrResolver = await createTokenProvider(context.server);
     const tableFields = await cacheWrapper.getOrAdd<
       OpenOpsField[],
       [number, TokenOrResolver]

packages/openops/src/lib/openops-tables/auth-user.ts

@@ -1,14 +1,6 @@
-import { AppSystemProp, cacheWrapper, system } from '@openops/server-shared';
 import { AxiosHeaders } from 'axios';
 import { IAxiosRetryConfig } from 'axios-retry';
 import { makeOpenOpsTablesPost } from './requests-helpers';
-const tokenLifetimeMinutes = system.getNumber(
-  AppSystemProp.TABLES_TOKEN_LIFETIME_MINUTES,
-);
-
-const tokenLifetimeSeconds = tokenLifetimeMinutes
-  ? (tokenLifetimeMinutes - 10) * 60 // Subtract 10 minutes to ensure the cache expired before the token
-  : undefined;
 
 export interface AuthTokens {
   token: string;
@@ -36,29 +28,3 @@ export async function authenticateUserInOpenOpsTables(
     axiosRetryConfig,
   );
 }
-
-export async function authenticateDefaultUserInOpenOpsTables(
-  axiosRetryConfig?: IAxiosRetryConfig,
-): Promise<AuthTokens> {
-  const cacheKey = 'openops-tables-token';
-
-  let tokens = await cacheWrapper.getSerializedObject<AuthTokens>(cacheKey);
-
-  if (!tokens) {
-    const email = system.getOrThrow(AppSystemProp.OPENOPS_ADMIN_EMAIL);
-    const password = system.getOrThrow(AppSystemProp.OPENOPS_ADMIN_PASSWORD);
-
-    tokens = await authenticateUserInOpenOpsTables(
-      email,
-      password,
-      axiosRetryConfig,
-    );
-    await cacheWrapper.setSerializedObject(
-      cacheKey,
-      tokens,
-      tokenLifetimeSeconds,
-    );
-  }
-
-  return tokens;
-}

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

@@ -1,29 +1,19 @@
 import { ServerContext } from '@openops/blocks-framework';
-import { AppSystemProp, encryptUtils, system } from '@openops/server-shared';
-import { authenticateDefaultUserInOpenOpsTables } from './auth-user';
-
-export function shouldUseDatabaseToken(): boolean {
-  return system.getBoolean(AppSystemProp.ENABLE_TABLES_DATABASE_TOKEN) ?? false;
-}
+import { encryptUtils } from '@openops/server-shared';
 
 export type TokenOrResolver = string | { getToken: () => string };
 export type TablesServerContext = Pick<
   ServerContext,
   'tablesDatabaseId' | 'tablesDatabaseToken'
 >;
 
-export async function resolveTokenProvider(
+export async function createTokenProvider(
   serverContext: TablesServerContext,
 ): Promise<TokenOrResolver> {
-  if (shouldUseDatabaseToken()) {
-    return {
-      getToken: () => {
-        const { tablesDatabaseToken } = serverContext;
-        return encryptUtils.decryptString(tablesDatabaseToken);
-      },
-    };
-  }
-
-  const { token } = await authenticateDefaultUserInOpenOpsTables();
-  return token;
+  return {
+    getToken: () => {
+      const { tablesDatabaseToken } = serverContext;
+      return encryptUtils.decryptString(tablesDatabaseToken);
+    },
+  };
 }

packages/openops/src/lib/openops-tables/create-axios-headers.ts

@@ -1,5 +1,5 @@
 import { AxiosHeaders } from 'axios';
-import { shouldUseDatabaseToken, TokenOrResolver } from './context-helpers';
+import { TokenOrResolver } from './context-helpers';
 
 export enum AuthType {
   JWT = 'JWT',
@@ -12,12 +12,8 @@ function getToken(tokenOrResolver: TokenOrResolver): string {
     : tokenOrResolver.getToken();
 }
 
-function getAuthPrefix(
-  useJwtOverride: boolean,
-  shouldUseDatabaseTokenConfig: boolean,
-): AuthType {
-  const useJwt = useJwtOverride || !shouldUseDatabaseTokenConfig;
-  return useJwt ? AuthType.JWT : AuthType.Token;
+function getAuthPrefix(useJwtOverride: boolean): AuthType {
+  return useJwtOverride ? AuthType.JWT : AuthType.Token;
 }
 
 export const createAxiosHeaders = (
@@ -26,7 +22,7 @@ export const createAxiosHeaders = (
   const useJwtOverride = typeof tokenOrResolver === 'string';
   const token = getToken(tokenOrResolver);
 
-  const prefix = getAuthPrefix(useJwtOverride, shouldUseDatabaseToken());
+  const prefix = getAuthPrefix(useJwtOverride);
 
   return new AxiosHeaders({
     'Content-Type': 'application/json',

packages/openops/src/lib/openops-tables/openops-tables-common-properties.ts

@@ -1,5 +1,5 @@
 import { Property, Validators } from '@openops/blocks-framework';
-import { resolveTokenProvider, TablesServerContext } from './context-helpers';
+import { createTokenProvider, TablesServerContext } from './context-helpers';
 import {
   DateOpenOpsField,
   DurationOpenOpsField,
@@ -37,7 +37,7 @@ export async function getTableFields(
   serverContext: TablesServerContext,
 ): Promise<OpenOpsField[]> {
   const tableId = await getTableIdByTableName(tableName, serverContext);
-  const tokenOrResolver = await resolveTokenProvider(serverContext);
+  const tokenOrResolver = await createTokenProvider(serverContext);
   return await getFields(tableId, tokenOrResolver, false);
 }
 

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

@@ -1,6 +1,6 @@
 import { AxiosHeaders } from 'axios';
 import { makeOpenOpsTablesGet } from '../openops-tables/requests-helpers';
-import { TablesServerContext, resolveTokenProvider } from './context-helpers';
+import { TablesServerContext, createTokenProvider } from './context-helpers';
 import { createAxiosHeaders } from './create-axios-headers';
 
 async function getTables(
@@ -49,7 +49,7 @@ export async function getTableNames(
 async function getAvailableTablesInOpenopsTables(
   serverContext: TablesServerContext,
 ): Promise<OpenOpsTable[]> {
-  const tokenOrResolver = await resolveTokenProvider(serverContext);
+  const tokenOrResolver = await createTokenProvider(serverContext);
 
   const authenticationHeader = createAxiosHeaders(tokenOrResolver);
 

packages/server/api/test/unit/mcp/llm-query-router.test.ts

@@ -39,7 +39,6 @@ jest.mock('@openops/server-shared', () => ({
   },
   AppSystemProp: {
     DB_TYPE: 'DB_TYPE',
-    ENABLE_TABLES_DATABASE_TOKEN: 'ENABLE_TABLES_DATABASE_TOKEN',
   },
 }));
 

packages/server/shared/src/lib/system/system-prop.ts

@@ -110,7 +110,6 @@ export enum AppSystemProp {
 
   MAX_LLM_CALLS_WITHOUT_INTERACTION = 'MAX_LLM_CALLS_WITHOUT_INTERACTION',
   LLM_CHAT_EXPIRE_TIME_SECONDS = 'LLM_CHAT_EXPIRE_TIME_SECONDS',
-  ENABLE_TABLES_DATABASE_TOKEN = 'ENABLE_TABLES_DATABASE_TOKEN',
 }
 
 export enum SharedSystemProp {