Skip to content

The open alternative to Salesforce, designed for AI.

Discriminate permissions principals by type (#29475)

Charles Bochetb0730255e8ba
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job.ts
index 5e096b9bea2..c3dd9fc3ced 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job.ts
@@ -85,8 +85,8 @@ export class CallAgentDatabaseEventTriggersJob {
const admittedRecordIds =
await eventRecordAccessGate.resolveAdmittedRecordIds({
workspaceId: workspaceEventBatch.workspaceId,
- mainPrincipal: { agentId: flatAgent.id },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: { type: 'agent', agentId: flatAgent.id },
+ applicationPrincipal: { type: 'customApplication' },
});
const admittedEvents = workspaceEventBatch.events
.filter((event) => admittedRecordIds.has(event.recordId))
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts
index 458d2c8d321..dadd250809c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts
@@ -331,8 +331,11 @@ export class AgentChatSharingService {
this.recordAccessPolicyService.hasAccessToRecords({
principals: {
workspaceId,
- mainPrincipal: { workspaceMemberId: memberId },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ workspaceMemberId: memberId,
+ },
+ applicationPrincipal: { type: 'customApplication' },
},
flatObjectMetadata: threadFlatObjectMetadata,
recordIds: [threadId],
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts
index f81582420b2..4ca8fa70641 100644
--- a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts
@@ -95,8 +95,8 @@ export class CallWebhookJobsJob {
admittedRecordIdsByRoleId.get(webhookRoleId) ??
eventRecordAccessGate.resolveAdmittedRecordIds({
workspaceId: workspaceEventBatch.workspaceId,
- mainPrincipal: { webhookId: webhook.id },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: { type: 'webhook', webhookId: webhook.id },
+ applicationPrincipal: { type: 'customApplication' },
});
admittedRecordIdsByRoleId.set(webhookRoleId, admittedRecordIds);
diff --git a/packages/twenty-server/src/engine/permissions/combine/services/record-access-policy.service.ts b/packages/twenty-server/src/engine/permissions/combine/services/record-access-policy.service.ts
index 1cd43b427a8..05c557e7b7b 100644
--- a/packages/twenty-server/src/engine/permissions/combine/services/record-access-policy.service.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/services/record-access-policy.service.ts
@@ -361,13 +361,13 @@ export class RecordAccessPolicyService {
'flatApplicationMaps',
]);
const { flatWorkspaceMemberMaps } =
- 'workspaceMemberId' in mainPrincipal
+ mainPrincipal.type === 'workspaceMember'
? await this.workspaceCacheService.getOrRecompute(workspaceId, [
'flatWorkspaceMemberMaps',
])
: { flatWorkspaceMemberMaps: EMPTY_WORKSPACE_MEMBER_MAPS };
const { flatRoleTargetMaps } =
- 'webhookId' in mainPrincipal
+ mainPrincipal.type === 'webhook'
? await this.workspaceCacheService.getOrRecompute(workspaceId, [
'flatRoleTargetMaps',
])
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-permissions-condition.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-permissions-condition.util.spec.ts
index 371cf6dcd0c..8b77346267d 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-permissions-condition.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-permissions-condition.util.spec.ts
@@ -125,14 +125,23 @@ const buildConditionOutcome = (
const readEverything: PermissionsPrincipalsWithRolesContext = {
workspaceId: 'workspace-id',
- mainPrincipal: { roleId: FULL_ACCESS_ROLE_ID, workspaceMemberId: 'member-1' },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ roleId: FULL_ACCESS_ROLE_ID,
+ workspaceMemberId: 'member-1',
+ },
+ applicationPrincipal: { type: 'customApplication' },
};
const owningApplication: PermissionsPrincipalsWithRolesContext = {
workspaceId: 'workspace-id',
- mainPrincipal: { roleId: APPLICATION_ROLE_ID, applicationId: APPLICATION_ID },
+ mainPrincipal: {
+ type: 'application',
+ roleId: APPLICATION_ROLE_ID,
+ applicationId: APPLICATION_ID,
+ },
applicationPrincipal: {
+ type: 'application',
roleId: APPLICATION_ROLE_ID,
applicationId: APPLICATION_ID,
},
@@ -141,10 +150,11 @@ const owningApplication: PermissionsPrincipalsWithRolesContext = {
const withoutObjectPermission: PermissionsPrincipalsWithRolesContext = {
...readEverything,
mainPrincipal: {
+ type: 'workspaceMember',
roleId: ROLE_WITHOUT_PERMISSION_ID,
workspaceMemberId: 'member-1',
},
- applicationPrincipal: { isCustomApp: true },
+ applicationPrincipal: { type: 'customApplication' },
};
const build = ({
@@ -299,9 +309,17 @@ describe('buildPermissionsCondition', () => {
});
const withoutCompanyPermission: PermissionsPrincipalsWithRolesContext = {
...readEverything,
- limitingPrincipal: { roleId: 'role-2', agentId: 'agent-1' },
- mainPrincipal: { roleId: 'role-3', workspaceMemberId: 'member-1' },
- applicationPrincipal: { isCustomApp: true },
+ limitingPrincipal: {
+ type: 'agent',
+ roleId: 'role-2',
+ agentId: 'agent-1',
+ },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ roleId: 'role-3',
+ workspaceMemberId: 'member-1',
+ },
+ applicationPrincipal: { type: 'customApplication' },
};
it('narrows a principal without object permission to the records named for them', () => {
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/find-permissions-admitted-record-ids.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/find-permissions-admitted-record-ids.util.spec.ts
index a1245eef2ff..a993ee19d36 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/find-permissions-admitted-record-ids.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/find-permissions-admitted-record-ids.util.spec.ts
@@ -101,20 +101,28 @@ const fullAccess = {
const rolePrincipal: PermissionsPrincipalsWithRolesContext = {
workspaceId: 'workspace-id',
- mainPrincipal: { roleId: MEMBER_ROLE_ID, isDeprecatedRoleOnly: true },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: { type: 'deprecatedRoleOnly', roleId: MEMBER_ROLE_ID },
+ applicationPrincipal: { type: 'customApplication' },
};
const memberPrincipal: PermissionsPrincipalsWithRolesContext = {
...rolePrincipal,
- mainPrincipal: { roleId: MEMBER_ROLE_ID, workspaceMemberId: MEMBER_ID },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ roleId: MEMBER_ROLE_ID,
+ workspaceMemberId: MEMBER_ID,
+ },
+ applicationPrincipal: { type: 'customApplication' },
};
const deniedPrincipal: PermissionsPrincipalsWithRolesContext = {
...memberPrincipal,
- mainPrincipal: { roleId: 'missing-role', workspaceMemberId: MEMBER_ID },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ roleId: 'missing-role',
+ workspaceMemberId: MEMBER_ID,
+ },
+ applicationPrincipal: { type: 'customApplication' },
};
const filterByStatus = (status: string) =>
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/has-access-to-all-records.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/has-access-to-all-records.util.spec.ts
index 8ed2cf8ff2b..ccfbece15d8 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/has-access-to-all-records.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/has-access-to-all-records.util.spec.ts
@@ -48,15 +48,19 @@ const buildPrincipal = (
if (!isDefined(applicationId)) {
return {
workspaceId: 'workspace-id',
- mainPrincipal: { roleId, workspaceMemberId: 'member-1' },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ roleId,
+ workspaceMemberId: 'member-1',
+ },
+ applicationPrincipal: { type: 'customApplication' },
};
}
return {
workspaceId: 'workspace-id',
- mainPrincipal: { roleId, applicationId },
- applicationPrincipal: { roleId, applicationId },
+ mainPrincipal: { type: 'application', roleId, applicationId },
+ applicationPrincipal: { type: 'application', roleId, applicationId },
};
};
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-permissions-row-access-outcome.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-permissions-row-access-outcome.util.spec.ts
index 43e85658e7c..4d5def23d8d 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-permissions-row-access-outcome.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/resolve-permissions-row-access-outcome.util.spec.ts
@@ -35,14 +35,19 @@ const readOnlyPermissions: ObjectPermissions = {
const readOnlyPrincipal: PermissionsPrincipalsWithRolesContext = {
workspaceId: 'workspace-id',
- mainPrincipal: { roleId: READ_ONLY_ROLE_ID, isDeprecatedRoleOnly: true },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: { type: 'deprecatedRoleOnly', roleId: READ_ONLY_ROLE_ID },
+ applicationPrincipal: { type: 'customApplication' },
};
const owningApplicationPrincipal: PermissionsPrincipalsWithRolesContext = {
workspaceId: 'workspace-id',
- mainPrincipal: { roleId: APPLICATION_ROLE_ID, applicationId: APPLICATION_ID },
+ mainPrincipal: {
+ type: 'application',
+ roleId: APPLICATION_ROLE_ID,
+ applicationId: APPLICATION_ID,
+ },
applicationPrincipal: {
+ type: 'application',
roleId: APPLICATION_ROLE_ID,
applicationId: APPLICATION_ID,
},
@@ -106,8 +111,8 @@ describe('resolvePermissionsRowAccessOutcome', () => {
resolveOutcome({
principal: {
...readOnlyPrincipal,
- mainPrincipal: { roleId: 'missing-role', isDeprecatedRoleOnly: true },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: { type: 'deprecatedRoleOnly', roleId: 'missing-role' },
+ applicationPrincipal: { type: 'customApplication' },
},
}),
).toBe(false);
diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/resolve-events-readable-by-role.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/resolve-events-readable-by-role.util.ts
index 74bd96e8d08..abb2dbdd1e9 100644
--- a/packages/twenty-server/src/engine/permissions/combine/utils/resolve-events-readable-by-role.util.ts
+++ b/packages/twenty-server/src/engine/permissions/combine/utils/resolve-events-readable-by-role.util.ts
@@ -30,8 +30,8 @@ export const resolveEventsReadableByRole = async <
const principal: PermissionsPrincipalsWithRolesContext = {
workspaceId: workspaceEventBatch.workspaceId,
- mainPrincipal: { roleId, applicationId },
- applicationPrincipal: { roleId, applicationId },
+ mainPrincipal: { type: 'application', roleId, applicationId },
+ applicationPrincipal: { type: 'application', roleId, applicationId },
};
const objectsPermissions = getPermissionsPrincipalObjectsPermissions({
principal,
@@ -40,8 +40,8 @@ export const resolveEventsReadableByRole = async <
const admittedRecordIds =
await eventRecordAccessGate.resolveAdmittedRecordIds({
workspaceId: workspaceEventBatch.workspaceId,
- mainPrincipal: { applicationId },
- applicationPrincipal: { applicationId },
+ mainPrincipal: { type: 'application', applicationId },
+ applicationPrincipal: { type: 'application', applicationId },
});
return workspaceEventBatch.events
diff --git a/packages/twenty-server/src/engine/permissions/permissions.service.ts b/packages/twenty-server/src/engine/permissions/permissions.service.ts
index a6468f55026..c306a096bfc 100644
--- a/packages/twenty-server/src/engine/permissions/permissions.service.ts
+++ b/packages/twenty-server/src/engine/permissions/permissions.service.ts
@@ -86,8 +86,8 @@ export class PermissionsService {
permissionFlags,
objectsPermissions: computeObjectsPermissionsForRoles({
principal: {
- mainPrincipal: { roleId: flatRole.id, isDeprecatedRoleOnly: true },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: { type: 'deprecatedRoleOnly', roleId: flatRole.id },
+ applicationPrincipal: { type: 'customApplication' },
},
rolesPermissions,
flatObjectMetadataMaps,
diff --git a/packages/twenty-server/src/engine/permissions/principal/types/permissions-principals-context.type.ts b/packages/twenty-server/src/engine/permissions/principal/types/permissions-principals-context.type.ts
index dfa4ef807cf..21f76739f3b 100644
--- a/packages/twenty-server/src/engine/permissions/principal/types/permissions-principals-context.type.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/types/permissions-principals-context.type.ts
@@ -1,26 +1,55 @@
/* @license Enterprise */
-// TODO(@charlesBochet): drop isDeprecatedRoleOnly once every caller names the principal holding the role
+// TODO(@charlesBochet): drop deprecatedRoleOnly once every caller names the principal holding the role
export type PermissionsDeprecatedRoleOnlyPrincipal = {
+ type: 'deprecatedRoleOnly';
roleId: string;
- isDeprecatedRoleOnly: true;
+};
+
+export type PermissionsWorkspaceMemberPrincipal = {
+ type: 'workspaceMember';
+ workspaceMemberId: string;
+};
+
+export type PermissionsApiKeyPrincipal = {
+ type: 'apiKey';
+ apiKeyId: string;
+};
+
+export type PermissionsAgentPrincipal = {
+ type: 'agent';
+ agentId: string;
+};
+
+export type PermissionsWebhookPrincipal = {
+ type: 'webhook';
+ webhookId: string;
+};
+
+export type PermissionsApplicationIdPrincipal = {
+ type: 'application';
+ applicationId: string;
+};
+
+export type PermissionsCustomApplicationPrincipal = {
+ type: 'customApplication';
};
export type PermissionsMainPrincipal =
- | { workspaceMemberId: string }
- | { apiKeyId: string }
- | { agentId: string }
- | { webhookId: string }
- | { applicationId: string }
+ | PermissionsWorkspaceMemberPrincipal
+ | PermissionsApiKeyPrincipal
+ | PermissionsAgentPrincipal
+ | PermissionsWebhookPrincipal
+ | PermissionsApplicationIdPrincipal
| PermissionsDeprecatedRoleOnlyPrincipal;
export type PermissionsLimitingPrincipal =
- | { agentId: string }
+ | PermissionsAgentPrincipal
| PermissionsDeprecatedRoleOnlyPrincipal;
export type PermissionsApplicationPrincipal =
- | { applicationId: string }
- | { isCustomApp: true }
+ | PermissionsApplicationIdPrincipal
+ | PermissionsCustomApplicationPrincipal
| PermissionsDeprecatedRoleOnlyPrincipal;
export type PermissionsPrincipalsContext = {
diff --git a/packages/twenty-server/src/engine/permissions/principal/types/permissions-principals-with-roles-context.type.ts b/packages/twenty-server/src/engine/permissions/principal/types/permissions-principals-with-roles-context.type.ts
index 47a1ea651da..191e9fa5d82 100644
--- a/packages/twenty-server/src/engine/permissions/principal/types/permissions-principals-with-roles-context.type.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/types/permissions-principals-with-roles-context.type.ts
@@ -1,22 +1,32 @@
/* @license Enterprise */
-import { type PermissionsDeprecatedRoleOnlyPrincipal } from 'src/engine/permissions/principal/types/permissions-principals-context.type';
+import {
+ type PermissionsAgentPrincipal,
+ type PermissionsApiKeyPrincipal,
+ type PermissionsApplicationIdPrincipal,
+ type PermissionsCustomApplicationPrincipal,
+ type PermissionsDeprecatedRoleOnlyPrincipal,
+ type PermissionsWebhookPrincipal,
+ type PermissionsWorkspaceMemberPrincipal,
+} from 'src/engine/permissions/principal/types/permissions-principals-context.type';
+
+type WithRoleId<TPrincipal> = TPrincipal & { roleId: string };
export type PermissionsMainPrincipalWithRole =
- | { roleId: string; workspaceMemberId: string }
- | { roleId: string; apiKeyId: string }
- | { roleId: string; agentId: string }
- | { roleId: string; webhookId: string }
- | { roleId: string; applicationId: string }
+ | WithRoleId<PermissionsWorkspaceMemberPrincipal>
+ | WithRoleId<PermissionsApiKeyPrincipal>
+ | WithRoleId<PermissionsAgentPrincipal>
+ | WithRoleId<PermissionsWebhookPrincipal>
+ | WithRoleId<PermissionsApplicationIdPrincipal>
| PermissionsDeprecatedRoleOnlyPrincipal;
export type PermissionsLimitingPrincipalWithRole =
- | { roleId: string; agentId: string }
+ | WithRoleId<PermissionsAgentPrincipal>
| PermissionsDeprecatedRoleOnlyPrincipal;
export type PermissionsApplicationPrincipalWithRole =
- | { roleId: string; applicationId: string }
- | { isCustomApp: true }
+ | WithRoleId<PermissionsApplicationIdPrincipal>
+ | PermissionsCustomApplicationPrincipal
| PermissionsDeprecatedRoleOnlyPrincipal;
export type PermissionsPrincipalsWithRolesContext = {
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/build-permissions-principal-roles.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/build-permissions-principal-roles.util.spec.ts
index 2da556260f0..6d9bb40b392 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/build-permissions-principal-roles.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/build-permissions-principal-roles.util.spec.ts
@@ -10,9 +10,9 @@ const APPLICATION_ROLE_ID = 'application-role';
const MEMBER_PRINCIPALS: PermissionsPrincipalsContext = {
workspaceId: 'workspace-1',
- mainPrincipal: { workspaceMemberId: MEMBER_ID },
- limitingPrincipal: { agentId: AGENT_ID },
- applicationPrincipal: { applicationId: APPLICATION_ID },
+ mainPrincipal: { type: 'workspaceMember', workspaceMemberId: MEMBER_ID },
+ limitingPrincipal: { type: 'agent', agentId: AGENT_ID },
+ applicationPrincipal: { type: 'application', applicationId: APPLICATION_ID },
};
describe('buildPermissionsPrincipalRoles', () => {
@@ -27,9 +27,18 @@ describe('buildPermissionsPrincipalRoles', () => {
principalsContext: MEMBER_PRINCIPALS,
}),
).toEqual({
- mainPrincipal: { roleId: USER_ROLE_ID, workspaceMemberId: MEMBER_ID },
- limitingPrincipal: { roleId: AGENT_ROLE_ID, agentId: AGENT_ID },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ roleId: USER_ROLE_ID,
+ workspaceMemberId: MEMBER_ID,
+ },
+ limitingPrincipal: {
+ type: 'agent',
+ roleId: AGENT_ROLE_ID,
+ agentId: AGENT_ID,
+ },
applicationPrincipal: {
+ type: 'application',
roleId: APPLICATION_ROLE_ID,
applicationId: APPLICATION_ID,
},
@@ -42,14 +51,18 @@ describe('buildPermissionsPrincipalRoles', () => {
roleIdsBySource: { apiKeyRoleId: 'api-key-role' },
principalsContext: {
workspaceId: 'workspace-1',
- mainPrincipal: { apiKeyId: 'api-key-1' },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: { type: 'apiKey', apiKeyId: 'api-key-1' },
+ applicationPrincipal: { type: 'customApplication' },
},
}),
).toEqual({
- mainPrincipal: { roleId: 'api-key-role', apiKeyId: 'api-key-1' },
+ mainPrincipal: {
+ type: 'apiKey',
+ roleId: 'api-key-role',
+ apiKeyId: 'api-key-1',
+ },
limitingPrincipal: undefined,
- applicationPrincipal: { isCustomApp: true },
+ applicationPrincipal: { type: 'customApplication' },
});
});
@@ -59,17 +72,22 @@ describe('buildPermissionsPrincipalRoles', () => {
roleIdsBySource: { applicationRoleId: APPLICATION_ROLE_ID },
principalsContext: {
workspaceId: 'workspace-1',
- mainPrincipal: { applicationId: APPLICATION_ID },
- applicationPrincipal: { applicationId: APPLICATION_ID },
+ mainPrincipal: { type: 'application', applicationId: APPLICATION_ID },
+ applicationPrincipal: {
+ type: 'application',
+ applicationId: APPLICATION_ID,
+ },
},
}),
).toEqual({
mainPrincipal: {
+ type: 'application',
roleId: APPLICATION_ROLE_ID,
applicationId: APPLICATION_ID,
},
limitingPrincipal: undefined,
applicationPrincipal: {
+ type: 'application',
roleId: APPLICATION_ROLE_ID,
applicationId: APPLICATION_ID,
},
@@ -87,9 +105,13 @@ describe('buildPermissionsPrincipalRoles', () => {
principalsContext: MEMBER_PRINCIPALS,
}),
).toEqual({
- mainPrincipal: { roleId: USER_ROLE_ID, workspaceMemberId: MEMBER_ID },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ roleId: USER_ROLE_ID,
+ workspaceMemberId: MEMBER_ID,
+ },
limitingPrincipal: undefined,
- applicationPrincipal: { isCustomApp: true },
+ applicationPrincipal: { type: 'customApplication' },
});
});
@@ -121,9 +143,9 @@ describe('buildPermissionsPrincipalRoles', () => {
principalsContext: undefined,
}),
).toEqual({
- mainPrincipal: { roleId: AGENT_ROLE_ID, isDeprecatedRoleOnly: true },
+ mainPrincipal: { type: 'deprecatedRoleOnly', roleId: AGENT_ROLE_ID },
limitingPrincipal: undefined,
- applicationPrincipal: { isCustomApp: true },
+ applicationPrincipal: { type: 'customApplication' },
});
});
});
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-acting-application-id.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-acting-application-id.util.spec.ts
index 52b42a9867c..02ea8439b7b 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-acting-application-id.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-acting-application-id.util.spec.ts
@@ -19,8 +19,13 @@ describe('getPermissionsPrincipalActingApplicationId', () => {
expect(
getPermissionsPrincipalActingApplicationId({
principal: {
- mainPrincipal: { roleId: 'user-role', workspaceMemberId: 'member-1' },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ roleId: 'user-role',
+ workspaceMemberId: 'member-1',
+ },
applicationPrincipal: {
+ type: 'application',
roleId: APPLICATION_ROLE_ID,
applicationId: APPLICATION_ID,
},
@@ -35,10 +40,12 @@ describe('getPermissionsPrincipalActingApplicationId', () => {
getPermissionsPrincipalActingApplicationId({
principal: {
mainPrincipal: {
+ type: 'application',
roleId: APPLICATION_ROLE_ID,
applicationId: APPLICATION_ID,
},
applicationPrincipal: {
+ type: 'application',
roleId: APPLICATION_ROLE_ID,
applicationId: APPLICATION_ID,
},
@@ -52,10 +59,10 @@ describe('getPermissionsPrincipalActingApplicationId', () => {
expect(
getPermissionsPrincipalActingApplicationId({
principal: {
- mainPrincipal: { roleId: 'user-role', isDeprecatedRoleOnly: true },
+ mainPrincipal: { type: 'deprecatedRoleOnly', roleId: 'user-role' },
applicationPrincipal: {
+ type: 'deprecatedRoleOnly',
roleId: APPLICATION_ROLE_ID,
- isDeprecatedRoleOnly: true,
},
},
flatApplicationMaps,
@@ -68,12 +75,12 @@ describe('getPermissionsPrincipalActingApplicationId', () => {
getPermissionsPrincipalActingApplicationId({
principal: {
mainPrincipal: {
+ type: 'deprecatedRoleOnly',
roleId: APPLICATION_ROLE_ID,
- isDeprecatedRoleOnly: true,
},
applicationPrincipal: {
+ type: 'deprecatedRoleOnly',
roleId: APPLICATION_ROLE_ID,
- isDeprecatedRoleOnly: true,
},
},
flatApplicationMaps,
@@ -86,10 +93,12 @@ describe('getPermissionsPrincipalActingApplicationId', () => {
getPermissionsPrincipalActingApplicationId({
principal: {
mainPrincipal: {
+ type: 'workspaceMember',
roleId: APPLICATION_ROLE_ID,
workspaceMemberId: 'member-1',
},
applicationPrincipal: {
+ type: 'application',
roleId: APPLICATION_ROLE_ID,
applicationId: APPLICATION_ID,
},
@@ -103,8 +112,12 @@ describe('getPermissionsPrincipalActingApplicationId', () => {
expect(
getPermissionsPrincipalActingApplicationId({
principal: {
- mainPrincipal: { roleId: 'user-role', workspaceMemberId: 'member-1' },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ roleId: 'user-role',
+ workspaceMemberId: 'member-1',
+ },
+ applicationPrincipal: { type: 'customApplication' },
},
flatApplicationMaps,
}),
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-role-ids.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-role-ids.util.spec.ts
index 58b3d425a22..91a97c2e814 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-role-ids.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principal-role-ids.util.spec.ts
@@ -4,9 +4,18 @@ describe('getPermissionsPrincipalRoleIds', () => {
it('lists the limiting role first and drops duplicates', () => {
expect(
getPermissionsPrincipalRoleIds({
- mainPrincipal: { roleId: 'user-role', workspaceMemberId: 'member-1' },
- limitingPrincipal: { roleId: 'agent-role', agentId: 'agent-1' },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ roleId: 'user-role',
+ workspaceMemberId: 'member-1',
+ },
+ limitingPrincipal: {
+ type: 'agent',
+ roleId: 'agent-role',
+ agentId: 'agent-1',
+ },
applicationPrincipal: {
+ type: 'application',
roleId: 'user-role',
applicationId: 'application-1',
},
@@ -17,8 +26,12 @@ describe('getPermissionsPrincipalRoleIds', () => {
it('leaves the custom app out of the intersection', () => {
expect(
getPermissionsPrincipalRoleIds({
- mainPrincipal: { roleId: 'user-role', workspaceMemberId: 'member-1' },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ roleId: 'user-role',
+ workspaceMemberId: 'member-1',
+ },
+ applicationPrincipal: { type: 'customApplication' },
}),
).toEqual(['user-role']);
});
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/build-deprecated-permissions-principals-from-config.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-deprecated-permissions-principals-from-config.util.ts
index 3d7f83fb1a5..9efc736594a 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/build-deprecated-permissions-principals-from-config.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/build-deprecated-permissions-principals-from-config.util.ts
@@ -32,13 +32,13 @@ export const buildDeprecatedPermissionsPrincipalsFromConfig = ({
return {
workspaceId,
- mainPrincipal: { roleId: mainPrincipal.roleId, isDeprecatedRoleOnly: true },
+ mainPrincipal: { type: 'deprecatedRoleOnly', roleId: mainPrincipal.roleId },
limitingPrincipal: isDefined(limitingPrincipal)
- ? { roleId: limitingPrincipal.roleId, isDeprecatedRoleOnly: true }
+ ? { type: 'deprecatedRoleOnly', roleId: limitingPrincipal.roleId }
: undefined,
applicationPrincipal:
- 'roleId' in applicationPrincipal
- ? { roleId: applicationPrincipal.roleId, isDeprecatedRoleOnly: true }
- : { isCustomApp: true },
+ applicationPrincipal.type === 'customApplication'
+ ? applicationPrincipal
+ : { type: 'deprecatedRoleOnly', roleId: applicationPrincipal.roleId },
};
};
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal-roles.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal-roles.util.ts
index 139edfe9a61..a3fa77befb3 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal-roles.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principal-roles.util.ts
@@ -29,29 +29,23 @@ const getMainRoleIdKey = ({
mainPrincipal: PermissionsMainPrincipal | undefined;
roleIdsBySource: RoleIdsBySource;
}): keyof RoleIdsBySource | undefined => {
- if (!isDefined(mainPrincipal) || 'isDeprecatedRoleOnly' in mainPrincipal) {
- return FALLBACK_MAIN_ROLE_ID_KEYS.find(
- (roleIdKey) => roleIdsBySource[roleIdKey] !== undefined,
- );
+ switch (mainPrincipal?.type) {
+ case undefined:
+ case 'deprecatedRoleOnly':
+ return FALLBACK_MAIN_ROLE_ID_KEYS.find(
+ (roleIdKey) => roleIdsBySource[roleIdKey] !== undefined,
+ );
+ case 'workspaceMember':
+ return 'userWorkspaceRoleId';
+ case 'apiKey':
+ return 'apiKeyRoleId';
+ case 'agent':
+ return 'agentRoleId';
+ case 'application':
+ return 'applicationRoleId';
+ case 'webhook':
+ return 'webhookRoleId';
}
-
- if ('workspaceMemberId' in mainPrincipal) {
- return 'userWorkspaceRoleId';
- }
-
- if ('apiKeyId' in mainPrincipal) {
- return 'apiKeyRoleId';
- }
-
- if ('agentId' in mainPrincipal) {
- return 'agentRoleId';
- }
-
- if ('applicationId' in mainPrincipal) {
- return 'applicationRoleId';
- }
-
- return 'webhookRoleId';
};
// TODO(@charlesBochet): an agent or application always needs a role; until then one without counts as the custom app
@@ -67,8 +61,8 @@ const buildLimitingPrincipal = ({
}
return isDefined(agentId)
- ? { roleId: agentRoleId, agentId }
- : { roleId: agentRoleId, isDeprecatedRoleOnly: true };
+ ? { type: 'agent', roleId: agentRoleId, agentId }
+ : { type: 'deprecatedRoleOnly', roleId: agentRoleId };
};
const buildApplicationPrincipal = ({
@@ -79,12 +73,12 @@ const buildApplicationPrincipal = ({
applicationId: string | undefined;
}): PermissionsApplicationPrincipalWithRole => {
if (!isDefined(applicationRoleId)) {
- return { isCustomApp: true };
+ return { type: 'customApplication' };
}
return isDefined(applicationId)
- ? { roleId: applicationRoleId, applicationId }
- : { roleId: applicationRoleId, isDeprecatedRoleOnly: true };
+ ? { type: 'application', roleId: applicationRoleId, applicationId }
+ : { type: 'deprecatedRoleOnly', roleId: applicationRoleId };
};
const getIdentifiedMainPrincipal = (
@@ -92,9 +86,9 @@ const getIdentifiedMainPrincipal = (
) => {
const mainPrincipal = principalsContext?.mainPrincipal;
- return isDefined(mainPrincipal) && !('isDeprecatedRoleOnly' in mainPrincipal)
- ? mainPrincipal
- : undefined;
+ return mainPrincipal?.type === 'deprecatedRoleOnly'
+ ? undefined
+ : mainPrincipal;
};
export const buildPermissionsPrincipalRoles = ({
@@ -131,7 +125,7 @@ export const buildPermissionsPrincipalRoles = ({
identifiedMainPrincipal,
)
? { ...identifiedMainPrincipal, roleId: mainRoleId }
- : { roleId: mainRoleId, isDeprecatedRoleOnly: true };
+ : { type: 'deprecatedRoleOnly', roleId: mainRoleId };
const limitingPrincipal = principalsContext?.limitingPrincipal;
const applicationPrincipal = principalsContext?.applicationPrincipal;
@@ -144,15 +138,14 @@ export const buildPermissionsPrincipalRoles = ({
: buildLimitingPrincipal({
agentRoleId: roleIdsBySource.agentRoleId,
agentId:
- isDefined(limitingPrincipal) && 'agentId' in limitingPrincipal
+ limitingPrincipal?.type === 'agent'
? limitingPrincipal.agentId
: undefined,
}),
applicationPrincipal: buildApplicationPrincipal({
applicationRoleId: roleIdsBySource.applicationRoleId,
applicationId:
- isDefined(applicationPrincipal) &&
- 'applicationId' in applicationPrincipal
+ applicationPrincipal?.type === 'application'
? applicationPrincipal.applicationId
: undefined,
}),
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principals-context.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principals-context.util.ts
index 9d0cb47b9d2..1500a6af5cd 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principals-context.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principals-context.util.ts
@@ -17,15 +17,15 @@ const buildMainPrincipal = ({
applicationId: string | undefined;
}): PermissionsMainPrincipal | undefined => {
if (isDefined(workspaceMemberId)) {
- return { workspaceMemberId };
+ return { type: 'workspaceMember', workspaceMemberId };
}
if (isDefined(apiKeyId)) {
- return { apiKeyId };
+ return { type: 'apiKey', apiKeyId };
}
if (isDefined(applicationId)) {
- return { applicationId };
+ return { type: 'application', applicationId };
}
return undefined;
@@ -57,9 +57,11 @@ export const buildPermissionsPrincipalsContext = ({
return {
workspaceId,
mainPrincipal,
- limitingPrincipal: isDefined(agentId) ? { agentId } : undefined,
+ limitingPrincipal: isDefined(agentId)
+ ? { type: 'agent', agentId }
+ : undefined,
applicationPrincipal: isDefined(applicationId)
- ? { applicationId }
- : { isCustomApp: true },
+ ? { type: 'application', applicationId }
+ : { type: 'customApplication' },
};
};
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-acting-application-id.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-acting-application-id.util.ts
index e901a226135..49ed8ce18dc 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-acting-application-id.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-acting-application-id.util.ts
@@ -18,20 +18,20 @@ export const getPermissionsPrincipalActingApplicationId = ({
}): string | undefined => {
const { mainPrincipal, limitingPrincipal, applicationPrincipal } = principal;
- if ('applicationId' in mainPrincipal) {
+ if (mainPrincipal.type === 'application') {
return mainPrincipal.applicationId;
}
if (
- !('roleId' in applicationPrincipal) ||
- ('workspaceMemberId' in mainPrincipal &&
+ applicationPrincipal.type === 'customApplication' ||
+ (mainPrincipal.type === 'workspaceMember' &&
applicationPrincipal.roleId === mainPrincipal.roleId) ||
applicationPrincipal.roleId === limitingPrincipal?.roleId
) {
return undefined;
}
- if ('applicationId' in applicationPrincipal) {
+ if (applicationPrincipal.type === 'application') {
return applicationPrincipal.applicationId;
}
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util.ts
index cf5e339245d..efaeb2ba68d 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-role-ids.util.ts
@@ -14,9 +14,9 @@ export const getPermissionsPrincipalRoleIds = (
[
principal.limitingPrincipal?.roleId,
principal.mainPrincipal.roleId,
- 'roleId' in principal.applicationPrincipal
- ? principal.applicationPrincipal.roleId
- : undefined,
+ principal.applicationPrincipal.type === 'customApplication'
+ ? undefined
+ : principal.applicationPrincipal.roleId,
].filter(isDefined),
),
];
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-workspace-member-id.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-workspace-member-id.util.ts
index 42b7488305f..f06c260d25c 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-workspace-member-id.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principal-workspace-member-id.util.ts
@@ -5,6 +5,6 @@ import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissio
export const getPermissionsPrincipalWorkspaceMemberId = (
principal: Pick<PermissionsPrincipalsWithRolesContext, 'mainPrincipal'>,
): string | undefined =>
- 'workspaceMemberId' in principal.mainPrincipal
+ principal.mainPrincipal.type === 'workspaceMember'
? principal.mainPrincipal.workspaceMemberId
: undefined;
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util.ts
index 5f4cbc9d465..e1dfc6dbdc2 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util.ts
@@ -47,6 +47,27 @@ type PermissionsPrincipalRoleMaps = {
flatRoleTargetMaps?: AllFlatEntityMaps['flatRoleTargetMaps'];
};
+const findWorkspaceMemberRoleId = ({
+ workspaceMemberId,
+ roleMaps,
+}: {
+ workspaceMemberId: string;
+ roleMaps: Pick<
+ PermissionsPrincipalRoleMaps,
+ 'flatWorkspaceMemberMaps' | 'userWorkspaceRoleMap'
+ >;
+}): string | undefined => {
+ const userId =
+ roleMaps.flatWorkspaceMemberMaps.byId[workspaceMemberId]?.userId;
+ const userWorkspaceId = isDefined(userId)
+ ? roleMaps.flatWorkspaceMemberMaps.userWorkspaceIdByUserId[userId]
+ : undefined;
+
+ return isDefined(userWorkspaceId)
+ ? roleMaps.userWorkspaceRoleMap[userWorkspaceId]
+ : undefined;
+};
+
const findMainPrincipalRoleId = ({
mainPrincipal,
roleMaps,
@@ -54,49 +75,36 @@ const findMainPrincipalRoleId = ({
mainPrincipal: PermissionsMainPrincipal;
roleMaps: PermissionsPrincipalRoleMaps;
}): string | undefined => {
- if ('isDeprecatedRoleOnly' in mainPrincipal) {
- return mainPrincipal.roleId;
- }
-
- if ('workspaceMemberId' in mainPrincipal) {
- const userId =
- roleMaps.flatWorkspaceMemberMaps.byId[mainPrincipal.workspaceMemberId]
- ?.userId;
- const userWorkspaceId = isDefined(userId)
- ? roleMaps.flatWorkspaceMemberMaps.userWorkspaceIdByUserId[userId]
- : undefined;
-
- return isDefined(userWorkspaceId)
- ? roleMaps.userWorkspaceRoleMap[userWorkspaceId]
- : undefined;
+ switch (mainPrincipal.type) {
+ case 'deprecatedRoleOnly':
+ return mainPrincipal.roleId;
+ case 'workspaceMember':
+ return findWorkspaceMemberRoleId({
+ workspaceMemberId: mainPrincipal.workspaceMemberId,
+ roleMaps,
+ });
+ case 'apiKey':
+ return roleMaps.apiKeyRoleMap[mainPrincipal.apiKeyId];
+ case 'agent':
+ return roleMaps.flatRoleTargetByAgentIdMaps[mainPrincipal.agentId]
+ ?.roleId;
+ case 'application': {
+ const flatApplication =
+ roleMaps.flatApplicationMaps.byId[mainPrincipal.applicationId];
+
+ return isDefined(flatApplication) && !isDefined(flatApplication.deletedAt)
+ ? (flatApplication.defaultRoleId ?? undefined)
+ : undefined;
+ }
+ case 'webhook':
+ return isDefined(roleMaps.flatRoleTargetMaps)
+ ? findFlatRoleTargetFromForeignKey({
+ flatRoleTargetMaps: roleMaps.flatRoleTargetMaps,
+ targetMetadataForeignKey: 'webhookId',
+ targetId: mainPrincipal.webhookId,
+ })?.roleId
+ : undefined;
}
-
- if ('apiKeyId' in mainPrincipal) {
- return roleMaps.apiKeyRoleMap[mainPrincipal.apiKeyId];
- }
-
- if ('agentId' in mainPrincipal) {
- return roleMaps.flatRoleTargetByAgentIdMaps[mainPrincipal.agentId]?.roleId;
- }
-
- if ('applicationId' in mainPrincipal) {
- const flatApplication =
- roleMaps.flatApplicationMaps.byId[mainPrincipal.applicationId];
-
- return isDefined(flatApplication) && !isDefined(flatApplication.deletedAt)
- ? (flatApplication.defaultRoleId ?? undefined)
- : undefined;
- }
-
- if (!isDefined(roleMaps.flatRoleTargetMaps)) {
- return undefined;
- }
-
- return findFlatRoleTargetFromForeignKey({
- flatRoleTargetMaps: roleMaps.flatRoleTargetMaps,
- targetMetadataForeignKey: 'webhookId',
- targetId: mainPrincipal.webhookId,
- })?.roleId;
};
// TODO(@charlesBochet): an agent or application always needs a role; until then one without counts as the custom app
@@ -109,7 +117,7 @@ const resolveLimitingPrincipal = ({
}): PermissionsLimitingPrincipalWithRole | undefined => {
if (
!isDefined(limitingPrincipal) ||
- 'isDeprecatedRoleOnly' in limitingPrincipal
+ limitingPrincipal.type === 'deprecatedRoleOnly'
) {
return limitingPrincipal;
}
@@ -118,7 +126,7 @@ const resolveLimitingPrincipal = ({
roleMaps.flatRoleTargetByAgentIdMaps[limitingPrincipal.agentId]?.roleId;
return isDefined(roleId)
- ? { roleId, agentId: limitingPrincipal.agentId }
+ ? { type: 'agent', roleId, agentId: limitingPrincipal.agentId }
: undefined;
};
@@ -131,7 +139,7 @@ const resolveApplicationPrincipal = ({
mainPrincipal: PermissionsMainPrincipalWithRole;
roleMaps: PermissionsPrincipalRoleMaps;
}): PermissionsApplicationPrincipalWithRole | undefined => {
- if (!('applicationId' in applicationPrincipal)) {
+ if (applicationPrincipal.type !== 'application') {
return applicationPrincipal;
}
@@ -145,15 +153,18 @@ const resolveApplicationPrincipal = ({
const { applicationRoleId } = resolveApplicationRoleId({
application: flatApplication,
userRoleId:
- 'workspaceMemberId' in mainPrincipal ? mainPrincipal.roleId : undefined,
+ mainPrincipal.type === 'workspaceMember'
+ ? mainPrincipal.roleId
+ : undefined,
});
return isDefined(applicationRoleId)
? {
+ type: 'application',
roleId: applicationRoleId,
applicationId: applicationPrincipal.applicationId,
}
- : { isCustomApp: true };
+ : { type: 'customApplication' };
};
export const resolvePermissionsPrincipalsWithRoles = ({
diff --git a/packages/twenty-server/src/engine/permissions/record-share/services/record-share-principal.service.ts b/packages/twenty-server/src/engine/permissions/record-share/services/record-share-principal.service.ts
index 26977b34aff..c17642740aa 100644
--- a/packages/twenty-server/src/engine/permissions/record-share/services/record-share-principal.service.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/services/record-share-principal.service.ts
@@ -126,8 +126,8 @@ export class RecordSharePrincipalService {
const rolePrincipal: PermissionsPrincipalsWithRolesContext = {
workspaceId,
- mainPrincipal: { roleId, isDeprecatedRoleOnly: true },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: { type: 'deprecatedRoleOnly', roleId },
+ applicationPrincipal: { type: 'customApplication' },
};
if (
@@ -156,8 +156,11 @@ export class RecordSharePrincipalService {
const hasGrant = await this.recordAccessPolicyService.hasAccessToRecords({
principals: {
workspaceId,
- mainPrincipal: { workspaceMemberId: principal.principalId },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ workspaceMemberId: principal.principalId,
+ },
+ applicationPrincipal: { type: 'customApplication' },
},
flatObjectMetadata,
operationType: 'select',
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts
index f77c8eaf132..d6fec3af43e 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/get-objects-permissions-from-role-permission-config.util.spec.ts
@@ -176,8 +176,11 @@ describe('getObjectsPermissionsFromRolePermissionConfig', () => {
getObjectsPermissionsFromRolePermissionConfig({
principals: {
workspaceId: 'workspace-1',
- mainPrincipal: { workspaceMemberId: 'member-id' },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ workspaceMemberId: 'member-id',
+ },
+ applicationPrincipal: { type: 'customApplication' },
},
rolesPermissions,
flatObjectMetadataMaps: EMPTY_FLAT_OBJECT_METADATA_MAPS,
@@ -279,8 +282,14 @@ describe('getObjectsPermissionsFromRolePermissionConfig disabled actions', () =>
actor: 'the owning application',
principals: {
workspaceId: 'workspace-1',
- mainPrincipal: { applicationId: 'owning-application-id' },
- applicationPrincipal: { applicationId: 'owning-application-id' },
+ mainPrincipal: {
+ type: 'application',
+ applicationId: 'owning-application-id',
+ },
+ applicationPrincipal: {
+ type: 'application',
+ applicationId: 'owning-application-id',
+ },
},
intersectionOf: { applicationRoleId: 'owning-application-role-id' },
canDestroy: true,
@@ -289,8 +298,14 @@ describe('getObjectsPermissionsFromRolePermissionConfig disabled actions', () =>
actor: 'another application',
principals: {
workspaceId: 'workspace-1',
- mainPrincipal: { applicationId: 'other-application-id' },
- applicationPrincipal: { applicationId: 'other-application-id' },
+ mainPrincipal: {
+ type: 'application',
+ applicationId: 'other-application-id',
+ },
+ applicationPrincipal: {
+ type: 'application',
+ applicationId: 'other-application-id',
+ },
},
intersectionOf: { applicationRoleId: 'other-application-role-id' },
canDestroy: false,
@@ -299,8 +314,11 @@ describe('getObjectsPermissionsFromRolePermissionConfig disabled actions', () =>
actor: 'a user',
principals: {
workspaceId: 'workspace-1',
- mainPrincipal: { workspaceMemberId: 'member-id' },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ workspaceMemberId: 'member-id',
+ },
+ applicationPrincipal: { type: 'customApplication' },
},
intersectionOf: { userWorkspaceRoleId: 'user-role-id' },
canDestroy: false,
@@ -309,8 +327,14 @@ describe('getObjectsPermissionsFromRolePermissionConfig disabled actions', () =>
actor: 'a user through the owning application',
principals: {
workspaceId: 'workspace-1',
- mainPrincipal: { workspaceMemberId: 'member-id' },
- applicationPrincipal: { applicationId: 'owning-application-id' },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ workspaceMemberId: 'member-id',
+ },
+ applicationPrincipal: {
+ type: 'application',
+ applicationId: 'owning-application-id',
+ },
},
intersectionOf: {
userWorkspaceRoleId: 'user-role-id',
@@ -322,8 +346,11 @@ describe('getObjectsPermissionsFromRolePermissionConfig disabled actions', () =>
actor: "a user holding the owning application's default role",
principals: {
workspaceId: 'workspace-1',
- mainPrincipal: { workspaceMemberId: 'member-id' },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ workspaceMemberId: 'member-id',
+ },
+ applicationPrincipal: { type: 'customApplication' },
},
intersectionOf: { userWorkspaceRoleId: 'owning-application-role-id' },
canDestroy: false,
@@ -332,8 +359,8 @@ describe('getObjectsPermissionsFromRolePermissionConfig disabled actions', () =>
actor: "an API key holding the owning application's default role",
principals: {
workspaceId: 'workspace-1',
- mainPrincipal: { apiKeyId: 'api-key-id' },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: { type: 'apiKey', apiKeyId: 'api-key-id' },
+ applicationPrincipal: { type: 'customApplication' },
},
intersectionOf: { apiKeyRoleId: 'owning-application-role-id' },
canDestroy: false,
@@ -342,8 +369,8 @@ describe('getObjectsPermissionsFromRolePermissionConfig disabled actions', () =>
actor: "an agent holding the owning application's default role",
principals: {
workspaceId: 'workspace-1',
- mainPrincipal: { agentId: 'agent-id' },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: { type: 'agent', agentId: 'agent-id' },
+ applicationPrincipal: { type: 'customApplication' },
},
intersectionOf: { agentRoleId: 'owning-application-role-id' },
canDestroy: false,
@@ -352,8 +379,14 @@ describe('getObjectsPermissionsFromRolePermissionConfig disabled actions', () =>
actor: 'the owning application with a user holding its default role',
principals: {
workspaceId: 'workspace-1',
- mainPrincipal: { workspaceMemberId: 'member-id' },
- applicationPrincipal: { applicationId: 'owning-application-id' },
+ mainPrincipal: {
+ type: 'workspaceMember',
+ workspaceMemberId: 'member-id',
+ },
+ applicationPrincipal: {
+ type: 'application',
+ applicationId: 'owning-application-id',
+ },
},
intersectionOf: {
userWorkspaceRoleId: 'owning-application-role-id',
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts
index c895342e44f..cedfdb34451 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/chat-thread-sharing.integration-spec.ts
@@ -996,8 +996,8 @@ describe('Conversations through the record API', () => {
.buildEventRecordAccessGate(batch)
.resolveAdmittedRecordIds({
workspaceId: SEED_APPLE_WORKSPACE_ID,
- mainPrincipal: { workspaceMemberId },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: { type: 'workspaceMember', workspaceMemberId },
+ applicationPrincipal: { type: 'customApplication' },
});
return admittedRecordIds.has(threadId);
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-level-sharing-restricted-record-surfaces.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-level-sharing-restricted-record-surfaces.integration-spec.ts
index f000da0fc2c..9a879bc97d6 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-level-sharing-restricted-record-surfaces.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-level-sharing-restricted-record-surfaces.integration-spec.ts
@@ -309,9 +309,10 @@ describe('A restricted record on an object open by default', () => {
.resolveAdmittedRecordIds({
workspaceId: workspaceId,
mainPrincipal: {
+ type: 'workspaceMember',
workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
},
- applicationPrincipal: { isCustomApp: true },
+ applicationPrincipal: { type: 'customApplication' },
});
expect([...admittedRecordIds]).toEqual([OPEN_COMPANY_ID]);
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-beyond-role.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-beyond-role.integration-spec.ts
index 3c98722a918..ea1ce1781f2 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-beyond-role.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-beyond-role.integration-spec.ts
@@ -258,9 +258,10 @@ describe('Records shared beyond the role that can access their object', () => {
const buildJonyPrincipal = (): PermissionsPrincipalsContext => ({
workspaceId,
mainPrincipal: {
+ type: 'workspaceMember',
workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
},
- applicationPrincipal: { isCustomApp: true },
+ applicationPrincipal: { type: 'customApplication' },
});
expect(
@@ -524,9 +525,10 @@ describe('Records shared beyond the role that can access their object', () => {
.resolveAdmittedRecordIds({
workspaceId: workspaceId,
mainPrincipal: {
+ type: 'workspaceMember',
workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
},
- applicationPrincipal: { isCustomApp: true },
+ applicationPrincipal: { type: 'customApplication' },
});
};
diff --git a/packages/twenty-server/test/integration/twenty-orm/record-access-policy.integration-spec.ts b/packages/twenty-server/test/integration/twenty-orm/record-access-policy.integration-spec.ts
index 0ae312a6445..44e92116fd1 100644
--- a/packages/twenty-server/test/integration/twenty-orm/record-access-policy.integration-spec.ts
+++ b/packages/twenty-server/test/integration/twenty-orm/record-access-policy.integration-spec.ts
@@ -24,8 +24,8 @@ describe('RecordAccessPolicyService', () => {
let recordAccessPolicyService: RecordAccessPolicyService;
const missingRolePrincipal: PermissionsPrincipalsContext = {
workspaceId: SEED_APPLE_WORKSPACE_ID,
- mainPrincipal: { roleId: randomUUID(), isDeprecatedRoleOnly: true },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: { type: 'deprecatedRoleOnly', roleId: randomUUID() },
+ applicationPrincipal: { type: 'customApplication' },
};
// Other suites wipe every person, so the record under test is created here
@@ -71,8 +71,8 @@ describe('RecordAccessPolicyService', () => {
adminPrincipal = {
workspaceId: SEED_APPLE_WORKSPACE_ID,
- mainPrincipal: { roleId: adminRoleId, isDeprecatedRoleOnly: true },
- applicationPrincipal: { isCustomApp: true },
+ mainPrincipal: { type: 'deprecatedRoleOnly', roleId: adminRoleId },
+ applicationPrincipal: { type: 'customApplication' },
};
});