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]>
123 lines
3.8 KiB
TypeScript
123 lines
3.8 KiB
TypeScript
import { INestApplication } from '@nestjs/common';
|
|
import * as bcrypt from 'bcryptjs';
|
|
import request from 'supertest';
|
|
import { App } from 'supertest/types';
|
|
import { PrismaService } from '../src/prisma/prisma.service';
|
|
import { createTestApp } from './utils/create-test-app';
|
|
import { login } from './utils/api';
|
|
|
|
interface VarroaMeasurementBody {
|
|
id: string;
|
|
colonyId: string;
|
|
}
|
|
|
|
describe('Varroa measurements (e2e)', () => {
|
|
let app: INestApplication<App>;
|
|
let prisma: PrismaService;
|
|
const beekeeperEmail = `varroa-e2e-beekeeper-${Date.now()}@example.com`;
|
|
const staffEmail = `varroa-e2e-staff-${Date.now()}@example.com`;
|
|
const password = 'SuperSecret123!';
|
|
let beekeeperId: string;
|
|
let staffId: string;
|
|
let beekeeperToken: string;
|
|
let staffToken: string;
|
|
let apiaryId: string;
|
|
let colonyId: string;
|
|
let measurementId: string;
|
|
|
|
beforeAll(async () => {
|
|
app = await createTestApp();
|
|
prisma = app.get(PrismaService);
|
|
|
|
const passwordHash = await bcrypt.hash(password, 12);
|
|
const beekeeper = await prisma.user.create({
|
|
data: {
|
|
email: beekeeperEmail,
|
|
passwordHash,
|
|
name: 'Beekeeper',
|
|
legacyRole: 'BEEKEEPER',
|
|
role: { connect: { key: 'BEEKEEPER' } },
|
|
},
|
|
});
|
|
beekeeperId = beekeeper.id;
|
|
const staff = await prisma.user.create({
|
|
data: {
|
|
email: staffEmail,
|
|
passwordHash,
|
|
name: 'Staff',
|
|
legacyRole: 'STAFF',
|
|
role: { connect: { key: 'STAFF' } },
|
|
},
|
|
});
|
|
staffId = staff.id;
|
|
beekeeperToken = (await login(app, beekeeperEmail, password)).accessToken;
|
|
staffToken = (await login(app, staffEmail, password)).accessToken;
|
|
|
|
const apiary = await prisma.apiary.create({
|
|
data: { name: `Stand ${Date.now()}` },
|
|
});
|
|
apiaryId = apiary.id;
|
|
const colony = await prisma.colony.create({
|
|
data: {
|
|
code: `V-${Date.now()}`,
|
|
apiaryId,
|
|
colonyType: 'PRODUCTION_COLONY',
|
|
},
|
|
});
|
|
colonyId = colony.id;
|
|
});
|
|
|
|
afterAll(async () => {
|
|
await prisma.varroaMeasurement.deleteMany({ where: { colonyId } });
|
|
await prisma.colony.deleteMany({ where: { id: colonyId } });
|
|
await prisma.apiary.deleteMany({ where: { id: apiaryId } });
|
|
await prisma.refreshToken.deleteMany({
|
|
where: { userId: { in: [beekeeperId, staffId] } },
|
|
});
|
|
await prisma.auditLog.deleteMany({
|
|
where: { userId: { in: [beekeeperId, staffId] } },
|
|
});
|
|
await prisma.user.deleteMany({
|
|
where: { id: { in: [beekeeperId, staffId] } },
|
|
});
|
|
await app.close();
|
|
});
|
|
|
|
it('rejects create for a STAFF user', () => {
|
|
return request(app.getHttpServer())
|
|
.post('/api/v1/varroa-measurements')
|
|
.set('Authorization', `Bearer ${staffToken}`)
|
|
.send({
|
|
colonyId,
|
|
date: new Date().toISOString(),
|
|
method: 'NATURAL_MITE_FALL',
|
|
})
|
|
.expect(403);
|
|
});
|
|
|
|
it('lets a BEEKEEPER user record a measurement', async () => {
|
|
const response = await request(app.getHttpServer())
|
|
.post('/api/v1/varroa-measurements')
|
|
.set('Authorization', `Bearer ${beekeeperToken}`)
|
|
.send({
|
|
colonyId,
|
|
date: new Date().toISOString(),
|
|
method: 'NATURAL_MITE_FALL',
|
|
miteCount: 12,
|
|
durationMinutes: 4320,
|
|
})
|
|
.expect(201);
|
|
measurementId = (response.body as VarroaMeasurementBody).id;
|
|
expect(measurementId).toEqual(expect.any(String));
|
|
});
|
|
|
|
it('lists measurements for the colony', async () => {
|
|
const response = await request(app.getHttpServer())
|
|
.get(`/api/v1/colonies/${colonyId}/varroa-measurements`)
|
|
.set('Authorization', `Bearer ${staffToken}`)
|
|
.expect(200);
|
|
const measurements = response.body as VarroaMeasurementBody[];
|
|
expect(measurements.some((entry) => entry.id === measurementId)).toBe(true);
|
|
});
|
|
});
|