Skip to content

The open alternative to Salesforce, designed for AI.

Replace the principal-type auth guards with AuthPrincipalGuard (#26936)

Paul Rastoin2260c77e6a2c
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.ts
index 9d646412c02..dccc2b0cb15 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
@@ -2,6 +2,12 @@ import { RuleTester } from 'oxlint/plugins-dev';
import { rule, RULE_NAME } from './graphql-resolvers-should-be-guarded';
+const ACCEPT_EVERY_PRINCIPAL =
+ 'AuthPrincipalGuard({ userSession: true, apiKey: true, oauthClient: true, application: true })';
+
+const ACCEPT_USER_SESSIONS =
+ 'AuthPrincipalGuard({ userSession: true, apiKey: false, oauthClient: false, application: false })';
+
const ruleTester = new RuleTester();
ruleTester.run(RULE_NAME, rule, {
@@ -10,7 +16,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestResolver {
@Query()
- @UseGuards(UserAuthGuard, NoPermissionGuard)
+ @UseGuards(${ACCEPT_USER_SESSIONS}, NoPermissionGuard)
testQuery() {}
}
`,
@@ -20,7 +26,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestResolver {
@Query()
- @UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, CustomPermissionGuard)
testQuery() {}
}
`,
@@ -38,7 +44,7 @@ ruleTester.run(RULE_NAME, rule, {
},
{
code: `
- @UseGuards(UserAuthGuard, NoPermissionGuard)
+ @UseGuards(${ACCEPT_USER_SESSIONS}, NoPermissionGuard)
class TestResolver {
@Query()
testQuery() {}
@@ -48,7 +54,7 @@ ruleTester.run(RULE_NAME, rule, {
},
{
code: `
- @UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, CustomPermissionGuard)
class TestResolver {
@Query()
testQuery() {}
@@ -70,7 +76,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestResolver {
@Subscription()
- @UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, NoPermissionGuard)
testSubscription() {}
}
`,
@@ -78,7 +84,7 @@ ruleTester.run(RULE_NAME, rule, {
},
{
code: `
- @UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, NoPermissionGuard)
class TestResolver {
@Subscription()
testSubscription() {}
@@ -104,7 +110,7 @@ ruleTester.run(RULE_NAME, rule, {
},
{
code: `
- @UseGuards(WorkspaceAuthGuard, SettingsPermissionGuard(PermissionFlagType.WORKSPACE))
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, SettingsPermissionGuard(PermissionFlagType.WORKSPACE))
class TestResolver {
@Mutation(() => String)
async createSomething() {}
@@ -116,7 +122,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestResolver {
@Mutation(() => String)
- @UseGuards(WorkspaceAuthGuard, SettingsPermissionGuard(PermissionFlagType.WORKSPACE))
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, SettingsPermissionGuard(PermissionFlagType.WORKSPACE))
async createSomething() {}
}
`,
@@ -126,7 +132,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestResolver {
@Mutation(() => String)
- @UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, CustomPermissionGuard)
async createSomething() {}
}
`,
@@ -134,7 +140,7 @@ ruleTester.run(RULE_NAME, rule, {
},
{
code: `
- @UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, CustomPermissionGuard)
class TestResolver {
@Mutation(() => String)
async createSomething() {}
@@ -142,6 +148,113 @@ ruleTester.run(RULE_NAME, rule, {
`,
filename: 'test.tsx',
},
+ {
+ code: `
+ class TestResolver {
+ @Query()
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: false,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ NoPermissionGuard,
+ )
+ testQuery() {}
+ }
+ `,
+ filename: 'test.tsx',
+ },
+ {
+ code: `
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, NoPermissionGuard)
+ class TestResolver {
+ @Mutation(() => String)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ )
+ async createSomething() {}
+ }
+ `,
+ filename: 'test.tsx',
+ },
+ {
+ code: `
+ @UseGuards(${ACCEPT_USER_SESSIONS}, NoPermissionGuard)
+ class TestResolver {
+ @Query()
+ @UseGuards(${ACCEPT_USER_SESSIONS})
+ testQuery() {}
+ }
+ `,
+ filename: 'test.tsx',
+ },
+ {
+ code: `
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: true,
+ }),
+ NoPermissionGuard,
+ )
+ class TestResolver {
+ @Query()
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: false,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ )
+ testQuery() {}
+ }
+ `,
+ filename: 'test.tsx',
+ },
+ {
+ code: `
+ class TestResolver {
+ @Query()
+ @UseGuards(
+ ${ACCEPT_EVERY_PRINCIPAL},
+ FeatureFlagGuard,
+ SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
+ )
+ testQuery() {}
+ }
+ `,
+ filename: 'test.tsx',
+ },
],
invalid: [
{
@@ -190,7 +303,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestResolver {
@Query()
- @UseGuards(UserAuthGuard)
+ @UseGuards(${ACCEPT_USER_SESSIONS})
testQuery() {}
}
`,
@@ -235,7 +348,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestResolver {
@Subscription()
- @UseGuards(WorkspaceAuthGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL})
testSubscription() {}
}
`,
@@ -248,7 +361,7 @@ ruleTester.run(RULE_NAME, rule, {
},
{
code: `
- @UseGuards(WorkspaceAuthGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL})
class TestResolver {
@Subscription()
testSubscription() {}
@@ -265,7 +378,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestResolver {
@Mutation(() => String)
- @UseGuards(WorkspaceAuthGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL})
async createSomething() {}
}
`,
@@ -278,7 +391,7 @@ ruleTester.run(RULE_NAME, rule, {
},
{
code: `
- @UseGuards(WorkspaceAuthGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL})
class TestResolver {
@Mutation(() => String)
async createSomething() {}
@@ -291,5 +404,147 @@ ruleTester.run(RULE_NAME, rule, {
],
filename: 'test.tsx',
},
+ ...[
+ 'AuthPrincipalGuard(AUTH_PRINCIPAL_GUARD_CONFIG)',
+ 'AuthPrincipalGuard({ ...USER_SESSIONS_ONLY, apiKey: true })',
+ 'AuthPrincipalGuard({ userSession: USER_SESSION_VARIANTS, apiKey: false, oauthClient: false, application: false })',
+ 'AuthPrincipalGuard({ userSession, apiKey: false, oauthClient: false, application: false })',
+ 'AuthPrincipalGuard()',
+ ].map((authPrincipalGuard) => ({
+ code: `
+ class TestResolver {
+ @Query()
+ @UseGuards(${authPrincipalGuard}, NoPermissionGuard)
+ testQuery() {}
+ }
+ `,
+ errors: [
+ { messageId: 'graphqlResolversShouldBeGuarded' },
+ { messageId: 'authPrincipalGuardConfigNotInline' },
+ ],
+ filename: 'test.tsx',
+ })),
+ {
+ code: `
+ @UseGuards(AuthPrincipalGuard(AUTH_PRINCIPAL_GUARD_CONFIG), NoPermissionGuard)
+ class TestResolver {
+ @Query()
+ testQuery() {}
+ }
+ `,
+ errors: [
+ { messageId: 'authPrincipalGuardConfigNotInline' },
+ { messageId: 'graphqlResolversShouldBeGuarded' },
+ ],
+ filename: 'test.tsx',
+ },
+ {
+ code: `
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ NoPermissionGuard,
+ )
+ class TestResolver {
+ @Query()
+ @UseGuards(${ACCEPT_USER_SESSIONS})
+ testQuery() {}
+ }
+ `,
+ errors: [
+ {
+ messageId: 'authPrincipalGuardWiderThanClass',
+ data: { principalVariants: 'userSession.workspaceAgnostic' },
+ },
+ ],
+ filename: 'test.tsx',
+ },
+ {
+ code: `
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: false,
+ apiKey: true,
+ oauthClient: false,
+ application: { withUser: true, withoutUser: false },
+ }),
+ NoPermissionGuard,
+ )
+ class TestResolver {
+ @Mutation()
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: false,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: false,
+ application: true,
+ }),
+ )
+ testMutation() {}
+ }
+ `,
+ errors: [
+ {
+ messageId: 'authPrincipalGuardWiderThanClass',
+ data: {
+ principalVariants: 'userSession.standard, application.withoutUser',
+ },
+ },
+ ],
+ filename: 'test.tsx',
+ },
+ {
+ code: `
+ @UseGuards(${ACCEPT_USER_SESSIONS}, NoPermissionGuard)
+ class TestResolver {
+ @Query()
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL})
+ testQuery() {}
+ }
+ `,
+ errors: [
+ {
+ messageId: 'authPrincipalGuardWiderThanClass',
+ data: { principalVariants: 'apiKey, oauthClient, application' },
+ },
+ ],
+ filename: 'test.tsx',
+ },
+ {
+ code: `
+ class TestResolver {
+ @Query()
+ @UseGuards(NoPermissionGuard, ${ACCEPT_USER_SESSIONS})
+ testQuery() {}
+ }
+ `,
+ errors: [{ messageId: 'authPrincipalGuardNotFirst' }],
+ filename: 'test.tsx',
+ },
+ {
+ code: `
+ @UseGuards(FeatureFlagGuard, ${ACCEPT_EVERY_PRINCIPAL}, NoPermissionGuard)
+ class TestResolver {
+ @Query()
+ testQuery() {}
+ }
+ `,
+ errors: [{ messageId: 'authPrincipalGuardNotFirst' }],
+ filename: 'test.tsx',
+ },
],
});
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.ts
index 9d268e9577e..780e058e50e 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 have authentication guards (UserAuthGuard or WorkspaceAuthGuard) or be explicitly marked as public (PublicEndpointGuard) and permission guards (SettingsPermissionGuard or CustomPermissionGuard) to maintain our security model.',
+ '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.',
message:
- 'All GraphQL resolvers must have authentication guards (@UseGuards(UserAuthGuard/WorkspaceAuthGuard)) and permission guards (@UseGuards(..., SettingsPermissionGuard(PermissionFlagType.XXX)), CustomPermissionGuard for custom logic, or NoPermissionGuard for special cases like onboarding).',
+ '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).',
});
diff --git a/packages/twenty-oxlint-rules/rules/rest-api-methods-should-be-guarded.spec.ts b/packages/twenty-oxlint-rules/rules/rest-api-methods-should-be-guarded.spec.ts
index 804bdf80657..cfc66a65db6 100644
--- a/packages/twenty-oxlint-rules/rules/rest-api-methods-should-be-guarded.spec.ts
+++ b/packages/twenty-oxlint-rules/rules/rest-api-methods-should-be-guarded.spec.ts
@@ -1,7 +1,14 @@
import { RuleTester } from 'oxlint/plugins-dev';
+import { AUTHENTICATING_GUARD_NAMES } from '../utils/typedTokenHelpers';
import { rule, RULE_NAME } from './rest-api-methods-should-be-guarded';
+const ACCEPT_EVERY_PRINCIPAL =
+ 'AuthPrincipalGuard({ userSession: true, apiKey: true, oauthClient: true, application: true })';
+
+const ACCEPT_USER_SESSIONS =
+ 'AuthPrincipalGuard({ userSession: true, apiKey: false, oauthClient: false, application: false })';
+
const ruleTester = new RuleTester();
ruleTester.run(RULE_NAME, rule, {
@@ -10,7 +17,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestController {
@Get()
- @UseGuards(UserAuthGuard, NoPermissionGuard)
+ @UseGuards(${ACCEPT_USER_SESSIONS}, NoPermissionGuard)
testMethod() {}
}
`,
@@ -20,7 +27,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestController {
@Get()
- @UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, CustomPermissionGuard)
testMethod() {}
}
`,
@@ -48,7 +55,7 @@ ruleTester.run(RULE_NAME, rule, {
},
{
code: `
- @UseGuards(UserAuthGuard, NoPermissionGuard)
+ @UseGuards(${ACCEPT_USER_SESSIONS}, NoPermissionGuard)
class TestController {
@Get()
testMethod() {}
@@ -58,7 +65,7 @@ ruleTester.run(RULE_NAME, rule, {
},
{
code: `
- @UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, CustomPermissionGuard)
class TestController {
@Get()
testMethod() {}
@@ -80,7 +87,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestController {
@Post()
- @UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, CustomPermissionGuard)
createMethod() {}
}
`,
@@ -90,7 +97,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestController {
@Put()
- @UseGuards(WorkspaceAuthGuard, UpdatePermissionGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, UpdatePermissionGuard)
updateMethod() {}
}
`,
@@ -100,7 +107,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestController {
@Patch()
- @UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, NoPermissionGuard)
patchMethod() {}
}
`,
@@ -110,7 +117,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestController {
@Delete()
- @UseGuards(WorkspaceAuthGuard, DeletePermissionGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, DeletePermissionGuard)
deleteMethod() {}
}
`,
@@ -118,7 +125,7 @@ ruleTester.run(RULE_NAME, rule, {
},
{
code: `
- @UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, CustomPermissionGuard)
class TestController {
@Post()
createMethod() {}
@@ -128,7 +135,7 @@ ruleTester.run(RULE_NAME, rule, {
},
{
code: `
- @UseGuards(WorkspaceAuthGuard, SettingsPermissionGuard(PermissionFlagType.WORKSPACE))
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL}, SettingsPermissionGuard(PermissionFlagType.WORKSPACE))
class TestController {
@Delete()
deleteMethod() {}
@@ -143,6 +150,75 @@ ruleTester.run(RULE_NAME, rule, {
}
`,
},
+ {
+ code: `
+ class TestController {
+ @Get()
+ @UseGuards(FileByIdGuard, NoPermissionGuard)
+ testMethod() {}
+ }
+ `,
+ filename: 'test.tsx',
+ },
+ {
+ code: `
+ class TestController {
+ @Post()
+ @UseGuards(FileUploadTokenGuard, NoPermissionGuard)
+ testMethod() {}
+ }
+ `,
+ filename: 'test.tsx',
+ },
+ {
+ code: `
+ class TestController {
+ @Get()
+ @UseGuards(FilePathGuard, NoPermissionGuard)
+ testMethod() {}
+ }
+ `,
+ filename: 'test.tsx',
+ },
+ ...AUTHENTICATING_GUARD_NAMES.map((authenticatingGuardName) => ({
+ code: `
+ @UseGuards(
+ ${authenticatingGuardName},
+ ${ACCEPT_EVERY_PRINCIPAL},
+ WorkspaceNotSuspendedGuard,
+ NoPermissionGuard,
+ )
+ class TestController {
+ @Post()
+ createMethod() {}
+ }
+ `,
+ filename: 'test.tsx',
+ })),
+ {
+ code: `
+ @UseGuards(JwtAuthGuard, ${ACCEPT_EVERY_PRINCIPAL}, NoPermissionGuard)
+ class TestController {
+ @Post()
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ SettingsPermissionGuard(PermissionFlagType.ROLES),
+ )
+ createMethod() {}
+ }
+ `,
+ filename: 'test.tsx',
+ },
],
invalid: [
{
@@ -177,7 +253,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestController {
@Get()
- @UseGuards(WorkspaceAuthGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL})
testMethod() {}
}
`,
@@ -220,7 +296,7 @@ ruleTester.run(RULE_NAME, rule, {
},
{
code: `
- @UseGuards(WorkspaceAuthGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL})
class TestController {
@Get()
testMethod() {}
@@ -237,7 +313,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestController {
@Post()
- @UseGuards(WorkspaceAuthGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL})
createMethod() {}
}
`,
@@ -252,7 +328,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestController {
@Put()
- @UseGuards(WorkspaceAuthGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL})
updateMethod() {}
}
`,
@@ -267,7 +343,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestController {
@Patch()
- @UseGuards(WorkspaceAuthGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL})
patchMethod() {}
}
`,
@@ -282,7 +358,7 @@ ruleTester.run(RULE_NAME, rule, {
code: `
class TestController {
@Delete()
- @UseGuards(WorkspaceAuthGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL})
deleteMethod() {}
}
`,
@@ -295,7 +371,7 @@ ruleTester.run(RULE_NAME, rule, {
},
{
code: `
- @UseGuards(WorkspaceAuthGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL})
class TestController {
@Post()
createMethod() {}
@@ -310,7 +386,7 @@ ruleTester.run(RULE_NAME, rule, {
},
{
code: `
- @UseGuards(WorkspaceAuthGuard)
+ @UseGuards(${ACCEPT_EVERY_PRINCIPAL})
class TestController {
@Delete()
deleteMethod() {}
@@ -323,5 +399,87 @@ ruleTester.run(RULE_NAME, rule, {
],
filename: 'test.tsx',
},
+ ...[
+ 'AuthPrincipalGuard(AUTH_PRINCIPAL_GUARD_CONFIG)',
+ 'AuthPrincipalGuard({ ...USER_SESSIONS_ONLY, apiKey: true })',
+ 'AuthPrincipalGuard({ userSession: USER_SESSION_VARIANTS, apiKey: false, oauthClient: false, application: false })',
+ 'AuthPrincipalGuard({ userSession, apiKey: false, oauthClient: false, application: false })',
+ ].map((authPrincipalGuard) => ({
+ code: `
+ class TestController {
+ @Get()
+ @UseGuards(${authPrincipalGuard}, NoPermissionGuard)
+ testMethod() {}
+ }
+ `,
+ errors: [
+ { messageId: 'restApiMethodsShouldBeGuarded' },
+ { messageId: 'authPrincipalGuardConfigNotInline' },
+ ],
+ filename: 'test.tsx',
+ })),
+ {
+ code: `
+ @UseGuards(
+ JwtAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ NoPermissionGuard,
+ )
+ class TestController {
+ @Get()
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: true,
+ apiKey: false,
+ oauthClient: true,
+ application: { withUser: true, withoutUser: false },
+ }),
+ )
+ testMethod() {}
+ }
+ `,
+ errors: [
+ {
+ messageId: 'authPrincipalGuardWiderThanClass',
+ data: {
+ principalVariants:
+ 'userSession.workspaceAgnostic, oauthClient.withoutUser',
+ },
+ },
+ ],
+ filename: 'test.tsx',
+ },
+ {
+ code: `
+ @UseGuards(JwtAuthGuard, WorkspaceNotSuspendedGuard, ${ACCEPT_EVERY_PRINCIPAL}, NoPermissionGuard)
+ class TestController {
+ @Get()
+ testMethod() {}
+ }
+ `,
+ errors: [{ messageId: 'authPrincipalGuardNotFirst' }],
+ filename: 'test.tsx',
+ },
+ {
+ code: `
+ class TestController {
+ @Post()
+ @UseGuards(CaptchaGuard, ${ACCEPT_USER_SESSIONS}, NoPermissionGuard)
+ createMethod() {}
+ }
+ `,
+ errors: [{ messageId: 'authPrincipalGuardNotFirst' }],
+ filename: 'test.tsx',
+ },
],
});
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.ts
index 7e88ded30a7..902063dfec0 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 have authentication guards (UserAuthGuard, WorkspaceAuthGuard, FilePathGuard, FileByIdGuard, FileUploadTokenGuard) or be explicitly marked as public (PublicEndpointGuard) and permission guards (SettingsPermissionGuard or CustomPermissionGuard) to maintain our security model.',
+ '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.',
message:
- 'All REST API controller endpoints must have authentication guards (@UseGuards(...)) and permission guards (@UseGuards(..., SettingsPermissionGuard(...)), CustomPermissionGuard, or NoPermissionGuard).',
+ '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).',
});
diff --git a/packages/twenty-oxlint-rules/utils/createGuardedEndpointRule.ts b/packages/twenty-oxlint-rules/utils/createGuardedEndpointRule.ts
index 13652085380..c20aac4fc37 100644
--- a/packages/twenty-oxlint-rules/utils/createGuardedEndpointRule.ts
+++ b/packages/twenty-oxlint-rules/utils/createGuardedEndpointRule.ts
@@ -9,6 +9,12 @@ type GuardedEndpointRuleOptions = {
message: string;
};
+const AUTH_PRINCIPAL_GUARD_CONFIG_NOT_INLINE_MESSAGE_ID =
+ 'authPrincipalGuardConfigNotInline';
+const AUTH_PRINCIPAL_GUARD_WIDER_THAN_CLASS_MESSAGE_ID =
+ 'authPrincipalGuardWiderThanClass';
+const AUTH_PRINCIPAL_GUARD_NOT_FIRST_MESSAGE_ID = 'authPrincipalGuardNotFirst';
+
const findClassDeclaration = (node: any): any | null => {
if (node.type === 'ClassDeclaration') return node;
if (node.parent) return findClassDeclaration(node.parent);
@@ -46,14 +52,105 @@ export const createGuardedEndpointRule = ({
defineRule({
meta: {
docs: { description },
- messages: { [messageId]: message },
+ messages: {
+ [messageId]: message,
+ [AUTH_PRINCIPAL_GUARD_CONFIG_NOT_INLINE_MESSAGE_ID]:
+ 'AuthPrincipalGuard takes an inline object literal (no variable, no spread, no shorthand) so the principals an endpoint accepts can be read at the endpoint.',
+ [AUTH_PRINCIPAL_GUARD_WIDER_THAN_CLASS_MESSAGE_ID]:
+ '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 must come first in its @UseGuards list, or right after JwtAuthGuard or McpAuthGuard, so the guards after it only run once the principal is known.',
+ },
schema: [],
hasSuggestions: false,
type: 'suggestion',
},
create: (context) => {
+ const reportAuthPrincipalGuardUsage = (node: any): void => {
+ for (const guard of typedTokenHelpers.getAuthPrincipalGuardsWithoutInlineConfig(
+ node,
+ )) {
+ context.report({
+ node: guard,
+ messageId: AUTH_PRINCIPAL_GUARD_CONFIG_NOT_INLINE_MESSAGE_ID,
+ });
+ }
+
+ for (const guard of typedTokenHelpers.getMisplacedAuthPrincipalGuards(
+ node,
+ )) {
+ context.report({
+ node: guard,
+ messageId: AUTH_PRINCIPAL_GUARD_NOT_FIRST_MESSAGE_ID,
+ });
+ }
+ };
+
+ const reportMethodGuardWiderThanClassGuard = (node: any): void => {
+ const classNode = findClassDeclaration(node);
+
+ if (!classNode) {
+ return;
+ }
+
+ const classGuards =
+ typedTokenHelpers.getInlineAuthPrincipalGuards(classNode);
+
+ if (classGuards.length === 0) {
+ return;
+ }
+
+ for (const methodGuard of typedTokenHelpers.getInlineAuthPrincipalGuards(
+ node,
+ )) {
+ const principalVariantsRefusedByClass = [
+ ...new Set<string>(
+ classGuards.flatMap((classGuard: any) =>
+ typedTokenHelpers.getPrincipalsRefusedByClassGuard(
+ methodGuard,
+ classGuard,
+ ),
+ ),
+ ),
+ ];
+
+ if (principalVariantsRefusedByClass.length > 0) {
+ context.report({
+ node: methodGuard,
+ messageId: AUTH_PRINCIPAL_GUARD_WIDER_THAN_CLASS_MESSAGE_ID,
+ data: {
+ principalVariants: principalVariantsRefusedByClass.join(', '),
+ },
+ });
+ }
+ }
+ };
+
return {
+ ClassDeclaration: (node: any): void => {
+ const hasEndpoint = node.body.body.some(
+ (member: any) =>
+ member.type === 'MethodDefinition' &&
+ typedTokenHelpers.nodeHasDecoratorsNamed(
+ member,
+ triggerDecorators,
+ ),
+ );
+
+ if (hasEndpoint) {
+ reportAuthPrincipalGuardUsage(node);
+ }
+ },
MethodDefinition: (node: any): void => {
+ if (
+ !typedTokenHelpers.nodeHasDecoratorsNamed(node, triggerDecorators)
+ ) {
+ return;
+ }
+
+ reportAuthPrincipalGuardUsage(node);
+ reportMethodGuardWiderThanClassGuard(node);
+
if (isMissingGuards(node, triggerDecorators)) {
context.report({ node, messageId });
}
diff --git a/packages/twenty-oxlint-rules/utils/typedTokenHelpers.ts b/packages/twenty-oxlint-rules/utils/typedTokenHelpers.ts
index fb50f8aa2d9..73f07b3fe94 100644
--- a/packages/twenty-oxlint-rules/utils/typedTokenHelpers.ts
+++ b/packages/twenty-oxlint-rules/utils/typedTokenHelpers.ts
@@ -1,9 +1,125 @@
+// Guards that authenticate the request themselves (file tokens) or mark it public.
+const AUTH_GUARD_NAMES = [
+ 'PublicEndpointGuard',
+ 'FilePathGuard',
+ 'FileByIdGuard',
+ 'FileUploadTokenGuard',
+];
+
+const AUTH_PRINCIPAL_GUARD_NAME = 'AuthPrincipalGuard';
+
+// They put the principal on the request, which AuthPrincipalGuard then reads.
+export const AUTHENTICATING_GUARD_NAMES = ['JwtAuthGuard', 'McpAuthGuard'];
+
+const getUseGuardsArgumentLists = (node: any): any[][] => {
+ if (!node.decorators) {
+ return [];
+ }
+
+ return node.decorators
+ .filter(
+ (decorator: any) =>
+ decorator.expression.type === 'CallExpression' &&
+ decorator.expression.callee.type === 'Identifier' &&
+ decorator.expression.callee.name === 'UseGuards',
+ )
+ .map((decorator: any) => decorator.expression.arguments);
+};
+
+const getUseGuardsArguments = (node: any): any[] =>
+ getUseGuardsArgumentLists(node).flat();
+
+const isAuthPrincipalGuardCall = (node: any): boolean =>
+ node.type === 'CallExpression' &&
+ node.callee.type === 'Identifier' &&
+ node.callee.name === AUTH_PRINCIPAL_GUARD_NAME;
+
+const isBooleanLiteral = (node: any): boolean =>
+ node.type === 'Literal' && typeof node.value === 'boolean';
+
+const isTrueLiteral = (node: any): boolean =>
+ node?.type === 'Literal' && node.value === true;
+
+// Only literals, so the principals an endpoint accepts can be read at the endpoint.
+const isInlineAuthPrincipalGuardConfig = (node: any): boolean =>
+ node.type === 'ObjectExpression' &&
+ node.properties.every(
+ (property: any) =>
+ property.type === 'Property' &&
+ !property.computed &&
+ !property.shorthand &&
+ (isBooleanLiteral(property.value) ||
+ isInlineAuthPrincipalGuardConfig(property.value)),
+ );
+
+const isAuthPrincipalGuardWithInlineConfig = (node: any): boolean =>
+ isAuthPrincipalGuardCall(node) &&
+ node.arguments.length === 1 &&
+ isInlineAuthPrincipalGuardConfig(node.arguments[0]);
+
+const getPropertyName = (property: any): string =>
+ property.key.name ?? property.key.value;
+
+const getPropertyValue = (objectNode: any, propertyName: string): any =>
+ objectNode.properties.find(
+ (property: any) => getPropertyName(property) === propertyName,
+ )?.value;
+
+const isVariantsConfig = (kindConfig: any): boolean =>
+ kindConfig?.type === 'ObjectExpression';
+
+// Kinds and variants are read from the two configs rather than listed here,
+// so this cannot drift from AuthPrincipalGuardConfig.
+const getPrincipalsRefusedByClassGuard = (
+ methodGuard: any,
+ classGuard: any,
+): string[] => {
+ const classConfig = classGuard.arguments[0];
+
+ return methodGuard.arguments[0].properties.flatMap((property: any) => {
+ const kind = getPropertyName(property);
+ const methodKindConfig = property.value;
+ const classKindConfig = getPropertyValue(classConfig, kind);
+
+ if (isTrueLiteral(classKindConfig)) {
+ return [];
+ }
+
+ if (isTrueLiteral(methodKindConfig)) {
+ return isVariantsConfig(classKindConfig)
+ ? classKindConfig.properties
+ .filter((variant: any) => !isTrueLiteral(variant.value))
+ .map((variant: any) => `${kind}.${getPropertyName(variant)}`)
+ : [kind];
+ }
+
+ if (!isVariantsConfig(methodKindConfig)) {
+ return [];
+ }
+
+ return methodKindConfig.properties
+ .filter(
+ (variant: any) =>
+ isTrueLiteral(variant.value) &&
+ !(
+ isVariantsConfig(classKindConfig) &&
+ isTrueLiteral(
+ getPropertyValue(classKindConfig, getPropertyName(variant)),
+ )
+ ),
+ )
+ .map((variant: any) => `${kind}.${getPropertyName(variant)}`);
+ });
+};
+
+const isPlacedFirst = (guardArguments: any[], index: number): boolean =>
+ index === 0 ||
+ (index === 1 &&
+ guardArguments[0].type === 'Identifier' &&
+ AUTHENTICATING_GUARD_NAMES.includes(guardArguments[0].name));
export const typedTokenHelpers = {
- nodeHasDecoratorsNamed: (
- node: any,
- decoratorNames: string[],
- ): boolean => {
+ nodeHasDecoratorsNamed: (node: any, decoratorNames: string[]): boolean => {
if (!node.decorators) {
return false;
}
@@ -24,35 +140,33 @@ export const typedTokenHelpers = {
});
},
- nodeHasAuthGuards: (node: any): boolean => {
- if (!node.decorators) {
- return false;
- }
+ nodeHasAuthGuards: (node: any): boolean =>
+ getUseGuardsArguments(node).some(
+ (arg: any) =>
+ (arg.type === 'Identifier' && AUTH_GUARD_NAMES.includes(arg.name)) ||
+ isAuthPrincipalGuardWithInlineConfig(arg),
+ ),
- return node.decorators.some((decorator: any) => {
- if (
- decorator.expression.type === 'CallExpression' &&
- decorator.expression.callee.type === 'Identifier' &&
- decorator.expression.callee.name === 'UseGuards'
- ) {
- return decorator.expression.arguments.some((arg: any) => {
- if (arg.type === 'Identifier') {
- return (
- arg.name === 'UserAuthGuard' ||
- arg.name === 'WorkspaceAuthGuard' ||
- arg.name === 'PublicEndpointGuard' ||
- arg.name === 'FilePathGuard' ||
- arg.name === 'FileByIdGuard' ||
- arg.name === 'FileUploadTokenGuard'
- );
- }
- return false;
- });
- }
+ getAuthPrincipalGuardsWithoutInlineConfig: (node: any): any[] =>
+ getUseGuardsArguments(node).filter(
+ (arg: any) =>
+ isAuthPrincipalGuardCall(arg) &&
+ !isAuthPrincipalGuardWithInlineConfig(arg),
+ ),
- return false;
- });
- },
+ getMisplacedAuthPrincipalGuards: (node: any): any[] =>
+ getUseGuardsArgumentLists(node).flatMap((guardArguments) =>
+ guardArguments.filter(
+ (arg: any, index: number) =>
+ isAuthPrincipalGuardCall(arg) &&
+ !isPlacedFirst(guardArguments, index),
+ ),
+ ),
+
+ getInlineAuthPrincipalGuards: (node: any): any[] =>
+ getUseGuardsArguments(node).filter(isAuthPrincipalGuardWithInlineConfig),
+
+ getPrincipalsRefusedByClassGuard,
nodeHasPermissionsGuard: (node: any): boolean => {
if (!node.decorators) {
diff --git a/packages/twenty-server/src/engine/api/mcp/controllers/mcp-core.controller.ts b/packages/twenty-server/src/engine/api/mcp/controllers/mcp-core.controller.ts
index a2fae8be7f4..77fc0fc6e6d 100644
--- a/packages/twenty-server/src/engine/api/mcp/controllers/mcp-core.controller.ts
+++ b/packages/twenty-server/src/engine/api/mcp/controllers/mcp-core.controller.ts
@@ -33,13 +33,23 @@ import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-worksp
import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { WorkspaceNotSuspendedGuard } from 'src/engine/guards/workspace-not-suspended.guard';
@Controller(ApiPath.Mcp)
@UseGuards(
McpAuthGuard,
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
WorkspaceNotSuspendedGuard,
NoPermissionGuard,
)
diff --git a/packages/twenty-server/src/engine/api/mcp/mcp.module.ts b/packages/twenty-server/src/engine/api/mcp/mcp.module.ts
index daac3cd1e25..8d6dadc383a 100644
--- a/packages/twenty-server/src/engine/api/mcp/mcp.module.ts
+++ b/packages/twenty-server/src/engine/api/mcp/mcp.module.ts
@@ -11,7 +11,6 @@ import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';
import { ToolProviderModule } from 'src/engine/core-modules/tool-provider/tool-provider.module';
import { JwtAuthGuard } from 'src/engine/guards/jwt-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { SkillModule } from 'src/engine/metadata-modules/skill/skill.module';
import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';
@@ -37,7 +36,6 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
providers: [
JwtAuthGuard,
McpAuthGuard,
- WorkspaceAuthGuard,
McpInstructionBuilderService,
McpProtocolService,
McpToolExecutorService,
diff --git a/packages/twenty-server/src/engine/api/rest/core/controllers/rest-api-core.controller.ts b/packages/twenty-server/src/engine/api/rest/core/controllers/rest-api-core.controller.ts
index 280b1975ba1..a2d7f0e3d78 100644
--- a/packages/twenty-server/src/engine/api/rest/core/controllers/rest-api-core.controller.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/controllers/rest-api-core.controller.ts
@@ -20,11 +20,25 @@ import { RestApiExceptionFilter } from 'src/engine/api/rest/rest-api-exception.f
import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request.type';
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
import { JwtAuthGuard } from 'src/engine/guards/jwt-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(ApiPath.Rest)
-@UseGuards(JwtAuthGuard, WorkspaceAuthGuard, CustomPermissionGuard)
+@UseGuards(
+ JwtAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ CustomPermissionGuard,
+)
@UseFilters(RestApiExceptionFilter, AuthRestApiExceptionFilter)
export class RestApiCoreController {
private readonly logger = new Logger(RestApiCoreController.name);
diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-ai-provider.resolver.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-ai-provider.resolver.ts
index c97405ac74c..44ab5589f13 100644
--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-ai-provider.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-ai-provider.resolver.ts
@@ -15,10 +15,8 @@ import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { ConfigVariableGraphqlApiExceptionFilter } from 'src/engine/core-modules/twenty-config/filters/config-variable-graphql-api-exception.filter';
import { AdminPanelGuard } from 'src/engine/guards/admin-panel-guard';
-import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { ModelsDevModelSuggestionDTO } from 'src/engine/core-modules/admin-panel/dtos/models-dev-model-suggestion.dto';
import { ModelsDevProviderSuggestionDTO } from 'src/engine/core-modules/admin-panel/dtos/models-dev-provider-suggestion.dto';
import { ModelsDevCatalogService } from 'src/engine/metadata-modules/ai/ai-models/services/models-dev-catalog.service';
@@ -32,9 +30,17 @@ import { ModelsDevCatalogService } from 'src/engine/metadata-modules/ai/ai-model
ConfigVariableGraphqlApiExceptionFilter,
)
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
- RequireUserSessionGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
SettingsPermissionGuard(PermissionFlagType.SECURITY),
)
export class AdminPanelAiProviderResolver {
diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-usage-limit.resolver.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-usage-limit.resolver.ts
index b61dda6f8b6..8a3a7c81f0c 100644
--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-usage-limit.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-usage-limit.resolver.ts
@@ -22,10 +22,8 @@ import { UsageLimitGraphqlApiExceptionFilter } from 'src/engine/core-modules/usa
import { UsageLimitService } from 'src/engine/core-modules/usage-limit/services/usage-limit.service';
import { fromUsageLimitEntityToDto } from 'src/engine/core-modules/usage-limit/utils/from-usage-limit-entity-to-dto.util';
import { AdminPanelGuard } from 'src/engine/guards/admin-panel-guard';
-import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@UsePipes(ResolverValidationPipe)
@AdminResolver()
@@ -35,9 +33,17 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
PreventNestToAutoLogGraphqlErrorsFilter,
)
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
- RequireUserSessionGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
SettingsPermissionGuard(PermissionFlagType.SECURITY),
AdminPanelGuard,
)
diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts
index 9a87845317d..f0c066f9b8c 100644
--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts
@@ -92,12 +92,9 @@ import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { AdminPanelGuard } from 'src/engine/guards/admin-panel-guard';
import { AdminPanelOrImpersonateGuard } from 'src/engine/guards/admin-panel-or-impersonate.guard';
-import { NoImpersonationGuard } from 'src/engine/guards/no-impersonation.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { ServerLevelImpersonateGuard } from 'src/engine/guards/server-level-impersonate.guard';
-import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { MODEL_FAMILY_LABELS } from 'src/engine/metadata-modules/ai/ai-models/constants/model-family-labels.const';
import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';
import { AiModelTier } from 'src/engine/metadata-modules/ai/ai-models/types/ai-model-tier.enum';
@@ -117,9 +114,17 @@ import { getAvailableEfforts } from 'src/engine/metadata-modules/ai/ai-models/ut
ConfigVariableGraphqlApiExceptionFilter,
)
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
- RequireUserSessionGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
SettingsPermissionGuard(PermissionFlagType.SECURITY),
)
export class AdminPanelResolver {
@@ -186,13 +191,39 @@ export class AdminPanelResolver {
return this.adminStatisticsService.getTopWorkspaces(searchTerm);
}
- @UseGuards(AdminPanelGuard, NoImpersonationGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: false,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ AdminPanelGuard,
+ )
@Query(() => [ServerAdminDTO])
async getServerAdmins(): Promise<ServerAdminDTO[]> {
return this.adminServerAdminService.getServerAdmins();
}
- @UseGuards(AdminPanelGuard, NoImpersonationGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: false,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ AdminPanelGuard,
+ )
@Mutation(() => ServerAdminDTO)
async updateServerAdminAccess(
@Args() input: UpdateServerAdminAccessInput,
diff --git a/packages/twenty-server/src/engine/core-modules/api-key/api-key.resolver.ts b/packages/twenty-server/src/engine/core-modules/api-key/api-key.resolver.ts
index b203c32867c..f5f2da9b751 100644
--- a/packages/twenty-server/src/engine/core-modules/api-key/api-key.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/api-key/api-key.resolver.ts
@@ -15,9 +15,8 @@ import { UpdateApiKeyInput } from 'src/engine/core-modules/api-key/dtos/update-a
import { apiKeyGraphqlApiExceptionHandler } from 'src/engine/core-modules/api-key/utils/api-key-graphql-api-exception-handler.util';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
-import { RequireAccessTokenGuard } from 'src/engine/guards/require-access-token.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { RoleDTO } from 'src/engine/metadata-modules/role/dtos/role.dto';
@@ -27,7 +26,17 @@ import { ApiKeyService } from './services/api-key.service';
@MetadataResolver(() => ApiKeyEntity)
@UseFilters(AuthGraphqlApiExceptionFilter, PermissionsGraphqlApiExceptionFilter)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
export class ApiKeyResolver {
@@ -70,10 +79,20 @@ export class ApiKeyResolver {
}
// Creating a key assigns it a role, so it also requires ROLES to prevent
- // binding a role above the caller's own. RequireAccessTokenGuard blocks
+ // binding a role above the caller's own. Refusing playground sessions blocks
// minting from derived PLAYGROUND tokens.
@UseGuards(
- RequireAccessTokenGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
SettingsPermissionGuard(PermissionFlagType.ROLES),
)
@Mutation(() => ApiKeyEntity)
@@ -90,7 +109,19 @@ export class ApiKeyResolver {
});
}
- @UseGuards(RequireAccessTokenGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ )
@Mutation(() => ApiKeyEntity, { nullable: true })
async updateApiKey(
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -117,7 +148,19 @@ export class ApiKeyResolver {
}
}
- @UseGuards(RequireAccessTokenGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ )
@Mutation(() => ApiKeyEntity, { nullable: true })
async revokeApiKey(
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -128,7 +171,17 @@ export class ApiKeyResolver {
// Binding a role to an API key requires ROLES to prevent privilege escalation.
@UseGuards(
- RequireAccessTokenGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
SettingsPermissionGuard(PermissionFlagType.ROLES),
)
@Mutation(() => Boolean)
diff --git a/packages/twenty-server/src/engine/core-modules/api-key/controllers/api-key.controller.ts b/packages/twenty-server/src/engine/core-modules/api-key/controllers/api-key.controller.ts
index c6373e93b68..43303e19093 100644
--- a/packages/twenty-server/src/engine/core-modules/api-key/controllers/api-key.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/api-key/controllers/api-key.controller.ts
@@ -26,9 +26,8 @@ import { ApiKeyService } from 'src/engine/core-modules/api-key/services/api-key.
import { 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 { RequireAccessTokenGuard } from 'src/engine/guards/require-access-token.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';
import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@@ -39,7 +38,17 @@ import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters
@Controller([`${ApiPath.Rest}/apiKeys`, `${ApiPath.Rest}/metadata/apiKeys`])
@UseGuards(
JwtAuthGuard,
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
@UseFilters(
@@ -75,7 +84,17 @@ export class ApiKeyController {
// Creating a key assigns it a role, so it also requires ROLES to prevent
// binding a role above the caller's own.
@UseGuards(
- RequireAccessTokenGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
SettingsPermissionGuard(PermissionFlagType.ROLES),
)
@Post()
@@ -94,7 +113,19 @@ export class ApiKeyController {
});
}
- @UseGuards(RequireAccessTokenGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ )
@Patch(':id')
async update(
@Param('id') id: string,
@@ -116,7 +147,19 @@ export class ApiKeyController {
return this.apiKeyService.update(id, workspace.id, updateData);
}
- @UseGuards(RequireAccessTokenGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ )
@Delete(':id')
async remove(
@Param('id') id: string,
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-authorization/application-authorization.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-authorization/application-authorization.resolver.ts
index fb7ec7f6dda..dcff27bf8cc 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-authorization/application-authorization.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-authorization/application-authorization.resolver.ts
@@ -7,16 +7,13 @@ import { type ApplicationAuthorizationEntity } from 'src/engine/core-modules/app
import { ApplicationAuthorizationDTO } from 'src/engine/core-modules/application/application-authorization/dtos/application-authorization.dto';
import { ApplicationAuthorizationService } from 'src/engine/core-modules/application/application-authorization/services/application-authorization.service';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
-import { isDefined } from 'twenty-shared/utils';
-
import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';
import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
// Scoped to this person within this workspace: an authorization grants an
// application access to one workspace's data, so it is listed and revoked from
@@ -25,6 +22,20 @@ import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
// lives elsewhere.
@UsePipes(ResolverValidationPipe)
@UseFilters(AuthGraphqlApiExceptionFilter)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ NoPermissionGuard,
+)
@MetadataResolver()
export class ApplicationAuthorizationResolver {
constructor(
@@ -32,19 +43,10 @@ export class ApplicationAuthorizationResolver {
) {}
@Query(() => [ApplicationAuthorizationDTO])
- @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)
async currentUserApplicationAuthorizations(
@AuthUser() user: AuthContextUser,
- @AuthWorkspace({ allowUndefined: true }) workspace:
- | WorkspaceEntity
- | undefined,
+ @AuthWorkspace() workspace: WorkspaceEntity,
): Promise<ApplicationAuthorizationDTO[]> {
- // UserAuthGuard admits workspace-agnostic credentials, which have no
- // workspace to scope to. Nothing is in scope rather than everything.
- if (!isDefined(workspace)) {
- return [];
- }
-
const authorizations =
await this.applicationAuthorizationService.findActiveAuthorizationsForUserWorkspace(
{ userId: user.id, workspaceId: workspace.id },
@@ -56,19 +58,12 @@ export class ApplicationAuthorizationResolver {
}
@Mutation(() => Boolean)
- @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)
async revokeApplicationAuthorization(
@AuthUser() user: AuthContextUser,
- @AuthWorkspace({ allowUndefined: true }) workspace:
- | WorkspaceEntity
- | undefined,
+ @AuthWorkspace() workspace: WorkspaceEntity,
@Args('applicationAuthorizationId', { type: () => UUIDScalarType })
applicationAuthorizationId: string,
): Promise<boolean> {
- if (!isDefined(workspace)) {
- return false;
- }
-
return await this.applicationAuthorizationService.revokeAuthorizationByIdForUserWorkspace(
{
authorizationId: applicationAuthorizationId,
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.ts
index ff1e5eec967..6d4c21e4f4d 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.resolver.ts
@@ -34,7 +34,7 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspac
import { ApplicationTargetArgs } from 'src/engine/decorators/auth/application-target-args.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { streamToBuffer } from 'src/utils/stream-to-buffer';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@@ -44,7 +44,17 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),
)
export class ApplicationDevelopmentResolver {
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-development/application-schema.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-development/application-schema.resolver.ts
index f3239afd057..2b2abec8ada 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-development/application-schema.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-development/application-schema.resolver.ts
@@ -13,12 +13,25 @@ import {
import { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flat-workspace.type';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@MetadataResolver()
@UseFilters(ApplicationExceptionFilter)
-@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+)
export class ApplicationSchemaResolver {
constructor(
private readonly workspaceGraphqlSchemaSDLService: WorkspaceGraphqlSchemaSDLService,
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-health/application-health.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-health/application-health.resolver.ts
index 8b6134619c1..9a7f8b60257 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-health/application-health.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-health/application-health.resolver.ts
@@ -14,10 +14,20 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { ApplicationTargetArg } from 'src/engine/decorators/auth/application-target-arg.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),
)
@MetadataResolver(() => ApplicationDTO)
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/__tests__/application-capability.resolver.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/__tests__/application-capability.resolver.spec.ts
index 72f37f8089c..158c454bcea 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-install/__tests__/application-capability.resolver.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/__tests__/application-capability.resolver.spec.ts
@@ -20,7 +20,7 @@ import {
ApplicationException,
ApplicationExceptionCode,
} from 'src/engine/core-modules/application/application.exception';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
const APPLICATION_ID = 'c832302c-e551-4b4f-b11c-19907888a284';
@@ -39,7 +39,20 @@ const USER_REQUEST = {
@Resolver()
class TestQueryResolver {
@Query(() => Boolean)
- @UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+ )
isReady(): boolean {
return true;
}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/application-capability.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/application-capability.resolver.ts
index aa381fa1ce2..6a76da114ed 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-install/application-capability.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/application-capability.resolver.ts
@@ -13,18 +13,24 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
-import { RequireAccessTokenGuard } from 'src/engine/guards/require-access-token.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@MetadataResolver()
@UsePipes(ResolverValidationPipe)
@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
- RequireAccessTokenGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),
)
export class ApplicationCapabilityResolver {
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.resolver.ts
index 9cc1588232e..3793923d0ee 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.resolver.ts
@@ -37,7 +37,7 @@ import { AuthApplication } from 'src/engine/decorators/auth/auth-application.dec
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
@UsePipes(ResolverValidationPipe)
@@ -48,7 +48,19 @@ import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/wor
AuthGraphqlApiExceptionFilter,
)
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
export class ApplicationInstallResolver {
constructor(
private readonly applicationService: ApplicationService,
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-job/application-job.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-job/application-job.resolver.ts
index 48764d8c6d9..8a6236521ab 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-job/application-job.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-job/application-job.resolver.ts
@@ -24,9 +24,22 @@ import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-worksp
import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
-@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+)
@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)
@UsePipes(ResolverValidationPipe)
@MetadataResolver()
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-key-value/application-key-value.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-key-value/application-key-value.resolver.ts
index 9d6ed1a2315..7e8dabfce2a 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-key-value/application-key-value.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-key-value/application-key-value.resolver.ts
@@ -14,10 +14,23 @@ import { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flat
import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
-@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+)
@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)
@MetadataResolver()
export class ApplicationKeyValueResolver {
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.resolver.ts
index 78b825ac665..226cad5a501 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.resolver.ts
@@ -9,7 +9,7 @@ import { MarketplaceAppDetailDTO } from 'src/engine/core-modules/application/app
import { MarketplaceQueryService } from 'src/engine/core-modules/application/application-marketplace/marketplace-query.service';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { MarketplaceCatalogSyncCronJob } from 'src/engine/core-modules/application/application-marketplace/crons/marketplace-catalog-sync.cron.job';
import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
@@ -23,7 +23,20 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
AuthGraphqlApiExceptionFilter,
)
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
-@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+)
export class MarketplaceResolver {
constructor(
private readonly marketplaceQueryService: MarketplaceQueryService,
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-oauth/application-oauth.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-oauth/application-oauth.resolver.ts
index fa9b6777900..c24c04329d0 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-oauth/application-oauth.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-oauth/application-oauth.resolver.ts
@@ -15,8 +15,7 @@ import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-worksp
import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { RequireAccessTokenGuard } from 'src/engine/guards/require-access-token.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
const APPLICATION_TOKEN_RATE_LIMIT_MAX = 30;
const APPLICATION_TOKEN_RATE_LIMIT_WINDOW_MS = 30_000;
@@ -28,7 +27,19 @@ const APPLICATION_TOKEN_RATE_LIMIT_WINDOW_MS = 30_000;
AuthGraphqlApiExceptionFilter,
ThrottlerGraphqlApiExceptionFilter,
)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
export class ApplicationOAuthResolver {
constructor(
private readonly applicationTokenService: ApplicationTokenService,
@@ -36,7 +47,20 @@ export class ApplicationOAuthResolver {
) {}
@Mutation(() => ApplicationTokenPairDTO)
- @UseGuards(RequireAccessTokenGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ NoPermissionGuard,
+ )
async renewApplicationToken(
@Args('applicationRefreshToken') applicationRefreshToken: string,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts
index e4bafbefe1a..38e09a55275 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts
@@ -52,10 +52,8 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
import { AdminPanelGuard } from 'src/engine/guards/admin-panel-guard';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
-import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
import { StreamSizeExceededError } from 'src/utils/stream-size-exceeded-error';
import { streamToBuffer } from 'src/utils/stream-to-buffer';
@@ -98,7 +96,20 @@ export class ApplicationRegistrationResolver {
return this.applicationRegistrationService.findPublicByClientId(clientId);
}
- @UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+ )
@Query(() => ApplicationRegistrationEntity, { nullable: true })
async findApplicationRegistrationByUniversalIdentifier(
@ApplicationTargetArg('universalIdentifier', {
@@ -112,7 +123,17 @@ export class ApplicationRegistrationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
@Query(() => [ApplicationRegistrationEntity])
@@ -138,7 +159,17 @@ export class ApplicationRegistrationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
@Query(() => ApplicationRegistrationEntity)
@@ -154,7 +185,17 @@ export class ApplicationRegistrationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
@Query(() => ApplicationRegistrationStatsDTO)
@@ -170,7 +211,17 @@ export class ApplicationRegistrationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
@Mutation(() => CreateApplicationRegistrationDTO)
@@ -187,7 +238,17 @@ export class ApplicationRegistrationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
@Mutation(() => ApplicationRegistrationEntity)
@@ -203,7 +264,17 @@ export class ApplicationRegistrationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
@Mutation(() => Boolean)
@@ -219,7 +290,17 @@ export class ApplicationRegistrationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
SettingsPermissionGuard(PermissionFlagType.ROLES),
)
@@ -239,7 +320,17 @@ export class ApplicationRegistrationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
@Query(() => [ApplicationRegistrationVariableDTO])
@@ -256,7 +347,17 @@ export class ApplicationRegistrationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
@Mutation(() => ApplicationRegistrationVariableDTO)
@@ -274,7 +375,17 @@ export class ApplicationRegistrationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.MARKETPLACE_APPS),
)
@Mutation(() => ApplicationRegistrationEntity)
@@ -289,7 +400,17 @@ export class ApplicationRegistrationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.MARKETPLACE_APPS),
)
@Mutation(() => ApplicationRegistrationEntity, {
@@ -333,7 +454,17 @@ export class ApplicationRegistrationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
@Query(() => String, { nullable: true })
@@ -362,7 +493,17 @@ export class ApplicationRegistrationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),
)
@Query(() => ClaimableApplicationRegistrationDTO, { nullable: true })
@@ -380,9 +521,17 @@ export class ApplicationRegistrationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
- RequireUserSessionGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
AdminPanelGuard,
SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),
)
@@ -399,7 +548,17 @@ export class ApplicationRegistrationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),
)
@Query(() => String)
@@ -427,9 +586,17 @@ export class ApplicationRegistrationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
- RequireUserSessionGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),
)
@Mutation(() => ApplicationRegistrationEntity)
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.resolver.ts
index 1dbbea25bc0..f719e177a8c 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.resolver.ts
@@ -10,13 +10,25 @@ import { ApplicationTargetArg } from 'src/engine/decorators/auth/application-tar
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 { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@MetadataResolver()
@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)
-@UseGuards(UserAuthGuard, WorkspaceAuthGuard, NoPermissionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ NoPermissionGuard,
+)
export class ApplicationUpgradeResolver {
constructor(
private readonly applicationUpgradeService: ApplicationUpgradeService,
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.resolver.ts
index aa89c136a6f..e728c7444f9 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.resolver.ts
@@ -17,11 +17,21 @@ import { AuthApplication } from 'src/engine/decorators/auth/auth-application.dec
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),
)
@MetadataResolver(() => ApplicationVariableEntityDTO)
diff --git a/packages/twenty-server/src/engine/core-modules/application/application.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application.resolver.ts
index 1349adbf700..a9af8eb59c6 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application.resolver.ts
@@ -23,10 +23,23 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+)
@MetadataResolver(() => ApplicationDTO)
export class ApplicationResolver {
constructor(
diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/application-connection-provider.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/application-connection-provider.resolver.ts
index d4bccef1d4b..db107a52c4a 100644
--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/application-connection-provider.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/application-connection-provider.resolver.ts
@@ -12,9 +12,21 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { ApplicationTargetArg } from 'src/engine/decorators/auth/application-target-arg.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@MetadataResolver(() => ApplicationConnectionProviderDTO)
@UseFilters(ApplicationExceptionFilter)
export class ApplicationConnectionProviderResolver {
diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.controller.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.controller.ts
index d515a610029..ab1fee37ce0 100644
--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.controller.ts
@@ -23,14 +23,28 @@ import { ApplicationConnectionsListService } from 'src/engine/core-modules/appli
import { ConnectionProviderRestApiExceptionFilter } from 'src/engine/core-modules/application/connection-provider/filters/connection-provider-rest-api-exception.filter';
import { JwtAuthGuard } from 'src/engine/guards/jwt-auth.guard';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
/** @deprecated Superseded by the `appConnections` / `appConnection` GraphQL
* queries on the metadata schema (ApplicationConnectionsResolver). The SDK
* helpers (`listConnections`, `getConnection`) now call GraphQL. Kept for
* backward compatibility with already-deployed app runtimes. */
@Controller(`${ApiPath.Apps}/connections`)
-@UseGuards(JwtAuthGuard, WorkspaceAuthGuard, NoPermissionGuard)
+@UseGuards(
+ JwtAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+)
@UseFilters(ConnectionProviderRestApiExceptionFilter)
@UsePipes(new ValidationPipe({ whitelist: true, forbidNonWhitelisted: true }))
export class ApplicationConnectionsController {
diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.resolver.ts
index f717dc8de87..3bebe69508f 100644
--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.resolver.ts
@@ -20,10 +20,23 @@ import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-worksp
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
-@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+)
@UseInterceptors(ConnectionProviderGraphqlApiExceptionInterceptor)
@UsePipes(ResolverValidationPipe)
@MetadataResolver()
diff --git a/packages/twenty-server/src/engine/core-modules/application/front-component-shared-dependencies/front-component-shared-dependencies.controller.ts b/packages/twenty-server/src/engine/core-modules/application/front-component-shared-dependencies/front-component-shared-dependencies.controller.ts
index 768e99eeb2e..7dd8c1f4bcb 100644
--- a/packages/twenty-server/src/engine/core-modules/application/front-component-shared-dependencies/front-component-shared-dependencies.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/front-component-shared-dependencies/front-component-shared-dependencies.controller.ts
@@ -32,11 +32,23 @@ import { ApplicationTargetParam } from 'src/engine/decorators/auth/application-t
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
@Controller(`${ApiPath.Rest}/front-component-shared-dependencies`)
@AllowSuspendedWorkspace()
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseFilters(ApplicationRestApiExceptionFilter)
export class FrontComponentSharedDependenciesController {
private readonly logger = new Logger(
diff --git a/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.resolver.ts b/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.resolver.ts
index 6406e0eb5be..d7aaf5081b2 100644
--- a/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.resolver.ts
@@ -18,13 +18,23 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.WORKSPACE_MEMBERS),
)
@UsePipes(ResolverValidationPipe)
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
index 0894bc8ce57..b4c378feb3a 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
@@ -99,11 +99,8 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
-import { RequireAccessTokenGuard } from 'src/engine/guards/require-access-token.guard';
-import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { getRequestBaseUrl } from 'src/utils/get-request-base-url.util';
import { streamToBuffer } from 'src/utils/stream-to-buffer';
@@ -592,7 +589,15 @@ export class AuthResolver {
}
@Query(() => SubdomainAvailabilityDTO)
- @UseGuards(UserAuthGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: true,
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ NoPermissionGuard,
+ )
async checkWorkspaceSubdomainAvailability(
@Args('subdomain') subdomain: string,
): Promise<SubdomainAvailabilityDTO> {
@@ -600,7 +605,15 @@ export class AuthResolver {
}
@Query(() => WorkspaceCreationDefaultsDTO)
- @UseGuards(UserAuthGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: true,
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ NoPermissionGuard,
+ )
async getWorkspaceCreationDefaults(
@AuthUser() currentUser: AuthContextUser,
): Promise<WorkspaceCreationDefaultsDTO> {
@@ -612,7 +625,15 @@ export class AuthResolver {
}
@Mutation(() => SignUpDTO)
- @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: true,
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ NoPermissionGuard,
+ )
@AllowSuspendedWorkspace()
async signUpInNewWorkspace(
@AuthUser() currentUser: AuthContextUser,
@@ -653,7 +674,15 @@ export class AuthResolver {
deprecationReason:
'Use createNewWorkspaceLogoUpload and completeNewWorkspaceLogoUpload, which send the logo straight to file storage.',
})
- @UseGuards(UserAuthGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: true,
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ NoPermissionGuard,
+ )
@AllowSuspendedWorkspace()
async uploadNewWorkspaceLogo(
@AuthUser() currentUser: AuthContextUser,
@@ -682,7 +711,15 @@ export class AuthResolver {
}
@Mutation(() => FileUploadTargetDTO)
- @UseGuards(UserAuthGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: true,
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ NoPermissionGuard,
+ )
@AllowSuspendedWorkspace()
async createNewWorkspaceLogoUpload(
@AuthUser() currentUser: AuthContextUser,
@@ -709,7 +746,15 @@ export class AuthResolver {
}
@Mutation(() => FileWithSignedUrlDTO)
- @UseGuards(UserAuthGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: true,
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ NoPermissionGuard,
+ )
@AllowSuspendedWorkspace()
async completeNewWorkspaceLogoUpload(
@AuthUser() currentUser: AuthContextUser,
@@ -732,7 +777,15 @@ export class AuthResolver {
}
@Mutation(() => TransientTokenDTO)
- @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: true,
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ NoPermissionGuard,
+ )
async generateTransientToken(
@AuthUser() user: AuthContextUser,
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -1016,7 +1069,15 @@ export class AuthResolver {
}
@Mutation(() => AuthorizeAppDTO)
- @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: true,
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ NoPermissionGuard,
+ )
async authorizeApp(
@Args() authorizeAppInput: AuthorizeAppInput,
@AuthUser() user: AuthContextUser,
@@ -1081,8 +1142,17 @@ export class AuthResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
- RequireAccessTokenGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
@Mutation(() => ApiKeyToken)
@@ -1098,8 +1168,17 @@ export class AuthResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
- RequireAccessTokenGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
@Mutation(() => AuthToken)
diff --git a/packages/twenty-server/src/engine/core-modules/billing/app-billing/app-billing.controller.ts b/packages/twenty-server/src/engine/core-modules/billing/app-billing/app-billing.controller.ts
index f8fb166ecf3..8626820ee4e 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/app-billing/app-billing.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/app-billing/app-billing.controller.ts
@@ -31,7 +31,7 @@ import { ThrottlerService } from 'src/engine/core-modules/throttler/throttler.se
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
import { JwtAuthGuard } from 'src/engine/guards/jwt-auth.guard';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
// Belt-and-suspenders on top of LogicFunctionExecutorService's execution
// throttle: application-access tokens are JWTs usable outside the runtime.
@@ -48,7 +48,21 @@ const CREDIT_UNAVAILABLE_REASON_BY_SERVER_REASON: Record<
};
@Controller(`${ApiPath.App}/billing`)
-@UseGuards(JwtAuthGuard, WorkspaceAuthGuard, NoPermissionGuard)
+@UseGuards(
+ JwtAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+)
export class AppBillingController {
constructor(
private readonly appBillingService: AppBillingService,
diff --git a/packages/twenty-server/src/engine/core-modules/billing/billing.resolver.ts b/packages/twenty-server/src/engine/core-modules/billing/billing.resolver.ts
index 4fa6a047034..4fb7096721e 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/billing.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/billing.resolver.ts
@@ -42,8 +42,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
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 { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import {
PermissionsException,
PermissionsExceptionCode,
@@ -71,7 +70,17 @@ export class BillingResolver {
@Query(() => BillingSessionDTO)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.BILLING),
)
async billingPortalSession(
@@ -88,7 +97,20 @@ export class BillingResolver {
}
@Mutation(() => BillingSessionDTO)
- @UseGuards(WorkspaceAuthGuard, UserAuthGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ NoPermissionGuard,
+ )
async checkoutSession(
@AuthWorkspace() workspace: WorkspaceEntity,
@AuthUser() user: AuthContextUser,
@@ -151,7 +173,20 @@ export class BillingResolver {
}
@Mutation(() => BillingPaymentIntentDTO)
- @UseGuards(WorkspaceAuthGuard, UserAuthGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ NoPermissionGuard,
+ )
async createSubscriptionPaymentIntent(
@AuthWorkspace() workspace: WorkspaceEntity,
@AuthUser() user: AuthContextUser,
@@ -188,7 +223,17 @@ export class BillingResolver {
@Mutation(() => BillingPaymentIntentDTO)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.BILLING),
)
async createBillingPaymentMethodSetupIntent(
@@ -201,7 +246,17 @@ export class BillingResolver {
@Mutation(() => BillingUpdateDTO)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.BILLING),
)
async switchSubscriptionInterval(
@@ -223,7 +278,17 @@ export class BillingResolver {
@Mutation(() => BillingUpdateDTO)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.BILLING),
)
async switchBillingPlan(@AuthWorkspace() workspace: WorkspaceEntity) {
@@ -243,7 +308,17 @@ export class BillingResolver {
@Mutation(() => BillingUpdateDTO)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.BILLING),
)
async cancelSwitchBillingPlan(@AuthWorkspace() workspace: WorkspaceEntity) {
@@ -263,7 +338,17 @@ export class BillingResolver {
@Mutation(() => BillingUpdateDTO)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.BILLING),
)
async cancelSwitchBillingInterval(
@@ -287,7 +372,17 @@ export class BillingResolver {
@Mutation(() => BillingUpdateDTO)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.BILLING),
)
async setResourceCreditSubscriptionPrice(
@@ -312,7 +407,20 @@ export class BillingResolver {
}
@Query(() => [BillingPlanDTO])
- @UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+ )
async listPlans(): Promise<BillingPlanDTO[]> {
const plans = await this.billingPlanService.listPlans();
@@ -321,7 +429,17 @@ export class BillingResolver {
@Mutation(() => BillingEndTrialPeriodDTO)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.BILLING),
)
async endSubscriptionTrialPeriod(
@@ -361,7 +479,17 @@ export class BillingResolver {
@Query(() => [BillingResourceCreditUsageDTO])
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.BILLING),
)
async getResourceCreditUsage(
@@ -382,7 +510,17 @@ export class BillingResolver {
@Mutation(() => BillingUpdateDTO)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.BILLING),
)
async cancelSwitchResourceCreditPrice(
diff --git a/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.resolver.ts b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.resolver.ts
index 30e85398180..bd56a9f8dc6 100644
--- a/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.resolver.ts
@@ -12,9 +12,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
import { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace-member-id.decorator';
import { CoreResolver } from 'src/engine/api/graphql/graphql-config/decorators/core-resolver.decorator';
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
-import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@@ -74,9 +72,17 @@ class GetTimelineCalendarEventsFromOpportunityIdArgs {
}
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
- RequireUserSessionGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
CustomPermissionGuard,
)
@CoreResolver(() => TimelineCalendarEventsWithTotalDTO)
diff --git a/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts
index 21d4517e36b..b5d74f078d4 100644
--- a/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts
@@ -11,11 +11,21 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
-@UseGuards(WorkspaceAuthGuard, UserAuthGuard, RequireUserSessionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+)
@UsePipes(ResolverValidationPipe)
@UseFilters(
PreventNestToAutoLogGraphqlErrorsFilter,
diff --git a/packages/twenty-server/src/engine/core-modules/company-enrichment/resolvers/company-enrichment.resolver.ts b/packages/twenty-server/src/engine/core-modules/company-enrichment/resolvers/company-enrichment.resolver.ts
index 57d6eb2736e..ce7ffa8fc96 100644
--- a/packages/twenty-server/src/engine/core-modules/company-enrichment/resolvers/company-enrichment.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/company-enrichment/resolvers/company-enrichment.resolver.ts
@@ -16,11 +16,21 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
-@UseGuards(WorkspaceAuthGuard, UserAuthGuard, RequireUserSessionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+)
@UsePipes(ResolverValidationPipe)
@UseFilters(
PreventNestToAutoLogGraphqlErrorsFilter,
diff --git a/packages/twenty-server/src/engine/core-modules/dpa/dpa.resolver.ts b/packages/twenty-server/src/engine/core-modules/dpa/dpa.resolver.ts
index e497ca81c3b..9ba3db10c2a 100644
--- a/packages/twenty-server/src/engine/core-modules/dpa/dpa.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/dpa/dpa.resolver.ts
@@ -16,13 +16,23 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
@CoreResolver(() => DpaAgreementEntity)
@UseFilters(AuthGraphqlApiExceptionFilter, PermissionsGraphqlApiExceptionFilter)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
)
@UsePipes(ResolverValidationPipe)
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/emailing-domain.resolver.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/emailing-domain.resolver.ts
index b4b6bdeded0..accfe74c13c 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/emailing-domain.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/emailing-domain.resolver.ts
@@ -14,11 +14,21 @@ import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/re
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
)
@UseFilters(
diff --git a/packages/twenty-server/src/engine/core-modules/enterprise/enterprise.resolver.ts b/packages/twenty-server/src/engine/core-modules/enterprise/enterprise.resolver.ts
index 885a1333030..7b0454ece00 100644
--- a/packages/twenty-server/src/engine/core-modules/enterprise/enterprise.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/enterprise/enterprise.resolver.ts
@@ -19,8 +19,7 @@ import { ConfigVariableExceptionCode } from 'src/engine/core-modules/twenty-conf
import { AdminPanelGuard } from 'src/engine/guards/admin-panel-guard';
import { BillingDisabledGuard } from 'src/engine/guards/billing-disabled.guard';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
// Server-binding rejections that should surface as an activation failure with
// their own user-facing message (rather than being silently swallowed).
@@ -32,7 +31,22 @@ const SERVER_BINDING_REJECTION_CODES: EnterpriseExceptionCode[] = [
];
@Resolver()
-@UseGuards(RequireUserSessionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ BillingDisabledGuard,
+ AdminPanelGuard,
+ NoPermissionGuard,
+)
@UsePipes(ResolverValidationPipe)
@UseFilters(EnterpriseExceptionFilter, PreventNestToAutoLogGraphqlErrorsFilter)
export class EnterpriseResolver {
@@ -59,12 +73,6 @@ export class EnterpriseResolver {
}
@Query(() => String, { nullable: true })
- @UseGuards(
- WorkspaceAuthGuard,
- BillingDisabledGuard,
- AdminPanelGuard,
- NoPermissionGuard,
- )
async enterprisePortalSession(
// for existing subscriptions
@Args('returnUrlPath', { nullable: true }) returnUrlPath?: string,
@@ -73,12 +81,6 @@ export class EnterpriseResolver {
}
@Query(() => String, { nullable: true })
- @UseGuards(
- WorkspaceAuthGuard,
- BillingDisabledGuard,
- AdminPanelGuard,
- NoPermissionGuard,
- )
async enterpriseCheckoutSession(
// for new subscriptions
@Args('billingInterval', { nullable: true }) billingInterval?: string,
@@ -90,23 +92,11 @@ export class EnterpriseResolver {
}
@Query(() => EnterpriseSubscriptionStatusDTO, { nullable: true })
- @UseGuards(
- WorkspaceAuthGuard,
- BillingDisabledGuard,
- AdminPanelGuard,
- NoPermissionGuard,
- )
async enterpriseSubscriptionStatus(): Promise<EnterpriseSubscriptionStatusDTO | null> {
return this.enterprisePlanService.getSubscriptionStatus();
}
@Mutation(() => Boolean)
- @UseGuards(
- WorkspaceAuthGuard,
- BillingDisabledGuard,
- AdminPanelGuard,
- NoPermissionGuard,
- )
async refreshEnterpriseValidityToken(): Promise<boolean> {
const refreshed = await this.enterprisePlanService.refreshValidityToken();
@@ -116,12 +106,6 @@ export class EnterpriseResolver {
}
@Mutation(() => EnterpriseLicenseInfoDTO)
- @UseGuards(
- WorkspaceAuthGuard,
- BillingDisabledGuard,
- AdminPanelGuard,
- NoPermissionGuard,
- )
async releaseEnterpriseServerBinding(): Promise<EnterpriseLicenseInfoDTO> {
await this.enterprisePlanService.releaseServerBinding();
@@ -135,12 +119,6 @@ export class EnterpriseResolver {
}
@Mutation(() => EnterpriseLicenseInfoDTO)
- @UseGuards(
- WorkspaceAuthGuard,
- BillingDisabledGuard,
- AdminPanelGuard,
- NoPermissionGuard,
- )
async setEnterpriseKey(
@Args('enterpriseKey') enterpriseKey: string,
): Promise<EnterpriseLicenseInfoDTO> {
diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.resolver.ts b/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.resolver.ts
index e27962fb3a7..dcbf73c4922 100644
--- a/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/event-logs/emit/event-log-emitter.resolver.ts
@@ -17,7 +17,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { Analytics } from './dtos/analytics.dto';
@@ -41,7 +41,20 @@ export class EventLogEmitterResolver {
) {}
@Mutation(() => Analytics)
- @UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+ )
async createObjectEvent(
@Args()
createObjectEventInput: CreateObjectEventInput,
diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs-live.resolver.ts b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs-live.resolver.ts
index 2f40071915d..d05359adccf 100644
--- a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs-live.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs-live.resolver.ts
@@ -18,7 +18,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { APPLICATION_KEEPALIVE_INTERVAL_MS } from 'src/engine/subscriptions/constants/application-keepalive-interval-ms.constant';
import { SubscriptionChannel } from 'src/engine/subscriptions/enums/subscription-channel.enum';
@@ -74,7 +74,17 @@ export class EventLogsLiveResolver {
) {}
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.SECURITY),
)
@Subscription(() => [EventLogRecord], {
diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.resolver.ts b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.resolver.ts
index 713bbe4b8bd..76a50814518 100644
--- a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.resolver.ts
@@ -17,7 +17,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { EventLogsService } from './event-logs.service';
@@ -38,7 +38,17 @@ export class EventLogsResolver {
constructor(private readonly eventLogsService: EventLogsService) {}
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.SECURITY),
)
@Query(() => EventLogQueryResult)
diff --git a/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.spec.ts b/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.spec.ts
index efd939e36cf..86e3b9d6fca 100644
--- a/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.spec.ts
@@ -1,7 +1,5 @@
import { RecordExportWorkspaceService } from 'src/engine/core-modules/record-export/services/record-export.workspace-service';
import { JwtAuthGuard } from 'src/engine/guards/jwt-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';
import { type CanActivate, Logger } from '@nestjs/common';
@@ -96,10 +94,6 @@ describe('FileController', () => {
})
.overrideGuard(JwtAuthGuard)
.useValue(mock_NoPermissionGuard)
- .overrideGuard(WorkspaceAuthGuard)
- .useValue(mock_NoPermissionGuard)
- .overrideGuard(UserAuthGuard)
- .useValue(mock_NoPermissionGuard)
.overrideGuard(CustomPermissionGuard)
.useValue(mock_NoPermissionGuard)
.overrideFilter(PermissionsRestApiExceptionFilter)
diff --git a/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.ts b/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.ts
index 8dd17b0d1ef..105a889c59a 100644
--- a/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.ts
@@ -40,8 +40,7 @@ import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard
import { JwtAuthGuard } from 'src/engine/guards/jwt-auth.guard';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';
// workspaceId is bound onto the request by FileByIdGuard.
@@ -201,8 +200,17 @@ export class FileController {
@Get(`${ApiPath.File}/${FileFolder.RecordExport}/:id`)
@UseGuards(
JwtAuthGuard,
- WorkspaceAuthGuard,
- UserAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
CustomPermissionGuard,
)
@UseFilters(PermissionsRestApiExceptionFilter)
diff --git a/packages/twenty-server/src/engine/core-modules/file/file-core-picture/resolvers/file-core-picture.resolver.ts b/packages/twenty-server/src/engine/core-modules/file/file-core-picture/resolvers/file-core-picture.resolver.ts
index c6360117cc2..c89b5c1a398 100644
--- a/packages/twenty-server/src/engine/core-modules/file/file-core-picture/resolvers/file-core-picture.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/file-core-picture/resolvers/file-core-picture.resolver.ts
@@ -20,11 +20,23 @@ import { UploadProfilePicturePermissionGuard } from 'src/engine/core-modules/use
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { streamToBuffer } from 'src/utils/stream-to-buffer';
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UsePipes(ResolverValidationPipe)
@UseFilters(
UsageLimitGraphqlApiExceptionFilter,
@@ -43,10 +55,7 @@ export class FileCorePictureResolver {
deprecationReason:
'Use createFileUpload with the CorePicture folder and completeWorkspaceLogoUpload, which send the logo straight to file storage.',
})
- @UseGuards(
- WorkspaceAuthGuard,
- SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
- )
+ @UseGuards(SettingsPermissionGuard(PermissionFlagType.WORKSPACE))
async uploadWorkspaceLogo(
@AuthWorkspace() workspace: WorkspaceEntity,
@Args({ name: 'file', type: () => GraphQLUpload })
@@ -68,7 +77,7 @@ export class FileCorePictureResolver {
deprecationReason:
'Use createFileUpload with the CorePicture folder and completeWorkspaceMemberProfilePictureUpload, which send the picture straight to file storage.',
})
- @UseGuards(WorkspaceAuthGuard, UploadProfilePicturePermissionGuard)
+ @UseGuards(UploadProfilePicturePermissionGuard)
async uploadWorkspaceMemberProfilePicture(
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@Args({ name: 'file', type: () => GraphQLUpload })
@@ -89,10 +98,7 @@ export class FileCorePictureResolver {
}
@Mutation(() => FileWithSignedUrlDTO)
- @UseGuards(
- WorkspaceAuthGuard,
- SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
- )
+ @UseGuards(SettingsPermissionGuard(PermissionFlagType.WORKSPACE))
async completeWorkspaceLogoUpload(
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@Args({ name: 'fileId', type: () => String })
@@ -105,7 +111,7 @@ export class FileCorePictureResolver {
}
@Mutation(() => FileWithSignedUrlDTO)
- @UseGuards(WorkspaceAuthGuard, UploadProfilePicturePermissionGuard)
+ @UseGuards(UploadProfilePicturePermissionGuard)
async completeWorkspaceMemberProfilePictureUpload(
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@Args({ name: 'fileId', type: () => String })
diff --git a/packages/twenty-server/src/engine/core-modules/file/file-upload/resolvers/file-upload.resolver.ts b/packages/twenty-server/src/engine/core-modules/file/file-upload/resolvers/file-upload.resolver.ts
index 77a0d48d4fb..97d98ff6ce6 100644
--- a/packages/twenty-server/src/engine/core-modules/file/file-upload/resolvers/file-upload.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/file-upload/resolvers/file-upload.resolver.ts
@@ -15,11 +15,23 @@ import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/re
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { UsageLimitGraphqlApiExceptionFilter } from 'src/engine/core-modules/usage-limit/filters/usage-limit-graphql-api-exception.filter';
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UsePipes(ResolverValidationPipe)
@UseFilters(
UsageLimitGraphqlApiExceptionFilter,
diff --git a/packages/twenty-server/src/engine/core-modules/file/files-field/resolvers/files-field.resolver.ts b/packages/twenty-server/src/engine/core-modules/file/files-field/resolvers/files-field.resolver.ts
index 89859003305..a12869872b2 100644
--- a/packages/twenty-server/src/engine/core-modules/file/files-field/resolvers/files-field.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/files-field/resolvers/files-field.resolver.ts
@@ -16,12 +16,24 @@ import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/re
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { streamToBuffer } from 'src/utils/stream-to-buffer';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { UsageLimitGraphqlApiExceptionFilter } from 'src/engine/core-modules/usage-limit/filters/usage-limit-graphql-api-exception.filter';
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UsePipes(ResolverValidationPipe)
@UseFilters(
UsageLimitGraphqlApiExceptionFilter,
diff --git a/packages/twenty-server/src/engine/core-modules/geo-map/resolver/geo-map.resolver.ts b/packages/twenty-server/src/engine/core-modules/geo-map/resolver/geo-map.resolver.ts
index 809c112be25..995a853ec0c 100644
--- a/packages/twenty-server/src/engine/core-modules/geo-map/resolver/geo-map.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/geo-map/resolver/geo-map.resolver.ts
@@ -6,10 +6,23 @@ import { PlaceDetailsResultDTO } from 'src/engine/core-modules/geo-map/dtos/plac
import { GeoMapService } from 'src/engine/core-modules/geo-map/services/geo-map.service';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
@MetadataResolver()
-@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+)
export class GeoMapResolver {
constructor(private readonly geoMapService: GeoMapService) {}
diff --git a/packages/twenty-server/src/engine/core-modules/imap-smtp-caldav-connection/imap-smtp-caldav-connection.resolver.ts b/packages/twenty-server/src/engine/core-modules/imap-smtp-caldav-connection/imap-smtp-caldav-connection.resolver.ts
index d4414df1f22..ed23891ea67 100644
--- a/packages/twenty-server/src/engine/core-modules/imap-smtp-caldav-connection/imap-smtp-caldav-connection.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/imap-smtp-caldav-connection/imap-smtp-caldav-connection.resolver.ts
@@ -19,7 +19,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { ConnectedAccountMetadataService } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.service';
import { ConnectedAccountTokenEncryptionService } from 'src/engine/metadata-modules/connected-account/services/connected-account-token-encryption.service';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
@@ -28,6 +28,20 @@ import { ImapSmtpCalDavApiService } from 'src/modules/connected-account/services
@MetadataResolver()
@UsePipes(ResolverValidationPipe)
@UseFilters(AuthGraphqlApiExceptionFilter, PermissionsGraphqlApiExceptionFilter)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ SettingsPermissionGuard(PermissionFlagType.CONNECTED_ACCOUNTS),
+)
export class ImapSmtpCaldavResolver {
constructor(
private readonly imapSmtpCaldavService: ImapSmtpCaldavService,
@@ -37,10 +51,6 @@ export class ImapSmtpCaldavResolver {
) {}
@Query(() => ConnectedImapSmtpCaldavAccountDTO)
- @UseGuards(
- WorkspaceAuthGuard,
- SettingsPermissionGuard(PermissionFlagType.CONNECTED_ACCOUNTS),
- )
async getConnectedImapSmtpCaldavAccount(
@Args('id', { type: () => UUIDScalarType }) id: string,
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -72,10 +82,6 @@ export class ImapSmtpCaldavResolver {
}
@Mutation(() => ImapSmtpCaldavConnectionSuccessDTO)
- @UseGuards(
- WorkspaceAuthGuard,
- SettingsPermissionGuard(PermissionFlagType.CONNECTED_ACCOUNTS),
- )
async saveImapSmtpCaldavAccount(
@Args('handle') handle: string,
@Args('connectionParameters')
diff --git a/packages/twenty-server/src/engine/core-modules/impersonation/impersonation.resolver.ts b/packages/twenty-server/src/engine/core-modules/impersonation/impersonation.resolver.ts
index bcdd0009999..96221989fab 100644
--- a/packages/twenty-server/src/engine/core-modules/impersonation/impersonation.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/impersonation/impersonation.resolver.ts
@@ -23,12 +23,9 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
import { ImpersonatePermissionGuard } from 'src/engine/guards/impersonate-permission.guard';
-import { NoImpersonationGuard } from 'src/engine/guards/no-impersonation.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@MetadataResolver()
@UsePipes(ResolverValidationPipe)
@@ -41,10 +38,17 @@ export class ImpersonationResolver {
constructor(private readonly impersonationService: ImpersonationService) {}
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
- RequireUserSessionGuard,
- NoImpersonationGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: false,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
ImpersonatePermissionGuard,
CustomPermissionGuard,
)
@@ -68,9 +72,17 @@ export class ImpersonationResolver {
}
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
- RequireUserSessionGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
NoPermissionGuard,
)
@Mutation(() => StopImpersonationDTO)
diff --git a/packages/twenty-server/src/engine/core-modules/lab/lab.resolver.ts b/packages/twenty-server/src/engine/core-modules/lab/lab.resolver.ts
index 95da88498b3..c770be2268b 100644
--- a/packages/twenty-server/src/engine/core-modules/lab/lab.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/lab/lab.resolver.ts
@@ -14,7 +14,7 @@ import { UpdateLabPublicFeatureFlagInput } from 'src/engine/core-modules/lab/dto
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
@@ -25,11 +25,23 @@ import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-module
PermissionsGraphqlApiExceptionFilter,
PreventNestToAutoLogGraphqlErrorsFilter,
)
-@UseGuards(SettingsPermissionGuard(PermissionFlagType.WORKSPACE))
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
+)
export class LabResolver {
constructor(private featureFlagService: FeatureFlagService) {}
- @UseGuards(WorkspaceAuthGuard)
@Mutation(() => FeatureFlagDTO)
async updateLabPublicFeatureFlag(
@Args('input') input: UpdateLabPublicFeatureFlagInput,
diff --git a/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.resolver.ts b/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.resolver.ts
index f494bc7e5e1..704c8514ad9 100644
--- a/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.resolver.ts
@@ -18,10 +18,8 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
-import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { AccountsToReconnectService } from 'src/modules/connected-account/services/accounts-to-reconnect.service';
@ArgsType()
@@ -80,9 +78,17 @@ class GetTimelineThreadsFromOpportunityIdArgs {
}
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
- RequireUserSessionGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
CustomPermissionGuard,
)
@CoreResolver(() => TimelineThreadsWithTotalDTO)
diff --git a/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.resolver.ts b/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.resolver.ts
index ef0b0b88e93..72b62a433e3 100644
--- a/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.resolver.ts
@@ -16,11 +16,21 @@ import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-worksp
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 { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
-@UseGuards(WorkspaceAuthGuard, UserAuthGuard, RequireUserSessionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+)
@UsePipes(ResolverValidationPipe)
@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)
@MetadataResolver()
diff --git a/packages/twenty-server/src/engine/core-modules/public-domain/public-domain.resolver.ts b/packages/twenty-server/src/engine/core-modules/public-domain/public-domain.resolver.ts
index 410bf94dc29..92b9c8ab347 100644
--- a/packages/twenty-server/src/engine/core-modules/public-domain/public-domain.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/public-domain/public-domain.resolver.ts
@@ -24,11 +24,21 @@ import { PublicDomainService } from 'src/engine/core-modules/public-domain/publi
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.WORKSPACE_MEMBERS),
)
@UsePipes(ResolverValidationPipe)
diff --git a/packages/twenty-server/src/engine/core-modules/record-export/record-export.resolver.ts b/packages/twenty-server/src/engine/core-modules/record-export/record-export.resolver.ts
index 6701d423374..b1a2ffc45aa 100644
--- a/packages/twenty-server/src/engine/core-modules/record-export/record-export.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-export/record-export.resolver.ts
@@ -15,13 +15,21 @@ import { CreateRecordExportInput } from 'src/engine/core-modules/record-export/d
import { RecordExportDTO } from 'src/engine/core-modules/record-export/dtos/record-export.dto';
import { RecordExportWorkspaceService } from 'src/engine/core-modules/record-export/services/record-export.workspace-service';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
@MetadataResolver()
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
SettingsPermissionGuard(PermissionFlagType.EXPORT_CSV),
)
@UsePipes(ResolverValidationPipe)
diff --git a/packages/twenty-server/src/engine/core-modules/record-share/resolvers/record-sharing.resolver.ts b/packages/twenty-server/src/engine/core-modules/record-share/resolvers/record-sharing.resolver.ts
index 510b1ffdc11..609d0673c0e 100644
--- a/packages/twenty-server/src/engine/core-modules/record-share/resolvers/record-sharing.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-share/resolvers/record-sharing.resolver.ts
@@ -16,13 +16,25 @@ import {
import { RecordShareException } from 'src/engine/core-modules/record-share/record-share.exception';
import { RecordSharingService } from 'src/engine/core-modules/record-share/services/record-sharing.service';
import { recordShareGraphqlApiExceptionHandler } from 'src/engine/core-modules/record-share/utils/record-share-graphql-api-exception-handler.util';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
registerEnumType(RecordShareAccessLevel, { name: 'RecordShareAccessLevel' });
@MetadataResolver()
-@UseGuards(WorkspaceAuthGuard, UserAuthGuard, CustomPermissionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ CustomPermissionGuard,
+)
export class RecordSharingResolver {
constructor(private readonly sharingService: RecordSharingService) {}
diff --git a/packages/twenty-server/src/engine/core-modules/sdk-client/controllers/sdk-client.controller.ts b/packages/twenty-server/src/engine/core-modules/sdk-client/controllers/sdk-client.controller.ts
index 7d1a69407ac..6087ae40e40 100644
--- a/packages/twenty-server/src/engine/core-modules/sdk-client/controllers/sdk-client.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/sdk-client/controllers/sdk-client.controller.ts
@@ -28,12 +28,24 @@ import { ApplicationTargetParam } from 'src/engine/decorators/auth/application-t
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@Controller(`${ApiPath.Rest}/sdk-client`)
@AllowSuspendedWorkspace()
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseFilters(ApplicationRestApiExceptionFilter)
export class SdkClientController {
constructor(
diff --git a/packages/twenty-server/src/engine/core-modules/search/search.resolver.ts b/packages/twenty-server/src/engine/core-modules/search/search.resolver.ts
index 8f0afe4e6fd..01d8118730e 100644
--- a/packages/twenty-server/src/engine/core-modules/search/search.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/search/search.resolver.ts
@@ -15,7 +15,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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 { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@@ -28,7 +28,20 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
AuthGraphqlApiExceptionFilter,
)
@UsePipes(ResolverValidationPipe)
-@UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ CustomPermissionGuard,
+)
export class SearchResolver {
constructor(
private readonly searchService: SearchService,
diff --git a/packages/twenty-server/src/engine/core-modules/sso/sso.resolver.ts b/packages/twenty-server/src/engine/core-modules/sso/sso.resolver.ts
index 98988037afd..7cb53d947e1 100644
--- a/packages/twenty-server/src/engine/core-modules/sso/sso.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/sso/sso.resolver.ts
@@ -26,7 +26,7 @@ import { type SsoException } from 'src/engine/core-modules/sso/sso.exception';
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
@MetadataResolver()
@@ -37,11 +37,24 @@ import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-module
SsoGraphqlApiExceptionFilter,
)
@UsePipes(ResolverValidationPipe)
-@UseGuards(SettingsPermissionGuard(PermissionFlagType.SECURITY))
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ SettingsPermissionGuard(PermissionFlagType.SECURITY),
+ EnterpriseFeaturesEnabledGuard,
+)
export class SsoResolver {
constructor(private readonly ssoService: SsoService) {}
- @UseGuards(WorkspaceAuthGuard, EnterpriseFeaturesEnabledGuard)
@Mutation(() => SetupSsoDTO)
async createOIDCIdentityProvider(
@Args('input') setupSsoInput: SetupOidcSsoInput,
@@ -53,7 +66,6 @@ export class SsoResolver {
);
}
- @UseGuards(WorkspaceAuthGuard, EnterpriseFeaturesEnabledGuard)
@Query(() => [FindAvailableSsoIdpDTO])
async getSSOIdentityProviders(
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -61,7 +73,6 @@ export class SsoResolver {
return this.ssoService.getSsoIdentityProviders(workspaceId);
}
- @UseGuards(WorkspaceAuthGuard, EnterpriseFeaturesEnabledGuard)
@Mutation(() => SetupSsoDTO)
async createSAMLIdentityProvider(
@Args('input') setupSsoInput: SetupSamlSsoInput,
@@ -73,7 +84,6 @@ export class SsoResolver {
);
}
- @UseGuards(WorkspaceAuthGuard, EnterpriseFeaturesEnabledGuard)
@Mutation(() => DeleteSsoDTO)
async deleteSSOIdentityProvider(
@Args('input') { identityProviderId }: DeleteSsoInput,
@@ -85,7 +95,6 @@ export class SsoResolver {
);
}
- @UseGuards(WorkspaceAuthGuard, EnterpriseFeaturesEnabledGuard)
@Mutation(() => EditSsoDTO)
async editSSOIdentityProvider(
@Args('input') input: EditSsoInput,
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/resolvers/tool-index.resolver.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/resolvers/tool-index.resolver.ts
index 605cbf399f9..851c823b45c 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/resolvers/tool-index.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/resolvers/tool-index.resolver.ts
@@ -15,7 +15,7 @@ import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
import { resolveRoleIdsForUser } from 'src/engine/twenty-orm/utils/resolve-role-ids-for-user.util';
@@ -50,7 +50,19 @@ export class ToolIndexEntryDTO {
}
@MetadataResolver()
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
export class ToolIndexResolver {
constructor(
private readonly toolRegistryService: ToolRegistryService,
diff --git a/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.resolver.ts b/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.resolver.ts
index 0cc3a199cb6..9f4f7ef7b99 100644
--- a/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.resolver.ts
@@ -21,10 +21,8 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
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 { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { TwoFactorAuthenticationService } from './two-factor-authentication.service';
@@ -103,7 +101,15 @@ export class TwoFactorAuthenticationResolver {
}
@Mutation(() => InitiateTwoFactorAuthenticationProvisioningDTO)
- @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: true,
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ NoPermissionGuard,
+ )
async initiateOTPProvisioningForAuthenticatedUser(
@AuthUser() user: AuthContextUser,
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -128,9 +134,17 @@ export class TwoFactorAuthenticationResolver {
@Mutation(() => DeleteTwoFactorAuthenticationMethodDTO)
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
- RequireUserSessionGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
CustomPermissionGuard,
)
async deleteTwoFactorAuthenticationMethod(
@@ -170,9 +184,17 @@ export class TwoFactorAuthenticationResolver {
@Mutation(() => VerifyTwoFactorAuthenticationMethodDTO)
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
- RequireUserSessionGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
NoPermissionGuard,
)
async verifyTwoFactorAuthenticationMethodForAuthenticatedUser(
diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.resolver.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.resolver.ts
index 90c8c56e237..c326cd0b8bc 100644
--- a/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.resolver.ts
@@ -22,7 +22,7 @@ import { fromUsageLimitEntityToDto } from 'src/engine/core-modules/usage-limit/u
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@MetadataResolver(() => UsageLimitDTO)
@@ -33,7 +33,17 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
)
@UsePipes(ResolverValidationPipe)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
)
export class UsageLimitResolver {
diff --git a/packages/twenty-server/src/engine/core-modules/usage/usage.resolver.ts b/packages/twenty-server/src/engine/core-modules/usage/usage.resolver.ts
index de57b664a6b..f3b05c36b12 100644
--- a/packages/twenty-server/src/engine/core-modules/usage/usage.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/usage/usage.resolver.ts
@@ -23,7 +23,7 @@ import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@MetadataResolver()
@@ -39,7 +39,17 @@ export class UsageResolver {
@Query(() => UsageAnalyticsDTO)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
)
async getUsageAnalytics(
diff --git a/packages/twenty-server/src/engine/core-modules/user-session/user-session.resolver.ts b/packages/twenty-server/src/engine/core-modules/user-session/user-session.resolver.ts
index 0f32af4259a..32f4049b7b7 100644
--- a/packages/twenty-server/src/engine/core-modules/user-session/user-session.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-session/user-session.resolver.ts
@@ -20,11 +20,19 @@ import { 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 { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
@UsePipes(ResolverValidationPipe)
@UseFilters(AuthGraphqlApiExceptionFilter)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: true,
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ NoPermissionGuard,
+)
@MetadataResolver()
@AllowSuspendedWorkspace()
export class UserSessionResolver {
@@ -34,7 +42,6 @@ export class UserSessionResolver {
) {}
@Query(() => [UserSessionDTO])
- @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)
async currentUserSessions(
@AuthUser() user: AuthContextUser,
@AuthWorkspace({ allowUndefined: true }) workspace:
@@ -42,8 +49,8 @@ export class UserSessionResolver {
| undefined,
@Context() context: { req: Request },
): Promise<UserSessionDTO[]> {
- // UserAuthGuard admits workspace-agnostic credentials, which have no
- // workspace to scope to. Nothing is in scope rather than everything.
+ // Workspace-agnostic sessions are admitted and have no workspace to
+ // scope to. Nothing is in scope rather than everything.
if (!isDefined(workspace)) {
return [];
}
@@ -66,7 +73,6 @@ export class UserSessionResolver {
}
@Mutation(() => Boolean)
- @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)
async revokeUserSession(
@AuthUser() user: AuthContextUser,
@AuthWorkspace({ allowUndefined: true }) workspace:
@@ -136,7 +142,6 @@ export class UserSessionResolver {
}
@Mutation(() => Int)
- @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)
async revokeAllOtherUserSessions(
@AuthUser() user: AuthContextUser,
@AuthWorkspace({ allowUndefined: true }) workspace:
diff --git a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
index 91b04448784..ee33a4dc5d1 100644
--- a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
@@ -65,11 +65,9 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
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 { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { buildUserSessionRequiredError } from 'src/engine/guards/utils/is-user-session-principal.util';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import {
PermissionsException,
PermissionsExceptionCode,
@@ -135,7 +133,15 @@ export class UserResolver {
}
@Query(() => UserEntity)
- @UseGuards(UserAuthGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: true,
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ NoPermissionGuard,
+ )
@AllowSuspendedWorkspace()
async currentUser(
@AuthUser() { id: userId }: AuthContextUser,
@@ -397,14 +403,30 @@ export class UserResolver {
}
@Mutation(() => UserEntity)
- @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: true,
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ NoPermissionGuard,
+ )
@AllowSuspendedWorkspace()
async deleteUser(@AuthUser() { id: userId }: AuthContextUser) {
return this.userService.deleteUser(userId);
}
@Mutation(() => UserWorkspaceEntity)
- @UseGuards(UserAuthGuard, CustomPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: true,
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ CustomPermissionGuard,
+ )
@AllowSuspendedWorkspace()
async deleteUserFromWorkspace(
@Args('workspaceMemberIdToDelete') workspaceMemberIdToDelete: string,
@@ -484,7 +506,20 @@ export class UserResolver {
}
@Mutation(() => Boolean)
- @UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ CustomPermissionGuard,
+ )
@AllowSuspendedWorkspace()
async updateWorkspaceMemberSettings(
@Args('input') input: UpdateWorkspaceMemberSettingsInput,
@@ -724,9 +759,17 @@ export class UserResolver {
@Mutation(() => Boolean)
@UseGuards(
- UserAuthGuard,
- RequireUserSessionGuard,
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
SettingsPermissionGuard(PermissionFlagType.PROFILE_INFORMATION),
)
async updateUserEmail(
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/core-workflow-version-mutation.resolver.ts b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/core-workflow-version-mutation.resolver.ts
index 46027315d75..6d342deaeb6 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/core-workflow-version-mutation.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/core-workflow-version-mutation.resolver.ts
@@ -36,9 +36,7 @@ import { CoreWorkflowAccessService } from 'src/engine/core-modules/workflow/serv
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 { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { UserOrApplicationAuthGuard } from 'src/engine/guards/user-or-application-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
@@ -49,8 +47,17 @@ import { CoreWorkflowRunnerService } from 'src/modules/workflow/workflow-runner/
@CoreResolver()
@UsePipes(ResolverValidationPipe)
@UseGuards(
- WorkspaceAuthGuard,
- UserOrApplicationAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.WORKFLOWS),
)
@UseFilters(
@@ -108,7 +115,19 @@ export class CoreWorkflowVersionMutationResolver {
}
@Mutation(() => RunWorkflowVersionDTO)
- @UseGuards(UserAuthGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ )
async runCoreWorkflowVersion(
@AuthUser() user: AuthContextUser,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/core-workflow.resolver.ts b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/core-workflow.resolver.ts
index 1e02f9e6e55..efbbf05acdb 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/core-workflow.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/core-workflow.resolver.ts
@@ -47,15 +47,23 @@ import { isDefined } from 'twenty-shared/utils';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { UserOrApplicationAuthGuard } from 'src/engine/guards/user-or-application-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
@CoreResolver()
@UsePipes(ResolverValidationPipe)
@UseGuards(
- WorkspaceAuthGuard,
- UserOrApplicationAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.WORKFLOWS),
)
@UseFilters(
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-builder.resolver.ts b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-builder.resolver.ts
index 7b42cc8ef5b..066b89ef906 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-builder.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-builder.resolver.ts
@@ -29,8 +29,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { type OutputSchema } from 'src/modules/workflow/workflow-builder/workflow-schema/types/output-schema.type';
import { WorkflowSchemaWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.workspace-service';
@@ -38,8 +37,17 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
@CoreResolver()
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
SettingsPermissionGuard(PermissionFlagType.WORKFLOWS),
)
@UsePipes(ResolverValidationPipe)
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-trigger.resolver.ts b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-trigger.resolver.ts
index 7ac3f85f465..edd96fbdd76 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-trigger.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-trigger.resolver.ts
@@ -19,8 +19,7 @@ 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 { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
@@ -31,7 +30,17 @@ import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/sta
@CoreResolver()
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.WORKFLOWS),
)
@UsePipes(ResolverValidationPipe)
@@ -94,7 +103,19 @@ export class WorkflowTriggerResolver {
}
@Mutation(() => RunWorkflowVersionDTO)
- @UseGuards(UserAuthGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ )
async runWorkflowVersion(
@AuthUserWorkspaceId({ allowUndefined: true })
userWorkspaceId: string | undefined,
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-version-edge.resolver.ts b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-version-edge.resolver.ts
index 832ad4a1883..9b86cf35ae1 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-version-edge.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-version-edge.resolver.ts
@@ -14,8 +14,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { CoreWorkflowAccessService } from 'src/engine/core-modules/workflow/services/core-workflow-access.service';
import { WorkflowVersionEdgeWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-edge/workflow-version-edge.workspace-service';
@@ -24,8 +23,17 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
@CoreResolver()
@UsePipes(ResolverValidationPipe)
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
SettingsPermissionGuard(PermissionFlagType.WORKFLOWS),
)
@UseFilters(
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-version-step.resolver.ts b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-version-step.resolver.ts
index d0d7c6cf8ed..c4d7cfb6276 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-version-step.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-version-step.resolver.ts
@@ -25,8 +25,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { ConnectedAccountMetadataService } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.service';
import { ConnectedAccountHandleDTO } from 'src/engine/metadata-modules/connected-account/dtos/connected-account-handle.dto';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
@@ -38,8 +37,17 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
@CoreResolver()
@UsePipes(ResolverValidationPipe)
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
SettingsPermissionGuard(PermissionFlagType.WORKFLOWS),
)
@UseFilters(
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-version.resolver.ts b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-version.resolver.ts
index 106b683a822..8a4a2d55613 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-version.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-version.resolver.ts
@@ -17,8 +17,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { WorkflowCommonWorkspaceService } from 'src/modules/workflow/common/workspace-services/workflow-common.workspace-service';
import { WorkflowVersionValidationWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-validation/workflow-version-validation.workspace-service';
@@ -29,8 +28,17 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
@CoreResolver()
@UsePipes(ResolverValidationPipe)
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
SettingsPermissionGuard(PermissionFlagType.WORKFLOWS),
)
@UseFilters(
diff --git a/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.resolver.ts b/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.resolver.ts
index 95079c17a7e..3bb6818c74d 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.resolver.ts
@@ -16,8 +16,7 @@ import { 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 { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
@@ -26,7 +25,17 @@ import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/sta
import { SendInvitationsInput } from './dtos/send-invitations.input';
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.WORKSPACE_MEMBERS),
)
@UsePipes(ResolverValidationPipe)
@@ -54,7 +63,19 @@ export class WorkspaceInvitationResolver {
}
@Mutation(() => SendInvitationsDTO)
- @UseGuards(UserAuthGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ )
async resendWorkspaceInvitation(
@Args('appTokenId') appTokenId: string,
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -90,7 +111,19 @@ export class WorkspaceInvitationResolver {
}
@Mutation(() => SendInvitationsDTO)
- @UseGuards(UserAuthGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ )
@AllowSuspendedWorkspace()
async sendInvitations(
@Args() sendInviteLinkInput: SendInvitationsInput,
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
index 5e99cccb00c..d07886434f1 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
@@ -65,11 +65,9 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
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 { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { RoleDTO } from 'src/engine/metadata-modules/role/dtos/role.dto';
import { RoleService } from 'src/engine/metadata-modules/role/role.service';
@@ -109,7 +107,20 @@ export class WorkspaceResolver {
) {}
@Query(() => WorkspaceEntity)
- @UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+ )
async currentWorkspace(@AuthWorkspace() { id }: WorkspaceEntity) {
const workspace = await this.workspaceService.findOneWorkspaceById(id);
@@ -120,9 +131,17 @@ export class WorkspaceResolver {
@Mutation(() => WorkspaceEntity)
@UseGuards(
- UserAuthGuard,
- RequireUserSessionGuard,
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
NoPermissionGuard,
)
async activateWorkspace(
@@ -137,7 +156,20 @@ export class WorkspaceResolver {
}
@Mutation(() => WorkspaceEntity)
- @UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ CustomPermissionGuard,
+ )
async updateWorkspace(
@Args('data') data: UpdateWorkspaceInput,
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -163,7 +195,17 @@ export class WorkspaceResolver {
@Mutation(() => WorkspaceEntity)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.SECURITY),
)
async updateWorkspaceAllowedIframeOrigins(
@@ -195,7 +237,17 @@ export class WorkspaceResolver {
@Mutation(() => WorkspaceEntity)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
)
@AllowSuspendedWorkspace()
@@ -469,7 +521,17 @@ export class WorkspaceResolver {
@Mutation(() => DomainValidRecords, { nullable: true })
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
)
async checkCustomDomainValidRecords(
diff --git a/packages/twenty-server/src/engine/guards/__tests__/auth-principal.guard.spec.ts b/packages/twenty-server/src/engine/guards/__tests__/auth-principal.guard.spec.ts
new file mode 100644
index 00000000000..c52d5b54389
--- /dev/null
+++ b/packages/twenty-server/src/engine/guards/__tests__/auth-principal.guard.spec.ts
@@ -0,0 +1,576 @@
+import { type ExecutionContext, ForbiddenException } from '@nestjs/common';
+
+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
+import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/jwt-token-type.enum';
+import { ErrorCode } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
+import {
+ runGuardedQuery,
+ runGuardedRestRequest,
+} from 'src/engine/guards/__tests__/run-guarded-query.test-util';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
+import { AUTH_PRINCIPAL_REFUSED_MESSAGE } from 'src/engine/guards/constants/auth-principal-refused-message.constant';
+import { type AuthPrincipalGuardConfig } from 'src/engine/guards/types/auth-principal-guard-config.type';
+
+const user = { id: 'user-id' };
+const workspace = { id: 'workspace-id' };
+const oauthClient = {
+ id: 'oauth-client-id',
+ sourceType: ApplicationRegistrationSourceType.OAUTH_ONLY,
+};
+const installedApplication = {
+ id: 'application-id',
+ sourceType: ApplicationRegistrationSourceType.NPM,
+};
+const apiKey = { id: 'api-key-id' };
+const impersonationContext = {
+ impersonatorUserWorkspaceId: 'impersonator-user-workspace-id',
+ impersonatedUserWorkspaceId: 'impersonated-user-workspace-id',
+};
+
+const REQUEST_BY_PRINCIPAL_VARIANT = {
+ 'userSession.standard': {
+ user,
+ workspace,
+ tokenType: JwtTokenTypeEnum.ACCESS,
+ },
+ 'userSession.impersonated': {
+ user,
+ workspace,
+ tokenType: JwtTokenTypeEnum.ACCESS,
+ impersonationContext,
+ },
+ 'userSession.playground': {
+ user,
+ workspace,
+ tokenType: JwtTokenTypeEnum.PLAYGROUND,
+ },
+ 'userSession.workspaceAgnostic': {
+ user,
+ tokenType: JwtTokenTypeEnum.WORKSPACE_AGNOSTIC,
+ },
+ apiKey: {
+ apiKey,
+ workspace,
+ tokenType: JwtTokenTypeEnum.API_KEY,
+ },
+ 'oauthClient.withUser': {
+ application: oauthClient,
+ user,
+ workspace,
+ tokenType: JwtTokenTypeEnum.APPLICATION_ACCESS,
+ },
+ 'oauthClient.withoutUser': {
+ application: oauthClient,
+ workspace,
+ tokenType: JwtTokenTypeEnum.APPLICATION_ACCESS,
+ },
+ 'application.withUser': {
+ application: installedApplication,
+ user,
+ workspace,
+ tokenType: JwtTokenTypeEnum.APPLICATION_ACCESS,
+ },
+ 'application.withoutUser': {
+ application: installedApplication,
+ workspace,
+ tokenType: JwtTokenTypeEnum.APPLICATION_ACCESS,
+ },
+};
+
+type PrincipalVariantName = keyof typeof REQUEST_BY_PRINCIPAL_VARIANT;
+
+const ALL_PRINCIPAL_VARIANT_NAMES = Object.keys(
+ REQUEST_BY_PRINCIPAL_VARIANT,
+) as PrincipalVariantName[];
+
+const REFUSE_EVERY_PRINCIPAL: AuthPrincipalGuardConfig = {
+ userSession: false,
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+};
+
+const ACCEPT_EVERY_PRINCIPAL: AuthPrincipalGuardConfig = {
+ userSession: true,
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+};
+
+const CONFIG_CASES: {
+ name: string;
+ authPrincipalGuardConfig: AuthPrincipalGuardConfig;
+ acceptedPrincipalVariantNames: PrincipalVariantName[];
+}[] = [
+ {
+ name: 'every kind refused',
+ authPrincipalGuardConfig: REFUSE_EVERY_PRINCIPAL,
+ acceptedPrincipalVariantNames: [],
+ },
+ {
+ name: 'every kind accepted',
+ authPrincipalGuardConfig: ACCEPT_EVERY_PRINCIPAL,
+ acceptedPrincipalVariantNames: ALL_PRINCIPAL_VARIANT_NAMES,
+ },
+ {
+ name: 'userSession: true',
+ authPrincipalGuardConfig: { ...REFUSE_EVERY_PRINCIPAL, userSession: true },
+ acceptedPrincipalVariantNames: [
+ 'userSession.standard',
+ 'userSession.impersonated',
+ 'userSession.playground',
+ 'userSession.workspaceAgnostic',
+ ],
+ },
+ {
+ name: 'userSession: false',
+ authPrincipalGuardConfig: { ...ACCEPT_EVERY_PRINCIPAL, userSession: false },
+ acceptedPrincipalVariantNames: [
+ 'apiKey',
+ 'oauthClient.withUser',
+ 'oauthClient.withoutUser',
+ 'application.withUser',
+ 'application.withoutUser',
+ ],
+ },
+ {
+ name: 'userSession standard only',
+ authPrincipalGuardConfig: {
+ ...REFUSE_EVERY_PRINCIPAL,
+ userSession: {
+ standard: true,
+ impersonated: false,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ },
+ acceptedPrincipalVariantNames: ['userSession.standard'],
+ },
+ {
+ name: 'userSession impersonated only',
+ authPrincipalGuardConfig: {
+ ...REFUSE_EVERY_PRINCIPAL,
+ userSession: {
+ standard: false,
+ impersonated: true,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ },
+ acceptedPrincipalVariantNames: ['userSession.impersonated'],
+ },
+ {
+ name: 'userSession playground only',
+ authPrincipalGuardConfig: {
+ ...REFUSE_EVERY_PRINCIPAL,
+ userSession: {
+ standard: false,
+ impersonated: false,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ },
+ acceptedPrincipalVariantNames: ['userSession.playground'],
+ },
+ {
+ name: 'userSession workspaceAgnostic only',
+ authPrincipalGuardConfig: {
+ ...REFUSE_EVERY_PRINCIPAL,
+ userSession: {
+ standard: false,
+ impersonated: false,
+ playground: false,
+ workspaceAgnostic: true,
+ },
+ },
+ acceptedPrincipalVariantNames: ['userSession.workspaceAgnostic'],
+ },
+ {
+ name: 'apiKey: true',
+ authPrincipalGuardConfig: { ...REFUSE_EVERY_PRINCIPAL, apiKey: true },
+ acceptedPrincipalVariantNames: ['apiKey'],
+ },
+ {
+ name: 'apiKey: false',
+ authPrincipalGuardConfig: { ...ACCEPT_EVERY_PRINCIPAL, apiKey: false },
+ acceptedPrincipalVariantNames: ALL_PRINCIPAL_VARIANT_NAMES.filter(
+ (principalVariantName) => principalVariantName !== 'apiKey',
+ ),
+ },
+ {
+ name: 'oauthClient: true',
+ authPrincipalGuardConfig: { ...REFUSE_EVERY_PRINCIPAL, oauthClient: true },
+ acceptedPrincipalVariantNames: [
+ 'oauthClient.withUser',
+ 'oauthClient.withoutUser',
+ ],
+ },
+ {
+ name: 'oauthClient: false',
+ authPrincipalGuardConfig: { ...ACCEPT_EVERY_PRINCIPAL, oauthClient: false },
+ acceptedPrincipalVariantNames: ALL_PRINCIPAL_VARIANT_NAMES.filter(
+ (principalVariantName) => !principalVariantName.startsWith('oauthClient'),
+ ),
+ },
+ {
+ name: 'oauthClient withUser only',
+ authPrincipalGuardConfig: {
+ ...REFUSE_EVERY_PRINCIPAL,
+ oauthClient: { withUser: true, withoutUser: false },
+ },
+ acceptedPrincipalVariantNames: ['oauthClient.withUser'],
+ },
+ {
+ name: 'oauthClient withoutUser only',
+ authPrincipalGuardConfig: {
+ ...REFUSE_EVERY_PRINCIPAL,
+ oauthClient: { withUser: false, withoutUser: true },
+ },
+ acceptedPrincipalVariantNames: ['oauthClient.withoutUser'],
+ },
+ {
+ name: 'application: true',
+ authPrincipalGuardConfig: { ...REFUSE_EVERY_PRINCIPAL, application: true },
+ acceptedPrincipalVariantNames: [
+ 'application.withUser',
+ 'application.withoutUser',
+ ],
+ },
+ {
+ name: 'application: false',
+ authPrincipalGuardConfig: { ...ACCEPT_EVERY_PRINCIPAL, application: false },
+ acceptedPrincipalVariantNames: ALL_PRINCIPAL_VARIANT_NAMES.filter(
+ (principalVariantName) => !principalVariantName.startsWith('application'),
+ ),
+ },
+ {
+ name: 'application withUser only',
+ authPrincipalGuardConfig: {
+ ...REFUSE_EVERY_PRINCIPAL,
+ application: { withUser: true, withoutUser: false },
+ },
+ acceptedPrincipalVariantNames: ['application.withUser'],
+ },
+ {
+ name: 'application withoutUser only',
+ authPrincipalGuardConfig: {
+ ...REFUSE_EVERY_PRINCIPAL,
+ application: { withUser: false, withoutUser: true },
+ },
+ acceptedPrincipalVariantNames: ['application.withoutUser'],
+ },
+ {
+ name: 'every principal carrying a user',
+ authPrincipalGuardConfig: {
+ userSession: true,
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ },
+ acceptedPrincipalVariantNames: [
+ 'userSession.standard',
+ 'userSession.impersonated',
+ 'userSession.playground',
+ 'userSession.workspaceAgnostic',
+ 'oauthClient.withUser',
+ 'application.withUser',
+ ],
+ },
+ {
+ name: 'workspace sessions that are not impersonated',
+ authPrincipalGuardConfig: {
+ userSession: {
+ standard: true,
+ impersonated: false,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ },
+ acceptedPrincipalVariantNames: [
+ 'userSession.standard',
+ 'userSession.playground',
+ ],
+ },
+];
+
+const buildHttpContext = (request: unknown): ExecutionContext =>
+ ({
+ getType: () => 'http',
+ switchToHttp: () => ({ getRequest: () => request }),
+ }) as unknown as ExecutionContext;
+
+const canActivateOverHttp = (
+ authPrincipalGuardConfig: AuthPrincipalGuardConfig,
+ request: unknown,
+): boolean => {
+ const Guard = AuthPrincipalGuard(authPrincipalGuardConfig);
+
+ try {
+ return new Guard().canActivate(buildHttpContext(request)) as boolean;
+ } catch (error) {
+ if (error instanceof ForbiddenException) {
+ return false;
+ }
+
+ throw error;
+ }
+};
+
+describe('AuthPrincipalGuard', () => {
+ describe.each(CONFIG_CASES)(
+ 'with $name',
+ ({ authPrincipalGuardConfig, acceptedPrincipalVariantNames }) => {
+ it.each(
+ ALL_PRINCIPAL_VARIANT_NAMES.map((principalVariantName) => ({
+ principalVariantName,
+ decision: acceptedPrincipalVariantNames.includes(principalVariantName)
+ ? 'accept'
+ : 'refuse',
+ })),
+ )(
+ 'should $decision $principalVariantName',
+ ({ principalVariantName, decision }) => {
+ expect(
+ canActivateOverHttp(
+ authPrincipalGuardConfig,
+ REQUEST_BY_PRINCIPAL_VARIANT[principalVariantName],
+ ),
+ ).toBe(decision === 'accept');
+ },
+ );
+ },
+ );
+
+ it.each([
+ {
+ name: 'a token type that is not a session',
+ tokenType: JwtTokenTypeEnum.FILE,
+ },
+ { name: 'a token type that never resolved', tokenType: undefined },
+ ])('should refuse a user carried by $name', ({ tokenType }) => {
+ expect(
+ canActivateOverHttp(ACCEPT_EVERY_PRINCIPAL, {
+ user,
+ workspace,
+ tokenType,
+ }),
+ ).toBe(false);
+ });
+
+ it.each([
+ {
+ name: 'an API key token that also carries a user',
+ request: { apiKey, user, workspace, tokenType: JwtTokenTypeEnum.API_KEY },
+ },
+ {
+ name: 'an API key token that also carries an application',
+ request: {
+ apiKey,
+ application: installedApplication,
+ workspace,
+ tokenType: JwtTokenTypeEnum.API_KEY,
+ },
+ },
+ {
+ name: 'an API key token without an API key',
+ request: { workspace, tokenType: JwtTokenTypeEnum.API_KEY },
+ },
+ {
+ name: 'an API key without a token type',
+ request: { apiKey, workspace, tokenType: undefined },
+ },
+ {
+ name: 'an application token without an application',
+ request: {
+ user,
+ workspace,
+ tokenType: JwtTokenTypeEnum.APPLICATION_ACCESS,
+ },
+ },
+ {
+ name: 'an application token that also carries an API key',
+ request: {
+ application: installedApplication,
+ apiKey,
+ workspace,
+ tokenType: JwtTokenTypeEnum.APPLICATION_ACCESS,
+ },
+ },
+ {
+ name: 'an application token that carries an impersonation',
+ request: {
+ application: installedApplication,
+ user,
+ workspace,
+ tokenType: JwtTokenTypeEnum.APPLICATION_ACCESS,
+ impersonationContext,
+ },
+ },
+ {
+ name: 'an application without a token type',
+ request: {
+ application: installedApplication,
+ workspace,
+ tokenType: undefined,
+ },
+ },
+ {
+ name: 'a session token that also carries an application',
+ request: {
+ user,
+ application: installedApplication,
+ workspace,
+ tokenType: JwtTokenTypeEnum.ACCESS,
+ },
+ },
+ {
+ name: 'a session token that also carries an API key',
+ request: { user, apiKey, workspace, tokenType: JwtTokenTypeEnum.ACCESS },
+ },
+ {
+ name: 'a session token without a user',
+ request: { workspace, tokenType: JwtTokenTypeEnum.ACCESS },
+ },
+ {
+ name: 'a playground token that also carries an application',
+ request: {
+ user,
+ application: oauthClient,
+ workspace,
+ tokenType: JwtTokenTypeEnum.PLAYGROUND,
+ },
+ },
+ {
+ name: 'a playground token that carries an impersonation',
+ request: {
+ user,
+ workspace,
+ tokenType: JwtTokenTypeEnum.PLAYGROUND,
+ impersonationContext,
+ },
+ },
+ {
+ name: 'a workspace-agnostic token that also carries an API key',
+ request: { user, apiKey, tokenType: JwtTokenTypeEnum.WORKSPACE_AGNOSTIC },
+ },
+ {
+ name: 'a workspace-agnostic token that carries an impersonation',
+ request: {
+ user,
+ tokenType: JwtTokenTypeEnum.WORKSPACE_AGNOSTIC,
+ impersonationContext,
+ },
+ },
+ ])('should refuse $name', ({ request }) => {
+ expect(canActivateOverHttp(ACCEPT_EVERY_PRINCIPAL, request)).toBe(false);
+ });
+
+ it('should treat a session as impersonated only when both ids are set', () => {
+ expect(
+ canActivateOverHttp(
+ {
+ ...REFUSE_EVERY_PRINCIPAL,
+ userSession: {
+ standard: true,
+ impersonated: false,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ },
+ {
+ user,
+ workspace,
+ tokenType: JwtTokenTypeEnum.ACCESS,
+ impersonationContext: {
+ impersonatorUserWorkspaceId: 'impersonator-user-workspace-id',
+ },
+ },
+ ),
+ ).toBe(true);
+ });
+
+ it('should refuse when there is no request on the context', () => {
+ expect(canActivateOverHttp(ACCEPT_EVERY_PRINCIPAL, undefined)).toBe(false);
+ });
+
+ describe('over GraphQL', () => {
+ it('should let an accepted principal through', async () => {
+ const result = await runGuardedQuery({
+ guard: AuthPrincipalGuard({
+ ...REFUSE_EVERY_PRINCIPAL,
+ userSession: true,
+ }),
+ request: REQUEST_BY_PRINCIPAL_VARIANT['userSession.standard'],
+ });
+
+ expect(result.errors).toBeUndefined();
+ expect(result.data?.guardedQuery).toBe('ok');
+ });
+
+ it('should refuse with FORBIDDEN', async () => {
+ const result = await runGuardedQuery({
+ guard: AuthPrincipalGuard({
+ ...REFUSE_EVERY_PRINCIPAL,
+ userSession: true,
+ }),
+ request: REQUEST_BY_PRINCIPAL_VARIANT.apiKey,
+ });
+
+ expect(result.errors).toHaveLength(1);
+ expect(result.errors?.[0]?.message).toBe(AUTH_PRINCIPAL_REFUSED_MESSAGE);
+ expect(result.errors?.[0]?.originalError).toBeInstanceOf(
+ ForbiddenException,
+ );
+ });
+
+ it('should report a request without credentials as UNAUTHENTICATED', async () => {
+ const result = await runGuardedQuery({
+ guard: AuthPrincipalGuard(ACCEPT_EVERY_PRINCIPAL),
+ request: { workspace },
+ });
+
+ expect(result.errors).toHaveLength(1);
+ expect(result.errors?.[0]?.extensions?.code).toBe(
+ ErrorCode.UNAUTHENTICATED,
+ );
+ });
+ });
+
+ describe('over REST', () => {
+ it('should let an accepted principal through', async () => {
+ const response = await runGuardedRestRequest({
+ guard: AuthPrincipalGuard({ ...REFUSE_EVERY_PRINCIPAL, apiKey: true }),
+ request: REQUEST_BY_PRINCIPAL_VARIANT.apiKey,
+ });
+
+ expect(response.status).toBe(200);
+ expect(response.text).toBe('ok');
+ });
+
+ it('should refuse with a 403', async () => {
+ const response = await runGuardedRestRequest({
+ guard: AuthPrincipalGuard({
+ ...REFUSE_EVERY_PRINCIPAL,
+ userSession: true,
+ }),
+ request: REQUEST_BY_PRINCIPAL_VARIANT.apiKey,
+ });
+
+ expect(response.status).toBe(403);
+ expect(response.body.message).toBe(AUTH_PRINCIPAL_REFUSED_MESSAGE);
+ });
+
+ it('should refuse a request without credentials with a 403', async () => {
+ const response = await runGuardedRestRequest({
+ guard: AuthPrincipalGuard(ACCEPT_EVERY_PRINCIPAL),
+ request: {},
+ });
+
+ expect(response.status).toBe(403);
+ expect(response.body.message).toBe(AUTH_PRINCIPAL_REFUSED_MESSAGE);
+ });
+ });
+});
diff --git a/packages/twenty-server/src/engine/guards/__tests__/run-guarded-query.test-util.ts b/packages/twenty-server/src/engine/guards/__tests__/run-guarded-query.test-util.ts
index 1aa7886aeab..55979841bc8 100644
--- a/packages/twenty-server/src/engine/guards/__tests__/run-guarded-query.test-util.ts
+++ b/packages/twenty-server/src/engine/guards/__tests__/run-guarded-query.test-util.ts
@@ -1,5 +1,12 @@
-// oxlint-disable twenty/graphql-resolvers-should-be-guarded
-import { type CanActivate, Module, type Type, UseGuards } from '@nestjs/common';
+// oxlint-disable twenty/graphql-resolvers-should-be-guarded, twenty/rest-api-methods-should-be-guarded
+import {
+ type CanActivate,
+ Controller,
+ Get,
+ Module,
+ type Type,
+ UseGuards,
+} from '@nestjs/common';
import { APP_FILTER } from '@nestjs/core';
import {
GraphQLModule,
@@ -11,7 +18,9 @@ import {
import { Test } from '@nestjs/testing';
import { YogaDriver, type YogaDriverConfig } from '@graphql-yoga/nestjs';
+import { type NextFunction, type Request, type Response } from 'express';
import { type GraphQLSchema, graphql } from 'graphql';
+import supertest from 'supertest';
import { UnhandledExceptionFilter } from 'src/filters/unhandled-exception.filter';
@@ -71,3 +80,49 @@ export const runGuardedQuery = async ({
return result;
};
+
+// Same for a REST route: the request fields are set by a middleware standing in
+// for authentication, and a refusal goes through the catch-all filter.
+export const runGuardedRestRequest = async ({
+ guard,
+ request,
+}: {
+ guard: Type<CanActivate>;
+ request: Record<string, unknown>;
+}) => {
+ @Controller('guarded')
+ class TestController {
+ @Get()
+ @UseGuards(guard)
+ guardedRoute(): string {
+ return 'ok';
+ }
+ }
+
+ @Module({
+ controllers: [TestController],
+ providers: [{ provide: APP_FILTER, useClass: UnhandledExceptionFilter }],
+ })
+ class RootModule {}
+
+ const moduleRef = await Test.createTestingModule({
+ imports: [RootModule],
+ }).compile();
+
+ const app = moduleRef.createNestApplication();
+
+ app.use(
+ (incomingRequest: Request, _response: Response, next: NextFunction) => {
+ Object.assign(incomingRequest, request);
+ next();
+ },
+ );
+
+ await app.init();
+
+ const response = await supertest(app.getHttpServer()).get('/guarded');
+
+ await app.close();
+
+ return response;
+};
diff --git a/packages/twenty-server/src/engine/guards/__tests__/user-auth.guard.spec.ts b/packages/twenty-server/src/engine/guards/__tests__/user-auth.guard.spec.ts
deleted file mode 100644
index 5849d654bbd..00000000000
--- a/packages/twenty-server/src/engine/guards/__tests__/user-auth.guard.spec.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { type ExecutionContext, ForbiddenException } from '@nestjs/common';
-
-import { ErrorCode } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
-import { runGuardedQuery } from 'src/engine/guards/__tests__/run-guarded-query.test-util';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-
-const runQuery = (request: Record<string, unknown>) =>
- runGuardedQuery({ guard: UserAuthGuard, request });
-
-describe('UserAuthGuard', () => {
- it('should let a user-scoped request through', async () => {
- const result = await runQuery({ user: { id: 'user-id' } });
-
- expect(result.errors).toBeUndefined();
- expect(result.data?.guardedQuery).toBe('ok');
- });
-
- it('should report an unauthenticated request as UNAUTHENTICATED', async () => {
- const result = await runQuery({});
-
- expect(result.errors?.[0]?.extensions?.code).toBe(
- ErrorCode.UNAUTHENTICATED,
- );
- });
-
- // Asserted on the exception rather than the code, which the Yoga error handler
- // derives from the HTTP status further down than this harness reaches.
- it('should keep refusing an API key, which authenticates without a user', async () => {
- const result = await runQuery({ apiKey: { id: 'api-key-id' } });
-
- expect(result.errors?.[0]?.originalError).toBeInstanceOf(
- ForbiddenException,
- );
- expect(result.errors?.[0]?.message).toBe('Forbidden resource');
- });
-
- it('should keep refusing an application, which authenticates without a user', async () => {
- const result = await runQuery({ application: { id: 'application-id' } });
-
- expect(result.errors?.[0]?.originalError).toBeInstanceOf(
- ForbiddenException,
- );
- });
-
- it('should keep refusing an unauthenticated REST request without throwing', () => {
- const guard = new UserAuthGuard();
-
- const httpContext = {
- getType: () => 'http',
- switchToHttp: () => ({ getRequest: () => ({}) }),
- } as unknown as ExecutionContext;
-
- expect(guard.canActivate(httpContext)).toBe(false);
- });
-});
diff --git a/packages/twenty-server/src/engine/guards/__tests__/workspace-auth.guard.spec.ts b/packages/twenty-server/src/engine/guards/__tests__/workspace-auth.guard.spec.ts
deleted file mode 100644
index 565740601e1..00000000000
--- a/packages/twenty-server/src/engine/guards/__tests__/workspace-auth.guard.spec.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { type ExecutionContext, ForbiddenException } from '@nestjs/common';
-
-import { ErrorCode } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
-import { runGuardedQuery } from 'src/engine/guards/__tests__/run-guarded-query.test-util';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
-
-const runQuery = (request: Record<string, unknown>) =>
- runGuardedQuery({ guard: WorkspaceAuthGuard, request });
-
-describe('WorkspaceAuthGuard', () => {
- it('should let a workspace-scoped request through', async () => {
- const result = await runQuery({
- user: { id: 'user-id' },
- workspace: { id: 'workspace-id' },
- });
-
- expect(result.errors).toBeUndefined();
- expect(result.data?.guardedQuery).toBe('ok');
- });
-
- it('should report an unauthenticated request as UNAUTHENTICATED', async () => {
- const result = await runQuery({});
-
- expect(result.errors?.[0]?.extensions?.code).toBe(
- ErrorCode.UNAUTHENTICATED,
- );
- });
-
- // Asserted on the exception rather than the code, which the Yoga error handler
- // derives from the HTTP status further down than this harness reaches.
- it('should keep refusing an authenticated request with no workspace', async () => {
- const result = await runQuery({ user: { id: 'user-id' } });
-
- expect(result.errors?.[0]?.originalError).toBeInstanceOf(
- ForbiddenException,
- );
- expect(result.errors?.[0]?.message).toBe('Forbidden resource');
- });
-
- it('should keep refusing an unauthenticated REST request without throwing', () => {
- const guard = new WorkspaceAuthGuard();
-
- const httpContext = {
- getType: () => 'http',
- switchToHttp: () => ({ getRequest: () => ({}) }),
- } as unknown as ExecutionContext;
-
- expect(guard.canActivate(httpContext)).toBe(false);
- });
-});
diff --git a/packages/twenty-server/src/engine/guards/auth-principal.guard.ts b/packages/twenty-server/src/engine/guards/auth-principal.guard.ts
new file mode 100644
index 00000000000..f12f5898bca
--- /dev/null
+++ b/packages/twenty-server/src/engine/guards/auth-principal.guard.ts
@@ -0,0 +1,45 @@
+import {
+ type CanActivate,
+ type ExecutionContext,
+ Injectable,
+ mixin,
+ type Type,
+} from '@nestjs/common';
+
+import { isDefined } from 'twenty-shared/utils';
+
+import { AuthPrincipalRefusedException } from 'src/engine/guards/exceptions/auth-principal-refused.exception';
+import { type AuthPrincipalGuardConfig } from 'src/engine/guards/types/auth-principal-guard-config.type';
+import { classifyAuthPrincipal } from 'src/engine/guards/utils/classify-auth-principal.util';
+import { getRequestOrThrowWhenUnauthenticated } from 'src/engine/guards/utils/get-request-or-throw-when-unauthenticated.util';
+import { isAuthPrincipalVariantAccepted } from 'src/engine/guards/utils/is-auth-principal-variant-accepted.util';
+
+export const AuthPrincipalGuard = (
+ authPrincipalGuardConfig: AuthPrincipalGuardConfig,
+): Type<CanActivate> => {
+ @Injectable()
+ class AuthPrincipalMixin implements CanActivate {
+ canActivate(context: ExecutionContext): boolean {
+ const request = getRequestOrThrowWhenUnauthenticated(context);
+ const authPrincipalVariant = isDefined(request)
+ ? classifyAuthPrincipal(request)
+ : undefined;
+
+ if (
+ isDefined(authPrincipalVariant) &&
+ isAuthPrincipalVariantAccepted({
+ authPrincipalGuardConfig,
+ authPrincipalVariant,
+ })
+ ) {
+ return true;
+ }
+
+ // A 403 on REST and FORBIDDEN on GraphQL, and unlike a GraphQL error thrown
+ // from a guard, Nest does not log it as an unhandled exception.
+ throw new AuthPrincipalRefusedException();
+ }
+ }
+
+ return mixin(AuthPrincipalMixin);
+};
diff --git a/packages/twenty-server/src/engine/guards/constants/auth-principal-refused-message.constant.ts b/packages/twenty-server/src/engine/guards/constants/auth-principal-refused-message.constant.ts
new file mode 100644
index 00000000000..11936bdd6b9
--- /dev/null
+++ b/packages/twenty-server/src/engine/guards/constants/auth-principal-refused-message.constant.ts
@@ -0,0 +1,2 @@
+export const AUTH_PRINCIPAL_REFUSED_MESSAGE =
+ 'This endpoint is not available to this caller';
diff --git a/packages/twenty-server/src/engine/guards/exceptions/auth-principal-refused.exception.ts b/packages/twenty-server/src/engine/guards/exceptions/auth-principal-refused.exception.ts
new file mode 100644
index 00000000000..a5c561e8cc7
--- /dev/null
+++ b/packages/twenty-server/src/engine/guards/exceptions/auth-principal-refused.exception.ts
@@ -0,0 +1,15 @@
+import { ForbiddenException } from '@nestjs/common';
+
+import { msg } from '@lingui/core/macro';
+
+import { AUTH_PRINCIPAL_REFUSED_MESSAGE } from 'src/engine/guards/constants/auth-principal-refused-message.constant';
+
+export class AuthPrincipalRefusedException extends ForbiddenException {
+ // Read off the exception by the GraphQL error handler, which otherwise falls
+ // back to a generic message for an HTTP exception.
+ readonly userFriendlyMessage = msg`You do not have permission to perform this action.`;
+
+ constructor() {
+ super(AUTH_PRINCIPAL_REFUSED_MESSAGE);
+ }
+}
diff --git a/packages/twenty-server/src/engine/guards/no-impersonation.guard.ts b/packages/twenty-server/src/engine/guards/no-impersonation.guard.ts
deleted file mode 100644
index 9ffedd75d9b..00000000000
--- a/packages/twenty-server/src/engine/guards/no-impersonation.guard.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {
- type CanActivate,
- type ExecutionContext,
- ForbiddenException,
- Injectable,
-} from '@nestjs/common';
-import { GqlExecutionContext } from '@nestjs/graphql';
-
-@Injectable()
-export class NoImpersonationGuard implements CanActivate {
- canActivate(context: ExecutionContext): boolean {
- const ctx = GqlExecutionContext.create(context);
- const request = ctx.getContext().req as {
- impersonationContext?: {
- impersonatorUserWorkspaceId?: string;
- impersonatedUserWorkspaceId?: string;
- };
- };
-
- const isCurrentlyImpersonating = Boolean(
- request?.impersonationContext?.impersonatorUserWorkspaceId &&
- request?.impersonationContext?.impersonatedUserWorkspaceId,
- );
-
- if (isCurrentlyImpersonating) {
- throw new ForbiddenException(
- "Can't access this resource while impersonating",
- );
- }
-
- return true;
- }
-}
diff --git a/packages/twenty-server/src/engine/guards/require-access-token.guard.spec.ts b/packages/twenty-server/src/engine/guards/require-access-token.guard.spec.ts
deleted file mode 100644
index 245077d87c9..00000000000
--- a/packages/twenty-server/src/engine/guards/require-access-token.guard.spec.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { type ExecutionContext } from '@nestjs/common';
-
-import { AuthException } from 'src/engine/core-modules/auth/auth.exception';
-import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/jwt-token-type.enum';
-import { RequireAccessTokenGuard } from 'src/engine/guards/require-access-token.guard';
-
-const buildExecutionContext = (
- request: { tokenType?: JwtTokenTypeEnum } | undefined,
-): ExecutionContext =>
- ({
- getType: () => 'http',
- switchToHttp: () => ({ getRequest: () => request }),
- }) as unknown as ExecutionContext;
-
-describe('RequireAccessTokenGuard', () => {
- const guard = new RequireAccessTokenGuard();
-
- it('allows a session ACCESS token', () => {
- const context = buildExecutionContext({
- tokenType: JwtTokenTypeEnum.ACCESS,
- });
-
- expect(guard.canActivate(context)).toBe(true);
- });
-
- it('rejects a PLAYGROUND token so it cannot mint further tokens', () => {
- const context = buildExecutionContext({
- tokenType: JwtTokenTypeEnum.PLAYGROUND,
- });
-
- expect(() => guard.canActivate(context)).toThrow(AuthException);
- });
-
- it('rejects an API_KEY token', () => {
- const context = buildExecutionContext({
- tokenType: JwtTokenTypeEnum.API_KEY,
- });
-
- expect(() => guard.canActivate(context)).toThrow(AuthException);
- });
-
- it('rejects a request without a resolved token type', () => {
- const context = buildExecutionContext({ tokenType: undefined });
-
- expect(() => guard.canActivate(context)).toThrow(AuthException);
- });
-
- it('denies when there is no request on the context', () => {
- const context = buildExecutionContext(undefined);
-
- expect(guard.canActivate(context)).toBe(false);
- });
-});
diff --git a/packages/twenty-server/src/engine/guards/require-access-token.guard.ts b/packages/twenty-server/src/engine/guards/require-access-token.guard.ts
deleted file mode 100644
index a9d3d546e63..00000000000
--- a/packages/twenty-server/src/engine/guards/require-access-token.guard.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import {
- type CanActivate,
- type ExecutionContext,
- Injectable,
-} from '@nestjs/common';
-
-import {
- AuthException,
- AuthExceptionCode,
-} from 'src/engine/core-modules/auth/auth.exception';
-import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/jwt-token-type.enum';
-import { getRequest } from 'src/utils/extract-request';
-
-@Injectable()
-export class RequireAccessTokenGuard implements CanActivate {
- canActivate(context: ExecutionContext): boolean {
- const request = getRequest(context);
-
- if (!request) return false;
-
- if (request.tokenType !== JwtTokenTypeEnum.ACCESS) {
- throw new AuthException(
- 'This endpoint requires a session access token',
- AuthExceptionCode.FORBIDDEN_EXCEPTION,
- );
- }
-
- return true;
- }
-}
diff --git a/packages/twenty-server/src/engine/guards/require-user-session.guard.spec.ts b/packages/twenty-server/src/engine/guards/require-user-session.guard.spec.ts
deleted file mode 100644
index 61157505516..00000000000
--- a/packages/twenty-server/src/engine/guards/require-user-session.guard.spec.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { type ExecutionContext } from '@nestjs/common';
-
-import { ErrorCode } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
-import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/jwt-token-type.enum';
-import { runGuardedQuery } from 'src/engine/guards/__tests__/run-guarded-query.test-util';
-import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';
-
-const user = { id: 'user-id' };
-
-const runQuery = (request: Record<string, unknown>) =>
- runGuardedQuery({ guard: RequireUserSessionGuard, request });
-
-describe('RequireUserSessionGuard', () => {
- it.each([
- JwtTokenTypeEnum.ACCESS,
- JwtTokenTypeEnum.PLAYGROUND,
- JwtTokenTypeEnum.WORKSPACE_AGNOSTIC,
- ])('should let a %s token carrying a user through', async (tokenType) => {
- const result = await runQuery({ user, tokenType });
-
- expect(result.errors).toBeUndefined();
- expect(result.data?.guardedQuery).toBe('ok');
- });
-
- it('should refuse an application token bound to a user', async () => {
- const result = await runQuery({
- user,
- application: { id: 'application-id' },
- tokenType: JwtTokenTypeEnum.APPLICATION_ACCESS,
- });
-
- expect(result.errors?.[0]?.extensions?.code).toBe(ErrorCode.FORBIDDEN);
- });
-
- it('should refuse an application token bound to nobody', async () => {
- const result = await runQuery({
- application: { id: 'application-id' },
- tokenType: JwtTokenTypeEnum.APPLICATION_ACCESS,
- });
-
- expect(result.errors?.[0]?.extensions?.code).toBe(ErrorCode.FORBIDDEN);
- });
-
- it('should refuse an API key token', async () => {
- const result = await runQuery({
- apiKey: { id: 'api-key-id' },
- tokenType: JwtTokenTypeEnum.API_KEY,
- });
-
- expect(result.errors?.[0]?.extensions?.code).toBe(ErrorCode.FORBIDDEN);
- });
-
- it('should refuse a user carried by a token type that is not a session', async () => {
- const result = await runQuery({ user, tokenType: JwtTokenTypeEnum.FILE });
-
- expect(result.errors?.[0]?.extensions?.code).toBe(ErrorCode.FORBIDDEN);
- });
-
- it('should refuse a request whose token type never resolved', async () => {
- const result = await runQuery({ user, tokenType: undefined });
-
- expect(result.errors?.[0]?.extensions?.code).toBe(ErrorCode.FORBIDDEN);
- });
-
- it('should report a credential-less request as UNAUTHENTICATED', async () => {
- const result = await runQuery({});
-
- expect(result.errors?.[0]?.extensions?.code).toBe(
- ErrorCode.UNAUTHENTICATED,
- );
- });
-
- it('should deny a REST request without throwing a GraphQL error', () => {
- const guard = new RequireUserSessionGuard();
-
- const httpContext = {
- getType: () => 'http',
- switchToHttp: () => ({
- getRequest: () => ({ apiKey: { id: 'api-key-id' } }),
- }),
- } as unknown as ExecutionContext;
-
- expect(guard.canActivate(httpContext)).toBe(false);
- });
-
- it('should deny when there is no request on the context', () => {
- const guard = new RequireUserSessionGuard();
-
- const httpContext = {
- getType: () => 'http',
- switchToHttp: () => ({ getRequest: () => undefined }),
- } as unknown as ExecutionContext;
-
- expect(guard.canActivate(httpContext)).toBe(false);
- });
-});
diff --git a/packages/twenty-server/src/engine/guards/require-user-session.guard.ts b/packages/twenty-server/src/engine/guards/require-user-session.guard.ts
deleted file mode 100644
index d68e8b58cfb..00000000000
--- a/packages/twenty-server/src/engine/guards/require-user-session.guard.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {
- type CanActivate,
- type ExecutionContext,
- Injectable,
-} from '@nestjs/common';
-import { type GqlContextType } from '@nestjs/graphql';
-
-import { getRequestOrThrowWhenUnauthenticated } from 'src/engine/guards/utils/get-request-or-throw-when-unauthenticated.util';
-import {
- buildUserSessionRequiredError,
- isUserSessionPrincipal,
-} from 'src/engine/guards/utils/is-user-session-principal.util';
-
-@Injectable()
-export class RequireUserSessionGuard implements CanActivate {
- canActivate(context: ExecutionContext): boolean {
- const request = getRequestOrThrowWhenUnauthenticated(context);
-
- if (!request) {
- return false;
- }
-
- if (isUserSessionPrincipal(request)) {
- return true;
- }
-
- if (context.getType<GqlContextType>() === 'graphql') {
- throw buildUserSessionRequiredError();
- }
-
- return false;
- }
-}
diff --git a/packages/twenty-server/src/engine/guards/types/auth-principal-guard-config.type.ts b/packages/twenty-server/src/engine/guards/types/auth-principal-guard-config.type.ts
new file mode 100644
index 00000000000..6b30b1e229f
--- /dev/null
+++ b/packages/twenty-server/src/engine/guards/types/auth-principal-guard-config.type.ts
@@ -0,0 +1,15 @@
+// Every kind and every variant is required, so a kind or variant added later
+// fails to compile at every endpoint until someone decides for it.
+export type AuthPrincipalGuardConfig = {
+ userSession:
+ | boolean
+ | {
+ standard: boolean;
+ impersonated: boolean;
+ playground: boolean;
+ workspaceAgnostic: boolean;
+ };
+ apiKey: boolean;
+ oauthClient: boolean | { withUser: boolean; withoutUser: boolean };
+ application: boolean | { withUser: boolean; withoutUser: boolean };
+};
diff --git a/packages/twenty-server/src/engine/guards/types/auth-principal-variant.type.ts b/packages/twenty-server/src/engine/guards/types/auth-principal-variant.type.ts
new file mode 100644
index 00000000000..f228cd7a22b
--- /dev/null
+++ b/packages/twenty-server/src/engine/guards/types/auth-principal-variant.type.ts
@@ -0,0 +1,10 @@
+export type AuthPrincipalVariant =
+ | {
+ kind: 'userSession';
+ variant: 'standard' | 'impersonated' | 'playground' | 'workspaceAgnostic';
+ }
+ | { kind: 'apiKey' }
+ | {
+ kind: 'oauthClient' | 'application';
+ variant: 'withUser' | 'withoutUser';
+ };
diff --git a/packages/twenty-server/src/engine/guards/user-auth.guard.ts b/packages/twenty-server/src/engine/guards/user-auth.guard.ts
deleted file mode 100644
index 2fdbe1a30a9..00000000000
--- a/packages/twenty-server/src/engine/guards/user-auth.guard.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { type CanActivate, type ExecutionContext } from '@nestjs/common';
-
-import { type Observable } from 'rxjs';
-
-import { getRequestOrThrowWhenUnauthenticated } from 'src/engine/guards/utils/get-request-or-throw-when-unauthenticated.util';
-
-export class UserAuthGuard implements CanActivate {
- canActivate(
- context: ExecutionContext,
- ): boolean | Promise<boolean> | Observable<boolean> {
- const request = getRequestOrThrowWhenUnauthenticated(context);
-
- if (!request) {
- return false;
- }
-
- return request.user !== undefined;
- }
-}
diff --git a/packages/twenty-server/src/engine/guards/user-or-application-auth.guard.ts b/packages/twenty-server/src/engine/guards/user-or-application-auth.guard.ts
deleted file mode 100644
index 37e2dd74dea..00000000000
--- a/packages/twenty-server/src/engine/guards/user-or-application-auth.guard.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { type CanActivate, type ExecutionContext } from '@nestjs/common';
-
-import { isDefined } from 'twenty-shared/utils';
-
-import { getRequestOrThrowWhenUnauthenticated } from 'src/engine/guards/utils/get-request-or-throw-when-unauthenticated.util';
-
-export class UserOrApplicationAuthGuard implements CanActivate {
- canActivate(context: ExecutionContext): boolean {
- const request = getRequestOrThrowWhenUnauthenticated(context);
-
- if (!request) {
- return false;
- }
-
- return isDefined(request.user) || isDefined(request.application);
- }
-}
diff --git a/packages/twenty-server/src/engine/guards/utils/classify-auth-principal.util.ts b/packages/twenty-server/src/engine/guards/utils/classify-auth-principal.util.ts
new file mode 100644
index 00000000000..0960c59c4e2
--- /dev/null
+++ b/packages/twenty-server/src/engine/guards/utils/classify-auth-principal.util.ts
@@ -0,0 +1,79 @@
+import { isNonEmptyString } from '@sniptt/guards';
+import { isDefined } from 'twenty-shared/utils';
+
+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
+import { isOAuthOnlyApplication } from 'src/engine/core-modules/application/utils/is-oauth-only-application.util';
+import { type RawAuthContext } from 'src/engine/core-modules/auth/types/raw-auth-context.type';
+import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/jwt-token-type.enum';
+import { type AuthPrincipalVariant } from 'src/engine/guards/types/auth-principal-variant.type';
+
+type AuthPrincipalRequest = {
+ user?: unknown;
+ apiKey?: unknown;
+ application?: Pick<FlatApplication, 'sourceType'> | null;
+ tokenType?: JwtTokenTypeEnum;
+ impersonationContext?: RawAuthContext['impersonationContext'];
+};
+
+const isImpersonating = (
+ impersonationContext: AuthPrincipalRequest['impersonationContext'],
+): boolean =>
+ isNonEmptyString(impersonationContext?.impersonatorUserWorkspaceId) &&
+ isNonEmptyString(impersonationContext?.impersonatedUserWorkspaceId);
+
+const carriesUserWithoutOtherPrincipal = (
+ request: AuthPrincipalRequest,
+): boolean =>
+ isDefined(request.user) &&
+ !isDefined(request.apiKey) &&
+ !isDefined(request.application);
+
+export const classifyAuthPrincipal = (
+ request: AuthPrincipalRequest,
+): AuthPrincipalVariant | undefined => {
+ switch (request.tokenType) {
+ case JwtTokenTypeEnum.API_KEY:
+ return isDefined(request.apiKey) &&
+ !isDefined(request.user) &&
+ !isDefined(request.application) &&
+ !isDefined(request.impersonationContext)
+ ? { kind: 'apiKey' }
+ : undefined;
+ case JwtTokenTypeEnum.APPLICATION_ACCESS:
+ if (
+ !isDefined(request.application) ||
+ isDefined(request.apiKey) ||
+ isDefined(request.impersonationContext)
+ ) {
+ return undefined;
+ }
+
+ return {
+ kind: isOAuthOnlyApplication(request.application)
+ ? 'oauthClient'
+ : 'application',
+ variant: isDefined(request.user) ? 'withUser' : 'withoutUser',
+ };
+ case JwtTokenTypeEnum.ACCESS:
+ return carriesUserWithoutOtherPrincipal(request)
+ ? {
+ kind: 'userSession',
+ variant: isImpersonating(request.impersonationContext)
+ ? 'impersonated'
+ : 'standard',
+ }
+ : undefined;
+ case JwtTokenTypeEnum.PLAYGROUND:
+ return carriesUserWithoutOtherPrincipal(request) &&
+ !isDefined(request.impersonationContext)
+ ? { kind: 'userSession', variant: 'playground' }
+ : undefined;
+ case JwtTokenTypeEnum.WORKSPACE_AGNOSTIC:
+ return carriesUserWithoutOtherPrincipal(request) &&
+ !isDefined(request.impersonationContext)
+ ? { kind: 'userSession', variant: 'workspaceAgnostic' }
+ : undefined;
+ default:
+ return undefined;
+ }
+};
diff --git a/packages/twenty-server/src/engine/guards/utils/get-request-or-throw-when-unauthenticated.util.ts b/packages/twenty-server/src/engine/guards/utils/get-request-or-throw-when-unauthenticated.util.ts
index 2c00b475a48..f187d413102 100644
--- a/packages/twenty-server/src/engine/guards/utils/get-request-or-throw-when-unauthenticated.util.ts
+++ b/packages/twenty-server/src/engine/guards/utils/get-request-or-throw-when-unauthenticated.util.ts
@@ -17,11 +17,10 @@ const hasAuthenticatedPrincipal = (request: {
isDefined(request.apiKey) ||
isDefined(request.application);
-// Shared by the auth guards so the two cannot drift on how a credential-less
-// request is reported. Returning false reports FORBIDDEN, which clients read as
-// a permission problem and never recover from, so a request nothing
-// authenticated has to say UNAUTHENTICATED instead. GraphQL only, since the
-// catch-all filter turns a GraphQL error thrown on the REST path into a 500.
+// A refusal reports FORBIDDEN, which clients read as a permission problem and
+// never recover from, so a request nothing authenticated has to say
+// UNAUTHENTICATED instead. GraphQL only, since the catch-all filter turns a
+// GraphQL error thrown on the REST path into a 500.
export const getRequestOrThrowWhenUnauthenticated = (
context: ExecutionContext,
) => {
diff --git a/packages/twenty-server/src/engine/guards/utils/is-auth-principal-variant-accepted.util.ts b/packages/twenty-server/src/engine/guards/utils/is-auth-principal-variant-accepted.util.ts
new file mode 100644
index 00000000000..4e056e33844
--- /dev/null
+++ b/packages/twenty-server/src/engine/guards/utils/is-auth-principal-variant-accepted.util.ts
@@ -0,0 +1,36 @@
+import { isBoolean } from '@sniptt/guards';
+import { assertUnreachable } from 'twenty-shared/utils';
+
+import { type AuthPrincipalGuardConfig } from 'src/engine/guards/types/auth-principal-guard-config.type';
+import { type AuthPrincipalVariant } from 'src/engine/guards/types/auth-principal-variant.type';
+
+const isVariantAccepted = <TVariant extends string>(
+ kindConfig: boolean | Record<TVariant, boolean>,
+ variant: TVariant,
+): boolean => (isBoolean(kindConfig) ? kindConfig : kindConfig[variant]);
+
+export const isAuthPrincipalVariantAccepted = ({
+ authPrincipalGuardConfig,
+ authPrincipalVariant,
+}: {
+ authPrincipalGuardConfig: AuthPrincipalGuardConfig;
+ authPrincipalVariant: AuthPrincipalVariant;
+}): boolean => {
+ switch (authPrincipalVariant.kind) {
+ case 'userSession':
+ return isVariantAccepted(
+ authPrincipalGuardConfig.userSession,
+ authPrincipalVariant.variant,
+ );
+ case 'apiKey':
+ return authPrincipalGuardConfig.apiKey;
+ case 'oauthClient':
+ case 'application':
+ return isVariantAccepted(
+ authPrincipalGuardConfig[authPrincipalVariant.kind],
+ authPrincipalVariant.variant,
+ );
+ default:
+ return assertUnreachable(authPrincipalVariant);
+ }
+};
diff --git a/packages/twenty-server/src/engine/guards/workspace-auth.guard.ts b/packages/twenty-server/src/engine/guards/workspace-auth.guard.ts
deleted file mode 100644
index 53dce444cfe..00000000000
--- a/packages/twenty-server/src/engine/guards/workspace-auth.guard.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import {
- type CanActivate,
- type ExecutionContext,
- Injectable,
-} from '@nestjs/common';
-
-import { type Observable } from 'rxjs';
-
-import { getRequestOrThrowWhenUnauthenticated } from 'src/engine/guards/utils/get-request-or-throw-when-unauthenticated.util';
-
-@Injectable()
-export class WorkspaceAuthGuard implements CanActivate {
- canActivate(
- context: ExecutionContext,
- ): boolean | Promise<boolean> | Observable<boolean> {
- const request = getRequestOrThrowWhenUnauthenticated(context);
-
- if (!request) {
- return false;
- }
-
- // Workspace-agnostic token: a genuine refusal, renewing returns the same one.
- if (!request.workspace) {
- return false;
- }
-
- return true;
- }
-}
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.ts
index cdc9bed0f9a..7f7e2d70f71 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
@@ -13,14 +13,27 @@ import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-worksp
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { RunAgentInputDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/run-agent.input';
import { RunAgentResultDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/run-agent-result.dto';
import { AgentRunService } from 'src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run.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';
-@UseGuards(WorkspaceAuthGuard, SettingsPermissionGuard(PermissionFlagType.AI))
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ SettingsPermissionGuard(PermissionFlagType.AI),
+)
@UseInterceptors(AiGraphqlApiExceptionInterceptor)
@UseFilters(
UsageLimitGraphqlApiExceptionFilter,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
index b5741957247..4e921a44660 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
@@ -16,7 +16,7 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspac
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { AgentTurnDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-turn.dto';
import { AgentTurnWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-turn.workspace-entity';
import { AgentTurnEvaluationDTO } from 'src/engine/metadata-modules/ai/ai-agent-monitor/dtos/agent-turn-evaluation.dto';
@@ -25,10 +25,19 @@ import { AgentTurnGraderService } from 'src/engine/metadata-modules/ai/ai-agent-
import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';
import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS),
)
@MetadataResolver(() => AgentTurnDTO)
@@ -87,7 +96,19 @@ export class AgentTurnResolver {
}
@Mutation(() => AgentTurnDTO)
- @UseGuards(UserAuthGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ )
async runEvaluationInput(
@Args('agentId', { type: () => UUIDScalarType }) agentId: string,
@Args('input') input: string,
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.ts
index 067994a285d..ed8c718277f 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
@@ -13,7 +13,7 @@ import { AuthApplication } from 'src/engine/decorators/auth/auth-application.dec
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -27,7 +27,20 @@ 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';
-@UseGuards(WorkspaceAuthGuard, SettingsPermissionGuard(PermissionFlagType.AI))
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ SettingsPermissionGuard(PermissionFlagType.AI),
+)
@UseInterceptors(
WorkspaceMigrationGraphqlApiExceptionInterceptor,
AiGraphqlApiExceptionInterceptor,
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.ts
index faa17847243..8f76b26ce89 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
@@ -16,8 +16,7 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspac
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 { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -27,7 +26,19 @@ import { AgentChatStreamingService } from 'src/engine/metadata-modules/ai/ai-cha
import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';
import { wrapAsyncIteratorWithLifecycle } from 'src/engine/subscriptions/utils/wrap-async-iterator-with-lifecycle';
@MetadataResolver()
-@UseGuards(WorkspaceAuthGuard, UserAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+)
@UseInterceptors(AiGraphqlApiExceptionInterceptor)
export class AgentChatSubscriptionResolver {
constructor(
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.ts
index 324b4af487b..c0d96c11363 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,5 +1,5 @@
import { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace-member-id.decorator';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
+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';
@@ -23,7 +23,6 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspac
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { AgentMessageDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message.dto';
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';
@@ -48,8 +47,17 @@ import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
SettingsPermissionGuard(PermissionFlagType.AI),
)
@UseInterceptors(AiGraphqlApiExceptionInterceptor)
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.ts
index f98d793f549..728d14f777d 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
@@ -10,10 +10,23 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspac
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
@MetadataResolver(() => AiChatUsageDTO)
-@UseGuards(WorkspaceAuthGuard, SettingsPermissionGuard(PermissionFlagType.AI))
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ SettingsPermissionGuard(PermissionFlagType.AI),
+)
@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)
export class AiChatUsageResolver {
constructor(private readonly aiChatUsageService: AiChatUsageService) {}
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.ts
index fefbccac524..b99f27aa095 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
@@ -20,15 +20,23 @@ 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 { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@UseGuards(
- WorkspaceAuthGuard,
- UserAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
SettingsPermissionGuard(PermissionFlagType.AI),
)
@UseInterceptors(AiGraphqlApiExceptionInterceptor)
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.ts
index 56bae7b37fd..a05d21e629a 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
@@ -12,7 +12,7 @@ import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-worksp
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import {
AiException,
AiExceptionCode,
@@ -30,7 +30,20 @@ import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters
import { AUTO_SELECT_MODEL_ID_BY_TIER } from 'twenty-shared/ai';
@Controller(`${ApiPath.Rest}/ai`)
-@UseGuards(JwtAuthGuard, WorkspaceAuthGuard)
+@UseGuards(
+ JwtAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseFilters(
RestApiExceptionFilter,
PermissionsRestApiExceptionFilter,
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.ts
index c211a185ab0..544daf4ce2c 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
@@ -8,13 +8,23 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspac
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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 { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS),
)
@MetadataResolver()
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.ts
index 8fa2edee7ba..eeb29fd4377 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
@@ -8,14 +8,26 @@ import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-worksp
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseInterceptors(CalendarChannelGraphqlApiExceptionInterceptor)
@MetadataResolver(() => CalendarChannelDTO)
@UseFilters(AuthGraphqlApiExceptionFilter)
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.ts
index 539988c0241..3e6666cb12c 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
@@ -22,7 +22,7 @@ import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspen
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -33,7 +33,19 @@ import { FrontComponentService } from 'src/engine/metadata-modules/front-compone
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';
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseInterceptors(
WorkspaceMigrationGraphqlApiExceptionInterceptor,
CommandMenuItemGraphqlApiExceptionInterceptor,
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.ts
index 1873c0ec5d8..b7590bcc1e0 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
@@ -16,7 +16,7 @@ import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspen
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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,7 +25,19 @@ import { ConnectedAccountGraphqlApiExceptionInterceptor } from 'src/engine/metad
import { 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';
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseInterceptors(ConnectedAccountGraphqlApiExceptionInterceptor)
@MetadataResolver(() => ConnectedAccountDTO)
@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)
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.ts
index d4131072693..570efb69f02 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
@@ -27,7 +27,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -61,7 +61,17 @@ import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scope
@Controller(`${ApiPath.Rest}/metadata/fields`)
@UseGuards(
JwtAuthGuard,
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.DATA_MODEL),
)
@UseFilters(
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.ts
index 6e6ca40bf5d..25f4a5e574c 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
@@ -25,7 +25,7 @@ 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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -61,7 +61,19 @@ type FieldMetadataStandardOverrideParent = Pick<
'label' | 'description' | 'icon' | 'overrides' | 'applicationId'
>;
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UsePipes(ResolverValidationPipe)
@MetadataResolver(() => FieldMetadataDTO)
@UseFilters(
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.ts
index 07f147302be..bc43b982900 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
@@ -25,7 +25,7 @@ import { ApplicationTargetParam } from 'src/engine/decorators/auth/application-t
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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 {
@@ -38,7 +38,19 @@ import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/works
@Controller(`${ApiPath.Rest}/front-components`)
@AllowSuspendedWorkspace()
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseFilters(
PermissionsRestApiExceptionFilter,
ApplicationRestApiExceptionFilter,
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.ts
index d01d0c75544..e5d1e97e108 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
@@ -31,9 +31,8 @@ import { 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 { RequireAccessTokenGuard } from 'src/engine/guards/require-access-token.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -43,7 +42,19 @@ import { FrontComponentGraphqlApiExceptionInterceptor } from 'src/engine/metadat
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';
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseInterceptors(
WorkspaceMigrationGraphqlApiExceptionInterceptor,
FrontComponentGraphqlApiExceptionInterceptor,
@@ -126,7 +137,20 @@ export class FrontComponentResolver {
}
@Query(() => FrontComponentDTO, { nullable: true })
- @UseGuards(RequireAccessTokenGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ NoPermissionGuard,
+ )
async frontComponent(
@Args('id', { type: () => UUIDScalarType }) id: string,
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -167,7 +191,20 @@ export class FrontComponentResolver {
}
@Mutation(() => ApplicationTokenPairDTO)
- @UseGuards(RequireAccessTokenGuard, NoPermissionGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: false,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: false,
+ application: false,
+ }),
+ NoPermissionGuard,
+ )
@UseFilters(ApplicationExceptionFilter)
async generateFrontComponentApplicationTokenPair(
@Args('applicationId', { type: () => UUIDScalarType })
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.ts
index 7f00011296b..a7af446c5fd 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,7 +10,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -22,7 +22,19 @@ import { objectMetadataGraphqlApiExceptionHandler } from 'src/engine/metadata-mo
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@MetadataResolver(() => IndexMetadataDTO)
@UsePipes(ResolverValidationPipe)
@UseFilters(
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.ts
index afd8a41102e..32f4ae76f0f 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
@@ -31,7 +31,7 @@ import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspen
import { FeatureFlagGuard } from 'src/engine/guards/feature-flag.guard';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -53,7 +53,21 @@ import { SubscriptionService } from 'src/engine/subscriptions/subscription.servi
import { wrapAsyncIteratorWithLifecycle } from 'src/engine/subscriptions/utils/wrap-async-iterator-with-lifecycle';
import { EventLogLiveService } from 'src/engine/core-modules/event-logs/live/event-log-live.service';
-@UseGuards(WorkspaceAuthGuard, FeatureFlagGuard, NoPermissionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ FeatureFlagGuard,
+ NoPermissionGuard,
+)
@MetadataResolver(() => LogicFunctionDTO)
@UsePipes(ResolverValidationPipe)
@UseFilters(
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.ts
index 9466e3274a6..9a9bd6806b0 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
@@ -14,7 +14,7 @@ import { AuthApplication } from 'src/engine/decorators/auth/auth-application.dec
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -24,7 +24,20 @@ import { MessageChannelGraphqlApiExceptionInterceptor } from 'src/engine/metadat
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';
-@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+)
@UseInterceptors(MessageChannelGraphqlApiExceptionInterceptor)
@UsePipes(ResolverValidationPipe)
@MetadataResolver()
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.ts
index c9a2aaa1929..c07d760220a 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
@@ -14,14 +14,27 @@ import { AuthApplication } from 'src/engine/decorators/auth/auth-application.dec
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
-@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+)
@UseInterceptors(MessageChannelGraphqlApiExceptionInterceptor)
@UsePipes(ResolverValidationPipe)
@MetadataResolver()
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.ts
index b681ab987da..8563a5010be 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
@@ -18,7 +18,7 @@ import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspen
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -46,7 +46,19 @@ import {
MessageFolderPendingSyncAction,
} from 'twenty-shared/types';
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseInterceptors(MessageChannelGraphqlApiExceptionInterceptor)
@MetadataResolver(() => MessageChannelDTO)
@UseFilters(AuthGraphqlApiExceptionFilter)
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.ts
index 4e083f5c99b..060356fa6c2 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
@@ -7,7 +7,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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,
@@ -17,7 +17,19 @@ import { MessageFolderGraphqlApiExceptionInterceptor } from 'src/engine/metadata
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';
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseInterceptors(MessageFolderGraphqlApiExceptionInterceptor)
@MetadataResolver(() => MessageFolderDTO)
@UseFilters(AuthGraphqlApiExceptionFilter)
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.ts
index 350d7c9692f..c12528f9f70 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
@@ -7,12 +7,24 @@ import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorato
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@MetadataResolver(() => MetadataTranslationDTO)
export class MetadataTranslationResolver {
constructor(
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.ts
index 61c8c157f06..7b0a7afd6b1 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
@@ -8,12 +8,25 @@ import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-worksp
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@MetadataResolver(() => MinimalMetadataDTO)
-@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ NoPermissionGuard,
+)
export class MinimalMetadataResolver {
constructor(
private readonly minimalMetadataService: MinimalMetadataService,
diff --git a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.resolver.ts
index 9a972729599..723cc4f2540 100644
--- a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.resolver.ts
@@ -25,7 +25,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { CreateNavigationMenuItemInput } from 'src/engine/metadata-modules/navigation-menu-item/dtos/create-navigation-menu-item.input';
import { NavigationMenuItemDTO } from 'src/engine/metadata-modules/navigation-menu-item/dtos/navigation-menu-item.dto';
import { RecordIdentifierDTO } from 'src/engine/metadata-modules/navigation-menu-item/dtos/record-identifier.dto';
@@ -36,7 +36,19 @@ import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/over
import { 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';
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseInterceptors(
WorkspaceMigrationGraphqlApiExceptionInterceptor,
NavigationMenuItemGraphqlApiExceptionInterceptor,
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.ts
index 23d38eeed9b..b6aeb4cd038 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
@@ -28,7 +28,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -64,7 +64,17 @@ import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scope
@Controller(`${ApiPath.Rest}/metadata/objects`)
@UseGuards(
JwtAuthGuard,
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.DATA_MODEL),
)
@UseFilters(
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.ts
index d9720f18daf..8891eee47df 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
@@ -23,7 +23,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -62,7 +62,19 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
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';
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@MetadataResolver(() => ObjectMetadataDTO)
@UsePipes(ResolverValidationPipe)
@UseFilters(
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.ts
index e2456a1a4c8..f3a73c95731 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
@@ -25,7 +25,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -43,7 +43,19 @@ import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/works
import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/pageLayoutTabs`)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseFilters(
PermissionsRestApiExceptionFilter,
PageLayoutTabRestApiExceptionFilter,
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.ts
index ac7555ede45..e7547cb8d7d 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
@@ -23,7 +23,7 @@ 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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -37,7 +37,19 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
@MetadataResolver(() => PageLayoutTabDTO)
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
@UseFilters(PageLayoutGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UsePipes(ResolverValidationPipe)
export class PageLayoutTabResolver {
constructor(
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.ts
index 4aee008ef74..ef7e032ff72 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
@@ -25,7 +25,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -43,7 +43,19 @@ import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/works
import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/pageLayoutWidgets`)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseFilters(
PermissionsRestApiExceptionFilter,
PageLayoutWidgetRestApiExceptionFilter,
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.ts
index 9d8b104120c..42e88cdc4f7 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
@@ -23,7 +23,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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,7 +38,19 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
@MetadataResolver(() => PageLayoutWidgetDTO)
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
@UseFilters(PageLayoutGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UsePipes(ResolverValidationPipe)
export class PageLayoutWidgetResolver {
constructor(
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.ts
index 76a25318f3a..33985e76d7c 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
@@ -23,7 +23,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -36,7 +36,19 @@ import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/works
import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/pageLayouts`)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseFilters(
PermissionsRestApiExceptionFilter,
PageLayoutRestApiExceptionFilter,
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.ts
index aefea70dafb..b5d90df9d62 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
@@ -24,7 +24,7 @@ import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspen
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -44,7 +44,19 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
@MetadataResolver(() => PageLayoutDTO)
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
@UseFilters(PageLayoutGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UsePipes(ResolverValidationPipe)
export class PageLayoutResolver {
constructor(
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.ts
index d374d2c4078..122175b4e1d 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
@@ -8,13 +8,23 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@MetadataResolver(() => PermissionFlagDTO)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.ROLES),
)
@UseFilters(AuthGraphqlApiExceptionFilter)
diff --git a/packages/twenty-server/src/engine/metadata-modules/record-permissions/record-permissions.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/record-permissions/record-permissions.resolver.ts
index 01cbc1175b0..1c0fb166e64 100644
--- a/packages/twenty-server/src/engine/metadata-modules/record-permissions/record-permissions.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/record-permissions/record-permissions.resolver.ts
@@ -13,8 +13,7 @@ import { type RecordPermissionsDTO } from 'src/engine/core-modules/record-share/
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { RecordSharingService } from 'src/engine/core-modules/record-share/services/record-sharing.service';
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import {
RecordPermissionsResult,
RecordPermissionsTargetInput,
@@ -24,7 +23,20 @@ import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/works
const MAX_PERMISSION_TARGETS = 100;
@MetadataResolver()
-@UseGuards(WorkspaceAuthGuard, UserAuthGuard, CustomPermissionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ CustomPermissionGuard,
+)
export class RecordPermissionsResolver {
constructor(
private readonly recordSharingService: RecordSharingService,
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts
index d74eaac43d4..bf178accc51 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts
@@ -22,8 +22,7 @@ import { AuthApplication } from 'src/engine/decorators/auth/auth-application.dec
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 { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { AiAgentRoleService } from 'src/engine/metadata-modules/ai/ai-agent-role/ai-agent-role.service';
import {
AiException,
@@ -69,7 +68,17 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
@MetadataResolver(() => RoleDTO)
@UsePipes(ResolverValidationPipe)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.ROLES),
)
@UseFilters(
@@ -103,7 +112,19 @@ export class RoleResolver {
}
@Mutation(() => WorkspaceMemberDTO)
- @UseGuards(UserAuthGuard)
+ @UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ )
async updateWorkspaceMemberRole(
@AuthWorkspace() workspace: WorkspaceEntity,
@Args('workspaceMemberId', { type: () => UUIDScalarType })
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.ts
index a58c5170e5e..8217c9d4024 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
@@ -9,13 +9,25 @@ import { type I18nContext } from 'src/engine/core-modules/i18n/types/i18n-contex
import { 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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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 { 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(WorkspaceAuthGuard)
+@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.ts
index 55c132ae082..60f485fe178 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
@@ -13,7 +13,7 @@ import { AuthApplication } from 'src/engine/decorators/auth/auth-application.dec
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { CreateSkillInput } from 'src/engine/metadata-modules/skill/dtos/create-skill.input';
import { SkillDTO } from 'src/engine/metadata-modules/skill/dtos/skill.dto';
import { UpdateSkillInput } from 'src/engine/metadata-modules/skill/dtos/update-skill.input';
@@ -24,7 +24,20 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
// Reads are open to chat users so the composer can list skills; mutations
// stay behind AI settings.
-@UseGuards(WorkspaceAuthGuard, SettingsPermissionGuard(PermissionFlagType.AI))
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ SettingsPermissionGuard(PermissionFlagType.AI),
+)
@UseInterceptors(
WorkspaceMigrationGraphqlApiExceptionInterceptor,
SkillGraphqlApiExceptionInterceptor,
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.ts
index 5b8cd8d8982..02e12a62c5a 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
@@ -20,7 +20,7 @@ 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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -30,7 +30,19 @@ import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/over
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';
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseInterceptors(
WorkspaceMigrationGraphqlApiExceptionInterceptor,
TimelineActivityTypeGraphqlApiExceptionInterceptor,
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.ts
index a8d30366c8c..c5d00be2ed8 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
@@ -21,7 +21,7 @@ import {
} from 'src/engine/guards/feature-flag.guard';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -29,7 +29,20 @@ import { ValidationRuleDTO } from 'src/engine/metadata-modules/validation-rule/d
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';
-@UseGuards(WorkspaceAuthGuard, FeatureFlagGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ FeatureFlagGuard,
+)
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
@MetadataResolver(() => ValidationRuleDTO)
@UseFilters(
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.ts
index fc8b0a2932e..469b9ad343b 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
@@ -21,7 +21,7 @@ import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
import { CreateViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard';
import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -40,7 +40,19 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
@MetadataResolver(() => ViewFieldGroupDTO)
@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
export class ViewFieldGroupResolver {
constructor(
private readonly viewFieldGroupService: ViewFieldGroupService,
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.ts
index 947527b230f..cda4585823c 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
@@ -20,7 +20,7 @@ import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/pa
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';
import { CreateViewFieldInput } from 'src/engine/metadata-modules/view-field/dtos/inputs/create-view-field.input';
@@ -41,7 +41,19 @@ import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view
import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/viewFields`)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseFilters(
PermissionsRestApiExceptionFilter,
ViewFieldRestApiExceptionFilter,
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.ts
index e9b4473a042..aab62f489ae 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
@@ -5,7 +5,7 @@ import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorato
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -19,7 +19,19 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
@MetadataResolver(() => ViewFieldDTO)
@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
export class ViewFieldResolver {
constructor(private readonly viewFieldService: ViewFieldService) {}
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.ts
index 2792e238ac1..c2c43e4ad6f 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
@@ -20,7 +20,7 @@ import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/pa
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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/metadata-modules/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';
@@ -41,7 +41,19 @@ import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view
import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/viewFilterGroups`)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseFilters(
PermissionsRestApiExceptionFilter,
ViewFilterGroupRestApiExceptionFilter,
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.ts
index 2e910affd98..49ec1443803 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
@@ -7,7 +7,7 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspac
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -19,7 +19,19 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
@MetadataResolver(() => ViewFilterGroupDTO)
@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
export class ViewFilterGroupResolver {
constructor(
private readonly viewFilterGroupService: ViewFilterGroupService,
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.ts
index 43ad2999bc1..8c6eea4c2c3 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
@@ -20,7 +20,7 @@ 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 { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';
import { CreateViewFilterInput } from 'src/engine/metadata-modules/view-filter/dtos/inputs/create-view-filter.input';
@@ -41,7 +41,19 @@ import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view
import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/viewFilters`)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseFilters(
PermissionsRestApiExceptionFilter,
ViewFilterRestApiExceptionFilter,
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.ts
index acd8a6a99c0..85e96832590 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
@@ -5,7 +5,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -19,7 +19,19 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
@MetadataResolver(() => ViewFilterDTO)
@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
export class ViewFilterResolver {
constructor(private readonly viewFilterService: ViewFilterService) {}
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.ts
index 4557c162430..8d78e3f2154 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
@@ -20,7 +20,7 @@ import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/pa
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';
import { CreateViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/create-view-group.input';
@@ -41,7 +41,19 @@ import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view
import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/viewGroups`)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseFilters(
PermissionsRestApiExceptionFilter,
ViewGroupRestApiExceptionFilter,
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.ts
index f2da6767413..07945e513f6 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
@@ -5,7 +5,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -19,7 +19,19 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
@MetadataResolver(() => ViewGroupDTO)
@UseFilters(ViewGroupGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
export class ViewGroupResolver {
constructor(private readonly viewGroupService: ViewGroupService) {}
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.ts
index cde5ba43495..aa2c205005c 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
@@ -20,7 +20,7 @@ import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/pa
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';
import { CreateViewSortInput } from 'src/engine/metadata-modules/view-sort/dtos/inputs/create-view-sort.input';
@@ -39,7 +39,19 @@ import { CreateViewChildEntityPermissionGuard } from 'src/engine/metadata-module
import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard';
import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/viewSorts`)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseFilters(
PermissionsRestApiExceptionFilter,
ViewSortRestApiExceptionFilter,
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.ts
index 13c0cd3ffba..df9e76263cb 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
@@ -7,7 +7,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -21,7 +21,19 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
@MetadataResolver(() => ViewSortDTO)
@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
export class ViewSortResolver {
constructor(private readonly viewSortService: ViewSortService) {}
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.ts
index 4878b0a7804..6a94b863100 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
@@ -25,7 +25,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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,7 +52,19 @@ import { CreateViewPermissionGuard } from 'src/engine/metadata-modules/view-perm
import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/views`)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseFilters(
PermissionsRestApiExceptionFilter,
ViewRestApiExceptionFilter,
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.ts
index a259f99ebf5..c4bb80c1e35 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
@@ -27,7 +27,7 @@ import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspen
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@@ -51,7 +51,19 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
@MetadataResolver(() => ViewDTO)
@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
-@UseGuards(WorkspaceAuthGuard)
+@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,
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/controllers/webhook.controller.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/controllers/webhook.controller.ts
index 74a9a160e73..2887da0ea03 100644
--- a/packages/twenty-server/src/engine/metadata-modules/webhook/controllers/webhook.controller.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/controllers/webhook.controller.ts
@@ -22,7 +22,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';
import { CreateWebhookInput } from 'src/engine/metadata-modules/webhook/dtos/create-webhook.input';
@@ -35,7 +35,17 @@ import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters
@Controller([`${ApiPath.Rest}/webhooks`, `${ApiPath.Rest}/metadata/webhooks`])
@UseGuards(
JwtAuthGuard,
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
@UseFilters(
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/webhook.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/webhook.resolver.ts
index aa1c048b206..64b3eeee87f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/webhook/webhook.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/webhook.resolver.ts
@@ -8,7 +8,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { CreateWebhookInput } from 'src/engine/metadata-modules/webhook/dtos/create-webhook.input';
import { UpdateWebhookInput } from 'src/engine/metadata-modules/webhook/dtos/update-webhook.input';
import { WebhookDTO } from 'src/engine/metadata-modules/webhook/dtos/webhook.dto';
@@ -17,7 +17,19 @@ import { WebhookService } from 'src/engine/metadata-modules/webhook/webhook.serv
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';
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UseInterceptors(
WorkspaceMigrationGraphqlApiExceptionInterceptor,
WebhookGraphqlApiExceptionInterceptor,
diff --git a/packages/twenty-server/src/engine/subscriptions/event-stream.resolver.ts b/packages/twenty-server/src/engine/subscriptions/event-stream.resolver.ts
index 82e19c9bc0c..3e4482adfac 100644
--- a/packages/twenty-server/src/engine/subscriptions/event-stream.resolver.ts
+++ b/packages/twenty-server/src/engine/subscriptions/event-stream.resolver.ts
@@ -24,8 +24,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
import { RequestLocale } from 'src/engine/decorators/locale/request-locale.decorator';
import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { APPLICATION_KEEPALIVE_INTERVAL_MS } from 'src/engine/subscriptions/constants/application-keepalive-interval-ms.constant';
import { EVENT_STREAM_TTL_MS } from 'src/engine/subscriptions/constants/event-stream-ttl.constant';
import { AddQuerySubscriptionInput } from 'src/engine/subscriptions/dtos/add-query-subscription.input';
@@ -45,7 +44,20 @@ import { wrapAsyncIteratorWithLifecycle } from 'src/engine/subscriptions/utils/w
@MetadataResolver()
@AllowSuspendedWorkspace()
-@UseGuards(WorkspaceAuthGuard, UserAuthGuard, NoPermissionGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+ NoPermissionGuard,
+)
@UsePipes(ResolverValidationPipe)
@UseFilters(
EventStreamExceptionFilter,
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/resolvers/create-calendar-event.resolver.ts b/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/resolvers/create-calendar-event.resolver.ts
index d5b31fa0130..4540811d850 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/resolvers/create-calendar-event.resolver.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-creation-manager/resolvers/create-calendar-event.resolver.ts
@@ -16,7 +16,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { ConnectedAccountMetadataService } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.service';
import { CreateCalendarEventOutputDTO } from 'src/modules/calendar/calendar-event-creation-manager/dtos/create-calendar-event-output.dto';
import { CreateCalendarEventInput } from 'src/modules/calendar/calendar-event-creation-manager/dtos/create-calendar-event.input';
@@ -27,7 +27,17 @@ import { CreateCalendarEventService } from 'src/modules/calendar/calendar-event-
@UsePipes(ResolverValidationPipe)
@UseFilters(AuthGraphqlApiExceptionFilter)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.CREATE_CALENDAR_EVENT_TOOL),
)
export class CreateCalendarEventResolver {
diff --git a/packages/twenty-server/src/modules/call-recording/resolvers/call-recording.resolver.ts b/packages/twenty-server/src/modules/call-recording/resolvers/call-recording.resolver.ts
index dee28160393..0c1e2568cff 100644
--- a/packages/twenty-server/src/modules/call-recording/resolvers/call-recording.resolver.ts
+++ b/packages/twenty-server/src/modules/call-recording/resolvers/call-recording.resolver.ts
@@ -5,11 +5,23 @@ import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorato
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { CallRecordingService } from 'src/modules/call-recording/services/call-recording.service';
@MetadataResolver()
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UsePipes(ResolverValidationPipe)
export class CallRecordingResolver {
constructor(private readonly callRecordingService: CallRecordingService) {}
diff --git a/packages/twenty-server/src/modules/connected-account/channel-sync/channel-sync.resolver.ts b/packages/twenty-server/src/modules/connected-account/channel-sync/channel-sync.resolver.ts
index 6560ff34190..fca88f04234 100644
--- a/packages/twenty-server/src/modules/connected-account/channel-sync/channel-sync.resolver.ts
+++ b/packages/twenty-server/src/modules/connected-account/channel-sync/channel-sync.resolver.ts
@@ -11,7 +11,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { ConnectedAccountMetadataService } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.service';
import { ChannelSyncSuccessDTO } from 'src/modules/connected-account/channel-sync/dtos/channel-sync-success.dto';
import { ChannelSyncService } from 'src/modules/connected-account/channel-sync/services/channel-sync.service';
@@ -19,7 +19,19 @@ import { ChannelSyncService } from 'src/modules/connected-account/channel-sync/s
@MetadataResolver()
@UsePipes(ResolverValidationPipe)
@UseFilters(AuthGraphqlApiExceptionFilter)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
export class ChannelSyncResolver {
constructor(
private readonly channelSyncService: ChannelSyncService,
diff --git a/packages/twenty-server/src/modules/dashboard/chart-data/resolvers/bar-chart-data.resolver.ts b/packages/twenty-server/src/modules/dashboard/chart-data/resolvers/bar-chart-data.resolver.ts
index 37b8390afcd..0e382a0639f 100644
--- a/packages/twenty-server/src/modules/dashboard/chart-data/resolvers/bar-chart-data.resolver.ts
+++ b/packages/twenty-server/src/modules/dashboard/chart-data/resolvers/bar-chart-data.resolver.ts
@@ -5,7 +5,7 @@ import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorato
import { 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 { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { BarChartDataDTO } from 'src/modules/dashboard/chart-data/dtos/bar-chart-data.dto';
import { BarChartDataInput } from 'src/modules/dashboard/chart-data/dtos/inputs/bar-chart-data.input';
import { ChartDataGraphqlApiExceptionFilter } from 'src/modules/dashboard/chart-data/filters/chart-data-graphql-api-exception.filter';
@@ -13,7 +13,19 @@ import { BarChartDataService } from 'src/modules/dashboard/chart-data/services/b
@MetadataResolver()
@UseFilters(ChartDataGraphqlApiExceptionFilter)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UsePipes(ResolverValidationPipe)
export class BarChartDataResolver {
constructor(private readonly barChartDataService: BarChartDataService) {}
diff --git a/packages/twenty-server/src/modules/dashboard/chart-data/resolvers/line-chart-data.resolver.ts b/packages/twenty-server/src/modules/dashboard/chart-data/resolvers/line-chart-data.resolver.ts
index fa4abf8e483..0cd8936a5ad 100644
--- a/packages/twenty-server/src/modules/dashboard/chart-data/resolvers/line-chart-data.resolver.ts
+++ b/packages/twenty-server/src/modules/dashboard/chart-data/resolvers/line-chart-data.resolver.ts
@@ -5,7 +5,7 @@ import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorato
import { 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 { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { LineChartDataInput } from 'src/modules/dashboard/chart-data/dtos/inputs/line-chart-data.input';
import { LineChartDataDTO } from 'src/modules/dashboard/chart-data/dtos/line-chart-data.dto';
import { ChartDataGraphqlApiExceptionFilter } from 'src/modules/dashboard/chart-data/filters/chart-data-graphql-api-exception.filter';
@@ -13,7 +13,19 @@ import { LineChartDataService } from 'src/modules/dashboard/chart-data/services/
@MetadataResolver()
@UseFilters(ChartDataGraphqlApiExceptionFilter)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UsePipes(ResolverValidationPipe)
export class LineChartDataResolver {
constructor(private readonly lineChartDataService: LineChartDataService) {}
diff --git a/packages/twenty-server/src/modules/dashboard/chart-data/resolvers/pie-chart-data.resolver.ts b/packages/twenty-server/src/modules/dashboard/chart-data/resolvers/pie-chart-data.resolver.ts
index c4d97824eca..e6692216ca3 100644
--- a/packages/twenty-server/src/modules/dashboard/chart-data/resolvers/pie-chart-data.resolver.ts
+++ b/packages/twenty-server/src/modules/dashboard/chart-data/resolvers/pie-chart-data.resolver.ts
@@ -5,7 +5,7 @@ import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorato
import { 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 { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PieChartDataInput } from 'src/modules/dashboard/chart-data/dtos/inputs/pie-chart-data.input';
import { PieChartDataDTO } from 'src/modules/dashboard/chart-data/dtos/pie-chart-data.dto';
import { ChartDataGraphqlApiExceptionFilter } from 'src/modules/dashboard/chart-data/filters/chart-data-graphql-api-exception.filter';
@@ -13,7 +13,19 @@ import { PieChartDataService } from 'src/modules/dashboard/chart-data/services/p
@MetadataResolver()
@UseFilters(ChartDataGraphqlApiExceptionFilter)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UsePipes(ResolverValidationPipe)
export class PieChartDataResolver {
constructor(private readonly pieChartDataService: PieChartDataService) {}
diff --git a/packages/twenty-server/src/modules/dashboard/controllers/dashboard.controller.ts b/packages/twenty-server/src/modules/dashboard/controllers/dashboard.controller.ts
index 8fe2468290a..5e8d770df0f 100644
--- a/packages/twenty-server/src/modules/dashboard/controllers/dashboard.controller.ts
+++ b/packages/twenty-server/src/modules/dashboard/controllers/dashboard.controller.ts
@@ -6,14 +6,28 @@ import { getWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/wo
import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
import { JwtAuthGuard } from 'src/engine/guards/jwt-auth.guard';
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';
import { DuplicatedDashboardDTO } from 'src/modules/dashboard/dtos/duplicated-dashboard.dto';
import { DashboardRestApiExceptionFilter } from 'src/modules/dashboard/filters/dashboard-rest-api-exception.filter';
import { DashboardDuplicationService } from 'src/modules/dashboard/services/dashboard-duplication.service';
@Controller(`${ApiPath.Rest}/dashboards`)
-@UseGuards(JwtAuthGuard, WorkspaceAuthGuard, CustomPermissionGuard)
+@UseGuards(
+ JwtAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ CustomPermissionGuard,
+)
@UseFilters(
DashboardRestApiExceptionFilter,
PermissionsRestApiExceptionFilter,
diff --git a/packages/twenty-server/src/modules/dashboard/resolvers/dashboard.resolver.ts b/packages/twenty-server/src/modules/dashboard/resolvers/dashboard.resolver.ts
index 23d6496e190..841575b7ae0 100644
--- a/packages/twenty-server/src/modules/dashboard/resolvers/dashboard.resolver.ts
+++ b/packages/twenty-server/src/modules/dashboard/resolvers/dashboard.resolver.ts
@@ -7,7 +7,7 @@ import { getWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/wo
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 { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PageLayoutGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception.filter';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { DuplicatedDashboardDTO } from 'src/modules/dashboard/dtos/duplicated-dashboard.dto';
@@ -21,7 +21,19 @@ import { DashboardGraphqlApiExceptionFilter } from 'src/modules/dashboard/utils/
PermissionsGraphqlApiExceptionFilter,
AuthGraphqlApiExceptionFilter,
)
-@UseGuards(WorkspaceAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+)
@UsePipes(ResolverValidationPipe)
export class DashboardResolver {
constructor(
diff --git a/packages/twenty-server/src/modules/emailing/resolvers/emailing-send.resolver.ts b/packages/twenty-server/src/modules/emailing/resolvers/emailing-send.resolver.ts
index afc3b1ac322..882fb852d8f 100644
--- a/packages/twenty-server/src/modules/emailing/resolvers/emailing-send.resolver.ts
+++ b/packages/twenty-server/src/modules/emailing/resolvers/emailing-send.resolver.ts
@@ -33,7 +33,7 @@ import {
RequireFeatureFlag,
} from 'src/engine/guards/feature-flag.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { ThrottlerGraphqlApiExceptionFilter } from 'src/engine/core-modules/throttler/filters/throttler-graphql-api-exception.filter';
import { EmailBillingService } from 'src/modules/emailing/services/email-billing.service';
import { MessageCampaignAudienceService } from 'src/modules/emailing/services/message-campaign-audience.service';
@@ -45,7 +45,17 @@ import { type EmailingDomainSendEmailResult } from 'src/engine/core-modules/emai
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
FeatureFlagGuard,
SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
)
diff --git a/packages/twenty-server/src/modules/emailing/resolvers/message-list.resolver.ts b/packages/twenty-server/src/modules/emailing/resolvers/message-list.resolver.ts
index be63cac31d8..51f86727ee6 100644
--- a/packages/twenty-server/src/modules/emailing/resolvers/message-list.resolver.ts
+++ b/packages/twenty-server/src/modules/emailing/resolvers/message-list.resolver.ts
@@ -14,7 +14,7 @@ import {
FeatureFlagGuard,
RequireFeatureFlag,
} from 'src/engine/guards/feature-flag.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { DuplicatedMessageListDTO } from 'src/modules/emailing/dtos/duplicated-message-list.dto';
import { MessageListDuplicationService } from 'src/modules/emailing/services/message-list-duplication.service';
@@ -28,7 +28,20 @@ import { MessageListGraphqlApiExceptionFilter } from 'src/modules/emailing/utils
PermissionsGraphqlApiExceptionFilter,
AuthGraphqlApiExceptionFilter,
)
-@UseGuards(WorkspaceAuthGuard, FeatureFlagGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
+ FeatureFlagGuard,
+)
@UsePipes(ResolverValidationPipe)
export class MessageListResolver {
constructor(
diff --git a/packages/twenty-server/src/modules/emailing/resolvers/message-suppression.resolver.ts b/packages/twenty-server/src/modules/emailing/resolvers/message-suppression.resolver.ts
index 518069b59d4..b28224f21b3 100644
--- a/packages/twenty-server/src/modules/emailing/resolvers/message-suppression.resolver.ts
+++ b/packages/twenty-server/src/modules/emailing/resolvers/message-suppression.resolver.ts
@@ -23,12 +23,22 @@ import {
RequireFeatureFlag,
} from 'src/engine/guards/feature-flag.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { MessageSuppressionService } from 'src/modules/emailing/services/message-suppression.service';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
FeatureFlagGuard,
SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
)
diff --git a/packages/twenty-server/src/modules/emailing/resolvers/unsubscribe-topic.resolver.ts b/packages/twenty-server/src/modules/emailing/resolvers/unsubscribe-topic.resolver.ts
index 6c3fa904de9..de1cc4f48db 100644
--- a/packages/twenty-server/src/modules/emailing/resolvers/unsubscribe-topic.resolver.ts
+++ b/packages/twenty-server/src/modules/emailing/resolvers/unsubscribe-topic.resolver.ts
@@ -18,12 +18,22 @@ import {
RequireFeatureFlag,
} from 'src/engine/guards/feature-flag.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { UnsubscribeTopicService } from 'src/modules/emailing/services/unsubscribe-topic.service';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
FeatureFlagGuard,
SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
)
diff --git a/packages/twenty-server/src/modules/input-ask/answer-ask/resolvers/answer-agent-chat-question.resolver.ts b/packages/twenty-server/src/modules/input-ask/answer-ask/resolvers/answer-agent-chat-question.resolver.ts
index afcb0169e0c..b972c9117ca 100644
--- a/packages/twenty-server/src/modules/input-ask/answer-ask/resolvers/answer-agent-chat-question.resolver.ts
+++ b/packages/twenty-server/src/modules/input-ask/answer-ask/resolvers/answer-agent-chat-question.resolver.ts
@@ -20,9 +20,8 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspac
import { 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 { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { AgentChatQuestionAnswerInput } from 'src/engine/metadata-modules/ai/ai-chat/dtos/agent-chat-question-answer.input';
import { FileAttachmentInput } from 'src/engine/metadata-modules/ai/ai-chat/dtos/file-attachment.input';
import { SendChatMessageResultDTO } from 'src/engine/metadata-modules/ai/ai-chat/dtos/send-chat-message-result.dto';
@@ -41,7 +40,19 @@ import {
// question the message asked, with the same checks as answerAsk.
@MetadataResolver()
@UsePipes(ResolverValidationPipe)
-@UseGuards(WorkspaceAuthGuard, UserAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+)
@UseInterceptors(AiGraphqlApiExceptionInterceptor)
@UseFilters(
InputAskGraphqlApiExceptionFilter,
diff --git a/packages/twenty-server/src/modules/input-ask/answer-ask/resolvers/answer-ask.resolver.ts b/packages/twenty-server/src/modules/input-ask/answer-ask/resolvers/answer-ask.resolver.ts
index 63f1a2b3dbe..972e07a3c4b 100644
--- a/packages/twenty-server/src/modules/input-ask/answer-ask/resolvers/answer-ask.resolver.ts
+++ b/packages/twenty-server/src/modules/input-ask/answer-ask/resolvers/answer-ask.resolver.ts
@@ -20,9 +20,8 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspac
import { 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 { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
@@ -40,7 +39,19 @@ import {
// class guard.
@CoreResolver()
@UsePipes(ResolverValidationPipe)
-@UseGuards(WorkspaceAuthGuard, UserAuthGuard)
+@UseGuards(
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: false,
+ oauthClient: { withUser: true, withoutUser: false },
+ application: { withUser: true, withoutUser: false },
+ }),
+)
@UseInterceptors(AiGraphqlApiExceptionInterceptor)
@UseFilters(
InputAskGraphqlApiExceptionFilter,
diff --git a/packages/twenty-server/src/modules/messaging/message-outbound-manager/resolvers/send-email.resolver.ts b/packages/twenty-server/src/modules/messaging/message-outbound-manager/resolvers/send-email.resolver.ts
index b98857eec7c..17cb97309bf 100644
--- a/packages/twenty-server/src/modules/messaging/message-outbound-manager/resolvers/send-email.resolver.ts
+++ b/packages/twenty-server/src/modules/messaging/message-outbound-manager/resolvers/send-email.resolver.ts
@@ -19,7 +19,7 @@ import { EmailComposerService } from 'src/engine/core-modules/tool/tools/email-t
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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';
import { ConnectedAccountMetadataService } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.service';
import { SendEmailOutputDTO } from 'src/modules/messaging/message-outbound-manager/dtos/send-email-output.dto';
import { SendEmailInput } from 'src/modules/messaging/message-outbound-manager/dtos/send-email.input';
@@ -31,7 +31,17 @@ import { isNonEmptyString } from '@sniptt/guards';
@UsePipes(ResolverValidationPipe)
@UseFilters(AuthGraphqlApiExceptionFilter)
@UseGuards(
- WorkspaceAuthGuard,
+ AuthPrincipalGuard({
+ userSession: {
+ standard: true,
+ impersonated: true,
+ playground: true,
+ workspaceAgnostic: false,
+ },
+ apiKey: true,
+ oauthClient: true,
+ application: true,
+ }),
SettingsPermissionGuard(PermissionFlagType.SEND_EMAIL_TOOL),
)
export class SendEmailResolver {
diff --git a/packages/twenty-server/test/integration/graphql/suites/settings-permissions/api-key-webhooks.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/settings-permissions/api-key-webhooks.integration-spec.ts
index 690c4a6a0c5..190d6b4c5c7 100644
--- a/packages/twenty-server/test/integration/graphql/suites/settings-permissions/api-key-webhooks.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/settings-permissions/api-key-webhooks.integration-spec.ts
@@ -34,7 +34,7 @@ describe('api key and webhooks permissions', () => {
});
// Non-ACCESS tokens (API_KEY here, PLAYGROUND same path) must never mint
- // an API key — enforced by RequireAccessTokenGuard.
+ // an API key, which the resolver's AuthPrincipalGuard enforces.
it('should reject a non-ACCESS token even with API key permission', async () => {
const queryData = {
query: `
diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/__snapshots__/failing-application-token-on-account-operations.integration-spec.ts.snap b/packages/twenty-server/test/integration/graphql/suites/user-session/__snapshots__/failing-application-token-on-account-operations.integration-spec.ts.snap
index bf4261aa641..57445fadbe0 100644
--- a/packages/twenty-server/test/integration/graphql/suites/user-session/__snapshots__/failing-application-token-on-account-operations.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/__snapshots__/failing-application-token-on-account-operations.integration-spec.ts.snap
@@ -4,9 +4,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -14,9 +14,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -24,9 +24,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -34,9 +34,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -44,9 +44,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -54,9 +54,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -64,11 +64,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -76,9 +74,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -86,9 +84,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -96,9 +94,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -106,9 +104,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -116,9 +114,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -126,9 +124,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -136,9 +134,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -146,9 +144,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -156,9 +154,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -166,9 +164,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -176,9 +174,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -186,9 +184,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -196,9 +194,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -206,9 +204,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -216,9 +214,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -226,9 +224,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -236,9 +234,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -246,9 +244,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -256,9 +254,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -266,9 +264,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -276,9 +274,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -286,9 +284,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -296,11 +294,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -308,11 +304,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -320,11 +314,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -332,11 +324,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -344,11 +334,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -356,11 +344,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -368,11 +354,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -380,11 +364,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -440,11 +422,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -452,11 +432,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -464,11 +442,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -476,11 +452,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -488,11 +462,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -500,11 +472,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -512,11 +482,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -524,11 +492,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -536,11 +502,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -548,11 +512,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -572,11 +534,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -584,11 +544,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -596,11 +554,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -608,11 +564,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -620,11 +574,9 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -632,10 +584,8 @@ exports[`Account operations with an application token should fail with an applic
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/__snapshots__/failing-workspace-agnostic-session-on-application-authorizations.integration-spec.ts.snap b/packages/twenty-server/test/integration/graphql/suites/user-session/__snapshots__/failing-workspace-agnostic-session-on-application-authorizations.integration-spec.ts.snap
new file mode 100644
index 00000000000..b9bd8443fb9
--- /dev/null
+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/__snapshots__/failing-workspace-agnostic-session-on-application-authorizations.integration-spec.ts.snap
@@ -0,0 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Application authorizations with a workspace-agnostic session should fail should refuse to list the application authorizations 1`] = `
+{
+ "extensions": {
+ "code": "FORBIDDEN",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
+ },
+ "message": "This endpoint is not available to this caller",
+}
+`;
+
+exports[`Application authorizations with a workspace-agnostic session should fail should refuse to revoke an application authorization 1`] = `
+{
+ "extensions": {
+ "code": "FORBIDDEN",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
+ },
+ "message": "This endpoint is not available to this caller",
+}
+`;
diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/failing-workspace-agnostic-session-on-application-authorizations.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/failing-workspace-agnostic-session-on-application-authorizations.integration-spec.ts
new file mode 100644
index 00000000000..f6177b6fb8a
--- /dev/null
+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/failing-workspace-agnostic-session-on-application-authorizations.integration-spec.ts
@@ -0,0 +1,54 @@
+import { currentUserApplicationAuthorizations } from 'test/integration/graphql/suites/user-session/utils/current-user-application-authorizations.util';
+import { revokeApplicationAuthorization } from 'test/integration/graphql/suites/user-session/utils/revoke-application-authorization.util';
+import { deleteUser } from 'test/integration/graphql/utils/delete-user.util';
+import { expectOneNotInternalServerErrorSnapshot } from 'test/integration/graphql/utils/expect-one-not-internal-server-error-snapshot.util';
+import { signUp } from 'test/integration/graphql/utils/sign-up.util';
+import { isDefined } from 'twenty-shared/utils';
+import { v4 as uuidv4 } from 'uuid';
+
+describe('Application authorizations with a workspace-agnostic session should fail', () => {
+ let workspaceAgnosticToken: string;
+
+ beforeAll(async () => {
+ const { data } = await signUp({
+ input: {
+ email: `application-authorizations-agnostic-${Date.now()}@example.com`,
+ password: 'Applecar2025!',
+ },
+ expectToFail: false,
+ });
+
+ workspaceAgnosticToken =
+ data.signUp.tokens.accessOrWorkspaceAgnosticToken.token;
+ });
+
+ afterAll(async () => {
+ if (!isDefined(workspaceAgnosticToken)) {
+ return;
+ }
+
+ await deleteUser({
+ accessToken: workspaceAgnosticToken,
+ expectToFail: false,
+ });
+ });
+
+ it('should refuse to list the application authorizations', async () => {
+ const { errors } = await currentUserApplicationAuthorizations({
+ token: workspaceAgnosticToken,
+ expectToFail: true,
+ });
+
+ expectOneNotInternalServerErrorSnapshot({ errors });
+ });
+
+ it('should refuse to revoke an application authorization', async () => {
+ const { errors } = await revokeApplicationAuthorization({
+ input: { applicationAuthorizationId: uuidv4() },
+ token: workspaceAgnosticToken,
+ expectToFail: true,
+ });
+
+ expectOneNotInternalServerErrorSnapshot({ errors });
+ });
+});
diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/successful-user-session-and-application-access.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/successful-user-session-and-application-access.integration-spec.ts
index 73c26b6733c..1bb0e0b1b56 100644
--- a/packages/twenty-server/test/integration/graphql/suites/user-session/successful-user-session-and-application-access.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/successful-user-session-and-application-access.integration-spec.ts
@@ -23,6 +23,7 @@ import {
import { SystemPermissionFlag } from 'twenty-shared/constants';
import { SubscriptionInterval } from 'src/engine/core-modules/billing/enums/billing-subscription-interval.enum';
+import { AUTH_PRINCIPAL_REFUSED_MESSAGE } from 'src/engine/guards/constants/auth-principal-refused-message.constant';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
import { USER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-users.util';
import { TWO_FACTOR_AUTHENTICATION_METHOD_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-two-factor-authentication-methods.util';
@@ -41,8 +42,6 @@ const OFFICIAL_APPLICATION_CURRENT_USER_FIELDS = `
}
`;
-const USER_SESSION_REFUSAL_MESSAGE = 'This endpoint requires a user session';
-
describe('User session operations and application access that must keep working', () => {
let applicationsApplication: ApplicationWithVariable;
let workspaceMembersApplication: ApplicationWithVariable;
@@ -247,14 +246,6 @@ describe('User session operations and application access that must keep working'
expect(sessionsErrors).toBeUndefined();
- const { errors: authorizationsErrors } =
- await currentUserApplicationAuthorizations({
- token: workspaceAgnosticToken,
- expectToFail: false,
- });
-
- expect(authorizationsErrors).toBeUndefined();
-
await deleteUser({
accessToken: workspaceAgnosticToken,
expectToFail: false,
@@ -381,7 +372,7 @@ describe('User session operations and application access that must keep working'
});
// Billing is off in the integration environment, so the mutation cannot
- // complete; what this asserts is that the user-session guard is not what
+ // complete; what this asserts is that AuthPrincipalGuard is not what
// stopped it, leaving checkoutSession on its permission path.
it('should reach the checkout session permission path', async () => {
const { errors } = await checkoutSession({
@@ -391,7 +382,7 @@ describe('User session operations and application access that must keep working'
});
expect((errors ?? []).map(({ message }) => message)).not.toContain(
- USER_SESSION_REFUSAL_MESSAGE,
+ AUTH_PRINCIPAL_REFUSED_MESSAGE,
);
});
});
diff --git a/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-visibility.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-visibility.integration-spec.ts
index 91af1e7bbe8..cb9b7ef2326 100644
--- a/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-visibility.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-visibility.integration-spec.ts
@@ -588,7 +588,7 @@ describe('core workflow visibility (e2e)', () => {
expect(response.body.data?.runWorkflowVersion ?? null).toBeNull();
});
- // WorkflowTriggerResolver carries no class-level UserAuthGuard, so unlike
+ // WorkflowTriggerResolver's AuthPrincipalGuard accepts API keys, so unlike
// the core workflow API an API key does reach this mutation, and the rule
// has to hold for a caller that is a workspace rather than a person.
it('refuses to activate it for an API key', async () => {
diff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/__snapshots__/failing-application-registration-ownership-change.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application-registration/__snapshots__/failing-application-registration-ownership-change.integration-spec.ts.snap
index bea979b7760..c1f1b6a26ff 100644
--- a/packages/twenty-server/test/integration/metadata/suites/application-registration/__snapshots__/failing-application-registration-ownership-change.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/__snapshots__/failing-application-registration-ownership-change.integration-spec.ts.snap
@@ -4,11 +4,9 @@ exports[`Application registration ownership change without a user session should
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -16,11 +14,9 @@ exports[`Application registration ownership change without a user session should
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a user session",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -28,9 +24,9 @@ exports[`Application registration ownership change without a user session should
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -38,9 +34,9 @@ exports[`Application registration ownership change without a user session should
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -48,9 +44,9 @@ exports[`Application registration ownership change without a user session should
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -58,8 +54,8 @@ exports[`Application registration ownership change without a user session should
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-application-token-renewal.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-application-token-renewal.integration-spec.ts.snap
index b0325ab0532..c7d398ee392 100644
--- a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-application-token-renewal.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-application-token-renewal.integration-spec.ts.snap
@@ -4,11 +4,9 @@ exports[`Application token renewal should fail when the caller is an API key 1`]
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a session access token",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -16,11 +14,9 @@ exports[`Application token renewal should fail when the caller is an application
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a session access token",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-cross-application-access.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-cross-application-access.integration-spec.ts.snap
index 5744a24a6c5..79c54c77968 100644
--- a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-cross-application-access.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-cross-application-access.integration-spec.ts.snap
@@ -604,9 +604,9 @@ exports[`Application token access to another application should fail with an app
{
"extensions": {
"code": "FORBIDDEN",
- "userFriendlyMessage": "An error occurred.",
+ "userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "Forbidden resource",
+ "message": "This endpoint is not available to this caller",
}
`;
diff --git a/packages/twenty-server/test/integration/metadata/suites/front-component/__snapshots__/failing-front-component-application-token-pair-generation.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/front-component/__snapshots__/failing-front-component-application-token-pair-generation.integration-spec.ts.snap
index 8d9664e5d34..e82efb8e6d8 100644
--- a/packages/twenty-server/test/integration/metadata/suites/front-component/__snapshots__/failing-front-component-application-token-pair-generation.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/front-component/__snapshots__/failing-front-component-application-token-pair-generation.integration-spec.ts.snap
@@ -4,11 +4,9 @@ exports[`Front component application token pair generation should fail when call
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a session access token",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -16,11 +14,9 @@ exports[`Front component application token pair generation should fail when call
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a session access token",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -28,11 +24,9 @@ exports[`Front component application token pair generation should fail when call
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a session access token",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
diff --git a/packages/twenty-server/test/integration/metadata/suites/front-component/__snapshots__/failing-front-component-application-token-pair.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/front-component/__snapshots__/failing-front-component-application-token-pair.integration-spec.ts.snap
index 93b0257de39..bcf01eaf460 100644
--- a/packages/twenty-server/test/integration/metadata/suites/front-component/__snapshots__/failing-front-component-application-token-pair.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/metadata/suites/front-component/__snapshots__/failing-front-component-application-token-pair.integration-spec.ts.snap
@@ -4,11 +4,9 @@ exports[`Front component read with token pair should fail when called with a use
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a session access token",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -16,11 +14,9 @@ exports[`Front component read with token pair should fail when called with a use
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a session access token",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -28,11 +24,9 @@ exports[`Front component read with token pair should fail when called with an AP
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a session access token",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;
@@ -40,10 +34,8 @@ exports[`Front component read with token pair should fail when called with an ap
{
"extensions": {
"code": "FORBIDDEN",
- "subCode": "FORBIDDEN_EXCEPTION",
"userFriendlyMessage": "You do not have permission to perform this action.",
},
- "message": "This endpoint requires a session access token",
- "name": "ForbiddenError",
+ "message": "This endpoint is not available to this caller",
}
`;