mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: Add scopes and role to create project endpoint (no-changelog) (#10145)

Browse source
This commit is contained in:
Val 2024-07-23 10:18:58 +01:00 committed by GitHub
parent 467051580b
commit a51e86f20b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/cli/src/controllers/project.controller.ts
View file

@ -48,7 +48,7 @@ export class ProjectController {
@GlobalScope('project:create') @GlobalScope('project:create')
// Using admin as all plans that contain projects should allow admins at the very least // Using admin as all plans that contain projects should allow admins at the very least
@Licensed('feat:projectRole:admin') @Licensed('feat:projectRole:admin')
async createProject(req: ProjectRequest.Create): Promise<Project> { async createProject(req: ProjectRequest.Create) {
try { try {
const project = await this.projectsService.createTeamProject(req.body.name, req.user); const project = await this.projectsService.createTeamProject(req.body.name, req.user);
@ -57,7 +57,16 @@ export class ProjectController {
role: req.user.role, role: req.user.role,
}); });
return project; return {
...project,
role: 'project:admin',
scopes: [
...combineScopes({
global: this.roleService.getRoleScopes(req.user.role),
project: this.roleService.getRoleScopes('project:admin'),
}),
],
};
} catch (e) { } catch (e) {
if (e instanceof TeamProjectOverQuotaError) { if (e instanceof TeamProjectOverQuotaError) {
throw new BadRequestError(e.message); throw new BadRequestError(e.message);

9
packages/cli/test/integration/project.api.test.ts
View file

@ -29,6 +29,7 @@ import { CacheService } from '@/services/cache/cache.service';
import { mockInstance } from '../shared/mocking'; import { mockInstance } from '../shared/mocking';
import { ActiveWorkflowManager } from '@/ActiveWorkflowManager'; import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
import { ProjectRepository } from '@/databases/repositories/project.repository'; import { ProjectRepository } from '@/databases/repositories/project.repository';
import { RoleService } from '@/services/role.service';
const testServer = utils.setupTestServer({ const testServer = utils.setupTestServer({
endpointGroups: ['project'], endpointGroups: ['project'],
@ -394,6 +395,10 @@ describe('POST /projects/', () => {
expect(async () => { expect(async () => {
await findProject(respProject.id); await findProject(respProject.id);
}).not.toThrow(); }).not.toThrow();
expect(resp.body.data.role).toBe('project:admin');
for (const scope of Container.get(RoleService).getRoleScopes('project:admin')) {
expect(resp.body.data.scopes).toContain(scope);
}
}); });
test('should allow to create a team projects if below the quota', async () => { test('should allow to create a team projects if below the quota', async () => {
@ -871,7 +876,7 @@ describe('DELETE /project/:projectId', () => {
{ project: otherProject, role: 'workflow:editor' }, { project: otherProject, role: 'workflow:editor' },
]); ]);
await shareWorkflowWithProjects(sharedWorkflow2, [ await shareWorkflowWithProjects(sharedWorkflow2, [
{ project: otherProject, role: 'workflow:user' }, { project: otherProject, role: 'workflow:editor' },
]); ]);
// //
@ -928,7 +933,7 @@ describe('DELETE /project/:projectId', () => {
{ project: otherProject, role: 'workflow:editor' }, { project: otherProject, role: 'workflow:editor' },
]); ]);
await shareWorkflowWithProjects(ownedWorkflow2, [ await shareWorkflowWithProjects(ownedWorkflow2, [
{ project: otherProject, role: 'workflow:user' }, { project: otherProject, role: 'workflow:editor' },
]); ]);
// //