The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
chore(usage-limit): remove the API rate limit v2 feature flag (#26169)
Etienne2692a4035236
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex 8225a4e87c0..82932fe3d90 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -1992,7 +1992,6 @@ enum FeatureFlagKey {IS_REST_METADATA_API_NEW_FORMAT_DIRECTIS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLEDIS_WORKFLOW_CORE_INDEX_PAGE_ENABLED- IS_API_RATE_LIMIT_V2_ENABLEDIS_MESSAGE_CALENDAR_TARGET_READ_ENABLEDIS_QUOTA_ENGINE_CREDIT_BOUND_ENABLEDIS_RECORD_SHARING_ENABLEDdiff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex b4a9fb7fd62..89b3f236d43 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -1607,7 +1607,7 @@ export interface FeatureFlag {__typename: 'FeatureFlag'}-export type FeatureFlagKey = 'IS_APP_CLAIMING_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_MESSAGE_CAMPAIGN_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' | 'IS_API_RATE_LIMIT_V2_ENABLED' | 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED' | 'IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED' | 'IS_RECORD_SHARING_ENABLED' | 'IS_INITIAL_OBJECT_VIEW_ENABLED' | 'IS_WEBHOOK_RATE_LIMIT_ENABLED'+export type FeatureFlagKey = 'IS_APP_CLAIMING_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_MESSAGE_CAMPAIGN_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' | 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED' | 'IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED' | 'IS_RECORD_SHARING_ENABLED' | 'IS_INITIAL_OBJECT_VIEW_ENABLED' | 'IS_WEBHOOK_RATE_LIMIT_ENABLED'export interface WorkspaceUrls {customUrl?: Scalars['String']@@ -10753,7 +10753,6 @@ export const enumFeatureFlagKey = {IS_REST_METADATA_API_NEW_FORMAT_DIRECT: 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' as const,IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED: 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' as const,IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED: 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' as const,- IS_API_RATE_LIMIT_V2_ENABLED: 'IS_API_RATE_LIMIT_V2_ENABLED' as const,IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED: 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED' as const,IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED: 'IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED' as const,IS_RECORD_SHARING_ENABLED: 'IS_RECORD_SHARING_ENABLED' as const,diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.tsindex 91af30a0202..3f46d44c873 100644--- a/packages/twenty-front/src/generated-admin/graphql.ts+++ b/packages/twenty-front/src/generated-admin/graphql.ts@@ -423,7 +423,6 @@ export type FeatureFlag = {};export enum FeatureFlagKey {- IS_API_RATE_LIMIT_V2_ENABLED = 'IS_API_RATE_LIMIT_V2_ENABLED',IS_APP_CLAIMING_ENABLED = 'IS_APP_CLAIMING_ENABLED',IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED = 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED',IS_INITIAL_OBJECT_VIEW_ENABLED = 'IS_INITIAL_OBJECT_VIEW_ENABLED',diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 5748e32331e..4821259e6c3 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -2044,7 +2044,6 @@ export type FeatureFlag = {};export enum FeatureFlagKey {- IS_API_RATE_LIMIT_V2_ENABLED = 'IS_API_RATE_LIMIT_V2_ENABLED',IS_APP_CLAIMING_ENABLED = 'IS_APP_CLAIMING_ENABLED',IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED = 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED',IS_INITIAL_OBJECT_VIEW_ENABLED = 'IS_INITIAL_OBJECT_VIEW_ENABLED',diff --git a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.tsindex 9123e126ccb..da415b9f597 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts+++ b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts@@ -42,10 +42,6 @@ export const SETTINGS_ADMIN_FEATURE_FLAG_METADATA: Partial<label: msg`Workflow index page`,description: msg`Use the dedicated workflow index page to browse workflows and their versions.`,},- [FeatureFlagKey.IS_API_RATE_LIMIT_V2_ENABLED]: {- label: msg`API rate limits v2`,- description: msg`Use the usage limit engine to enforce API request speed limits.`,- },[FeatureFlagKey.IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED]: {label: msg`Message and calendar target reads`,description: msg`Use target relations to find messages and calendar events linked to records.`,diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.tsindex 1c636285fa8..25035b196e4 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts@@ -1,11 +1,7 @@import { Inject, Injectable } from '@nestjs/common';import { type PermissionFlagType } from 'twenty-shared/constants';-import {- FeatureFlagKey,- FieldMetadataType,- type ObjectRecord,-} from 'twenty-shared/types';+import { FieldMetadataType, type ObjectRecord } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { type ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';@@ -49,11 +45,8 @@ import { isApiKeyAuthContext } from 'src/engine/core-modules/auth/guards/is-api-import { isApplicationAuthContext } from 'src/engine/core-modules/auth/guards/is-application-auth-context.guard';import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';import { WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';import { MetricsService } from 'src/engine/core-modules/metrics/metrics.service';import { MetricsKeys } from 'src/engine/core-modules/metrics/types/metrics-keys.type';-import { ThrottlerException } from 'src/engine/core-modules/throttler/throttler.exception';-import { ThrottlerService } from 'src/engine/core-modules/throttler/throttler.service';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';import { UsageLimitException } from 'src/engine/core-modules/usage-limit/exceptions/usage-limit.exception';import { UsageLimitSpeedService } from 'src/engine/core-modules/usage-limit/services/usage-limit-speed.service';@@ -113,8 +106,6 @@ export abstract class CommonBaseQueryRunnerService<@Inject()protected readonly commonResultGettersService: CommonResultGettersService;@Inject()- protected readonly throttlerService: ThrottlerService;- @Inject()protected readonly usageLimitSpeedService: UsageLimitSpeedService;@Inject()protected readonly usageRecorderService: UsageRecorderService;@@ -122,8 +113,6 @@ export abstract class CommonBaseQueryRunnerService<protected readonly twentyConfigService: TwentyConfigService;@Inject()protected readonly metricsService: MetricsService;- @Inject()- protected readonly featureFlagService: FeatureFlagService;protected abstract readonly operationName: CommonQueryNames;@@ -141,7 +130,7 @@ export abstract class CommonBaseQueryRunnerService<} = queryRunnerContext;if ((queryRunnerContext.nestedOperationDepth ?? 0) === 0) {- await this.throttleQueryExecution(authContext);+ await this.consumeApiSpeedLimit(authContext);}this.recordApiUsage(authContext);@@ -576,23 +565,6 @@ export abstract class CommonBaseQueryRunnerService<});}- private async throttleQueryExecution(authContext: WorkspaceAuthContext) {- const isApiRateLimitV2Enabled =- await this.featureFlagService.isFeatureEnabled(- FeatureFlagKey.IS_API_RATE_LIMIT_V2_ENABLED,- authContext.workspace.id,- );-- if (isApiRateLimitV2Enabled) {- await this.consumeApiSpeedLimit(authContext);-- return;- }-- await this.throttleApiKeyQueryExecution(authContext);- await this.throttleApplicationQueryExecution(authContext);- }-private async consumeApiSpeedLimit(authContext: WorkspaceAuthContext) {try {await this.usageLimitSpeedService.consumeOrThrow({@@ -646,84 +618,6 @@ export abstract class CommonBaseQueryRunnerService<}}- private async throttleApplicationQueryExecution(- authContext: WorkspaceAuthContext,- ) {- if (!isApplicationAuthContext(authContext)) return;-- try {- await this.throttlerService.tokenBucketThrottleOrThrow(- `api:throttler:application:${authContext.application.universalIdentifier}`,- 1,- this.twentyConfigService.get('APPLICATION_API_RATE_LIMITING_LIMIT'),- this.twentyConfigService.get('APPLICATION_API_RATE_LIMITING_TTL_IN_MS'),- );- } catch (error) {- if (error instanceof ThrottlerException) {- await this.metricsService.incrementCounterForEvent({- key: MetricsKeys.CommonApiApplicationQueryRateLimited,- shouldStoreInCache: false,- attributes: {- universal_identifier: authContext.application.universalIdentifier,- app_name: authContext.application.name,- source_type: authContext.application.sourceType,- },- });- }-- throw error;- }- }-- private async throttleApiKeyQueryExecution(- authContext: WorkspaceAuthContext,- ) {- try {- if (!isApiKeyAuthContext(authContext)) return;-- const workspaceId = authContext.workspace.id;-- const shortConfig = {- key: `api:throttler:${workspaceId}-short-limit`,- maxTokens: this.twentyConfigService.get(- 'API_RATE_LIMITING_SHORT_LIMIT',- ),- timeWindow: this.twentyConfigService.get(- 'API_RATE_LIMITING_SHORT_TTL_IN_MS',- ),- };-- const longConfig = {- key: `api:throttler:${workspaceId}-long-limit`,- maxTokens: this.twentyConfigService.get('API_RATE_LIMITING_LONG_LIMIT'),- timeWindow: this.twentyConfigService.get(- 'API_RATE_LIMITING_LONG_TTL_IN_MS',- ),- };-- await this.throttlerService.tokenBucketThrottleOrThrow(- shortConfig.key,- 1,- shortConfig.maxTokens,- shortConfig.timeWindow,- );-- await this.throttlerService.tokenBucketThrottleOrThrow(- longConfig.key,- 1,- longConfig.maxTokens,- longConfig.timeWindow,- );- } catch (error) {- await this.metricsService.incrementCounterForEvent({- key: MetricsKeys.CommonApiQueryRateLimited,- shouldStoreInCache: false,- });-- throw error;- }- }-private validateQueryComplexity(selectedFieldsResult: CommonSelectedFieldsResult,args: CommonExtendedInput<Args>,diff --git a/packages/twenty-server/test/integration/usage-limit/api-rate-limit.integration-spec.ts b/packages/twenty-server/test/integration/usage-limit/api-rate-limit.integration-spec.tsindex af9eedcd6f1..46c9654d37a 100644--- a/packages/twenty-server/test/integration/usage-limit/api-rate-limit.integration-spec.ts+++ b/packages/twenty-server/test/integration/usage-limit/api-rate-limit.integration-spec.ts@@ -8,11 +8,9 @@ import { jestExpectToBeDefined } from 'test/utils/jest-expect-to-be-defined.utilimport { gql } from 'graphql-tag';import { createClient } from 'redis';-import { FeatureFlagKey } from 'twenty-shared/types';import { type Repository } from 'typeorm';import { ApiKeyEntity } from 'src/engine/core-modules/api-key/api-key.entity';-import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';import { UsageLimitEntity } from 'src/engine/core-modules/usage-limit/usage-limit.entity';import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';@@ -23,7 +21,6 @@ const LIMIT_VALUE = 1;describe('API rate limiting', () => {let usageLimitRepository: Repository<UsageLimitEntity>;- let featureFlagRepository: Repository<FeatureFlagEntity>;let apiKeyRepository: Repository<ApiKeyEntity>;let redis: Awaited<ReturnType<typeof createClient>>;let usageLimitId: string;@@ -55,7 +52,6 @@ describe('API rate limiting', () => {const invalidateWorkspaceCaches = async () => {const keys = [- ...(await redis.keys(`*featureFlagsMap:${SEED_APPLE_WORKSPACE_ID}*`)),...(await redis.keys(`*usageLimits:${SEED_APPLE_WORKSPACE_ID}*`)),];@@ -120,23 +116,11 @@ describe('API rate limiting', () => {beforeAll(async () => {usageLimitRepository =getCoreRepository<UsageLimitEntity>(UsageLimitEntity);- featureFlagRepository =- getCoreRepository<FeatureFlagEntity>(FeatureFlagEntity);apiKeyRepository = getCoreRepository<ApiKeyEntity>(ApiKeyEntity);redis = await createClient({ url: process.env.REDIS_URL }).connect();await createDedicatedApiKey();- await featureFlagRepository.delete({- key: FeatureFlagKey.IS_API_RATE_LIMIT_V2_ENABLED,- workspaceId: SEED_APPLE_WORKSPACE_ID,- });- await featureFlagRepository.save({- key: FeatureFlagKey.IS_API_RATE_LIMIT_V2_ENABLED,- value: true,- workspaceId: SEED_APPLE_WORKSPACE_ID,- });-const [usageLimit] = await usageLimitRepository.save([{workspaceId: SEED_APPLE_WORKSPACE_ID,@@ -160,10 +144,6 @@ describe('API rate limiting', () => {afterAll(async () => {await usageLimitRepository.delete({ id: usageLimitId });- await featureFlagRepository.delete({- key: FeatureFlagKey.IS_API_RATE_LIMIT_V2_ENABLED,- workspaceId: SEED_APPLE_WORKSPACE_ID,- });await apiKeyRepository.delete({ id: apiKeyId });await invalidateWorkspaceCaches();await redis.quit();diff --git a/packages/twenty-shared/src/types/FeatureFlagKey.ts b/packages/twenty-shared/src/types/FeatureFlagKey.tsindex 4a8f2c78206..df12f029be7 100644--- a/packages/twenty-shared/src/types/FeatureFlagKey.ts+++ b/packages/twenty-shared/src/types/FeatureFlagKey.ts@@ -8,7 +8,6 @@ export enum FeatureFlagKey {IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED = 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED',IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED = 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED',- IS_API_RATE_LIMIT_V2_ENABLED = 'IS_API_RATE_LIMIT_V2_ENABLED',IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED = 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED',IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED = 'IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED',IS_RECORD_SHARING_ENABLED = 'IS_RECORD_SHARING_ENABLED',