The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Guard metadata-modules endpoints with AccessPolicyGuard (#29547)
Paul Rastoin53bff6baeb8d
diff --git a/packages/twenty-oxlint-rules/rules/graphql-resolvers-should-be-guarded.spec.ts b/packages/twenty-oxlint-rules/rules/graphql-resolvers-should-be-guarded.spec.tsindex 9846ea3b0f5..38440399a99 100644--- a/packages/twenty-oxlint-rules/rules/graphql-resolvers-should-be-guarded.spec.ts+++ b/packages/twenty-oxlint-rules/rules/graphql-resolvers-should-be-guarded.spec.ts@@ -32,6 +32,16 @@ ruleTester.run(RULE_NAME, rule, {`,filename: 'test.tsx',},+ {+ code: `+ class TestResolver {+ @Mutation()+ @UseGuards(AccessPolicyGuard({ authPrincipals: { userSession: true, apiKey: false, oauthClient: false, application: false }, requiredPermissionFlags: [PermissionFlagType.WORKSPACE] }))+ testMutation() {}+ }+ `,+ filename: 'test.tsx',+ },{code: `class TestResolver {@@ -566,20 +576,30 @@ ruleTester.run(RULE_NAME, rule, {errors: [{ messageId: 'authPrincipalGuardNotFirst' }],filename: 'test.tsx',},- {+ ...[+ 'AccessPolicyGuard({ ...VIEW_WRITE_ACCESS_POLICY })',+ 'AccessPolicyGuard({})',+ 'AccessPolicyGuard({ authPrincipals: {}, requiredPermissionFlags: [] })',+ 'AccessPolicyGuard({ authPrincipals: { userSession: false, apiKey: true, oauthClient: false, application: false } })',+ 'AccessPolicyGuard({ authPrincipals, requiredPermissionFlags: [] })',+ 'AccessPolicyGuard({ authPrincipals: { ...USER_SESSIONS_ONLY, apiKey: true }, requiredPermissionFlags: [] })',+ 'AccessPolicyGuard({ authPrincipals: { userSession: USER_SESSION_VARIANTS, apiKey: false, oauthClient: false, application: false }, requiredPermissionFlags: [] })',+ 'AccessPolicyGuard({ authPrincipals: { userSession: false, apiKey: true, oauthClient: false, application: false }, requiredPermissionFlags: [...VIEW_FLAGS] })',+ 'AccessPolicyGuard({ authPrincipals: { userSession: false, apiKey: true, oauthClient: false, application: false }, requiredPermissionFlags: VIEW_FLAGS })',+ ].map((accessPolicyGuard) => ({code: `class TestResolver {@Mutation()- @UseGuards(AccessPolicyGuard({ authPrincipals: {}, requiredPermissionFlags: [] }))+ @UseGuards(${accessPolicyGuard})testMutation() {}}`,errors: [{ messageId: 'graphqlResolversShouldBeGuarded' },- { messageId: 'accessPolicyGuardWithoutPolicyConstant' },+ { messageId: 'accessPolicyGuardWithoutPolicy' },],filename: 'test.tsx',- },+ })),{code: `@UseGuards(AccessPolicyGuard(VIEW_READ_ACCESS_POLICY))diff --git a/packages/twenty-oxlint-rules/rules/graphql-resolvers-should-be-guarded.ts b/packages/twenty-oxlint-rules/rules/graphql-resolvers-should-be-guarded.tsindex 35730f5e22e..ccf32eab7da 100644--- a/packages/twenty-oxlint-rules/rules/graphql-resolvers-should-be-guarded.ts+++ b/packages/twenty-oxlint-rules/rules/graphql-resolvers-should-be-guarded.ts@@ -6,7 +6,7 @@ export const rule = createGuardedEndpointRule({triggerDecorators: ['Query', 'Mutation', 'Subscription'],messageId: 'graphqlResolversShouldBeGuarded',description:- 'GraphQL root resolvers (Query, Mutation, Subscription) should declare the principals they accept with AuthPrincipalGuard({ ... }) or be explicitly marked as public (PublicEndpointGuard), and have permission guards (SettingsPermissionGuard or CustomPermissionGuard) to maintain our security model. AccessPolicyGuard(*_ACCESS_POLICY) covers both.',+ 'GraphQL root resolvers (Query, Mutation, Subscription) should declare the principals they accept with AuthPrincipalGuard({ ... }) or be explicitly marked as public (PublicEndpointGuard), and have permission guards (SettingsPermissionGuard or CustomPermissionGuard) to maintain our security model. AccessPolicyGuard covers both.',message:- 'All GraphQL resolvers must have an authentication guard (@UseGuards(AuthPrincipalGuard({ ... })) or PublicEndpointGuard) and permission guards (@UseGuards(..., SettingsPermissionGuard(PermissionFlagType.XXX)), CustomPermissionGuard for custom logic, or NoPermissionGuard for special cases like onboarding), or a single AccessPolicyGuard(*_ACCESS_POLICY) covering both.',+ 'All GraphQL resolvers must have an authentication guard (@UseGuards(AuthPrincipalGuard({ ... })) or PublicEndpointGuard) and permission guards (@UseGuards(..., SettingsPermissionGuard(PermissionFlagType.XXX)), CustomPermissionGuard for custom logic, or NoPermissionGuard for special cases like onboarding), or a single AccessPolicyGuard covering both.',});diff --git a/packages/twenty-oxlint-rules/rules/rest-api-methods-should-be-guarded.ts b/packages/twenty-oxlint-rules/rules/rest-api-methods-should-be-guarded.tsindex 3abee1d2c61..69bce6dc194 100644--- a/packages/twenty-oxlint-rules/rules/rest-api-methods-should-be-guarded.ts+++ b/packages/twenty-oxlint-rules/rules/rest-api-methods-should-be-guarded.ts@@ -15,7 +15,7 @@ export const rule = createGuardedEndpointRule({],messageId: 'restApiMethodsShouldBeGuarded',description:- 'REST API endpoints should declare the principals they accept with AuthPrincipalGuard({ ... }), authenticate with a file token guard (FilePathGuard, FileByIdGuard, FileUploadTokenGuard) or be explicitly marked as public (PublicEndpointGuard), and have permission guards (SettingsPermissionGuard or CustomPermissionGuard) to maintain our security model. AccessPolicyGuard(*_ACCESS_POLICY) covers both.',+ 'REST API endpoints should declare the principals they accept with AuthPrincipalGuard({ ... }), authenticate with a file token guard (FilePathGuard, FileByIdGuard, FileUploadTokenGuard) or be explicitly marked as public (PublicEndpointGuard), and have permission guards (SettingsPermissionGuard or CustomPermissionGuard) to maintain our security model. AccessPolicyGuard covers both.',message:- 'All REST API controller endpoints must have an authentication guard (@UseGuards(AuthPrincipalGuard({ ... })), a file token guard, or PublicEndpointGuard) and permission guards (@UseGuards(..., SettingsPermissionGuard(...)), CustomPermissionGuard, or NoPermissionGuard), or a single AccessPolicyGuard(*_ACCESS_POLICY) covering both.',+ 'All REST API controller endpoints must have an authentication guard (@UseGuards(AuthPrincipalGuard({ ... })), a file token guard, or PublicEndpointGuard) and permission guards (@UseGuards(..., SettingsPermissionGuard(...)), CustomPermissionGuard, or NoPermissionGuard), or a single AccessPolicyGuard covering both.',});diff --git a/packages/twenty-oxlint-rules/utils/createGuardedEndpointRule.ts b/packages/twenty-oxlint-rules/utils/createGuardedEndpointRule.tsindex efa346040d6..0f2329ca5fb 100644--- a/packages/twenty-oxlint-rules/utils/createGuardedEndpointRule.ts+++ b/packages/twenty-oxlint-rules/utils/createGuardedEndpointRule.ts@@ -14,8 +14,8 @@ const AUTH_PRINCIPAL_GUARD_CONFIG_NOT_INLINE_MESSAGE_ID =const AUTH_PRINCIPAL_GUARD_WIDER_THAN_CLASS_MESSAGE_ID ='authPrincipalGuardWiderThanClass';const AUTH_PRINCIPAL_GUARD_NOT_FIRST_MESSAGE_ID = 'authPrincipalGuardNotFirst';-const ACCESS_POLICY_GUARD_WITHOUT_POLICY_CONSTANT_MESSAGE_ID =- 'accessPolicyGuardWithoutPolicyConstant';+const ACCESS_POLICY_GUARD_WITHOUT_POLICY_MESSAGE_ID =+ 'accessPolicyGuardWithoutPolicy';const ACCESS_POLICY_GUARD_ON_CLASS_AND_METHOD_MESSAGE_ID ='accessPolicyGuardOnClassAndMethod';@@ -64,8 +64,8 @@ export const createGuardedEndpointRule = ({'This method-level AuthPrincipalGuard accepts {{ principalVariants }}, which the class-level AuthPrincipalGuard refuses: a method can only narrow what its class accepts.',[AUTH_PRINCIPAL_GUARD_NOT_FIRST_MESSAGE_ID]:'AuthPrincipalGuard and AccessPolicyGuard must come first in their @UseGuards list, or right after JwtAuthGuard or McpAuthGuard, so the guards after them only run once the principal is known.',- [ACCESS_POLICY_GUARD_WITHOUT_POLICY_CONSTANT_MESSAGE_ID]:- 'AccessPolicyGuard takes an imported *_ACCESS_POLICY constant, so the GraphQL, REST and tool entry points of an operation share one policy.',+ [ACCESS_POLICY_GUARD_WITHOUT_POLICY_MESSAGE_ID]:+ 'AccessPolicyGuard takes a *_ACCESS_POLICY constant or an inline policy object (no spread, no shorthand).',[ACCESS_POLICY_GUARD_ON_CLASS_AND_METHOD_MESSAGE_ID]:'An endpoint takes one AccessPolicyGuard: on its class when every endpoint of the class shares the policy, otherwise on each method, never both.',},@@ -93,12 +93,12 @@ export const createGuardedEndpointRule = ({});}- for (const guard of typedTokenHelpers.getAccessPolicyGuardsWithoutPolicyConstant(+ for (const guard of typedTokenHelpers.getAccessPolicyGuardsWithoutPolicy(node,)) {context.report({node: guard,- messageId: ACCESS_POLICY_GUARD_WITHOUT_POLICY_CONSTANT_MESSAGE_ID,+ messageId: ACCESS_POLICY_GUARD_WITHOUT_POLICY_MESSAGE_ID,});}};diff --git a/packages/twenty-oxlint-rules/utils/typedTokenHelpers.ts b/packages/twenty-oxlint-rules/utils/typedTokenHelpers.tsindex 2f826100d75..a2ae743bbaa 100644--- a/packages/twenty-oxlint-rules/utils/typedTokenHelpers.ts+++ b/packages/twenty-oxlint-rules/utils/typedTokenHelpers.ts@@ -10,7 +10,7 @@ const AUTH_PRINCIPAL_GUARD_NAME = 'AuthPrincipalGuard';const ACCESS_POLICY_GUARD_NAME = 'AccessPolicyGuard';-// A named constant, so every entry point of an operation imports the same policy+// A named constant when several entry points share the operation, else an inline policyconst ACCESS_POLICY_CONSTANT_NAME_PATTERN = /^[A-Z][A-Z0-9_]*_ACCESS_POLICY$/;// They put the principal on the request, which AuthPrincipalGuard then reads.@@ -44,11 +44,9 @@ const isAccessPolicyGuardCall = (node: any): boolean =>node.callee.type === 'Identifier' &&node.callee.name === ACCESS_POLICY_GUARD_NAME;-const isAccessPolicyGuardWithPolicyConstant = (node: any): boolean =>- isAccessPolicyGuardCall(node) &&- node.arguments.length === 1 &&- node.arguments[0].type === 'Identifier' &&- ACCESS_POLICY_CONSTANT_NAME_PATTERN.test(node.arguments[0].name);+const isAccessPolicyConstant = (node: any): boolean =>+ node.type === 'Identifier' &&+ ACCESS_POLICY_CONSTANT_NAME_PATTERN.test(node.name);// Both guards check the principal, so the guards after them only run once it is knownconst isPrincipalCheckingGuardCall = (node: any): boolean =>@@ -85,6 +83,30 @@ const getPropertyValue = (objectNode: any, propertyName: string): any =>(property: any) => getPropertyName(property) === propertyName,)?.value;+const isArrayWithoutSpread = (node: any): boolean =>+ node.type === 'ArrayExpression' &&+ node.elements.every((element: any) => element?.type !== 'SpreadElement');++const isInlineAccessPolicy = (node: any): boolean =>+ node.type === 'ObjectExpression' &&+ node.properties.every(+ (property: any) =>+ property.type === 'Property' &&+ !property.computed &&+ !property.shorthand &&+ (getPropertyName(property) === 'authPrincipals'+ ? isInlineAuthPrincipalGuardConfig(property.value)+ : isArrayWithoutSpread(property.value)),+ ) &&+ getPropertyValue(node, 'authPrincipals')?.properties.length > 0 &&+ getPropertyValue(node, 'requiredPermissionFlags') !== undefined;++const isAccessPolicyGuardWithPolicy = (node: any): boolean =>+ isAccessPolicyGuardCall(node) &&+ node.arguments.length === 1 &&+ (isAccessPolicyConstant(node.arguments[0]) ||+ isInlineAccessPolicy(node.arguments[0]));+const isVariantsConfig = (kindConfig: any): boolean =>kindConfig?.type === 'ObjectExpression';@@ -165,14 +187,13 @@ export const typedTokenHelpers = {(arg: any) =>(arg.type === 'Identifier' && AUTH_GUARD_NAMES.includes(arg.name)) ||isAuthPrincipalGuardWithInlineConfig(arg) ||- isAccessPolicyGuardWithPolicyConstant(arg),+ isAccessPolicyGuardWithPolicy(arg),),- getAccessPolicyGuardsWithoutPolicyConstant: (node: any): any[] =>+ getAccessPolicyGuardsWithoutPolicy: (node: any): any[] =>getUseGuardsArguments(node).filter((arg: any) =>- isAccessPolicyGuardCall(arg) &&- !isAccessPolicyGuardWithPolicyConstant(arg),+ isAccessPolicyGuardCall(arg) && !isAccessPolicyGuardWithPolicy(arg),),getAccessPolicyGuards: (node: any): any[] =>@@ -211,7 +232,7 @@ export const typedTokenHelpers = {decorator.expression.callee.name === 'UseGuards') {return decorator.expression.arguments.some((arg: any) => {- if (isAccessPolicyGuardWithPolicyConstant(arg)) {+ if (isAccessPolicyGuardWithPolicy(arg)) {return true;}if (arg.type === 'CallExpression') {diff --git a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts b/packages/twenty-server/src/engine/core-modules/core-engine.module.tsindex cf5de4c7e49..08c5c3cd52b 100644--- a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts+++ b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts@@ -38,6 +38,7 @@ import { EnvironmentModule } from 'src/engine/core-modules/environment/environmeimport { ExceptionHandlerModule } from 'src/engine/core-modules/exception-handler/exception-handler.module';import { exceptionHandlerModuleFactory } from 'src/engine/core-modules/exception-handler/exception-handler.module-factory';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';+import { AccessPolicyModule } from 'src/engine/permissions/access-policy/access-policy.module';import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module';import { GeoMapModule } from 'src/engine/core-modules/geo-map/geo-map-module';import { GettingStartedWorkflowModule } from 'src/engine/core-modules/getting-started/getting-started-workflow.module';@@ -96,6 +97,7 @@ import { FileApiModule } from './file/file-api.module';UsageModule,ClientConfigModule,FeatureFlagModule,+ AccessPolicyModule,FileApiModule,RecordShareModule,RowLevelPermissionModule,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-run.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-run.resolver.tsindex 9375815a687..8f51315fad4 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-run.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/resolvers/agent-run.resolver.ts@@ -20,8 +20,6 @@ import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decimport { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace-member-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { GenerateInputDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/generate.input';import { GenerateResultDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/generate-result.dto';import { RunAgentInputDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/run-agent.input';@@ -30,20 +28,23 @@ import { AgentRunService } from 'src/engine/metadata-modules/ai/ai-agent-executiimport { AiGenerateService } from 'src/engine/metadata-modules/ai/ai-agent-execution/services/ai-generate.service';import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,},- apiKey: true,- oauthClient: true,- application: true,+ requiredPermissionFlags: [PermissionFlagType.AI],}),- SettingsPermissionGuard(PermissionFlagType.AI),)@UseInterceptors(AiGraphqlApiExceptionInterceptor)@UseFilters(diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-runs/resolvers/agent-runs.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-runs/resolvers/agent-runs.resolver.tsindex 4436ac8b631..f13f74ebf5f 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-runs/resolvers/agent-runs.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-runs/resolvers/agent-runs.resolver.ts@@ -11,26 +11,27 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspacimport { ApplicationTargetArg } from 'src/engine/decorators/auth/application-target-arg.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { ApplicationTargetGuard } from 'src/engine/guards/application-target.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';import { AgentRunDTO } from 'src/engine/metadata-modules/ai/ai-agent-runs/dtos/agent-run.dto';import { AgentRunsService } from 'src/engine/metadata-modules/ai/ai-agent-runs/services/agent-runs.service';import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,},- apiKey: true,- oauthClient: true,- application: true,+ requiredPermissionFlags: [PermissionFlagType.AI_SETTINGS],}),- SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS),)@UseInterceptors(AiGraphqlApiExceptionInterceptor)@MetadataResolver(() => AgentRunDTO)diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.resolver.tsindex 9a2a23fd1b9..47b8a972ae8 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/agent.resolver.ts@@ -12,8 +12,6 @@ import { ApplicationTargetArg } from 'src/engine/decorators/auth/application-tarimport { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { fromFlatAgentWithRoleIdToAgentDto } from 'src/engine/metadata-modules/flat-agent/utils/from-agent-entity-to-agent-dto.util';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';@@ -28,9 +26,11 @@ import { UpdateAgentInput } from './dtos/update-agent.input';import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';import { ApplicationTargetGuard } from 'src/engine/guards/application-target.guard';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';-@UseGuards(- AuthPrincipalGuard({+const AGENT_RESOLVER_READ_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {userSession: {standard: true,impersonated: true,@@ -40,9 +40,28 @@ import { ApplicationTargetGuard } from 'src/engine/guards/application-target.guaapiKey: true,oauthClient: true,application: true,- }),- SettingsPermissionGuard(PermissionFlagType.AI),-)+ },+ requiredPermissionFlags: [PermissionFlagType.AI],+};++const AGENT_RESOLVER_WRITE_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [+ PermissionFlagType.AI,+ PermissionFlagType.AI_SETTINGS,+ ],+};+@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor,AiGraphqlApiExceptionInterceptor,@@ -66,6 +85,7 @@ export class AgentResolver {}@Query(() => [AgentDTO])+ @UseGuards(AccessPolicyGuard(AGENT_RESOLVER_READ_ACCESS_POLICY))async findManyAgents(@AuthWorkspace(){ id: workspaceId, workspaceCustomApplicationId }: WorkspaceEntity,@@ -88,7 +108,10 @@ export class AgentResolver {}@Query(() => AgentDTO)- @UseGuards(ApplicationTargetGuard)+ @UseGuards(+ AccessPolicyGuard(AGENT_RESOLVER_READ_ACCESS_POLICY),+ ApplicationTargetGuard,+ )async findOneAgent(@ApplicationTargetArg<AgentIdInput>('input', {kind: 'applicationOwnedEntity',@@ -108,7 +131,7 @@ export class AgentResolver {}@Mutation(() => AgentDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS))+ @UseGuards(AccessPolicyGuard(AGENT_RESOLVER_WRITE_ACCESS_POLICY))async createOneAgent(@Args('input') input: CreateAgentInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -127,7 +150,7 @@ export class AgentResolver {@Mutation(() => AgentDTO)@UseGuards(- SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS),+ AccessPolicyGuard(AGENT_RESOLVER_WRITE_ACCESS_POLICY),ApplicationTargetGuard,)async updateOneAgent(@@ -154,7 +177,7 @@ export class AgentResolver {@Mutation(() => AgentDTO)@UseGuards(- SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS),+ AccessPolicyGuard(AGENT_RESOLVER_WRITE_ACCESS_POLICY),ApplicationTargetGuard,)async deleteOneAgent(diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-channel.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-channel.resolver.tsindex 6acb7f35d06..5c8f3570a51 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-channel.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-channel.resolver.ts@@ -19,8 +19,6 @@ import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decimport { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace-member-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { AgentChatChannelDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-channel.dto';import { AgentChatChannelRoleDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-channel-role.dto';import { AgentChatChannelSummaryDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-channel-summary.dto';@@ -39,9 +37,11 @@ import { PermissionsService } from 'src/engine/permissions/permissions.service';import { IS_CUSTOM_DEPRECATION_REASON } from 'src/engine/metadata-modules/utils/constants/is-custom-deprecation-reason.constant';import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';-@UseGuards(- AuthPrincipalGuard({+const AGENT_CHAT_CHANNEL_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {userSession: {standard: true,impersonated: true,@@ -51,9 +51,28 @@ import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/worapiKey: false,oauthClient: { withUser: true, withoutUser: false },application: { withUser: true, withoutUser: false },- }),- SettingsPermissionGuard(PermissionFlagType.AI),-)+ },+ requiredPermissionFlags: [PermissionFlagType.AI],+};++const AGENT_CHAT_CHANNEL_SETTINGS_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: false,+ oauthClient: { withUser: true, withoutUser: false },+ application: { withUser: true, withoutUser: false },+ },+ requiredPermissionFlags: [+ PermissionFlagType.AI,+ PermissionFlagType.AI_SETTINGS,+ ],+};+@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor,AiGraphqlApiExceptionInterceptor,@@ -80,6 +99,7 @@ export class AgentChatChannelResolver {}@Query(() => AgentChatChannelThreadIdsDTO)+ @UseGuards(AccessPolicyGuard(AGENT_CHAT_CHANNEL_ACCESS_POLICY))async agentChatChannelThreadIds(@Args('channelId', { type: () => UUIDScalarType }) channelId: string,@Args('status', {@@ -115,6 +135,7 @@ export class AgentChatChannelResolver {}@Query(() => [AgentChatChannelSummaryDTO])+ @UseGuards(AccessPolicyGuard(AGENT_CHAT_CHANNEL_ACCESS_POLICY))async agentChatChannelSummaries(@AuthWorkspaceMemberId() workspaceMemberId: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -126,6 +147,7 @@ export class AgentChatChannelResolver {}@Query(() => [AgentChatChannelDTO])+ @UseGuards(AccessPolicyGuard(AGENT_CHAT_CHANNEL_ACCESS_POLICY))async agentChatChannels(@AuthWorkspaceMemberId() workspaceMemberId: string,@AuthUserWorkspaceId() userWorkspaceId: string,@@ -150,7 +172,7 @@ export class AgentChatChannelResolver {}@Query(() => [AgentChatChannelRoleDTO])- @UseGuards(SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS))+ @UseGuards(AccessPolicyGuard(AGENT_CHAT_CHANNEL_SETTINGS_ACCESS_POLICY))async agentChatChannelRoles(@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<AgentChatChannelRoleDTO[]> {@@ -158,7 +180,7 @@ export class AgentChatChannelResolver {}@Mutation(() => AgentChatChannelDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS))+ @UseGuards(AccessPolicyGuard(AGENT_CHAT_CHANNEL_SETTINGS_ACCESS_POLICY))async createAgentChatChannel(@Args('input', { type: () => CreateAgentChatChannelInput })input: CreateAgentChatChannelInput,@@ -174,7 +196,7 @@ export class AgentChatChannelResolver {}@Mutation(() => AgentChatChannelDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS))+ @UseGuards(AccessPolicyGuard(AGENT_CHAT_CHANNEL_SETTINGS_ACCESS_POLICY))async updateAgentChatChannel(@Args('channelId', { type: () => UUIDScalarType }) channelId: string,@Args('input', { type: () => UpdateAgentChatChannelInput })@@ -195,7 +217,7 @@ export class AgentChatChannelResolver {}@Mutation(() => Boolean)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS))+ @UseGuards(AccessPolicyGuard(AGENT_CHAT_CHANNEL_SETTINGS_ACCESS_POLICY))async deleteAgentChatChannel(@Args('channelId', { type: () => UUIDScalarType }) channelId: string,@Args('destinationChannelId', {@@ -217,6 +239,7 @@ export class AgentChatChannelResolver {}@Mutation(() => Boolean)+ @UseGuards(AccessPolicyGuard(AGENT_CHAT_CHANNEL_ACCESS_POLICY))async moveAgentChatThreadToChannel(@Args('threadId', { type: () => UUIDScalarType }) threadId: string,@Args('channelId', { type: () => UUIDScalarType, nullable: true })@@ -235,6 +258,7 @@ export class AgentChatChannelResolver {}@Mutation(() => Boolean)+ @UseGuards(AccessPolicyGuard(AGENT_CHAT_CHANNEL_ACCESS_POLICY))async markAgentChatThreadAsDoneInChannel(@Args('threadId', { type: () => UUIDScalarType }) threadId: string,@AuthWorkspaceMemberId() workspaceMemberId: string,@@ -251,6 +275,7 @@ export class AgentChatChannelResolver {}@Mutation(() => Boolean)+ @UseGuards(AccessPolicyGuard(AGENT_CHAT_CHANNEL_ACCESS_POLICY))async snoozeAgentChatThreadInChannel(@Args('threadId', { type: () => UUIDScalarType }) threadId: string,@Args('snoozedUntil', { type: () => Date }) snoozedUntil: Date,@@ -268,6 +293,7 @@ export class AgentChatChannelResolver {}@Mutation(() => Boolean)+ @UseGuards(AccessPolicyGuard(AGENT_CHAT_CHANNEL_ACCESS_POLICY))async reopenAgentChatThreadInChannel(@Args('threadId', { type: () => UUIDScalarType }) threadId: string,@AuthWorkspaceMemberId() workspaceMemberId: string,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-history.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-history.resolver.tsindex ba86391fb41..0c39816101e 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-history.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-history.resolver.ts@@ -11,8 +11,6 @@ import { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flatimport { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace-member-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { AgentMessageDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message.dto';import { AgentChatConversationInput } from 'src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-conversation.input';import { ChatStreamCatchupChunksDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/chat-stream-catchup-chunks.dto';@@ -27,20 +25,23 @@ import { AgentTurnRecorderService } from 'src/engine/metadata-modules/ai/ai-histimport { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: false,+ oauthClient: { withUser: true, withoutUser: false },+ application: true,},- apiKey: false,- oauthClient: { withUser: true, withoutUser: false },- application: true,+ requiredPermissionFlags: [PermissionFlagType.AI],}),- SettingsPermissionGuard(PermissionFlagType.AI),)@UseInterceptors(AiGraphqlApiExceptionInterceptor)@UseFilters(AuthGraphqlApiExceptionFilter)diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-message-reaction.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-message-reaction.resolver.tsindex 0e37b898ab7..e6b886bd571 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-message-reaction.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-message-reaction.resolver.ts@@ -9,25 +9,26 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filtimport { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace-member-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { AgentMessageReactionSummaryDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message-reaction-summary.dto';import { AgentChatMessageReactionService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-message-reaction.service';import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: false,+ oauthClient: { withUser: true, withoutUser: false },+ application: { withUser: true, withoutUser: false },},- apiKey: false,- oauthClient: { withUser: true, withoutUser: false },- application: { withUser: true, withoutUser: false },+ requiredPermissionFlags: [PermissionFlagType.AI],}),- SettingsPermissionGuard(PermissionFlagType.AI),)@UseInterceptors(AiGraphqlApiExceptionInterceptor)@UseFilters(AuthGraphqlApiExceptionFilter)diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-subscription.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-subscription.resolver.tsindex 050a4826456..7961352cdc9 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-subscription.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-subscription.resolver.ts@@ -18,8 +18,6 @@ import { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flatimport { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace-member-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';import { AGENT_CHAT_KEEPALIVE_INTERVAL_MS } from 'src/engine/metadata-modules/ai/ai-chat/constants/agent-chat-keepalive-interval-ms.constant';import { AGENT_CHAT_STREAM_REAP_CHECK_INTERVAL_MS } from 'src/engine/metadata-modules/ai/ai-chat/constants/agent-chat-stream-reap-check-interval-ms.constant';@@ -30,6 +28,8 @@ import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/aimport { AgentChatStreamRecoveryService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-stream-recovery.service';import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';import { wrapAsyncIteratorWithLifecycle } from 'src/engine/subscriptions/utils/wrap-async-iterator-with-lifecycle';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';+type AgentChatEventPayload = {onAgentChatEvent: {threadId: string | null;@@ -39,16 +39,19 @@ type AgentChatEventPayload = {@MetadataResolver()@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: false,+ oauthClient: { withUser: true, withoutUser: false },+ application: true,},- apiKey: false,- oauthClient: { withUser: true, withoutUser: false },- application: true,+ requiredPermissionFlags: [PermissionFlagType.AI],}),)@UseInterceptors(AiGraphqlApiExceptionInterceptor)@@ -62,7 +65,6 @@ export class AgentChatSubscriptionResolver {) {}@Subscription(() => AgentChatEventDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.AI))async onAgentChatEvent(@Args() source: AgentChatEventInput,@AuthWorkspace()diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-thread-participant.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-thread-participant.resolver.tsindex 809249cbb25..af4c1829c03 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-thread-participant.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat-thread-participant.resolver.ts@@ -10,8 +10,6 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filtimport { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace-member-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { AgentChatOpenThreadsSummaryDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-open-threads-summary.dto';import { AgentChatThreadParticipantDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-thread-participant.dto';import { AgentChatInboxAction } from 'src/engine/metadata-modules/ai/ai-chat/enums/agent-chat-inbox-action.enum';@@ -23,20 +21,23 @@ import {AiExceptionCode,} from 'src/engine/metadata-modules/ai/ai.exception';import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: false,+ oauthClient: { withUser: true, withoutUser: false },+ application: { withUser: true, withoutUser: false },},- apiKey: false,- oauthClient: { withUser: true, withoutUser: false },- application: { withUser: true, withoutUser: false },+ requiredPermissionFlags: [PermissionFlagType.AI],}),- SettingsPermissionGuard(PermissionFlagType.AI),)@UseInterceptors(AiGraphqlApiExceptionInterceptor)@UseFilters(AuthGraphqlApiExceptionFilter)diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.tsindex 1e5c047a848..eef4e35b844 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts@@ -1,6 +1,5 @@import { AgentChatQueueService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-queue.service';import { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace-member-id.decorator';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { AgentChatThreadLifecycleService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service';import { AgentChatSharingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service';import { UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';@@ -24,7 +23,6 @@ import { toDisplayCredits } from 'src/engine/core-modules/usage/utils/to-displayimport { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { type BrowsingContextType } from 'src/engine/metadata-modules/ai/ai-agent/types/browsing-context.type';import { AgentChatThreadDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-thread.dto';import { FileAttachmentInput } from 'src/engine/metadata-modules/ai/ai-chat/dtos/file-attachment.input';@@ -48,20 +46,23 @@ import { UsageLimitGraphqlApiExceptionFilter } from 'src/engine/core-modules/usaimport { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: false,+ oauthClient: { withUser: true, withoutUser: false },+ application: { withUser: true, withoutUser: false },},- apiKey: false,- oauthClient: { withUser: true, withoutUser: false },- application: { withUser: true, withoutUser: false },+ requiredPermissionFlags: [PermissionFlagType.AI],}),- SettingsPermissionGuard(PermissionFlagType.AI),)@UseInterceptors(AiGraphqlApiExceptionInterceptor)@UseFilters(diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-inbox-thread.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-inbox-thread.resolver.tsindex 22b82bc920f..3c9acd57fda 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-inbox-thread.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-inbox-thread.resolver.ts@@ -16,27 +16,28 @@ import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-aimport { getWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';import { AuthenticationError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { InboxThreadRecordInputDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/inbox-thread-record.input';import { AgentChatThreadTargetService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-target.service';import { AgentInboxAccessService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-inbox-access.service';import { type AgentInboxCallerAuthContext } from 'src/engine/metadata-modules/ai/ai-chat/types/agent-inbox-caller-auth-context.type';import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: false,+ oauthClient: { withUser: true, withoutUser: false },+ application: true,},- apiKey: false,- oauthClient: { withUser: true, withoutUser: false },- application: { withUser: true, withoutUser: true },+ requiredPermissionFlags: [PermissionFlagType.AI],}),- SettingsPermissionGuard(PermissionFlagType.AI),)@UseInterceptors(AiGraphqlApiExceptionInterceptor)@UseFilters(AuthGraphqlApiExceptionFilter)diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-inbox.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-inbox.resolver.tsindex 6d287a1f5a5..1ca8ccd365f 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-inbox.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-inbox.resolver.ts@@ -15,22 +15,23 @@ import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/reimport { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flat-workspace.type';import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { SendInboxMessageResultDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/send-inbox-message-result.dto';import { SendInboxMessageInputDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/send-inbox-message.input';import { AgentInboxProposalService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-inbox-proposal.service';import { AgentInboxService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-inbox.service';import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: false,- apiKey: false,- oauthClient: false,- application: true,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: false,+ apiKey: false,+ oauthClient: false,+ application: true,+ },+ requiredPermissionFlags: [PermissionFlagType.AI],}),- SettingsPermissionGuard(PermissionFlagType.AI),)@UseInterceptors(AiGraphqlApiExceptionInterceptor)@UseFilters(AuthGraphqlApiExceptionFilter)diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/ai-chat-usage.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/ai-chat-usage.resolver.tsindex 842402e7f6e..310c1af60d5 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/ai-chat-usage.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/ai-chat-usage.resolver.ts@@ -13,23 +13,24 @@ import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resimport { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@MetadataResolver(() => AiChatUsageDTO)@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,},- apiKey: true,- oauthClient: true,- application: true,+ requiredPermissionFlags: [PermissionFlagType.AI],}),- SettingsPermissionGuard(PermissionFlagType.AI),)@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)export class AiChatUsageResolver {diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/workspace-setup-chat.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/workspace-setup-chat.resolver.tsindex b99f27aa095..d7a1eb5b52a 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/workspace-setup-chat.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/workspace-setup-chat.resolver.ts@@ -19,25 +19,26 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspacimport { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { StartWorkspaceSetupChatResultDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/start-workspace-setup-chat-result.dto';import { WorkspaceSetupChatService } from 'src/engine/metadata-modules/ai/ai-chat/services/workspace-setup-chat.service';import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: false,+ oauthClient: { withUser: true, withoutUser: false },+ application: { withUser: true, withoutUser: false },},- apiKey: false,- oauthClient: { withUser: true, withoutUser: false },- application: { withUser: true, withoutUser: false },+ requiredPermissionFlags: [PermissionFlagType.AI],}),- SettingsPermissionGuard(PermissionFlagType.AI),)@UseInterceptors(AiGraphqlApiExceptionInterceptor)@MetadataResolver()diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/ai-front-component.controller.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/ai-front-component.controller.tsindex c6698e3d9e9..4f58c0797f6 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/ai-front-component.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-front-component/ai-front-component.controller.ts@@ -23,19 +23,14 @@ import { getWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/woimport { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { AiFrontComponentService } from 'src/engine/metadata-modules/ai/ai-front-component/ai-front-component.service';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@Controller(`${ApiPath.Rest}/ai-front-components`)@UseFilters(ApplicationRestApiExceptionFilter)-export class AiFrontComponentController {- constructor(private readonly components: AiFrontComponentService) {}-- @Get('drafts/:draftId')- @Header('Cache-Control', 'no-store')- @UseGuards(- AuthPrincipalGuard({+@UseGuards(+ AccessPolicyGuard({+ authPrincipals: {userSession: {standard: true,impersonated: true,@@ -45,9 +40,15 @@ export class AiFrontComponentController {apiKey: false,oauthClient: false,application: false,- }),- NoPermissionGuard,- )+ },+ requiredPermissionFlags: [],+ }),+)+export class AiFrontComponentController {+ constructor(private readonly components: AiFrontComponentService) {}++ @Get('drafts/:draftId')+ @Header('Cache-Control', 'no-store')getPreview(@Param('draftId', ParseUUIDPipe) draftId: string,@AuthUserWorkspaceId() userWorkspaceId: string,@@ -60,20 +61,6 @@ export class AiFrontComponentController {}@Post('drafts/:draftId/preview-error')- @UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: false,- workspaceAgnostic: false,- },- apiKey: false,- oauthClient: false,- application: false,- }),- NoPermissionGuard,- )reportPreviewError(@Param('draftId', ParseUUIDPipe) draftId: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-generate-text/controllers/ai-generate-text.controller.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-generate-text/controllers/ai-generate-text.controller.tsindex 6e090309486..0851bbf179f 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-generate-text/controllers/ai-generate-text.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-generate-text/controllers/ai-generate-text.controller.ts@@ -21,8 +21,6 @@ import type { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspacimport { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { JwtAuthGuard } from 'src/engine/guards/jwt-auth.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import {AiException,AiExceptionCode,@@ -38,20 +36,24 @@ import { withDedicatedAiTrace } from 'src/engine/metadata-modules/ai/ai-models/uimport { PermissionsRestApiExceptionFilter } from 'src/engine/permissions/utils/permissions-rest-api-exception.filter';import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';import { AUTO_SELECT_MODEL_ID_BY_TIER } from 'twenty-shared/ai';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@Controller(`${ApiPath.Rest}/ai`)@UseGuards(JwtAuthGuard,- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,},- apiKey: true,- oauthClient: true,- application: true,+ requiredPermissionFlags: [PermissionFlagType.AI],}),)@UseFilters(@@ -71,7 +73,6 @@ export class AiGenerateTextController {// deprecated: use the `generate` GraphQL mutation, or ai.generate in a logic function@Post('generate-text')@Header('Deprecation', AI_GENERATE_TEXT_DEPRECATION_HEADER_VALUE)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.AI))async handleGenerateText(@Body() body: GenerateTextInput,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/resolvers/tool-call-answer.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/resolvers/tool-call-answer.resolver.tsindex 9606ba9a9bd..c7574c2c3e9 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/resolvers/tool-call-answer.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/resolvers/tool-call-answer.resolver.ts@@ -18,7 +18,6 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspacimport { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace-member-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';import { tagAiChatStreamScope } from 'src/engine/metadata-modules/ai/ai-chat/utils/tag-ai-chat-stream-scope.util';import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';@@ -26,21 +25,25 @@ import { AnswerToolCallResultDTO } from 'src/engine/metadata-modules/ai/ai-tool-import { AnswerToolCallInput } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/dtos/answer-tool-call.input';import { ToolCallAnswerService } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service';import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/permissions/utils/permissions-graphql-api-exception.filter';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';// permission depends on whether the call waits in a chat or on a caller such as a workflow run, so no class guard@CoreResolver()@UsePipes(ResolverValidationPipe)@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: false,+ oauthClient: { withUser: true, withoutUser: false },+ application: { withUser: true, withoutUser: false },},- apiKey: false,- oauthClient: { withUser: true, withoutUser: false },- application: { withUser: true, withoutUser: false },+ requiredPermissionFlags: [],}),)@UseInterceptors(AiGraphqlApiExceptionInterceptor)diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/resolvers/ai-workspace-stats.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/resolvers/ai-workspace-stats.resolver.tsindex 296cdb22a6a..abfb3794579 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/resolvers/ai-workspace-stats.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-workspace-stats/resolvers/ai-workspace-stats.resolver.ts@@ -7,24 +7,25 @@ import { PermissionFlagType } from 'twenty-shared/constants';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { WorkspaceAiStatsDTO } from 'src/engine/metadata-modules/ai/ai-workspace-stats/dtos/workspace-ai-stats.dto';import { AiWorkspaceStatsService } from 'src/engine/metadata-modules/ai/ai-workspace-stats/services/ai-workspace-stats.service';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,},- apiKey: true,- oauthClient: true,- application: true,+ requiredPermissionFlags: [PermissionFlagType.AI_SETTINGS],}),- SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS),)@MetadataResolver()export class AiWorkspaceStatsResolver {diff --git a/packages/twenty-server/src/engine/metadata-modules/calendar-channel/resolvers/calendar-channel.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/calendar-channel/resolvers/calendar-channel.resolver.tsindex 9bf2d5a36ff..537296d4ff4 100644--- a/packages/twenty-server/src/engine/metadata-modules/calendar-channel/resolvers/calendar-channel.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/calendar-channel/resolvers/calendar-channel.resolver.ts@@ -10,26 +10,28 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entimport { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { CalendarChannelMetadataService } from 'src/engine/metadata-modules/calendar-channel/calendar-channel-metadata.service';import { CalendarChannelDTO } from 'src/engine/metadata-modules/calendar-channel/dtos/calendar-channel.dto';import { UpdateCalendarChannelInput } from 'src/engine/metadata-modules/calendar-channel/dtos/update-calendar-channel.input';import { CalendarChannelGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/calendar-channel/interceptors/calendar-channel-graphql-api-exception.interceptor';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';import { CalendarChannelSyncStatusService } from 'src/modules/calendar/common/services/calendar-channel-sync-status.service';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,},- apiKey: true,- oauthClient: true,- application: true,+ requiredPermissionFlags: [],}),)@UseInterceptors(CalendarChannelGraphqlApiExceptionInterceptor)@@ -42,7 +44,6 @@ export class CalendarChannelResolver {) {}@Query(() => [CalendarChannelDTO])- @UseGuards(NoPermissionGuard)@AllowSuspendedWorkspace()async myCalendarChannels(@AuthWorkspace() workspace: WorkspaceEntity,@@ -70,7 +71,6 @@ export class CalendarChannelResolver {}@Mutation(() => CalendarChannelDTO)- @UseGuards(NoPermissionGuard)async updateCalendarChannel(@Args('input') input: UpdateCalendarChannelInput,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.resolver.tsindex 1096dbb3b63..7dade8fe11f 100644--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.resolver.ts@@ -20,9 +20,6 @@ import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspimport { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { CommandMenuItemService } from 'src/engine/metadata-modules/command-menu-item/command-menu-item.service';import { CommandMenuItemDTO } from 'src/engine/metadata-modules/command-menu-item/dtos/command-menu-item.dto';import { CreateCommandMenuItemInput } from 'src/engine/metadata-modules/command-menu-item/dtos/create-command-menu-item.input';@@ -32,9 +29,11 @@ import { FrontComponentDTO } from 'src/engine/metadata-modules/front-component/dimport { FrontComponentService } from 'src/engine/metadata-modules/front-component/front-component.service';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';-@UseGuards(- AuthPrincipalGuard({+const COMMAND_MENU_ITEM_READ_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {userSession: {standard: true,impersonated: true,@@ -44,8 +43,25 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filtapiKey: true,oauthClient: true,application: true,- }),-)+ },+ requiredPermissionFlags: [],+};++const COMMAND_MENU_ITEM_WRITE_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [PermissionFlagType.LAYOUTS],+};+@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor,CommandMenuItemGraphqlApiExceptionInterceptor,@@ -125,7 +141,7 @@ export class CommandMenuItemResolver {}@Query(() => [CommandMenuItemDTO])- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(COMMAND_MENU_ITEM_READ_ACCESS_POLICY))@AllowSuspendedWorkspace()async commandMenuItems(@AuthUserWorkspaceId({ allowUndefined: true })@@ -140,7 +156,7 @@ export class CommandMenuItemResolver {}@Query(() => CommandMenuItemDTO, { nullable: true })- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(COMMAND_MENU_ITEM_READ_ACCESS_POLICY))async commandMenuItem(@Args('id', { type: () => UUIDScalarType }) id: string,@AuthUserWorkspaceId({ allowUndefined: true })@@ -167,7 +183,7 @@ export class CommandMenuItemResolver {}@Mutation(() => CommandMenuItemDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(COMMAND_MENU_ITEM_WRITE_ACCESS_POLICY))async createCommandMenuItem(@Args('input') input: CreateCommandMenuItemInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -176,7 +192,7 @@ export class CommandMenuItemResolver {}@Mutation(() => CommandMenuItemDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(COMMAND_MENU_ITEM_WRITE_ACCESS_POLICY))async updateCommandMenuItem(@Args('input') input: UpdateCommandMenuItemInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -185,7 +201,7 @@ export class CommandMenuItemResolver {}@Mutation(() => CommandMenuItemDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(COMMAND_MENU_ITEM_WRITE_ACCESS_POLICY))async resetCommandMenuItem(@Args('id', { type: () => UUIDScalarType }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -194,7 +210,7 @@ export class CommandMenuItemResolver {}@Mutation(() => CommandMenuItemDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(COMMAND_MENU_ITEM_WRITE_ACCESS_POLICY))async deleteCommandMenuItem(@Args('id', { type: () => UUIDScalarType }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver.tsindex 47b30e919c6..9f9d64bf9ff 100644--- a/packages/twenty-server/src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver.ts@@ -14,9 +14,6 @@ import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspimport { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { ConnectedAccountMetadataService } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.service';import { ApplicationConnectedAccountDTO } from 'src/engine/metadata-modules/connected-account/dtos/application-connected-account.dto';import { ConnectedAccountPublicDTO } from 'src/engine/metadata-modules/connected-account/dtos/connected-account-public.dto';@@ -25,9 +22,11 @@ import { ConnectedAccountGraphqlApiExceptionInterceptor } from 'src/engine/metadimport { buildPublicConnectedAccount } from 'src/engine/metadata-modules/connected-account/utils/build-public-connected-account.util';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';import { ApplicationTargetGuard } from 'src/engine/guards/application-target.guard';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';-@UseGuards(- AuthPrincipalGuard({+const CONNECTED_ACCOUNT_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {userSession: {standard: true,impersonated: true,@@ -37,8 +36,10 @@ import { ApplicationTargetGuard } from 'src/engine/guards/application-target.guaapiKey: true,oauthClient: true,application: true,- }),-)+ },+ requiredPermissionFlags: [],+};+@UseInterceptors(ConnectedAccountGraphqlApiExceptionInterceptor)@MetadataResolver(() => ConnectedAccountDTO)@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)@@ -48,7 +49,7 @@ export class ConnectedAccountResolver {) {}@Query(() => [ConnectedAccountPublicDTO])- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(CONNECTED_ACCOUNT_ACCESS_POLICY))@AllowSuspendedWorkspace()async myConnectedAccounts(@AuthWorkspace() workspace: WorkspaceEntity,@@ -65,7 +66,20 @@ export class ConnectedAccountResolver {@Query(() => [ApplicationConnectedAccountDTO])@UseGuards(- SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [PermissionFlagType.APPLICATIONS],+ }),ApplicationTargetGuard,)async applicationConnectedAccounts(@@ -94,7 +108,10 @@ export class ConnectedAccountResolver {}@Mutation(() => ConnectedAccountPublicDTO)- @UseGuards(CustomPermissionGuard)+ @UseGuards(+ AccessPolicyGuard(CONNECTED_ACCOUNT_ACCESS_POLICY),+ CustomPermissionGuard,+ )async deleteConnectedAccount(@Args('id', { type: () => UUIDScalarType }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -118,7 +135,10 @@ export class ConnectedAccountResolver {}@Mutation(() => ConnectedAccountPublicDTO)- @UseGuards(CustomPermissionGuard)+ @UseGuards(+ AccessPolicyGuard(CONNECTED_ACCOUNT_ACCESS_POLICY),+ CustomPermissionGuard,+ )async disconnectConnectedAccount(@Args('id', { type: () => UUIDScalarType }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller.tsindex 28e3cef1887..8f1f9780828 100644--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller.ts@@ -14,8 +14,6 @@ import {UsePipes,ValidationPipe,} from '@nestjs/common';--import { PermissionFlagType } from 'twenty-shared/constants';import { ApiPath, FeatureFlagKey } from 'twenty-shared/types';import { type RestCursorPageInfo } from 'src/engine/api/rest/metadata/types/rest-cursor-page-info.type';@@ -26,8 +24,6 @@ import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/serviceimport { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { JwtAuthGuard } from 'src/engine/guards/jwt-auth.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { DerivedFieldMetadataIdsService } from 'src/engine/metadata-modules/derived-field-metadata-ids/services/derived-field-metadata-ids.service';import { type DerivedFieldMetadataIds } from 'src/engine/metadata-modules/derived-field-metadata-ids/types/derived-field-metadata-ids.type';import { CreateFieldInput } from 'src/engine/metadata-modules/field-metadata/dtos/create-field.input';@@ -57,23 +53,12 @@ import { PermissionsRestApiExceptionFilter } from 'src/engine/permissions/utils/import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';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 { FIELD_METADATA_READ_ACCESS_POLICY } from 'src/engine/metadata-modules/field-metadata/constants/field-metadata-read-access-policy.constant';+import { FIELD_METADATA_WRITE_ACCESS_POLICY } from 'src/engine/metadata-modules/field-metadata/constants/field-metadata-write-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@Controller(`${ApiPath.Rest}/metadata/fields`)-@UseGuards(- JwtAuthGuard,- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),- SettingsPermissionGuard(PermissionFlagType.DATA_MODEL),-)+@UseGuards(JwtAuthGuard)@UseFilters(PermissionsRestApiExceptionFilter,FieldMetadataRestApiExceptionFilter,@@ -120,6 +105,7 @@ export class FieldMetadataController {}@Get()+ @UseGuards(AccessPolicyGuard(FIELD_METADATA_READ_ACCESS_POLICY))async findMany(@Req() request: AuthenticatedRequest,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -155,6 +141,7 @@ export class FieldMetadataController {}@Get(':id')+ @UseGuards(AccessPolicyGuard(FIELD_METADATA_READ_ACCESS_POLICY))async findOne(@Param('id', new ParseUUIDPipe()) id: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -186,6 +173,7 @@ export class FieldMetadataController {}@Post()+ @UseGuards(AccessPolicyGuard(FIELD_METADATA_WRITE_ACCESS_POLICY))async createOne(@Body() input: CreateFieldInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -203,6 +191,7 @@ export class FieldMetadataController {}@Patch(':id')+ @UseGuards(AccessPolicyGuard(FIELD_METADATA_WRITE_ACCESS_POLICY))async updateOnePatch(@Param('id', new ParseUUIDPipe()) id: string,@Body() update: UpdateFieldInput,@@ -212,6 +201,7 @@ export class FieldMetadataController {}@Put(':id')+ @UseGuards(AccessPolicyGuard(FIELD_METADATA_WRITE_ACCESS_POLICY))async updateOnePut(@Param('id', new ParseUUIDPipe()) id: string,@Body() update: UpdateFieldInput,@@ -221,6 +211,7 @@ export class FieldMetadataController {}@Delete(':id')+ @UseGuards(AccessPolicyGuard(FIELD_METADATA_WRITE_ACCESS_POLICY))async deleteOne(@Param('id', new ParseUUIDPipe()) id: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.tsindex 7a16c3a7100..ef79f6fb7bf 100644--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts@@ -7,8 +7,6 @@ import {Query,ResolveField,} from '@nestjs/graphql';--import { PermissionFlagType } from 'twenty-shared/constants';import { isDefined } from 'twenty-shared/utils';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';@@ -23,9 +21,6 @@ import { I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.typimport { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { DerivedFieldMetadataIdsService } from 'src/engine/metadata-modules/derived-field-metadata-ids/services/derived-field-metadata-ids.service';import { CreateOneFieldMetadataInput } from 'src/engine/metadata-modules/field-metadata/dtos/create-field.input';import { DeleteOneFieldInput } from 'src/engine/metadata-modules/field-metadata/dtos/delete-field.input';@@ -53,15 +48,12 @@ import { ApplicationTranslationCatalogService } from 'src/engine/metadata-moduleimport { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';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 { FIELD_METADATA_WRITE_ACCESS_POLICY } from 'src/engine/metadata-modules/field-metadata/constants/field-metadata-write-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';-// structural type so ResolverValidationPipe skips FieldMetadataDTO decorators on loaded parents-type FieldMetadataStandardOverrideParent = Pick<- FieldMetadataDTO,- 'label' | 'description' | 'icon' | 'overrides' | 'applicationId'->;--@UseGuards(- AuthPrincipalGuard({+const FIELD_METADATA_RESOLVER_READ_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {userSession: {standard: true,impersonated: true,@@ -71,8 +63,16 @@ type FieldMetadataStandardOverrideParent = Pick<apiKey: true,oauthClient: true,application: true,- }),-)+ },+ requiredPermissionFlags: [],+};++// structural type so ResolverValidationPipe skips FieldMetadataDTO decorators on loaded parents+type FieldMetadataStandardOverrideParent = Pick<+ FieldMetadataDTO,+ 'label' | 'description' | 'icon' | 'overrides' | 'applicationId'+>;+@UsePipes(ResolverValidationPipe)@MetadataResolver(() => FieldMetadataDTO)@UseFilters(@@ -89,7 +89,7 @@ export class FieldMetadataResolver {private readonly derivedFieldMetadataIdsService: DerivedFieldMetadataIdsService,) {}- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(FIELD_METADATA_RESOLVER_READ_ACCESS_POLICY))@Query(() => FieldConnectionDTO)async fields(@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -137,7 +137,7 @@ export class FieldMetadataResolver {};}- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(FIELD_METADATA_RESOLVER_READ_ACCESS_POLICY))@Query(() => FieldMetadataDTO)async field(@Args('id', {@@ -255,7 +255,7 @@ export class FieldMetadataResolver {);}- @UseGuards(SettingsPermissionGuard(PermissionFlagType.DATA_MODEL))+ @UseGuards(AccessPolicyGuard(FIELD_METADATA_WRITE_ACCESS_POLICY))@Mutation(() => FieldMetadataDTO)async createOneField(@Args('input') input: CreateOneFieldMetadataInput,@@ -273,7 +273,7 @@ export class FieldMetadataResolver {}}- @UseGuards(SettingsPermissionGuard(PermissionFlagType.DATA_MODEL))+ @UseGuards(AccessPolicyGuard(FIELD_METADATA_WRITE_ACCESS_POLICY))@Mutation(() => FieldMetadataDTO)async updateOneField(@Args('input') input: UpdateOneFieldMetadataInput,@@ -291,7 +291,7 @@ export class FieldMetadataResolver {}}- @UseGuards(SettingsPermissionGuard(PermissionFlagType.DATA_MODEL))+ @UseGuards(AccessPolicyGuard(FIELD_METADATA_WRITE_ACCESS_POLICY))@Mutation(() => FieldMetadataDTO)async deleteOneField(@Args('input') deleteOneFieldInput: DeleteOneFieldInput,diff --git a/packages/twenty-server/src/engine/metadata-modules/front-component/constants/front-component-read-access-policy.constant.ts b/packages/twenty-server/src/engine/metadata-modules/front-component/constants/front-component-read-access-policy.constant.tsnew file mode 100644index 00000000000..0b8412e3f52--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/front-component/constants/front-component-read-access-policy.constant.ts@@ -0,0 +1,16 @@+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';++export const FRONT_COMPONENT_READ_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [],+};diff --git a/packages/twenty-server/src/engine/metadata-modules/front-component/controllers/front-component.controller.ts b/packages/twenty-server/src/engine/metadata-modules/front-component/controllers/front-component.controller.tsindex e3b2c140f67..158b4605777 100644--- a/packages/twenty-server/src/engine/metadata-modules/front-component/controllers/front-component.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/front-component/controllers/front-component.controller.ts@@ -24,8 +24,6 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entimport { ApplicationTargetParam } from 'src/engine/decorators/auth/application-target-param.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { FlatEntityMapsRestApiExceptionFilter } from 'src/engine/metadata-modules/flat-entity/filters/flat-entity-maps-rest-api-exception.filter';import { FrontComponentRestApiExceptionFilter } from 'src/engine/metadata-modules/front-component/filters/front-component-rest-api-exception.filter';import {@@ -36,22 +34,12 @@ import { FrontComponentService } from 'src/engine/metadata-modules/front-componeimport { PermissionsRestApiExceptionFilter } from 'src/engine/permissions/utils/permissions-rest-api-exception.filter';import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';import { ApplicationTargetGuard } from 'src/engine/guards/application-target.guard';+import { FRONT_COMPONENT_READ_ACCESS_POLICY } from 'src/engine/metadata-modules/front-component/constants/front-component-read-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@Controller(`${ApiPath.Rest}/front-components`)@AllowSuspendedWorkspace()-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)+@UseGuards(AccessPolicyGuard(FRONT_COMPONENT_READ_ACCESS_POLICY))@UseFilters(PermissionsRestApiExceptionFilter,ApplicationRestApiExceptionFilter,@@ -65,7 +53,7 @@ export class FrontComponentController {constructor(private readonly frontComponentService: FrontComponentService) {}@Get([':frontComponentId', ':frontComponentId/:cacheKey'])- @UseGuards(NoPermissionGuard, ApplicationTargetGuard)+ @UseGuards(ApplicationTargetGuard)async getBuiltJs(@Res() res: Response,@ApplicationTargetParam('frontComponentId', {diff --git a/packages/twenty-server/src/engine/metadata-modules/front-component/front-component.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/front-component/front-component.resolver.tsindex f4b87ea04f0..c2ad9214a63 100644--- a/packages/twenty-server/src/engine/metadata-modules/front-component/front-component.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/front-component/front-component.resolver.ts@@ -34,9 +34,6 @@ import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspimport { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { fromFlatFrontComponentToFrontComponentDto } from 'src/engine/metadata-modules/flat-front-component/utils/from-flat-front-component-to-front-component-dto.util';import { CreateFrontComponentInput } from 'src/engine/metadata-modules/front-component/dtos/create-front-component.input';import { FrontComponentDTO } from 'src/engine/metadata-modules/front-component/dtos/front-component.dto';@@ -45,9 +42,27 @@ import { FrontComponentService } from 'src/engine/metadata-modules/front-componeimport { FrontComponentGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/front-component/interceptors/front-component-graphql-api-exception.interceptor';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';+import { FRONT_COMPONENT_READ_ACCESS_POLICY } from 'src/engine/metadata-modules/front-component/constants/front-component-read-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';-@UseGuards(- AuthPrincipalGuard({+const FRONT_COMPONENT_USER_SESSION_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: false,+ workspaceAgnostic: false,+ },+ apiKey: false,+ oauthClient: false,+ application: false,+ },+ requiredPermissionFlags: [],+};++const FRONT_COMPONENT_WRITE_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {userSession: {standard: true,impersonated: true,@@ -56,9 +71,11 @@ import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/wor},apiKey: true,oauthClient: true,- application: true,- }),-)+ application: false,+ },+ requiredPermissionFlags: [PermissionFlagType.APPLICATIONS],+};+@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor,FrontComponentGraphqlApiExceptionInterceptor,@@ -142,7 +159,7 @@ export class FrontComponentResolver {}@Query(() => [FrontComponentDTO])- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(FRONT_COMPONENT_READ_ACCESS_POLICY))@AllowSuspendedWorkspace()async frontComponents(@AuthWorkspace() workspace: WorkspaceEntity,@@ -164,20 +181,7 @@ export class FrontComponentResolver {}@Query(() => FrontComponentDTO, { nullable: true })- @UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: false,- workspaceAgnostic: false,- },- apiKey: false,- oauthClient: false,- application: false,- }),- NoPermissionGuard,- )+ @UseGuards(AccessPolicyGuard(FRONT_COMPONENT_USER_SESSION_ACCESS_POLICY))async frontComponent(@Args('id', { type: () => UUIDScalarType }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -219,20 +223,7 @@ export class FrontComponentResolver {}@Mutation(() => ApplicationTokenPairDTO)- @UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: false,- workspaceAgnostic: false,- },- apiKey: false,- oauthClient: false,- application: false,- }),- NoPermissionGuard,- )+ @UseGuards(AccessPolicyGuard(FRONT_COMPONENT_USER_SESSION_ACCESS_POLICY))@UseFilters(ApplicationExceptionFilter)async generateFrontComponentApplicationTokenPair(@Args('applicationId', { type: () => UUIDScalarType })@@ -250,20 +241,7 @@ export class FrontComponentResolver {}@Mutation(() => FrontComponentDTO)- @UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: false,- }),- SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),- )+ @UseGuards(AccessPolicyGuard(FRONT_COMPONENT_WRITE_ACCESS_POLICY))async createFrontComponent(@Args('input') input: CreateFrontComponentInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -277,20 +255,7 @@ export class FrontComponentResolver {}@Mutation(() => FrontComponentDTO)- @UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: false,- }),- SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),- )+ @UseGuards(AccessPolicyGuard(FRONT_COMPONENT_WRITE_ACCESS_POLICY))async updateFrontComponent(@Args('input') input: UpdateFrontComponentInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -305,20 +270,7 @@ export class FrontComponentResolver {}@Mutation(() => FrontComponentDTO)- @UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: false,- }),- SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),- )+ @UseGuards(AccessPolicyGuard(FRONT_COMPONENT_WRITE_ACCESS_POLICY))async deleteFrontComponent(@Args('id', { type: () => UUIDScalarType }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.resolver.tsindex 316c494e1ea..d4024bf8641 100644--- a/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.resolver.ts@@ -10,8 +10,6 @@ import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/reimport { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { fromFlatIndexMetadataToIndexMetadataDto } from 'src/engine/metadata-modules/flat-index-metadata/utils/from-flat-index-metadata-to-index-metadata-dto.util';import { CreateOneIndexInput } from 'src/engine/metadata-modules/index-metadata/dtos/create-one-index.input';import { DeleteOneIndexInput } from 'src/engine/metadata-modules/index-metadata/dtos/delete-index.input';@@ -23,18 +21,22 @@ import { indexMetadataGraphqlApiExceptionHandler } from 'src/engine/metadata-modimport { objectMetadataGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/object-metadata/utils/object-metadata-graphql-api-exception-handler.util';import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/permissions/utils/permissions-graphql-api-exception.filter';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,},- apiKey: true,- oauthClient: true,- application: true,+ requiredPermissionFlags: [PermissionFlagType.DATA_MODEL],}),)@MetadataResolver(() => IndexMetadataDTO)@@ -83,7 +85,6 @@ export class IndexMetadataResolver {}}- @UseGuards(SettingsPermissionGuard(PermissionFlagType.DATA_MODEL))@Mutation(() => IndexMetadataDTO)async createOneIndex(@Args('input') input: CreateOneIndexInput,@@ -101,7 +102,6 @@ export class IndexMetadataResolver {}}- @UseGuards(SettingsPermissionGuard(PermissionFlagType.DATA_MODEL))@Mutation(() => IndexMetadataDTO)async deleteOneIndex(@Args('input') input: DeleteOneIndexInput,diff --git a/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.resolver.tsindex 4f1820fb410..d0c7f2b3140 100644--- a/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.resolver.ts@@ -33,9 +33,6 @@ import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';import { CreateLogicFunctionFromSourceInput } from 'src/engine/metadata-modules/logic-function/dtos/create-logic-function-from-source.input';import { ExecuteOneLogicFunctionInput } from 'src/engine/metadata-modules/logic-function/dtos/execute-logic-function.input';@@ -58,9 +55,11 @@ import { wrapAsyncIteratorWithLifecycle } from 'src/engine/subscriptions/utils/wimport { EventLogLiveService } from 'src/engine/core-modules/event-logs/live/event-log-live.service';import { ApplicationTargetGuard } from 'src/engine/guards/application-target.guard';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';-@UseGuards(- AuthPrincipalGuard({+const LOGIC_FUNCTION_READ_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {userSession: {standard: true,impersonated: true,@@ -70,9 +69,40 @@ import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/worapiKey: true,oauthClient: true,application: true,- }),- NoPermissionGuard,-)+ },+ requiredPermissionFlags: [],+};++const LOGIC_FUNCTION_WORKFLOWS_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [PermissionFlagType.WORKFLOWS],+};++const LOGIC_FUNCTION_WRITE_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: false,+ },+ requiredPermissionFlags: [PermissionFlagType.WORKFLOWS],+};+@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)@MetadataResolver(() => LogicFunctionDTO)@UsePipes(ResolverValidationPipe)@@ -92,7 +122,10 @@ export class LogicFunctionResolver {) {}@Query(() => LogicFunctionDTO)- @UseGuards(ApplicationTargetGuard)+ @UseGuards(+ AccessPolicyGuard(LOGIC_FUNCTION_READ_ACCESS_POLICY),+ ApplicationTargetGuard,+ )async findOneLogicFunction(@ApplicationTargetArg<LogicFunctionIdInput>('input', {kind: 'applicationOwnedEntity',@@ -124,6 +157,7 @@ export class LogicFunctionResolver {}@Query(() => [LogicFunctionDTO])+ @UseGuards(AccessPolicyGuard(LOGIC_FUNCTION_READ_ACCESS_POLICY))@AllowSuspendedWorkspace()async findManyLogicFunctions(@AuthWorkspace()@@ -175,7 +209,7 @@ export class LogicFunctionResolver {}@Query(() => graphqlTypeJson)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.WORKFLOWS))+ @UseGuards(AccessPolicyGuard(LOGIC_FUNCTION_WORKFLOWS_ACCESS_POLICY))async getAvailablePackages(@Args('input') { id }: LogicFunctionIdInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -214,20 +248,7 @@ export class LogicFunctionResolver {}@Mutation(() => LogicFunctionDTO)- @UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: false,- }),- SettingsPermissionGuard(PermissionFlagType.WORKFLOWS),- )+ @UseGuards(AccessPolicyGuard(LOGIC_FUNCTION_WRITE_ACCESS_POLICY))async deleteOneLogicFunction(@Args('input') { id }: LogicFunctionIdInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -247,20 +268,7 @@ export class LogicFunctionResolver {}@Mutation(() => LogicFunctionDTO)- @UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: false,- }),- SettingsPermissionGuard(PermissionFlagType.WORKFLOWS),- )+ @UseGuards(AccessPolicyGuard(LOGIC_FUNCTION_WRITE_ACCESS_POLICY))async createOneLogicFunction(@Args('input') input: CreateLogicFunctionFromSourceInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -277,7 +285,7 @@ export class LogicFunctionResolver {@Mutation(() => LogicFunctionExecutionResultDTO)@UseGuards(- SettingsPermissionGuard(PermissionFlagType.WORKFLOWS),+ AccessPolicyGuard(LOGIC_FUNCTION_WORKFLOWS_ACCESS_POLICY),ApplicationTargetGuard,)async executeOneLogicFunction(@@ -307,7 +315,7 @@ export class LogicFunctionResolver {@Query(() => String, { nullable: true })@UseGuards(- SettingsPermissionGuard(PermissionFlagType.WORKFLOWS),+ AccessPolicyGuard(LOGIC_FUNCTION_WORKFLOWS_ACCESS_POLICY),ApplicationTargetGuard,)async getLogicFunctionSourceCode(@@ -332,7 +340,7 @@ export class LogicFunctionResolver {@Mutation(() => Boolean)@UseGuards(- SettingsPermissionGuard(PermissionFlagType.WORKFLOWS),+ AccessPolicyGuard(LOGIC_FUNCTION_WORKFLOWS_ACCESS_POLICY),ApplicationTargetGuard,)async updateOneLogicFunction(@@ -391,7 +399,7 @@ export class LogicFunctionResolver {);},})- @UseGuards(SettingsPermissionGuard(PermissionFlagType.WORKFLOWS))+ @UseGuards(AccessPolicyGuard(LOGIC_FUNCTION_WORKFLOWS_ACCESS_POLICY))async logicFunctionLogs(@Args('input') _: LogicFunctionLogsInput,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/mcp-server/mcp-server.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/mcp-server/mcp-server.resolver.tsindex 21953f5f8cc..3c5b68b6641 100644--- a/packages/twenty-server/src/engine/metadata-modules/mcp-server/mcp-server.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/mcp-server/mcp-server.resolver.ts@@ -9,30 +9,30 @@ import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';-import { FeatureFlagGuard } from 'src/engine/guards/feature-flag.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { CreateMcpServerInput } from 'src/engine/metadata-modules/mcp-server/dtos/create-mcp-server.input';import { McpServerDTO } from 'src/engine/metadata-modules/mcp-server/dtos/mcp-server.dto';import { UpdateMcpServerInput } from 'src/engine/metadata-modules/mcp-server/dtos/update-mcp-server.input';import { McpServerGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/mcp-server/interceptors/mcp-server-graphql-api-exception.interceptor';import { McpServerService } from 'src/engine/metadata-modules/mcp-server/mcp-server.service';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,},- apiKey: true,- oauthClient: true,- application: true,+ requiredPermissionFlags: [PermissionFlagType.API_KEYS_AND_WEBHOOKS],+ requiredFeatureFlags: [FeatureFlagKey.IS_MCP_SERVERS_ENABLED],}),- FeatureFlagGuard(FeatureFlagKey.IS_MCP_SERVERS_ENABLED),- SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),)@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor,diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/application-message-channels.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/application-message-channels.resolver.tsindex d2bf6959a49..e7b57633ad3 100644--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/application-message-channels.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/application-message-channels.resolver.ts@@ -13,8 +13,6 @@ import { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flatimport { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';import { CreateAppMessageChannelInput } from 'src/engine/metadata-modules/message-channel/dtos/create-app-message-channel.input';import { ListAppMessageChannelsInput } from 'src/engine/metadata-modules/message-channel/dtos/list-app-message-channels.input';@@ -23,15 +21,18 @@ import { UpdateAppMessageChannelInput } from 'src/engine/metadata-modules/messagimport { MessageChannelGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/message-channel/interceptors/message-channel-graphql-api-exception.interceptor';import { ApplicationMessageChannelsService } from 'src/engine/metadata-modules/message-channel/services/application-message-channels.service';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: false,- apiKey: false,- oauthClient: false,- application: true,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: false,+ apiKey: false,+ oauthClient: false,+ application: true,+ },+ requiredPermissionFlags: [],}),- NoPermissionGuard,)@UseInterceptors(MessageChannelGraphqlApiExceptionInterceptor)@UsePipes(ResolverValidationPipe)diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/application-message-folders.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/application-message-folders.resolver.tsindex 8f5815fa609..46453fd3e1c 100644--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/application-message-folders.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/application-message-folders.resolver.ts@@ -14,22 +14,23 @@ import { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flatimport { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { ListAppMessageFoldersInput } from 'src/engine/metadata-modules/message-channel/dtos/list-app-message-folders.input';import { SyncAppMessageFoldersInput } from 'src/engine/metadata-modules/message-channel/dtos/sync-app-message-folders.input';import { MessageChannelGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/message-channel/interceptors/message-channel-graphql-api-exception.interceptor';import { ApplicationMessageFoldersService } from 'src/engine/metadata-modules/message-channel/services/application-message-folders.service';import { MessageFolderDTO } from 'src/engine/metadata-modules/message-folder/dtos/message-folder.dto';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: false,- apiKey: false,- oauthClient: false,- application: true,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: false,+ apiKey: false,+ oauthClient: false,+ application: true,+ },+ requiredPermissionFlags: [],}),- NoPermissionGuard,)@UseInterceptors(MessageChannelGraphqlApiExceptionInterceptor)@UsePipes(ResolverValidationPipe)diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/application-message-ingestion.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/application-message-ingestion.resolver.tsindex 18a09f3f6e2..cca5f65af2a 100644--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/application-message-ingestion.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/application-message-ingestion.resolver.ts@@ -13,22 +13,23 @@ import { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flatimport { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { IngestAppMessagesInput } from 'src/engine/metadata-modules/message-channel/dtos/ingest-app-messages.input';import { IngestAppMessagesOutput } from 'src/engine/metadata-modules/message-channel/dtos/ingest-app-messages.output';import { MessageChannelGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/message-channel/interceptors/message-channel-graphql-api-exception.interceptor';import { ApplicationMessageIngestionService } from 'src/engine/metadata-modules/message-channel/services/application-message-ingestion.service';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: false,- apiKey: false,- oauthClient: false,- application: true,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: false,+ apiKey: false,+ oauthClient: false,+ application: true,+ },+ requiredPermissionFlags: [],}),- NoPermissionGuard,)@UseInterceptors(MessageChannelGraphqlApiExceptionInterceptor)@UsePipes(ResolverValidationPipe)diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/application-message-send.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/application-message-send.resolver.tsindex 7012e1a1927..1676e73e3ac 100644--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/application-message-send.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/application-message-send.resolver.ts@@ -15,28 +15,29 @@ import { UsageLimitGraphqlApiExceptionFilter } from 'src/engine/core-modules/usaimport { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flat-workspace.type';import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { ConnectedAccountGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/connected-account/interceptors/connected-account-graphql-api-exception.interceptor';import { SendAppChannelMessageInput } from 'src/engine/metadata-modules/message-channel/dtos/send-app-channel-message.input';import { SendAppChannelMessageOutput } from 'src/engine/metadata-modules/message-channel/dtos/send-app-channel-message.output';import { MessageChannelGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/message-channel/interceptors/message-channel-graphql-api-exception.interceptor';import { ApplicationMessageSendService } from 'src/engine/metadata-modules/message-channel/services/application-message-send.service';import { MessagingProviderGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/messaging-provider/interceptors/messaging-provider-graphql-api-exception.interceptor';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: false,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: false,+ workspaceAgnostic: false,+ },+ apiKey: false,+ oauthClient: false,+ application: false,},- apiKey: false,- oauthClient: false,- application: false,+ requiredPermissionFlags: [PermissionFlagType.SEND_EMAIL_TOOL],}),- SettingsPermissionGuard(PermissionFlagType.SEND_EMAIL_TOOL),)@UseInterceptors(MessageChannelGraphqlApiExceptionInterceptor,diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/message-channel.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/message-channel.resolver.tsindex d0367799573..94b14100c84 100644--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/message-channel.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/message-channel.resolver.ts@@ -23,9 +23,6 @@ import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspimport { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { ConnectedAccountMetadataService } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.service';import { ConnectedAccountPublicDTO } from 'src/engine/metadata-modules/connected-account/dtos/connected-account-public.dto';import { CreateEmailGroupChannelInput } from 'src/engine/metadata-modules/message-channel/dtos/create-email-group-channel.input';@@ -52,9 +49,11 @@ import {MessageChannelType,MessageFolderPendingSyncAction,} from 'twenty-shared/types';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';-@UseGuards(- AuthPrincipalGuard({+const MESSAGE_CHANNEL_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {userSession: {standard: true,impersonated: true,@@ -64,8 +63,25 @@ import {apiKey: true,oauthClient: true,application: true,- }),-)+ },+ requiredPermissionFlags: [],+};++const EMAIL_GROUP_CHANNEL_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [PermissionFlagType.WORKSPACE],+};+@UseInterceptors(MessageChannelGraphqlApiExceptionInterceptor)@MetadataResolver(() => MessageChannelDTO)@UseFilters(AuthGraphqlApiExceptionFilter)@@ -142,7 +158,7 @@ export class MessageChannelResolver {}@Query(() => [MessageChannelDTO])- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(MESSAGE_CHANNEL_ACCESS_POLICY))@AllowSuspendedWorkspace()async myMessageChannels(@AuthWorkspace() workspace: WorkspaceEntity,@@ -170,7 +186,10 @@ export class MessageChannelResolver {}@Mutation(() => MessageChannelDTO)- @UseGuards(CustomPermissionGuard)+ @UseGuards(+ AccessPolicyGuard(MESSAGE_CHANNEL_ACCESS_POLICY),+ CustomPermissionGuard,+ )async updateMessageChannel(@Args('input') input: UpdateMessageChannelInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -246,7 +265,7 @@ export class MessageChannelResolver {}@Mutation(() => CreateEmailGroupChannelOutput)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.WORKSPACE))+ @UseGuards(AccessPolicyGuard(EMAIL_GROUP_CHANNEL_ACCESS_POLICY))async createEmailGroupChannel(@Args('input') input: CreateEmailGroupChannelInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -261,7 +280,7 @@ export class MessageChannelResolver {}@Mutation(() => MessageChannelDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.WORKSPACE))+ @UseGuards(AccessPolicyGuard(EMAIL_GROUP_CHANNEL_ACCESS_POLICY))async updateEmailGroupChannel(@Args('input') input: UpdateEmailGroupChannelInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -276,7 +295,7 @@ export class MessageChannelResolver {}@Mutation(() => MessageChannelDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.WORKSPACE))+ @UseGuards(AccessPolicyGuard(EMAIL_GROUP_CHANNEL_ACCESS_POLICY))async deleteEmailGroupChannel(@Args('id', { type: () => UUIDScalarType }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/message-folder/resolvers/message-folder.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/message-folder/resolvers/message-folder.resolver.tsindex ac7a7e7f79a..df8ea75ada0 100644--- a/packages/twenty-server/src/engine/metadata-modules/message-folder/resolvers/message-folder.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/message-folder/resolvers/message-folder.resolver.ts@@ -6,8 +6,6 @@ import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decoratoimport { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { MessageFolderDTO } from 'src/engine/metadata-modules/message-folder/dtos/message-folder.dto';import {UpdateMessageFolderInput,@@ -16,18 +14,22 @@ import {import { MessageFolderGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/message-folder/interceptors/message-folder-graphql-api-exception.interceptor';import { MessageFolderMetadataService } from 'src/engine/metadata-modules/message-folder/message-folder-metadata.service';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,},- apiKey: true,- oauthClient: true,- application: true,+ requiredPermissionFlags: [],}),)@UseInterceptors(MessageFolderGraphqlApiExceptionInterceptor)@@ -39,7 +41,6 @@ export class MessageFolderResolver {) {}@Query(() => [MessageFolderDTO])- @UseGuards(NoPermissionGuard)async myMessageFolders(@AuthWorkspace() workspace: WorkspaceEntity,@AuthUserWorkspaceId() userWorkspaceId: string,@@ -64,7 +65,6 @@ export class MessageFolderResolver {}@Mutation(() => MessageFolderDTO)- @UseGuards(NoPermissionGuard)async updateMessageFolder(@Args('input') input: UpdateMessageFolderInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -84,7 +84,6 @@ export class MessageFolderResolver {}@Mutation(() => [MessageFolderDTO])- @UseGuards(NoPermissionGuard)async updateMessageFolders(@Args('input') input: UpdateMessageFoldersInput,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/metadata-translation/metadata-translation.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/metadata-translation/metadata-translation.resolver.tsindex c12528f9f70..7f72567106d 100644--- a/packages/twenty-server/src/engine/metadata-modules/metadata-translation/metadata-translation.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/metadata-translation/metadata-translation.resolver.ts@@ -6,23 +6,25 @@ import { PermissionFlagType } from 'twenty-shared/constants';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { MetadataTranslationDTO } from 'src/engine/metadata-modules/metadata-translation/dtos/metadata-translation.dto';import { MetadataTranslationsInput } from 'src/engine/metadata-modules/metadata-translation/dtos/metadata-translations.input';import { MetadataTranslationService } from 'src/engine/metadata-modules/metadata-translation/services/metadata-translation.service';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,},- apiKey: true,- oauthClient: true,- application: true,+ requiredPermissionFlags: [PermissionFlagType.DATA_MODEL],}),)@MetadataResolver(() => MetadataTranslationDTO)@@ -31,7 +33,6 @@ export class MetadataTranslationResolver {private readonly metadataTranslationService: MetadataTranslationService,) {}- @UseGuards(SettingsPermissionGuard(PermissionFlagType.DATA_MODEL))@Query(() => [MetadataTranslationDTO])async metadataTranslations(@Args('input') input: MetadataTranslationsInput,diff --git a/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.resolver.tsindex 7b0a7afd6b1..6b1f082e46a 100644--- a/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.resolver.ts@@ -7,25 +7,26 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entimport { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { MinimalMetadataDTO } from 'src/engine/metadata-modules/minimal-metadata/dtos/minimal-metadata.dto';import { MinimalMetadataService } from 'src/engine/metadata-modules/minimal-metadata/minimal-metadata.service';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@MetadataResolver(() => MinimalMetadataDTO)@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,},- apiKey: true,- oauthClient: true,- application: true,+ requiredPermissionFlags: [],}),- NoPermissionGuard,)export class MinimalMetadataResolver {constructor(diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller.tsindex 4a6f60a35aa..343c233e728 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller.ts@@ -14,8 +14,6 @@ import {UsePipes,ValidationPipe,} from '@nestjs/common';--import { PermissionFlagType } from 'twenty-shared/constants';import { ApiPath, FeatureFlagKey } from 'twenty-shared/types';import { In } from 'typeorm';@@ -27,8 +25,6 @@ import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/serviceimport { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { JwtAuthGuard } from 'src/engine/guards/jwt-auth.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { DerivedFieldMetadataIdsService } from 'src/engine/metadata-modules/derived-field-metadata-ids/services/derived-field-metadata-ids.service';import { type DerivedFieldMetadataIds } from 'src/engine/metadata-modules/derived-field-metadata-ids/types/derived-field-metadata-ids.type';import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';@@ -60,23 +56,12 @@ import { PermissionsRestApiExceptionFilter } from 'src/engine/permissions/utils/import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';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 { OBJECT_METADATA_READ_ACCESS_POLICY } from 'src/engine/metadata-modules/object-metadata/constants/object-metadata-read-access-policy.constant';+import { OBJECT_METADATA_WRITE_ACCESS_POLICY } from 'src/engine/metadata-modules/object-metadata/constants/object-metadata-write-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@Controller(`${ApiPath.Rest}/metadata/objects`)-@UseGuards(- JwtAuthGuard,- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),- SettingsPermissionGuard(PermissionFlagType.DATA_MODEL),-)+@UseGuards(JwtAuthGuard)@UseFilters(PermissionsRestApiExceptionFilter,ObjectMetadataRestApiExceptionFilter,@@ -98,6 +83,7 @@ export class ObjectMetadataController {) {}@Get()+ @UseGuards(AccessPolicyGuard(OBJECT_METADATA_READ_ACCESS_POLICY))async findMany(@Req() request: AuthenticatedRequest,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -137,6 +123,7 @@ export class ObjectMetadataController {}@Get(':id')+ @UseGuards(AccessPolicyGuard(OBJECT_METADATA_READ_ACCESS_POLICY))async findOne(@Param('id', new ParseUUIDPipe()) id: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -174,6 +161,7 @@ export class ObjectMetadataController {}@Post()+ @UseGuards(AccessPolicyGuard(OBJECT_METADATA_WRITE_ACCESS_POLICY))async createOne(@Body() input: CreateObjectInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -206,6 +194,7 @@ export class ObjectMetadataController {}@Patch(':id')+ @UseGuards(AccessPolicyGuard(OBJECT_METADATA_WRITE_ACCESS_POLICY))async updateOnePatch(@Param('id', new ParseUUIDPipe()) id: string,@Body() update: UpdateObjectPayload,@@ -215,6 +204,7 @@ export class ObjectMetadataController {}@Put(':id')+ @UseGuards(AccessPolicyGuard(OBJECT_METADATA_WRITE_ACCESS_POLICY))async updateOnePut(@Param('id', new ParseUUIDPipe()) id: string,@Body() update: UpdateObjectPayload,@@ -224,6 +214,7 @@ export class ObjectMetadataController {}@Delete(':id')+ @UseGuards(AccessPolicyGuard(OBJECT_METADATA_WRITE_ACCESS_POLICY))async deleteOne(@Param('id', new ParseUUIDPipe()) id: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.tsindex 56cda1b0829..6892c0a8068 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts@@ -7,8 +7,6 @@ import {Query,ResolveField,} from '@nestjs/graphql';--import { PermissionFlagType } from 'twenty-shared/constants';import { isDefined } from 'twenty-shared/utils';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';@@ -21,9 +19,6 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entimport { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';import { FieldFilterInput } from 'src/engine/metadata-modules/field-metadata/dtos/field-filter.input';import { fromFlatObjectMetadataToObjectMetadataDto } from 'src/engine/metadata-modules/flat-object-metadata/utils/from-flat-object-metadata-to-object-metadata-dto.util';@@ -61,9 +56,13 @@ import { fromObjectMetadataEntityToObjectMetadataDto } from 'src/engine/metadataimport { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';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 { OBJECT_METADATA_READ_ACCESS_POLICY } from 'src/engine/metadata-modules/object-metadata/constants/object-metadata-read-access-policy.constant';+import { OBJECT_METADATA_WRITE_ACCESS_POLICY } from 'src/engine/metadata-modules/object-metadata/constants/object-metadata-write-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';-@UseGuards(- AuthPrincipalGuard({+const OBJECT_METADATA_RESOLVER_READ_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {userSession: {standard: true,impersonated: true,@@ -73,8 +72,10 @@ import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scopeapiKey: true,oauthClient: true,application: true,- }),-)+ },+ requiredPermissionFlags: [],+};+@MetadataResolver(() => ObjectMetadataDTO)@UsePipes(ResolverValidationPipe)@UseFilters(@@ -92,7 +93,7 @@ export class ObjectMetadataResolver {private readonly objectMetadataRepository: WorkspaceScopedRepository<ObjectMetadataEntity>,) {}- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(OBJECT_METADATA_RESOLVER_READ_ACCESS_POLICY))@Query(() => ObjectConnectionDTO)@AllowSuspendedWorkspace()async objects(@@ -136,7 +137,7 @@ export class ObjectMetadataResolver {};}- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(OBJECT_METADATA_RESOLVER_READ_ACCESS_POLICY))@Query(() => ObjectMetadataDTO)async object(@Args('id', {@@ -223,7 +224,7 @@ export class ObjectMetadataResolver {return !objectMetadata.isUIEditable;}- @UseGuards(SettingsPermissionGuard(PermissionFlagType.DATA_MODEL))+ @UseGuards(AccessPolicyGuard(OBJECT_METADATA_READ_ACCESS_POLICY))@Query(() => [ObjectRecordCountDTO])async objectRecordCounts(@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -231,7 +232,7 @@ export class ObjectMetadataResolver {return this.objectRecordCountService.getRecordCounts(workspaceId);}- @UseGuards(SettingsPermissionGuard(PermissionFlagType.DATA_MODEL))+ @UseGuards(AccessPolicyGuard(OBJECT_METADATA_READ_ACCESS_POLICY))@Query(() => [UUIDScalarType])async mostlyEmptyFieldMetadataIds(@Args('objectMetadataId', { type: () => UUIDScalarType })@@ -322,7 +323,6 @@ export class ObjectMetadataResolver {);}- @UseGuards(SettingsPermissionGuard(PermissionFlagType.DATA_MODEL))@ResolveField(() => String, { nullable: true })async icon(@Parent() objectMetadata: ObjectMetadataDTO,@@ -358,7 +358,7 @@ export class ObjectMetadataResolver {return getEffectiveImageIdentifierFieldMetadataId(objectMetadata);}- @UseGuards(SettingsPermissionGuard(PermissionFlagType.DATA_MODEL))+ @UseGuards(AccessPolicyGuard(OBJECT_METADATA_WRITE_ACCESS_POLICY))@Mutation(() => ObjectMetadataDTO)async createOneObject(@Args('input') input: CreateOneObjectInput,@@ -377,7 +377,7 @@ export class ObjectMetadataResolver {}}- @UseGuards(SettingsPermissionGuard(PermissionFlagType.DATA_MODEL))+ @UseGuards(AccessPolicyGuard(OBJECT_METADATA_WRITE_ACCESS_POLICY))@Mutation(() => ObjectMetadataDTO)async deleteOneObject(@Args('input') deleteObjectInput: DeleteOneObjectInput,@@ -396,7 +396,7 @@ export class ObjectMetadataResolver {}}- @UseGuards(SettingsPermissionGuard(PermissionFlagType.DATA_MODEL))+ @UseGuards(AccessPolicyGuard(OBJECT_METADATA_WRITE_ACCESS_POLICY))@Mutation(() => ObjectMetadataDTO)async updateOneObject(@Args('input') updateObjectInput: UpdateOneObjectInput,@@ -415,7 +415,7 @@ export class ObjectMetadataResolver {}}- @UseGuards(SettingsPermissionGuard(PermissionFlagType.DATA_MODEL))+ @UseGuards(AccessPolicyGuard(OBJECT_METADATA_WRITE_ACCESS_POLICY))@Mutation(() => [ObjectMetadataDTO])async updateManyObjects(@Args('inputs', { type: () => [UpdateOneObjectInput] })diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/constants/page-layout-tab-read-access-policy.constant.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/constants/page-layout-tab-read-access-policy.constant.tsnew file mode 100644index 00000000000..3ff0a833403--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/constants/page-layout-tab-read-access-policy.constant.ts@@ -0,0 +1,16 @@+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';++export const PAGE_LAYOUT_TAB_READ_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [],+};diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/constants/page-layout-tab-write-access-policy.constant.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/constants/page-layout-tab-write-access-policy.constant.tsnew file mode 100644index 00000000000..55029769c1f--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/constants/page-layout-tab-write-access-policy.constant.ts@@ -0,0 +1,18 @@+import { PermissionFlagType } from 'twenty-shared/constants';++import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';++export const PAGE_LAYOUT_TAB_WRITE_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [PermissionFlagType.LAYOUTS],+};diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller.tsindex bb5cde52caf..6dbff415f6f 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller.ts@@ -11,8 +11,6 @@ import {UseFilters,UseGuards,} from '@nestjs/common';--import { PermissionFlagType } from 'twenty-shared/constants';import { ApiPath } from 'twenty-shared/types';import { type APP_LOCALES } from 'twenty-shared/translations';import { isDefined } from 'twenty-shared/utils';@@ -23,9 +21,6 @@ import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paimport { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { RequestLocale } from 'src/engine/decorators/locale/request-locale.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { FlatEntityMapsRestApiExceptionFilter } from 'src/engine/metadata-modules/flat-entity/filters/flat-entity-maps-rest-api-exception.filter';import { CreatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/create-page-layout-tab.input';import { UpdatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab.input';@@ -41,21 +36,11 @@ import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-taimport { PermissionsRestApiExceptionFilter } from 'src/engine/permissions/utils/permissions-rest-api-exception.filter';import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';+import { PAGE_LAYOUT_TAB_READ_ACCESS_POLICY } from 'src/engine/metadata-modules/page-layout-tab/constants/page-layout-tab-read-access-policy.constant';+import { PAGE_LAYOUT_TAB_WRITE_ACCESS_POLICY } from 'src/engine/metadata-modules/page-layout-tab/constants/page-layout-tab-write-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@Controller(`${ApiPath.Rest}/metadata/pageLayoutTabs`)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)@UseFilters(PermissionsRestApiExceptionFilter,PageLayoutTabRestApiExceptionFilter,@@ -70,7 +55,7 @@ export class PageLayoutTabController {) {}@Get()- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_TAB_READ_ACCESS_POLICY))async findMany(@Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,@@ -106,7 +91,7 @@ export class PageLayoutTabController {}@Get(':id')- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_TAB_READ_ACCESS_POLICY))async findOne(@Param('id') id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -131,7 +116,7 @@ export class PageLayoutTabController {}@Post()- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_TAB_WRITE_ACCESS_POLICY))async create(@Body() input: CreatePageLayoutTabInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -143,7 +128,7 @@ export class PageLayoutTabController {}@Patch(':id')- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_TAB_WRITE_ACCESS_POLICY))async update(@Param('id') id: string,@Body() input: UpdatePageLayoutTabInput,@@ -157,7 +142,7 @@ export class PageLayoutTabController {}@Delete(':id')- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_TAB_WRITE_ACCESS_POLICY))async destroy(@Param('id') id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/resolvers/page-layout-tab.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/resolvers/page-layout-tab.resolver.tsindex e7547cb8d7d..4075591ed15 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/resolvers/page-layout-tab.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/resolvers/page-layout-tab.resolver.ts@@ -12,18 +12,12 @@ import {Query,ResolveField,} from '@nestjs/graphql';--import { PermissionFlagType } from 'twenty-shared/constants';-import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';import { type I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.type';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { CreatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/create-page-layout-tab.input';import { UpdatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab.input';import { PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto';@@ -33,23 +27,13 @@ import { PageLayoutGraphqlApiExceptionFilter } from 'src/engine/metadata-modulesimport { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { PAGE_LAYOUT_TAB_READ_ACCESS_POLICY } from 'src/engine/metadata-modules/page-layout-tab/constants/page-layout-tab-read-access-policy.constant';+import { PAGE_LAYOUT_TAB_WRITE_ACCESS_POLICY } from 'src/engine/metadata-modules/page-layout-tab/constants/page-layout-tab-write-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@MetadataResolver(() => PageLayoutTabDTO)@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)@UseFilters(PageLayoutGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)@UsePipes(ResolverValidationPipe)export class PageLayoutTabResolver {constructor(@@ -83,7 +67,7 @@ export class PageLayoutTabResolver {}@Query(() => [PageLayoutTabDTO])- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_TAB_READ_ACCESS_POLICY))async getPageLayoutTabs(@AuthWorkspace() workspace: WorkspaceEntity,@Args('pageLayoutId', { type: () => String }) pageLayoutId: string,@@ -95,7 +79,7 @@ export class PageLayoutTabResolver {}@Query(() => PageLayoutTabDTO)- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_TAB_READ_ACCESS_POLICY))async getPageLayoutTab(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -107,7 +91,7 @@ export class PageLayoutTabResolver {}@Mutation(() => PageLayoutTabDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_TAB_WRITE_ACCESS_POLICY))async createPageLayoutTab(@Args('input') input: CreatePageLayoutTabInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -119,7 +103,7 @@ export class PageLayoutTabResolver {}@Mutation(() => PageLayoutTabDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_TAB_WRITE_ACCESS_POLICY))async updatePageLayoutTab(@Args('id', { type: () => String }) id: string,@Args('input') input: UpdatePageLayoutTabInput,@@ -133,7 +117,7 @@ export class PageLayoutTabResolver {}@Mutation(() => Boolean)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_TAB_WRITE_ACCESS_POLICY))async destroyPageLayoutTab(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/constants/page-layout-widget-read-access-policy.constant.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/constants/page-layout-widget-read-access-policy.constant.tsnew file mode 100644index 00000000000..7bf7a8cca3f--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/constants/page-layout-widget-read-access-policy.constant.ts@@ -0,0 +1,16 @@+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';++export const PAGE_LAYOUT_WIDGET_READ_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [],+};diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/constants/page-layout-widget-write-access-policy.constant.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/constants/page-layout-widget-write-access-policy.constant.tsnew file mode 100644index 00000000000..983d38e12bb--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/constants/page-layout-widget-write-access-policy.constant.ts@@ -0,0 +1,18 @@+import { PermissionFlagType } from 'twenty-shared/constants';++import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';++export const PAGE_LAYOUT_WIDGET_WRITE_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [PermissionFlagType.LAYOUTS],+};diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller.tsindex 31d7f12de89..ecf1649820d 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller.ts@@ -13,7 +13,6 @@ import {} from '@nestjs/common';import { isDefined } from 'class-validator';-import { PermissionFlagType } from 'twenty-shared/constants';import { ApiPath } from 'twenty-shared/types';import { type APP_LOCALES } from 'twenty-shared/translations';@@ -23,9 +22,6 @@ import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paimport { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { RequestLocale } from 'src/engine/decorators/locale/request-locale.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { FlatEntityMapsRestApiExceptionFilter } from 'src/engine/metadata-modules/flat-entity/filters/flat-entity-maps-rest-api-exception.filter';import { CreatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/create-page-layout-widget.input';import { UpdatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input';@@ -41,21 +37,11 @@ import { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layoutimport { PermissionsRestApiExceptionFilter } from 'src/engine/permissions/utils/permissions-rest-api-exception.filter';import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';+import { PAGE_LAYOUT_WIDGET_READ_ACCESS_POLICY } from 'src/engine/metadata-modules/page-layout-widget/constants/page-layout-widget-read-access-policy.constant';+import { PAGE_LAYOUT_WIDGET_WRITE_ACCESS_POLICY } from 'src/engine/metadata-modules/page-layout-widget/constants/page-layout-widget-write-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@Controller(`${ApiPath.Rest}/metadata/pageLayoutWidgets`)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)@UseFilters(PermissionsRestApiExceptionFilter,PageLayoutWidgetRestApiExceptionFilter,@@ -70,7 +56,7 @@ export class PageLayoutWidgetController {) {}@Get()- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WIDGET_READ_ACCESS_POLICY))async findMany(@Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,@@ -106,7 +92,7 @@ export class PageLayoutWidgetController {}@Get(':id')- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WIDGET_READ_ACCESS_POLICY))async findOne(@Param('id') id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -133,7 +119,7 @@ export class PageLayoutWidgetController {}@Post()- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WIDGET_WRITE_ACCESS_POLICY))async create(@Body() input: CreatePageLayoutWidgetInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -145,7 +131,7 @@ export class PageLayoutWidgetController {}@Patch(':id')- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WIDGET_WRITE_ACCESS_POLICY))async update(@Param('id') id: string,@Body() input: UpdatePageLayoutWidgetInput,@@ -159,7 +145,7 @@ export class PageLayoutWidgetController {}@Delete(':id')- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WIDGET_WRITE_ACCESS_POLICY))async destroy(@Param('id') id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/resolvers/page-layout-widget.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/resolvers/page-layout-widget.resolver.tsindex 1caeb213ce3..fa9107e0616 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/resolvers/page-layout-widget.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/resolvers/page-layout-widget.resolver.ts@@ -12,8 +12,6 @@ import {Query,ResolveField,} from '@nestjs/graphql';--import { PermissionFlagType } from 'twenty-shared/constants';import { type IframeMediaPermission } from 'twenty-shared/types';import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';@@ -25,9 +23,6 @@ import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { CreatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/create-page-layout-widget.input';import { UpdatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input';import { PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto';@@ -38,23 +33,13 @@ import { PageLayoutGraphqlApiExceptionFilter } from 'src/engine/metadata-modulesimport { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { PAGE_LAYOUT_WIDGET_READ_ACCESS_POLICY } from 'src/engine/metadata-modules/page-layout-widget/constants/page-layout-widget-read-access-policy.constant';+import { PAGE_LAYOUT_WIDGET_WRITE_ACCESS_POLICY } from 'src/engine/metadata-modules/page-layout-widget/constants/page-layout-widget-write-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@MetadataResolver(() => PageLayoutWidgetDTO)@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)@UseFilters(PageLayoutGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)@UsePipes(ResolverValidationPipe)export class PageLayoutWidgetResolver {constructor(@@ -126,7 +111,7 @@ export class PageLayoutWidgetResolver {}@Query(() => [PageLayoutWidgetDTO])- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WIDGET_READ_ACCESS_POLICY))async getPageLayoutWidgets(@AuthWorkspace() workspace: WorkspaceEntity,@Args('pageLayoutTabId', { type: () => String }) pageLayoutTabId: string,@@ -138,7 +123,7 @@ export class PageLayoutWidgetResolver {}@Query(() => PageLayoutWidgetDTO)- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WIDGET_READ_ACCESS_POLICY))async getPageLayoutWidget(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -150,7 +135,7 @@ export class PageLayoutWidgetResolver {}@Mutation(() => PageLayoutWidgetDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WIDGET_WRITE_ACCESS_POLICY))async createPageLayoutWidget(@Args('input') input: CreatePageLayoutWidgetInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -162,7 +147,7 @@ export class PageLayoutWidgetResolver {}@Mutation(() => PageLayoutWidgetDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WIDGET_WRITE_ACCESS_POLICY))async updatePageLayoutWidget(@Args('id', { type: () => String }) id: string,@Args('input') input: UpdatePageLayoutWidgetInput,@@ -176,7 +161,7 @@ export class PageLayoutWidgetResolver {}@Mutation(() => Boolean)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WIDGET_WRITE_ACCESS_POLICY))async destroyPageLayoutWidget(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/constants/page-layout-read-access-policy.constant.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/constants/page-layout-read-access-policy.constant.tsnew file mode 100644index 00000000000..2b4cbf9e8ce--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/constants/page-layout-read-access-policy.constant.ts@@ -0,0 +1,16 @@+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';++export const PAGE_LAYOUT_READ_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [],+};diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/constants/page-layout-write-access-policy.constant.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/constants/page-layout-write-access-policy.constant.tsnew file mode 100644index 00000000000..52f821ee7c5--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/constants/page-layout-write-access-policy.constant.ts@@ -0,0 +1,18 @@+import { PermissionFlagType } from 'twenty-shared/constants';++import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';++export const PAGE_LAYOUT_WRITE_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [PermissionFlagType.LAYOUTS],+};diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout.controller.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout.controller.tsindex 0b4b951f84d..6f1272afc7c 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout.controller.ts@@ -11,8 +11,6 @@ import {UseFilters,UseGuards,} from '@nestjs/common';--import { PermissionFlagType } from 'twenty-shared/constants';import { type APP_LOCALES } from 'twenty-shared/translations';import { ApiPath, PageLayoutType } from 'twenty-shared/types';@@ -21,9 +19,6 @@ import { parseMetadataRestPagination } from 'src/engine/api/rest/metadata/utils/import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { RequestLocale } from 'src/engine/decorators/locale/request-locale.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { FlatEntityMapsRestApiExceptionFilter } from 'src/engine/metadata-modules/flat-entity/filters/flat-entity-maps-rest-api-exception.filter';import { CreatePageLayoutInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout.input';import { UpdatePageLayoutInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout.input';@@ -34,21 +29,11 @@ import { PermissionsRestApiExceptionFilter } from 'src/engine/permissions/utils/import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';+import { PAGE_LAYOUT_READ_ACCESS_POLICY } from 'src/engine/metadata-modules/page-layout/constants/page-layout-read-access-policy.constant';+import { PAGE_LAYOUT_WRITE_ACCESS_POLICY } from 'src/engine/metadata-modules/page-layout/constants/page-layout-write-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@Controller(`${ApiPath.Rest}/metadata/pageLayouts`)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)@UseFilters(PermissionsRestApiExceptionFilter,PageLayoutRestApiExceptionFilter,@@ -63,7 +48,7 @@ export class PageLayoutController {) {}@Get()- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_READ_ACCESS_POLICY))async findMany(@Req() request: AuthenticatedRequest,@RequestLocale() locale: keyof typeof APP_LOCALES | undefined,@@ -93,7 +78,7 @@ export class PageLayoutController {}@Get(':id')- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_READ_ACCESS_POLICY))async findOne(@Param('id') id: string,@RequestLocale() locale: keyof typeof APP_LOCALES | undefined,@@ -118,7 +103,7 @@ export class PageLayoutController {}@Post()- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WRITE_ACCESS_POLICY))async create(@Body() input: CreatePageLayoutInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -130,7 +115,7 @@ export class PageLayoutController {}@Patch(':id')- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WRITE_ACCESS_POLICY))async update(@Param('id') id: string,@Body() input: UpdatePageLayoutInput,@@ -146,7 +131,7 @@ export class PageLayoutController {}@Delete(':id')- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WRITE_ACCESS_POLICY))async destroy(@Param('id') id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/resolvers/page-layout.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/resolvers/page-layout.resolver.tsindex a5535adc84b..a375fddbc63 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/resolvers/page-layout.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/resolvers/page-layout.resolver.ts@@ -12,9 +12,6 @@ import {Query,ResolveField,} from '@nestjs/graphql';--import { PermissionFlagType } from 'twenty-shared/constants';-import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';import { type I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.type';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';@@ -22,9 +19,6 @@ import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto';import { PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto';import { CreatePageLayoutInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout.input';@@ -40,23 +34,13 @@ import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overimport { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { PAGE_LAYOUT_READ_ACCESS_POLICY } from 'src/engine/metadata-modules/page-layout/constants/page-layout-read-access-policy.constant';+import { PAGE_LAYOUT_WRITE_ACCESS_POLICY } from 'src/engine/metadata-modules/page-layout/constants/page-layout-write-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@MetadataResolver(() => PageLayoutDTO)@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)@UseFilters(PageLayoutGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)@UsePipes(ResolverValidationPipe)export class PageLayoutResolver {constructor(@@ -93,7 +77,7 @@ export class PageLayoutResolver {}@Query(() => [PageLayoutDTO])- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_READ_ACCESS_POLICY))@AllowSuspendedWorkspace()async getPageLayouts(@AuthWorkspace() workspace: WorkspaceEntity,@@ -116,7 +100,7 @@ export class PageLayoutResolver {}@Query(() => PageLayoutDTO, { nullable: true })- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_READ_ACCESS_POLICY))async getPageLayout(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -128,7 +112,7 @@ export class PageLayoutResolver {}@Mutation(() => PageLayoutDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WRITE_ACCESS_POLICY))async createPageLayout(@Args('input') input: CreatePageLayoutInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -140,7 +124,7 @@ export class PageLayoutResolver {}@Mutation(() => PageLayoutDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WRITE_ACCESS_POLICY))async updatePageLayout(@Args('id', { type: () => String }) id: string,@Args('input') input: UpdatePageLayoutInput,@@ -154,7 +138,7 @@ export class PageLayoutResolver {}@Mutation(() => Boolean)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WRITE_ACCESS_POLICY))async destroyPageLayout(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -166,7 +150,7 @@ export class PageLayoutResolver {}@Mutation(() => PageLayoutDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WRITE_ACCESS_POLICY))async updatePageLayoutWithTabsAndWidgets(@Args('id', { type: () => String }) id: string,@Args('input') input: UpdatePageLayoutWithTabsInput,@@ -180,7 +164,7 @@ export class PageLayoutResolver {}@Mutation(() => PageLayoutDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WRITE_ACCESS_POLICY))async resetPageLayoutToDefault(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -192,7 +176,7 @@ export class PageLayoutResolver {}@Mutation(() => PageLayoutWidgetDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WRITE_ACCESS_POLICY))async resetPageLayoutWidgetToDefault(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -204,7 +188,7 @@ export class PageLayoutResolver {}@Mutation(() => PageLayoutTabDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(AccessPolicyGuard(PAGE_LAYOUT_WRITE_ACCESS_POLICY))async resetPageLayoutTabToDefault(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.resolver.tsindex 122175b4e1d..4f384f934d4 100644--- a/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.resolver.ts@@ -7,25 +7,26 @@ import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decoratoimport { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { PermissionFlagDTO } from 'src/engine/metadata-modules/permission-flag/dtos/permission-flag.dto';import { PermissionFlagService } from 'src/engine/metadata-modules/permission-flag/permission-flag.service';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@MetadataResolver(() => PermissionFlagDTO)@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,},- apiKey: true,- oauthClient: true,- application: true,+ requiredPermissionFlags: [PermissionFlagType.ROLES],}),- SettingsPermissionGuard(PermissionFlagType.ROLES),)@UseFilters(AuthGraphqlApiExceptionFilter)export class PermissionFlagResolver {diff --git a/packages/twenty-server/src/engine/metadata-modules/related-record-path/related-record-path.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/related-record-path/related-record-path.resolver.tsindex bb2b686a0c6..d9050206c47 100644--- a/packages/twenty-server/src/engine/metadata-modules/related-record-path/related-record-path.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/related-record-path/related-record-path.resolver.ts@@ -17,26 +17,28 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filtimport { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { FeatureFlagGuard } from 'src/engine/guards/feature-flag.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { CreateRelatedRecordPathInput } from 'src/engine/metadata-modules/related-record-path/dtos/create-related-record-path.input';import { RelatedRecordPathDTO } from 'src/engine/metadata-modules/related-record-path/dtos/related-record-path.dto';import { RelatedRecordPathGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/related-record-path/filters/related-record-path-graphql-api-exception.filter';import { RelatedRecordPathService } from 'src/engine/metadata-modules/related-record-path/related-record-path.service';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: false,+ oauthClient: { withUser: true, withoutUser: false },+ application: false,},- apiKey: false,- oauthClient: { withUser: true, withoutUser: false },- application: false,+ requiredPermissionFlags: [PermissionFlagType.ROLES],+ requiredFeatureFlags: [FeatureFlagKey.IS_RELATED_RECORD_PATHS_ENABLED],}),)@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)@@ -52,10 +54,6 @@ export class RelatedRecordPathResolver {) {}@Query(() => [RelatedRecordPathDTO])- @UseGuards(- FeatureFlagGuard(FeatureFlagKey.IS_RELATED_RECORD_PATHS_ENABLED),- SettingsPermissionGuard(PermissionFlagType.ROLES),- )async relatedRecordPaths(@AuthWorkspace() workspace: WorkspaceEntity,): Promise<RelatedRecordPathDTO[]> {@@ -65,10 +63,6 @@ export class RelatedRecordPathResolver {}@Mutation(() => RelatedRecordPathDTO)- @UseGuards(- FeatureFlagGuard(FeatureFlagKey.IS_RELATED_RECORD_PATHS_ENABLED),- SettingsPermissionGuard(PermissionFlagType.ROLES),- )async createRelatedRecordPath(@Args('input') input: CreateRelatedRecordPathInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -80,10 +74,6 @@ export class RelatedRecordPathResolver {}@Mutation(() => RelatedRecordPathDTO)- @UseGuards(- FeatureFlagGuard(FeatureFlagKey.IS_RELATED_RECORD_PATHS_ENABLED),- SettingsPermissionGuard(PermissionFlagType.ROLES),- )async deleteRelatedRecordPath(@Args('id', { type: () => UUIDScalarType }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/settings-menu-item/settings-menu-item.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/settings-menu-item/settings-menu-item.resolver.tsindex 8217c9d4024..03134bd395f 100644--- a/packages/twenty-server/src/engine/metadata-modules/settings-menu-item/settings-menu-item.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/settings-menu-item/settings-menu-item.resolver.ts@@ -1,4 +1,4 @@-import { UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';+import { UseFilters, UseInterceptors } from '@nestjs/common';import { Context, Parent, ResolveField } from '@nestjs/graphql';import { isNonEmptyString } from '@sniptt/guards';@@ -9,25 +9,11 @@ import { type I18nContext } from 'src/engine/core-modules/i18n/types/i18n-conteximport { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';import { SettingsMenuItemDTO } from 'src/engine/metadata-modules/settings-menu-item/dtos/settings-menu-item.dto';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)@MetadataResolver(() => SettingsMenuItemDTO)@UseFilters(AuthGraphqlApiExceptionFilter)diff --git a/packages/twenty-server/src/engine/metadata-modules/skill/skill.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/skill/skill.resolver.tsindex f66c9c10128..87839111004 100644--- a/packages/twenty-server/src/engine/metadata-modules/skill/skill.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/skill/skill.resolver.ts@@ -22,8 +22,6 @@ import { ApplicationTargetArg } from 'src/engine/decorators/auth/application-tarimport { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';import { CreateSkillInput } from 'src/engine/metadata-modules/skill/dtos/create-skill.input';@@ -35,10 +33,12 @@ import { SkillService } from 'src/engine/metadata-modules/skill/skill.service';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';import { ApplicationTargetGuard } from 'src/engine/guards/application-target.guard';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';-// Reads only need the AI flag so the chat composer can list skills; mutations need AI_SETTINGS-@UseGuards(- AuthPrincipalGuard({+// Reads only need the AI flag so the chat composer can list skills+const SKILL_READ_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {userSession: {standard: true,impersonated: true,@@ -48,9 +48,28 @@ import { ApplicationTargetGuard } from 'src/engine/guards/application-target.guaapiKey: true,oauthClient: true,application: true,- }),- SettingsPermissionGuard(PermissionFlagType.AI),-)+ },+ requiredPermissionFlags: [PermissionFlagType.AI],+};++const SKILL_WRITE_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [+ PermissionFlagType.AI,+ PermissionFlagType.AI_SETTINGS,+ ],+};+@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor,SkillGraphqlApiExceptionInterceptor,@@ -106,6 +125,7 @@ export class SkillResolver {}@Query(() => [SkillDTO])+ @UseGuards(AccessPolicyGuard(SKILL_READ_ACCESS_POLICY))async skills(@AuthWorkspace() workspace: WorkspaceEntity,@AuthApplication({ allowUndefined: true })@@ -124,7 +144,10 @@ export class SkillResolver {}@Query(() => SkillDTO, { nullable: true })- @UseGuards(ApplicationTargetGuard)+ @UseGuards(+ AccessPolicyGuard(SKILL_READ_ACCESS_POLICY),+ ApplicationTargetGuard,+ )async skill(@ApplicationTargetArg('id',@@ -142,7 +165,7 @@ export class SkillResolver {}@Mutation(() => SkillDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS))+ @UseGuards(AccessPolicyGuard(SKILL_WRITE_ACCESS_POLICY))async createSkill(@Args('input') input: CreateSkillInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -152,7 +175,7 @@ export class SkillResolver {@Mutation(() => SkillDTO)@UseGuards(- SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS),+ AccessPolicyGuard(SKILL_WRITE_ACCESS_POLICY),ApplicationTargetGuard,)async updateSkill(@@ -170,7 +193,7 @@ export class SkillResolver {@Mutation(() => SkillDTO)@UseGuards(- SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS),+ AccessPolicyGuard(SKILL_WRITE_ACCESS_POLICY),ApplicationTargetGuard,)async deleteSkill(@@ -191,7 +214,7 @@ export class SkillResolver {@Mutation(() => SkillDTO)@UseGuards(- SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS),+ AccessPolicyGuard(SKILL_WRITE_ACCESS_POLICY),ApplicationTargetGuard,)async activateSkill(@@ -212,7 +235,7 @@ export class SkillResolver {@Mutation(() => SkillDTO)@UseGuards(- SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS),+ AccessPolicyGuard(SKILL_WRITE_ACCESS_POLICY),ApplicationTargetGuard,)async deactivateSkill(diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.resolver.tsindex f518654cd5a..03229e1250d 100644--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.resolver.ts@@ -23,10 +23,6 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entimport { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { PermissionFlagType } from 'twenty-shared/constants';--import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';import { TimelineActivityTypeDTO } from 'src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type.dto';import { UpdateTimelineActivityTypeInput } from 'src/engine/metadata-modules/timeline-activity-type/dtos/update-timeline-activity-type.input';@@ -35,9 +31,11 @@ import { TimelineActivityTypeService } from 'src/engine/metadata-modules/timelinimport { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';-@UseGuards(- AuthPrincipalGuard({+const TIMELINE_ACTIVITY_TYPE_WRITE_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {userSession: {standard: true,impersonated: true,@@ -47,8 +45,10 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filtapiKey: true,oauthClient: true,application: true,- }),-)+ },+ requiredPermissionFlags: [PermissionFlagType.APPLICATIONS],+};+@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor,TimelineActivityTypeGraphqlApiExceptionInterceptor,@@ -89,7 +89,22 @@ export class TimelineActivityTypeResolver {}@Query(() => [TimelineActivityTypeDTO])- @UseGuards(NoPermissionGuard)+ @UseGuards(+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [],+ }),+ )async timelineActivityTypes(@AuthWorkspace() workspace: WorkspaceEntity,): Promise<TimelineActivityTypeDTO[]> {@@ -99,7 +114,7 @@ export class TimelineActivityTypeResolver {}@Mutation(() => TimelineActivityTypeDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))+ @UseGuards(AccessPolicyGuard(TIMELINE_ACTIVITY_TYPE_WRITE_ACCESS_POLICY))@UsePipes(ResolverValidationPipe)async updateTimelineActivityType(@Args('input') input: UpdateTimelineActivityTypeInput,@@ -112,7 +127,7 @@ export class TimelineActivityTypeResolver {}@Mutation(() => TimelineActivityTypeDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))+ @UseGuards(AccessPolicyGuard(TIMELINE_ACTIVITY_TYPE_WRITE_ACCESS_POLICY))async resetTimelineActivityType(@Args('id', { type: () => UUIDScalarType }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/validation-rule/validation-rule.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/validation-rule/validation-rule.resolver.tsindex 81a774a1aa9..fb6f77eb5cc 100644--- a/packages/twenty-server/src/engine/metadata-modules/validation-rule/validation-rule.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/validation-rule/validation-rule.resolver.ts@@ -7,27 +7,24 @@ import {UsePipes,} from '@nestjs/common';import { Args, Mutation, Query } from '@nestjs/graphql';--import { PermissionFlagType } from 'twenty-shared/constants';-import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { CreateValidationRuleInput } from 'src/engine/metadata-modules/validation-rule/dtos/create-validation-rule.input';import { ValidationRuleGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/validation-rule/filters/validation-rule-graphql-api-exception.filter';import { UpdateValidationRuleInput } from 'src/engine/metadata-modules/validation-rule/dtos/update-validation-rule.input';import { ValidationRuleDTO } from 'src/engine/metadata-modules/validation-rule/dtos/validation-rule.dto';import { ValidationRuleService } from 'src/engine/metadata-modules/validation-rule/validation-rule.service';import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';+import { VALIDATION_RULE_WRITE_ACCESS_POLICY } from 'src/engine/metadata-modules/validation-rule/constants/validation-rule-write-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';-@UseGuards(- AuthPrincipalGuard({+const VALIDATION_RULE_RESOLVER_READ_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {userSession: {standard: true,impersonated: true,@@ -37,8 +34,10 @@ import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/worapiKey: true,oauthClient: true,application: true,- }),-)+ },+ requiredPermissionFlags: [],+};+@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)@MetadataResolver(() => ValidationRuleDTO)@UseFilters(@@ -50,7 +49,7 @@ export class ValidationRuleResolver {constructor(private readonly validationRuleService: ValidationRuleService) {}@Query(() => [ValidationRuleDTO])- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(VALIDATION_RULE_RESOLVER_READ_ACCESS_POLICY))async validationRules(@Args('objectMetadataId', { type: () => UUIDScalarType })objectMetadataId: string,@@ -63,7 +62,7 @@ export class ValidationRuleResolver {}@Query(() => [ValidationRuleDTO])- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(VALIDATION_RULE_RESOLVER_READ_ACCESS_POLICY))async validationRulesReadingField(@Args('fieldMetadataId', { type: () => UUIDScalarType })fieldMetadataId: string,@@ -76,7 +75,7 @@ export class ValidationRuleResolver {}@Mutation(() => ValidationRuleDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.DATA_MODEL))+ @UseGuards(AccessPolicyGuard(VALIDATION_RULE_WRITE_ACCESS_POLICY))async createValidationRule(@Args('input') input: CreateValidationRuleInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -88,7 +87,7 @@ export class ValidationRuleResolver {}@Mutation(() => ValidationRuleDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.DATA_MODEL))+ @UseGuards(AccessPolicyGuard(VALIDATION_RULE_WRITE_ACCESS_POLICY))async updateValidationRule(@Args('input') input: UpdateValidationRuleInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -100,7 +99,7 @@ export class ValidationRuleResolver {}@Mutation(() => ValidationRuleDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.DATA_MODEL))+ @UseGuards(AccessPolicyGuard(VALIDATION_RULE_WRITE_ACCESS_POLICY))async deleteValidationRule(@Args('id', { type: () => UUIDScalarType }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field-group/resolvers/view-field-group.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/view-field-group/resolvers/view-field-group.resolver.tsindex 1f842c23a42..253d4ec0302 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-field-group/resolvers/view-field-group.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-field-group/resolvers/view-field-group.resolver.ts@@ -17,11 +17,8 @@ import { type I18nContext } from 'src/engine/core-modules/i18n/types/i18n-conteximport { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { CreateViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/create-view-child-entity-permission.guard';import { ViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/view-child-entity-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { CreateViewFieldGroupInput } from 'src/engine/metadata-modules/view-field-group/dtos/inputs/create-view-field-group.input';import { DeleteViewFieldGroupInput } from 'src/engine/metadata-modules/view-field-group/dtos/inputs/delete-view-field-group.input';import { DestroyViewFieldGroupInput } from 'src/engine/metadata-modules/view-field-group/dtos/inputs/destroy-view-field-group.input';@@ -37,11 +34,11 @@ import { type ViewEntity } from 'src/engine/metadata-modules/view/entities/view.import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/utils/view-graphql-api-exception.filter';import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';-@MetadataResolver(() => ViewFieldGroupDTO)-@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)-@UseGuards(- AuthPrincipalGuard({+const VIEW_FIELD_GROUP_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {userSession: {standard: true,impersonated: true,@@ -51,8 +48,12 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filtapiKey: true,oauthClient: true,application: true,- }),-)+ },+ requiredPermissionFlags: [],+};++@MetadataResolver(() => ViewFieldGroupDTO)+@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)export class ViewFieldGroupResolver {constructor(private readonly viewFieldGroupService: ViewFieldGroupService,@@ -86,7 +87,7 @@ export class ViewFieldGroupResolver {}@Query(() => [ViewFieldGroupDTO])- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(VIEW_FIELD_GROUP_ACCESS_POLICY))async getViewFieldGroups(@Args('viewId', { type: () => String }) viewId: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -95,7 +96,7 @@ export class ViewFieldGroupResolver {}@Query(() => ViewFieldGroupDTO, { nullable: true })- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(VIEW_FIELD_GROUP_ACCESS_POLICY))async getViewFieldGroup(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -104,7 +105,10 @@ export class ViewFieldGroupResolver {}@Mutation(() => ViewFieldGroupDTO)- @UseGuards(ViewChildEntityPermissionGuard('viewFieldGroup'))+ @UseGuards(+ AccessPolicyGuard(VIEW_FIELD_GROUP_ACCESS_POLICY),+ ViewChildEntityPermissionGuard('viewFieldGroup'),+ )async updateViewFieldGroup(@Args('input') updateViewFieldGroupInput: UpdateViewFieldGroupInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -116,7 +120,10 @@ export class ViewFieldGroupResolver {}@Mutation(() => ViewFieldGroupDTO)- @UseGuards(CreateViewChildEntityPermissionGuard)+ @UseGuards(+ AccessPolicyGuard(VIEW_FIELD_GROUP_ACCESS_POLICY),+ CreateViewChildEntityPermissionGuard,+ )async createViewFieldGroup(@Args('input')createViewFieldGroupInput: CreateViewFieldGroupInput,@@ -129,7 +136,10 @@ export class ViewFieldGroupResolver {}@Mutation(() => [ViewFieldGroupDTO])- @UseGuards(CreateViewChildEntityPermissionGuard)+ @UseGuards(+ AccessPolicyGuard(VIEW_FIELD_GROUP_ACCESS_POLICY),+ CreateViewChildEntityPermissionGuard,+ )async createManyViewFieldGroups(@Args('inputs', { type: () => [CreateViewFieldGroupInput] })createViewFieldGroupInputs: CreateViewFieldGroupInput[],@@ -142,7 +152,10 @@ export class ViewFieldGroupResolver {}@Mutation(() => ViewFieldGroupDTO)- @UseGuards(ViewChildEntityPermissionGuard('viewFieldGroup'))+ @UseGuards(+ AccessPolicyGuard(VIEW_FIELD_GROUP_ACCESS_POLICY),+ ViewChildEntityPermissionGuard('viewFieldGroup'),+ )async deleteViewFieldGroup(@Args('input') deleteViewFieldGroupInput: DeleteViewFieldGroupInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -154,7 +167,10 @@ export class ViewFieldGroupResolver {}@Mutation(() => ViewFieldGroupDTO)- @UseGuards(ViewChildEntityPermissionGuard('viewFieldGroup'))+ @UseGuards(+ AccessPolicyGuard(VIEW_FIELD_GROUP_ACCESS_POLICY),+ ViewChildEntityPermissionGuard('viewFieldGroup'),+ )async destroyViewFieldGroup(@Args('input')destroyViewFieldGroupInput: DestroyViewFieldGroupInput,@@ -167,7 +183,22 @@ export class ViewFieldGroupResolver {}@Mutation(() => ViewDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [PermissionFlagType.LAYOUTS],+ }),+ )@UsePipes(ResolverValidationPipe)async upsertFieldsWidget(@Args('input') input: UpsertFieldsWidgetInput,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/constants/view-field-access-policy.constant.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/constants/view-field-access-policy.constant.tsnew file mode 100644index 00000000000..d521713912b--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/constants/view-field-access-policy.constant.ts@@ -0,0 +1,16 @@+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';++export const VIEW_FIELD_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [],+};diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.tsindex ca2b9a0cf72..6cdd7e712f9 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.ts@@ -19,8 +19,6 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entimport { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { FlatEntityMapsRestApiExceptionFilter } from 'src/engine/metadata-modules/flat-entity/filters/flat-entity-maps-rest-api-exception.filter';import { PermissionsRestApiExceptionFilter } from 'src/engine/permissions/utils/permissions-rest-api-exception.filter';import { CreateViewFieldInput } from 'src/engine/metadata-modules/view-field/dtos/inputs/create-view-field.input';@@ -39,21 +37,11 @@ import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/worksimport { CreateViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/create-view-child-entity-permission.guard';import { ViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/view-child-entity-permission.guard';import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';+import { VIEW_FIELD_ACCESS_POLICY } from 'src/engine/metadata-modules/view-field/constants/view-field-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@Controller(`${ApiPath.Rest}/metadata/viewFields`)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)+@UseGuards(AccessPolicyGuard(VIEW_FIELD_ACCESS_POLICY))@UseFilters(PermissionsRestApiExceptionFilter,ViewFieldRestApiExceptionFilter,@@ -65,7 +53,6 @@ export class ViewFieldController {constructor(private readonly viewFieldService: ViewFieldService) {}@Get()- @UseGuards(NoPermissionGuard)async findMany(@Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,@@ -79,7 +66,6 @@ export class ViewFieldController {}@Get(':id')- @UseGuards(NoPermissionGuard)async findOne(@Param('id') id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/resolvers/view-field.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/resolvers/view-field.resolver.tsindex 6317b303321..00ae9f61805 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-field/resolvers/view-field.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/resolvers/view-field.resolver.ts@@ -4,8 +4,6 @@ import { Args, Mutation, Query } from '@nestjs/graphql';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { CreateViewFieldInput } from 'src/engine/metadata-modules/view-field/dtos/inputs/create-view-field.input';import { DeleteViewFieldInput } from 'src/engine/metadata-modules/view-field/dtos/inputs/delete-view-field.input';import { DestroyViewFieldInput } from 'src/engine/metadata-modules/view-field/dtos/inputs/destroy-view-field.input';@@ -16,27 +14,16 @@ import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/import { CreateViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/create-view-child-entity-permission.guard';import { ViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/view-child-entity-permission.guard';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { VIEW_FIELD_ACCESS_POLICY } from 'src/engine/metadata-modules/view-field/constants/view-field-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@MetadataResolver(() => ViewFieldDTO)@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)+@UseGuards(AccessPolicyGuard(VIEW_FIELD_ACCESS_POLICY))export class ViewFieldResolver {constructor(private readonly viewFieldService: ViewFieldService) {}@Query(() => [ViewFieldDTO])- @UseGuards(NoPermissionGuard)async getViewFields(@Args('viewId', { type: () => String }) viewId: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -45,7 +32,6 @@ export class ViewFieldResolver {}@Query(() => ViewFieldDTO, { nullable: true })- @UseGuards(NoPermissionGuard)async getViewField(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/constants/view-filter-group-access-policy.constant.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/constants/view-filter-group-access-policy.constant.tsnew file mode 100644index 00000000000..f48f2d15ffb--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/constants/view-filter-group-access-policy.constant.ts@@ -0,0 +1,16 @@+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';++export const VIEW_FILTER_GROUP_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [],+};diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.tsindex a130cd5b3fa..f4c4e8d89a0 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.ts@@ -19,8 +19,6 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspacimport { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { FlatEntityMapsRestApiExceptionFilter } from 'src/engine/metadata-modules/flat-entity/filters/flat-entity-maps-rest-api-exception.filter';import { PermissionsRestApiExceptionFilter } from 'src/engine/permissions/utils/permissions-rest-api-exception.filter';import { type CreateViewFilterGroupInput } from 'src/engine/metadata-modules/view-filter-group/dtos/inputs/create-view-filter-group.input';@@ -39,21 +37,11 @@ import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/worksimport { CreateViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/create-view-child-entity-permission.guard';import { ViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/view-child-entity-permission.guard';import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';+import { VIEW_FILTER_GROUP_ACCESS_POLICY } from 'src/engine/metadata-modules/view-filter-group/constants/view-filter-group-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@Controller(`${ApiPath.Rest}/metadata/viewFilterGroups`)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)+@UseGuards(AccessPolicyGuard(VIEW_FILTER_GROUP_ACCESS_POLICY))@UseFilters(PermissionsRestApiExceptionFilter,ViewFilterGroupRestApiExceptionFilter,@@ -67,7 +55,6 @@ export class ViewFilterGroupController {) {}@Get()- @UseGuards(NoPermissionGuard)async findMany(@Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,@@ -81,7 +68,6 @@ export class ViewFilterGroupController {}@Get(':id')- @UseGuards(NoPermissionGuard)async findOne(@Param('id') id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/resolvers/view-filter-group.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/resolvers/view-filter-group.resolver.tsindex 13d7a1d6f7e..5e54902cbc1 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/resolvers/view-filter-group.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/resolvers/view-filter-group.resolver.ts@@ -6,8 +6,6 @@ import { isDefined } from 'twenty-shared/utils';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { CreateViewFilterGroupInput } from 'src/engine/metadata-modules/view-filter-group/dtos/inputs/create-view-filter-group.input';import { UpdateViewFilterGroupInput } from 'src/engine/metadata-modules/view-filter-group/dtos/inputs/update-view-filter-group.input';import { ViewFilterGroupDTO } from 'src/engine/metadata-modules/view-filter-group/dtos/view-filter-group.dto';@@ -16,29 +14,18 @@ import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/import { CreateViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/create-view-child-entity-permission.guard';import { ViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/view-child-entity-permission.guard';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { VIEW_FILTER_GROUP_ACCESS_POLICY } from 'src/engine/metadata-modules/view-filter-group/constants/view-filter-group-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@MetadataResolver(() => ViewFilterGroupDTO)@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)+@UseGuards(AccessPolicyGuard(VIEW_FILTER_GROUP_ACCESS_POLICY))export class ViewFilterGroupResolver {constructor(private readonly viewFilterGroupService: ViewFilterGroupService,) {}@Query(() => [ViewFilterGroupDTO])- @UseGuards(NoPermissionGuard)async getViewFilterGroups(@AuthWorkspace() workspace: WorkspaceEntity,@Args('viewId', { type: () => String, nullable: true })@@ -52,7 +39,6 @@ export class ViewFilterGroupResolver {}@Query(() => ViewFilterGroupDTO, { nullable: true })- @UseGuards(NoPermissionGuard)async getViewFilterGroup(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter/constants/view-filter-access-policy.constant.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter/constants/view-filter-access-policy.constant.tsnew file mode 100644index 00000000000..cf36b34c881--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter/constants/view-filter-access-policy.constant.ts@@ -0,0 +1,16 @@+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';++export const VIEW_FILTER_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [],+};diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.tsindex 7c955701c3c..203ff375d7a 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.ts@@ -19,8 +19,6 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entimport { parseMetadataRestPagination } from 'src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util';import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { FlatEntityMapsRestApiExceptionFilter } from 'src/engine/metadata-modules/flat-entity/filters/flat-entity-maps-rest-api-exception.filter';import { PermissionsRestApiExceptionFilter } from 'src/engine/permissions/utils/permissions-rest-api-exception.filter';import { CreateViewFilterInput } from 'src/engine/metadata-modules/view-filter/dtos/inputs/create-view-filter.input';@@ -39,21 +37,11 @@ import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/worksimport { CreateViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/create-view-child-entity-permission.guard';import { ViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/view-child-entity-permission.guard';import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';+import { VIEW_FILTER_ACCESS_POLICY } from 'src/engine/metadata-modules/view-filter/constants/view-filter-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@Controller(`${ApiPath.Rest}/metadata/viewFilters`)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)+@UseGuards(AccessPolicyGuard(VIEW_FILTER_ACCESS_POLICY))@UseFilters(PermissionsRestApiExceptionFilter,ViewFilterRestApiExceptionFilter,@@ -65,7 +53,6 @@ export class ViewFilterController {constructor(private readonly viewFilterService: ViewFilterService) {}@Get()- @UseGuards(NoPermissionGuard)async findMany(@Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,@@ -85,7 +72,6 @@ export class ViewFilterController {}@Get(':id')- @UseGuards(NoPermissionGuard)async findOne(@Param('id') id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter/resolvers/view-filter.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter/resolvers/view-filter.resolver.tsindex e8a21afb008..dfb28cc1c2a 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-filter/resolvers/view-filter.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter/resolvers/view-filter.resolver.ts@@ -4,8 +4,6 @@ import { Args, Mutation, Query } from '@nestjs/graphql';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { CreateViewFilterInput } from 'src/engine/metadata-modules/view-filter/dtos/inputs/create-view-filter.input';import { DeleteViewFilterInput } from 'src/engine/metadata-modules/view-filter/dtos/inputs/delete-view-filter.input';import { DestroyViewFilterInput } from 'src/engine/metadata-modules/view-filter/dtos/inputs/destroy-view-filter.input';@@ -16,27 +14,16 @@ import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/import { CreateViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/create-view-child-entity-permission.guard';import { ViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/view-child-entity-permission.guard';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { VIEW_FILTER_ACCESS_POLICY } from 'src/engine/metadata-modules/view-filter/constants/view-filter-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@MetadataResolver(() => ViewFilterDTO)@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)+@UseGuards(AccessPolicyGuard(VIEW_FILTER_ACCESS_POLICY))export class ViewFilterResolver {constructor(private readonly viewFilterService: ViewFilterService) {}@Query(() => [ViewFilterDTO])- @UseGuards(NoPermissionGuard)async getViewFilters(@AuthWorkspace() workspace: WorkspaceEntity,@Args('viewId', { type: () => String, nullable: true })@@ -50,7 +37,6 @@ export class ViewFilterResolver {}@Query(() => ViewFilterDTO, { nullable: true })- @UseGuards(NoPermissionGuard)async getViewFilter(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-group/constants/view-group-access-policy.constant.ts b/packages/twenty-server/src/engine/metadata-modules/view-group/constants/view-group-access-policy.constant.tsnew file mode 100644index 00000000000..6af5f83835b--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/view-group/constants/view-group-access-policy.constant.ts@@ -0,0 +1,16 @@+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';++export const VIEW_GROUP_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [],+};diff --git a/packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.tsindex 4aa49f9b81c..a6fee35af62 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.ts@@ -19,8 +19,6 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entimport { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { FlatEntityMapsRestApiExceptionFilter } from 'src/engine/metadata-modules/flat-entity/filters/flat-entity-maps-rest-api-exception.filter';import { PermissionsRestApiExceptionFilter } from 'src/engine/permissions/utils/permissions-rest-api-exception.filter';import { CreateViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/create-view-group.input';@@ -39,21 +37,11 @@ import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/worksimport { CreateViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/create-view-child-entity-permission.guard';import { ViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/view-child-entity-permission.guard';import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';+import { VIEW_GROUP_ACCESS_POLICY } from 'src/engine/metadata-modules/view-group/constants/view-group-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@Controller(`${ApiPath.Rest}/metadata/viewGroups`)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)+@UseGuards(AccessPolicyGuard(VIEW_GROUP_ACCESS_POLICY))@UseFilters(PermissionsRestApiExceptionFilter,ViewGroupRestApiExceptionFilter,@@ -65,7 +53,6 @@ export class ViewGroupController {constructor(private readonly viewGroupService: ViewGroupService) {}@Get()- @UseGuards(NoPermissionGuard)async findMany(@Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,@@ -79,7 +66,6 @@ export class ViewGroupController {}@Get(':id')- @UseGuards(NoPermissionGuard)async findOne(@Param('id') id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-group/resolvers/view-group.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/view-group/resolvers/view-group.resolver.tsindex 0d3e8ad0f73..544317640df 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-group/resolvers/view-group.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-group/resolvers/view-group.resolver.ts@@ -4,8 +4,6 @@ import { Args, Mutation, Query } from '@nestjs/graphql';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { CreateViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/create-view-group.input';import { DeleteViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/delete-view-group.input';import { DestroyViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/destroy-view-group.input';@@ -16,27 +14,16 @@ import { ViewGroupGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/import { CreateViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/create-view-child-entity-permission.guard';import { ViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/view-child-entity-permission.guard';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { VIEW_GROUP_ACCESS_POLICY } from 'src/engine/metadata-modules/view-group/constants/view-group-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@MetadataResolver(() => ViewGroupDTO)@UseFilters(ViewGroupGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)+@UseGuards(AccessPolicyGuard(VIEW_GROUP_ACCESS_POLICY))export class ViewGroupResolver {constructor(private readonly viewGroupService: ViewGroupService) {}@Query(() => [ViewGroupDTO])- @UseGuards(NoPermissionGuard)async getViewGroups(@AuthWorkspace() workspace: WorkspaceEntity,@Args('viewId', { type: () => String, nullable: true })@@ -50,7 +37,6 @@ export class ViewGroupResolver {}@Query(() => ViewGroupDTO, { nullable: true })- @UseGuards(NoPermissionGuard)async getViewGroup(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-sort/constants/view-sort-access-policy.constant.ts b/packages/twenty-server/src/engine/metadata-modules/view-sort/constants/view-sort-access-policy.constant.tsnew file mode 100644index 00000000000..dc58608f905--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/view-sort/constants/view-sort-access-policy.constant.ts@@ -0,0 +1,16 @@+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';++export const VIEW_SORT_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [],+};diff --git a/packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.tsindex 975e0b53b0e..c2cae4362f4 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.ts@@ -19,8 +19,6 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entimport { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { FlatEntityMapsRestApiExceptionFilter } from 'src/engine/metadata-modules/flat-entity/filters/flat-entity-maps-rest-api-exception.filter';import { PermissionsRestApiExceptionFilter } from 'src/engine/permissions/utils/permissions-rest-api-exception.filter';import { CreateViewSortInput } from 'src/engine/metadata-modules/view-sort/dtos/inputs/create-view-sort.input';@@ -38,20 +36,11 @@ import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/worksimport { CreateViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/create-view-child-entity-permission.guard';import { ViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/view-child-entity-permission.guard';import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';+import { VIEW_SORT_ACCESS_POLICY } from 'src/engine/metadata-modules/view-sort/constants/view-sort-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';+@Controller(`${ApiPath.Rest}/metadata/viewSorts`)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)+@UseGuards(AccessPolicyGuard(VIEW_SORT_ACCESS_POLICY))@UseFilters(PermissionsRestApiExceptionFilter,ViewSortRestApiExceptionFilter,@@ -63,7 +52,6 @@ export class ViewSortController {constructor(private readonly viewSortService: ViewSortService) {}@Get()- @UseGuards(NoPermissionGuard)async findMany(@Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,@@ -77,7 +65,6 @@ export class ViewSortController {}@Get(':id')- @UseGuards(NoPermissionGuard)async findOne(@Param('id') id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-sort/resolvers/view-sort.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/view-sort/resolvers/view-sort.resolver.tsindex 1b7d39582ec..cb5a4789761 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-sort/resolvers/view-sort.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-sort/resolvers/view-sort.resolver.ts@@ -6,8 +6,6 @@ import { isDefined } from 'class-validator';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { CreateViewSortInput } from 'src/engine/metadata-modules/view-sort/dtos/inputs/create-view-sort.input';import { UpdateViewSortInput } from 'src/engine/metadata-modules/view-sort/dtos/inputs/update-view-sort.input';import { ViewSortDTO } from 'src/engine/metadata-modules/view-sort/dtos/view-sort.dto';@@ -18,27 +16,16 @@ import { DestroyViewSortInput } from 'src/engine/metadata-modules/view-sort/dtosimport { CreateViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/create-view-child-entity-permission.guard';import { ViewChildEntityPermissionGuard } from 'src/engine/permissions/view/guards/view-child-entity-permission.guard';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { VIEW_SORT_ACCESS_POLICY } from 'src/engine/metadata-modules/view-sort/constants/view-sort-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@MetadataResolver(() => ViewSortDTO)@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)+@UseGuards(AccessPolicyGuard(VIEW_SORT_ACCESS_POLICY))export class ViewSortResolver {constructor(private readonly viewSortService: ViewSortService) {}@Query(() => [ViewSortDTO])- @UseGuards(NoPermissionGuard)async getViewSorts(@AuthWorkspace() workspace: WorkspaceEntity,@Args('viewId', { type: () => String, nullable: true })@@ -52,7 +39,6 @@ export class ViewSortResolver {}@Query(() => ViewSortDTO, { nullable: true })- @UseGuards(NoPermissionGuard)async getViewSort(@Args('id', { type: () => String }) id: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view/constants/view-write-by-visibility-access-policy.constant.ts b/packages/twenty-server/src/engine/metadata-modules/view/constants/view-write-by-visibility-access-policy.constant.tsnew file mode 100644index 00000000000..7070b367bfb--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/view/constants/view-write-by-visibility-access-policy.constant.ts@@ -0,0 +1,18 @@+import { type AccessPolicy } from 'src/engine/guards/types/access-policy.type';++// The view permission guards check VIEWS per view, exempting the caller's+// own unlisted views+export const VIEW_WRITE_BY_VISIBILITY_ACCESS_POLICY: AccessPolicy = {+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [],+};diff --git a/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.tsindex 28b033fefe4..725db53e8c1 100644--- a/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts@@ -26,8 +26,6 @@ import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspimport { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { RequestLocale } from 'src/engine/decorators/locale/request-locale.decorator';import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';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';import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';@@ -52,21 +50,11 @@ import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/worksimport { ViewPermissionGuard } from 'src/engine/permissions/view/guards/view-permission.guard';import { CreateViewPermissionGuard } from 'src/engine/permissions/view/guards/create-view-permission.guard';import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';+import { VIEW_READ_ACCESS_POLICY } from 'src/engine/metadata-modules/view/constants/view-read-access-policy.constant';+import { VIEW_WRITE_BY_VISIBILITY_ACCESS_POLICY } from 'src/engine/metadata-modules/view/constants/view-write-by-visibility-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@Controller(`${ApiPath.Rest}/metadata/views`)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)@UseFilters(PermissionsRestApiExceptionFilter,ViewRestApiExceptionFilter,@@ -82,7 +70,7 @@ export class ViewController {) {}@Get()- @UseGuards(CustomPermissionGuard)+ @UseGuards(AccessPolicyGuard(VIEW_READ_ACCESS_POLICY), CustomPermissionGuard)async findMany(@Req() request: AuthenticatedRequest,@RequestLocale() locale: keyof typeof APP_LOCALES | undefined,@@ -110,7 +98,7 @@ export class ViewController {}@Get(':id')- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(VIEW_READ_ACCESS_POLICY))async findOne(@Param('id') id: string,@RequestLocale() locale: keyof typeof APP_LOCALES | undefined,@@ -143,7 +131,10 @@ export class ViewController {}@Post()- @UseGuards(CreateViewPermissionGuard)+ @UseGuards(+ AccessPolicyGuard(VIEW_WRITE_BY_VISIBILITY_ACCESS_POLICY),+ CreateViewPermissionGuard,+ )async create(@Body() input: CreateViewInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -164,7 +155,10 @@ export class ViewController {}@Patch(':id')- @UseGuards(ViewPermissionGuard)+ @UseGuards(+ AccessPolicyGuard(VIEW_WRITE_BY_VISIBILITY_ACCESS_POLICY),+ ViewPermissionGuard,+ )@UsePipes(new ValidationPipe())async update(@Param('id') id: string,@@ -193,7 +187,10 @@ export class ViewController {}@Delete(':id')- @UseGuards(ViewPermissionGuard)+ @UseGuards(+ AccessPolicyGuard(VIEW_WRITE_BY_VISIBILITY_ACCESS_POLICY),+ ViewPermissionGuard,+ )async delete(@Param('id') id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view/resolvers/view.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/view/resolvers/view.resolver.tsindex 90cb0b4bb4c..b27f0775382 100644--- a/packages/twenty-server/src/engine/metadata-modules/view/resolvers/view.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view/resolvers/view.resolver.ts@@ -25,9 +25,6 @@ import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspimport { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';-import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';-import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';-import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { buildViewNameObjectLabels } from 'src/engine/metadata-modules/view/utils/build-view-name-object-labels.util';import { resolveViewName } from 'src/engine/metadata-modules/view/utils/resolve-view-name.util';import { ViewFieldGroupDTO } from 'src/engine/metadata-modules/view-field-group/dtos/view-field-group.dto';@@ -49,22 +46,12 @@ import { ViewPermissionGuard } from 'src/engine/permissions/view/guards/view-perimport { CreateViewPermissionGuard } from 'src/engine/permissions/view/guards/create-view-permission.guard';import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { VIEW_READ_ACCESS_POLICY } from 'src/engine/metadata-modules/view/constants/view-read-access-policy.constant';+import { VIEW_WRITE_BY_VISIBILITY_ACCESS_POLICY } from 'src/engine/metadata-modules/view/constants/view-write-by-visibility-access-policy.constant';+import { AccessPolicyGuard } from 'src/engine/guards/access-policy.guard';@MetadataResolver(() => ViewDTO)@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)-@UseGuards(- AuthPrincipalGuard({- userSession: {- standard: true,- impersonated: true,- playground: true,- workspaceAgnostic: false,- },- apiKey: true,- oauthClient: true,- application: true,- }),-)export class ViewResolver {constructor(private readonly viewService: ViewService,@@ -151,7 +138,7 @@ export class ViewResolver {}@Query(() => [ViewDTO])- @UseGuards(CustomPermissionGuard)+ @UseGuards(AccessPolicyGuard(VIEW_READ_ACCESS_POLICY), CustomPermissionGuard)@AllowSuspendedWorkspace()async getViews(@AuthWorkspace() workspace: WorkspaceEntity,@@ -179,7 +166,7 @@ export class ViewResolver {}@Query(() => ViewDTO, { nullable: true })- @UseGuards(NoPermissionGuard)+ @UseGuards(AccessPolicyGuard(VIEW_READ_ACCESS_POLICY))async getView(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -194,7 +181,10 @@ export class ViewResolver {}@Mutation(() => ViewDTO)- @UseGuards(CreateViewPermissionGuard)+ @UseGuards(+ AccessPolicyGuard(VIEW_WRITE_BY_VISIBILITY_ACCESS_POLICY),+ CreateViewPermissionGuard,+ )async createView(@Args('input') input: CreateViewInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -213,7 +203,10 @@ export class ViewResolver {}@Mutation(() => ViewDTO)- @UseGuards(ViewPermissionGuard)+ @UseGuards(+ AccessPolicyGuard(VIEW_WRITE_BY_VISIBILITY_ACCESS_POLICY),+ ViewPermissionGuard,+ )@UsePipes(ResolverValidationPipe)async updateView(@Args('id', { type: () => String }) id: string,@@ -230,7 +223,10 @@ export class ViewResolver {}@Mutation(() => Boolean)- @UseGuards(ViewPermissionGuard)+ @UseGuards(+ AccessPolicyGuard(VIEW_WRITE_BY_VISIBILITY_ACCESS_POLICY),+ ViewPermissionGuard,+ )async deleteView(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -244,7 +240,10 @@ export class ViewResolver {}@Mutation(() => Boolean)- @UseGuards(ViewPermissionGuard)+ @UseGuards(+ AccessPolicyGuard(VIEW_WRITE_BY_VISIBILITY_ACCESS_POLICY),+ ViewPermissionGuard,+ )async destroyView(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -258,7 +257,22 @@ export class ViewResolver {}@Mutation(() => ViewDTO)- @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))+ @UseGuards(+ AccessPolicyGuard({+ authPrincipals: {+ userSession: {+ standard: true,+ impersonated: true,+ playground: true,+ workspaceAgnostic: false,+ },+ apiKey: true,+ oauthClient: true,+ application: true,+ },+ requiredPermissionFlags: [PermissionFlagType.LAYOUTS],+ }),+ )@UsePipes(ResolverValidationPipe)async upsertViewWidget(@Args('input') input: UpsertViewWidgetInput,diff --git a/packages/twenty-server/src/engine/permissions/access-policy/access-policy.module.ts b/packages/twenty-server/src/engine/permissions/access-policy/access-policy.module.tsnew file mode 100644index 00000000000..0b43cb74537--- /dev/null+++ b/packages/twenty-server/src/engine/permissions/access-policy/access-policy.module.ts@@ -0,0 +1,14 @@+import { Global, Module } from '@nestjs/common';++import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';+import { AccessPolicyService } from 'src/engine/permissions/access-policy/access-policy.service';+import { PermissionsModule } from 'src/engine/permissions/permissions.module';++// Global so AccessPolicyGuard resolves on any endpoint without its module importing this one+@Global()+@Module({+ imports: [PermissionsModule, FeatureFlagModule],+ providers: [AccessPolicyService],+ exports: [AccessPolicyService],+})+export class AccessPolicyModule {}diff --git a/packages/twenty-server/src/engine/permissions/permissions.module.ts b/packages/twenty-server/src/engine/permissions/permissions.module.tsindex 29937e12462..422730aaaaf 100644--- a/packages/twenty-server/src/engine/permissions/permissions.module.ts+++ b/packages/twenty-server/src/engine/permissions/permissions.module.ts@@ -3,8 +3,6 @@ import { TypeOrmModule } from '@nestjs/typeorm';import { ApiKeyEntity } from 'src/engine/core-modules/api-key/api-key.entity';import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';-import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';-import { AccessPolicyService } from 'src/engine/permissions/access-policy/access-policy.service';import { PermissionsService } from 'src/engine/permissions/permissions.service';import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity';import { RoleTargetModule } from 'src/engine/metadata-modules/role-target/role-target.module';@@ -17,16 +15,14 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheTypeOrmModule.forFeature([RoleEntity, RoleTargetEntity, ApiKeyEntity]),WorkspaceCacheModule,RoleTargetModule,- FeatureFlagModule,],providers: [- AccessPolicyService,ApiKeyRoleService,PermissionsService,provideWorkspaceScopedRepository(ApiKeyEntity),provideWorkspaceScopedRepository(RoleEntity),provideWorkspaceScopedRepository(RoleTargetEntity),],- exports: [AccessPolicyService, PermissionsService, ApiKeyRoleService],+ exports: [PermissionsService, ApiKeyRoleService],})export class PermissionsModule {}