Skip to content

The open alternative to Salesforce, designed for AI.

chore(permissions): remove dead and duplicated server permission code (#27106)

Félix Malfait611e24d1eddf
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts
index b20c90c6b0b..def65408a87 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts
@@ -1,6 +1,5 @@
import { Inject, Injectable } from '@nestjs/common';
-import { type PermissionFlagType } from 'twenty-shared/constants';
import { FieldMetadataType, type ObjectRecord } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
@@ -37,13 +36,10 @@ import {
} from 'src/engine/api/common/types/common-query-result.type';
import { CommonSelectedFieldsResult } from 'src/engine/api/common/types/common-selected-fields-result.type';
import { type NestedRelationsReadPathOptions } from 'src/engine/api/common/types/nested-relations-read-path-options.type';
-import { OBJECTS_WITH_SETTINGS_PERMISSIONS_REQUIREMENTS } from 'src/engine/api/graphql/graphql-query-runner/constants/objects-with-settings-permissions-requirements';
import { GraphqlQueryParser } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser';
import { WorkspacePreQueryHookPayload } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type';
import { WorkspaceQueryHookService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.service';
-import { isApiKeyAuthContext } from 'src/engine/core-modules/auth/guards/is-api-key-auth-context.guard';
import { isApplicationAuthContext } from 'src/engine/core-modules/auth/guards/is-application-auth-context.guard';
-import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';
import { WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { MetricsService } from 'src/engine/core-modules/metrics/metrics.service';
import { MetricsKeys } from 'src/engine/core-modules/metrics/types/metrics-keys.type';
@@ -62,12 +58,6 @@ import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util';
import { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import {
- PermissionsException,
- PermissionsExceptionCode,
- PermissionsExceptionMessage,
-} from 'src/engine/metadata-modules/permissions/permissions.exception';
-import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
import { RelationNestedQueries } from 'src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
import { type MutationKind } from 'src/engine/twenty-orm/sql/utils/build-mutation-statement.util';
@@ -100,8 +90,6 @@ export abstract class CommonBaseQueryRunnerService<
@Inject()
protected readonly processNestedRelationsHelper: ProcessNestedRelationsHelper;
@Inject()
- protected readonly permissionsService: PermissionsService;
- @Inject()
protected readonly workspaceCacheService: WorkspaceCacheService;
@Inject()
protected readonly commonResultGettersService: CommonResultGettersService;
@@ -138,13 +126,6 @@ export abstract class CommonBaseQueryRunnerService<
await this.validate(args, queryRunnerContext);
- if (flatObjectMetadata.isSystem === true) {
- await this.validateSettingsPermissionsOnObjectOrThrow(
- authContext,
- queryRunnerContext,
- );
- }
-
const commonQueryParser = new GraphqlQueryParser(
flatObjectMetadata,
flatObjectMetadataMaps,
@@ -309,48 +290,6 @@ export abstract class CommonBaseQueryRunnerService<
return resultWithGetters as Output;
}
- private async validateSettingsPermissionsOnObjectOrThrow(
- authContext: WorkspaceAuthContext,
- queryRunnerContext: CommonBaseQueryRunnerContext,
- ) {
- const { flatObjectMetadata } = queryRunnerContext;
-
- const workspace = authContext.workspace;
-
- if (
- Object.keys(OBJECTS_WITH_SETTINGS_PERMISSIONS_REQUIREMENTS).includes(
- flatObjectMetadata.nameSingular,
- )
- ) {
- const permissionRequired: PermissionFlagType =
- OBJECTS_WITH_SETTINGS_PERMISSIONS_REQUIREMENTS[
- flatObjectMetadata.nameSingular as keyof typeof OBJECTS_WITH_SETTINGS_PERMISSIONS_REQUIREMENTS
- ];
-
- const userHasPermission =
- await this.permissionsService.userHasWorkspaceSettingPermission({
- userWorkspaceId: isUserAuthContext(authContext)
- ? authContext.userWorkspaceId
- : undefined,
- setting: permissionRequired,
- workspaceId: workspace.id,
- apiKeyId: isApiKeyAuthContext(authContext)
- ? authContext.apiKey.id
- : undefined,
- applicationId: isUserAuthContext(authContext)
- ? authContext.application?.id
- : undefined,
- });
-
- if (!userHasPermission) {
- throw new PermissionsException(
- PermissionsExceptionMessage.PERMISSION_DENIED,
- PermissionsExceptionCode.PERMISSION_DENIED,
- );
- }
- }
- }
-
private async prepareExtendedQueryRunnerContextWithGlobalDatasource(
queryRunnerContext: CommonBaseQueryRunnerContext,
): Promise<Omit<CommonExtendedQueryRunnerContext, 'commonQueryParser'>> {
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/constants/objects-with-settings-permissions-requirements.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/constants/objects-with-settings-permissions-requirements.ts
deleted file mode 100644
index 09e1379d1c6..00000000000
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/constants/objects-with-settings-permissions-requirements.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { PermissionFlagType } from 'twenty-shared/constants';
-
-export const OBJECTS_WITH_SETTINGS_PERMISSIONS_REQUIREMENTS = {
- apiKey: PermissionFlagType.API_KEYS_AND_WEBHOOKS,
- webhook: PermissionFlagType.API_KEYS_AND_WEBHOOKS,
-} as const;
diff --git a/packages/twenty-server/src/engine/core-modules/api-key/services/api-key-role.service.ts b/packages/twenty-server/src/engine/core-modules/api-key/services/api-key-role.service.ts
index cf271f69d84..03feb8c39e8 100644
--- a/packages/twenty-server/src/engine/core-modules/api-key/services/api-key-role.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/api-key/services/api-key-role.service.ts
@@ -14,10 +14,7 @@ import { RoleTargetService } from 'src/engine/metadata-modules/role-target/servi
import { type RoleDTO } from 'src/engine/metadata-modules/role/dtos/role.dto';
import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
import { fromFlatRoleToRoleDto } from 'src/engine/metadata-modules/role/utils/fromFlatRoleToRoleDto.util';
-import {
- fromRoleEntitiesToRoleDtos,
- fromRoleEntityToRoleDto,
-} from 'src/engine/metadata-modules/role/utils/fromRoleEntityToRoleDto.util';
+import { fromRoleEntitiesToRoleDtos } from 'src/engine/metadata-modules/role/utils/fromRoleEntityToRoleDto.util';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@@ -187,38 +184,6 @@ export class ApiKeyRoleService {
return fromRoleEntitiesToRoleDtos(roles);
}
- public async getRolesByApiKeys({
- apiKeyIds,
- workspaceId,
- }: {
- apiKeyIds: string[];
- workspaceId: string;
- }): Promise<Map<string, RoleDTO>> {
- if (!apiKeyIds.length) {
- return new Map();
- }
-
- const roleTargets = await this.roleTargetRepository.find(workspaceId, {
- where: {
- apiKeyId: In(apiKeyIds),
- },
- relations: ['role'],
- });
-
- const rolesMap = new Map<string, RoleDTO>();
-
- for (const roleTarget of roleTargets) {
- if (roleTarget.apiKeyId && roleTarget.role) {
- rolesMap.set(
- roleTarget.apiKeyId,
- fromRoleEntityToRoleDto(roleTarget.role),
- );
- }
- }
-
- return rolesMap;
- }
-
public async getApiKeysAssignedToRole(
roleId: string,
workspaceId: string,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-permission-flag/constants/flat-permission-flag-editable-properties.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-permission-flag/constants/flat-permission-flag-editable-properties.constant.ts
deleted file mode 100644
index 21f887b9651..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/flat-permission-flag/constants/flat-permission-flag-editable-properties.constant.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { type MetadataEntityPropertyName } from 'src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant';
-
-export const FLAT_PERMISSION_FLAG_EDITABLE_PROPERTIES = [
- 'label',
- 'description',
- 'icon',
- 'permissionType',
-] as const satisfies MetadataEntityPropertyName<'permissionFlag'>[];
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-permission-flag/utils/from-create-permission-flag-input-to-flat-permission-flag-to-create.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-permission-flag/utils/from-create-permission-flag-input-to-flat-permission-flag-to-create.util.ts
deleted file mode 100644
index af89e6a74d3..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/flat-permission-flag/utils/from-create-permission-flag-input-to-flat-permission-flag-to-create.util.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { trimAndRemoveDuplicatedWhitespacesFromObjectStringProperties } from 'twenty-shared/utils';
-import { v4 } from 'uuid';
-
-import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
-import { type FlatPermissionFlag } from 'src/engine/metadata-modules/flat-permission-flag/types/flat-permission-flag.type';
-import { type CreatePermissionFlagInput } from 'src/engine/metadata-modules/permission-flag/dtos/create-permission-flag.input';
-
-export const fromCreatePermissionFlagInputToFlatPermissionFlagToCreate = ({
- createPermissionFlagInput,
- workspaceId,
- flatApplication,
-}: {
- createPermissionFlagInput: CreatePermissionFlagInput;
- workspaceId: string;
- flatApplication: FlatApplication;
-}): FlatPermissionFlag => {
- const now = new Date().toISOString();
-
- const { key, label, description, icon } =
- trimAndRemoveDuplicatedWhitespacesFromObjectStringProperties(
- createPermissionFlagInput,
- ['key', 'label', 'description', 'icon'],
- );
-
- const id = createPermissionFlagInput.id ?? v4();
- const universalIdentifier =
- createPermissionFlagInput.universalIdentifier ?? id;
-
- return {
- id,
- universalIdentifier,
- key,
- label,
- description: description ?? null,
- icon: icon ?? null,
- permissionType: createPermissionFlagInput.permissionType,
- workspaceId,
- applicationId: flatApplication.id,
- applicationUniversalIdentifier: flatApplication.universalIdentifier,
- rolePermissionFlagIds: [],
- rolePermissionFlagUniversalIdentifiers: [],
- createdAt: now,
- updatedAt: now,
- };
-};
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-permission-flag/utils/from-delete-permission-flag-input-to-flat-permission-flag-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-permission-flag/utils/from-delete-permission-flag-input-to-flat-permission-flag-or-throw.util.ts
deleted file mode 100644
index 5e26ba83f01..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/flat-permission-flag/utils/from-delete-permission-flag-input-to-flat-permission-flag-or-throw.util.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { isDefined } from 'twenty-shared/utils';
-
-import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
-import { type FlatPermissionFlag } from 'src/engine/metadata-modules/flat-permission-flag/types/flat-permission-flag.type';
-import {
- PermissionFlagException,
- PermissionFlagExceptionCode,
-} from 'src/engine/metadata-modules/permission-flag/permission-flag.exception';
-
-export const fromDeletePermissionFlagInputToFlatPermissionFlagOrThrow = ({
- flatPermissionFlagMaps,
- permissionFlagId,
-}: {
- flatPermissionFlagMaps: FlatEntityMaps<FlatPermissionFlag>;
- permissionFlagId: string;
-}): FlatPermissionFlag => {
- const existing = findFlatEntityByIdInFlatEntityMaps({
- flatEntityId: permissionFlagId,
- flatEntityMaps: flatPermissionFlagMaps,
- });
-
- if (!isDefined(existing)) {
- throw new PermissionFlagException(
- 'Permission flag not found',
- PermissionFlagExceptionCode.PERMISSION_FLAG_NOT_FOUND,
- );
- }
-
- return existing;
-};
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-permission-flag/utils/from-update-permission-flag-input-to-flat-permission-flag-to-update-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-permission-flag/utils/from-update-permission-flag-input-to-flat-permission-flag-to-update-or-throw.util.ts
deleted file mode 100644
index 5fd1cd098a0..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/flat-permission-flag/utils/from-update-permission-flag-input-to-flat-permission-flag-to-update-or-throw.util.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { isDefined } from 'twenty-shared/utils';
-
-import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
-import { FLAT_PERMISSION_FLAG_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-permission-flag/constants/flat-permission-flag-editable-properties.constant';
-import { type FlatPermissionFlag } from 'src/engine/metadata-modules/flat-permission-flag/types/flat-permission-flag.type';
-import {
- PermissionFlagException,
- PermissionFlagExceptionCode,
-} from 'src/engine/metadata-modules/permission-flag/permission-flag.exception';
-import { type UpdatePermissionFlagInput } from 'src/engine/metadata-modules/permission-flag/dtos/update-permission-flag.input';
-import { mergeUpdateInExistingRecord } from 'src/utils/merge-update-in-existing-record.util';
-
-export const fromUpdatePermissionFlagInputToFlatPermissionFlagToUpdateOrThrow =
- ({
- flatPermissionFlagMaps,
- updatePermissionFlagInput,
- }: {
- flatPermissionFlagMaps: FlatEntityMaps<FlatPermissionFlag>;
- updatePermissionFlagInput: UpdatePermissionFlagInput;
- }): FlatPermissionFlag => {
- const existing = findFlatEntityByIdInFlatEntityMaps({
- flatEntityId: updatePermissionFlagInput.id,
- flatEntityMaps: flatPermissionFlagMaps,
- });
-
- if (!isDefined(existing)) {
- throw new PermissionFlagException(
- 'Permission flag not found',
- PermissionFlagExceptionCode.PERMISSION_FLAG_NOT_FOUND,
- );
- }
-
- return {
- ...mergeUpdateInExistingRecord({
- existing,
- properties: [...FLAT_PERMISSION_FLAG_EDITABLE_PROPERTIES],
- update: updatePermissionFlagInput.update,
- }),
- updatedAt: new Date().toISOString(),
- };
- };
diff --git a/packages/twenty-server/src/engine/metadata-modules/permission-flag/dtos/create-permission-flag.input.ts b/packages/twenty-server/src/engine/metadata-modules/permission-flag/dtos/create-permission-flag.input.ts
deleted file mode 100644
index 05773e14090..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/permission-flag/dtos/create-permission-flag.input.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Field, InputType } from '@nestjs/graphql';
-
-import {
- IsIn,
- IsNotEmpty,
- IsOptional,
- IsString,
- IsUUID,
-} from 'class-validator';
-
-import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-import {
- PERMISSION_FLAG_PERMISSION_TYPES,
- type PermissionFlagPermissionType,
-} from 'src/engine/metadata-modules/permission-flag/constants/permission-flag-permission-type.constant';
-
-@InputType()
-export class CreatePermissionFlagInput {
- @IsUUID()
- @IsOptional()
- @Field(() => UUIDScalarType, { nullable: true })
- id?: string;
-
- @IsUUID()
- @IsOptional()
- @Field(() => UUIDScalarType, { nullable: true })
- universalIdentifier?: string;
-
- @IsString()
- @IsNotEmpty()
- @Field()
- key: string;
-
- @IsString()
- @IsNotEmpty()
- @Field()
- label: string;
-
- @IsString()
- @IsOptional()
- @Field({ nullable: true })
- description?: string;
-
- @IsString()
- @IsOptional()
- @Field({ nullable: true })
- icon?: string;
-
- @IsIn(PERMISSION_FLAG_PERMISSION_TYPES)
- @Field(() => String)
- permissionType: PermissionFlagPermissionType;
-}
diff --git a/packages/twenty-server/src/engine/metadata-modules/permission-flag/dtos/update-permission-flag.input.ts b/packages/twenty-server/src/engine/metadata-modules/permission-flag/dtos/update-permission-flag.input.ts
deleted file mode 100644
index 68f654b25e7..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/permission-flag/dtos/update-permission-flag.input.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Field, InputType } from '@nestjs/graphql';
-
-import { Type } from 'class-transformer';
-import {
- IsIn,
- IsNotEmpty,
- IsOptional,
- IsString,
- IsUUID,
- ValidateNested,
-} from 'class-validator';
-
-import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-import {
- PERMISSION_FLAG_PERMISSION_TYPES,
- type PermissionFlagPermissionType,
-} from 'src/engine/metadata-modules/permission-flag/constants/permission-flag-permission-type.constant';
-
-@InputType()
-export class UpdatePermissionFlagInputUpdates {
- @IsOptional()
- @IsString()
- @Field({ nullable: true })
- label?: string;
-
- @IsOptional()
- @IsString()
- @Field({ nullable: true })
- description?: string;
-
- @IsOptional()
- @IsString()
- @Field({ nullable: true })
- icon?: string;
-
- @IsOptional()
- @IsIn(PERMISSION_FLAG_PERMISSION_TYPES)
- @Field(() => String, { nullable: true })
- permissionType?: PermissionFlagPermissionType;
-}
-
-@InputType()
-export class UpdatePermissionFlagInput {
- @IsUUID()
- @IsNotEmpty()
- @Field(() => UUIDScalarType, {
- description: 'The id of the permission flag definition to update',
- })
- id: string;
-
- @Type(() => UpdatePermissionFlagInputUpdates)
- @ValidateNested()
- @Field(() => UpdatePermissionFlagInputUpdates, {
- description: 'The fields to update',
- })
- update: UpdatePermissionFlagInputUpdates;
-}
diff --git a/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.module.ts b/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.module.ts
index e79912c8998..2fa4b6340ef 100644
--- a/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.module.ts
@@ -1,20 +1,16 @@
import { Module } from '@nestjs/common';
-import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { FlatPermissionFlagModule } from 'src/engine/metadata-modules/flat-permission-flag/flat-permission-flag.module';
import { PermissionFlagService } from 'src/engine/metadata-modules/permission-flag/permission-flag.service';
import { PermissionFlagResolver } from 'src/engine/metadata-modules/permission-flag/permission-flag.resolver';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
-import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
@Module({
imports: [
WorkspaceManyOrAllFlatEntityMapsCacheModule,
- WorkspaceMigrationModule,
WorkspaceCacheStorageModule,
- ApplicationModule,
FlatPermissionFlagModule,
PermissionsModule,
],
diff --git a/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.service.ts b/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.service.ts
index d7e0e6d2f34..fe20f6c60e1 100644
--- a/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.service.ts
@@ -2,26 +2,14 @@ import { Injectable } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
-import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
-import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
-import { fromCreatePermissionFlagInputToFlatPermissionFlagToCreate } from 'src/engine/metadata-modules/flat-permission-flag/utils/from-create-permission-flag-input-to-flat-permission-flag-to-create.util';
-import { fromDeletePermissionFlagInputToFlatPermissionFlagOrThrow } from 'src/engine/metadata-modules/flat-permission-flag/utils/from-delete-permission-flag-input-to-flat-permission-flag-or-throw.util';
import { fromFlatPermissionFlagToPermissionFlagDto } from 'src/engine/metadata-modules/flat-permission-flag/utils/from-flat-permission-flag-to-permission-flag-dto.util';
-import { fromUpdatePermissionFlagInputToFlatPermissionFlagToUpdateOrThrow } from 'src/engine/metadata-modules/flat-permission-flag/utils/from-update-permission-flag-input-to-flat-permission-flag-to-update-or-throw.util';
-import { type CreatePermissionFlagInput } from 'src/engine/metadata-modules/permission-flag/dtos/create-permission-flag.input';
import { type PermissionFlagDTO } from 'src/engine/metadata-modules/permission-flag/dtos/permission-flag.dto';
-import { type UpdatePermissionFlagInput } from 'src/engine/metadata-modules/permission-flag/dtos/update-permission-flag.input';
-import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
-import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
@Injectable()
export class PermissionFlagService {
constructor(
- private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
- private readonly applicationService: ApplicationService,
) {}
async findAll(workspaceId: string): Promise<PermissionFlagDTO[]> {
@@ -38,191 +26,4 @@ export class PermissionFlagService {
.sort((a, b) => a.createdAt.localeCompare(b.createdAt))
.map(fromFlatPermissionFlagToPermissionFlagDto);
}
-
- async findById(
- id: string,
- workspaceId: string,
- ): Promise<PermissionFlagDTO | null> {
- const { flatPermissionFlagMaps } =
- await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
- {
- workspaceId,
- flatMapsKeys: ['flatPermissionFlagMaps'],
- },
- );
-
- const flatPermissionFlag = findFlatEntityByIdInFlatEntityMaps({
- flatEntityId: id,
- flatEntityMaps: flatPermissionFlagMaps,
- });
-
- if (!isDefined(flatPermissionFlag)) {
- return null;
- }
-
- return fromFlatPermissionFlagToPermissionFlagDto(flatPermissionFlag);
- }
-
- async create(
- input: CreatePermissionFlagInput,
- workspaceId: string,
- ): Promise<PermissionFlagDTO> {
- const { workspaceCustomFlatApplication } =
- await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
- { workspaceId },
- );
-
- const flatToCreate =
- fromCreatePermissionFlagInputToFlatPermissionFlagToCreate({
- createPermissionFlagInput: input,
- workspaceId,
- flatApplication: workspaceCustomFlatApplication,
- });
-
- const validateAndBuildResult =
- await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
- {
- allFlatEntityOperationByMetadataName: {
- permissionFlag: {
- flatEntityToCreate: [flatToCreate],
- flatEntityToDelete: [],
- flatEntityToUpdate: [],
- },
- },
- workspaceId,
- applicationUniversalIdentifier:
- workspaceCustomFlatApplication.universalIdentifier,
- },
- );
-
- if (validateAndBuildResult.status === 'fail') {
- throw new WorkspaceMigrationBuilderException(
- validateAndBuildResult,
- 'Validation errors occurred while creating permission flag',
- );
- }
-
- const { flatPermissionFlagMaps: recomputedMaps } =
- await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
- {
- workspaceId,
- flatMapsKeys: ['flatPermissionFlagMaps'],
- },
- );
-
- return fromFlatPermissionFlagToPermissionFlagDto(
- findFlatEntityByIdInFlatEntityMapsOrThrow({
- flatEntityId: flatToCreate.id,
- flatEntityMaps: recomputedMaps,
- }),
- );
- }
-
- async update(
- input: UpdatePermissionFlagInput,
- workspaceId: string,
- ): Promise<PermissionFlagDTO> {
- const { workspaceCustomFlatApplication } =
- await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
- { workspaceId },
- );
-
- const { flatPermissionFlagMaps: existingMaps } =
- await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
- {
- workspaceId,
- flatMapsKeys: ['flatPermissionFlagMaps'],
- },
- );
-
- const flatToUpdate =
- fromUpdatePermissionFlagInputToFlatPermissionFlagToUpdateOrThrow({
- flatPermissionFlagMaps: existingMaps,
- updatePermissionFlagInput: input,
- });
-
- const validateAndBuildResult =
- await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
- {
- allFlatEntityOperationByMetadataName: {
- permissionFlag: {
- flatEntityToCreate: [],
- flatEntityToDelete: [],
- flatEntityToUpdate: [flatToUpdate],
- },
- },
- workspaceId,
- applicationUniversalIdentifier:
- workspaceCustomFlatApplication.universalIdentifier,
- },
- );
-
- if (validateAndBuildResult.status === 'fail') {
- throw new WorkspaceMigrationBuilderException(
- validateAndBuildResult,
- 'Validation errors occurred while updating permission flag',
- );
- }
-
- const { flatPermissionFlagMaps: recomputedMaps } =
- await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
- {
- workspaceId,
- flatMapsKeys: ['flatPermissionFlagMaps'],
- },
- );
-
- return fromFlatPermissionFlagToPermissionFlagDto(
- findFlatEntityByIdInFlatEntityMapsOrThrow({
- flatEntityId: input.id,
- flatEntityMaps: recomputedMaps,
- }),
- );
- }
-
- async delete(id: string, workspaceId: string): Promise<PermissionFlagDTO> {
- const { workspaceCustomFlatApplication } =
- await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
- { workspaceId },
- );
-
- const { flatPermissionFlagMaps: existingMaps } =
- await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
- {
- workspaceId,
- flatMapsKeys: ['flatPermissionFlagMaps'],
- },
- );
-
- const flatToDelete =
- fromDeletePermissionFlagInputToFlatPermissionFlagOrThrow({
- flatPermissionFlagMaps: existingMaps,
- permissionFlagId: id,
- });
-
- const validateAndBuildResult =
- await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
- {
- allFlatEntityOperationByMetadataName: {
- permissionFlag: {
- flatEntityToCreate: [],
- flatEntityToDelete: [flatToDelete],
- flatEntityToUpdate: [],
- },
- },
- workspaceId,
- applicationUniversalIdentifier:
- workspaceCustomFlatApplication.universalIdentifier,
- },
- );
-
- if (validateAndBuildResult.status === 'fail') {
- throw new WorkspaceMigrationBuilderException(
- validateAndBuildResult,
- 'Validation errors occurred while deleting permission flag',
- );
- }
-
- return fromFlatPermissionFlagToPermissionFlagDto(flatToDelete);
- }
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/role-target/services/role-target.service.ts b/packages/twenty-server/src/engine/metadata-modules/role-target/services/role-target.service.ts
index 886fc97c623..e40a7d51536 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role-target/services/role-target.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role-target/services/role-target.service.ts
@@ -5,23 +5,12 @@ import { isDefined } from 'twenty-shared/utils';
import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { FlatRoleTarget } from 'src/engine/metadata-modules/flat-role-target/types/flat-role-target.type';
import { CreateRoleTargetInput } from 'src/engine/metadata-modules/role-target/types/create-role-target.input';
import { fromCreateRoleTargetInputToFlatRoleTargetToCreate } from 'src/engine/metadata-modules/role-target/utils/from-create-role-target-input-to-flat-role-target-to-create.util';
import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
-export type DeleteRoleTargetInput = {
- id: string;
- workspaceId: string;
-};
-
-export type FindRoleTargetInput = {
- id: string;
- workspaceId: string;
-};
-
@Injectable()
export class RoleTargetService {
constructor(
@@ -143,7 +132,13 @@ export class RoleTargetService {
);
}
- async delete({ id, workspaceId }: DeleteRoleTargetInput): Promise<void> {
+ async delete({
+ id,
+ workspaceId,
+ }: {
+ id: string;
+ workspaceId: string;
+ }): Promise<void> {
const { workspaceCustomFlatApplication } =
await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
{
@@ -188,27 +183,4 @@ export class RoleTargetService {
);
}
}
-
- async findOne({
- findRoleTargetInput,
- }: {
- findRoleTargetInput: FindRoleTargetInput;
- }): Promise<FlatRoleTarget | null> {
- const { workspaceId, id } = findRoleTargetInput;
-
- const { flatRoleTargetMaps } =
- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
- {
- workspaceId,
- flatMapsKeys: ['flatRoleTargetMaps'],
- },
- );
-
- const roleTarget = findFlatEntityByIdInFlatEntityMaps({
- flatEntityId: id,
- flatEntityMaps: flatRoleTargetMaps,
- });
-
- return roleTarget ?? null;
- }
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/row-level-permission-predicate/services/row-level-permission-predicate-group.service.ts b/packages/twenty-server/src/engine/metadata-modules/row-level-permission-predicate/services/row-level-permission-predicate-group.service.ts
index 1140a8eddc0..be4c7f43fd5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/row-level-permission-predicate/services/row-level-permission-predicate-group.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/row-level-permission-predicate/services/row-level-permission-predicate-group.service.ts
@@ -8,7 +8,6 @@ import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/bil
import { BillingService } from 'src/engine/core-modules/billing/services/billing.service';
import { EnterprisePlanService } from 'src/engine/core-modules/enterprise/services/enterprise-plan.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { fromFlatRowLevelPermissionPredicateGroupToDto } from 'src/engine/metadata-modules/flat-row-level-permission-predicate/utils/from-flat-row-level-permission-predicate-group-to-dto.util';
import { RowLevelPermissionPredicateGroupDTO } from 'src/engine/metadata-modules/row-level-permission-predicate/dtos/row-level-permission-predicate-group.dto';
import { RowLevelPermissionPredicateGroupEntity } from 'src/engine/metadata-modules/row-level-permission-predicate/entities/row-level-permission-predicate-group.entity';
@@ -90,37 +89,6 @@ export class RowLevelPermissionPredicateGroupService {
.map(fromFlatRowLevelPermissionPredicateGroupToDto);
}
- async findById(
- id: string,
- workspaceId: string,
- ): Promise<RowLevelPermissionPredicateGroupDTO | null> {
- const hasRowLevelPermissionFeature =
- await this.hasRowLevelPermissionFeature(workspaceId);
-
- if (!hasRowLevelPermissionFeature) {
- return null;
- }
-
- const { flatRowLevelPermissionPredicateGroupMaps } =
- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
- {
- workspaceId,
- flatMapsKeys: ['flatRowLevelPermissionPredicateGroupMaps'],
- },
- );
-
- const flatGroup = findFlatEntityByIdInFlatEntityMaps({
- flatEntityId: id,
- flatEntityMaps: flatRowLevelPermissionPredicateGroupMaps,
- });
-
- if (!isDefined(flatGroup) || flatGroup.deletedAt !== null) {
- return null;
- }
-
- return fromFlatRowLevelPermissionPredicateGroupToDto(flatGroup);
- }
-
public async deleteAllRowLevelPermissionPredicateGroups(workspaceId: string) {
// Checking first keeps the common no-op a read and lets cleanup retry on every pass after a failed attempt
const hasPredicateGroups =
diff --git a/packages/twenty-server/src/engine/metadata-modules/row-level-permission-predicate/services/row-level-permission-predicate.service.ts b/packages/twenty-server/src/engine/metadata-modules/row-level-permission-predicate/services/row-level-permission-predicate.service.ts
index 7837cca5f73..4b40fe058fc 100644
--- a/packages/twenty-server/src/engine/metadata-modules/row-level-permission-predicate/services/row-level-permission-predicate.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/row-level-permission-predicate/services/row-level-permission-predicate.service.ts
@@ -83,75 +83,6 @@ export class RowLevelPermissionPredicateService {
.map(fromFlatRowLevelPermissionPredicateToDto);
}
- async findByRoleAndObject(
- workspaceId: string,
- roleId: string,
- objectMetadataId: string,
- ): Promise<RowLevelPermissionPredicateDTO[]> {
- const hasRowLevelPermissionFeature =
- await this.hasRowLevelPermissionFeature(workspaceId);
-
- if (!hasRowLevelPermissionFeature) {
- return [];
- }
-
- const { flatRowLevelPermissionPredicateMaps } =
- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
- {
- workspaceId,
- flatMapsKeys: ['flatRowLevelPermissionPredicateMaps'],
- },
- );
-
- return Object.values(
- flatRowLevelPermissionPredicateMaps.byUniversalIdentifier,
- )
- .filter(isDefined)
- .filter(
- (predicate) =>
- predicate.deletedAt === null &&
- predicate.roleId === roleId &&
- predicate.objectMetadataId === objectMetadataId,
- )
- .sort(
- (a, b) =>
- (a.positionInRowLevelPermissionPredicateGroup ?? 0) -
- (b.positionInRowLevelPermissionPredicateGroup ?? 0),
- )
- .map(fromFlatRowLevelPermissionPredicateToDto);
- }
-
- async findById(
- id: string,
- workspaceId: string,
- ): Promise<RowLevelPermissionPredicateDTO | null> {
- const hasRowLevelPermissionFeature =
- await this.hasRowLevelPermissionFeature(workspaceId);
-
- if (!hasRowLevelPermissionFeature) {
- return null;
- }
-
- const { flatRowLevelPermissionPredicateMaps } =
- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
- {
- workspaceId,
- flatMapsKeys: ['flatRowLevelPermissionPredicateMaps'],
- },
- );
-
- const flatPredicate = findFlatEntityByIdInFlatEntityMaps({
- flatEntityId: id,
- flatEntityMaps: flatRowLevelPermissionPredicateMaps,
- });
-
- if (!isDefined(flatPredicate) || flatPredicate.deletedAt !== null) {
- return null;
- }
-
- return fromFlatRowLevelPermissionPredicateToDto(flatPredicate);
- }
-
async upsertRowLevelPermissionPredicates({
input,
workspaceId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard.ts
index 59d38858a8c..2cc203728c2 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard.ts
@@ -25,18 +25,14 @@ export class CreateViewChildEntityPermissionGuard implements CanActivate {
const accessContext = resolveViewAccessContext(request);
if (viewIds.length === 0) {
- return this.viewAccessService.canUserModifyViewByChildEntity(
- null,
- accessContext,
- );
+ return this.viewAccessService.canUserModifyView(null, accessContext);
}
for (const viewId of viewIds) {
- const canModify =
- await this.viewAccessService.canUserModifyViewByChildEntity(
- viewId,
- accessContext,
- );
+ const canModify = await this.viewAccessService.canUserModifyView(
+ viewId,
+ accessContext,
+ );
if (!canModify) {
return false;
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard.ts
index a0473941649..d466d6679f4 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard.ts
@@ -40,7 +40,7 @@ export const ViewChildEntityPermissionGuard = (
)
: null;
- return this.viewAccessService.canUserModifyViewByChildEntity(
+ return this.viewAccessService.canUserModifyView(
viewId,
resolveViewAccessContext(request),
);
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-access.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-access.service.ts
index e31cdf2524e..04fced296b8 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-access.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-access.service.ts
@@ -27,8 +27,8 @@ export class ViewAccessService {
viewId: string | null,
accessContext: ViewAccessContext,
): Promise<boolean> {
- // If viewId is null, the entity doesn't exist - allow the operation
- // so the service can handle the NOT_FOUND error properly
+ // A missing view or child entity is let through so the service throws
+ // its entity-specific NOT_FOUND error instead of a generic one
if (!viewId) {
return true;
}
@@ -38,31 +38,6 @@ export class ViewAccessService {
accessContext.workspaceId,
);
- // If view doesn't exist, allow through to service for proper error message
- if (!view) {
- return true;
- }
-
- return this.checkViewAccess(view, accessContext);
- }
-
- async canUserModifyViewByChildEntity(
- viewId: string | null,
- accessContext: ViewAccessContext,
- ): Promise<boolean> {
- // If viewId is null, the child entity doesn't exist
- // Allow through so the service can throw the proper entity-specific error
- // (e.g., "View field not found" instead of generic "View not found")
- if (!viewId) {
- return true;
- }
-
- const view = await this.viewService.findByIdIncludingDeleted(
- viewId,
- accessContext.workspaceId,
- );
-
- // If view doesn't exist, allow through to service for proper error message
if (!view) {
return true;
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries.ts b/packages/twenty-server/src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries.ts
index 3faa0f7ff85..8f874b7f976 100644
--- a/packages/twenty-server/src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries.ts
@@ -39,7 +39,7 @@ export class RelationNestedQueries {
constructor(repository: WorkspaceRepository) {
this.repository = repository;
- this.internalContext = repository.getInternalContext();
+ this.internalContext = repository.internalContext;
}
prepareNestedRelationQueries<Entity extends ObjectLiteral>(
diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/permissions.utils.spec.ts b/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/permissions.utils.spec.ts
index 3351e1ef2d9..39f78618b5c 100644
--- a/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/permissions.utils.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/permissions.utils.spec.ts
@@ -68,7 +68,7 @@ describe('validateOperationIsPermittedOrThrow - system objects permissions', ()
operationType: OperationType;
objectsPermissions?: ObjectsPermissions;
updatedColumns?: string[];
- selectedColumns?: string[] | '*';
+ selectedColumns?: string[];
}) => {
return validateOperationIsPermittedOrThrow({
entityName: SYSTEM_OBJECT_NAME,
@@ -78,7 +78,6 @@ describe('validateOperationIsPermittedOrThrow - system objects permissions', ()
flatFieldMetadataMaps: mockFlatFieldMetadataMaps,
objectIdByNameSingular,
selectedColumns,
- allFieldsSelected: false,
updatedColumns,
});
};
diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/permissions.utils.ts b/packages/twenty-server/src/engine/twenty-orm/repository/permissions.utils.ts
index ff4e7a179fc..9b6924fa8a7 100644
--- a/packages/twenty-server/src/engine/twenty-orm/repository/permissions.utils.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/repository/permissions.utils.ts
@@ -37,8 +37,7 @@ type ValidateOperationIsPermittedOrThrowArgs = {
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
objectIdByNameSingular: Record<string, string>;
- selectedColumns: string[] | '*';
- allFieldsSelected: boolean;
+ selectedColumns: string[];
updatedColumns: string[];
authContext?: WorkspaceAuthContext;
isRecordSharingEnabled?: boolean;
@@ -52,7 +51,6 @@ export const validateOperationIsPermittedOrThrow = ({
flatFieldMetadataMaps,
objectIdByNameSingular,
selectedColumns,
- allFieldsSelected,
updatedColumns,
authContext,
isRecordSharingEnabled = false,
@@ -119,11 +117,13 @@ export const validateOperationIsPermittedOrThrow = ({
switch (operationType) {
case 'select':
+ case 'delete':
+ case 'restore':
+ case 'soft-delete':
validateReadFieldPermissionOrThrow({
restrictedFields,
selectedColumns,
columnNameToFieldMetadataIdMap,
- allFieldsSelected,
entityName,
flatFieldMetadataMaps,
});
@@ -179,35 +179,12 @@ export const validateOperationIsPermittedOrThrow = ({
});
}
break;
- case 'delete':
- validateReadFieldPermissionOrThrow({
- restrictedFields,
- selectedColumns,
- columnNameToFieldMetadataIdMap,
- entityName,
- flatFieldMetadataMaps,
- });
- break;
- case 'restore':
- case 'soft-delete':
- validateReadFieldPermissionOrThrow({
- restrictedFields,
- selectedColumns,
- columnNameToFieldMetadataIdMap,
- entityName,
- flatFieldMetadataMaps,
- });
- break;
default:
throw new PermissionsException(
PermissionsExceptionMessage.UNKNOWN_OPERATION_NAME,
PermissionsExceptionCode.UNKNOWN_OPERATION_NAME,
);
}
-
- if (isEmpty(restrictedFields)) {
- return;
- }
};
const buildFieldPermissionDeniedMessage = ({
@@ -236,16 +213,14 @@ const validateReadFieldPermissionOrThrow = ({
restrictedFields,
selectedColumns,
columnNameToFieldMetadataIdMap,
- allFieldsSelected,
entityName,
flatFieldMetadataMaps,
}: {
restrictedFields: RestrictedFieldsPermissions;
- selectedColumns: string[] | '*';
+ selectedColumns: string[];
columnNameToFieldMetadataIdMap: Record<string, string>;
entityName: string;
flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
- allFieldsSelected?: boolean;
}) => {
const noReadRestrictions =
isEmpty(restrictedFields) ||
@@ -255,13 +230,6 @@ const validateReadFieldPermissionOrThrow = ({
return;
}
- if (allFieldsSelected || selectedColumns === '*') {
- throw new PermissionsException(
- PermissionsExceptionMessage.PERMISSION_DENIED,
- PermissionsExceptionCode.PERMISSION_DENIED,
- );
- }
-
for (const column of selectedColumns) {
const fieldMetadataId = columnNameToFieldMetadataIdMap[column];
diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts
index e58e7b2beec..2b82f4859ed 100644
--- a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts
@@ -279,10 +279,6 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
}
}
- getInternalContext(): WorkspaceInternalContext {
- return this.options.internalContext;
- }
-
get internalContext(): WorkspaceInternalContext {
return this.options.internalContext;
}
@@ -1916,7 +1912,6 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
objectIdByNameSingular:
this.options.internalContext.objectIdByNameSingular,
selectedColumns: columnsToReturn,
- allFieldsSelected: false,
updatedColumns,
authContext: this.options.authContext,
isRecordSharingEnabled: this.isRecordSharingEnabled,
@@ -2122,7 +2117,6 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
this.options.internalContext.objectIdByNameSingular,
isRecordSharingEnabled: this.isRecordSharingEnabled,
selectedColumns: columnNames,
- allFieldsSelected: false,
updatedColumns: [],
});
}