Skip to content

The open alternative to Salesforce, designed for AI.

Resolve permissions principals through one service (#29591)

Charles Bochetae1ced97186a
diff --git a/packages/twenty-server/src/engine/guards/__tests__/settings-permission.guard.spec.ts b/packages/twenty-server/src/engine/guards/__tests__/settings-permission.guard.spec.ts
index d90dfeb9daf..be908f9aaae 100644
--- a/packages/twenty-server/src/engine/guards/__tests__/settings-permission.guard.spec.ts
+++ b/packages/twenty-server/src/engine/guards/__tests__/settings-permission.guard.spec.ts
@@ -17,6 +17,7 @@ import {
PermissionsExceptionCode,
} from 'src/engine/permissions/permissions.exception';
import { PermissionsService } from 'src/engine/permissions/permissions.service';
+import { PermissionsPrincipalsService } from 'src/engine/permissions/principal/services/permissions-principals.service';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
describe('SettingsPermissionGuard', () => {
@@ -175,6 +176,7 @@ describe('SettingsPermissionGuard', () => {
const module: TestingModule = await Test.createTestingModule({
providers: [
PermissionsService,
+ PermissionsPrincipalsService,
{ provide: ApiKeyRoleService, useValue: {} },
{
provide: WorkspaceCacheService,
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 13e42faa3a8..a371729f0cd 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
@@ -16,7 +16,7 @@ import {
PermissionsExceptionCode,
PermissionsExceptionMessage,
} from 'src/engine/permissions/permissions.exception';
-import { PermissionsService } from 'src/engine/permissions/permissions.service';
+import { PermissionsPrincipalsService } from 'src/engine/permissions/principal/services/permissions-principals.service';
import { getPermissionsPrincipalsObjectsPermissions } from 'src/engine/permissions/role/utils/get-permissions-principals-objects-permissions.util';
import { PrivateRecordStorageService } from 'src/engine/permissions/private-record/services/private-record-storage.service';
import { type PrivateRecordState } from 'src/engine/permissions/private-record/types/private-record-state.type';
@@ -87,7 +87,7 @@ export class RecordAccessPolicyService {
private readonly recordShareStorageService: RecordShareStorageService,
private readonly privateRecordStorageService: PrivateRecordStorageService,
private readonly workspaceOrmManager: WorkspaceOrmManager,
- private readonly permissionsService: PermissionsService,
+ private readonly permissionsPrincipalsService: PermissionsPrincipalsService,
) {}
forAuthContext(
@@ -466,7 +466,9 @@ export class RecordAccessPolicyService {
private resolvePrincipalsWithRoles(
authContext: PermissionsAuthContext,
): Promise<PermissionsPrincipalsWithRolesContext | undefined> {
- return this.permissionsService.findPrincipalsWithRoles(authContext);
+ return this.permissionsPrincipalsService.findPrincipalsWithRoles(
+ authContext,
+ );
}
private findPrincipalsMetadataMaps(
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 8fdda09f38e..6bafcc211e0 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,7 +101,7 @@ const fullAccess = {
const rolePrincipals: PermissionsPrincipalsWithRolesContext = {
workspaceId: 'workspace-id',
- mainPrincipal: { type: 'deprecatedRoleOnly', roleId: MEMBER_ROLE_ID },
+ mainPrincipal: { type: 'role', roleId: MEMBER_ROLE_ID },
applicationPrincipal: { type: 'customApplication' },
};
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 aa095712e64..2c127dae273 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,7 +35,7 @@ const readOnlyPermissions: ObjectPermissions = {
const readOnlyPrincipals: PermissionsPrincipalsWithRolesContext = {
workspaceId: 'workspace-id',
- mainPrincipal: { type: 'deprecatedRoleOnly', roleId: READ_ONLY_ROLE_ID },
+ mainPrincipal: { type: 'role', roleId: READ_ONLY_ROLE_ID },
applicationPrincipal: { type: 'customApplication' },
};
@@ -111,7 +111,7 @@ describe('resolvePermissionsRowAccessOutcome', () => {
resolveOutcome({
principals: {
...readOnlyPrincipals,
- mainPrincipal: { type: 'deprecatedRoleOnly', roleId: 'missing-role' },
+ mainPrincipal: { type: 'role', roleId: 'missing-role' },
applicationPrincipal: { type: 'customApplication' },
},
}),
diff --git a/packages/twenty-server/src/engine/permissions/permissions.module.ts b/packages/twenty-server/src/engine/permissions/permissions.module.ts
index 422730aaaaf..0565a00f207 100644
--- a/packages/twenty-server/src/engine/permissions/permissions.module.ts
+++ b/packages/twenty-server/src/engine/permissions/permissions.module.ts
@@ -4,6 +4,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { ApiKeyEntity } from 'src/engine/core-modules/api-key/api-key.entity';
import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';
import { PermissionsService } from 'src/engine/permissions/permissions.service';
+import { PermissionsPrincipalsService } from 'src/engine/permissions/principal/services/permissions-principals.service';
import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity';
import { RoleTargetModule } from 'src/engine/metadata-modules/role-target/role-target.module';
import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
@@ -19,10 +20,15 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
providers: [
ApiKeyRoleService,
PermissionsService,
+ PermissionsPrincipalsService,
provideWorkspaceScopedRepository(ApiKeyEntity),
provideWorkspaceScopedRepository(RoleEntity),
provideWorkspaceScopedRepository(RoleTargetEntity),
],
- exports: [PermissionsService, ApiKeyRoleService],
+ exports: [
+ PermissionsService,
+ PermissionsPrincipalsService,
+ ApiKeyRoleService,
+ ],
})
export class PermissionsModule {}
diff --git a/packages/twenty-server/src/engine/permissions/permissions.service.ts b/packages/twenty-server/src/engine/permissions/permissions.service.ts
index f9482d6321c..bc050ba4535 100644
--- a/packages/twenty-server/src/engine/permissions/permissions.service.ts
+++ b/packages/twenty-server/src/engine/permissions/permissions.service.ts
@@ -26,16 +26,9 @@ import { type UserWorkspacePermissions } from 'src/engine/permissions/types/user
import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map.type';
import { isSystemAuthContext } from 'src/engine/core-modules/auth/guards/is-system-auth-context.guard';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { type PermissionsAuthContext } from 'src/engine/permissions/principal/types/permissions-auth-context.type';
import { getPermissionsPrincipalsRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principals-role-ids.util';
+import { PermissionsPrincipalsService } from 'src/engine/permissions/principal/services/permissions-principals.service';
import { resolveApplicationRoleId } from 'src/engine/permissions/principal/utils/resolve-application-role-id.util';
-import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
-import { canAuthContextHoldRoles } from 'src/engine/permissions/principal/utils/can-auth-context-hold-roles.util';
-import { buildPermissionsPrincipalsRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principals-role-maps.util';
-import {
- type PermissionsPrincipalsRoleMaps,
- resolvePermissionsPrincipalsWithRoles,
-} from 'src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@Injectable()
@@ -43,6 +36,7 @@ export class PermissionsService {
constructor(
private readonly workspaceCacheService: WorkspaceCacheService,
private readonly apiKeyRoleService: ApiKeyRoleService,
+ private readonly permissionsPrincipalsService: PermissionsPrincipalsService,
) {}
public async getUserWorkspacePermissions({
@@ -91,7 +85,7 @@ export class PermissionsService {
permissionFlags,
objectsPermissions: computeObjectsPermissionsForRoles({
principals: {
- mainPrincipal: { type: 'deprecatedRoleOnly', roleId: flatRole.id },
+ mainPrincipal: { type: 'role', roleId: flatRole.id },
applicationPrincipal: { type: 'customApplication' },
},
rolesPermissions,
@@ -176,7 +170,10 @@ export class PermissionsService {
return true;
}
- const principals = await this.findPrincipalsWithRoles(authContext);
+ const principals =
+ await this.permissionsPrincipalsService.findPrincipalsWithRoles(
+ authContext,
+ );
if (!isDefined(principals)) {
return false;
@@ -210,87 +207,16 @@ export class PermissionsService {
return [];
}
- const principals = await this.findPrincipalsWithRoles(authContext);
+ const principals =
+ await this.permissionsPrincipalsService.findPrincipalsWithRoles(
+ authContext,
+ );
return isDefined(principals)
? getPermissionsPrincipalsRoleIds(principals)
: [];
}
- public async findPrincipalsWithRoles(
- authContext: PermissionsAuthContext,
- ): Promise<PermissionsPrincipalsWithRolesContext | undefined> {
- if (!canAuthContextHoldRoles(authContext)) {
- return undefined;
- }
-
- return resolvePermissionsPrincipalsWithRoles({
- authContext,
- roleMaps: await this.loadPrincipalRoleMaps(authContext),
- });
- }
-
- private async loadPrincipalRoleMaps(
- authContext: Pick<PermissionsAuthContext, 'type' | 'workspace'>,
- ): Promise<PermissionsPrincipalsRoleMaps> {
- const workspaceId = authContext.workspace.id;
- const {
- userWorkspaceRoleMap,
- apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps,
- flatApplicationMaps,
- } = await this.workspaceCacheService.getOrRecompute(workspaceId, [
- 'userWorkspaceRoleMap',
- 'apiKeyRoleMap',
- 'flatRoleTargetByAgentIdMaps',
- 'flatApplicationMaps',
- ]);
-
- return {
- ...buildPermissionsPrincipalsRoleMaps({
- flatWorkspaceMemberMaps:
- await this.loadFlatWorkspaceMemberMaps(authContext),
- userWorkspaceRoleMap,
- apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps,
- flatApplicationMaps,
- }),
- flatRoleTargetMaps: await this.loadFlatRoleTargetMaps(authContext),
- };
- }
-
- private async loadFlatWorkspaceMemberMaps(
- authContext: Pick<PermissionsAuthContext, 'type' | 'workspace'>,
- ) {
- if (authContext.type !== 'user') {
- return undefined;
- }
-
- const { flatWorkspaceMemberMaps } =
- await this.workspaceCacheService.getOrRecompute(
- authContext.workspace.id,
- ['flatWorkspaceMemberMaps'],
- );
-
- return flatWorkspaceMemberMaps;
- }
-
- private async loadFlatRoleTargetMaps(
- authContext: Pick<PermissionsAuthContext, 'type' | 'workspace'>,
- ) {
- if (authContext.type !== 'webhook') {
- return undefined;
- }
-
- const { flatRoleTargetMaps } =
- await this.workspaceCacheService.getOrRecompute(
- authContext.workspace.id,
- ['flatRoleTargetMaps'],
- );
-
- return flatRoleTargetMaps;
- }
-
// Like the ORM, a role missing from the cache grants nothing, and every role must grant the flag
private isPermissionFlagGrantedToRoles({
roleIds,
diff --git a/packages/twenty-server/src/engine/permissions/principal/services/permissions-principals.service.ts b/packages/twenty-server/src/engine/permissions/principal/services/permissions-principals.service.ts
new file mode 100644
index 00000000000..f9f29701af4
--- /dev/null
+++ b/packages/twenty-server/src/engine/permissions/principal/services/permissions-principals.service.ts
@@ -0,0 +1,78 @@
+/* @license Enterprise */
+
+import { Injectable } from '@nestjs/common';
+
+import { type PermissionsAuthContext } from 'src/engine/permissions/principal/types/permissions-auth-context.type';
+import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
+import { canAuthContextHoldRoles } from 'src/engine/permissions/principal/utils/can-auth-context-hold-roles.util';
+import { resolvePermissionsPrincipalsWithRoles } from 'src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+
+@Injectable()
+export class PermissionsPrincipalsService {
+ constructor(private readonly workspaceCacheService: WorkspaceCacheService) {}
+
+ async findPrincipalsWithRoles(
+ authContext: PermissionsAuthContext,
+ ): Promise<PermissionsPrincipalsWithRolesContext | undefined> {
+ if (!canAuthContextHoldRoles(authContext)) {
+ return undefined;
+ }
+
+ const workspaceId = authContext.workspace.id;
+ const {
+ userWorkspaceRoleMap,
+ apiKeyRoleMap,
+ flatRoleTargetByAgentIdMaps,
+ flatApplicationMaps,
+ } = await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'userWorkspaceRoleMap',
+ 'apiKeyRoleMap',
+ 'flatRoleTargetByAgentIdMaps',
+ 'flatApplicationMaps',
+ ]);
+
+ return resolvePermissionsPrincipalsWithRoles({
+ authContext,
+ roleMaps: {
+ userWorkspaceRoleMap,
+ apiKeyRoleMap,
+ flatRoleTargetByAgentIdMaps,
+ flatApplicationMaps,
+ flatWorkspaceMemberMaps:
+ await this.findFlatWorkspaceMemberMaps(authContext),
+ flatRoleTargetMaps: await this.findFlatRoleTargetMaps(authContext),
+ },
+ });
+ }
+
+ private async findFlatWorkspaceMemberMaps(
+ authContext: PermissionsAuthContext,
+ ) {
+ if (authContext.type !== 'user') {
+ return undefined;
+ }
+
+ const { flatWorkspaceMemberMaps } =
+ await this.workspaceCacheService.getOrRecompute(
+ authContext.workspace.id,
+ ['flatWorkspaceMemberMaps'],
+ );
+
+ return flatWorkspaceMemberMaps;
+ }
+
+ private async findFlatRoleTargetMaps(authContext: PermissionsAuthContext) {
+ if (authContext.type !== 'webhook') {
+ return undefined;
+ }
+
+ const { flatRoleTargetMaps } =
+ await this.workspaceCacheService.getOrRecompute(
+ authContext.workspace.id,
+ ['flatRoleTargetMaps'],
+ );
+
+ return flatRoleTargetMaps;
+ }
+}
diff --git a/packages/twenty-server/src/engine/permissions/principal/types/permissions-principal.type.ts b/packages/twenty-server/src/engine/permissions/principal/types/permissions-principal.type.ts
index 6ca8463b3f6..4c1b8b9a88c 100644
--- a/packages/twenty-server/src/engine/permissions/principal/types/permissions-principal.type.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/types/permissions-principal.type.ts
@@ -1,8 +1,7 @@
/* @license Enterprise */
-// TODO(@charlesBochet): drop deprecatedRoleOnly once every caller names the principal holding the role
-export type PermissionsDeprecatedRoleOnlyPrincipal = {
- type: 'deprecatedRoleOnly';
+export type PermissionsRolePrincipal = {
+ type: 'role';
roleId: string;
};
@@ -41,13 +40,10 @@ export type PermissionsMainPrincipal =
| PermissionsAgentPrincipal
| PermissionsWebhookPrincipal
| PermissionsApplicationIdPrincipal
- | PermissionsDeprecatedRoleOnlyPrincipal;
+ | PermissionsRolePrincipal;
-export type PermissionsLimitingPrincipal =
- | PermissionsAgentPrincipal
- | PermissionsDeprecatedRoleOnlyPrincipal;
+export type PermissionsLimitingPrincipal = PermissionsAgentPrincipal;
export type PermissionsApplicationPrincipal =
| PermissionsApplicationIdPrincipal
- | PermissionsCustomApplicationPrincipal
- | PermissionsDeprecatedRoleOnlyPrincipal;
+ | PermissionsCustomApplicationPrincipal;
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 1906ba7eb8d..0e845630e6d 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
@@ -6,7 +6,7 @@ import {
type PermissionsApiKeyPrincipal,
type PermissionsApplicationIdPrincipal,
type PermissionsCustomApplicationPrincipal,
- type PermissionsDeprecatedRoleOnlyPrincipal,
+ type PermissionsRolePrincipal,
type PermissionsWebhookPrincipal,
type PermissionsWorkspaceMemberPrincipal,
} from 'src/engine/permissions/principal/types/permissions-principal.type';
@@ -19,16 +19,14 @@ export type PermissionsMainPrincipalWithRole =
| WithRoleId<PermissionsAgentPrincipal>
| WithRoleId<PermissionsWebhookPrincipal>
| WithRoleId<PermissionsApplicationIdPrincipal>
- | PermissionsDeprecatedRoleOnlyPrincipal;
+ | PermissionsRolePrincipal;
export type PermissionsLimitingPrincipalWithRole =
- | WithRoleId<PermissionsAgentPrincipal>
- | PermissionsDeprecatedRoleOnlyPrincipal;
+ WithRoleId<PermissionsAgentPrincipal>;
export type PermissionsApplicationPrincipalWithRole =
| WithRoleId<PermissionsApplicationIdPrincipal>
- | PermissionsCustomApplicationPrincipal
- | PermissionsDeprecatedRoleOnlyPrincipal;
+ | PermissionsCustomApplicationPrincipal;
export type PermissionsPrincipalsWithRolesContext = {
workspaceId: string;
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principals-acting-application-id.util.spec.ts b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principals-acting-application-id.util.spec.ts
index 10b74c34ea9..8f358a16457 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principals-acting-application-id.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/__tests__/get-permissions-principals-acting-application-id.util.spec.ts
@@ -1,19 +1,8 @@
-import { type ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
import { getPermissionsPrincipalsActingApplicationId } from 'src/engine/permissions/principal/utils/get-permissions-principals-acting-application-id.util';
const APPLICATION_ID = 'application-1';
const APPLICATION_ROLE_ID = 'application-role';
-const flatApplicationMaps: ApplicationDefaultRoleMaps = {
- byId: {
- [APPLICATION_ID]: {
- id: APPLICATION_ID,
- defaultRoleId: APPLICATION_ROLE_ID,
- deletedAt: null,
- },
- },
-};
-
describe('getPermissionsPrincipalsActingApplicationId', () => {
it('returns the application a member acts through', () => {
expect(
@@ -30,7 +19,6 @@ describe('getPermissionsPrincipalsActingApplicationId', () => {
applicationId: APPLICATION_ID,
},
},
- flatApplicationMaps,
}),
).toBe(APPLICATION_ID);
});
@@ -50,40 +38,6 @@ describe('getPermissionsPrincipalsActingApplicationId', () => {
applicationId: APPLICATION_ID,
},
},
- flatApplicationMaps,
- }),
- ).toBe(APPLICATION_ID);
- });
-
- it('looks up the application of a deprecated role-only app', () => {
- expect(
- getPermissionsPrincipalsActingApplicationId({
- principals: {
- mainPrincipal: { type: 'deprecatedRoleOnly', roleId: 'user-role' },
- applicationPrincipal: {
- type: 'deprecatedRoleOnly',
- roleId: APPLICATION_ROLE_ID,
- },
- },
- flatApplicationMaps,
- }),
- ).toBe(APPLICATION_ID);
- });
-
- it('keeps the owning application of a role-only application config', () => {
- expect(
- getPermissionsPrincipalsActingApplicationId({
- principals: {
- mainPrincipal: {
- type: 'deprecatedRoleOnly',
- roleId: APPLICATION_ROLE_ID,
- },
- applicationPrincipal: {
- type: 'deprecatedRoleOnly',
- roleId: APPLICATION_ROLE_ID,
- },
- },
- flatApplicationMaps,
}),
).toBe(APPLICATION_ID);
});
@@ -103,7 +57,6 @@ describe('getPermissionsPrincipalsActingApplicationId', () => {
applicationId: APPLICATION_ID,
},
},
- flatApplicationMaps,
}),
).toBeUndefined();
});
@@ -119,7 +72,6 @@ describe('getPermissionsPrincipalsActingApplicationId', () => {
},
applicationPrincipal: { type: 'customApplication' },
},
- flatApplicationMaps,
}),
).toBeUndefined();
});
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principals-role-maps.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principals-role-maps.util.ts
deleted file mode 100644
index 4f16cfb3bd4..00000000000
--- a/packages/twenty-server/src/engine/permissions/principal/utils/build-permissions-principals-role-maps.util.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/* @license Enterprise */
-
-import { type FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types/flat-workspace-member-maps.type';
-import { type PermissionsPrincipalsRoleMaps } from 'src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util';
-
-const EMPTY_WORKSPACE_MEMBER_MAPS = { byId: {}, userWorkspaceIdByUserId: {} };
-
-export const buildPermissionsPrincipalsRoleMaps = ({
- flatWorkspaceMemberMaps,
- userWorkspaceRoleMap,
- apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps,
- flatApplicationMaps,
-}: Omit<
- PermissionsPrincipalsRoleMaps,
- 'flatWorkspaceMemberMaps' | 'flatRoleTargetMaps'
-> & {
- flatWorkspaceMemberMaps?: FlatWorkspaceMemberMaps;
-}): PermissionsPrincipalsRoleMaps => ({
- flatWorkspaceMemberMaps:
- flatWorkspaceMemberMaps ?? EMPTY_WORKSPACE_MEMBER_MAPS,
- userWorkspaceRoleMap,
- apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps,
- flatApplicationMaps,
-});
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principals-acting-application-id.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principals-acting-application-id.util.ts
index d0501b55a08..f676e0e6ef0 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principals-acting-application-id.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/get-permissions-principals-acting-application-id.util.ts
@@ -1,21 +1,16 @@
/* @license Enterprise */
-import { isDefined } from 'twenty-shared/utils';
-
-import { type ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
import { isPermissionMainPrincipalWorkspaceMember } from 'src/engine/permissions/principal/utils/is-permission-main-principal-workspace-member.util';
// TODO(@charlesBochet): members hold Admin, the Standard app's default role (#28667); simplify once they no longer do
export const getPermissionsPrincipalsActingApplicationId = ({
principals,
- flatApplicationMaps,
}: {
principals: Pick<
PermissionsPrincipalsWithRolesContext,
'mainPrincipal' | 'limitingPrincipal' | 'applicationPrincipal'
>;
- flatApplicationMaps: ApplicationDefaultRoleMaps;
}): string | undefined => {
const { mainPrincipal, limitingPrincipal, applicationPrincipal } = principals;
@@ -32,13 +27,5 @@ export const getPermissionsPrincipalsActingApplicationId = ({
return undefined;
}
- if (applicationPrincipal.type === 'application') {
- return applicationPrincipal.applicationId;
- }
-
- return Object.values(flatApplicationMaps.byId).find(
- (flatApplication) =>
- flatApplication?.defaultRoleId === applicationPrincipal.roleId &&
- !isDefined(flatApplication.deletedAt),
- )?.id;
+ return applicationPrincipal.applicationId;
};
diff --git a/packages/twenty-server/src/engine/permissions/principal/utils/is-permissions-principals-owning-object.util.ts b/packages/twenty-server/src/engine/permissions/principal/utils/is-permissions-principals-owning-object.util.ts
index 8c18a233269..e1a0bba4769 100644
--- a/packages/twenty-server/src/engine/permissions/principal/utils/is-permissions-principals-owning-object.util.ts
+++ b/packages/twenty-server/src/engine/permissions/principal/utils/is-permissions-principals-owning-object.util.ts
@@ -3,25 +3,21 @@
import { isDefined } from 'twenty-shared/utils';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { type ApplicationDefaultRoleMaps } from 'src/engine/permissions/principal/types/application-default-role-maps.type';
import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
import { getPermissionsPrincipalsActingApplicationId } from 'src/engine/permissions/principal/utils/get-permissions-principals-acting-application-id.util';
export const isPermissionsPrincipalsOwningObject = ({
principals,
flatObjectMetadata,
- flatApplicationMaps,
}: {
principals: Pick<
PermissionsPrincipalsWithRolesContext,
'mainPrincipal' | 'limitingPrincipal' | 'applicationPrincipal'
>;
flatObjectMetadata: Pick<FlatObjectMetadata, 'applicationId'>;
- flatApplicationMaps: ApplicationDefaultRoleMaps;
}): boolean => {
const actingApplicationId = getPermissionsPrincipalsActingApplicationId({
principals,
- flatApplicationMaps,
});
return (
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 544674fa156..48b0a77d5cb 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
@@ -26,7 +26,7 @@ import { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-targ
import { isPermissionMainPrincipalWorkspaceMember } from 'src/engine/permissions/principal/utils/is-permission-main-principal-workspace-member.util';
export type PermissionsPrincipalsRoleMaps = {
- flatWorkspaceMemberMaps: {
+ flatWorkspaceMemberMaps?: {
byId: Partial<Record<string, Pick<FlatWorkspaceMember, 'userId'>>>;
userWorkspaceIdByUserId: FlatWorkspaceMemberMaps['userWorkspaceIdByUserId'];
};
@@ -60,9 +60,9 @@ const findWorkspaceMemberRoleId = ({
>;
}): string | undefined => {
const userId =
- roleMaps.flatWorkspaceMemberMaps.byId[workspaceMemberId]?.userId;
+ roleMaps.flatWorkspaceMemberMaps?.byId[workspaceMemberId]?.userId;
const userWorkspaceId = isDefined(userId)
- ? roleMaps.flatWorkspaceMemberMaps.userWorkspaceIdByUserId[userId]
+ ? roleMaps.flatWorkspaceMemberMaps?.userWorkspaceIdByUserId[userId]
: undefined;
return isDefined(userWorkspaceId)
@@ -78,7 +78,7 @@ const findMainPrincipalRoleId = ({
roleMaps: PermissionsPrincipalsRoleMaps;
}): string | undefined => {
switch (mainPrincipal.type) {
- case 'deprecatedRoleOnly':
+ case 'role':
return mainPrincipal.roleId;
case 'workspaceMember':
return findWorkspaceMemberRoleId({
@@ -116,10 +116,6 @@ const resolveLimitingPrincipal = ({
limitingPrincipal: PermissionsLimitingPrincipal;
roleMaps: PermissionsPrincipalsRoleMaps;
}): PermissionsLimitingPrincipalWithRole | undefined => {
- if (limitingPrincipal.type === 'deprecatedRoleOnly') {
- return limitingPrincipal;
- }
-
const roleId =
roleMaps.flatRoleTargetByAgentIdMaps[limitingPrincipal.agentId]?.roleId;
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 5d40bbbab67..77ff425abc4 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,7 +126,7 @@ export class RecordSharePrincipalService {
const rolePrincipals: PermissionsPrincipalsWithRolesContext = {
workspaceId,
- mainPrincipal: { type: 'deprecatedRoleOnly', roleId },
+ mainPrincipal: { type: 'role', roleId },
applicationPrincipal: { type: 'customApplication' },
};
diff --git a/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts b/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts
index e7f1fbdef4a..f421038f0bc 100644
--- a/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts
+++ b/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts
@@ -40,10 +40,9 @@ import { type RecordTargetInput } from 'src/engine/permissions/record-permission
import { RecordPermissionsService } from 'src/engine/permissions/record-permissions/services/record-permissions.service';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/types/workspace-transaction-scope.type';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
-import { buildPermissionsPrincipalsRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principals-role-maps.util';
import { getPermissionsPrincipalsRoleIds } from 'src/engine/permissions/principal/utils/get-permissions-principals-role-ids.util';
import { getPermissionsPrincipalsShareKeys } from 'src/engine/permissions/principal/utils/get-permissions-principals-share-keys.util';
-import { resolvePermissionsPrincipalsWithRoles } from 'src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util';
+import { PermissionsPrincipalsService } from 'src/engine/permissions/principal/services/permissions-principals.service';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';
@@ -72,6 +71,7 @@ export class RecordSharingService {
private readonly privateRecordStorageService: PrivateRecordStorageService,
private readonly recordSharePrincipalService: RecordSharePrincipalService,
private readonly recordPermissionsService: RecordPermissionsService,
+ private readonly permissionsPrincipalsService: PermissionsPrincipalsService,
) {}
async getSharing(args: RecordSharingArgs): Promise<RecordSharingDTO> {
@@ -456,31 +456,14 @@ export class RecordSharingService {
}) {
const workspaceId = authContext.workspace.id;
const { flatObjectMetadata, isShareable } = sharingObject;
- const {
- userWorkspaceRoleMap,
- apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps,
- flatApplicationMaps,
- flatWorkspaceMemberMaps,
- roleIdsWithAllRecordsAccess,
- } = await this.workspaceCacheService.getOrRecompute(workspaceId, [
- 'userWorkspaceRoleMap',
- 'apiKeyRoleMap',
- 'flatRoleTargetByAgentIdMaps',
- 'flatApplicationMaps',
- 'flatWorkspaceMemberMaps',
- 'roleIdsWithAllRecordsAccess',
- ]);
- const principals = resolvePermissionsPrincipalsWithRoles({
- authContext,
- roleMaps: buildPermissionsPrincipalsRoleMaps({
- flatWorkspaceMemberMaps,
- userWorkspaceRoleMap,
- apiKeyRoleMap,
- flatRoleTargetByAgentIdMaps,
- flatApplicationMaps,
- }),
- });
+ const { roleIdsWithAllRecordsAccess } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'roleIdsWithAllRecordsAccess',
+ ]);
+ const principals =
+ await this.permissionsPrincipalsService.findPrincipalsWithRoles(
+ authContext,
+ );
const canAccessAllRecords =
isDefined(principals) &&
canRolesAccessAllRecords({
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-objects-permissions-for-roles.util.spec.ts b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-objects-permissions-for-roles.util.spec.ts
index 88432109448..d7a308d36ab 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-objects-permissions-for-roles.util.spec.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/__tests__/compute-objects-permissions-for-roles.util.spec.ts
@@ -20,7 +20,6 @@ import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object
import { type PermissionsAuthContext } from 'src/engine/permissions/principal/types/permissions-auth-context.type';
import { type AiRunPermissionScope } from 'src/engine/permissions/principal/types/ai-run-permission-scope.type';
import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
-import { buildPermissionsPrincipalsRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principals-role-maps.util';
import {
type PermissionsPrincipalsRoleMaps,
resolvePermissionsPrincipalsWithRoles,
@@ -43,13 +42,12 @@ const buildRoleMaps = (
flatApplicationMaps: PermissionsPrincipalsRoleMaps['flatApplicationMaps'] = {
byId: {},
},
-): PermissionsPrincipalsRoleMaps =>
- buildPermissionsPrincipalsRoleMaps({
- userWorkspaceRoleMap: {},
- apiKeyRoleMap: {},
- flatRoleTargetByAgentIdMaps: {},
- flatApplicationMaps,
- });
+): PermissionsPrincipalsRoleMaps => ({
+ userWorkspaceRoleMap: {},
+ apiKeyRoleMap: {},
+ flatRoleTargetByAgentIdMaps: {},
+ flatApplicationMaps,
+});
const agentRolePermissions = {
[OBJECT_ID]: {
@@ -148,7 +146,7 @@ describe('computeObjectsPermissionsForRoles', () => {
it('should resolve a single role unchanged', () => {
expect(
computeForPrincipals({
- mainPrincipal: { type: 'deprecatedRoleOnly', roleId: 'agent-role-id' },
+ mainPrincipal: { type: 'role', roleId: 'agent-role-id' },
applicationPrincipal: { type: 'customApplication' },
}),
).toEqual(agentRolePermissions);
@@ -158,11 +156,12 @@ describe('computeObjectsPermissionsForRoles', () => {
expect(
computeForPrincipals({
mainPrincipal: {
- type: 'deprecatedRoleOnly',
+ type: 'role',
roleId: 'default-role-id',
},
applicationPrincipal: {
- type: 'deprecatedRoleOnly',
+ type: 'application',
+ applicationId: 'default-application-id',
roleId: 'default-role-id',
},
}),
@@ -173,7 +172,7 @@ describe('computeObjectsPermissionsForRoles', () => {
expect(
computeForPrincipals({
mainPrincipal: {
- type: 'deprecatedRoleOnly',
+ type: 'role',
roleId: 'default-role-id',
},
limitingPrincipal: {
@@ -190,7 +189,7 @@ describe('computeObjectsPermissionsForRoles', () => {
expect(
computeForPrincipals({
mainPrincipal: {
- type: 'deprecatedRoleOnly',
+ type: 'role',
roleId: 'default-role-id',
},
applicationPrincipal: {
@@ -205,7 +204,7 @@ describe('computeObjectsPermissionsForRoles', () => {
it('should deny when one of the intersected roles is missing from the cache', () => {
expect(
computeForPrincipals({
- mainPrincipal: { type: 'deprecatedRoleOnly', roleId: 'agent-role-id' },
+ mainPrincipal: { type: 'role', roleId: 'agent-role-id' },
limitingPrincipal: {
type: 'agent',
agentId: 'agent-id',
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util.ts
index ab5fae98d97..e032cb23c10 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/compute-objects-permissions-for-roles.util.ts
@@ -44,7 +44,6 @@ export const computeObjectsPermissionsForRoles = ({
const actingApplicationId = getPermissionsPrincipalsActingApplicationId({
principals,
- flatApplicationMaps,
});
const actingApplicationRoleId = isDefined(actingApplicationId)
diff --git a/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principals.util.ts b/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principals.util.ts
index fff1472c81e..1567253b1ff 100644
--- a/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principals.util.ts
+++ b/packages/twenty-server/src/engine/permissions/role/utils/is-object-operation-disabled-to-principals.util.ts
@@ -17,5 +17,4 @@ export const isObjectOperationDisabledToPrincipals = ({
!isPermissionsPrincipalsOwningObject({
principals,
flatObjectMetadata,
- flatApplicationMaps: metadataMaps.flatApplicationMaps,
});
diff --git a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts
index 1687ef9c956..ea985f093b1 100644
--- a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts
@@ -27,7 +27,6 @@ import { type WorkspaceTableShape } from 'src/engine/twenty-orm/table-shape/type
import { buildWorkspaceTableShape } from 'src/engine/twenty-orm/table-shape/utils/build-workspace-table-shape.util';
import { isSystemAuthContext } from 'src/engine/core-modules/auth/guards/is-system-auth-context.guard';
import { type PermissionsPrincipalsWithRolesContext } from 'src/engine/permissions/principal/types/permissions-principals-with-roles-context.type';
-import { buildPermissionsPrincipalsRoleMaps } from 'src/engine/permissions/principal/utils/build-permissions-principals-role-maps.util';
import { resolvePermissionsPrincipalsWithRoles } from 'src/engine/permissions/principal/utils/resolve-permissions-principals-with-roles.util';
const tableShapeCache = new WeakMap<
@@ -284,7 +283,7 @@ export class WorkspaceDataSource {
this.permissionsPrincipals =
resolvePermissionsPrincipalsWithRoles({
authContext: this.authContext,
- roleMaps: buildPermissionsPrincipalsRoleMaps(this.internalContext),
+ roleMaps: this.internalContext,
}) ?? null;
}