From 222f475cc64c17f4b04d7361b26bcabe271572da Mon Sep 17 00:00:00 2001 From: Marie <51697796+ijreilly@users.noreply.github.com> Date: Tue, 18 Feb 2025 18:25:54 +0100 Subject: [PATCH] [permissions] Fix db reset leads to broken state if env var permission is not true (#10309) --- .../src/database/typeorm-seeds/core/feature-flags.ts | 5 ----- .../engine/workspace-manager/workspace-manager.service.ts | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts b/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts index b337c1df6..349b49097 100644 --- a/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts +++ b/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts @@ -80,11 +80,6 @@ export const seedFeatureFlags = async ( workspaceId: workspaceId, value: false, }, - { - key: FeatureFlagKey.IsPermissionsEnabled, - workspaceId: workspaceId, - value: true, - }, ]) .execute(); }; diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts index f0d74ee01..1db51af0d 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts @@ -8,6 +8,7 @@ import { SEED_ACME_WORKSPACE_ID, SEED_APPLE_WORKSPACE_ID, } from 'src/database/typeorm-seeds/core/workspaces'; +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 { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity'; import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity'; @@ -263,6 +264,10 @@ export class WorkspaceManagerService { } private async initPermissionsDev(workspaceId: string) { + await this.featureFlagService.enableFeatureFlags( + [FeatureFlagKey.IsPermissionsEnabled], + workspaceId, + ); const adminRole = await this.roleService.createAdminRole({ workspaceId, });