[permissions V2] Remove feature flag (#12790)

packages/twenty-server/src/engine/metadata-modules/role/role.module.ts

@@ -1,7 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
-import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
 import { FileModule } from 'src/engine/core-modules/file/file.module';
 import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
@@ -11,19 +10,17 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permi
 import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
 import { RoleResolver } from 'src/engine/metadata-modules/role/role.resolver';
 import { RoleService } from 'src/engine/metadata-modules/role/role.service';
-import { UserWorkspaceRoleEntity } from 'src/engine/metadata-modules/role/user-workspace-role.entity';
 import { SettingPermissionModule } from 'src/engine/metadata-modules/setting-permission/setting-permission.module';
 import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';
 import { WorkspacePermissionsCacheModule } from 'src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.module';
 
 @Module({
   imports: [
-    TypeOrmModule.forFeature([RoleEntity, UserWorkspaceRoleEntity], 'core'),
+    TypeOrmModule.forFeature([RoleEntity], 'core'),
     TypeOrmModule.forFeature([UserWorkspace, Workspace], 'core'),
     UserRoleModule,
     PermissionsModule,
     UserWorkspaceModule,
-    FeatureFlagModule,
     ObjectPermissionModule,
     SettingPermissionModule,
     WorkspacePermissionsCacheModule,

packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts

@@ -8,9 +8,6 @@ import {
   Resolver,
 } from '@nestjs/graphql';
 
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
-import { FileService } from 'src/engine/core-modules/file/services/file.service';
 import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';
 import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
@@ -56,10 +53,8 @@ export class RoleResolver {
     private readonly userRoleService: UserRoleService,
     private readonly roleService: RoleService,
     private readonly userWorkspaceService: UserWorkspaceService,
-    private readonly featureFlagService: FeatureFlagService,
     private readonly objectPermissionService: ObjectPermissionService,
     private readonly settingPermissionService: SettingPermissionService,
-    private readonly fileService: FileService,
   ) {}
 
   @Query(() => [RoleDTO])
@@ -123,8 +118,6 @@ export class RoleResolver {
     @AuthWorkspace() workspace: Workspace,
     @Args('createRoleInput') createRoleInput: CreateRoleInput,
   ): Promise<RoleDTO> {
-    await this.validatePermissionsV2EnabledOrThrow(workspace);
-
     return await this.roleService.createRole({
       workspaceId: workspace.id,
       input: createRoleInput,
@@ -136,8 +129,6 @@ export class RoleResolver {
     @AuthWorkspace() workspace: Workspace,
     @Args('updateRoleInput') updateRoleInput: UpdateRoleInput,
   ): Promise<RoleDTO> {
-    await this.validatePermissionsV2EnabledOrThrow(workspace);
-
     const role = await this.roleService.updateRole({
       input: updateRoleInput,
       workspaceId: workspace.id,
@@ -151,8 +142,6 @@ export class RoleResolver {
     @AuthWorkspace() workspace: Workspace,
     @Args('roleId') roleId: string,
   ): Promise<string> {
-    await this.validatePermissionsV2EnabledOrThrow(workspace);
-
     const deletedRoleId = await this.roleService.deleteRole(
       roleId,
       workspace.id,
@@ -167,8 +156,6 @@ export class RoleResolver {
     @Args('upsertObjectPermissionsInput')
     upsertObjectPermissionsInput: UpsertObjectPermissionsInput,
   ): Promise<ObjectPermissionDTO[]> {
-    await this.validatePermissionsV2EnabledOrThrow(workspace);
-
     return this.objectPermissionService.upsertObjectPermissions({
       workspaceId: workspace.id,
       input: upsertObjectPermissionsInput,
@@ -181,8 +168,6 @@ export class RoleResolver {
     @Args('upsertSettingPermissionsInput')
     upsertSettingPermissionsInput: UpsertSettingPermissionsInput,
   ): Promise<SettingPermissionDTO[]> {
-    await this.validatePermissionsV2EnabledOrThrow(workspace);
-
     return this.settingPermissionService.upsertSettingPermissions({
       workspaceId: workspace.id,
       input: upsertSettingPermissionsInput,
@@ -202,19 +187,4 @@ export class RoleResolver {
 
     return workspaceMembers;
   }
-
-  private async validatePermissionsV2EnabledOrThrow(workspace: Workspace) {
-    const isPermissionsV2Enabled =
-      await this.featureFlagService.isFeatureEnabled(
-        FeatureFlagKey.IS_PERMISSIONS_V2_ENABLED,
-        workspace.id,
-      );
-
-    if (!isPermissionsV2Enabled) {
-      throw new PermissionsException(
-        PermissionsExceptionMessage.PERMISSIONS_V2_NOT_ENABLED,
-        PermissionsExceptionCode.PERMISSIONS_V2_NOT_ENABLED,
-      );
-    }
-  }
 }

packages/twenty-server/src/engine/metadata-modules/role/role.service.ts

@@ -17,7 +17,6 @@ import {
   UpdateRolePayload,
 } from 'src/engine/metadata-modules/role/dtos/update-role-input.dto';
 import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
-import { UserWorkspaceRoleEntity } from 'src/engine/metadata-modules/role/user-workspace-role.entity';
 import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
 import { isArgDefinedIfProvidedOrThrow } from 'src/engine/metadata-modules/utils/is-arg-defined-if-provided-or-throw.util';
 import { WorkspacePermissionsCacheService } from 'src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.service';
@@ -28,8 +27,6 @@ export class RoleService {
     private readonly workspaceRepository: Repository<Workspace>,
     @InjectRepository(RoleEntity, 'core')
     private readonly roleRepository: Repository<RoleEntity>,
-    @InjectRepository(UserWorkspaceRoleEntity, 'core')
-    private readonly userWorkspaceRoleRepository: Repository<UserWorkspaceRoleEntity>,
     private readonly userRoleService: UserRoleService,
     private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService,
   ) {}