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]>
141 lines
4.2 KiB
TypeScript
141 lines
4.2 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 HarvestBody {
|
|
id: string;
|
|
apiaryId: string;
|
|
colonies: { colonyId: string }[];
|
|
}
|
|
|
|
describe('Harvests (e2e)', () => {
|
|
let app: INestApplication<App>;
|
|
let prisma: PrismaService;
|
|
const staffEmail = `harvests-e2e-staff-${Date.now()}@example.com`;
|
|
const readonlyEmail = `harvests-e2e-readonly-${Date.now()}@example.com`;
|
|
const password = 'SuperSecret123!';
|
|
let staffId: string;
|
|
let readonlyId: string;
|
|
let staffToken: string;
|
|
let readonlyToken: string;
|
|
let apiaryId: string;
|
|
let colonyOneId: string;
|
|
let colonyTwoId: string;
|
|
let harvestId: string;
|
|
|
|
beforeAll(async () => {
|
|
app = await createTestApp();
|
|
prisma = app.get(PrismaService);
|
|
|
|
const passwordHash = await bcrypt.hash(password, 12);
|
|
const staff = await prisma.user.create({
|
|
data: {
|
|
email: staffEmail,
|
|
passwordHash,
|
|
name: 'Staff',
|
|
legacyRole: 'STAFF',
|
|
role: { connect: { key: 'STAFF' } },
|
|
},
|
|
});
|
|
staffId = staff.id;
|
|
const readonly = await prisma.user.create({
|
|
data: {
|
|
email: readonlyEmail,
|
|
passwordHash,
|
|
name: 'Readonly',
|
|
legacyRole: 'READONLY',
|
|
role: { connect: { key: 'READONLY' } },
|
|
},
|
|
});
|
|
readonlyId = readonly.id;
|
|
staffToken = (await login(app, staffEmail, password)).accessToken;
|
|
readonlyToken = (await login(app, readonlyEmail, password)).accessToken;
|
|
|
|
const apiary = await prisma.apiary.create({
|
|
data: { name: `Stand ${Date.now()}` },
|
|
});
|
|
apiaryId = apiary.id;
|
|
const colonyOne = await prisma.colony.create({
|
|
data: {
|
|
code: `V-${Date.now()}-A`,
|
|
apiaryId,
|
|
colonyType: 'PRODUCTION_COLONY',
|
|
},
|
|
});
|
|
colonyOneId = colonyOne.id;
|
|
const colonyTwo = await prisma.colony.create({
|
|
data: {
|
|
code: `V-${Date.now()}-B`,
|
|
apiaryId,
|
|
colonyType: 'PRODUCTION_COLONY',
|
|
},
|
|
});
|
|
colonyTwoId = colonyTwo.id;
|
|
});
|
|
|
|
afterAll(async () => {
|
|
if (harvestId) {
|
|
await prisma.harvestColony.deleteMany({ where: { harvestId } });
|
|
await prisma.harvest.deleteMany({ where: { id: harvestId } });
|
|
}
|
|
await prisma.colony.deleteMany({
|
|
where: { id: { in: [colonyOneId, colonyTwoId] } },
|
|
});
|
|
await prisma.apiary.deleteMany({ where: { id: apiaryId } });
|
|
await prisma.refreshToken.deleteMany({
|
|
where: { userId: { in: [staffId, readonlyId] } },
|
|
});
|
|
await prisma.auditLog.deleteMany({
|
|
where: { userId: { in: [staffId, readonlyId] } },
|
|
});
|
|
await prisma.user.deleteMany({
|
|
where: { id: { in: [staffId, readonlyId] } },
|
|
});
|
|
await app.close();
|
|
});
|
|
|
|
it('rejects create for a READONLY user', () => {
|
|
return request(app.getHttpServer())
|
|
.post('/api/v1/harvests')
|
|
.set('Authorization', `Bearer ${readonlyToken}`)
|
|
.send({
|
|
apiaryId,
|
|
date: new Date().toISOString(),
|
|
colonyIds: [colonyOneId],
|
|
})
|
|
.expect(403);
|
|
});
|
|
|
|
it('lets a STAFF user record a harvest across multiple colonies', async () => {
|
|
const response = await request(app.getHttpServer())
|
|
.post('/api/v1/harvests')
|
|
.set('Authorization', `Bearer ${staffToken}`)
|
|
.send({
|
|
apiaryId,
|
|
date: new Date().toISOString(),
|
|
colonyIds: [colonyOneId, colonyTwoId],
|
|
netWeight: 18.5,
|
|
})
|
|
.expect(201);
|
|
const harvest = response.body as HarvestBody;
|
|
harvestId = harvest.id;
|
|
expect(harvest.colonies).toHaveLength(2);
|
|
});
|
|
|
|
it('returns the harvest with its colonies on lookup', async () => {
|
|
const response = await request(app.getHttpServer())
|
|
.get(`/api/v1/harvests/${harvestId}`)
|
|
.set('Authorization', `Bearer ${readonlyToken}`)
|
|
.expect(200);
|
|
const harvest = response.body as HarvestBody;
|
|
const colonyIds = harvest.colonies.map((entry) => entry.colonyId);
|
|
expect(colonyIds).toEqual(
|
|
expect.arrayContaining([colonyOneId, colonyTwoId]),
|
|
);
|
|
});
|
|
});
|