The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Keep disabled actions off for members holding an application's default role (#29103)
Charles Bochetd3c27b1f286d
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-objects-permissions-for-role-permission-config.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-objects-permissions-for-role-permission-config.util.spec.tsindex 82a8656d05e..0a14efb27dc 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-objects-permissions-for-role-permission-config.util.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-objects-permissions-for-role-permission-config.util.spec.ts@@ -84,6 +84,29 @@ describe('computeObjectsPermissionsForRolePermissionConfig', () => {},canDestroy: false,},+ {+ actor: "a user holding the owning application's default role",+ intersectionOf: { userWorkspaceRoleId: 'owning-application-role-id' },+ canDestroy: false,+ },+ {+ actor: "an API key holding the owning application's default role",+ intersectionOf: { apiKeyRoleId: 'owning-application-role-id' },+ canDestroy: false,+ },+ {+ actor: "an agent holding the owning application's default role",+ intersectionOf: { agentRoleId: 'owning-application-role-id' },+ canDestroy: false,+ },+ {+ actor: 'the owning application with a user holding its default role',+ intersectionOf: {+ userWorkspaceRoleId: 'owning-application-role-id',+ applicationRoleId: 'owning-application-role-id',+ },+ canDestroy: false,+ },])('disabled action allowed for $actor: $canDestroy',({ intersectionOf, canDestroy }) => {diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util.tsindex 6afc6608e4a..87b5f1ac476 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/compute-objects-permissions-for-role-permission-config.util.ts@@ -44,6 +44,18 @@ export const computeObjectsPermissionsForRolePermissionConfig = ({const applicationIdByDefaultRoleId =buildApplicationIdByDefaultRoleId(flatApplicationMaps);+ const { applicationRoleId, ...nonApplicationRoleIdsBySource } =+ intersectionOf;+ const nonApplicationRoleIds = new Set(+ Object.values(nonApplicationRoleIdsBySource).filter(isDefined),+ );++ // TODO(@charlesBochet): members hold Admin, the Standard app's default role (#28667); simplify once they no longer do+ const getActingApplicationId = (roleId: string) =>+ roleId === applicationRoleId && !nonApplicationRoleIds.has(roleId)+ ? applicationIdByDefaultRoleId[roleId]+ : undefined;+const permissionsPerRole = roleIds.map((roleId) => {const rolePermissions = rolesPermissions[roleId];@@ -51,7 +63,7 @@ export const computeObjectsPermissionsForRolePermissionConfig = ({? restrictObjectsPermissionsToDisabledActions({objectsPermissions: rolePermissions,flatObjectMetadataMaps,- actingApplicationId: applicationIdByDefaultRoleId[roleId],+ actingApplicationId: getActingApplicationId(roleId),}): undefined;});diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/disabled-object-permission-actions-object-records-permissions.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/disabled-object-permission-actions-object-records-permissions.integration-spec.tsindex 98314bfefbc..3d4a0964bc0 100644--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/disabled-object-permission-actions-object-records-permissions.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/disabled-object-permission-actions-object-records-permissions.integration-spec.ts@@ -1,8 +1,10 @@import { randomUUID } from 'node:crypto';+import gql from 'graphql-tag';import { createOneOperationFactory } from 'test/integration/graphql/utils/create-one-operation-factory.util';import { makeGraphqlApiRequestWithApiKey } from 'test/integration/graphql/utils/make-graphql-api-request-with-api-key.util';import { makeGraphqlApiRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';import {RecordShareAccessLevel,@@ -17,8 +19,20 @@ import { PERSON_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/dadescribe('disabled object permission actions', () => {let createRecordShareOperation: ReturnType<typeof createOneOperationFactory>;+ let recordShareObjectMetadataId: string;beforeAll(async () => {+ recordShareObjectMetadataId = (+ await getCoreRepository<ObjectMetadataEntity>(+ ObjectMetadataEntity,+ ).findOneOrFail({+ where: {+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ nameSingular: 'recordShare',+ },+ })+ ).id;+const personObjectMetadata = await getCoreRepository<ObjectMetadataEntity>(ObjectMetadataEntity,).findOneOrFail({@@ -51,4 +65,38 @@ describe('disabled object permission actions', () => {ErrorCode.FORBIDDEN,);});++ it("reports the actions disabled on record shares in an admin user's permissions", async () => {+ const response = await makeMetadataApiRequest({+ query: gql`+ query CurrentUserObjectsPermissions {+ currentUser {+ currentUserWorkspace {+ objectsPermissions {+ objectMetadataId+ canReadObjectRecords+ canUpdateObjectRecords+ canSoftDeleteObjectRecords+ canDestroyObjectRecords+ }+ }+ }+ }+ `,+ });++ expect(response.body.errors).toBeUndefined();+ expect(+ response.body.data.currentUser.currentUserWorkspace.objectsPermissions.find(+ ({ objectMetadataId }: { objectMetadataId: string }) =>+ objectMetadataId === recordShareObjectMetadataId,+ ),+ ).toEqual({+ objectMetadataId: recordShareObjectMetadataId,+ canReadObjectRecords: false,+ canUpdateObjectRecords: false,+ canSoftDeleteObjectRecords: false,+ canDestroyObjectRecords: false,+ });+ });});