The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(metadata): guard view field group mutations with VIEWS and LAYOUTS permissions (#26490)
Mateidslx40ae2f8343d6
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field-group/resolvers/view-field-group.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/view-field-group/resolvers/view-field-group.resolver.tsindex aae17571d7a..fc8b0a2932e 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@@ -9,6 +9,7 @@ import {} from '@nestjs/graphql';import { isArray } from '@sniptt/guards';+import { PermissionFlagType } from 'twenty-shared/constants';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';@@ -17,6 +18,9 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entimport { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';+import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';+import { CreateViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard';+import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';import { CreateViewFieldGroupInput } from 'src/engine/metadata-modules/view-field-group/dtos/inputs/create-view-field-group.input';import { DeleteViewFieldGroupInput } from 'src/engine/metadata-modules/view-field-group/dtos/inputs/delete-view-field-group.input';@@ -88,7 +92,7 @@ export class ViewFieldGroupResolver {}@Mutation(() => ViewFieldGroupDTO)- @UseGuards(NoPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewFieldGroup'))async updateViewFieldGroup(@Args('input') updateViewFieldGroupInput: UpdateViewFieldGroupInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -100,7 +104,7 @@ export class ViewFieldGroupResolver {}@Mutation(() => ViewFieldGroupDTO)- @UseGuards(NoPermissionGuard)+ @UseGuards(CreateViewChildEntityPermissionGuard)async createViewFieldGroup(@Args('input')createViewFieldGroupInput: CreateViewFieldGroupInput,@@ -113,7 +117,7 @@ export class ViewFieldGroupResolver {}@Mutation(() => [ViewFieldGroupDTO])- @UseGuards(NoPermissionGuard)+ @UseGuards(CreateViewChildEntityPermissionGuard)async createManyViewFieldGroups(@Args('inputs', { type: () => [CreateViewFieldGroupInput] })createViewFieldGroupInputs: CreateViewFieldGroupInput[],@@ -126,7 +130,7 @@ export class ViewFieldGroupResolver {}@Mutation(() => ViewFieldGroupDTO)- @UseGuards(NoPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewFieldGroup'))async deleteViewFieldGroup(@Args('input') deleteViewFieldGroupInput: DeleteViewFieldGroupInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -138,7 +142,7 @@ export class ViewFieldGroupResolver {}@Mutation(() => ViewFieldGroupDTO)- @UseGuards(NoPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewFieldGroup'))async destroyViewFieldGroup(@Args('input')destroyViewFieldGroupInput: DestroyViewFieldGroupInput,@@ -151,7 +155,7 @@ export class ViewFieldGroupResolver {}@Mutation(() => ViewDTO)- @UseGuards(NoPermissionGuard)+ @UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))@UsePipes(ResolverValidationPipe)async upsertFieldsWidget(@Args('input') input: UpsertFieldsWidgetInput,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field-group/view-field-group.module.ts b/packages/twenty-server/src/engine/metadata-modules/view-field-group/view-field-group.module.tsindex 3882de4997b..9165b6984d1 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-field-group/view-field-group.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-field-group/view-field-group.module.ts@@ -8,6 +8,7 @@ import { ViewFieldGroupEntity } from 'src/engine/metadata-modules/view-field-groimport { ViewFieldGroupResolver } from 'src/engine/metadata-modules/view-field-group/resolvers/view-field-group.resolver';import { FieldsWidgetUpsertService } from 'src/engine/metadata-modules/view-field-group/services/fields-widget-upsert.service';import { ViewFieldGroupService } from 'src/engine/metadata-modules/view-field-group/services/view-field-group.service';+import { ViewPermissionsModule } from 'src/engine/metadata-modules/view-permissions/view-permissions.module';import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';@@ -16,6 +17,7 @@ import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules@Module({imports: [+ ViewPermissionsModule,ApplicationTranslationCatalogModule,TypeOrmModule.forFeature([ViewFieldGroupEntity, ViewEntity]),WorkspaceCacheStorageModule,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard.tsindex 24749e41370..59d38858a8c 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard.ts@@ -7,7 +7,7 @@ import { GqlExecutionContext } from '@nestjs/graphql';import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';import { resolveViewAccessContext } from 'src/engine/metadata-modules/view-permissions/utils/resolve-view-access-context.util';-import { resolveViewChildEntityViewId } from 'src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-id.util';+import { resolveViewChildEntityViewIds } from 'src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-ids.util';@Injectable()export class CreateViewChildEntityPermissionGuard implements CanActivate {@@ -18,11 +18,31 @@ export class CreateViewChildEntityPermissionGuard implements CanActivate {const request = gqlContext.getContext().req;const args = gqlContext.getArgs();- const viewId = resolveViewChildEntityViewId({ args, body: request.body });+ const viewIds = resolveViewChildEntityViewIds({+ args,+ body: request.body,+ });+ const accessContext = resolveViewAccessContext(request);- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- resolveViewAccessContext(request),- );+ if (viewIds.length === 0) {+ return this.viewAccessService.canUserModifyViewByChildEntity(+ null,+ accessContext,+ );+ }++ for (const viewId of viewIds) {+ const canModify =+ await this.viewAccessService.canUserModifyViewByChildEntity(+ viewId,+ accessContext,+ );++ if (!canModify) {+ return false;+ }+ }++ return true;}}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service.tsindex dfbad08e669..f79921040c2 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service.ts@@ -30,6 +30,20 @@ export class ViewEntityLookupService {);}+ case 'viewFieldGroup': {+ const { flatViewFieldGroupMaps } =+ await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(+ { workspaceId, flatMapsKeys: ['flatViewFieldGroupMaps'] },+ );++ return (+ findFlatEntityByIdInFlatEntityMaps({+ flatEntityId: entityId,+ flatEntityMaps: flatViewFieldGroupMaps,+ })?.viewId ?? null+ );+ }+case 'viewFilter': {const { flatViewFilterMaps } =await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/types/view-permissions.types.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/types/view-permissions.types.tsindex e411b353d65..8e0743f9125 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/types/view-permissions.types.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/types/view-permissions.types.ts@@ -1,5 +1,6 @@export type ViewChildEntityKind =| 'viewField'+ | 'viewFieldGroup'| 'viewFilter'| 'viewFilterGroup'| 'viewGroup'diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/__tests__/resolve-view-child-entity-view-id.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/__tests__/resolve-view-child-entity-view-id.util.spec.tsindex 8cb4123d60b..47e9276e16b 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/__tests__/resolve-view-child-entity-view-id.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/__tests__/resolve-view-child-entity-view-id.util.spec.ts@@ -1,4 +1,5 @@import { resolveViewChildEntityViewId } from 'src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-id.util';+import { resolveViewChildEntityViewIds } from 'src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-ids.util';describe('resolveViewChildEntityViewId', () => {it('reads the view named by the input', () => {@@ -40,3 +41,40 @@ describe('resolveViewChildEntityViewId', () => {).toBeNull();});});++describe('resolveViewChildEntityViewIds', () => {+ it('resolves all distinct views across bulk create inputs', () => {+ expect(+ resolveViewChildEntityViewIds({+ args: {+ inputs: [+ { viewId: 'view-1' },+ { viewId: 'view-2' },+ { viewId: 'view-1' },+ ],+ },+ body: undefined,+ }),+ ).toEqual(['view-1', 'view-2']);+ });++ it('ignores empty strings and non-string values', () => {+ expect(+ resolveViewChildEntityViewIds({+ args: {+ inputs: [{ viewId: '' }, { viewId: 123 }, { viewId: 'view-valid' }],+ },+ body: undefined,+ }),+ ).toEqual(['view-valid']);+ });++ it('returns empty array when neither input nor body names a view', () => {+ expect(+ resolveViewChildEntityViewIds({+ args: undefined,+ body: undefined,+ }),+ ).toEqual([]);+ });+});diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-id.util.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-id.util.tsindex 135415308ae..d7a12d66ff7 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-id.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-id.util.ts@@ -1,4 +1,4 @@-import { isNonEmptyString } from '@sniptt/guards';+import { resolveViewChildEntityViewIds } from 'src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-ids.util';export const resolveViewChildEntityViewId = ({args,@@ -8,7 +8,4 @@ export const resolveViewChildEntityViewId = ({| { input?: { viewId?: unknown }; inputs?: { viewId?: unknown }[] }| undefined;body: { viewId?: unknown } | undefined;-}): string | null =>- [args?.input?.viewId, args?.inputs?.[0]?.viewId, body?.viewId].find(- isNonEmptyString,- ) ?? null;+}): string | null => resolveViewChildEntityViewIds({ args, body })[0] ?? null;diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-ids.util.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-ids.util.tsnew file mode 100644index 00000000000..258505ded8d--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-ids.util.ts@@ -0,0 +1,31 @@+import { isNonEmptyString } from '@sniptt/guards';++export const resolveViewChildEntityViewIds = ({+ args,+ body,+}: {+ args:+ | { input?: { viewId?: unknown }; inputs?: { viewId?: unknown }[] }+ | undefined;+ body: { viewId?: unknown } | undefined;+}): string[] => {+ const ids: string[] = [];++ if (isNonEmptyString(args?.input?.viewId)) {+ ids.push(args.input.viewId);+ }++ if (Array.isArray(args?.inputs)) {+ for (const item of args.inputs) {+ if (isNonEmptyString(item?.viewId)) {+ ids.push(item.viewId);+ }+ }+ }++ if (isNonEmptyString(body?.viewId)) {+ ids.push(body.viewId);+ }++ return [...new Set(ids)];+};diff --git a/packages/twenty-server/test/integration/metadata/suites/view-permissions/application-principal-view-access.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/view-permissions/application-principal-view-access.integration-spec.tsindex f54b2ebc443..cb25eaeebd8 100644--- a/packages/twenty-server/test/integration/metadata/suites/view-permissions/application-principal-view-access.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/view-permissions/application-principal-view-access.integration-spec.ts@@ -11,6 +11,8 @@ import { buildBaseManifest } from 'test/integration/metadata/suites/application/import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';import { setupApplicationForSync } from 'test/integration/metadata/suites/application/utils/setup-application-for-sync.util';import { syncApplication } from 'test/integration/metadata/suites/application/utils/sync-application.util';+import { createManyViewFieldGroupsQueryFactory } from 'test/integration/metadata/suites/view-field-group/utils/create-many-view-field-groups-query-factory.util';+import { createViewFieldGroupQueryFactory } from 'test/integration/metadata/suites/view-field-group/utils/create-view-field-group-query-factory.util';import { createViewGroupQueryFactory } from 'test/integration/metadata/suites/view-group/utils/create-view-group-query-factory.util';import { createOneView } from 'test/integration/metadata/suites/view/utils/create-one-view.util';import { createViewQueryFactory } from 'test/integration/metadata/suites/view/utils/create-view-query-factory.util';@@ -243,6 +245,45 @@ describe('application principal view access (integration)', () => {});}, 120000);+ it('allows field group creation for an application with VIEWS permission', async () => {+ const response = await makeMetadataAPIRequest(+ createViewFieldGroupQueryFactory({+ input: { viewId: groupedViewId, name: 'Allowed group' },+ }),+ authorizedApplication.accessToken,+ );++ expect(response.body.errors).toBeUndefined();+ expect(response.body.data.createViewFieldGroup.id).toBeDefined();+ });++ it('denies field group creation for an application without VIEWS permission', async () => {+ const response = await makeMetadataAPIRequest(+ createViewFieldGroupQueryFactory({+ input: { viewId: groupedViewId, name: 'Denied group' },+ }),+ deniedApplication.accessToken,+ );++ expect(response.body.errors?.[0]?.extensions?.code).toBe('FORBIDDEN');+ expect(response.body.data?.createViewFieldGroup).toBeFalsy();+ });++ it('checks every view in a batch, including one after a missing view', async () => {+ const response = await makeMetadataAPIRequest(+ createManyViewFieldGroupsQueryFactory({+ inputs: [+ { viewId: crypto.randomUUID(), name: 'Missing view' },+ { viewId: groupedViewId, name: 'Forbidden view' },+ ],+ }),+ deniedApplication.accessToken,+ );++ expect(response.body.errors?.[0]?.extensions?.code).toBe('FORBIDDEN');+ expect(response.body.data?.createManyViewFieldGroups).toBeFalsy();+ });+describe('an application whose role grants the VIEWS permission', () => {it('creates a view', async () => {const response = await createViewAsApplication({