Skip to content

The open alternative to Salesforce, designed for AI.

Only write audit log events for workspaces entitled to audit logs (#26182)

neo7738d0f5034d790
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
index 4b9e685a481..836e1f79edc 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
@@ -3670,12 +3670,12 @@ type Query {
getApiKeyRoles: [Role!]!
apiKey(input: GetApiKeyInput!): ApiKey
currentUserSessions: [UserSession!]!
- myConnectedAccounts: [ConnectedAccountPublicDTO!]!
- applicationConnectedAccounts(applicationId: UUID!): [ApplicationConnectedAccountDTO!]!
- applicationConnectionProviders(applicationId: UUID!): [ApplicationConnectionProvider!]!
billingPortalSession(returnUrlPath: String, forPaymentMethodUpdate: Boolean): BillingSession!
listPlans: [BillingPlan!]!
getResourceCreditUsage: [BillingResourceCreditUsage!]!
+ myConnectedAccounts: [ConnectedAccountPublicDTO!]!
+ applicationConnectedAccounts(applicationId: UUID!): [ApplicationConnectedAccountDTO!]!
+ applicationConnectionProviders(applicationId: UUID!): [ApplicationConnectionProvider!]!
getInviteSuggestions: [InviteSuggestion!]!
findWorkspaceInvitations: [WorkspaceInvitation!]!
getApprovedAccessDomains: [ApprovedAccessDomain!]!
@@ -3962,8 +3962,6 @@ type Mutation {
assignRoleToApiKey(apiKeyId: UUID!, roleId: UUID!): Boolean!
revokeUserSession(userSessionId: UUID!): Boolean!
revokeAllOtherUserSessions: Int!
- deleteConnectedAccount(id: UUID!): ConnectedAccountPublicDTO!
- updateOneApplicationVariable(key: String!, value: String!, applicationId: UUID): Boolean!
checkoutSession(recurringInterval: SubscriptionInterval!, plan: BillingPlanKey! = PRO, requirePaymentMethod: Boolean! = true, successUrlPath: String): BillingSession!
createSubscriptionPaymentIntent(recurringInterval: SubscriptionInterval!, plan: BillingPlanKey! = PRO, requirePaymentMethod: Boolean! = true, successUrlPath: String, idempotencyKey: String!): BillingPaymentIntent!
createBillingPaymentMethodSetupIntent: BillingPaymentIntent!
@@ -3974,6 +3972,8 @@ type Mutation {
setResourceCreditSubscriptionPrice(priceId: String!): BillingUpdate!
endSubscriptionTrialPeriod: BillingEndTrialPeriod!
cancelSwitchResourceCreditPrice: BillingUpdate!
+ deleteConnectedAccount(id: UUID!): ConnectedAccountPublicDTO!
+ updateOneApplicationVariable(key: String!, value: String!, applicationId: UUID): Boolean!
skipSyncEmailOnboardingStep(isAutoSkipped: Boolean! = false): OnboardingStepSuccess!
completeBookCallOnboardingStep(hasBookedCall: Boolean! = false, isAutoSkipped: Boolean! = false): OnboardingStepSuccess!
triggerInstallAppsOnboardingStep(universalIdentifiers: [String!]!, isAutoSkipped: Boolean! = false): OnboardingStepSuccess!
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
index 3d994fbde39..7f66ddf18d3 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
@@ -3226,12 +3226,12 @@ export interface Query {
getApiKeyRoles: Role[]
apiKey?: ApiKey
currentUserSessions: UserSession[]
- myConnectedAccounts: ConnectedAccountPublicDTO[]
- applicationConnectedAccounts: ApplicationConnectedAccountDTO[]
- applicationConnectionProviders: ApplicationConnectionProvider[]
billingPortalSession: BillingSession
listPlans: BillingPlan[]
getResourceCreditUsage: BillingResourceCreditUsage[]
+ myConnectedAccounts: ConnectedAccountPublicDTO[]
+ applicationConnectedAccounts: ApplicationConnectedAccountDTO[]
+ applicationConnectionProviders: ApplicationConnectionProvider[]
getInviteSuggestions: InviteSuggestion[]
findWorkspaceInvitations: WorkspaceInvitation[]
getApprovedAccessDomains: ApprovedAccessDomain[]
@@ -3387,8 +3387,6 @@ export interface Mutation {
assignRoleToApiKey: Scalars['Boolean']
revokeUserSession: Scalars['Boolean']
revokeAllOtherUserSessions: Scalars['Int']
- deleteConnectedAccount: ConnectedAccountPublicDTO
- updateOneApplicationVariable: Scalars['Boolean']
checkoutSession: BillingSession
createSubscriptionPaymentIntent: BillingPaymentIntent
createBillingPaymentMethodSetupIntent: BillingPaymentIntent
@@ -3399,6 +3397,8 @@ export interface Mutation {
setResourceCreditSubscriptionPrice: BillingUpdate
endSubscriptionTrialPeriod: BillingEndTrialPeriod
cancelSwitchResourceCreditPrice: BillingUpdate
+ deleteConnectedAccount: ConnectedAccountPublicDTO
+ updateOneApplicationVariable: Scalars['Boolean']
skipSyncEmailOnboardingStep: OnboardingStepSuccess
completeBookCallOnboardingStep: OnboardingStepSuccess
triggerInstallAppsOnboardingStep: OnboardingStepSuccess
@@ -6969,12 +6969,12 @@ export interface QueryGenqlSelection{
getApiKeyRoles?: RoleGenqlSelection
apiKey?: (ApiKeyGenqlSelection & { __args: {input: GetApiKeyInput} })
currentUserSessions?: UserSessionGenqlSelection
- myConnectedAccounts?: ConnectedAccountPublicDTOGenqlSelection
- applicationConnectedAccounts?: (ApplicationConnectedAccountDTOGenqlSelection & { __args: {applicationId: Scalars['UUID']} })
- applicationConnectionProviders?: (ApplicationConnectionProviderGenqlSelection & { __args: {applicationId: Scalars['UUID']} })
billingPortalSession?: (BillingSessionGenqlSelection & { __args?: {returnUrlPath?: (Scalars['String'] | null), forPaymentMethodUpdate?: (Scalars['Boolean'] | null)} })
listPlans?: BillingPlanGenqlSelection
getResourceCreditUsage?: BillingResourceCreditUsageGenqlSelection
+ myConnectedAccounts?: ConnectedAccountPublicDTOGenqlSelection
+ applicationConnectedAccounts?: (ApplicationConnectedAccountDTOGenqlSelection & { __args: {applicationId: Scalars['UUID']} })
+ applicationConnectionProviders?: (ApplicationConnectionProviderGenqlSelection & { __args: {applicationId: Scalars['UUID']} })
getInviteSuggestions?: InviteSuggestionGenqlSelection
findWorkspaceInvitations?: WorkspaceInvitationGenqlSelection
getApprovedAccessDomains?: ApprovedAccessDomainGenqlSelection
@@ -7179,8 +7179,6 @@ export interface MutationGenqlSelection{
assignRoleToApiKey?: { __args: {apiKeyId: Scalars['UUID'], roleId: Scalars['UUID']} }
revokeUserSession?: { __args: {userSessionId: Scalars['UUID']} }
revokeAllOtherUserSessions?: boolean | number
- deleteConnectedAccount?: (ConnectedAccountPublicDTOGenqlSelection & { __args: {id: Scalars['UUID']} })
- updateOneApplicationVariable?: { __args: {key: Scalars['String'], value: Scalars['String'], applicationId?: (Scalars['UUID'] | null)} }
checkoutSession?: (BillingSessionGenqlSelection & { __args: {recurringInterval: SubscriptionInterval, plan: BillingPlanKey, requirePaymentMethod: Scalars['Boolean'], successUrlPath?: (Scalars['String'] | null)} })
createSubscriptionPaymentIntent?: (BillingPaymentIntentGenqlSelection & { __args: {recurringInterval: SubscriptionInterval, plan: BillingPlanKey, requirePaymentMethod: Scalars['Boolean'], successUrlPath?: (Scalars['String'] | null), idempotencyKey: Scalars['String']} })
createBillingPaymentMethodSetupIntent?: BillingPaymentIntentGenqlSelection
@@ -7191,6 +7189,8 @@ export interface MutationGenqlSelection{
setResourceCreditSubscriptionPrice?: (BillingUpdateGenqlSelection & { __args: {priceId: Scalars['String']} })
endSubscriptionTrialPeriod?: BillingEndTrialPeriodGenqlSelection
cancelSwitchResourceCreditPrice?: BillingUpdateGenqlSelection
+ deleteConnectedAccount?: (ConnectedAccountPublicDTOGenqlSelection & { __args: {id: Scalars['UUID']} })
+ updateOneApplicationVariable?: { __args: {key: Scalars['String'], value: Scalars['String'], applicationId?: (Scalars['UUID'] | null)} }
skipSyncEmailOnboardingStep?: (OnboardingStepSuccessGenqlSelection & { __args: {isAutoSkipped: Scalars['Boolean']} })
completeBookCallOnboardingStep?: (OnboardingStepSuccessGenqlSelection & { __args: {hasBookedCall: Scalars['Boolean'], isAutoSkipped: Scalars['Boolean']} })
triggerInstallAppsOnboardingStep?: (OnboardingStepSuccessGenqlSelection & { __args: {universalIdentifiers: Scalars['String'][], isAutoSkipped: Scalars['Boolean']} })
diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.ts
index bb141bb2ea6..804e4ff7319 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts
@@ -7327,6 +7327,23 @@ export default {
"currentUserSessions": [
173
],
+ "billingPortalSession": [
+ 178,
+ {
+ "returnUrlPath": [
+ 1
+ ],
+ "forPaymentMethodUpdate": [
+ 8
+ ]
+ }
+ ],
+ "listPlans": [
+ 176
+ ],
+ "getResourceCreditUsage": [
+ 175
+ ],
"myConnectedAccounts": [
193
],
@@ -7348,23 +7365,6 @@ export default {
]
}
],
- "billingPortalSession": [
- 178,
- {
- "returnUrlPath": [
- 1
- ],
- "forPaymentMethodUpdate": [
- 8
- ]
- }
- ],
- "listPlans": [
- 176
- ],
- "getResourceCreditUsage": [
- 175
- ],
"getInviteSuggestions": [
185
],
@@ -8833,31 +8833,6 @@ export default {
"revokeAllOtherUserSessions": [
28
],
- "deleteConnectedAccount": [
- 193,
- {
- "id": [
- 3,
- "UUID!"
- ]
- }
- ],
- "updateOneApplicationVariable": [
- 8,
- {
- "key": [
- 1,
- "String!"
- ],
- "value": [
- 1,
- "String!"
- ],
- "applicationId": [
- 3
- ]
- }
- ],
"checkoutSession": [
178,
{
@@ -8932,6 +8907,31 @@ export default {
"cancelSwitchResourceCreditPrice": [
179
],
+ "deleteConnectedAccount": [
+ 193,
+ {
+ "id": [
+ 3,
+ "UUID!"
+ ]
+ }
+ ],
+ "updateOneApplicationVariable": [
+ 8,
+ {
+ "key": [
+ 1,
+ "String!"
+ ],
+ "value": [
+ 1,
+ "String!"
+ ],
+ "applicationId": [
+ 3
+ ]
+ }
+ ],
"skipSyncEmailOnboardingStep": [
187,
{
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
index 952ee102fcc..61752e597b2 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
@@ -13,6 +13,8 @@ import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import { OnDatabaseBatchEvent } from 'src/engine/api/graphql/graphql-query-runner/decorators/on-database-batch-event.decorator';
import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
+import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';
+import { BillingSubscriptionService } from 'src/engine/core-modules/billing/services/billing-subscription.service';
import { CreateEventLogFromInternalEvent } from 'src/engine/core-modules/event-logs/ingest/create-event-log-from-internal-event';
import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
@@ -40,6 +42,7 @@ export class EntityEventsToDbListener {
private readonly objectRecordEventPublisher: ObjectRecordEventPublisher,
private readonly timelineActivityRoutingPlanService: TimelineActivityRoutingPlanService,
private readonly workspaceCacheService: WorkspaceCacheService,
+ private readonly billingSubscriptionService: BillingSubscriptionService,
) {}
@OnDatabaseBatchEvent('*', DatabaseEventAction.CREATED)
@@ -119,18 +122,32 @@ export class EntityEventsToDbListener {
}
if (isAuditLogBatchEvent && action !== DatabaseEventAction.DESTROYED) {
- promises.push(
- this.entityEventsToDbQueueService.add<WorkspaceEventBatch<T>>(
- CreateEventLogFromInternalEvent.name,
- batchEvent,
- { retryLimit: 1 },
- ),
- );
+ promises.push(this.enqueueEventLogIfEntitled(batchEvent));
}
await Promise.all(promises);
}
+ private async enqueueEventLogIfEntitled<T extends ObjectRecordEvent>(
+ batchEvent: WorkspaceEventBatch<T>,
+ ) {
+ const hasAuditLogsEntitlement =
+ await this.billingSubscriptionService.getWorkspaceEntitlementValue(
+ batchEvent.workspaceId,
+ BillingEntitlementKey.AUDIT_LOGS,
+ );
+
+ if (!hasAuditLogsEntitlement) {
+ return;
+ }
+
+ await this.entityEventsToDbQueueService.add<WorkspaceEventBatch<T>>(
+ CreateEventLogFromInternalEvent.name,
+ batchEvent,
+ { retryLimit: 1 },
+ );
+ }
+
private async enqueueWebhookJobsIfAnyWebhookMatches<
T extends ObjectRecordEvent,
>(batchEventForWebhook: WorkspaceEventBatchForWebhook<T>) {
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts
index 9565810ef6b..5da0f68cffe 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts
@@ -3,6 +3,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { TelemetryListener } from 'src/engine/api/graphql/workspace-query-runner/listeners/telemetry.listener';
import { WorkspaceQueryHookModule } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.module';
+import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
import { FileModule } from 'src/engine/core-modules/file/file.module';
import { RecordPositionModule } from 'src/engine/core-modules/record-position/record-position.module';
@@ -27,6 +28,7 @@ import { EntityEventsToDbListener } from './listeners/entity-events-to-db.listen
SubscriptionsModule,
TimelineActivityModule,
WorkspaceCacheModule,
+ BillingModule,
],
providers: [EntityEventsToDbListener, TelemetryListener],
})