The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
feat(billing): gate custom roles behind the CUSTOM_ROLES entitlement (#28218)
Etienne050474384f09
diff --git a/packages/twenty-server/src/database/commands/agent-history/agent-history-schema.service.ts b/packages/twenty-server/src/database/commands/agent-history/agent-history-schema.service.tsindex 807f8395223..29e8ebf2484 100644--- a/packages/twenty-server/src/database/commands/agent-history/agent-history-schema.service.ts+++ b/packages/twenty-server/src/database/commands/agent-history/agent-history-schema.service.ts@@ -24,6 +24,7 @@ export class AgentHistorySchemaService {'flatFieldMetadataMaps','flatIndexMaps','featureFlagsMap',+ 'billingEntitlements',]),);const { twentyStandardFlatApplication } =@@ -68,7 +69,10 @@ export class AgentHistorySchemaService {applicationUniversalIdentifier:twentyStandardFlatApplication.universalIdentifier,},- additionalCacheDataMaps: { featureFlagsMap: existing.featureFlagsMap },+ additionalCacheDataMaps: {+ featureFlagsMap: existing.featureFlagsMap,+ billingEntitlements: existing.billingEntitlements,+ },idByUniversalIdentifierByMetadataName,fromToAllFlatEntityMaps: {flatObjectMetadataMaps: {diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/__tests__/2-42-workspace-command-1789757500000-sync-message-record-page.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/__tests__/2-42-workspace-command-1789757500000-sync-message-record-page.command.spec.tsindex ceb6bba8765..6e8f81db166 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/__tests__/2-42-workspace-command-1789757500000-sync-message-record-page.command.spec.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/__tests__/2-42-workspace-command-1789757500000-sync-message-record-page.command.spec.ts@@ -328,6 +328,7 @@ describe('SyncMessageRecordPageCommand', () => {remainingFlatEntityMapsToValidate: createEmptyFlatEntityMaps(),additionalCacheDataMaps: {featureFlagsMap: {} as Record<FeatureFlagKey, boolean>,+ billingEntitlements: {},},buildOptions: {isSystemBuild: true,diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790317893308-provision-agent-chat-thread-target.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790317893308-provision-agent-chat-thread-target.command.tsindex d797a5769ff..3d4836ef4b3 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790317893308-provision-agent-chat-thread-target.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790317893308-provision-agent-chat-thread-target.command.ts@@ -94,6 +94,7 @@ export class ProvisionAgentChatThreadTargetCommand extends ProvisionedWorkspaceC'flatFieldMetadataMaps','flatIndexMaps','featureFlagsMap',+ 'billingEntitlements',]),);@@ -143,6 +144,7 @@ export class ProvisionAgentChatThreadTargetCommand extends ProvisionedWorkspaceC},additionalCacheDataMaps: {featureFlagsMap: existing.featureFlagsMap,+ billingEntitlements: existing.billingEntitlements,},idByUniversalIdentifierByMetadataName,fromToAllFlatEntityMaps: {diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/2-43-workspace-command-1790266078807-sync-attachment-record-page.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/2-43-workspace-command-1790266078807-sync-attachment-record-page.command.spec.tsindex a9d9b7e31d3..0df13b0524d 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/2-43-workspace-command-1790266078807-sync-attachment-record-page.command.spec.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/__tests__/2-43-workspace-command-1790266078807-sync-attachment-record-page.command.spec.ts@@ -397,6 +397,7 @@ describe('SyncAttachmentRecordPageCommand', () => {remainingFlatEntityMapsToValidate: createEmptyFlatEntityMaps(),additionalCacheDataMaps: {featureFlagsMap: {} as Record<FeatureFlagKey, boolean>,+ billingEntitlements: {},},buildOptions: {isSystemBuild: true,diff --git a/packages/twenty-server/src/engine/core-modules/api-key/api-key.resolver.ts b/packages/twenty-server/src/engine/core-modules/api-key/api-key.resolver.tsindex f5f2da9b751..e823ba5b476 100644--- a/packages/twenty-server/src/engine/core-modules/api-key/api-key.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/api-key/api-key.resolver.ts@@ -1,4 +1,4 @@-import { UseFilters, UseGuards } from '@nestjs/common';+import { UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';import { Args, Mutation, Parent, Query, ResolveField } from '@nestjs/graphql';import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';@@ -19,11 +19,13 @@ import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';import { RoleDTO } from 'src/engine/metadata-modules/role/dtos/role.dto';+import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';import { ApiKeyRoleService } from './services/api-key-role.service';import { ApiKeyService } from './services/api-key.service';@MetadataResolver(() => ApiKeyEntity)+@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)@UseFilters(AuthGraphqlApiExceptionFilter, PermissionsGraphqlApiExceptionFilter)@UseGuards(AuthPrincipalGuard({diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest-migration.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest-migration.service.tsindex 5ca65fb424f..727058b8ea3 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest-migration.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest-migration.service.ts@@ -102,10 +102,15 @@ export class ApplicationManifestMigrationService {[...Object.values(ALL_METADATA_NAME).map(getMetadataFlatEntityMapsKey),'featureFlagsMap',+ 'billingEntitlements',],);- const { featureFlagsMap, ...existingAllFlatEntityMaps } = cacheResult;+ const {+ featureFlagsMap,+ billingEntitlements,+ ...existingAllFlatEntityMaps+ } = cacheResult;const fromAllFlatEntityMaps = getApplicationSubAllFlatEntityMaps({applicationIds: [ownerFlatApplication.id],@@ -145,7 +150,7 @@ export class ApplicationManifestMigrationService {}),workspaceId,dependencyAllFlatEntityMaps,- additionalCacheDataMaps: { featureFlagsMap },+ additionalCacheDataMaps: { featureFlagsMap, billingEntitlements },},);diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/is-user-facing-tool-execution-error.util.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/is-user-facing-tool-execution-error.util.tsindex 58e5c080de5..46f16e8e094 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/is-user-facing-tool-execution-error.util.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/is-user-facing-tool-execution-error.util.ts@@ -104,6 +104,7 @@ const USER_FACING_PERMISSIONS_EXCEPTION_CODES = [PermissionsExceptionCode.EMPTY_FIELD_PERMISSION_NOT_ALLOWED,PermissionsExceptionCode.ROLE_MUST_HAVE_AT_LEAST_ONE_TARGET,PermissionsExceptionCode.ROLE_CANNOT_BE_ASSIGNED_TO_USERS,+ PermissionsExceptionCode.CUSTOM_ROLES_NOT_ENTITLED,PermissionsExceptionCode.ROLE_NOT_FOUND,PermissionsExceptionCode.OBJECT_METADATA_NOT_FOUND,PermissionsExceptionCode.FIELD_METADATA_NOT_FOUND,diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.tsindex 827438271aa..b80f1878ce4 100644--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts@@ -17,7 +17,7 @@ import { UserEntity } from 'src/engine/core-modules/user/user.entity';import { WorkspaceInvitationModule } from 'src/engine/core-modules/workspace-invitation/workspace-invitation.module';import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity';import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';-import { RoleValidationModule } from 'src/engine/metadata-modules/role-validation/role-validation.module';+import { RoleAssignmentValidationModule } from 'src/engine/metadata-modules/role-assignment-validation/role-assignment-validation.module';import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';@Module({@@ -28,7 +28,7 @@ import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.UserEntity,RoleTargetEntity,]),- RoleValidationModule,+ RoleAssignmentValidationModule,ApprovedAccessDomainModule,WorkspaceInvitationModule,WorkspaceDomainsModule,diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.tsindex 63b01683ea1..5e73d917d0c 100644--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts@@ -40,7 +40,7 @@ import {import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity';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 { RoleValidationService } from 'src/engine/metadata-modules/role-validation/services/role-validation.service';+import { RoleAssignmentValidationService } from 'src/engine/metadata-modules/role-assignment-validation/services/role-assignment-validation.service';import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';@@ -59,7 +59,7 @@ export class UserWorkspaceService {private readonly userRepository: Repository<UserEntity>,@InjectWorkspaceScopedRepository(RoleTargetEntity)private readonly roleTargetRepository: WorkspaceScopedRepository<RoleTargetEntity>,- private readonly roleValidationService: RoleValidationService,+ private readonly roleAssignmentValidationService: RoleAssignmentValidationService,private readonly workspaceInvitationService: WorkspaceInvitationService,private readonly workspaceDomainsService: WorkspaceDomainsService,private readonly loginTokenService: LoginTokenService,@@ -272,25 +272,20 @@ export class UserWorkspaceService {roleId: string | null | undefined,workspace: WorkspaceEntity,): Promise<string> {- if (isDefined(roleId)) {- await this.roleValidationService.validateRoleAssignableToUsersOrThrow(- roleId,- workspace.id,- );-- return roleId;- }+ const resolvedRoleId = roleId ?? workspace.defaultRoleId;- const defaultRoleId = workspace.defaultRoleId;-- if (!isDefined(defaultRoleId)) {+ if (!isDefined(resolvedRoleId)) {throw new PermissionsException(PermissionsExceptionMessage.DEFAULT_ROLE_NOT_FOUND,PermissionsExceptionCode.DEFAULT_ROLE_NOT_FOUND,);}- return defaultRoleId;+ await this.roleAssignmentValidationService.validateRoleAssignableToUsersOrThrow(+ { roleId: resolvedRoleId, workspaceId: workspace.id },+ );++ return resolvedRoleId;}public async getUserCount(workspaceId: string): Promise<number | undefined> {diff --git a/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts b/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.tsindex bd0ada76e75..eca053ebf00 100644--- a/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts+++ b/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts@@ -42,7 +42,7 @@ import {WorkspaceInvitationExceptionCode,} from 'src/engine/core-modules/workspace-invitation/workspace-invitation.exception';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';-import { RoleValidationService } from 'src/engine/metadata-modules/role-validation/services/role-validation.service';+import { RoleAssignmentValidationService } from 'src/engine/metadata-modules/role-assignment-validation/services/role-assignment-validation.service';import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';import { CustomException } from 'src/utils/custom-exception';@@ -53,7 +53,7 @@ export class WorkspaceInvitationService {private readonly appTokenRepository: Repository<AppTokenEntity>,@InjectRepository(UserWorkspaceEntity)private readonly userWorkspaceRepository: Repository<UserWorkspaceEntity>,- private readonly roleValidationService: RoleValidationService,+ private readonly roleAssignmentValidationService: RoleAssignmentValidationService,private readonly twentyConfigService: TwentyConfigService,private readonly emailService: EmailService,private readonly onboardingService: OnboardingService,@@ -305,9 +305,8 @@ export class WorkspaceInvitationService {}if (isDefined(roleId)) {- await this.roleValidationService.validateRoleAssignableToUsersOrThrow(- roleId,- workspace.id,+ await this.roleAssignmentValidationService.validateRoleAssignableToUsersOrThrow(+ { roleId, workspaceId: workspace.id },);}diff --git a/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.module.ts b/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.module.tsindex 70c795acbab..8324f46a756 100644--- a/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.module.ts+++ b/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.module.ts@@ -10,13 +10,13 @@ import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/userimport { WorkspaceInvitationService } from 'src/engine/core-modules/workspace-invitation/services/workspace-invitation.service';import { WorkspaceInvitationResolver } from 'src/engine/core-modules/workspace-invitation/workspace-invitation.resolver';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';-import { RoleValidationModule } from 'src/engine/metadata-modules/role-validation/role-validation.module';+import { RoleAssignmentValidationModule } from 'src/engine/metadata-modules/role-assignment-validation/role-assignment-validation.module';@Module({imports: [WorkspaceDomainsModule,TypeOrmModule.forFeature([AppTokenEntity, UserWorkspaceEntity]),- RoleValidationModule,+ RoleAssignmentValidationModule,FileModule,OnboardingModule,PermissionsModule,diff --git a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.tsindex d7609356aae..4fe3b19b591 100644--- a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts+++ b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts@@ -99,6 +99,7 @@ import {PermissionsExceptionMessage,} from 'src/engine/metadata-modules/permissions/permissions.exception';import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';+import { RoleAssignmentValidationService } from 'src/engine/metadata-modules/role-assignment-validation/services/role-assignment-validation.service';import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage/workspace-cache-storage.service';import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';import { WorkspaceSchemaService } from 'src/engine/workspace-datasource/workspace-schema.service';@@ -195,6 +196,7 @@ export class WorkspaceService {private readonly postgresAdvisoryLockService: PostgresAdvisoryLockService,private readonly applicationUninstallService: ApplicationUninstallService,private readonly eventLogRetentionService: EventLogRetentionService,+ private readonly roleAssignmentValidationService: RoleAssignmentValidationService,) {}// reject unknown new pins now rather than silently falling back at run time; stored pins stay so the form remains editable@@ -370,6 +372,15 @@ export class WorkspaceService {);}+ if (+ isDefined(payload.defaultRoleId) &&+ workspace.defaultRoleId !== payload.defaultRoleId+ ) {+ await this.roleAssignmentValidationService.validateRoleAssignableToUsersOrThrow(+ { roleId: payload.defaultRoleId, workspaceId: workspace.id },+ );+ }+let customDomainRegistered = false;if (payload.customDomain === null && isDefined(workspace.customDomain)) {diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.tsindex dd88b2475ad..5517596d114 100644--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts@@ -34,6 +34,7 @@ import { AiAgentModule } from 'src/engine/metadata-modules/ai/ai-agent/ai-agent.import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';import { RoleModule } from 'src/engine/metadata-modules/role/role.module';+import { RoleAssignmentValidationModule } from 'src/engine/metadata-modules/role-assignment-validation/role-assignment-validation.module';import { ViewModule } from 'src/engine/metadata-modules/view/view.module';import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';@@ -61,6 +62,7 @@ import { StandardObjectsPrefillModule } from 'src/engine/workspace-manager/standPermissionsModule,WorkspaceCacheStorageModule,RoleModule,+ RoleAssignmentValidationModule,AiAgentModule,DnsManagerModule,WorkspaceDomainsModule,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/__tests__/validate-enum-flat-field-metadata.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/__tests__/validate-enum-flat-field-metadata.util.spec.tsindex d11a54d2860..6323f9df26f 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/__tests__/validate-enum-flat-field-metadata.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/__tests__/validate-enum-flat-field-metadata.util.spec.ts@@ -52,6 +52,7 @@ const validateOptionColor = ({additionalCacheDataMaps: {featureFlagsMap:{} as WorkspaceMigrationBuilderAdditionalCacheDataMaps['featureFlagsMap'],+ billingEntitlements: {},},optimisticFlatEntityMapsAndRelatedFlatEntityMaps:createEmptyAllFlatEntityMaps(),diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.exception.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.exception.tsindex 59f8c70970e..e62dad3dc67 100644--- a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.exception.ts+++ b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.exception.ts@@ -31,6 +31,7 @@ export enum PermissionsExceptionCode {ROLE_NOT_EDITABLE = 'ROLE_NOT_EDITABLE',DEFAULT_ROLE_CANNOT_BE_DELETED = 'DEFAULT_ROLE_CANNOT_BE_DELETED',MEMBER_ROLE_CANNOT_BE_DELETED = 'MEMBER_ROLE_CANNOT_BE_DELETED',+ CUSTOM_ROLES_NOT_ENTITLED = 'CUSTOM_ROLES_NOT_ENTITLED',NO_PERMISSIONS_FOUND_IN_DATASOURCE = 'NO_PERMISSIONS_FOUND_IN_DATASOURCE',CANNOT_ADD_OBJECT_PERMISSION_ON_SYSTEM_OBJECT = 'CANNOT_ADD_OBJECT_PERMISSION_ON_SYSTEM_OBJECT',CANNOT_ADD_FIELD_PERMISSION_ON_SYSTEM_OBJECT = 'CANNOT_ADD_FIELD_PERMISSION_ON_SYSTEM_OBJECT',@@ -111,6 +112,8 @@ const getPermissionsExceptionUserFriendlyMessage = (return msg`The default role cannot be deleted.`;case PermissionsExceptionCode.MEMBER_ROLE_CANNOT_BE_DELETED:return msg`The Member role cannot be deleted.`;+ case PermissionsExceptionCode.CUSTOM_ROLES_NOT_ENTITLED:+ return msg`Custom roles are part of the Organization plan.`;case PermissionsExceptionCode.NO_PERMISSIONS_FOUND_IN_DATASOURCE:return msg`No permissions found in datasource.`;case PermissionsExceptionCode.CANNOT_ADD_OBJECT_PERMISSION_ON_SYSTEM_OBJECT:diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/utils/permission-graphql-api-exception-handler.util.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/utils/permission-graphql-api-exception-handler.util.tsindex fd01ac03345..f5ecd376d8d 100644--- a/packages/twenty-server/src/engine/metadata-modules/permissions/utils/permission-graphql-api-exception-handler.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/permissions/utils/permission-graphql-api-exception-handler.util.ts@@ -35,6 +35,7 @@ export const permissionGraphqlApiExceptionHandler = (case PermissionsExceptionCode.ROLE_NOT_EDITABLE:case PermissionsExceptionCode.DEFAULT_ROLE_CANNOT_BE_DELETED:case PermissionsExceptionCode.MEMBER_ROLE_CANNOT_BE_DELETED:+ case PermissionsExceptionCode.CUSTOM_ROLES_NOT_ENTITLED:case PermissionsExceptionCode.CANNOT_ADD_OBJECT_PERMISSION_ON_SYSTEM_OBJECT:case PermissionsExceptionCode.CANNOT_ADD_FIELD_PERMISSION_ON_SYSTEM_OBJECT:throw new ForbiddenError(error);diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/utils/permission-rest-api-exception-code-to-http-status.util.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/utils/permission-rest-api-exception-code-to-http-status.util.tsindex d675e31e5cf..74107cee367 100644--- a/packages/twenty-server/src/engine/metadata-modules/permissions/utils/permission-rest-api-exception-code-to-http-status.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/permissions/utils/permission-rest-api-exception-code-to-http-status.util.ts@@ -17,6 +17,7 @@ export const permissionRestApiExceptionCodeToHttpStatus = (case PermissionsExceptionCode.ROLE_NOT_EDITABLE:case PermissionsExceptionCode.DEFAULT_ROLE_CANNOT_BE_DELETED:case PermissionsExceptionCode.MEMBER_ROLE_CANNOT_BE_DELETED:+ case PermissionsExceptionCode.CUSTOM_ROLES_NOT_ENTITLED:case PermissionsExceptionCode.CANNOT_ADD_OBJECT_PERMISSION_ON_SYSTEM_OBJECT:case PermissionsExceptionCode.CANNOT_ADD_FIELD_PERMISSION_ON_SYSTEM_OBJECT:return 403;diff --git a/packages/twenty-server/src/engine/metadata-modules/role-assignment-validation/role-assignment-validation.module.ts b/packages/twenty-server/src/engine/metadata-modules/role-assignment-validation/role-assignment-validation.module.tsnew file mode 100644index 00000000000..004f533dc87--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/role-assignment-validation/role-assignment-validation.module.ts@@ -0,0 +1,10 @@+import { Module } from '@nestjs/common';+import { RoleAssignmentValidationService } from 'src/engine/metadata-modules/role-assignment-validation/services/role-assignment-validation.service';+import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';++@Module({+ imports: [WorkspaceCacheModule],+ providers: [RoleAssignmentValidationService],+ exports: [RoleAssignmentValidationService],+})+export class RoleAssignmentValidationModule {}diff --git a/packages/twenty-server/src/engine/metadata-modules/role-assignment-validation/services/role-assignment-validation.service.ts b/packages/twenty-server/src/engine/metadata-modules/role-assignment-validation/services/role-assignment-validation.service.tsnew file mode 100644index 00000000000..d2e92c7ea3d--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/role-assignment-validation/services/role-assignment-validation.service.ts@@ -0,0 +1,65 @@+import { Injectable } from '@nestjs/common';++import { isDefined } from 'twenty-shared/utils';++import {+ PermissionsException,+ PermissionsExceptionCode,+ PermissionsExceptionMessage,+} from 'src/engine/metadata-modules/permissions/permissions.exception';+import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { validateFlatRoleTargetRoleIsEntitled } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-role-is-entitled.util';++@Injectable()+export class RoleAssignmentValidationService {+ constructor(private readonly workspaceCacheService: WorkspaceCacheService) {}++ async validateRoleAssignableToUsersOrThrow({+ roleId,+ workspaceId,+ }: {+ roleId: string;+ workspaceId: string;+ }): Promise<void> {+ const { flatRoleMaps, billingEntitlements } =+ await this.workspaceCacheService.getOrRecompute(workspaceId, [+ 'flatRoleMaps',+ 'billingEntitlements',+ ]);++ const role = findFlatEntityByIdInFlatEntityMaps({+ flatEntityId: roleId,+ flatEntityMaps: flatRoleMaps,+ });++ if (!isDefined(role)) {+ throw new PermissionsException(+ PermissionsExceptionMessage.ROLE_NOT_FOUND,+ PermissionsExceptionCode.ROLE_NOT_FOUND,+ );+ }++ if (!role.canBeAssignedToUsers) {+ throw new PermissionsException(+ PermissionsExceptionMessage.ROLE_CANNOT_BE_ASSIGNED_TO_USERS,+ PermissionsExceptionCode.ROLE_CANNOT_BE_ASSIGNED_TO_USERS,+ );+ }++ const entitlementError = validateFlatRoleTargetRoleIsEntitled({+ flatRole: role,+ flatRoleTarget: { agentUniversalIdentifier: null },+ billingEntitlements,+ buildOptions: { isSystemBuild: false },+ });++ if (isDefined(entitlementError)) {+ throw new PermissionsException(+ entitlementError.message,+ PermissionsExceptionCode.CUSTOM_ROLES_NOT_ENTITLED,+ { userFriendlyMessage: entitlementError.userFriendlyMessage },+ );+ }+ }+}diff --git a/packages/twenty-server/src/engine/metadata-modules/role-validation/role-validation.module.ts b/packages/twenty-server/src/engine/metadata-modules/role-validation/role-validation.module.tsdeleted file mode 100644index 2943b84a4fc..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/role-validation/role-validation.module.ts+++ /dev/null@@ -1,10 +0,0 @@-import { Module } from '@nestjs/common';-import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';-import { RoleValidationService } from 'src/engine/metadata-modules/role-validation/services/role-validation.service';--@Module({- imports: [WorkspaceManyOrAllFlatEntityMapsCacheModule],- providers: [RoleValidationService],- exports: [RoleValidationService],-})-export class RoleValidationModule {}diff --git a/packages/twenty-server/src/engine/metadata-modules/role-validation/services/role-validation.service.ts b/packages/twenty-server/src/engine/metadata-modules/role-validation/services/role-validation.service.tsdeleted file mode 100644index c8721197b1e..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/role-validation/services/role-validation.service.ts+++ /dev/null@@ -1,47 +0,0 @@-import { Injectable } from '@nestjs/common';--import {- PermissionsException,- PermissionsExceptionCode,- PermissionsExceptionMessage,-} from 'src/engine/metadata-modules/permissions/permissions.exception';-import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';--@Injectable()-export class RoleValidationService {- constructor(- private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,- ) {}-- async validateRoleAssignableToUsersOrThrow(- roleId: string,- workspaceId: string,- ): Promise<void> {- const { flatRoleMaps } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatRoleMaps'],- },- );- const role = findFlatEntityByIdInFlatEntityMaps({- flatEntityId: roleId,- flatEntityMaps: flatRoleMaps,- });-- if (!role) {- throw new PermissionsException(- PermissionsExceptionMessage.ROLE_NOT_FOUND,- PermissionsExceptionCode.ROLE_NOT_FOUND,- );- }-- if (!role.canBeAssignedToUsers) {- throw new PermissionsException(- PermissionsExceptionMessage.ROLE_CANNOT_BE_ASSIGNED_TO_USERS,- PermissionsExceptionCode.ROLE_CANNOT_BE_ASSIGNED_TO_USERS,- );- }- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/role/exceptions/role-target.exception.ts b/packages/twenty-server/src/engine/metadata-modules/role/exceptions/role-target.exception.tsindex d9c1b67287e..6653b09f844 100644--- a/packages/twenty-server/src/engine/metadata-modules/role/exceptions/role-target.exception.ts+++ b/packages/twenty-server/src/engine/metadata-modules/role/exceptions/role-target.exception.ts@@ -10,6 +10,7 @@ export enum RoleTargetExceptionCode {ROLE_TARGET_MISSING_IDENTIFIER = 'ROLE_TARGET_MISSING_IDENTIFIER',ROLE_CANNOT_BE_ASSIGNED_TO_ENTITY = 'ROLE_CANNOT_BE_ASSIGNED_TO_ENTITY',ROLE_NOT_FOUND = 'ROLE_NOT_FOUND',+ CUSTOM_ROLES_NOT_ENTITLED = 'CUSTOM_ROLES_NOT_ENTITLED',}const getRoleTargetExceptionUserFriendlyMessage = (@@ -26,6 +27,8 @@ const getRoleTargetExceptionUserFriendlyMessage = (return msg`Role cannot be assigned to this entity.`;case RoleTargetExceptionCode.ROLE_NOT_FOUND:return msg`Role not found.`;+ case RoleTargetExceptionCode.CUSTOM_ROLES_NOT_ENTITLED:+ return msg`Custom roles are part of the Organization plan.`;default:assertUnreachable(code);}diff --git a/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.module.ts b/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.module.tsindex 976d039e59b..65ab21b154a 100644--- a/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.module.ts@@ -4,7 +4,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity';import { RoleTargetModule } from 'src/engine/metadata-modules/role-target/role-target.module';-import { RoleValidationModule } from 'src/engine/metadata-modules/role-validation/role-validation.module';+import { RoleAssignmentValidationModule } from 'src/engine/metadata-modules/role-assignment-validation/role-assignment-validation.module';import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';@@ -15,7 +15,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheTypeOrmModule.forFeature([UserWorkspaceEntity]),WorkspaceCacheModule,RoleTargetModule,- RoleValidationModule,+ RoleAssignmentValidationModule,],providers: [UserRoleService,diff --git a/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.service.ts b/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.service.tsindex c21006eaf4a..ba426845e79 100644--- a/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.service.ts@@ -13,7 +13,7 @@ import {} from 'src/engine/metadata-modules/permissions/permissions.exception';import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity';import { RoleTargetService } from 'src/engine/metadata-modules/role-target/services/role-target.service';-import { RoleValidationService } from 'src/engine/metadata-modules/role-validation/services/role-validation.service';+import { RoleAssignmentValidationService } from 'src/engine/metadata-modules/role-assignment-validation/services/role-assignment-validation.service';import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';@@ -32,7 +32,7 @@ export class UserRoleService {private readonly workspaceOrmManager: WorkspaceOrmManager,private readonly roleTargetService: RoleTargetService,private readonly workspaceCacheService: WorkspaceCacheService,- private readonly roleValidationService: RoleValidationService,+ private readonly roleAssignmentValidationService: RoleAssignmentValidationService,) {}public async assignRoleToWorkspaceMember({@@ -74,9 +74,17 @@ export class UserRoleService {actingUserWorkspaceId,});- await this.roleValidationService.validateRoleAssignableToUsersOrThrow(- roleId,- workspaceId,+ const { userWorkspaceRoleMap } =+ await this.workspaceCacheService.getOrRecompute(workspaceId, [+ 'userWorkspaceRoleMap',+ ]);++ if (userWorkspaceRoleMap[userWorkspace.id] === roleId) {+ return { workspaceMember, userWorkspaceId: userWorkspace.id };+ }++ await this.roleAssignmentValidationService.validateRoleAssignableToUsersOrThrow(+ { roleId, workspaceId },);await this.assignRoleToManyUserWorkspace({diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/billing/utils/seed-billing-entitlements.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/billing/utils/seed-billing-entitlements.util.tsnew file mode 100644index 00000000000..421681dac07--- /dev/null+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/billing/utils/seed-billing-entitlements.util.ts@@ -0,0 +1,37 @@+import { type QueryRunner } from 'typeorm';++import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';++const tableName = 'billingEntitlement';++type SeedBillingEntitlementsArgs = {+ queryRunner: QueryRunner;+ schemaName: string;+ workspaceId: string;+};++export const seedBillingEntitlements = async ({+ queryRunner,+ schemaName,+ workspaceId,+}: SeedBillingEntitlementsArgs) => {+ await queryRunner.manager+ .createQueryBuilder()+ .insert()+ .into(`${schemaName}.${tableName}`, [+ 'workspaceId',+ 'key',+ 'value',+ 'stripeCustomerId',+ ])+ .orIgnore()+ .values([+ {+ workspaceId,+ key: BillingEntitlementKey.CUSTOM_ROLES,+ value: true,+ stripeCustomerId: 'cus_default0',+ },+ ])+ .execute();+};diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.workspace-service.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.workspace-service.tsindex cfb021ced0e..1db08cd5fba 100644--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.workspace-service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.workspace-service.ts@@ -28,6 +28,7 @@ import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storageimport { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { WorkspaceSchemaService } from 'src/engine/workspace-datasource/workspace-schema.service';import { seedBillingCustomers } from 'src/engine/workspace-manager/dev-seeder/core/billing/utils/seed-billing-customers.util';+import { seedBillingEntitlements } from 'src/engine/workspace-manager/dev-seeder/core/billing/utils/seed-billing-entitlements.util';import { seedBillingSubscriptions } from 'src/engine/workspace-manager/dev-seeder/core/billing/utils/seed-billing-subscriptions.util';import {type SeededWorkspacesIds,@@ -354,6 +355,7 @@ export class DevSeederWorkspaceService {schemaName,workspaceId,});+ await seedBillingEntitlements({ queryRunner, schemaName, workspaceId });}await seedMetadataEntities({ queryRunner, schemaName, workspaceId });diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/services/twenty-standard-application.service.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/services/twenty-standard-application.service.tsindex 033f1c7adbb..12620336a0e 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/services/twenty-standard-application.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/services/twenty-standard-application.service.ts@@ -36,11 +36,15 @@ export class TwentyStandardApplicationService {workspaceId,},);- const { featureFlagsMap, ...fromTwentyStandardAllFlatEntityMaps } =- await this.workspaceCacheService.getOrRecompute(workspaceId, [- ...TWENTY_STANDARD_ALL_METADATA_NAME.map(getMetadataFlatEntityMapsKey),- 'featureFlagsMap',- ]);+ const {+ featureFlagsMap,+ billingEntitlements,+ ...fromTwentyStandardAllFlatEntityMaps+ } = await this.workspaceCacheService.getOrRecompute(workspaceId, [+ ...TWENTY_STANDARD_ALL_METADATA_NAME.map(getMetadataFlatEntityMapsKey),+ 'featureFlagsMap',+ 'billingEntitlements',+ ]);const {allFlatEntityMaps: toTwentyStandardAllFlatEntityMaps,@@ -92,6 +96,7 @@ export class TwentyStandardApplicationService {workspaceId,additionalCacheDataMaps: {featureFlagsMap,+ billingEntitlements,},idByUniversalIdentifierByMetadataName,},diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/workspace-migration-additional-cache-data-maps-key.constant.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/workspace-migration-additional-cache-data-maps-key.constant.tsindex e9e6fb60228..76b5f691f18 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/workspace-migration-additional-cache-data-maps-key.constant.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/workspace-migration-additional-cache-data-maps-key.constant.ts@@ -2,4 +2,5 @@ import { type AdditionalCacheDataMaps } from 'src/engine/workspace-cache/types/wexport const WORKSPACE_MIGRATION_ADDITIONAL_CACHE_DATA_MAPS_KEY = ['featureFlagsMap',+ 'billingEntitlements',] as const satisfies (keyof AdditionalCacheDataMaps)[];diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-page-layout-widget-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-page-layout-widget-validator.service.tsindex 89eebff4399..42f266ee3be 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-page-layout-widget-validator.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-page-layout-widget-validator.service.ts@@ -45,7 +45,7 @@ export class FlatPageLayoutWidgetValidatorService {flatEntityUpdate,finalFlatEntityMaps,optimisticFlatEntityMapsAndRelatedFlatEntityMaps,- additionalCacheDataMaps: { featureFlagsMap },+ additionalCacheDataMaps,workspaceId,buildOptions,}: FlatEntityUpdateValidationArgs<@@ -136,7 +136,7 @@ export class FlatPageLayoutWidgetValidatorService {flatEntityToValidate: updatedFlatPageLayoutWidget,optimisticFlatEntityMapsAndRelatedFlatEntityMaps,update: flatEntityUpdate,- additionalCacheDataMaps: { featureFlagsMap },+ additionalCacheDataMaps,workspaceId,buildOptions,remainingFlatEntityMapsToValidate:@@ -186,7 +186,7 @@ export class FlatPageLayoutWidgetValidatorService {public async validateFlatPageLayoutWidgetCreation({finalFlatEntityMaps,flatEntityToValidate: flatPageLayoutWidgetToValidate,- additionalCacheDataMaps: { featureFlagsMap },+ additionalCacheDataMaps,optimisticFlatEntityMapsAndRelatedFlatEntityMaps,workspaceId,buildOptions,@@ -267,7 +267,7 @@ export class FlatPageLayoutWidgetValidatorService {{flatEntityToValidate: flatPageLayoutWidgetToValidate,optimisticFlatEntityMapsAndRelatedFlatEntityMaps,- additionalCacheDataMaps: { featureFlagsMap },+ additionalCacheDataMaps,workspaceId,buildOptions,remainingFlatEntityMapsToValidate,diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-role-target-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-role-target-validator.service.tsindex abdbbb974c6..511a5999c0a 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-role-target-validator.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-role-target-validator.service.ts@@ -11,6 +11,7 @@ import { getEmptyFlatEntityValidationError } from 'src/engine/workspace-manager/import { FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type';import { UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type';import { validateFlatRoleTargetAssignationAvailability } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-assignation-availability.util';+import { validateFlatRoleTargetRoleIsEntitled } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-role-is-entitled.util';import { validateFlatRoleTargetTargetsOnlyOneEntity } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-targets-only-one-entity.util';@Injectable()@@ -21,6 +22,8 @@ export class FlatRoleTargetValidatorService {flatRoleTargetMaps: optimisticFlatRoleTargetMaps,flatRoleMaps,},+ additionalCacheDataMaps: { billingEntitlements },+ buildOptions,}: UniversalFlatEntityValidationArgs<typeof ALL_METADATA_NAME.roleTarget>): FailedFlatEntityValidation<'roleTarget', 'create'> {@@ -69,6 +72,17 @@ export class FlatRoleTargetValidatorService {flatRoleTarget: flatRoleTargetToValidate,}),);++ const entitlementError = validateFlatRoleTargetRoleIsEntitled({+ flatRole: referencedRole,+ flatRoleTarget: flatRoleTargetToValidate,+ billingEntitlements,+ buildOptions,+ });++ if (isDefined(entitlementError)) {+ validationResult.errors.push(entitlementError);+ }}return validationResult;@@ -115,6 +129,8 @@ export class FlatRoleTargetValidatorService {flatRoleTargetMaps: optimisticFlatRoleTargetMaps,flatRoleMaps,},+ additionalCacheDataMaps: { billingEntitlements },+ buildOptions,}: FlatEntityUpdateValidationArgs<typeof ALL_METADATA_NAME.roleTarget>): FailedFlatEntityValidation<'roleTarget', 'update'> {@@ -174,6 +190,24 @@ export class FlatRoleTargetValidatorService {}),);+ if (+ updatedFlatRoleTarget.roleUniversalIdentifier ===+ existingRoleTarget.roleUniversalIdentifier+ ) {+ return validationResult;+ }++ const entitlementError = validateFlatRoleTargetRoleIsEntitled({+ flatRole: referencedRole,+ flatRoleTarget: updatedFlatRoleTarget,+ billingEntitlements,+ buildOptions,+ });++ if (isDefined(entitlementError)) {+ validationResult.errors.push(entitlementError);+ }+return validationResult;}}diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/__tests__/validate-flat-role-target-role-is-entitled.util.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/__tests__/validate-flat-role-target-role-is-entitled.util.spec.tsnew file mode 100644index 00000000000..e9c68831e18--- /dev/null+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/__tests__/validate-flat-role-target-role-is-entitled.util.spec.ts@@ -0,0 +1,87 @@+import { MEMBER_ROLE_UNIVERSAL_IDENTIFIER } from 'twenty-shared/constants';++import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';+import { RoleTargetExceptionCode } from 'src/engine/metadata-modules/role/exceptions/role-target.exception';+import { STANDARD_ROLE } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-role.constant';+import { validateFlatRoleTargetRoleIsEntitled } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-role-is-entitled.util';++const CUSTOM_ROLE = {+ universalIdentifier: '6f1c2a54-91d3-4b7e-a0f2-3c8d5e7b9a10',+ label: 'Sales',+};++const USER_ROLE_TARGET = { agentUniversalIdentifier: null };++const USER_BUILD_OPTIONS = {+ isSystemBuild: false,+ applicationUniversalIdentifier: 'workspace-custom-application',+};++describe('validateFlatRoleTargetRoleIsEntitled', () => {+ it.each([+ ['Admin', STANDARD_ROLE.admin.universalIdentifier],+ ['Member', MEMBER_ROLE_UNIVERSAL_IDENTIFIER],+ ])(+ 'should allow %s without the entitlement',+ (label, universalIdentifier) => {+ expect(+ validateFlatRoleTargetRoleIsEntitled({+ flatRole: { universalIdentifier, label },+ flatRoleTarget: USER_ROLE_TARGET,+ billingEntitlements: {},+ buildOptions: USER_BUILD_OPTIONS,+ }),+ ).toBeUndefined();+ },+ );++ it('should allow a custom role when the workspace is entitled', () => {+ expect(+ validateFlatRoleTargetRoleIsEntitled({+ flatRole: CUSTOM_ROLE,+ flatRoleTarget: USER_ROLE_TARGET,+ billingEntitlements: { [BillingEntitlementKey.CUSTOM_ROLES]: true },+ buildOptions: USER_BUILD_OPTIONS,+ }),+ ).toBeUndefined();+ });++ it('should allow a custom role in a system build', () => {+ expect(+ validateFlatRoleTargetRoleIsEntitled({+ flatRole: CUSTOM_ROLE,+ flatRoleTarget: USER_ROLE_TARGET,+ billingEntitlements: {},+ buildOptions: { ...USER_BUILD_OPTIONS, isSystemBuild: true },+ }),+ ).toBeUndefined();+ });++ it('should allow a custom role on an agent without the entitlement', () => {+ expect(+ validateFlatRoleTargetRoleIsEntitled({+ flatRole: CUSTOM_ROLE,+ flatRoleTarget: { agentUniversalIdentifier: 'agent-universal-id' },+ billingEntitlements: {},+ buildOptions: USER_BUILD_OPTIONS,+ }),+ ).toBeUndefined();+ });++ it.each([+ ['revoked', { [BillingEntitlementKey.CUSTOM_ROLES]: false }],+ ['missing', {}],+ ])(+ 'should refuse a custom role when the entitlement is %s',+ (_, billingEntitlements) => {+ expect(+ validateFlatRoleTargetRoleIsEntitled({+ flatRole: CUSTOM_ROLE,+ flatRoleTarget: USER_ROLE_TARGET,+ billingEntitlements,+ buildOptions: USER_BUILD_OPTIONS,+ })?.code,+ ).toBe(RoleTargetExceptionCode.CUSTOM_ROLES_NOT_ENTITLED);+ },+ );+});diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-role-is-entitled.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-role-is-entitled.util.tsnew file mode 100644index 00000000000..b8d98ef00f7--- /dev/null+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-role-target-role-is-entitled.util.ts@@ -0,0 +1,52 @@+import { msg, t } from '@lingui/core/macro';+import { MEMBER_ROLE_UNIVERSAL_IDENTIFIER } from 'twenty-shared/constants';+import { isDefined } from 'twenty-shared/utils';++import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';+import { type BillingEntitlements } from 'src/engine/core-modules/billing/types/billing-entitlements.type';+import { RoleTargetExceptionCode } from 'src/engine/metadata-modules/role/exceptions/role-target.exception';+import { STANDARD_ROLE } from 'src/engine/workspace-manager/twenty-standard-application/constants/standard-role.constant';+import { type UniversalFlatRoleTarget } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-role-target.type';+import { type UniversalFlatRole } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-role.type';+import { type FlatEntityValidationError } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/types/failed-flat-entity-validation.type';+import { type WorkspaceMigrationBuilderOptions } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type';++const ROLE_UNIVERSAL_IDENTIFIERS_ASSIGNABLE_WITHOUT_ENTITLEMENT = [+ STANDARD_ROLE.admin.universalIdentifier,+ MEMBER_ROLE_UNIVERSAL_IDENTIFIER,+];++type ValidateFlatRoleTargetRoleIsEntitledArgs = {+ flatRole: Pick<UniversalFlatRole, 'universalIdentifier' | 'label'>;+ flatRoleTarget: Pick<UniversalFlatRoleTarget, 'agentUniversalIdentifier'>;+ billingEntitlements: BillingEntitlements;+ buildOptions: Pick<WorkspaceMigrationBuilderOptions, 'isSystemBuild'>;+};++export const validateFlatRoleTargetRoleIsEntitled = ({+ flatRole,+ flatRoleTarget,+ billingEntitlements,+ buildOptions,+}: ValidateFlatRoleTargetRoleIsEntitledArgs):+ | FlatEntityValidationError+ | undefined => {+ if (+ buildOptions.isSystemBuild ||+ isDefined(flatRoleTarget.agentUniversalIdentifier) ||+ ROLE_UNIVERSAL_IDENTIFIERS_ASSIGNABLE_WITHOUT_ENTITLEMENT.includes(+ flatRole.universalIdentifier,+ ) ||+ billingEntitlements[BillingEntitlementKey.CUSTOM_ROLES]+ ) {+ return undefined;+ }++ const roleLabel = flatRole.label;++ return {+ code: RoleTargetExceptionCode.CUSTOM_ROLES_NOT_ENTITLED,+ message: t`Role "${roleLabel}" cannot be assigned: custom roles require the Organization plan`,+ userFriendlyMessage: msg`Custom roles are part of the Organization plan. Upgrade to assign "${roleLabel}".`,+ };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/role/__snapshots__/failing-custom-role-assignment-without-entitlement.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/role/__snapshots__/failing-custom-role-assignment-without-entitlement.integration-spec.ts.snapnew file mode 100644index 00000000000..22369bd9c81--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/role/__snapshots__/failing-custom-role-assignment-without-entitlement.integration-spec.ts.snap@@ -0,0 +1,72 @@+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing++exports[`Custom role assignment without the custom roles entitlement should refuse a custom role as the workspace default role 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "CUSTOM_ROLES_NOT_ENTITLED",+ "userFriendlyMessage": "Custom roles are part of the Organization plan. Upgrade to assign "Entitlement gated role".",+ },+ "message": "Role "Entitlement gated role" cannot be assigned: custom roles require the Organization plan",+ "name": "ForbiddenError",+}+`;++exports[`Custom role assignment without the custom roles entitlement should refuse a role that cannot be assigned to users as the workspace default role 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "subCode": "ROLE_CANNOT_BE_ASSIGNED_TO_USERS",+ "userFriendlyMessage": "This role cannot be assigned to users.",+ },+ "message": "Role cannot be assigned to users",+ "name": "UserInputError",+}+`;++exports[`Custom role assignment without the custom roles entitlement should refuse assigning a custom role to a workspace member 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "CUSTOM_ROLES_NOT_ENTITLED",+ "userFriendlyMessage": "Custom roles are part of the Organization plan. Upgrade to assign "Entitlement gated role".",+ },+ "message": "Role "Entitlement gated role" cannot be assigned: custom roles require the Organization plan",+ "name": "ForbiddenError",+}+`;++exports[`Custom role assignment without the custom roles entitlement should refuse creating an API key with a custom role 1`] = `+{+ "extensions": {+ "code": "METADATA_VALIDATION_FAILED",+ "errors": {+ "roleTarget": [+ {+ "errors": [+ {+ "code": "CUSTOM_ROLES_NOT_ENTITLED",+ "message": "Role "Entitlement gated role" cannot be assigned: custom roles require the Organization plan",+ "userFriendlyMessage": "Custom roles are part of the Organization plan. Upgrade to assign "Entitlement gated role".",+ },+ ],+ "flatEntityMinimalInformation": {+ "universalIdentifier": Any<String>,+ },+ "metadataName": "roleTarget",+ "status": "fail",+ "type": "create",+ },+ ],+ },+ "message": "Validation failed for 1 roleTarget",+ "summary": {+ "roleTarget": 1,+ "totalErrors": 1,+ },+ "userFriendlyMessage": "Custom roles are part of the Organization plan. Upgrade to assign "Entitlement gated role".",+ },+ "message": "Multiple validation errors occurred while creating role targets",+ "name": "GraphQLError",+}+`;diff --git a/packages/twenty-server/test/integration/metadata/suites/role/failing-custom-role-assignment-without-entitlement.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/role/failing-custom-role-assignment-without-entitlement.integration-spec.tsnew file mode 100644index 00000000000..98639ae72a7--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/role/failing-custom-role-assignment-without-entitlement.integration-spec.ts@@ -0,0 +1,270 @@+import gql from 'graphql-tag';+import { TEST_AI_MODEL_ID } from 'test/integration/constants/test-ai-model-ids.constants';+import { expectOneNotInternalServerErrorSnapshot } from 'test/integration/graphql/utils/expect-one-not-internal-server-error-snapshot.util';+import { updateWorkspace } from 'test/integration/graphql/utils/update-workspace.util';+import { createOneAgent } from 'test/integration/metadata/suites/agent/utils/create-one-agent.util';+import { deleteOneAgent } from 'test/integration/metadata/suites/agent/utils/delete-one-agent.util';+import { createOneRole } from 'test/integration/metadata/suites/role/utils/create-one-role.util';+import { deleteOneRole } from 'test/integration/metadata/suites/role/utils/delete-one-role.util';+import { findOneRoleByLabel } from 'test/integration/metadata/suites/role/utils/find-one-role-by-label.util';+import { updateWorkspaceMemberRole } from 'test/integration/metadata/suites/role/utils/update-workspace-member-role.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';++import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';+import { type WorkspaceBillingEntitlementsCacheService } from 'src/engine/core-modules/billing/services/workspace-billing-entitlements-cache.service';+import { type UserEntity } from 'src/engine/core-modules/user/user.entity';+import { type UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';+import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { PermissionsExceptionCode } from 'src/engine/metadata-modules/permissions/permissions.exception';+import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';+import { USER_WORKSPACE_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-user-workspaces.util';+import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';++describe('Custom role assignment without the custom roles entitlement', () => {+ let workspaceCacheService: WorkspaceCacheService;+ let billingEntitlementsCacheService: WorkspaceBillingEntitlementsCacheService;+ let adminRoleId: string;+ let memberRoleId: string;+ let guestRoleId: string;+ let customRoleId: string;++ const refreshEntitlements = () =>+ workspaceCacheService.invalidateAndRecompute(SEED_APPLE_WORKSPACE_ID, [+ 'billingEntitlements',+ ]);++ beforeAll(async () => {+ workspaceCacheService = getAppProviderByClassName<WorkspaceCacheService>(+ 'WorkspaceCacheService',+ );+ billingEntitlementsCacheService =+ getAppProviderByClassName<WorkspaceBillingEntitlementsCacheService>(+ 'WorkspaceBillingEntitlementsCacheService',+ );++ adminRoleId = (await findOneRoleByLabel({ label: 'Admin' })).id;+ memberRoleId = (await findOneRoleByLabel({ label: 'Member' })).id;+ guestRoleId = (await findOneRoleByLabel({ label: 'Guest' })).id;++ const { data } = await createOneRole({+ expectToFail: false,+ input: {+ label: 'Entitlement gated role',+ canBeAssignedToUsers: true,+ canBeAssignedToAgents: true,+ canBeAssignedToApiKeys: true,+ },+ });++ customRoleId = data.createOneRole.id;++ jest+ .spyOn(billingEntitlementsCacheService, 'computeForCache')+ .mockReturnValue({ [BillingEntitlementKey.CUSTOM_ROLES]: false });+ await refreshEntitlements();+ });++ afterAll(async () => {+ jest.restoreAllMocks();+ await refreshEntitlements();++ await updateWorkspaceMemberRole({+ input: {+ workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,+ roleId: memberRoleId,+ },+ });++ await deleteOneRole({+ expectToFail: false,+ input: { idToDelete: customRoleId },+ });+ });++ it('should refuse assigning a custom role to a workspace member', async () => {+ const { errors } = await updateWorkspaceMemberRole({+ expectToFail: true,+ input: {+ workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,+ roleId: customRoleId,+ },+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ describe('when a new user joins with a custom role', () => {+ let userWorkspaceService: UserWorkspaceService;+ let workspace: WorkspaceEntity;+ let user: UserEntity;++ beforeAll(async () => {+ userWorkspaceService = getAppProviderByClassName<UserWorkspaceService>(+ 'UserWorkspaceService',+ );++ [workspace] = await global.testDataSource.query(+ `SELECT * FROM core."workspace" WHERE id = $1`,+ [SEED_APPLE_WORKSPACE_ID],+ );++ [user] = await global.testDataSource.query(+ `INSERT INTO core."user" (email, "firstName", "lastName") VALUES ($1, 'Unentitled', 'Joiner') RETURNING *`,+ ['[email protected]'],+ );+ });++ afterAll(async () => {+ await global.testDataSource.query(+ `DELETE FROM core."userWorkspace" WHERE "userId" = $1`,+ [user.id],+ );+ await global.testDataSource.query(+ `DELETE FROM core."user" WHERE id = $1`,+ [user.id],+ );+ });++ it.each([+ { roleSource: 'the invited role', isDefaultRole: false },+ { roleSource: 'the workspace default role', isDefaultRole: true },+ ])(+ 'should refuse $roleSource before saving the membership',+ async ({ isDefaultRole }) => {+ await expect(+ userWorkspaceService.addUserToWorkspaceIfUserNotInWorkspace(+ user,+ isDefaultRole+ ? { ...workspace, defaultRoleId: customRoleId }+ : workspace,+ isDefaultRole ? undefined : customRoleId,+ ),+ ).rejects.toMatchObject({+ code: PermissionsExceptionCode.CUSTOM_ROLES_NOT_ENTITLED,+ });++ const userWorkspaces = await global.testDataSource.query(+ `SELECT id FROM core."userWorkspace" WHERE "userId" = $1`,+ [user.id],+ );++ expect(userWorkspaces).toEqual([]);+ },+ );+ });++ it('should refuse creating an API key with a custom role', async () => {+ const response = await makeMetadataApiRequest({+ query: gql`+ mutation CreateApiKey($input: CreateApiKeyInput!) {+ createApiKey(input: $input) {+ id+ }+ }+ `,+ variables: {+ input: {+ name: 'Entitlement gated key',+ expiresAt: '2099-01-01T00:00:00Z',+ roleId: customRoleId,+ },+ },+ });++ expectOneNotInternalServerErrorSnapshot({ errors: response.body.errors });+ });++ it('should refuse a custom role as the workspace default role', async () => {+ const { errors } = await updateWorkspace({+ expectToFail: true,+ data: { defaultRoleId: customRoleId },+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse a role that cannot be assigned to users as the workspace default role', async () => {+ const { data } = await createOneRole({+ expectToFail: false,+ input: {+ label: 'Agent only role',+ canBeAssignedToUsers: false,+ canBeAssignedToAgents: true,+ },+ });++ const { errors } = await updateWorkspace({+ expectToFail: true,+ data: { defaultRoleId: data.createOneRole.id },+ });++ await deleteOneRole({+ expectToFail: false,+ input: { idToDelete: data.createOneRole.id },+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should still create an agent with a custom role', async () => {+ const { data, errors } = await createOneAgent({+ expectToFail: false,+ input: {+ label: 'Entitlement exempt agent',+ prompt: 'Answer questions',+ modelId: TEST_AI_MODEL_ID,+ roleId: customRoleId,+ },+ });++ expect(errors).toBeUndefined();++ await deleteOneAgent({+ expectToFail: false,+ input: { id: data.createOneAgent.id },+ });+ });++ it('should still assign Admin and Member', async () => {+ const { errors: adminErrors } = await updateWorkspaceMemberRole({+ expectToFail: false,+ input: {+ workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,+ roleId: adminRoleId,+ },+ });++ expect(adminErrors).toBeUndefined();++ const { errors: memberErrors } = await updateWorkspaceMemberRole({+ expectToFail: false,+ input: {+ workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,+ roleId: memberRoleId,+ },+ });++ expect(memberErrors).toBeUndefined();+ });++ it('should keep a member on their existing custom role when it is saved again', async () => {+ const { errors } = await updateWorkspaceMemberRole({+ expectToFail: false,+ input: {+ workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.PHIL,+ roleId: guestRoleId,+ },+ });++ expect(errors).toBeUndefined();++ const roleTargets: { roleId: string }[] = await global.testDataSource.query(+ `SELECT "roleId" FROM core."roleTarget" WHERE "workspaceId" = $1 AND "userWorkspaceId" = $2`,+ [SEED_APPLE_WORKSPACE_ID, USER_WORKSPACE_DATA_SEED_IDS.PHIL],+ );++ expect(roleTargets).toEqual([{ roleId: guestRoleId }]);+ });+});