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

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

Browse Source
This commit is contained in:
Andreas Fitzek
2025-08-25 14:29:28 +02:00
committed by GitHub
parent b62c957c71
commit a21a03d4b0
117 changed files with 410 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packages/cli/test/integration/users.api.test.ts
View File

@@ -12,9 +12,6 @@ import {
import type { PublicUser, User } from '@n8n/db';
import {
FolderRepository,
GLOBAL_ADMIN_ROLE,
GLOBAL_MEMBER_ROLE,
GLOBAL_OWNER_ROLE,
ProjectRelationRepository,
ProjectRepository,
SharedCredentialsRepository,
@@ -64,26 +61,26 @@ describe('GET /users', () => {
userRepository = Container.get(UserRepository);
owner = await createUser({
role: GLOBAL_OWNER_ROLE,
role: 'global:owner',
email: 'owner@n8n.io',
firstName: 'OwnerFirstName',
lastName: 'OwnerLastName',
});
member1 = await createUser({
role: GLOBAL_MEMBER_ROLE,
role: 'global:member',
email: 'member1@n8n.io',
firstName: 'Member1FirstName',
lastName: 'Member1LastName',
mfaEnabled: true,
});
member2 = await createUser({
role: GLOBAL_MEMBER_ROLE,
role: 'global:member',
email: 'member2@n8n.io',
firstName: 'Member2FirstName',
lastName: 'Member2LastName',
});
await createUser({
role: GLOBAL_ADMIN_ROLE,
role: 'global:admin',
email: 'admin@n8n.io',
firstName: 'AdminFirstName',
lastName: 'AdminLastName',
@@ -578,7 +575,7 @@ describe('GET /users', () => {
let pendingUser: User;
beforeAll(async () => {
pendingUser = await createUser({
role: { slug: 'global:member' },
role: 'global:member',
email: 'pending@n8n.io',
firstName: 'PendingFirstName',
lastName: 'PendingLastName',
@@ -726,14 +723,14 @@ describe('GET /users', () => {
test('should sort by firstName and lastName combined', async () => {
const user1 = await createUser({
role: { slug: 'global:member' },
role: 'global:member',
email: 'memberz1@n8n.io',
firstName: 'ZZZFirstName',
lastName: 'ZZZLastName',
});
const user2 = await createUser({
role: { slug: 'global:member' },
role: 'global:member',
email: 'memberz2@n8n.io',
firstName: 'ZZZFirstName',
lastName: 'ZZYLastName',
@@ -1426,7 +1423,7 @@ describe('PATCH /users/:id/role', () => {
const user = await getUserById(otherAdmin.id);
expect(user.role.slug).toBe('global:member');
expect(user.role).toBe('global:member');
// restore other admin
@@ -1444,7 +1441,7 @@ describe('PATCH /users/:id/role', () => {
const user = await getUserById(admin.id);
expect(user.role.slug).toBe('global:member');
expect(user.role).toBe('global:member');
// restore admin
@@ -1462,7 +1459,7 @@ describe('PATCH /users/:id/role', () => {
const user = await getUserById(admin.id);
expect(user.role.slug).toBe('global:admin');
expect(user.role).toBe('global:admin');
// restore member
@@ -1511,7 +1508,7 @@ describe('PATCH /users/:id/role', () => {
const user = await getUserById(admin.id);
expect(user.role.slug).toBe('global:admin');
expect(user.role).toBe('global:admin');
// restore member
@@ -1529,7 +1526,7 @@ describe('PATCH /users/:id/role', () => {
const user = await getUserById(admin.id);
expect(user.role.slug).toBe('global:member');
expect(user.role).toBe('global:member');
// restore admin