admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-20 11:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(core): Use roles from database in global roles (#17853)

Browse Source
This commit is contained in:
Andreas Fitzek
2025-08-22 16:02:01 +02:00
committed by GitHub
parent 350f84c49f
commit a8e4387f4d
117 changed files with 875 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/cli/test/integration/commands/ldap/reset.test.ts
View File

@@ -61,7 +61,7 @@ describe('--deleteWorkflowsAndCredentials', () => {
//
// ARRANGE
//
const member = await createLdapUser({ role: 'global:member' }, uuid());
const member = await createLdapUser({ role: { slug: 'global:member' } }, uuid());
const memberProject = await getPersonalProject(member);
const workflow = await createWorkflow({}, member);
const credential = await saveCredential(randomCredentialPayload(), {
@@ -166,7 +166,7 @@ describe('--userId', () => {
//
// ARRANGE
//
const member = await createLdapUser({ role: 'global:member' }, uuid());
const member = await createLdapUser({ role: { slug: 'global:member' } }, uuid());
await expect(command.run([`--userId=${member.id}`])).rejects.toThrowError(
`Can't migrate workflows and credentials to the user with the ID ${member.id}. That user was created via LDAP and will be deleted as well.`,
@@ -177,7 +177,7 @@ describe('--userId', () => {
//
// ARRANGE
//
const member = await createLdapUser({ role: 'global:member' }, uuid());
const member = await createLdapUser({ role: { slug: 'global:member' } }, uuid());
const memberProject = await getPersonalProject(member);
const workflow = await createWorkflow({}, member);
const credential = await saveCredential(randomCredentialPayload(), {
@@ -242,7 +242,7 @@ describe('--projectId', () => {
//
// ARRANGE
//
const member = await createLdapUser({ role: 'global:member' }, uuid());
const member = await createLdapUser({ role: { slug: 'global:member' } }, uuid());
const memberProject = await getPersonalProject(member);
await expect(command.run([`--projectId=${memberProject.id}`])).rejects.toThrowError(
@@ -254,7 +254,7 @@ describe('--projectId', () => {
//
// ARRANGE
//
const member = await createLdapUser({ role: 'global:member' }, uuid());
const member = await createLdapUser({ role: { slug: 'global:member' } }, uuid());
const memberProject = await getPersonalProject(member);
const workflow = await createWorkflow({}, member);
const credential = await saveCredential(randomCredentialPayload(), {
@@ -310,7 +310,7 @@ describe('--projectId', () => {
//
// ARRANGE
//
const member = await createLdapUser({ role: 'global:member' }, uuid());
const member = await createLdapUser({ role: { slug: 'global:member' } }, uuid());
const memberProject = await getPersonalProject(member);
const workflow = await createWorkflow({}, member);
const credential = await saveCredential(randomCredentialPayload(), {

9
packages/cli/test/integration/commands/reset.cmd.test.ts
View File

@@ -12,6 +12,7 @@ import {
SharedCredentialsRepository,
SharedWorkflowRepository,
UserRepository,
GLOBAL_OWNER_ROLE,
} from '@n8n/db';
import { Container } from '@n8n/di';
@@ -35,7 +36,7 @@ test('user-management:reset should reset DB to default user state', async () =>
//
// ARRANGE
//
const owner = await createUser({ role: 'global:owner' });
const owner = await createUser({ role: GLOBAL_OWNER_ROLE });
const ownerProject = await getPersonalProject(owner);
// should be deleted
@@ -70,7 +71,7 @@ test('user-management:reset should reset DB to default user state', async () =>
// check if the owner account was reset:
await expect(
Container.get(UserRepository).findOneBy({ role: 'global:owner' }),
Container.get(UserRepository).findOneBy({ role: { slug: GLOBAL_OWNER_ROLE.slug } }),
).resolves.toMatchObject({
email: null,
firstName: null,
@@ -80,7 +81,9 @@ test('user-management:reset should reset DB to default user state', async () =>
});
// all members were deleted:
const members = await Container.get(UserRepository).findOneBy({ role: 'global:member' });
const members = await Container.get(UserRepository).findOneBy({
role: { slug: 'global:member' },
});
expect(members).toBeNull();
// all workflows are owned by the owner: