Nick SzaunigandClaude Sonnet 5
139ea6fdd7
Replaces the fixed 5-value Role enum with a database-driven Role/Permission model: admins can create custom roles with a precise per-resource/action permission set (83-key code-owned catalog), instead of being locked to ADMIN/BEEKEEPER/STAFF/READONLY/API_CLIENT. - New Role/Permission/RolePermission tables; legacy Role enum renamed to LegacyRole and kept as User.legacyRole so all existing @Roles() call sites keep working unchanged during the migration. - New RolesController/RolesService (CRUD, permission-set editing, deactivate/reactivate) with lockout-prevention invariants: system roles (ADMIN) can't be edited or deactivated, and a role still assigned to users can't be deactivated. - New PermissionResolverService (30s-cached, DB-fresh per user) and PermissionsGuard + @RequirePermission(), registered as an additional APP_GUARD alongside the legacy RolesGuard so both systems run side-by-side until controllers are migrated in Phase 2. - PermissionCatalogSyncService seeds any new catalog entries into the DB on boot, so future features only touch the TS catalog. - New GET /auth/me returns the caller's role and effective permissions. - Migration hand-written (destructive column rename) with grants derived from a fresh grep of every existing @Roles() call site, verified against 5 controllers read in full for STAFF's exact write boundary. - test/roles.e2e-spec.ts covers the new endpoints and invariants end to end; test/authorization-coverage.e2e-spec.ts added but skipped until Phase 2 gives every controller a @RequirePermission. Co-Authored-By: Claude Sonnet 5 <[email protected]>
54 lines
1.5 KiB
TypeScript
54 lines
1.5 KiB
TypeScript
import {
|
|
Body,
|
|
Controller,
|
|
Get,
|
|
Param,
|
|
Patch,
|
|
Post,
|
|
Query,
|
|
} from '@nestjs/common';
|
|
import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
|
|
import { LegacyRole as Role } from '../../generated/prisma';
|
|
import { Roles } from '../auth/decorators/roles.decorator';
|
|
import { CurrentUser } from '../auth/decorators/current-user.decorator';
|
|
import type { AuthenticatedUser } from '../auth/types/authenticated-user';
|
|
import { CreateBottlingBatchDto } from './dto/create-bottling-batch.dto';
|
|
import { UpdateBottlingBatchDto } from './dto/update-bottling-batch.dto';
|
|
import { BottlingService } from './bottling.service';
|
|
|
|
@ApiTags('bottling')
|
|
@ApiBearerAuth()
|
|
@Controller('bottling-batches')
|
|
export class BottlingController {
|
|
constructor(private readonly bottlingService: BottlingService) {}
|
|
|
|
@Get()
|
|
findAll(@Query('honeyBatchId') honeyBatchId?: string) {
|
|
return this.bottlingService.findAll({ honeyBatchId });
|
|
}
|
|
|
|
@Get(':id')
|
|
findOne(@Param('id') id: string) {
|
|
return this.bottlingService.findById(id);
|
|
}
|
|
|
|
@Roles(Role.ADMIN, Role.BEEKEEPER)
|
|
@Post()
|
|
create(
|
|
@Body() dto: CreateBottlingBatchDto,
|
|
@CurrentUser() actor: AuthenticatedUser,
|
|
) {
|
|
return this.bottlingService.create(dto, actor.id);
|
|
}
|
|
|
|
@Roles(Role.ADMIN, Role.BEEKEEPER)
|
|
@Patch(':id')
|
|
update(
|
|
@Param('id') id: string,
|
|
@Body() dto: UpdateBottlingBatchDto,
|
|
@CurrentUser() actor: AuthenticatedUser,
|
|
) {
|
|
return this.bottlingService.update(id, dto, actor.id);
|
|
}
|
|
}
|