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

feat: refactoring casl permission checks for recursive nested operations (#778)

Browse Source 
* feat: nested casl abilities

* fix: remove unused packages

* Fixes

* Fix createMany broken

* Fix lint

* Fix lint

* Fix lint

* Fix lint

* Fixes

* Fix CommentThread

* Fix bugs

* Fix lint

* Fix bugs

* Fixed auto routing

* Fixed app path

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
This commit is contained in:
Jérémy M
2023-07-26 01:37:22 +02:00
committed by GitHub
parent 92b9e987a5
commit 51cfc0d82c
69 changed files with 1192 additions and 883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/core/person/person.resolver.spec.ts
View File

@ -1,9 +1,5 @@
import { Test, TestingModule } from '@nestjs/testing';
import { CanActivate } from '@nestjs/common';
import { UpdateOneGuard } from 'src/guards/update-one.guard';
import { DeleteManyGuard } from 'src/guards/delete-many.guard';
import { CreateOneGuard } from 'src/guards/create-one.guard';
import { AbilityFactory } from 'src/ability/ability.factory';
import { PersonService } from './person.service';
@ -13,8 +9,6 @@ describe('PersonResolver', () => {
let resolver: PersonResolver;
beforeEach(async () => {
const mockGuard: CanActivate = { canActivate: jest.fn(() => true) };
const module: TestingModule = await Test.createTestingModule({
providers: [
PersonResolver,
@ -27,14 +21,7 @@ describe('PersonResolver', () => {
useValue: {},
},
],
})
.overrideGuard(UpdateOneGuard)
.useValue(mockGuard)
.overrideGuard(DeleteManyGuard)
.useValue(mockGuard)
.overrideGuard(CreateOneGuard)
.useValue(mockGuard)
.compile();
}).compile();
resolver = module.get<PersonResolver>(PersonResolver);
});

6
server/src/core/person/person.resolver.ts
View File

@ -20,9 +20,6 @@ import { AffectedRows } from 'src/core/@generated/prisma/affected-rows.output';
import { DeleteManyPersonArgs } from 'src/core/@generated/person/delete-many-person.args';
import { Workspace } from 'src/core/@generated/workspace/workspace.model';
import { AuthWorkspace } from 'src/decorators/auth-workspace.decorator';
import { UpdateOneGuard } from 'src/guards/update-one.guard';
import { DeleteManyGuard } from 'src/guards/delete-many.guard';
import { CreateOneGuard } from 'src/guards/create-one.guard';
import {
PrismaSelect,
PrismaSelector,
@ -95,7 +92,6 @@ export class PersonResolver {
return `${parent.firstName ?? ''} ${parent.lastName ?? ''}`;
}
@UseGuards(UpdateOneGuard)
@Mutation(() => Person, {
nullable: true,
})
@ -128,7 +124,6 @@ export class PersonResolver {
} as Prisma.PersonUpdateArgs);
}
@UseGuards(DeleteManyGuard)
@Mutation(() => AffectedRows, {
nullable: false,
})
@ -142,7 +137,6 @@ export class PersonResolver {
});
}
@UseGuards(CreateOneGuard)
@Mutation(() => Person, {
nullable: false,
})

30
server/src/core/person/person.service.ts
View File

@ -10,35 +10,35 @@ export class PersonService {
constructor(private readonly prismaService: PrismaService) {}
// Find
findFirst = this.prismaService.person.findFirst;
findFirstOrThrow = this.prismaService.person.findFirstOrThrow;
findFirst = this.prismaService.client.person.findFirst;
findFirstOrThrow = this.prismaService.client.person.findFirstOrThrow;
findUnique = this.prismaService.person.findUnique;
findUniqueOrThrow = this.prismaService.person.findUniqueOrThrow;
findUnique = this.prismaService.client.person.findUnique;
findUniqueOrThrow = this.prismaService.client.person.findUniqueOrThrow;
findMany = this.prismaService.person.findMany;
findMany = this.prismaService.client.person.findMany;
// Create
create = this.prismaService.person.create;
createMany = this.prismaService.person.createMany;
create = this.prismaService.client.person.create;
createMany = this.prismaService.client.person.createMany;
// Update
update = this.prismaService.person.update;
upsert = this.prismaService.person.upsert;
updateMany = this.prismaService.person.updateMany;
update = this.prismaService.client.person.update;
upsert = this.prismaService.client.person.upsert;
updateMany = this.prismaService.client.person.updateMany;
// Delete
delete = this.prismaService.person.delete;
deleteMany = this.prismaService.person.deleteMany;
delete = this.prismaService.client.person.delete;
deleteMany = this.prismaService.client.person.deleteMany;
// Aggregate
aggregate = this.prismaService.person.aggregate;
aggregate = this.prismaService.client.person.aggregate;
// Count
count = this.prismaService.person.count;
count = this.prismaService.client.person.count;
// GroupBy
groupBy = this.prismaService.person.groupBy;
groupBy = this.prismaService.client.person.groupBy;
async createDefaultPeople({
workspaceId,
companies,