Cals Roles With Persisted Permission

Author: Ángel De La Cruz

src/auth/auth.service.ts

@@ -49,8 +49,6 @@ export class AuthService extends AuthJwt {
 
             const user = await this.findUserEmail(dto.email);
 
-            console.log(user)
-
             await this.compareUserPassword(dto.password, user.password);
 
             const tokens = await this.getToken(user.id, user.email, user.role_id);

src/casls/guards/abilities.guard.ts

@@ -35,7 +35,7 @@ export const actions = [
     'delete'
 ] as const;
 
-export const subjects = ['User', 'all'] as const;
+export const subjects = ['Role', 'User', 'all'] as const;
 
 export type Abilities = [
     (typeof actions)[number],
@@ -68,7 +68,7 @@ export class AbilitiesGuard implements CanActivate {
             }
         });
 
- 
+
         const parsedUserPermissions = this.parseCondition(
             userPermissions,
             currentUser

src/permissions/permissions.controller.ts

@@ -1,32 +1,50 @@
-import { Controller, Get, Post, Body, Param, Delete, Put } from '@nestjs/common';
+import { Controller, Get, Post, Body, Param, Delete, Put, UseGuards } from '@nestjs/common';
 import { PermissionsService } from './permissions.service';
 import { CreatePermissionDto } from './dto/create-permission.dto';
 import { UpdatePermissionDto } from './dto/update-permission.dto';
+import { checkAbilites } from '../casls/decorators/abilities.decorator';
+import { AbilitiesGuard } from '../casls/guards/abilities.guard';
 
 @Controller('permissions')
 export class PermissionsController {
   constructor(private readonly permissionsService: PermissionsService) { }
 
+
+  @checkAbilites({ action: 'create', subject: 'Permission' })
+  @UseGuards(AbilitiesGuard)
   @Post()
   create(@Body() createPermissionDto: CreatePermissionDto) {
     return this.permissionsService.create(createPermissionDto);
   }
 
+
+
+  @checkAbilites({ action: 'read', subject: 'Permission' })
+  @UseGuards(AbilitiesGuard)
   @Get()
   findAll() {
     return this.permissionsService.findAll();
   }
 
+
+  @checkAbilites({ action: 'read', subject: 'Permission' })
+  @UseGuards(AbilitiesGuard)
   @Get(':id')
   findOne(@Param('id') id: string) {
     return this.permissionsService.findOne(+id);
   }
 
+
+  @checkAbilites({ action: 'update', subject: 'Permission' })
+  @UseGuards(AbilitiesGuard)
   @Put(':id')
   update(@Param('id') id: string, @Body() updatePermissionDto: UpdatePermissionDto) {
     return this.permissionsService.update(+id, updatePermissionDto);
   }
 
+
+  @checkAbilites({ action: 'delete', subject: 'Permission' })
+  @UseGuards(AbilitiesGuard)
   @Delete(':id')
   remove(@Param('id') id: string) {
     return this.permissionsService.remove(+id);

src/roles/roles.controller.ts

@@ -1,32 +1,47 @@
-import { Controller, Get, Post, Body, Patch, Param, Delete, Put } from '@nestjs/common';
+import { Controller, Get, Post, Body, Patch, Param, Delete, Put, UseGuards } from '@nestjs/common';
 import { RolesService } from './roles.service';
 import { CreateRoleDto } from './dto/create-role.dto';
 import { UpdateRoleDto } from './dto/update-role.dto';
+import { checkAbilites } from '../casls/decorators/abilities.decorator';
+import { AbilitiesGuard } from '../casls/guards/abilities.guard';
 
 @Controller('roles')
 export class RolesController {
   constructor(private readonly rolesService: RolesService) { }
 
+  @checkAbilites({ action: 'update', subject: 'Role' })
+  @UseGuards(AbilitiesGuard)
   @Post()
   create(@Body() createRoleDto: CreateRoleDto) {
     return this.rolesService.create(createRoleDto);
   }
 
+
+  @checkAbilites({ action: 'read', subject: 'Role' })
+  @UseGuards(AbilitiesGuard)
   @Get()
   findAll() {
     return this.rolesService.findAll();
   }
 
+  @checkAbilites({ action: 'read', subject: 'Role' })
+  @UseGuards(AbilitiesGuard)
   @Get(':id')
   findOne(@Param('id') id: string) {
     return this.rolesService.findOne(+id);
   }
 
+
+  @checkAbilites({ action: 'update', subject: 'Role' })
+  @UseGuards(AbilitiesGuard)
   @Put(':id')
   update(@Param('id') id: string, @Body() updateRoleDto: UpdateRoleDto) {
     return this.rolesService.update(+id, updateRoleDto);
   }
 
+
+  @checkAbilites({ action: 'delete', subject: 'Role' })
+  @UseGuards(AbilitiesGuard)
   @Delete(':id')
   remove(@Param('id') id: string) {
     return this.rolesService.remove(+id);

src/users/users.service.ts

@@ -1,5 +1,6 @@
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { CreateUserDto } from './dto/create-user.dto';
+import { UpdateUserDto } from './dto/update-user.dto';
 import { PrismaService } from '../prisma/prisma.service';
 import { Prisma, User } from '@prisma/client';
 import * as bcrypt from 'bcrypt';
@@ -73,7 +74,7 @@ export class UsersService {
   // Actualizar un usuario, su rol o su perfil
   async updateUser(
     id: number,
-    data: Prisma.UserUpdateInput,
+    data: UpdateUserDto,
   ): Promise<User> {
     try {
       return await this.prismaService.user.update({