The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(server): correct misclassified structural exemptions in prefer-workspace-scoped-repository (#26202)
Paul Rastoinf6de5eed01ec
diff --git a/packages/twenty-oxlint-rules/package.json b/packages/twenty-oxlint-rules/package.jsonindex 1c656a76c78..bad9939b331 100644--- a/packages/twenty-oxlint-rules/package.json+++ b/packages/twenty-oxlint-rules/package.json@@ -3,6 +3,7 @@"private": true,"type": "module","devDependencies": {- "@oxlint/plugins": "^1.51.0"+ "@oxlint/plugins": "^1.51.0",+ "twenty-shared": "workspace:*"}}diff --git a/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.exemptions.ts b/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.exemptions.tsnew file mode 100644index 00000000000..5db390bbb58--- /dev/null+++ b/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.exemptions.ts@@ -0,0 +1,55 @@+// Kept free of imports: twenty-server's exemptions spec loads this module.+// Entities that do not fit the scoped wrapper: workspace itself,+// nullable-workspaceId rows (instance-level config / migrations / tokens),+// and global tables with no workspaceId column at all.+export const STRUCTURAL_EXEMPTIONS = [+ 'WorkspaceEntity',++ // nullable workspaceId — both rows support instance-level and per-workspace use+ 'KeyValuePairEntity',+ 'UpgradeMigrationEntity',+ 'AppTokenEntity',+ // user-scoped auth sessions; workspaceId is null for workspace-agnostic sessions+ 'UserSessionEntity',+ 'ApplicationRegistrationEntity',++ 'ApplicationRegistrationVariableEntity',+ 'BillingMeterEntity',+ 'BillingPriceEntity',+ 'BillingProductEntity',+ 'BillingSubscriptionItemEntity',+ 'SigningKeyEntity',+ 'UserEntity',+] as const;++// Workspace-scoped entities the wrapper could technically wrap, but where+// the dominant access patterns are cross-workspace (request routing, auth,+// metadata sync, file storage, transaction-bound channel updates) and the+// payoff doesn't justify dual-injecting every call site or growing the+// wrapper API. Treat as a "deliberately not migrated" list, not a backlog.+export const WORKSPACE_SCOPED_EXEMPTIONS = [+ // Resolved by id alone at auth/request-routing time and inside file-storage+ // transactions; very few of the ~50 call sites carry a workspaceId.+ 'ApplicationEntity',+ // Read by user across every workspace they belong to (the "apps you+ // authorized" screen) and from the OAuth token endpoint, which has no+ // request workspace to scope by.+ 'ApplicationAuthorizationEntity',+ // 20+ call sites across calendar/messaging modules; staged for a dedicated PR.+ 'CalendarChannelEntity',+ 'MessageChannelEntity',+ // The owning services `extends TypeOrmQueryService<E>` and pass the raw+ // repo to `super(...)`; the superclass type doesn't accept the wrapper.+ 'FieldMetadataEntity',+ 'ObjectMetadataEntity',+ // Only injection lives in a frozen historical upgrade-version-command+ // directory that CI's mutation-guard refuses to let us edit.+ 'DataSourceEntity',+ // The domain column is globally unique across workspaces, so duplicate+ // preflight checks must query cross-workspace; writes stay on the wrapper.+ 'EmailingDomainEntity',+ 'UserWorkspaceEntity',+ 'ConnectedAccountEntity',+ 'MessageFolderEntity',+ 'WorkspaceSsoIdentityProviderEntity',+] as const;diff --git a/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.ts b/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.tsindex 31f45fcd43d..ae60a5d0c8e 100644--- a/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.ts+++ b/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.ts@@ -1,65 +1,24 @@import { defineRule } from '@oxlint/plugins';-export const RULE_NAME = 'prefer-workspace-scoped-repository';+import { type Equal, type Expect } from 'twenty-shared/testing';-// Entities that do not fit the scoped wrapper: workspace itself, pivots,-// nullable-workspaceId rows (instance-level config / migrations / tokens),-// and global tables with no workspaceId column at all.-const STRUCTURAL_EXEMPTIONS = new Set<string>([- 'WorkspaceEntity',- 'UserWorkspaceEntity',- 'AppTokenEntity',- 'ApplicationRegistrationEntity',- 'ApplicationRegistrationClaimEntity',- 'ApplicationRegistrationVariableEntity',- // nullable workspaceId — both rows support instance-level and per-workspace use- 'KeyValuePairEntity',- 'UpgradeMigrationEntity',- // user-scoped auth sessions; workspaceId is null for workspace-agnostic sessions- 'UserSessionEntity',-- 'BillingMeterEntity',- 'BillingPriceEntity',- 'BillingProductEntity',- 'BillingSubscriptionItemEntity',- 'ConnectedAccountEntity',- 'ConnectionProviderEntity',- 'FrontComponentEntity',- 'LogicFunctionEntity',- 'MessageFolderEntity',- 'RolePermissionFlagEntity',- 'SigningKeyEntity',- 'UserEntity',- 'WorkspaceSsoIdentityProviderEntity',-]);+import {+ STRUCTURAL_EXEMPTIONS,+ WORKSPACE_SCOPED_EXEMPTIONS,+} from './prefer-workspace-scoped-repository.exemptions';-// Workspace-scoped entities the wrapper could technically wrap, but where-// the dominant access patterns are cross-workspace (request routing, auth,-// metadata sync, file storage, transaction-bound channel updates) and the-// payoff doesn't justify dual-injecting every call site or growing the-// wrapper API. Treat as a "deliberately not migrated" list, not a backlog.-const WORKSPACE_SCOPED_EXEMPTIONS = new Set<string>([- // Resolved by id alone at auth/request-routing time and inside file-storage- // transactions; very few of the ~50 call sites carry a workspaceId.- 'ApplicationEntity',- // Read by user across every workspace they belong to (the "apps you- // authorized" screen) and from the OAuth token endpoint, which has no- // request workspace to scope by.- 'ApplicationAuthorizationEntity',- // 20+ call sites across calendar/messaging modules; staged for a dedicated PR.- 'CalendarChannelEntity',- 'MessageChannelEntity',- // The owning services `extends TypeOrmQueryService<E>` and pass the raw- // repo to `super(...)`; the superclass type doesn't accept the wrapper.- 'FieldMetadataEntity',- 'ObjectMetadataEntity',- // Only injection lives in a frozen historical upgrade-version-command- // directory that CI's mutation-guard refuses to let us edit.- 'DataSourceEntity',- // The domain column is globally unique across workspaces, so duplicate- // preflight checks must query cross-workspace; writes stay on the wrapper.- 'EmailingDomainEntity',-]);+export const RULE_NAME = 'prefer-workspace-scoped-repository';++// oxlint-disable-next-line no-unused-vars+type ExemptionListsAreDisjoint = Expect<+ Equal<+ Extract<+ (typeof STRUCTURAL_EXEMPTIONS)[number],+ (typeof WORKSPACE_SCOPED_EXEMPTIONS)[number]+ >,+ never+ >+>;// Everything else must use @InjectWorkspaceScopedRepository.const EXCLUSIONS = new Set<string>([diff --git a/packages/twenty-server/jest.config.mjs b/packages/twenty-server/jest.config.mjsindex cb480d0c214..b0b296a0d1e 100644--- a/packages/twenty-server/jest.config.mjs+++ b/packages/twenty-server/jest.config.mjs@@ -25,7 +25,7 @@ const jestConfig = {// nested under sanitize-html/node_modules because other consumers hold htmlparser2 8/10 at the root -- the optional// (.*/node_modules/)? prefix lets the allow-list match a package at any nesting depth, not only the hoisted copy.// jest's CJS runtime can't load their `export` syntax, so let swc transform them.- '/node_modules/(?!(.*/node_modules/)?(file-type|@file-type|strtok3|token-types|@borewit|@tokenizer|uint8array-extras|read-next-line|digest-fetch|md5|js-sha256|js-sha512|base-64|charenc|crypt|email-reply-parser|jsdom|html-encoding-sniffer|whatwg-encoding|@exodus|parse5|entities|tough-cookie|@csstools|@asamuzakjp|graphql-upload|fs-capacitor|e2b|@e2b|chalk|ai|@ai-sdk|@workflow|htmlparser2|domhandler|domutils|dom-serializer|domelementtype|@faker-js)/)',+ '/node_modules/(?!(.*/node_modules/)?(file-type|@file-type|strtok3|token-types|@borewit|@tokenizer|uint8array-extras|read-next-line|digest-fetch|md5|js-sha256|js-sha512|base-64|charenc|crypt|email-reply-parser|jsdom|html-encoding-sniffer|whatwg-encoding|@exodus|parse5|entities|tough-cookie|@csstools|@asamuzakjp|graphql-upload|fs-capacitor|e2b|@e2b|chalk|ai|@ai-sdk|@workflow|htmlparser2|domhandler|domutils|dom-serializer|domelementtype|@faker-js|twenty-oxlint-rules)/)',],testRegex: '.*\\.spec\\.ts$',transform: {diff --git a/packages/twenty-server/package.json b/packages/twenty-server/package.jsonindex b69c9999c4c..384812a0a67 100644--- a/packages/twenty-server/package.json+++ b/packages/twenty-server/package.json@@ -233,6 +233,7 @@"ts-node": "10.9.1","twenty-client-sdk": "workspace:*","twenty-emails": "workspace:*",+ "twenty-oxlint-rules": "workspace:*","twenty-shared": "workspace:*"},"engines": {diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest.module.tsindex 329d3529a1c..67e3f7478c1 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest.module.ts@@ -21,6 +21,7 @@ import { FrontComponentEntity } from 'src/engine/metadata-modules/front-componenimport { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';+import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';@Module({imports: [@@ -39,6 +40,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceWorkspaceMigrationModule,],providers: [+ provideWorkspaceScopedRepository(FrontComponentEntity),ApplicationManifestApplyService,ApplicationManifestMigrationService,ApplicationSyncService,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-sync.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-sync.service.tsindex ca1ab28864d..fabbea6ce9c 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-sync.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-sync.service.ts@@ -1,8 +1,6 @@import { Inject, Injectable, Logger } from '@nestjs/common';-import { InjectRepository } from '@nestjs/typeorm';import { type Manifest } from 'twenty-shared/application';-import { Repository } from 'typeorm';import { ALL_METADATA_NAME } from 'twenty-shared/metadata';import { FileFolder } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -36,6 +34,8 @@ import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-managerimport { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';import { WorkspaceMigration } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration.type';import { streamToBuffer } from 'src/utils/stream-to-buffer';+import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';+import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';@Injectable()export class ApplicationSyncService {@@ -51,8 +51,8 @@ export class ApplicationSyncService {@Inject(LOGIC_FUNCTION_DRIVER_FACTORY_TOKEN)private readonly logicFunctionDriverFactory: LogicFunctionDriverFactory,private readonly applicationUninstallService: ApplicationUninstallService,- @InjectRepository(FrontComponentEntity)- private readonly frontComponentRepository: Repository<FrontComponentEntity>,+ @InjectWorkspaceScopedRepository(FrontComponentEntity)+ private readonly frontComponentRepository: WorkspaceScopedRepository<FrontComponentEntity>,private readonly workspaceEventBroadcaster: WorkspaceEventBroadcaster,) {}@@ -313,10 +313,10 @@ export class ApplicationSyncService {frontComponentSharedDependenciesChecksum: string | null;}): Promise<void> {try {- const frontComponents = await this.frontComponentRepository.find({- select: ['id'],- where: { applicationId, workspaceId },- });+ const frontComponents = await this.frontComponentRepository.find(+ workspaceId,+ { select: ['id'], where: { applicationId } },+ );await this.workspaceEventBroadcaster.broadcast({workspaceId,diff --git a/packages/twenty-server/src/engine/core-modules/application/application.module.ts b/packages/twenty-server/src/engine/core-modules/application/application.module.tsindex d183f2c11a6..a25c36d728b 100644--- a/packages/twenty-server/src/engine/core-modules/application/application.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application.module.ts@@ -55,6 +55,8 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheprovideWorkspaceScopedRepository(AgentEntity),provideWorkspaceScopedRepository(ApplicationVariableEntity),provideWorkspaceScopedRepository(CommandMenuItemEntity),+ provideWorkspaceScopedRepository(FrontComponentEntity),+ provideWorkspaceScopedRepository(LogicFunctionEntity),],})export class ApplicationModule {}diff --git a/packages/twenty-server/src/engine/core-modules/application/application.service.ts b/packages/twenty-server/src/engine/core-modules/application/application.service.tsindex 6a878d4f998..d828fbcd1e4 100644--- a/packages/twenty-server/src/engine/core-modules/application/application.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application.service.ts@@ -49,12 +49,12 @@ export class ApplicationService {private readonly fileStorageService: FileStorageService,@InjectRepository(WorkspaceEntity)private readonly workspaceRepository: Repository<WorkspaceEntity>,- @InjectRepository(LogicFunctionEntity)- private readonly logicFunctionRepository: Repository<LogicFunctionEntity>,+ @InjectWorkspaceScopedRepository(LogicFunctionEntity)+ private readonly logicFunctionRepository: WorkspaceScopedRepository<LogicFunctionEntity>,@InjectWorkspaceScopedRepository(AgentEntity)private readonly agentRepository: WorkspaceScopedRepository<AgentEntity>,- @InjectRepository(FrontComponentEntity)- private readonly frontComponentRepository: Repository<FrontComponentEntity>,+ @InjectWorkspaceScopedRepository(FrontComponentEntity)+ private readonly frontComponentRepository: WorkspaceScopedRepository<FrontComponentEntity>,@InjectWorkspaceScopedRepository(CommandMenuItemEntity)private readonly commandMenuItemRepository: WorkspaceScopedRepository<CommandMenuItemEntity>,@InjectRepository(ObjectMetadataEntity)@@ -210,14 +210,14 @@ export class ApplicationService {objects,applicationVariables,] = await Promise.all([- this.logicFunctionRepository.find({- where: { applicationId: application.id, workspaceId },+ this.logicFunctionRepository.find(workspaceId, {+ where: { applicationId: application.id },}),this.agentRepository.find(workspaceId, {where: { applicationId: application.id },}),- this.frontComponentRepository.find({- where: { applicationId: application.id, workspaceId },+ this.frontComponentRepository.find(workspaceId, {+ where: { applicationId: application.id },}),this.commandMenuItemRepository.find(workspaceId, {where: { applicationId: application.id },diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-lifecycle-hook.service.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-lifecycle-hook.service.tsindex f8dba52141e..473118f9d22 100644--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-lifecycle-hook.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-lifecycle-hook.service.ts@@ -98,10 +98,10 @@ export class ConnectionProviderLifecycleHookService {connectedAccountId: string;}): Promise<void> {await this.captureFailures(workspaceId, async () => {- const provider =- await this.connectionProviderService.findOneByIdOrThrow(- connectionProviderId,- );+ const provider = await this.connectionProviderService.findOneByIdOrThrow({+ id: connectionProviderId,+ workspaceId,+ });const logicFunctionId = await this.resolveLogicFunctionId({hook: 'onDisconnect',logicFunctionUniversalIdentifier:diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-oauth-flow.service.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-oauth-flow.service.tsindex 7a8d136bbfa..941fccd9c85 100644--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-oauth-flow.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-oauth-flow.service.ts@@ -160,9 +160,10 @@ export class ConnectionProviderOAuthFlowService {async completeAuthorizationFlow(args: CallbackArgs): Promise<CallbackResult> {const statePayload = await this.verifyState(args.state);- const provider = await this.oauthProviderService.findOneByIdOrThrow(- statePayload.connectionProviderId,- );+ const provider = await this.oauthProviderService.findOneByIdOrThrow({+ id: statePayload.connectionProviderId,+ workspaceId: statePayload.workspaceId,+ });assertOAuthProvider(provider);diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-oauth.controller.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-oauth.controller.tsindex 8ecb097bcee..c7b67cb18c9 100644--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-oauth.controller.ts+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-oauth.controller.ts@@ -103,6 +103,7 @@ export class ConnectionProviderOAuthController {await this.oauthProviderService.findOneByApplicationAndName({applicationId,name: providerName,+ workspaceId,});if (!provider) {@@ -112,13 +113,6 @@ export class ConnectionProviderOAuthController {);}- if (provider.workspaceId !== workspaceId) {- throw new ConnectionProviderException(- 'OAuth provider does not belong to the requesting workspace',- ConnectionProviderExceptionCode.FORBIDDEN,- );- }-const userWorkspace = await this.userWorkspaceRepository.findOne({where: { userId, workspaceId },});diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.module.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.module.tsindex d424046a3e7..c7e300516c0 100644--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.module.ts@@ -19,6 +19,7 @@ import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-acimport { ConnectedAccountTokenEncryptionModule } from 'src/engine/metadata-modules/connected-account/services/connected-account-token-encryption.module';import { FlatConnectionProviderModule } from 'src/engine/metadata-modules/flat-connection-provider/flat-connection-provider.module';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';+import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';@Module({@@ -41,6 +42,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cachePermissionsModule,],providers: [+ provideWorkspaceScopedRepository(ConnectionProviderEntity),AppConnectionAccessService,ConnectionProviderService,ConnectionProviderOAuthFlowService,diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.service.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.service.tsindex 53c0a33530c..956abf27754 100644--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.service.ts@@ -11,12 +11,14 @@ import { ConnectionProviderEntity } from 'src/engine/core-modules/application/coimport { ConnectionProviderException } from 'src/engine/core-modules/application/connection-provider/connection-provider.exception';import { assertOAuthProvider } from 'src/engine/core-modules/application/connection-provider/utils/assert-oauth-provider.util';import { SecretEncryptionService } from 'src/engine/core-modules/secret-encryption/secret-encryption.service';+import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';+import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';@Injectable()export class ConnectionProviderService {constructor(- @InjectRepository(ConnectionProviderEntity)- private readonly connectionProviderRepository: Repository<ConnectionProviderEntity>,+ @InjectWorkspaceScopedRepository(ConnectionProviderEntity)+ private readonly connectionProviderRepository: WorkspaceScopedRepository<ConnectionProviderEntity>,@InjectRepository(ApplicationEntity)private readonly applicationRepository: Repository<ApplicationEntity>,@InjectRepository(ApplicationRegistrationVariableEntity)@@ -174,19 +176,28 @@ export class ConnectionProviderService {async findOneByApplicationAndName({applicationId,name,+ workspaceId,}: {applicationId: string;name: string;+ workspaceId: string;}): Promise<ConnectionProviderEntity | null> {- return this.connectionProviderRepository.findOne({+ return this.connectionProviderRepository.findOne(workspaceId, {where: { applicationId, name },});}- async findOneByIdOrThrow(id: string): Promise<ConnectionProviderEntity> {- const provider = await this.connectionProviderRepository.findOne({- where: { id },- });+ async findOneByIdOrThrow({+ id,+ workspaceId,+ }: {+ id: string;+ workspaceId: string;+ }): Promise<ConnectionProviderEntity> {+ const provider = await this.connectionProviderRepository.findOne(+ workspaceId,+ { where: { id } },+ );if (!isDefined(provider)) {throw new ConnectionProviderException(@@ -205,8 +216,8 @@ export class ConnectionProviderService {applicationId: string;workspaceId: string;}): Promise<ConnectionProviderEntity[]> {- return this.connectionProviderRepository.find({- where: { applicationId, workspaceId },+ return this.connectionProviderRepository.find(workspaceId, {+ where: { applicationId },});}}diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.module.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.module.tsindex c8c2936bbee..9c944853b0f 100644--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.module.ts@@ -11,6 +11,7 @@ import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';import { ConnectedAccountTokenEncryptionModule } from 'src/engine/metadata-modules/connected-account/services/connected-account-token-encryption.module';+import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';import { RefreshTokensManagerModule } from 'src/modules/connected-account/refresh-tokens-manager/connected-account-refresh-tokens-manager.module';@@ -35,6 +36,7 @@ import { RefreshTokensManagerModule } from 'src/modules/connected-account/refresConnectedAccountTokenEncryptionModule,],providers: [+ provideWorkspaceScopedRepository(ConnectionProviderEntity),ApplicationConnectionAuthFailureService,ApplicationConnectionsListService,ApplicationConnectionsResolver,diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/services/application-connections-list.service.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/services/application-connections-list.service.tsindex 8fcf8336bf2..e99883e4965 100644--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/services/application-connections-list.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/services/application-connections-list.service.ts@@ -15,6 +15,8 @@ import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/userimport { resolveWorkspaceMemberId } from 'src/engine/core-modules/user-workspace/utils/resolve-workspace-member-id.util';import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';import { ConnectedAccountTokenEncryptionService } from 'src/engine/metadata-modules/connected-account/services/connected-account-token-encryption.service';+import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';+import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';import { ConnectedAccountRefreshTokensService } from 'src/modules/connected-account/refresh-tokens-manager/services/connected-account-refresh-tokens.service';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';@@ -49,8 +51,8 @@ export class ApplicationConnectionsListService {private readonly workspaceCacheService: WorkspaceCacheService,@InjectRepository(ConnectedAccountEntity)private readonly connectedAccountRepository: Repository<ConnectedAccountEntity>,- @InjectRepository(ConnectionProviderEntity)- private readonly oauthProviderRepository: Repository<ConnectionProviderEntity>,+ @InjectWorkspaceScopedRepository(ConnectionProviderEntity)+ private readonly oauthProviderRepository: WorkspaceScopedRepository<ConnectionProviderEntity>,@InjectRepository(UserWorkspaceEntity)private readonly userWorkspaceRepository: Repository<UserWorkspaceEntity>,) {}@@ -61,8 +63,8 @@ export class ApplicationConnectionsListService {requestUserWorkspaceId,filter,}: ListArgs): Promise<AppConnectionDto[]> {- const providers = await this.oauthProviderRepository.find({- where: { applicationId, workspaceId },+ const providers = await this.oauthProviderRepository.find(workspaceId, {+ where: { applicationId },});const providerById = new Map(providers.map((p) => [p.id, p]));@@ -149,10 +151,10 @@ export class ApplicationConnectionsListService {);}- const provider = await this.oauthProviderRepository.findOneByOrFail({- id: account.connectionProviderId,+ const provider = await this.oauthProviderRepository.findOneOrFail(workspaceId,- });+ { where: { id: account.connectionProviderId } },+ );const dto = await this.refreshAndMap(account,diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/refresh/services/app-oauth-refresh-tokens.service.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/refresh/services/app-oauth-refresh-tokens.service.tsindex 3f997f01b84..9bbb8425a02 100644--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/refresh/services/app-oauth-refresh-tokens.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/refresh/services/app-oauth-refresh-tokens.service.ts@@ -36,9 +36,10 @@ export class AppOAuthRefreshAccessTokenService {);}- const { provider, clientId, clientSecret } = await this.resolveProvider(- connectedAccount.connectionProviderId,- );+ const { provider, clientId, clientSecret } = await this.resolveProvider({+ connectionProviderId: connectedAccount.connectionProviderId,+ workspaceId: connectedAccount.workspaceId,+ });try {const tokenResponse = await exchangeRefreshTokenForToken({@@ -77,12 +78,18 @@ export class AppOAuthRefreshAccessTokenService {}}- private async resolveProvider(connectionProviderId: string) {+ private async resolveProvider({+ connectionProviderId,+ workspaceId,+ }: {+ connectionProviderId: string;+ workspaceId: string;+ }) {try {- const provider =- await this.connectionProviderService.findOneByIdOrThrow(- connectionProviderId,- );+ const provider = await this.connectionProviderService.findOneByIdOrThrow({+ id: connectionProviderId,+ workspaceId,+ });assertOAuthProvider(provider);diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/refresh/services/app-oauth-revoke.service.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/refresh/services/app-oauth-revoke.service.tsindex 242f384a074..c1e90e31fb8 100644--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/refresh/services/app-oauth-revoke.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/refresh/services/app-oauth-revoke.service.ts@@ -29,9 +29,10 @@ export class AppOAuthRevokeService {let provider;try {- provider = await this.connectionProviderService.findOneByIdOrThrow(- connectedAccount.connectionProviderId,- );+ provider = await this.connectionProviderService.findOneByIdOrThrow({+ id: connectedAccount.connectionProviderId,+ workspaceId: connectedAccount.workspaceId,+ });} catch {return;}diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/logic-function-trigger.module.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/logic-function-trigger.module.tsindex a94e708cac8..368be2aa0d2 100644--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/logic-function-trigger.module.ts+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/logic-function-trigger.module.ts@@ -16,6 +16,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entimport { LogicFunctionEntity } from 'src/engine/metadata-modules/logic-function/logic-function.entity';import { RecordShareModule } from 'src/engine/core-modules/record-share/record-share.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';+import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';@Module({imports: [@@ -27,6 +28,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheRecordShareModule,],providers: [+ provideWorkspaceScopedRepository(LogicFunctionEntity),LogicFunctionTriggerJob,ApplicationLifecycleHookJob,LogicFunctionJobRunnerService,diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/route/route-trigger.service.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/route/route-trigger.service.tsindex e3745689278..4fab7dddc9c 100644--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/route/route-trigger.service.ts+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/route/route-trigger.service.ts@@ -1,12 +1,11 @@import { Injectable, Logger } from '@nestjs/common';-import { InjectRepository } from '@nestjs/typeorm';import { msg } from '@lingui/core/macro';import { isNonEmptyString } from '@sniptt/guards';import { Request } from 'express';import { match } from 'path-to-regexp';import { assertIsDefinedOrThrow, isDefined } from 'twenty-shared/utils';-import { IsNull, Not, Repository } from 'typeorm';+import { IsNull, Not } from 'typeorm';import { HTTPMethod } from 'twenty-shared/types';import { WorkspaceActivationStatus } from 'twenty-shared/workspace';@@ -33,6 +32,8 @@ import {LogicFunctionExecutionExceptionCode,} from 'src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service';import { CustomException } from 'src/utils/custom-exception';+import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';+import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';type RouteTriggerWorkspace = Pick<WorkspaceEntity,@@ -55,8 +56,8 @@ export class RouteTriggerService {private readonly logicFunctionTriggerService: LogicFunctionTriggerService,private readonly workspaceDomainsService: WorkspaceDomainsService,private readonly twentyConfigService: TwentyConfigService,- @InjectRepository(LogicFunctionEntity)- private readonly logicFunctionRepository: Repository<LogicFunctionEntity>,+ @InjectWorkspaceScopedRepository(LogicFunctionEntity)+ private readonly logicFunctionRepository: WorkspaceScopedRepository<LogicFunctionEntity>,) {}private async resolveAuthenticationContextForWorkspaceFallback({@@ -262,9 +263,8 @@ export class RouteTriggerService {} = await this.resolveRouteTriggerRequestContextOrFail(request);const logicFunctionsWithHttpRouteTrigger =- await this.logicFunctionRepository.find({+ await this.logicFunctionRepository.find(workspace.id, {where: {- workspaceId: workspace.id,httpRouteTriggerSettings: Not(IsNull()),...(isDefined(applicationId) ? { applicationId } : {}),},diff --git a/packages/twenty-server/src/engine/core-modules/server-route-trigger/server-route-trigger.module.ts b/packages/twenty-server/src/engine/core-modules/server-route-trigger/server-route-trigger.module.tsindex e0a045d53bb..87405300c4e 100644--- a/packages/twenty-server/src/engine/core-modules/server-route-trigger/server-route-trigger.module.ts+++ b/packages/twenty-server/src/engine/core-modules/server-route-trigger/server-route-trigger.module.ts@@ -5,6 +5,7 @@ import { LogicFunctionExecutorModule } from 'src/engine/core-modules/logic-functimport { ServerRouteTriggerController } from 'src/engine/core-modules/server-route-trigger/server-route-trigger.controller';import { ServerRouteTriggerService } from 'src/engine/core-modules/server-route-trigger/server-route-trigger.service';import { LogicFunctionEntity } from 'src/engine/metadata-modules/logic-function/logic-function.entity';+import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';@Module({imports: [@@ -12,6 +13,9 @@ import { LogicFunctionEntity } from 'src/engine/metadata-modules/logic-function/LogicFunctionExecutorModule,],controllers: [ServerRouteTriggerController],- providers: [ServerRouteTriggerService],+ providers: [+ provideWorkspaceScopedRepository(LogicFunctionEntity),+ ServerRouteTriggerService,+ ],})export class ServerRouteTriggerModule {}diff --git a/packages/twenty-server/src/engine/core-modules/server-route-trigger/server-route-trigger.service.ts b/packages/twenty-server/src/engine/core-modules/server-route-trigger/server-route-trigger.service.tsindex 097c98e2805..36d6a7db2b7 100644--- a/packages/twenty-server/src/engine/core-modules/server-route-trigger/server-route-trigger.service.ts+++ b/packages/twenty-server/src/engine/core-modules/server-route-trigger/server-route-trigger.service.ts@@ -1,10 +1,8 @@import { Injectable, Logger } from '@nestjs/common';-import { InjectRepository } from '@nestjs/typeorm';import { Request } from 'express';import { isLogicFunctionHttpResponse } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';-import { Repository } from 'typeorm';import {LogicFunctionExecutionException,@@ -36,6 +34,8 @@ import {LogicFunctionException,LogicFunctionExceptionCode,} from 'src/engine/metadata-modules/logic-function/logic-function.exception';+import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';+import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';const QUEUED_TARGET_RETRY_LIMIT = 3;@@ -44,8 +44,8 @@ export class ServerRouteTriggerService {private readonly logger = new Logger(ServerRouteTriggerService.name);constructor(- @InjectRepository(LogicFunctionEntity)- private readonly logicFunctionRepository: Repository<LogicFunctionEntity>,+ @InjectWorkspaceScopedRepository(LogicFunctionEntity)+ private readonly logicFunctionRepository: WorkspaceScopedRepository<LogicFunctionEntity>,private readonly logicFunctionExecutorService: LogicFunctionExecutorService,@InjectMessageQueue(MessageQueue.logicFunctionQueue)private readonly messageQueueService: MessageQueueService,@@ -205,18 +205,20 @@ export class ServerRouteTriggerService {workspaceId: string;applicationRegistrationId?: string;}): Promise<LogicFunctionEntity> {- const logicFunction = await this.logicFunctionRepository.findOne({- where: {- universalIdentifier: logicFunctionUniversalIdentifier,- workspaceId,+ const logicFunction = await this.logicFunctionRepository.findOne(+ workspaceId,+ {+ where: {+ universalIdentifier: logicFunctionUniversalIdentifier,+ ...(isDefined(applicationRegistrationId)+ ? { application: { applicationRegistrationId } }+ : {}),+ },...(isDefined(applicationRegistrationId)- ? { application: { applicationRegistrationId } }+ ? { relations: { application: true } }: {}),},- ...(isDefined(applicationRegistrationId)- ? { relations: { application: true } }- : {}),- });+ );if (!isDefined(logicFunction)) {throw new ServerRouteTriggerException(diff --git a/packages/twenty-server/src/engine/twenty-orm/workspace-scoped-repository/__tests__/prefer-workspace-scoped-repository-exemptions.spec.ts b/packages/twenty-server/src/engine/twenty-orm/workspace-scoped-repository/__tests__/prefer-workspace-scoped-repository-exemptions.spec.tsnew file mode 100644index 00000000000..e591a79ca0d--- /dev/null+++ b/packages/twenty-server/src/engine/twenty-orm/workspace-scoped-repository/__tests__/prefer-workspace-scoped-repository-exemptions.spec.ts@@ -0,0 +1,104 @@+import { existsSync } from 'fs';+import { dirname, isAbsolute, join } from 'path';++import {+ DataSource,+ type DataSourceOptions,+ type EntityMetadata,+} from 'typeorm';++import {+ STRUCTURAL_EXEMPTIONS,+ WORKSPACE_SCOPED_EXEMPTIONS,+} from 'twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.exemptions';++type DataSourceWithMetadataBuilder = DataSource & {+ buildMetadatas: () => Promise<void>;+};++const findPackageRoot = (): string => {+ let directory = __dirname;++ while (!existsSync(join(directory, 'package.json'))) {+ directory = dirname(directory);+ }++ return directory;+};++const toAbsolute = (entityGlob: string): string =>+ isAbsolute(entityGlob) ? entityGlob : join(findPackageRoot(), entityGlob);++const buildCoreEntityMetadatas = async (): Promise<+ Map<string, EntityMetadata>+> => {+ const billingEnabled = process.env.IS_BILLING_ENABLED;++ process.env.IS_BILLING_ENABLED = 'true';++ try {+ // Read at module load from IS_BILLING_ENABLED, so it has to load after it.+ const { typeORMCoreModuleOptions } =+ await import('src/database/typeorm/core/core.datasource');++ const dataSource = new DataSource({+ ...typeORMCoreModuleOptions,+ entities: (typeORMCoreModuleOptions.entities as string[]).map(toAbsolute),+ } as DataSourceOptions) as DataSourceWithMetadataBuilder;++ await dataSource.buildMetadatas();++ return new Map(+ dataSource.entityMetadatas.map((entityMetadata) => [+ entityMetadata.targetName,+ entityMetadata,+ ]),+ );+ } finally {+ process.env.IS_BILLING_ENABLED = billingEnabled;+ }+};++describe('prefer-workspace-scoped-repository exemptions', () => {+ let entityMetadataByClassName: Map<string, EntityMetadata>;++ beforeAll(async () => {+ entityMetadataByClassName = await buildCoreEntityMetadatas();+ });++ // The wrapper builds its predicate from the workspaceId property, so an+ // entity exposing the column under another property name is unreachable+ // through it and counts as having none.+ const findWorkspaceIdColumn = (entityClassName: string) =>+ entityMetadataByClassName+ .get(entityClassName)+ ?.columns.find((column) => column.propertyName === 'workspaceId');++ it.each([...STRUCTURAL_EXEMPTIONS, ...WORKSPACE_SCOPED_EXEMPTIONS])(+ '%s is a known entity',+ (exemptedEntityName) => {+ expect([...entityMetadataByClassName.keys()]).toContain(+ exemptedEntityName,+ );+ },+ );++ it.each(STRUCTURAL_EXEMPTIONS)(+ '%s has no workspaceId, or a nullable one',+ (exemptedEntityName) => {+ const workspaceIdColumn = findWorkspaceIdColumn(exemptedEntityName);++ expect(workspaceIdColumn?.isNullable ?? true).toBe(true);+ },+ );++ it.each(WORKSPACE_SCOPED_EXEMPTIONS)(+ '%s has a NOT NULL workspaceId',+ (exemptedEntityName) => {+ const workspaceIdColumn = findWorkspaceIdColumn(exemptedEntityName);++ expect(workspaceIdColumn).toBeDefined();+ expect(workspaceIdColumn?.isNullable).toBe(false);+ },+ );+});diff --git a/packages/twenty-server/src/engine/workspace-manager/types/all-non-workspace-related-entity.type.ts b/packages/twenty-server/src/engine/workspace-manager/types/all-non-workspace-related-entity.type.tsindex 1e31091d9e4..a94c0452f56 100644--- a/packages/twenty-server/src/engine/workspace-manager/types/all-non-workspace-related-entity.type.ts+++ b/packages/twenty-server/src/engine/workspace-manager/types/all-non-workspace-related-entity.type.ts@@ -1,6 +1,7 @@+import { type Equal, type Expect } from 'twenty-shared/testing';+import { type ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';import { type ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';-import { type ApplicationVariableEntity } from 'src/engine/core-modules/application/application-variable/application-variable.entity';import { type BillingMeterEntity } from 'src/engine/core-modules/billing/entities/billing-meter.entity';import { type BillingPriceEntity } from 'src/engine/core-modules/billing/entities/billing-price.entity';import { type BillingProductEntity } from 'src/engine/core-modules/billing/entities/billing-product.entity';@@ -16,10 +17,14 @@ import { type AgentTurnEntity } from 'src/engine/metadata-modules/ai/ai-agent-eximport { type AgentTurnEvaluationEntity } from 'src/engine/metadata-modules/ai/ai-agent-monitor/entities/agent-turn-evaluation.entity';import { type AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';import { type IndexFieldMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-field-metadata.entity';+import { type SyncableEntity } from 'src/engine/workspace-manager/types/syncable-entity.interface';/**- * Union of all entities that don't have a direct `workspaceId` field- * (i.e., they don't extend `WorkspaceRelatedEntity`).+ * Union of all entities that don't extend `WorkspaceRelatedEntity`.+ *+ * Membership is about the base class, not the column: several members declare+ * their own `workspaceId`, so this is not a "has no workspaceId" predicate and+ * must not be used as one.** This type is used alongside `WorkspaceRelatedEntity` to enable TypeScript* to properly extract entity relation properties for dynamic typing purposes.@@ -37,7 +42,6 @@ export type AllNonWorkspaceRelatedEntity =| IndexFieldMetadataEntity| ApplicationRegistrationEntity| ApplicationRegistrationVariableEntity- | ApplicationVariableEntity| BillingMeterEntity| BillingPriceEntity| BillingProductEntity@@ -47,3 +51,10 @@ export type AllNonWorkspaceRelatedEntity =| TwoFactorAuthenticationMethodEntity| UserEntity| WorkspaceEntity;++// A syncable entity extends WorkspaceRelatedEntity, so it always carries a+// NOT NULL workspaceId and can never belong to this union.+// oxlint-disable-next-line no-unused-vars+type NoMemberIsSyncable = Expect<+ Equal<Extract<AllNonWorkspaceRelatedEntity, SyncableEntity>, never>+>;diff --git a/yarn.lock b/yarn.lockindex dc7fad20e3a..e85af6c9a35 100644--- a/yarn.lock+++ b/yarn.lock@@ -50178,11 +50178,12 @@ __metadata:languageName: unknownlinkType: soft-"twenty-oxlint-rules@workspace:packages/twenty-oxlint-rules":+"twenty-oxlint-rules@workspace:*, twenty-oxlint-rules@workspace:packages/twenty-oxlint-rules":version: 0.0.0-use.localresolution: "twenty-oxlint-rules@workspace:packages/twenty-oxlint-rules"dependencies:"@oxlint/plugins": "npm:^1.51.0"+ twenty-shared: "workspace:*"languageName: unknownlinkType: soft@@ -50444,6 +50445,7 @@ __metadata:tslib: "npm:2.8.1"twenty-client-sdk: "workspace:*"twenty-emails: "workspace:*"+ twenty-oxlint-rules: "workspace:*"twenty-shared: "workspace:*"type-fest: "npm:4.10.1"typeorm: "patch:[email protected]#./patches/typeorm+0.3.31.patch"