Skip to content

The open alternative to Salesforce, designed for AI.

feat(auth): refuse API access for suspended workspaces (#26127)

Etienne4ee50b63e686
diff --git a/packages/twenty-server/src/app.module.ts b/packages/twenty-server/src/app.module.ts
index 5674b526098..3917827e6f8 100644
--- a/packages/twenty-server/src/app.module.ts
+++ b/packages/twenty-server/src/app.module.ts
@@ -4,7 +4,7 @@ import {
Module,
RequestMethod,
} from '@nestjs/common';
-import { APP_FILTER } from '@nestjs/core';
+import { APP_FILTER, APP_GUARD } from '@nestjs/core';
import { GraphQLModule } from '@nestjs/graphql';
import { ServeStaticModule } from '@nestjs/serve-static';
@@ -30,12 +30,14 @@ import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/work
import { ApiRequestContextMiddleware } from 'src/engine/core-modules/usage/middlewares/api-request-context.middleware';
import { CookieSessionCsrfMiddleware } from 'src/engine/middlewares/cookie-session-csrf.middleware';
import { GraphQLHydrateRequestFromTokenMiddleware } from 'src/engine/middlewares/graphql-hydrate-request-from-token.middleware';
+import { GraphQLRefuseSuspendedWorkspaceMiddleware } from 'src/engine/middlewares/graphql-refuse-suspended-workspace.middleware';
import { MiddlewareModule } from 'src/engine/middlewares/middleware.module';
import { JwtModule } from 'src/engine/core-modules/jwt/jwt.module';
import { UserSessionModule } from 'src/engine/core-modules/user-session/user-session.module';
import { RestCoreMiddleware } from 'src/engine/middlewares/rest-core.middleware';
import { TwentyOrmModule } from 'src/engine/twenty-orm/twenty-orm.module';
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
+import { WorkspaceNotSuspendedGuard } from 'src/engine/guards/workspace-not-suspended.guard';
import { UnhandledExceptionFilter } from 'src/filters/unhandled-exception.filter';
import { ModulesModule } from 'src/modules/modules.module';
@@ -83,6 +85,10 @@ const MIGRATED_REST_METHODS = [
provide: APP_FILTER,
useClass: UnhandledExceptionFilter,
},
+ {
+ provide: APP_GUARD,
+ useClass: WorkspaceNotSuspendedGuard,
+ },
],
})
export class AppModule {
@@ -121,6 +127,7 @@ export class AppModule {
.apply(
ApiRequestContextMiddleware,
GraphQLHydrateRequestFromTokenMiddleware,
+ GraphQLRefuseSuspendedWorkspaceMiddleware,
WorkspaceAuthContextMiddleware,
)
.forRoutes({ path: ApiPath.GraphQL, method: RequestMethod.ALL });
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 d08aee12911..5ada30175ac 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
@@ -21,6 +21,7 @@ import { McpAuthGuard } from 'src/engine/api/mcp/guards/mcp-auth.guard';
import { McpProtocolService } from 'src/engine/api/mcp/services/mcp-protocol.service';
import { writeSseEvent } from 'src/engine/api/mcp/utils/write-sse-event.util';
import { RestApiExceptionFilter } from 'src/engine/api/rest/rest-api-exception.filter';
+import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
import { FlatApiKey } from 'src/engine/core-modules/api-key/types/flat-api-key.type';
import { FlatWorkspace } from 'src/engine/core-modules/workspace/types/flat-workspace.type';
import { UserEntity } from 'src/engine/core-modules/user/user.entity';
@@ -30,10 +31,16 @@ 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 { WorkspaceNotSuspendedGuard } from 'src/engine/guards/workspace-not-suspended.guard';
@Controller(ApiPath.Mcp)
-@UseGuards(McpAuthGuard, WorkspaceAuthGuard, NoPermissionGuard)
-@UseFilters(RestApiExceptionFilter)
+@UseGuards(
+ McpAuthGuard,
+ WorkspaceAuthGuard,
+ WorkspaceNotSuspendedGuard,
+ NoPermissionGuard,
+)
+@UseFilters(RestApiExceptionFilter, AuthRestApiExceptionFilter)
export class McpCoreController {
constructor(private readonly mcpProtocolService: McpProtocolService) {}
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 d00253dbeea..835d53da01b 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
@@ -21,10 +21,11 @@ import { AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-re
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 { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(ApiPath.Rest)
@UseGuards(JwtAuthGuard, WorkspaceAuthGuard, CustomPermissionGuard)
-@UseFilters(RestApiExceptionFilter)
+@UseFilters(RestApiExceptionFilter, AuthRestApiExceptionFilter)
export class RestApiCoreController {
private readonly logger = new Logger(RestApiCoreController.name);
constructor(private readonly restApiCoreService: RestApiCoreService) {}
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 68f8dad1930..1ef7f7e67a3 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
@@ -30,6 +30,7 @@ import { RequireAccessTokenGuard } from 'src/engine/guards/require-access-token.
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';
/**
* rest/apiKeys is deprecated, use rest/metadata/apiKeys instead
@@ -41,7 +42,11 @@ import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/p
WorkspaceAuthGuard,
SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),
)
-@UseFilters(PermissionsRestApiExceptionFilter, RestApiExceptionFilter)
+@UseFilters(
+ PermissionsRestApiExceptionFilter,
+ RestApiExceptionFilter,
+ AuthRestApiExceptionFilter,
+)
export class ApiKeyController {
constructor(private readonly apiKeyService: ApiKeyService) {}
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 2ce3b0a5946..ae9fb9ace84 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
@@ -36,11 +36,12 @@ import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.g
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@UsePipes(ResolverValidationPipe)
@MetadataResolver()
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
-@UseFilters(ApplicationExceptionFilter)
+@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)
@UseGuards(
WorkspaceAuthGuard,
SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),
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 374dacbfa36..3739e5da8b2 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
@@ -30,6 +30,7 @@ import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/re
import { JobStatusDTO } from 'src/engine/core-modules/message-queue/dtos/job-status.dto';
import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
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 { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
@@ -54,6 +55,7 @@ export class ApplicationInstallResolver {
@Query(() => [ApplicationDTO])
@UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))
+ @AllowSuspendedWorkspace()
async findManyApplications(
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
) {
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 c9770643bfa..48764d8c6d9 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
@@ -16,6 +16,7 @@ import { JobStatusDTO } from 'src/engine/core-modules/message-queue/dtos/job-sta
import { ApplicationJobService } from 'src/engine/core-modules/application/application-job/services/application-job.service';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';
+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 { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flat-workspace.type';
import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';
@@ -26,7 +27,7 @@ import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
-@UseFilters(ApplicationExceptionFilter)
+@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)
@UsePipes(ResolverValidationPipe)
@MetadataResolver()
export class ApplicationJobResolver {
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 51819efad74..9d6ed1a2315 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
@@ -15,9 +15,10 @@ import { AuthApplication } from 'src/engine/decorators/auth/auth-application.dec
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 { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
-@UseFilters(ApplicationExceptionFilter)
+@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)
@MetadataResolver()
export class ApplicationKeyValueResolver {
constructor(
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 74e65098609..78b825ac665 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
@@ -15,9 +15,13 @@ import { MarketplaceCatalogSyncCronJob } from 'src/engine/core-modules/applicati
import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@MetadataResolver()
-@UseFilters(ApplicationRegistrationExceptionFilter)
+@UseFilters(
+ ApplicationRegistrationExceptionFilter,
+ AuthGraphqlApiExceptionFilter,
+)
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
export class MarketplaceResolver {
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 4c31abc6e5b..d0bbe7347bf 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
@@ -11,9 +11,10 @@ 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 { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@MetadataResolver()
-@UseFilters(ApplicationExceptionFilter)
+@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)
@UseGuards(UserAuthGuard, WorkspaceAuthGuard, NoPermissionGuard)
export class ApplicationUpgradeResolver {
constructor(
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 086f3ef25c1..1ed6e900364 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
@@ -13,13 +13,17 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
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 { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(
WorkspaceAuthGuard,
SettingsPermissionGuard(PermissionFlagType.APPLICATIONS),
)
@MetadataResolver(() => ApplicationVariableEntityDTO)
-@UseFilters(ApplicationVariableEntityExceptionFilter)
+@UseFilters(
+ ApplicationVariableEntityExceptionFilter,
+ AuthGraphqlApiExceptionFilter,
+)
export class ApplicationVariableEntityResolver {
constructor(
private readonly applicationVariableService: ApplicationVariableEntityService,
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 3bbd0531b9a..f717dc8de87 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
@@ -1,4 +1,9 @@
-import { UseGuards, UseInterceptors, UsePipes } from '@nestjs/common';
+import {
+ UseGuards,
+ UseInterceptors,
+ UsePipes,
+ UseFilters,
+} from '@nestjs/common';
import { Args, ID, Mutation, Query } from '@nestjs/graphql';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
@@ -16,11 +21,13 @@ import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/re
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 { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
@UseInterceptors(ConnectionProviderGraphqlApiExceptionInterceptor)
@UsePipes(ResolverValidationPipe)
@MetadataResolver()
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class ApplicationConnectionsResolver {
constructor(
private readonly listService: ApplicationConnectionsListService,
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 10bf7c932ea..0ddb714e081 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
@@ -29,10 +29,12 @@ import { PRESIGNED_URL_NO_STORE_CACHE_CONTROL } from 'src/engine/core-modules/fi
import { setFileResponseHeaders } from 'src/engine/core-modules/file/utils/set-file-response-headers.utils';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
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';
@Controller(`${ApiPath.Rest}/front-component-shared-dependencies`)
+@AllowSuspendedWorkspace()
@UseGuards(WorkspaceAuthGuard)
@UseFilters(ApplicationRestApiExceptionFilter)
export class FrontComponentSharedDependenciesController {
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 08d89167d60..6406e0eb5be 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
@@ -11,6 +11,7 @@ import { DeleteApprovedAccessDomainInput } from 'src/engine/core-modules/approve
import { ValidateApprovedAccessDomainInput } from 'src/engine/core-modules/approved-access-domain/dtos/validate-approved-access-domain.input';
import { ApprovedAccessDomainService } from 'src/engine/core-modules/approved-access-domain/services/approved-access-domain.service';
import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -30,6 +31,7 @@ import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/sta
@UseFilters(
ApprovedAccessDomainExceptionFilter,
PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
)
@MetadataResolver()
export class ApprovedAccessDomainResolver {
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.exception.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.exception.ts
index 24c2b7abef0..9e3550fb756 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/auth.exception.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.exception.ts
@@ -14,6 +14,7 @@ export const AuthExceptionCode = appendCommonExceptionCode({
EMAIL_NOT_VERIFIED: 'EMAIL_NOT_VERIFIED',
CLIENT_NOT_FOUND: 'CLIENT_NOT_FOUND',
WORKSPACE_NOT_FOUND: 'WORKSPACE_NOT_FOUND',
+ WORKSPACE_SUSPENDED: 'WORKSPACE_SUSPENDED',
APPLICATION_NOT_FOUND: 'APPLICATION_NOT_FOUND',
INVALID_INPUT: 'INVALID_INPUT',
FORBIDDEN_EXCEPTION: 'FORBIDDEN_EXCEPTION',
@@ -50,6 +51,8 @@ const getAuthExceptionUserFriendlyMessage = (
return msg`Email is not verified.`;
case AuthExceptionCode.WORKSPACE_NOT_FOUND:
return msg`Workspace not found.`;
+ case AuthExceptionCode.WORKSPACE_SUSPENDED:
+ return msg`This workspace is suspended. Choose a plan to reactivate it.`;
case AuthExceptionCode.APPLICATION_NOT_FOUND:
return msg`Application not found.`;
case AuthExceptionCode.INVALID_INPUT:
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 8824543c9cd..6273c7c4ba4 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
@@ -90,6 +90,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { AuthProvider } from 'src/engine/decorators/auth/auth-provider.decorator';
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 { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
import { RequireAccessTokenGuard } from 'src/engine/guards/require-access-token.guard';
@@ -177,6 +178,7 @@ export class AuthResolver {
@Mutation(() => GetAuthorizationUrlForSsoDTO)
@UseGuards(PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async getAuthorizationUrlForSSO(
@Args('input') params: GetAuthorizationUrlForSsoInput,
) {
@@ -208,6 +210,7 @@ export class AuthResolver {
@Mutation(() => LoginTokenDTO)
@UseGuards(CaptchaGuard, PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async getLoginTokenFromCredentials(
@Args()
getLoginTokenFromCredentialsInput: UserCredentialsInput,
@@ -243,6 +246,7 @@ export class AuthResolver {
@Mutation(() => AvailableWorkspacesAndAccessTokensDTO)
@UseGuards(CaptchaGuard, PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async signIn(
@Args()
userCredentials: UserCredentialsInput,
@@ -290,6 +294,7 @@ export class AuthResolver {
@Mutation(() => VerifyEmailAndGetLoginTokenDTO)
@UseGuards(PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async verifyEmailAndGetLoginToken(
@Args()
getAuthTokenFromEmailVerificationTokenInput: GetAuthTokenFromEmailVerificationTokenInput,
@@ -334,6 +339,7 @@ export class AuthResolver {
@Mutation(() => AvailableWorkspacesAndAccessTokensDTO)
@UseGuards(PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async verifyEmailAndGetWorkspaceAgnosticToken(
@Args()
getAuthTokenFromEmailVerificationTokenInput: GetAuthTokenFromEmailVerificationTokenInput,
@@ -397,6 +403,7 @@ export class AuthResolver {
@Mutation(() => AuthTokens)
@UseGuards(CaptchaGuard, PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async getAuthTokensFromOTP(
@Args()
twoFactorAuthenticationVerificationInput: TwoFactorAuthenticationVerificationInput,
@@ -439,6 +446,7 @@ export class AuthResolver {
@Mutation(() => AvailableWorkspacesAndAccessTokensDTO)
@UseGuards(CaptchaGuard, PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async signUp(
@Args() signUpInput: UserCredentialsInput,
@Context() context: { req: Request },
@@ -502,6 +510,7 @@ export class AuthResolver {
@Mutation(() => SignUpDTO)
@UseGuards(CaptchaGuard, PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async signUpInWorkspace(
@Args() signUpInput: SignUpInput,
): Promise<SignUpDTO> {
@@ -595,6 +604,7 @@ export class AuthResolver {
@Mutation(() => SignUpDTO)
@UseGuards(UserAuthGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async signUpInNewWorkspace(
@AuthUser() currentUser: AuthContextUser,
@AuthProvider() authProvider: AuthProviderEnum,
@@ -632,6 +642,7 @@ export class AuthResolver {
@Mutation(() => FileWithSignedUrlDTO)
@UseGuards(UserAuthGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async uploadNewWorkspaceLogo(
@AuthUser() currentUser: AuthContextUser,
@Args('workspaceId') workspaceId: string,
@@ -684,6 +695,7 @@ export class AuthResolver {
@Mutation(() => AuthTokens)
@UseGuards(PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async getAuthTokensFromLoginToken(
@Args() getAuthTokensFromLoginTokenInput: GetAuthTokensFromLoginTokenInput,
@Args('origin') origin: string,
@@ -747,6 +759,7 @@ export class AuthResolver {
@Mutation(() => AuthTokens)
@UseGuards(PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async getAuthTokensFromSSOExchangeToken(
@Args()
{ ssoExchangeToken }: GetAuthTokensFromSsoExchangeTokenInput,
@@ -958,6 +971,7 @@ export class AuthResolver {
@Mutation(() => AuthTokens)
@UseGuards(PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async renewToken(
@Args() args: AppTokenInput,
@Context() context: { req: Request },
@@ -977,6 +991,7 @@ export class AuthResolver {
@Mutation(() => Boolean)
@UseGuards(PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async signOut(
@Context() context: { req: Request },
@Args('refreshToken', { nullable: true }) refreshToken?: string,
@@ -1040,6 +1055,7 @@ export class AuthResolver {
@Mutation(() => EmailPasswordResetLinkDTO)
@UseGuards(CaptchaGuard, PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async emailPasswordResetLink(
@Args() emailPasswordResetInput: EmailPasswordResetLinkInput,
@Context() context: I18nContext,
@@ -1068,6 +1084,7 @@ export class AuthResolver {
@Mutation(() => InvalidatePasswordDTO)
@UseGuards(PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async updatePasswordViaResetToken(
@Args()
{ passwordResetToken, newPassword }: UpdatePasswordViaResetTokenInput,
diff --git a/packages/twenty-server/src/engine/core-modules/auth/filters/auth-rest-api-exception.filter.ts b/packages/twenty-server/src/engine/core-modules/auth/filters/auth-rest-api-exception.filter.ts
index 9ce271c2ce0..e4eb74f074a 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/filters/auth-rest-api-exception.filter.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/filters/auth-rest-api-exception.filter.ts
@@ -47,6 +47,7 @@ export class AuthRestApiExceptionFilter implements ExceptionFilter {
400,
);
case AuthExceptionCode.FORBIDDEN_EXCEPTION:
+ case AuthExceptionCode.WORKSPACE_SUSPENDED:
return this.httpExceptionHandlerService.handleError(
exception,
response,
diff --git a/packages/twenty-server/src/engine/core-modules/auth/utils/auth-graphql-api-exception-handler.util.ts b/packages/twenty-server/src/engine/core-modules/auth/utils/auth-graphql-api-exception-handler.util.ts
index 51438be1019..ff8e930b7b6 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/utils/auth-graphql-api-exception-handler.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/utils/auth-graphql-api-exception-handler.util.ts
@@ -19,6 +19,7 @@ export const authGraphqlApiExceptionHandler = (exception: AuthException) => {
case AuthExceptionCode.INVALID_INPUT:
throw new UserInputError(exception);
case AuthExceptionCode.FORBIDDEN_EXCEPTION:
+ case AuthExceptionCode.WORKSPACE_SUSPENDED:
case AuthExceptionCode.INSUFFICIENT_SCOPES:
case AuthExceptionCode.OAUTH_ACCESS_DENIED:
case AuthExceptionCode.SSO_AUTH_FAILED:
diff --git a/packages/twenty-server/src/engine/core-modules/auth/utils/get-auth-exception-rest-status.util.ts b/packages/twenty-server/src/engine/core-modules/auth/utils/get-auth-exception-rest-status.util.ts
index 1d50c55631b..e8a1a0a20a4 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/utils/get-auth-exception-rest-status.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/utils/get-auth-exception-rest-status.util.ts
@@ -12,6 +12,7 @@ export const getAuthExceptionRestStatus = (exception: AuthException) => {
case AuthExceptionCode.INVALID_INPUT:
return 400;
case AuthExceptionCode.FORBIDDEN_EXCEPTION:
+ case AuthExceptionCode.WORKSPACE_SUSPENDED:
case AuthExceptionCode.INSUFFICIENT_SCOPES:
case AuthExceptionCode.OAUTH_ACCESS_DENIED:
case AuthExceptionCode.SSO_AUTH_FAILED:
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 8b04bb56adc..d90db23a6b3 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
@@ -37,6 +37,7 @@ import { AuthApiKey } from 'src/engine/decorators/auth/auth-api-key.decorator';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
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 { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
@@ -49,6 +50,7 @@ import {
import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
@MetadataResolver()
+@AllowSuspendedWorkspace()
@UsePipes(ResolverValidationPipe)
@UseFilters(
PermissionsGraphqlApiExceptionFilter,
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 5cefc7c909d..096cff7fae7 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
@@ -1,4 +1,4 @@
-import { UseGuards } from '@nestjs/common';
+import { UseGuards, UseFilters } from '@nestjs/common';
import { Args, ArgsType, Field, Int, Query } from '@nestjs/graphql';
import { Max } from 'class-validator';
@@ -14,6 +14,7 @@ import { CoreResolver } from 'src/engine/api/graphql/graphql-config/decorators/c
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@ArgsType()
class GetTimelineCalendarEventsFromObjectRecordArgs {
@@ -72,6 +73,7 @@ class GetTimelineCalendarEventsFromOpportunityIdArgs {
@UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)
@CoreResolver(() => TimelineCalendarEventsWithTotalDTO)
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class TimelineCalendarEventResolver {
constructor(
private readonly timelineCalendarEventService: TimelineCalendarEventService,
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 1a534a9a7b5..a5ab25dd902 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
@@ -4,6 +4,7 @@ import { Mutation, Query } from '@nestjs/graphql';
import { CoreResolver } from 'src/engine/api/graphql/graphql-config/decorators/core-resolver.decorator';
import { MaintenanceModeService } from 'src/engine/core-modules/admin-panel/maintenance-mode.service';
import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -15,7 +16,10 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@UseGuards(WorkspaceAuthGuard, UserAuthGuard)
@UsePipes(ResolverValidationPipe)
-@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)
+@UseFilters(
+ PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
+)
@CoreResolver()
export class ClientConfigResolver {
constructor(
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 7d53a78a3cb..451f5e460b5 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
@@ -3,6 +3,7 @@ import { Mutation } from '@nestjs/graphql';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { WorkspaceCompanyEnrichmentResultDTO } from 'src/engine/core-modules/company-enrichment/dtos/workspace-company-enrichment-result.dto';
import { WorkspaceCompanyEnrichmentOutcome } from 'src/engine/core-modules/company-enrichment/enums/workspace-company-enrichment-outcome.enum';
import { WorkspacePersonEnrichmentOutcome } from 'src/engine/core-modules/company-enrichment/enums/workspace-person-enrichment-outcome.enum';
@@ -20,7 +21,10 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@UseGuards(WorkspaceAuthGuard, UserAuthGuard)
@UsePipes(ResolverValidationPipe)
-@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)
+@UseFilters(
+ PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
+)
@MetadataResolver()
export class CompanyEnrichmentResolver {
constructor(
diff --git a/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.resolver.ts b/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.resolver.ts
index 1ef39442d4e..fb34033465e 100644
--- a/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.resolver.ts
@@ -12,8 +12,10 @@ import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/re
import { I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.type';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
+import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';
@MetadataResolver()
+@AllowSuspendedWorkspace()
@UsePipes(ResolverValidationPipe)
@UseFilters(
EmailVerificationExceptionFilter,
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 6e24e60c10f..b4b6bdeded0 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
@@ -15,6 +15,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(
WorkspaceAuthGuard,
@@ -23,6 +24,7 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@UseFilters(
EmailGroupAccessGraphqlApiExceptionFilter,
EmailingDomainGraphqlApiExceptionFilter,
+ AuthGraphqlApiExceptionFilter,
)
@UsePipes(ResolverValidationPipe)
@MetadataResolver(() => EmailingDomainDTO)
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 e134d9a1c5d..e27962fb3a7 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
@@ -14,9 +14,11 @@ import { UserEntity } from 'src/engine/core-modules/user/user.entity';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
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 { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { Analytics } from './dtos/analytics.dto';
import {
@@ -31,6 +33,7 @@ import { EventLogEmitterService } from './event-log-emitter.service';
@UseFilters(
EventLogEmitterExceptionFilter,
PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
)
export class EventLogEmitterResolver {
constructor(
@@ -67,6 +70,7 @@ export class EventLogEmitterResolver {
@Mutation(() => Analytics)
@UseGuards(PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async trackAnalytics(
@Args()
createAnalyticsInput: CreateAnalyticsInputV2,
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 8551ebbf5eb..8c283ba8e7d 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,12 +20,14 @@ import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.g
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { streamToBuffer } from 'src/utils/stream-to-buffer';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(WorkspaceAuthGuard)
@UsePipes(ResolverValidationPipe)
@UseFilters(
PermissionsGraphqlApiExceptionFilter,
PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
)
@MetadataResolver()
export class FileCorePictureResolver {
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 a4922b828c8..933f1ed8475 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
@@ -14,10 +14,14 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(WorkspaceAuthGuard)
@UsePipes(ResolverValidationPipe)
-@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)
+@UseFilters(
+ PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
+)
@MetadataResolver()
export class FileUploadResolver {
constructor(private readonly fileUploadService: FileUploadService) {}
diff --git a/packages/twenty-server/src/engine/core-modules/file/file.module.ts b/packages/twenty-server/src/engine/core-modules/file/file.module.ts
index 840fd69b22b..d35cb151021 100644
--- a/packages/twenty-server/src/engine/core-modules/file/file.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/file.module.ts
@@ -5,6 +5,7 @@ import { ApplicationEntity } from 'src/engine/core-modules/application/applicati
import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module';
import { FileDeletionJob } from 'src/engine/core-modules/file/jobs/file-deletion.job';
import { FileWorkspaceFolderDeletionJob } from 'src/engine/core-modules/file/jobs/file-workspace-folder-deletion.job';
+import { CoreEntityCacheModule } from 'src/engine/core-entity-cache/core-entity-cache.module';
import { JwtModule } from 'src/engine/core-modules/jwt/jwt.module';
import { SecureHttpClientModule } from 'src/engine/core-modules/secure-http-client/secure-http-client.module';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -23,6 +24,7 @@ import { FileService } from './services/file.service';
@Module({
imports: [
JwtModule,
+ CoreEntityCacheModule,
TypeOrmModule.forFeature([FileEntity, WorkspaceEntity, ApplicationEntity]),
PermissionsModule,
FileStorageModule,
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 1826d2bca24..fb0b9472b5e 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
@@ -18,10 +18,14 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { streamToBuffer } from 'src/utils/stream-to-buffer';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(WorkspaceAuthGuard)
@UsePipes(ResolverValidationPipe)
-@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)
+@UseFilters(
+ PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
+)
@MetadataResolver()
export class FilesFieldResolver {
constructor(private readonly filesFieldService: FilesFieldService) {}
diff --git a/packages/twenty-server/src/engine/core-modules/file/guards/file-by-id.guard.ts b/packages/twenty-server/src/engine/core-modules/file/guards/file-by-id.guard.ts
index 1c0518f475d..e7ccdbef35d 100644
--- a/packages/twenty-server/src/engine/core-modules/file/guards/file-by-id.guard.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/guards/file-by-id.guard.ts
@@ -6,6 +6,8 @@ import { fileFolderConfigs } from 'src/engine/core-modules/file/interfaces/file-
import { FileTokenJwtPayload } from 'src/engine/core-modules/auth/types/file-token-jwt-payload.type';
import { JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrapper.service';
+import { isWorkspaceSuspended } from 'src/engine/core-modules/workspace/utils/is-workspace-suspended.util';
+import { CoreEntityCacheService } from 'src/engine/core-entity-cache/services/core-entity-cache.service';
export const SUPPORTED_FILE_FOLDERS = [
FileFolder.CorePicture,
@@ -20,9 +22,16 @@ export const SUPPORTED_FILE_FOLDERS = [
export type SupportedFileFolder = (typeof SUPPORTED_FILE_FOLDERS)[number];
+const FILE_FOLDERS_SERVED_WHEN_SUSPENDED: SupportedFileFolder[] = [
+ FileFolder.CorePicture,
+];
+
@Injectable()
export class FileByIdGuard implements CanActivate {
- constructor(private readonly jwtWrapperService: JwtWrapperService) {}
+ constructor(
+ private readonly jwtWrapperService: JwtWrapperService,
+ private readonly coreEntityCacheService: CoreEntityCacheService,
+ ) {}
async canActivate(context: ExecutionContext): Promise<boolean> {
const request = context.switchToHttp().getRequest();
@@ -63,7 +72,26 @@ export class FileByIdGuard implements CanActivate {
return false;
}
- return true;
+ return await this.isFileFolderServable(
+ fileFolder,
+ decodedPayload.workspaceId,
+ );
+ }
+
+ private async isFileFolderServable(
+ fileFolder: SupportedFileFolder,
+ workspaceId: string,
+ ): Promise<boolean> {
+ if (FILE_FOLDERS_SERVED_WHEN_SUSPENDED.includes(fileFolder)) {
+ return true;
+ }
+
+ const workspace = await this.coreEntityCacheService.get(
+ 'workspaceEntity',
+ workspaceId,
+ );
+
+ return !isWorkspaceSuspended(workspace);
}
private isSupportedFileFolder(
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 ed3738d7350..84b0f0df052 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
@@ -20,6 +20,7 @@ import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-module
import { AuthImpersonationContext } from 'src/engine/decorators/auth/auth-impersonation-context.decorator';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';
import { 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';
@@ -66,6 +67,7 @@ export class ImpersonationResolver {
@UseGuards(WorkspaceAuthGuard, UserAuthGuard, NoPermissionGuard)
@Mutation(() => StopImpersonationDTO)
+ @AllowSuspendedWorkspace()
async stopImpersonation(
@AuthImpersonationContext()
impersonationContext: AuthContext['impersonationContext'],
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 91450fabd22..4bce5852a11 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
@@ -1,4 +1,4 @@
-import { UseGuards } from '@nestjs/common';
+import { UseGuards, UseFilters } from '@nestjs/common';
import { Args, ArgsType, Field, Int, Mutation, Query } from '@nestjs/graphql';
import { Max } from 'class-validator';
@@ -13,6 +13,7 @@ import { TimelineThreadsWithTotalDTO } from 'src/engine/core-modules/messaging/d
import { GetMessagesService } from 'src/engine/core-modules/messaging/services/get-messages.service';
import { UserService } from 'src/engine/core-modules/user/services/user.service';
import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
@@ -79,6 +80,7 @@ class GetTimelineThreadsFromOpportunityIdArgs {
@UseGuards(WorkspaceAuthGuard, UserAuthGuard, CustomPermissionGuard)
@CoreResolver(() => TimelineThreadsWithTotalDTO)
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class TimelineMessagingResolver {
constructor(
private readonly getMessagesFromPersonIdsService: GetMessagesService,
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 0a6af7f8a35..1d3e69ed10d 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
@@ -14,6 +14,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@@ -22,6 +23,7 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@UsePipes(ResolverValidationPipe)
@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)
@MetadataResolver()
+@AllowSuspendedWorkspace()
export class OnboardingResolver {
constructor(
private readonly onboardingService: OnboardingService,
diff --git a/packages/twenty-server/src/engine/core-modules/open-api/open-api.controller.ts b/packages/twenty-server/src/engine/core-modules/open-api/open-api.controller.ts
index 9330b8fd3b5..b9248056ac7 100644
--- a/packages/twenty-server/src/engine/core-modules/open-api/open-api.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/open-api/open-api.controller.ts
@@ -1,4 +1,11 @@
-import { Controller, Get, Req, Res, UseGuards } from '@nestjs/common';
+import {
+ Controller,
+ Get,
+ Req,
+ Res,
+ UseGuards,
+ UseFilters,
+} from '@nestjs/common';
import { Request, Response } from 'express';
import { ApiPath } from 'twenty-shared/types';
@@ -6,8 +13,10 @@ import { ApiPath } from 'twenty-shared/types';
import { OpenApiService } from 'src/engine/core-modules/open-api/open-api.service';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
+import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller()
+@UseFilters(AuthRestApiExceptionFilter)
export class OpenApiController {
constructor(private readonly openApiService: OpenApiService) {}
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 b5e33e9eca6..410bf94dc29 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
@@ -25,6 +25,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(
WorkspaceAuthGuard,
@@ -34,6 +35,7 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
@UseFilters(
PublicDomainExceptionFilter,
PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
)
@MetadataResolver()
export class PublicDomainResolver {
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 24d2b3b2dfa..922ae7d6ced 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
@@ -23,11 +23,13 @@ import { SdkClientArchiveService } from 'src/engine/core-modules/sdk-client/sdk-
import { getInstalledSdkMetadataModule } from 'src/engine/core-modules/sdk-client/utils/get-installed-sdk-metadata-module.util';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
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 { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@Controller(`${ApiPath.Rest}/sdk-client`)
+@AllowSuspendedWorkspace()
@UseGuards(WorkspaceAuthGuard)
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 fc5173e6bf5..8f0afe4e6fd 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
@@ -18,12 +18,14 @@ import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
@CoreResolver()
@UseFilters(
SearchApiExceptionFilter,
PermissionsGraphqlApiExceptionFilter,
PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
)
@UsePipes(ResolverValidationPipe)
@UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)
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 5a887f723ca..950f5471643 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
@@ -7,6 +7,7 @@ import { PermissionFlagType } from 'twenty-shared/constants';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { EnterpriseFeaturesEnabledGuard } from 'src/engine/core-modules/auth/guards/enterprise-features-enabled.guard';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { DeleteSsoInput } from 'src/engine/core-modules/sso/dtos/delete-sso.input';
@@ -31,6 +32,7 @@ import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-module
@UseFilters(
PermissionsGraphqlApiExceptionFilter,
PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
)
@UsePipes(ResolverValidationPipe)
@UseGuards(SettingsPermissionGuard(PermissionFlagType.SECURITY))
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 f1dea4a5657..d85d9aa9877 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
@@ -18,6 +18,7 @@ import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-co
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
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 { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
@@ -49,6 +50,7 @@ export class TwoFactorAuthenticationResolver {
@Mutation(() => InitiateTwoFactorAuthenticationProvisioningDTO)
@UseGuards(PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async initiateOTPProvisioning(
@Args()
initiateTwoFactorAuthenticationProvisioningInput: InitiateTwoFactorAuthenticationProvisioningInput,
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 e85cfdfdb63..7161133d46e 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
@@ -23,11 +23,13 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
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 { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@MetadataResolver(() => UsageLimitDTO)
@UseFilters(
UsageLimitGraphqlApiExceptionFilter,
PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
)
@UsePipes(ResolverValidationPipe)
@UseGuards(
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 5b1d81bc3a2..f2c56d53263 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
@@ -18,12 +18,14 @@ import { UserSessionCookieService } from 'src/engine/core-modules/user-session/s
import { hashUserSessionToken } from 'src/engine/core-modules/user-session/utils/hash-user-session-token.util';
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 { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
@UsePipes(ResolverValidationPipe)
@UseFilters(AuthGraphqlApiExceptionFilter)
@MetadataResolver()
+@AllowSuspendedWorkspace()
export class UserSessionResolver {
constructor(
private readonly userSessionService: UserSessionService,
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 5df8a0fe5c5..1202be4e0a4 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
@@ -54,10 +54,12 @@ import { AuthAuthenticatedAt } from 'src/engine/decorators/auth/auth-authenticat
import { AuthProvider } from 'src/engine/decorators/auth/auth-provider.decorator';
import { AuthImpersonationContext } from 'src/engine/decorators/auth/auth-impersonation-context.decorator';
import { canCredentialAutoLoginIntoWorkspaces } from 'src/engine/core-modules/auth/utils/can-credential-auto-login-into-workspaces.util';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
import { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace-member-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
@@ -87,7 +89,7 @@ const getHMACKey = (email?: string, key?: string | null) => {
};
@MetadataResolver(() => UserEntity)
-@UseFilters(PermissionsGraphqlApiExceptionFilter)
+@UseFilters(PermissionsGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
export class UserResolver {
constructor(
@InjectRepository(UserEntity)
@@ -129,6 +131,7 @@ export class UserResolver {
@Query(() => UserEntity)
@UseGuards(UserAuthGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async currentUser(
@AuthUser() { id: userId }: AuthContextUser,
@AuthWorkspace({ allowUndefined: true }) workspace: WorkspaceEntity,
@@ -381,12 +384,14 @@ export class UserResolver {
@Mutation(() => UserEntity)
@UseGuards(UserAuthGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async deleteUser(@AuthUser() { id: userId }: AuthContextUser) {
return this.userService.deleteUser(userId);
}
@Mutation(() => UserWorkspaceEntity)
@UseGuards(UserAuthGuard, CustomPermissionGuard)
+ @AllowSuspendedWorkspace()
async deleteUserFromWorkspace(
@Args('workspaceMemberIdToDelete') workspaceMemberIdToDelete: string,
@AuthUser() { id: userId }: AuthContextUser,
@@ -456,6 +461,7 @@ export class UserResolver {
@Mutation(() => Boolean)
@UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)
+ @AllowSuspendedWorkspace()
async updateWorkspaceMemberSettings(
@Args('input') input: UpdateWorkspaceMemberSettingsInput,
@AuthWorkspace() workspace: 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 7f7cfc8a8b0..780ac730356 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
@@ -23,6 +23,7 @@ import { CoreWorkflowMutationWorkspaceService } from 'src/engine/core-modules/wo
import { CoreWorkflowVersionListService } from 'src/engine/core-modules/workflow/services/core-workflow-version-list.service';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
import { isDefined } from 'twenty-shared/utils';
@@ -43,6 +44,7 @@ import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-module
WorkflowQueryValidationGraphqlApiExceptionFilter,
PermissionsGraphqlApiExceptionFilter,
PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
)
export class CoreWorkflowResolver {
constructor(
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 2b3ce432640..00df39d5d98 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
@@ -17,6 +17,7 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@CoreResolver()
@UseGuards(
@@ -29,6 +30,7 @@ import { WorkflowSchemaWorkspaceService } from 'src/modules/workflow/workflow-bu
WorkflowTriggerGraphqlApiExceptionFilter,
PermissionsGraphqlApiExceptionFilter,
PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
)
export class WorkflowBuilderResolver {
constructor(
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 c993f9654cb..b5511bdff3f 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
@@ -14,6 +14,7 @@ import { buildCreatedByFromFullNameMetadata } from 'src/engine/core-modules/acto
import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { RunWorkflowVersionInput } from 'src/engine/core-modules/workflow/dtos/run-workflow-version.input';
import { RunWorkflowVersionDTO } from 'src/engine/core-modules/workflow/dtos/run-workflow-version.dto';
import { WorkflowRunDTO } from 'src/engine/core-modules/workflow/dtos/workflow-run.dto';
@@ -42,6 +43,7 @@ import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/sta
WorkflowVersionValidationGraphqlApiExceptionFilter,
PermissionsGraphqlApiExceptionFilter,
PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
)
export class WorkflowTriggerResolver {
constructor(
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 1d902a053cb..e68e1ef07a9 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
@@ -17,6 +17,7 @@ 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 { WorkflowVersionEdgeWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-edge/workflow-version-edge.workspace-service';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@CoreResolver()
@UsePipes(ResolverValidationPipe)
@@ -30,6 +31,7 @@ import { WorkflowVersionEdgeWorkspaceService } from 'src/modules/workflow/workfl
PreventNestToAutoLogGraphqlErrorsFilter,
WorkflowVersionEdgeGraphqlApiExceptionFilter,
WorkflowVersionValidationGraphqlApiExceptionFilter,
+ AuthGraphqlApiExceptionFilter,
)
export class WorkflowVersionEdgeResolver {
constructor(
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 f9170e6e8ff..9cbf1cc2d2a 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
@@ -33,6 +33,7 @@ import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-module
import { WorkflowVersionStepWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.workspace-service';
import { WorkflowRunWorkspaceService } from 'src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service';
import { WorkflowRunnerWorkspaceService } from 'src/modules/workflow/workflow-runner/workspace-services/workflow-runner.workspace-service';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@CoreResolver()
@UsePipes(ResolverValidationPipe)
@@ -46,6 +47,7 @@ import { WorkflowRunnerWorkspaceService } from 'src/modules/workflow/workflow-ru
PreventNestToAutoLogGraphqlErrorsFilter,
WorkflowVersionStepGraphqlApiExceptionFilter,
WorkflowVersionValidationGraphqlApiExceptionFilter,
+ AuthGraphqlApiExceptionFilter,
)
export class WorkflowVersionStepResolver {
constructor(
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 0c3a0a4c02c..43151fa8d24 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
@@ -22,6 +22,7 @@ import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-module
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';
import { WorkflowVersionWorkspaceService } from 'src/modules/workflow/workflow-builder/workflow-version/workflow-version.workspace-service';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@CoreResolver()
@UsePipes(ResolverValidationPipe)
@@ -34,6 +35,7 @@ import { WorkflowVersionWorkspaceService } from 'src/modules/workflow/workflow-b
PermissionsGraphqlApiExceptionFilter,
PreventNestToAutoLogGraphqlErrorsFilter,
WorkflowVersionValidationGraphqlApiExceptionFilter,
+ AuthGraphqlApiExceptionFilter,
)
export class WorkflowVersionResolver {
constructor(
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 af26645f54b..95079c17a7e 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
@@ -7,12 +7,14 @@ import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorato
import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { SendInvitationsDTO } from 'src/engine/core-modules/workspace-invitation/dtos/send-invitations.dto';
import { WorkspaceInvitation } from 'src/engine/core-modules/workspace-invitation/dtos/workspace-invitation.dto';
import { WorkspaceInvitationService } from 'src/engine/core-modules/workspace-invitation/services/workspace-invitation.service';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
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';
@@ -31,6 +33,7 @@ import { SendInvitationsInput } from './dtos/send-invitations.input';
@UseFilters(
PermissionsGraphqlApiExceptionFilter,
PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
)
@MetadataResolver()
export class WorkspaceInvitationResolver {
@@ -88,6 +91,7 @@ export class WorkspaceInvitationResolver {
@Mutation(() => SendInvitationsDTO)
@UseGuards(UserAuthGuard)
+ @AllowSuspendedWorkspace()
async sendInvitations(
@Args() sendInviteLinkInput: SendInvitationsInput,
@AuthUser() user: AuthContextUser,
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/utils/__tests__/is-workspace-suspended.util.spec.ts b/packages/twenty-server/src/engine/core-modules/workspace/utils/__tests__/is-workspace-suspended.util.spec.ts
new file mode 100644
index 00000000000..3216a08dc69
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/workspace/utils/__tests__/is-workspace-suspended.util.spec.ts
@@ -0,0 +1,47 @@
+import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
+
+import { isWorkspaceSuspended } from 'src/engine/core-modules/workspace/utils/is-workspace-suspended.util';
+
+describe('isWorkspaceSuspended', () => {
+ it.each([
+ WorkspaceActivationStatus.SUSPENDED,
+ WorkspaceActivationStatus.INACTIVE,
+ ])('should return true when the workspace is %s', (activationStatus) => {
+ expect(
+ isWorkspaceSuspended({ activationStatus, deletedAt: undefined }),
+ ).toBe(true);
+ });
+
+ it.each([
+ WorkspaceActivationStatus.ACTIVE,
+ WorkspaceActivationStatus.CREATED,
+ WorkspaceActivationStatus.PENDING_CREATION,
+ WorkspaceActivationStatus.ONGOING_CREATION,
+ ])('should return false when the workspace is %s', (activationStatus) => {
+ expect(
+ isWorkspaceSuspended({ activationStatus, deletedAt: undefined }),
+ ).toBe(false);
+ });
+
+ it.each([
+ WorkspaceActivationStatus.SUSPENDED,
+ WorkspaceActivationStatus.INACTIVE,
+ ])(
+ 'should return false when a %s workspace is soft deleted',
+ (activationStatus) => {
+ expect(
+ isWorkspaceSuspended({
+ activationStatus,
+ deletedAt: '2026-09-16T10:00:00.000Z',
+ }),
+ ).toBe(false);
+ },
+ );
+
+ it.each([null, undefined])(
+ 'should return false when the workspace is %s',
+ (workspace) => {
+ expect(isWorkspaceSuspended(workspace)).toBe(false);
+ },
+ );
+});
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/utils/is-workspace-suspended.util.ts b/packages/twenty-server/src/engine/core-modules/workspace/utils/is-workspace-suspended.util.ts
new file mode 100644
index 00000000000..e4ee1c8a2f7
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/workspace/utils/is-workspace-suspended.util.ts
@@ -0,0 +1,21 @@
+import { isDefined } from 'twenty-shared/utils';
+import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
+
+import { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flat-workspace.type';
+
+const SUSPENDED_WORKSPACE_ACTIVATION_STATUSES: WorkspaceActivationStatus[] = [
+ WorkspaceActivationStatus.SUSPENDED,
+ WorkspaceActivationStatus.INACTIVE,
+];
+
+export const isWorkspaceSuspended = (
+ workspace:
+ | Pick<FlatWorkspace, 'activationStatus' | 'deletedAt'>
+ | null
+ | undefined,
+): boolean =>
+ isDefined(workspace) &&
+ SUSPENDED_WORKSPACE_ACTIVATION_STATUSES.includes(
+ workspace.activationStatus,
+ ) &&
+ !isDefined(workspace.deletedAt);
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 b5a8d190436..fd173852378 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
@@ -20,6 +20,7 @@ import { ApplicationService } from 'src/engine/core-modules/application/applicat
import { ApplicationDTO } from 'src/engine/core-modules/application/dtos/application.dto';
import { fromFlatApplicationToApplicationDto } from 'src/engine/core-modules/application/utils/from-flat-application-to-application-dto.util';
import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { BillingEntitlementDTO } from 'src/engine/core-modules/billing/dtos/billing-entitlement.dto';
import { BillingCustomerEntity } from 'src/engine/core-modules/billing/entities/billing-customer.entity';
import { BillingSubscriptionEntity } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
@@ -58,6 +59,7 @@ import { AuthApiKey } from 'src/engine/decorators/auth/auth-api-key.decorator';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
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 { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
@@ -84,6 +86,7 @@ const OriginHeader = createParamDecorator(
@UseFilters(
PreventNestToAutoLogGraphqlErrorsFilter,
PermissionsGraphqlApiExceptionFilter,
+ AuthGraphqlApiExceptionFilter,
)
export class WorkspaceResolver {
constructor(
@@ -165,6 +168,7 @@ export class WorkspaceResolver {
WorkspaceAuthGuard,
SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
)
+ @AllowSuspendedWorkspace()
async deleteCurrentWorkspace(@AuthWorkspace() { id }: WorkspaceEntity) {
await this.workspaceService.suspendWorkspace(id);
return this.workspaceService.deleteWorkspace(id, true);
@@ -344,6 +348,7 @@ export class WorkspaceResolver {
@Query(() => PublicWorkspaceDataDTO)
@UseGuards(PublicEndpointGuard, NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async getPublicWorkspaceDataByDomain(
@OriginHeader() originHeader: string,
@Args('origin', { nullable: true }) origin?: string,
diff --git a/packages/twenty-server/src/engine/decorators/auth/allow-suspended-workspace.decorator.ts b/packages/twenty-server/src/engine/decorators/auth/allow-suspended-workspace.decorator.ts
new file mode 100644
index 00000000000..1f11bbce60f
--- /dev/null
+++ b/packages/twenty-server/src/engine/decorators/auth/allow-suspended-workspace.decorator.ts
@@ -0,0 +1,6 @@
+import { SetMetadata } from '@nestjs/common';
+
+import { ALLOW_SUSPENDED_WORKSPACE_KEY } from 'src/engine/guards/constants/allow-suspended-workspace-key.constant';
+
+export const AllowSuspendedWorkspace = () =>
+ SetMetadata(ALLOW_SUSPENDED_WORKSPACE_KEY, true);
diff --git a/packages/twenty-server/src/engine/guards/__tests__/workspace-not-suspended.guard.spec.ts b/packages/twenty-server/src/engine/guards/__tests__/workspace-not-suspended.guard.spec.ts
new file mode 100644
index 00000000000..266d1acb70e
--- /dev/null
+++ b/packages/twenty-server/src/engine/guards/__tests__/workspace-not-suspended.guard.spec.ts
@@ -0,0 +1,163 @@
+import { type ExecutionContext } from '@nestjs/common';
+import { Reflector } from '@nestjs/core';
+import { GqlExecutionContext } from '@nestjs/graphql';
+
+import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
+
+import {
+ AuthException,
+ AuthExceptionCode,
+} from 'src/engine/core-modules/auth/auth.exception';
+import { ALLOW_SUSPENDED_WORKSPACE_KEY } from 'src/engine/guards/constants/allow-suspended-workspace-key.constant';
+import { WorkspaceNotSuspendedGuard } from 'src/engine/guards/workspace-not-suspended.guard';
+
+const SUSPENDED_STATUSES = [
+ WorkspaceActivationStatus.SUSPENDED,
+ WorkspaceActivationStatus.INACTIVE,
+];
+
+const buildContext = ({
+ workspace,
+ type = 'graphql',
+ operation = 'query',
+ isSuspendedWorkspaceAllowed = false,
+}: {
+ workspace: Record<string, unknown> | undefined;
+ type?: string;
+ operation?: string;
+ isSuspendedWorkspaceAllowed?: boolean;
+}) => {
+ const reflector = new Reflector();
+
+ jest
+ .spyOn(reflector, 'getAllAndOverride')
+ .mockImplementation((key) =>
+ key === ALLOW_SUSPENDED_WORKSPACE_KEY
+ ? isSuspendedWorkspaceAllowed
+ : undefined,
+ );
+
+ jest.spyOn(GqlExecutionContext, 'create').mockReturnValue({
+ getContext: () => ({ req: { workspace } }),
+ getInfo: () => ({ operation: { operation } }),
+ } as any);
+
+ const context = {
+ getType: () => type,
+ getHandler: () => jest.fn(),
+ getClass: () => jest.fn(),
+ switchToHttp: () => ({ getRequest: () => ({ workspace }) }),
+ } as unknown as ExecutionContext;
+
+ return { guard: new WorkspaceNotSuspendedGuard(reflector), context };
+};
+
+const expectSuspendedThrow = (run: () => boolean) => {
+ expect(run).toThrow(AuthException);
+ expect(run).toThrow(
+ expect.objectContaining({ code: AuthExceptionCode.WORKSPACE_SUSPENDED }),
+ );
+};
+
+describe('WorkspaceNotSuspendedGuard', () => {
+ afterEach(() => {
+ jest.restoreAllMocks();
+ });
+
+ it.each([
+ WorkspaceActivationStatus.ACTIVE,
+ WorkspaceActivationStatus.CREATED,
+ WorkspaceActivationStatus.PENDING_CREATION,
+ WorkspaceActivationStatus.ONGOING_CREATION,
+ ])('should let a %s workspace through', (activationStatus) => {
+ const { guard, context } = buildContext({
+ workspace: { id: 'workspace-id', activationStatus },
+ operation: 'mutation',
+ });
+
+ expect(guard.canActivate(context)).toBe(true);
+ });
+
+ it('should let an unauthenticated request through', () => {
+ const { guard, context } = buildContext({ workspace: undefined });
+
+ expect(guard.canActivate(context)).toBe(true);
+ });
+
+ it.each(SUSPENDED_STATUSES)(
+ 'should refuse an undeclared query on a %s workspace',
+ (activationStatus) => {
+ const { guard, context } = buildContext({
+ workspace: { id: 'workspace-id', activationStatus },
+ operation: 'query',
+ });
+
+ expectSuspendedThrow(() => guard.canActivate(context));
+ },
+ );
+
+ it.each(SUSPENDED_STATUSES)(
+ 'should refuse an undeclared mutation on a %s workspace',
+ (activationStatus) => {
+ const { guard, context } = buildContext({
+ workspace: { id: 'workspace-id', activationStatus },
+ operation: 'mutation',
+ });
+
+ expectSuspendedThrow(() => guard.canActivate(context));
+ },
+ );
+
+ it.each(SUSPENDED_STATUSES)(
+ 'should refuse an undeclared subscription on a %s workspace',
+ (activationStatus) => {
+ const { guard, context } = buildContext({
+ workspace: { id: 'workspace-id', activationStatus },
+ operation: 'subscription',
+ });
+
+ expectSuspendedThrow(() => guard.canActivate(context));
+ },
+ );
+
+ it.each(SUSPENDED_STATUSES)(
+ 'should refuse an undeclared http request on a %s workspace',
+ (activationStatus) => {
+ const { guard, context } = buildContext({
+ workspace: { id: 'workspace-id', activationStatus },
+ type: 'http',
+ });
+
+ expectSuspendedThrow(() => guard.canActivate(context));
+ },
+ );
+
+ it.each(SUSPENDED_STATUSES)(
+ 'should let a declared handler through on a %s workspace',
+ (activationStatus) => {
+ const { guard, context } = buildContext({
+ workspace: { id: 'workspace-id', activationStatus },
+ operation: 'mutation',
+ isSuspendedWorkspaceAllowed: true,
+ });
+
+ expect(guard.canActivate(context)).toBe(true);
+ },
+ );
+
+ it.each(SUSPENDED_STATUSES)(
+ 'should let a soft deleted %s workspace through',
+ (activationStatus) => {
+ const { guard, context } = buildContext({
+ workspace: {
+ id: 'workspace-id',
+ activationStatus,
+ deletedAt: '2026-09-16T10:00:00.000Z',
+ },
+ operation: 'mutation',
+ });
+
+ expect(guard.canActivate(context)).toBe(true);
+ },
+ );
+});
diff --git a/packages/twenty-server/src/engine/guards/constants/allow-suspended-workspace-key.constant.ts b/packages/twenty-server/src/engine/guards/constants/allow-suspended-workspace-key.constant.ts
new file mode 100644
index 00000000000..ca82bbd563c
--- /dev/null
+++ b/packages/twenty-server/src/engine/guards/constants/allow-suspended-workspace-key.constant.ts
@@ -0,0 +1 @@
+export const ALLOW_SUSPENDED_WORKSPACE_KEY = 'ALLOW_SUSPENDED_WORKSPACE';
diff --git a/packages/twenty-server/src/engine/guards/workspace-not-suspended.guard.ts b/packages/twenty-server/src/engine/guards/workspace-not-suspended.guard.ts
new file mode 100644
index 00000000000..7010f623943
--- /dev/null
+++ b/packages/twenty-server/src/engine/guards/workspace-not-suspended.guard.ts
@@ -0,0 +1,45 @@
+import {
+ type CanActivate,
+ type ExecutionContext,
+ Injectable,
+} from '@nestjs/common';
+import { Reflector } from '@nestjs/core';
+
+import {
+ AuthException,
+ AuthExceptionCode,
+} from 'src/engine/core-modules/auth/auth.exception';
+import { isWorkspaceSuspended } from 'src/engine/core-modules/workspace/utils/is-workspace-suspended.util';
+import { ALLOW_SUSPENDED_WORKSPACE_KEY } from 'src/engine/guards/constants/allow-suspended-workspace-key.constant';
+import { getRequest } from 'src/utils/extract-request';
+
+@Injectable()
+export class WorkspaceNotSuspendedGuard implements CanActivate {
+ constructor(private readonly reflector: Reflector) {}
+
+ canActivate(context: ExecutionContext): boolean {
+ const request = getRequest(context);
+
+ if (!isWorkspaceSuspended(request?.workspace)) {
+ return true;
+ }
+
+ if (this.isAllowedWhenSuspended(context)) {
+ return true;
+ }
+
+ throw new AuthException(
+ 'Workspace is suspended',
+ AuthExceptionCode.WORKSPACE_SUSPENDED,
+ );
+ }
+
+ private isAllowedWhenSuspended(context: ExecutionContext): boolean {
+ return (
+ this.reflector.getAllAndOverride<boolean>(ALLOW_SUSPENDED_WORKSPACE_KEY, [
+ context.getHandler(),
+ context.getClass(),
+ ]) === 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 8d983845ed5..cdc9bed0f9a 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
@@ -18,12 +18,14 @@ import { RunAgentInputDTO } from 'src/engine/metadata-modules/ai/ai-agent-execut
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))
@UseInterceptors(AiGraphqlApiExceptionInterceptor)
@UseFilters(
UsageLimitGraphqlApiExceptionFilter,
BillingGraphqlApiExceptionFilter,
+ AuthGraphqlApiExceptionFilter,
)
// TODO(@abdulrahmancodes): install ResolverValidationPipe here; without it every
// class-validator decorator on RunAgentInputDTO is inert. Enabling it rejects the
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 c18ed2f0c24..06a7fa2237d 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
@@ -1,4 +1,4 @@
-import { Logger, UseGuards } from '@nestjs/common';
+import { Logger, UseGuards, UseFilters } from '@nestjs/common';
import { Args, Mutation, Query } from '@nestjs/graphql';
import { msg } from '@lingui/core/macro';
@@ -24,11 +24,13 @@ import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.serv
import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(
WorkspaceAuthGuard,
SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS),
)
@MetadataResolver()
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class AgentTurnResolver {
private readonly logger = new Logger(AgentTurnResolver.name);
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 3bd05ad0adf..bb8fcc1c096 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
@@ -1,4 +1,4 @@
-import { UseGuards, UseInterceptors } from '@nestjs/common';
+import { UseGuards, UseInterceptors, UseFilters } from '@nestjs/common';
import { Args, Mutation, Query } from '@nestjs/graphql';
import { PermissionFlagType } from 'twenty-shared/constants';
@@ -20,6 +20,7 @@ import { AgentDTO } from './dtos/agent.dto';
import { CreateAgentInput } from './dtos/create-agent.input';
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))
@UseInterceptors(
@@ -27,6 +28,7 @@ import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai
AiGraphqlApiExceptionInterceptor,
)
@MetadataResolver()
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class AgentResolver {
constructor(
private readonly agentService: AgentService,
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 dd8b2714200..778d660a929 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
@@ -19,6 +19,7 @@ import { toDisplayCredits } from 'src/engine/core-modules/usage/utils/to-display
import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { 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 { AgentMessageDTO } from 'src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message.dto';
@@ -49,12 +50,14 @@ import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
import { getChatModelId } from 'src/engine/metadata-modules/ai/ai-models/utils/get-chat-model-id.util';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(WorkspaceAuthGuard, SettingsPermissionGuard(PermissionFlagType.AI))
@UseInterceptors(AiGraphqlApiExceptionInterceptor)
@UseFilters(
UsageLimitGraphqlApiExceptionFilter,
BillingGraphqlApiExceptionFilter,
+ AuthGraphqlApiExceptionFilter,
)
@MetadataResolver(() => AgentChatThreadDTO)
export class AgentChatResolver {
@@ -71,6 +74,7 @@ export class AgentChatResolver {
) {}
@Query(() => [AgentChatThreadDTO])
+ @AllowSuspendedWorkspace()
async chatThreads(
@AuthUserWorkspaceId() userWorkspaceId: string,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
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 a3bd6ac4571..01898f4264a 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
@@ -1,4 +1,4 @@
-import { UseGuards, UseInterceptors } from '@nestjs/common';
+import { UseGuards, UseInterceptors, UseFilters } from '@nestjs/common';
import { Args, Mutation } from '@nestjs/graphql';
import GraphQLJSON from 'graphql-type-json';
@@ -10,6 +10,7 @@ import {
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { matchWorkspacePersonEnrichmentToUserEmail } from 'src/engine/core-modules/company-enrichment/utils/match-workspace-person-enrichment-to-user-email.util';
import { sanitizeWorkspaceCompanyEnrichment } from 'src/engine/core-modules/company-enrichment/utils/sanitize-workspace-company-enrichment.util';
import { sanitizeWorkspacePersonEnrichment } from 'src/engine/core-modules/company-enrichment/utils/sanitize-workspace-person-enrichment.util';
@@ -31,6 +32,7 @@ import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai
)
@UseInterceptors(AiGraphqlApiExceptionInterceptor)
@MetadataResolver()
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class WorkspaceSetupChatResolver {
constructor(
private readonly workspaceSetupChatService: WorkspaceSetupChatService,
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 adf45c6436a..56bae7b37fd 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
@@ -26,6 +26,7 @@ import { buildReasoningProviderOptions } from 'src/engine/metadata-modules/ai/ai
import { buildAiTelemetry } from 'src/engine/metadata-modules/ai/ai-models/utils/build-ai-telemetry.util';
import { withDedicatedAiTrace } from 'src/engine/metadata-modules/ai/ai-models/utils/with-dedicated-ai-trace.util';
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';
import { AUTO_SELECT_MODEL_ID_BY_TIER } from 'twenty-shared/ai';
@Controller(`${ApiPath.Rest}/ai`)
@@ -36,6 +37,7 @@ import { AUTO_SELECT_MODEL_ID_BY_TIER } from 'twenty-shared/ai';
AiRestApiExceptionFilter,
UsageLimitRestApiExceptionFilter,
BillingRestApiExceptionFilter,
+ AuthRestApiExceptionFilter,
)
export class AiGenerateTextController {
constructor(
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 4c36444f49a..8fa2edee7ba 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
@@ -1,4 +1,4 @@
-import { UseGuards, UseInterceptors } from '@nestjs/common';
+import { UseGuards, UseInterceptors, UseFilters } from '@nestjs/common';
import { Args, Mutation, Query } from '@nestjs/graphql';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
@@ -6,16 +6,19 @@ import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorato
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { 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 { 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)
@UseInterceptors(CalendarChannelGraphqlApiExceptionInterceptor)
@MetadataResolver(() => CalendarChannelDTO)
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class CalendarChannelResolver {
constructor(
private readonly calendarChannelMetadataService: CalendarChannelMetadataService,
@@ -23,6 +26,7 @@ export class CalendarChannelResolver {
@Query(() => [CalendarChannelDTO])
@UseGuards(NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async myCalendarChannels(
@AuthWorkspace() workspace: WorkspaceEntity,
@AuthUserWorkspaceId() userWorkspaceId: string,
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 29734cca16e..65d56756fbd 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
@@ -1,4 +1,4 @@
-import { UseGuards, UseInterceptors } from '@nestjs/common';
+import { UseGuards, UseInterceptors, UseFilters } from '@nestjs/common';
import {
Args,
Context,
@@ -15,6 +15,7 @@ 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 { 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';
@@ -26,6 +27,7 @@ import { CommandMenuItemGraphqlApiExceptionInterceptor } from 'src/engine/metada
import { FrontComponentDTO } from 'src/engine/metadata-modules/front-component/dtos/front-component.dto';
import { FrontComponentService } from 'src/engine/metadata-modules/front-component/front-component.service';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(WorkspaceAuthGuard)
@UseInterceptors(
@@ -33,6 +35,7 @@ import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/wor
CommandMenuItemGraphqlApiExceptionInterceptor,
)
@MetadataResolver(() => CommandMenuItemDTO)
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class CommandMenuItemResolver {
constructor(
private readonly commandMenuItemService: CommandMenuItemService,
@@ -106,6 +109,7 @@ export class CommandMenuItemResolver {
@Query(() => [CommandMenuItemDTO])
@UseGuards(NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async commandMenuItems(
@AuthWorkspace() workspace: WorkspaceEntity,
): Promise<CommandMenuItemDTO[]> {
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 429d2940706..cffd2685f73 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
@@ -1,4 +1,4 @@
-import { UseGuards, UseInterceptors } from '@nestjs/common';
+import { UseGuards, UseInterceptors, UseFilters } from '@nestjs/common';
import { Args, Mutation, Query } from '@nestjs/graphql';
import { PermissionFlagType } from 'twenty-shared/constants';
@@ -10,6 +10,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
@@ -20,10 +21,12 @@ import { ConnectedAccountPublicDTO } from 'src/engine/metadata-modules/connected
import { ConnectedAccountDTO } from 'src/engine/metadata-modules/connected-account/dtos/connected-account.dto';
import { ConnectedAccountGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/connected-account/interceptors/connected-account-graphql-api-exception.interceptor';
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)
@UseInterceptors(ConnectedAccountGraphqlApiExceptionInterceptor)
@MetadataResolver(() => ConnectedAccountDTO)
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class ConnectedAccountResolver {
constructor(
private readonly connectedAccountMetadataService: ConnectedAccountMetadataService,
@@ -31,6 +34,7 @@ export class ConnectedAccountResolver {
@Query(() => [ConnectedAccountPublicDTO])
@UseGuards(NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async myConnectedAccounts(
@AuthWorkspace() workspace: WorkspaceEntity,
@AuthUserWorkspaceId() userWorkspaceId: string,
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 8b5140dfc10..e03887b73d5 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
@@ -56,6 +56,7 @@ import {
import { FlatEntityMapsRestApiExceptionFilter } from 'src/engine/metadata-modules/flat-entity/filters/flat-entity-maps-rest-api-exception.filter';
import { fromFlatFieldMetadataToFieldMetadataDto } from 'src/engine/metadata-modules/flat-field-metadata/utils/from-flat-field-metadata-to-field-metadata-dto.util';
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';
@Controller(`${ApiPath.Rest}/metadata/fields`)
@UseGuards(
@@ -68,6 +69,7 @@ import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/p
FieldMetadataRestApiExceptionFilter,
ApplicationRestApiExceptionFilter,
FlatEntityMapsRestApiExceptionFilter,
+ AuthRestApiExceptionFilter,
)
@UsePipes(new ValidationPipe())
export class FieldMetadataController {
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 1b2cf989dc2..b3858175c41 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
@@ -52,6 +52,7 @@ import { fromFlatFieldMetadataToFieldMetadataDto } from 'src/engine/metadata-mod
import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
// Keep @Parent() structurally typed so ResolverValidationPipe does not validate
// FieldMetadataDTO date decorators on already-loaded parent records.
@@ -66,6 +67,7 @@ type FieldMetadataStandardOverrideParent = Pick<
@UseFilters(
PermissionsGraphqlApiExceptionFilter,
PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
)
export class FieldMetadataResolver {
constructor(
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 17a50ca848d..e31f695bd34 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
@@ -22,6 +22,7 @@ import { setFileResponseHeaders } from 'src/engine/core-modules/file/utils/set-f
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
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 { FlatEntityMapsRestApiExceptionFilter } from 'src/engine/metadata-modules/flat-entity/filters/flat-entity-maps-rest-api-exception.filter';
@@ -35,6 +36,7 @@ import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/p
import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/front-components`)
+@AllowSuspendedWorkspace()
@UseGuards(WorkspaceAuthGuard)
@UseFilters(
PermissionsRestApiExceptionFilter,
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 13f45d1519d..5b8d6f865ea 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
@@ -1,4 +1,4 @@
-import { Inject, UseGuards, UseInterceptors } from '@nestjs/common';
+import { Inject, UseGuards, UseInterceptors, UseFilters } from '@nestjs/common';
import { Args, Mutation, Parent, Query, ResolveField } from '@nestjs/graphql';
import { PermissionFlagType } from 'twenty-shared/constants';
@@ -8,10 +8,12 @@ import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/
import { ApplicationVariableEntityService } from 'src/engine/core-modules/application/application-variable/application-variable.service';
import { ApplicationTokenService } from 'src/engine/core-modules/auth/token/services/application-token.service';
import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
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 { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
@@ -31,6 +33,7 @@ import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/wor
FrontComponentGraphqlApiExceptionInterceptor,
)
@MetadataResolver(() => FrontComponentDTO)
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class FrontComponentResolver {
constructor(
@Inject(FrontComponentService)
@@ -59,6 +62,7 @@ export class FrontComponentResolver {
@Query(() => [FrontComponentDTO])
@UseGuards(NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async frontComponents(
@AuthWorkspace() workspace: WorkspaceEntity,
): Promise<FrontComponentDTO[]> {
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 4a627f05bf6..7f00011296b 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
@@ -20,6 +20,7 @@ import { IndexMetadataService } from 'src/engine/metadata-modules/index-metadata
import { indexMetadataGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/index-metadata/utils/index-metadata-graphql-api-exception-handler.util';
import { objectMetadataGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/object-metadata/utils/object-metadata-graphql-api-exception-handler.util';
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)
@MetadataResolver(() => IndexMetadataDTO)
@@ -27,6 +28,7 @@ import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-module
@UseFilters(
PreventNestToAutoLogGraphqlErrorsFilter,
PermissionsGraphqlApiExceptionFilter,
+ AuthGraphqlApiExceptionFilter,
)
export class IndexMetadataResolver {
constructor(private readonly indexMetadataService: IndexMetadataService) {}
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 676887afce4..50ca01557ef 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
@@ -10,9 +10,11 @@ import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';
import { 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';
@@ -40,7 +42,10 @@ import { EventLogLiveService } from 'src/engine/core-modules/event-logs/live/eve
@UseGuards(WorkspaceAuthGuard, FeatureFlagGuard, NoPermissionGuard)
@MetadataResolver()
@UsePipes(ResolverValidationPipe)
-@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)
+@UseFilters(
+ PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
+)
export class LogicFunctionResolver {
constructor(
private readonly logicFunctionFromSourceService: LogicFunctionFromSourceService,
@@ -75,6 +80,7 @@ export class LogicFunctionResolver {
}
@Query(() => [LogicFunctionDTO])
+ @AllowSuspendedWorkspace()
async findManyLogicFunctions(
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
): Promise<LogicFunctionDTO[]> {
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 73fe84f8d51..9466e3274a6 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
@@ -1,4 +1,9 @@
-import { UseGuards, UseInterceptors, UsePipes } from '@nestjs/common';
+import {
+ UseGuards,
+ UseInterceptors,
+ UsePipes,
+ UseFilters,
+} from '@nestjs/common';
import { Args, Mutation, Query } from '@nestjs/graphql';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
@@ -17,11 +22,13 @@ import { MessageChannelDTO } from 'src/engine/metadata-modules/message-channel/d
import { UpdateAppMessageChannelInput } from 'src/engine/metadata-modules/message-channel/dtos/update-app-message-channel.input';
import { MessageChannelGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/message-channel/interceptors/message-channel-graphql-api-exception.interceptor';
import { ApplicationMessageChannelsService } from 'src/engine/metadata-modules/message-channel/services/application-message-channels.service';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(WorkspaceAuthGuard, NoPermissionGuard)
@UseInterceptors(MessageChannelGraphqlApiExceptionInterceptor)
@UsePipes(ResolverValidationPipe)
@MetadataResolver()
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class ApplicationMessageChannelsResolver {
constructor(
private readonly applicationMessageChannelsService: ApplicationMessageChannelsService,
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 56615fb4391..c9a2aaa1929 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
@@ -1,4 +1,9 @@
-import { UseGuards, UseInterceptors, UsePipes } from '@nestjs/common';
+import {
+ UseGuards,
+ UseInterceptors,
+ UsePipes,
+ UseFilters,
+} from '@nestjs/common';
import { Args, Mutation } from '@nestjs/graphql';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
@@ -14,11 +19,13 @@ import { IngestAppMessagesInput } from 'src/engine/metadata-modules/message-chan
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)
@UseInterceptors(MessageChannelGraphqlApiExceptionInterceptor)
@UsePipes(ResolverValidationPipe)
@MetadataResolver()
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class ApplicationMessageIngestionResolver {
constructor(
private readonly applicationMessageIngestionService: ApplicationMessageIngestionService,
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 7cffbe178c4..a0b4e51e39e 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
@@ -1,4 +1,4 @@
-import { UseGuards, UseInterceptors } from '@nestjs/common';
+import { UseGuards, UseInterceptors, UseFilters } from '@nestjs/common';
import { Args, Mutation, Parent, Query, ResolveField } from '@nestjs/graphql';
import { InjectRepository } from '@nestjs/typeorm';
@@ -15,6 +15,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
@@ -36,6 +37,7 @@ import {
} from 'src/engine/metadata-modules/message-channel/message-channel.exception';
import { MessageFolderEntity } from 'src/engine/metadata-modules/message-folder/entities/message-folder.entity';
import { MessagingProcessGroupEmailActionsService } from 'src/modules/messaging/message-import-manager/services/messaging-process-group-email-actions.service';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import {
MessageChannelPendingGroupEmailsAction,
MessageChannelSyncStage,
@@ -46,6 +48,7 @@ import {
@UseGuards(WorkspaceAuthGuard)
@UseInterceptors(MessageChannelGraphqlApiExceptionInterceptor)
@MetadataResolver(() => MessageChannelDTO)
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class MessageChannelResolver {
constructor(
private readonly messageChannelMetadataService: MessageChannelMetadataService,
@@ -113,6 +116,7 @@ export class MessageChannelResolver {
@Query(() => [MessageChannelDTO])
@UseGuards(NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async myMessageChannels(
@AuthWorkspace() workspace: WorkspaceEntity,
@AuthUserWorkspaceId() userWorkspaceId: string,
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 6958c7e512c..4e083f5c99b 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
@@ -1,4 +1,4 @@
-import { UseGuards, UseInterceptors } from '@nestjs/common';
+import { UseGuards, UseInterceptors, UseFilters } from '@nestjs/common';
import { Args, Mutation, Query } from '@nestjs/graphql';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
@@ -15,10 +15,12 @@ import {
} from 'src/engine/metadata-modules/message-folder/dtos/update-message-folder.input';
import { MessageFolderGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/message-folder/interceptors/message-folder-graphql-api-exception.interceptor';
import { MessageFolderMetadataService } from 'src/engine/metadata-modules/message-folder/message-folder-metadata.service';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(WorkspaceAuthGuard)
@UseInterceptors(MessageFolderGraphqlApiExceptionInterceptor)
@MetadataResolver(() => MessageFolderDTO)
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class MessageFolderResolver {
constructor(
private readonly messageFolderMetadataService: MessageFolderMetadataService,
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 f0c24d2bf73..61c8c157f06 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
@@ -6,6 +6,7 @@ import { type I18nContext } from 'src/engine/core-modules/i18n/types/i18n-contex
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { 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 { MinimalMetadataDTO } from 'src/engine/metadata-modules/minimal-metadata/dtos/minimal-metadata.dto';
@@ -19,6 +20,7 @@ export class MinimalMetadataResolver {
) {}
@Query(() => MinimalMetadataDTO)
+ @AllowSuspendedWorkspace()
async minimalMetadata(
@AuthWorkspace() workspace: WorkspaceEntity,
@AuthUserWorkspaceId({ allowUndefined: true })
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 1250d56d236..9a972729599 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
@@ -1,4 +1,4 @@
-import { UseGuards, UseInterceptors } from '@nestjs/common';
+import { UseGuards, UseInterceptors, UseFilters } from '@nestjs/common';
import {
Args,
Context,
@@ -15,12 +15,14 @@ import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/
import { ApiKeyEntity } from 'src/engine/core-modules/api-key/api-key.entity';
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
import { getWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { type I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.type';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
import { AuthApiKey } from 'src/engine/decorators/auth/auth-api-key.decorator';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';
import { 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';
@@ -40,6 +42,7 @@ import { ApplicationTranslationCatalogService } from 'src/engine/metadata-module
NavigationMenuItemGraphqlApiExceptionInterceptor,
)
@MetadataResolver(() => NavigationMenuItemDTO)
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class NavigationMenuItemResolver {
constructor(
private readonly navigationMenuItemService: NavigationMenuItemService,
@@ -78,6 +81,7 @@ export class NavigationMenuItemResolver {
@Query(() => [NavigationMenuItemDTO])
@UseGuards(NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async navigationMenuItems(
@AuthWorkspace() workspace: WorkspaceEntity,
@AuthUserWorkspaceId({ allowUndefined: true })
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 0ed3170369a..3d40ff44bc9 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
@@ -58,6 +58,7 @@ import {
toLegacyObjectMetadataUpdateResponse,
} from 'src/engine/metadata-modules/object-metadata/utils/to-legacy-object-metadata-response.util';
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';
@Controller(`${ApiPath.Rest}/metadata/objects`)
@UseGuards(
@@ -70,6 +71,7 @@ import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/p
ObjectMetadataRestApiExceptionFilter,
ApplicationRestApiExceptionFilter,
FlatEntityMapsRestApiExceptionFilter,
+ AuthRestApiExceptionFilter,
)
@UsePipes(new ValidationPipe())
export class ObjectMetadataController {
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 df04bec8824..063a4423382 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
@@ -22,6 +22,7 @@ import { I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.typ
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 { 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';
@@ -59,6 +60,7 @@ import { SearchFieldMetadataDTO } from 'src/engine/metadata-modules/search-field
import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
import { fromObjectMetadataEntityToObjectMetadataDto } from 'src/engine/metadata-modules/object-metadata/utils/from-object-metadata-entity-to-object-metadata-dto.util';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(WorkspaceAuthGuard)
@MetadataResolver(() => ObjectMetadataDTO)
@@ -66,6 +68,7 @@ import { fromObjectMetadataEntityToObjectMetadataDto } from 'src/engine/metadata
@UseFilters(
PreventNestToAutoLogGraphqlErrorsFilter,
PermissionsGraphqlApiExceptionFilter,
+ AuthGraphqlApiExceptionFilter,
)
export class ObjectMetadataResolver {
constructor(
@@ -79,6 +82,7 @@ export class ObjectMetadataResolver {
@UseGuards(NoPermissionGuard)
@Query(() => ObjectConnectionDTO)
+ @AllowSuspendedWorkspace()
async objects(
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@Args('paging', {
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 4e134db945e..390d96a9e2e 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
@@ -40,6 +40,7 @@ import { PageLayoutTabRestApiExceptionFilter } from 'src/engine/metadata-modules
import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service';
import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';
import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';
+import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/pageLayoutTabs`)
@UseGuards(WorkspaceAuthGuard)
@@ -48,6 +49,7 @@ import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/works
PageLayoutTabRestApiExceptionFilter,
FlatEntityMapsRestApiExceptionFilter,
WorkspaceMigrationRunnerRestApiExceptionFilter,
+ AuthRestApiExceptionFilter,
)
export class PageLayoutTabController {
constructor(
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 2fcb780cc5f..ac7555ede45 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
@@ -32,10 +32,11 @@ import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/over
import { PageLayoutGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception.filter';
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';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@MetadataResolver(() => PageLayoutTabDTO)
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
-@UseFilters(PageLayoutGraphqlApiExceptionFilter)
+@UseFilters(PageLayoutGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
@UseGuards(WorkspaceAuthGuard)
@UsePipes(ResolverValidationPipe)
export class PageLayoutTabResolver {
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 e287f3cc569..a72d6c1691f 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
@@ -40,6 +40,7 @@ import { PageLayoutWidgetRestApiExceptionFilter } from 'src/engine/metadata-modu
import { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service';
import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';
import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';
+import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/pageLayoutWidgets`)
@UseGuards(WorkspaceAuthGuard)
@@ -48,6 +49,7 @@ import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/works
PageLayoutWidgetRestApiExceptionFilter,
FlatEntityMapsRestApiExceptionFilter,
WorkspaceMigrationRunnerRestApiExceptionFilter,
+ AuthRestApiExceptionFilter,
)
export class PageLayoutWidgetController {
constructor(
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 13a80be8e25..9d8b104120c 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
@@ -33,10 +33,11 @@ import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/over
import { PageLayoutGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception.filter';
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';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@MetadataResolver(() => PageLayoutWidgetDTO)
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
-@UseFilters(PageLayoutGraphqlApiExceptionFilter)
+@UseFilters(PageLayoutGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
@UseGuards(WorkspaceAuthGuard)
@UsePipes(ResolverValidationPipe)
export class PageLayoutWidgetResolver {
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 eb7ebc9c6b6..86ddea6b446 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
@@ -33,6 +33,7 @@ import { PageLayoutService } from 'src/engine/metadata-modules/page-layout/servi
import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';
+import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/pageLayouts`)
@UseGuards(WorkspaceAuthGuard)
@@ -41,6 +42,7 @@ import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/works
PageLayoutRestApiExceptionFilter,
FlatEntityMapsRestApiExceptionFilter,
WorkspaceMigrationRunnerRestApiExceptionFilter,
+ AuthRestApiExceptionFilter,
)
export class PageLayoutController {
constructor(
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 2f23138b360..aefea70dafb 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
@@ -20,6 +20,7 @@ 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 { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
@@ -38,10 +39,11 @@ import { PageLayoutGraphqlApiExceptionFilter } from 'src/engine/metadata-modules
import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@MetadataResolver(() => PageLayoutDTO)
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
-@UseFilters(PageLayoutGraphqlApiExceptionFilter)
+@UseFilters(PageLayoutGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
@UseGuards(WorkspaceAuthGuard)
@UsePipes(ResolverValidationPipe)
export class PageLayoutResolver {
@@ -82,6 +84,7 @@ export class PageLayoutResolver {
@Query(() => [PageLayoutDTO])
@UseGuards(NoPermissionGuard)
+ @AllowSuspendedWorkspace()
async getPageLayouts(
@AuthWorkspace() workspace: WorkspaceEntity,
@Args('objectMetadataId', { type: () => String, nullable: true })
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 0ed48de0c19..4f4f7f30d7b 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
@@ -61,6 +61,7 @@ import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@MetadataResolver(() => RoleDTO)
@UsePipes(ResolverValidationPipe)
@@ -72,6 +73,7 @@ import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/sta
RowLevelPermissionPredicateGraphqlApiExceptionFilter,
PermissionsGraphqlApiExceptionFilter,
PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
)
@UseInterceptors(WorkspaceMigrationGraphqlApiExceptionInterceptor)
export class RoleResolver {
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 2d8c13b26c9..2a920d6bd19 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
@@ -1,4 +1,4 @@
-import { UseGuards, UseInterceptors } from '@nestjs/common';
+import { UseGuards, UseInterceptors, UseFilters } from '@nestjs/common';
import { Args, Mutation, Query } from '@nestjs/graphql';
import { PermissionFlagType } from 'twenty-shared/constants';
@@ -15,6 +15,7 @@ import { UpdateSkillInput } from 'src/engine/metadata-modules/skill/dtos/update-
import { SkillGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/skill/interceptors/skill-graphql-api-exception.interceptor';
import { SkillService } from 'src/engine/metadata-modules/skill/skill.service';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
// Reads are open to chat users so the composer can list skills; mutations
// stay behind AI settings.
@@ -24,6 +25,7 @@ import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/wor
SkillGraphqlApiExceptionInterceptor,
)
@MetadataResolver(() => SkillDTO)
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class SkillResolver {
constructor(private readonly skillService: SkillService) {}
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 baacb15ddd5..5b8cd8d8982 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
@@ -1,4 +1,4 @@
-import { UseGuards, UseInterceptors } from '@nestjs/common';
+import { UseGuards, UseInterceptors, UseFilters } from '@nestjs/common';
import {
Args,
Context,
@@ -28,6 +28,7 @@ import { TimelineActivityTypeGraphqlApiExceptionInterceptor } from 'src/engine/m
import { TimelineActivityTypeService } from 'src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.service';
import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/overrides/utils/resolve-effective-entity-property.util';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(WorkspaceAuthGuard)
@UseInterceptors(
@@ -35,6 +36,7 @@ import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/wor
TimelineActivityTypeGraphqlApiExceptionInterceptor,
)
@MetadataResolver(() => TimelineActivityTypeDTO)
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class TimelineActivityTypeResolver {
constructor(
private readonly timelineActivityTypeService: TimelineActivityTypeService,
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 61dfd883758..aae17571d7a 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
@@ -32,9 +32,10 @@ import { ViewDTO } from 'src/engine/metadata-modules/view/dtos/view.dto';
import { type ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/utils/view-graphql-api-exception.filter';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@MetadataResolver(() => ViewFieldGroupDTO)
-@UseFilters(ViewGraphqlApiExceptionFilter)
+@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
@UseGuards(WorkspaceAuthGuard)
export class ViewFieldGroupResolver {
constructor(
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 8e3c3929886..24c981cb787 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
@@ -38,6 +38,7 @@ import { ViewFieldService } from 'src/engine/metadata-modules/view-field/service
import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';
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 { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/viewFields`)
@UseGuards(WorkspaceAuthGuard)
@@ -46,6 +47,7 @@ import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view
ViewFieldRestApiExceptionFilter,
FlatEntityMapsRestApiExceptionFilter,
WorkspaceMigrationRunnerRestApiExceptionFilter,
+ AuthRestApiExceptionFilter,
)
export class ViewFieldController {
constructor(private readonly viewFieldService: ViewFieldService) {}
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 862cd8713f8..e9b4473a042 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
@@ -15,9 +15,10 @@ import { ViewFieldService } from 'src/engine/metadata-modules/view-field/service
import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/utils/view-graphql-api-exception.filter';
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 { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@MetadataResolver(() => ViewFieldDTO)
-@UseFilters(ViewGraphqlApiExceptionFilter)
+@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
@UseGuards(WorkspaceAuthGuard)
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 d2bf028399d..a38d867540c 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
@@ -38,6 +38,7 @@ import { ViewFilterGroupService } from 'src/engine/metadata-modules/view-filter-
import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';
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 { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/viewFilterGroups`)
@UseGuards(WorkspaceAuthGuard)
@@ -46,6 +47,7 @@ import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view
ViewFilterGroupRestApiExceptionFilter,
FlatEntityMapsRestApiExceptionFilter,
WorkspaceMigrationRunnerRestApiExceptionFilter,
+ AuthRestApiExceptionFilter,
)
export class ViewFilterGroupController {
constructor(
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 e8cf8afd2ed..2e910affd98 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
@@ -15,9 +15,10 @@ import { ViewFilterGroupService } from 'src/engine/metadata-modules/view-filter-
import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/utils/view-graphql-api-exception.filter';
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 { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@MetadataResolver(() => ViewFilterGroupDTO)
-@UseFilters(ViewGraphqlApiExceptionFilter)
+@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
@UseGuards(WorkspaceAuthGuard)
export class ViewFilterGroupResolver {
constructor(
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 4b23cc74275..d8a6f949efd 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
@@ -38,6 +38,7 @@ import { ViewFilterService } from 'src/engine/metadata-modules/view-filter/servi
import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';
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 { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/viewFilters`)
@UseGuards(WorkspaceAuthGuard)
@@ -46,6 +47,7 @@ import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view
ViewFilterRestApiExceptionFilter,
FlatEntityMapsRestApiExceptionFilter,
WorkspaceMigrationRunnerRestApiExceptionFilter,
+ AuthRestApiExceptionFilter,
)
export class ViewFilterController {
constructor(private readonly viewFilterService: ViewFilterService) {}
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 e3e73838769..acd8a6a99c0 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
@@ -15,9 +15,10 @@ import { ViewFilterService } from 'src/engine/metadata-modules/view-filter/servi
import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/utils/view-graphql-api-exception.filter';
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 { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@MetadataResolver(() => ViewFilterDTO)
-@UseFilters(ViewGraphqlApiExceptionFilter)
+@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
@UseGuards(WorkspaceAuthGuard)
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 586f416a678..97187b7414d 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
@@ -38,6 +38,7 @@ import { ViewGroupService } from 'src/engine/metadata-modules/view-group/service
import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';
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 { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/viewGroups`)
@UseGuards(WorkspaceAuthGuard)
@@ -46,6 +47,7 @@ import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view
ViewGroupRestApiExceptionFilter,
FlatEntityMapsRestApiExceptionFilter,
WorkspaceMigrationRunnerRestApiExceptionFilter,
+ AuthRestApiExceptionFilter,
)
export class ViewGroupController {
constructor(private readonly viewGroupService: ViewGroupService) {}
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 4d3c45e4a74..f2da6767413 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
@@ -15,9 +15,10 @@ import { ViewGroupService } from 'src/engine/metadata-modules/view-group/service
import { ViewGroupGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view-group/utils/view-group-graphql-api-exception.filter';
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 { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@MetadataResolver(() => ViewGroupDTO)
-@UseFilters(ViewGroupGraphqlApiExceptionFilter)
+@UseFilters(ViewGroupGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
@UseGuards(WorkspaceAuthGuard)
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 fe7c345eed8..0bd7bf4fdc5 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
@@ -37,6 +37,7 @@ import { ViewSortService } from 'src/engine/metadata-modules/view-sort/services/
import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';
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 { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/viewSorts`)
@UseGuards(WorkspaceAuthGuard)
@UseFilters(
@@ -44,6 +45,7 @@ import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view
ViewSortRestApiExceptionFilter,
FlatEntityMapsRestApiExceptionFilter,
WorkspaceMigrationRunnerRestApiExceptionFilter,
+ AuthRestApiExceptionFilter,
)
export class ViewSortController {
constructor(private readonly viewSortService: ViewSortService) {}
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 f6ad5be535c..13c0cd3ffba 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
@@ -17,9 +17,10 @@ import { DeleteViewSortInput } from 'src/engine/metadata-modules/view-sort/dtos/
import { DestroyViewSortInput } from 'src/engine/metadata-modules/view-sort/dtos/inputs/destroy-view-sort.input';
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 { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@MetadataResolver(() => ViewSortDTO)
-@UseFilters(ViewGraphqlApiExceptionFilter)
+@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
@UseGuards(WorkspaceAuthGuard)
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 ea1dda74031..ab586be54ce 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
@@ -49,6 +49,7 @@ import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/p
import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';
import { ViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-permission.guard';
import { CreateViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-permission.guard';
+import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller(`${ApiPath.Rest}/metadata/views`)
@UseGuards(WorkspaceAuthGuard)
@@ -57,6 +58,7 @@ import { CreateViewPermissionGuard } from 'src/engine/metadata-modules/view-perm
ViewRestApiExceptionFilter,
FlatEntityMapsRestApiExceptionFilter,
WorkspaceMigrationRunnerRestApiExceptionFilter,
+ AuthRestApiExceptionFilter,
)
export class ViewController {
constructor(
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 5c70c24fbf0..a259f99ebf5 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
@@ -23,6 +23,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';
import { 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';
@@ -46,9 +47,10 @@ import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/
import { ViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-permission.guard';
import { CreateViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-permission.guard';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@MetadataResolver(() => ViewDTO)
-@UseFilters(ViewGraphqlApiExceptionFilter)
+@UseFilters(ViewGraphqlApiExceptionFilter, AuthGraphqlApiExceptionFilter)
@UseGuards(WorkspaceAuthGuard)
export class ViewResolver {
constructor(
@@ -129,6 +131,7 @@ export class ViewResolver {
@Query(() => [ViewDTO])
@UseGuards(CustomPermissionGuard)
+ @AllowSuspendedWorkspace()
async getViews(
@AuthWorkspace() workspace: WorkspaceEntity,
@AuthUserWorkspaceId({ allowUndefined: true })
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 5d87f903b2b..4c8aceef86b 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
@@ -30,6 +30,7 @@ import { UpdateWebhookInput } from 'src/engine/metadata-modules/webhook/dtos/upd
import { type WebhookDTO } from 'src/engine/metadata-modules/webhook/dtos/webhook.dto';
import { WebhookService } from 'src/engine/metadata-modules/webhook/webhook.service';
import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';
+import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
@Controller([`${ApiPath.Rest}/webhooks`, `${ApiPath.Rest}/metadata/webhooks`])
@UseGuards(
@@ -42,6 +43,7 @@ import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/works
RestApiExceptionFilter,
FlatEntityMapsRestApiExceptionFilter,
WorkspaceMigrationRunnerRestApiExceptionFilter,
+ AuthRestApiExceptionFilter,
)
export class WebhookController {
constructor(private readonly webhookService: WebhookService) {}
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 72132e7b688..aa1c048b206 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
@@ -1,4 +1,4 @@
-import { UseGuards, UseInterceptors } from '@nestjs/common';
+import { UseGuards, UseInterceptors, UseFilters } from '@nestjs/common';
import { Args, Mutation, Query } from '@nestjs/graphql';
import { PermissionFlagType } from 'twenty-shared/constants';
@@ -15,6 +15,7 @@ import { WebhookDTO } from 'src/engine/metadata-modules/webhook/dtos/webhook.dto
import { WebhookGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/webhook/interceptors/webhook-graphql-api-exception.interceptor';
import { WebhookService } from 'src/engine/metadata-modules/webhook/webhook.service';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(WorkspaceAuthGuard)
@UseInterceptors(
@@ -22,6 +23,7 @@ import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/wor
WebhookGraphqlApiExceptionInterceptor,
)
@MetadataResolver(() => WebhookDTO)
+@UseFilters(AuthGraphqlApiExceptionFilter)
export class WebhookResolver {
constructor(private readonly webhookService: WebhookService) {}
diff --git a/packages/twenty-server/src/engine/middlewares/__tests__/graphql-refuse-suspended-workspace.middleware.spec.ts b/packages/twenty-server/src/engine/middlewares/__tests__/graphql-refuse-suspended-workspace.middleware.spec.ts
new file mode 100644
index 00000000000..751416290c6
--- /dev/null
+++ b/packages/twenty-server/src/engine/middlewares/__tests__/graphql-refuse-suspended-workspace.middleware.spec.ts
@@ -0,0 +1,63 @@
+import { type NextFunction, type Request, type Response } from 'express';
+import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
+
+import { AuthExceptionCode } from 'src/engine/core-modules/auth/auth.exception';
+import { GraphQLRefuseSuspendedWorkspaceMiddleware } from 'src/engine/middlewares/graphql-refuse-suspended-workspace.middleware';
+import { type MiddlewareService } from 'src/engine/middlewares/middleware.service';
+
+describe('GraphQLRefuseSuspendedWorkspaceMiddleware', () => {
+ let middlewareService: jest.Mocked<MiddlewareService>;
+ let middleware: GraphQLRefuseSuspendedWorkspaceMiddleware;
+ let next: NextFunction;
+
+ const response = {} as Response;
+
+ beforeEach(() => {
+ middlewareService = {
+ writeGraphqlResponseOnExceptionCaught: jest.fn(),
+ } as unknown as jest.Mocked<MiddlewareService>;
+ middleware = new GraphQLRefuseSuspendedWorkspaceMiddleware(
+ middlewareService,
+ );
+ next = jest.fn();
+ });
+
+ it.each([
+ WorkspaceActivationStatus.SUSPENDED,
+ WorkspaceActivationStatus.INACTIVE,
+ ])(
+ 'should refuse a %s workspace without calling next',
+ (activationStatus) => {
+ const request = {
+ workspace: { id: 'workspace-id', activationStatus },
+ } as unknown as Request;
+
+ middleware.use(request, response, next);
+
+ expect(next).not.toHaveBeenCalled();
+ expect(
+ middlewareService.writeGraphqlResponseOnExceptionCaught,
+ ).toHaveBeenCalledWith(
+ response,
+ expect.objectContaining({
+ code: AuthExceptionCode.WORKSPACE_SUSPENDED,
+ }),
+ );
+ },
+ );
+
+ it.each([
+ [
+ 'an active workspace',
+ { activationStatus: WorkspaceActivationStatus.ACTIVE },
+ ],
+ ['no workspace', undefined],
+ ])('should call next for %s', (_label, workspace) => {
+ middleware.use({ workspace } as unknown as Request, response, next);
+
+ expect(next).toHaveBeenCalled();
+ expect(
+ middlewareService.writeGraphqlResponseOnExceptionCaught,
+ ).not.toHaveBeenCalled();
+ });
+});
diff --git a/packages/twenty-server/src/engine/middlewares/graphql-refuse-suspended-workspace.middleware.ts b/packages/twenty-server/src/engine/middlewares/graphql-refuse-suspended-workspace.middleware.ts
new file mode 100644
index 00000000000..c505f981205
--- /dev/null
+++ b/packages/twenty-server/src/engine/middlewares/graphql-refuse-suspended-workspace.middleware.ts
@@ -0,0 +1,31 @@
+import { Injectable, type NestMiddleware } from '@nestjs/common';
+
+import { type NextFunction, type Request, type Response } from 'express';
+
+import {
+ AuthException,
+ AuthExceptionCode,
+} from 'src/engine/core-modules/auth/auth.exception';
+import { isWorkspaceSuspended } from 'src/engine/core-modules/workspace/utils/is-workspace-suspended.util';
+import { MiddlewareService } from 'src/engine/middlewares/middleware.service';
+
+@Injectable()
+export class GraphQLRefuseSuspendedWorkspaceMiddleware implements NestMiddleware {
+ constructor(private readonly middlewareService: MiddlewareService) {}
+
+ use(req: Request, res: Response, next: NextFunction) {
+ if (!isWorkspaceSuspended(req.workspace)) {
+ next();
+
+ return;
+ }
+
+ this.middlewareService.writeGraphqlResponseOnExceptionCaught(
+ res,
+ new AuthException(
+ 'Workspace is suspended',
+ AuthExceptionCode.WORKSPACE_SUSPENDED,
+ ),
+ );
+ }
+}
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 ad07a35c750..2e351f49e85 100644
--- a/packages/twenty-server/src/engine/subscriptions/event-stream.resolver.ts
+++ b/packages/twenty-server/src/engine/subscriptions/event-stream.resolver.ts
@@ -13,6 +13,7 @@ import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handl
import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { type AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthApiKey } from 'src/engine/decorators/auth/auth-api-key.decorator';
import { AuthApplication } from 'src/engine/decorators/auth/auth-application.decorator';
@@ -21,6 +22,7 @@ import { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace
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 { 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';
@@ -42,9 +44,14 @@ import { eventStreamIdToChannelId } from 'src/engine/subscriptions/utils/get-cha
import { wrapAsyncIteratorWithLifecycle } from 'src/engine/subscriptions/utils/wrap-async-iterator-with-lifecycle';
@MetadataResolver()
+@AllowSuspendedWorkspace()
@UseGuards(WorkspaceAuthGuard, UserAuthGuard, NoPermissionGuard)
@UsePipes(ResolverValidationPipe)
-@UseFilters(EventStreamExceptionFilter, PreventNestToAutoLogGraphqlErrorsFilter)
+@UseFilters(
+ EventStreamExceptionFilter,
+ PreventNestToAutoLogGraphqlErrorsFilter,
+ AuthGraphqlApiExceptionFilter,
+)
export class EventStreamResolver {
constructor(
private readonly subscriptionService: SubscriptionService,
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 7be4a9716de..8fe2468290a 100644
--- a/packages/twenty-server/src/modules/dashboard/controllers/dashboard.controller.ts
+++ b/packages/twenty-server/src/modules/dashboard/controllers/dashboard.controller.ts
@@ -3,6 +3,7 @@ import { Controller, Param, Post, UseFilters, UseGuards } from '@nestjs/common';
import { ApiPath } from 'twenty-shared/types';
import { getWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';
+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';
@@ -13,7 +14,11 @@ import { DashboardDuplicationService } from 'src/modules/dashboard/services/dash
@Controller(`${ApiPath.Rest}/dashboards`)
@UseGuards(JwtAuthGuard, WorkspaceAuthGuard, CustomPermissionGuard)
-@UseFilters(DashboardRestApiExceptionFilter, PermissionsRestApiExceptionFilter)
+@UseFilters(
+ DashboardRestApiExceptionFilter,
+ PermissionsRestApiExceptionFilter,
+ AuthRestApiExceptionFilter,
+)
export class DashboardController {
constructor(
private readonly dashboardDuplicationService: DashboardDuplicationService,
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 9b4710e8695..23d6496e190 100644
--- a/packages/twenty-server/src/modules/dashboard/resolvers/dashboard.resolver.ts
+++ b/packages/twenty-server/src/modules/dashboard/resolvers/dashboard.resolver.ts
@@ -4,6 +4,7 @@ import { Args, Mutation } from '@nestjs/graphql';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { getWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';
+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';
@@ -18,6 +19,7 @@ import { DashboardGraphqlApiExceptionFilter } from 'src/modules/dashboard/utils/
DashboardGraphqlApiExceptionFilter,
PageLayoutGraphqlApiExceptionFilter,
PermissionsGraphqlApiExceptionFilter,
+ AuthGraphqlApiExceptionFilter,
)
@UseGuards(WorkspaceAuthGuard)
@UsePipes(ResolverValidationPipe)
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 9375de646d7..86096685608 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
@@ -37,6 +37,7 @@ import { MessageCampaignScheduleService } from 'src/modules/emailing/services/me
import { MessageCampaignService } from 'src/modules/emailing/services/message-campaign.service';
import { countDeliveredRecipients } from 'src/engine/core-modules/emailing-domain/utils/count-delivered-recipients.util';
import { type EmailingDomainSendEmailResult } from 'src/engine/core-modules/emailing-domain/drivers/types/emailing-domain-send-email-result.type';
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@UseGuards(
WorkspaceAuthGuard,
@@ -47,6 +48,7 @@ import { type EmailingDomainSendEmailResult } from 'src/engine/core-modules/emai
EmailGroupAccessGraphqlApiExceptionFilter,
EmailingDomainGraphqlApiExceptionFilter,
ThrottlerGraphqlApiExceptionFilter,
+ AuthGraphqlApiExceptionFilter,
)
@UsePipes(ResolverValidationPipe)
@MetadataResolver()
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 2fbe845855f..be63cac31d8 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
@@ -6,6 +6,7 @@ import { FeatureFlagKey } from 'twenty-shared/types';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { getWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';
+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 { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
@@ -25,6 +26,7 @@ import { MessageListGraphqlApiExceptionFilter } from 'src/modules/emailing/utils
@UseFilters(
MessageListGraphqlApiExceptionFilter,
PermissionsGraphqlApiExceptionFilter,
+ AuthGraphqlApiExceptionFilter,
)
@UseGuards(WorkspaceAuthGuard, FeatureFlagGuard)
@UsePipes(ResolverValidationPipe)
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 14c81ab11c5..518069b59d4 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
@@ -25,6 +25,7 @@ import {
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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,
@@ -34,6 +35,7 @@ import { MessageSuppressionService } from 'src/modules/emailing/services/message
@UseFilters(
EmailGroupAccessGraphqlApiExceptionFilter,
EmailingDomainGraphqlApiExceptionFilter,
+ AuthGraphqlApiExceptionFilter,
)
@UsePipes(ResolverValidationPipe)
@MetadataResolver(() => MessageSuppressionListDTO)
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 c080b813af2..6c3fa904de9 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
@@ -20,13 +20,17 @@ import {
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.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,
FeatureFlagGuard,
SettingsPermissionGuard(PermissionFlagType.WORKSPACE),
)
-@UseFilters(EmailGroupAccessGraphqlApiExceptionFilter)
+@UseFilters(
+ EmailGroupAccessGraphqlApiExceptionFilter,
+ AuthGraphqlApiExceptionFilter,
+)
@UsePipes(ResolverValidationPipe)
@MetadataResolver(() => UnsubscribeTopicDTO)
export class UnsubscribeTopicResolver {