admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[permissions] Fix db reset leads to broken state if env var permission is not true (#10309)

Browse Source
This commit is contained in:
Marie
2025-02-18 18:25:54 +01:00
committed by GitHub
parent 804aab6e0b
commit 222f475cc6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts
View File

@ -80,11 +80,6 @@ export const seedFeatureFlags = async (
workspaceId: workspaceId, workspaceId: workspaceId,
value: false, value: false,
}, },
{
key: FeatureFlagKey.IsPermissionsEnabled,
workspaceId: workspaceId,
value: true,
},
]) ])
.execute(); .execute();
}; };

5
packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts
View File

@ -8,6 +8,7 @@ import {
SEED_ACME_WORKSPACE_ID, SEED_ACME_WORKSPACE_ID,
SEED_APPLE_WORKSPACE_ID, SEED_APPLE_WORKSPACE_ID,
} from 'src/database/typeorm-seeds/core/workspaces'; } 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 { 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 { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.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) { private async initPermissionsDev(workspaceId: string) {
await this.featureFlagService.enableFeatureFlags(
[FeatureFlagKey.IsPermissionsEnabled],
workspaceId,
);
const adminRole = await this.roleService.createAdminRole({ const adminRole = await this.roleService.createAdminRole({
workspaceId, workspaceId,
}); });