The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix: return proper FORBIDDEN GraphQL errors from ApiKeyResolver (#21107)
Weikod86e8275638b
diff --git a/packages/twenty-server/src/engine/core-modules/api-key/api-key.resolver.ts b/packages/twenty-server/src/engine/core-modules/api-key/api-key.resolver.tsindex 2edc9c105d5..617f08ae355 100644--- a/packages/twenty-server/src/engine/core-modules/api-key/api-key.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/api-key/api-key.resolver.ts@@ -1,4 +1,4 @@-import { UseGuards } from '@nestjs/common';+import { UseFilters, UseGuards } from '@nestjs/common';import { Args, Mutation, Parent, Query, ResolveField } from '@nestjs/graphql';import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';@@ -7,6 +7,7 @@ import { PermissionFlagType } from 'twenty-shared/constants';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { ApiKeyEntity } from 'src/engine/core-modules/api-key/api-key.entity';+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';import { CreateApiKeyInput } from 'src/engine/core-modules/api-key/dtos/create-api-key.input';import { GetApiKeyInput } from 'src/engine/core-modules/api-key/dtos/get-api-key.input';import { RevokeApiKeyInput } from 'src/engine/core-modules/api-key/dtos/revoke-api-key.input';@@ -17,12 +18,14 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decoratimport { RequireAccessTokenGuard } from 'src/engine/guards/require-access-token.guard';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';+import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';import { RoleDTO } from 'src/engine/metadata-modules/role/dtos/role.dto';import { ApiKeyRoleService } from './services/api-key-role.service';import { ApiKeyService } from './services/api-key.service';@MetadataResolver(() => ApiKeyEntity)+@UseFilters(AuthGraphqlApiExceptionFilter, PermissionsGraphqlApiExceptionFilter)@UseGuards(WorkspaceAuthGuard,SettingsPermissionGuard(PermissionFlagType.API_KEYS_AND_WEBHOOKS),diff --git a/packages/twenty-server/test/integration/graphql/suites/settings-permissions/api-key-webhooks.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/settings-permissions/api-key-webhooks.integration-spec.tsindex 81055c6f6ae..e2e3cd854ff 100644--- a/packages/twenty-server/test/integration/graphql/suites/settings-permissions/api-key-webhooks.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/settings-permissions/api-key-webhooks.integration-spec.ts@@ -65,7 +65,7 @@ describe('api key and webhooks permissions', () => {const queryData = {query: `mutation createApiKey {- createApiKey(input: { name: "escalation", expiresAt: "2025-01-01T00:00:00Z" }) {+ createApiKey(input: { name: "escalation", expiresAt: "2025-01-01T00:00:00Z", roleId: "20202020-0000-4000-8000-000000000000" }) {id}}