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]>
103 lines
3.1 KiB
TypeScript
103 lines
3.1 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 AuditLogEntryBody {
|
|
entityType: string;
|
|
entityId: string;
|
|
action: string;
|
|
}
|
|
|
|
describe('Audit log (e2e)', () => {
|
|
let app: INestApplication<App>;
|
|
let prisma: PrismaService;
|
|
const adminEmail = `audit-e2e-admin-${Date.now()}@example.com`;
|
|
const beekeeperEmail = `audit-e2e-beekeeper-${Date.now()}@example.com`;
|
|
const password = 'SuperSecret123!';
|
|
let adminId: string;
|
|
let beekeeperId: string;
|
|
let adminToken: string;
|
|
let beekeeperToken: string;
|
|
let apiaryId: string;
|
|
|
|
beforeAll(async () => {
|
|
app = await createTestApp();
|
|
prisma = app.get(PrismaService);
|
|
|
|
const passwordHash = await bcrypt.hash(password, 12);
|
|
const admin = await prisma.user.create({
|
|
data: {
|
|
email: adminEmail,
|
|
passwordHash,
|
|
name: 'Admin',
|
|
legacyRole: 'ADMIN',
|
|
role: { connect: { key: 'ADMIN' } },
|
|
},
|
|
});
|
|
adminId = admin.id;
|
|
const beekeeper = await prisma.user.create({
|
|
data: {
|
|
email: beekeeperEmail,
|
|
passwordHash,
|
|
name: 'Beekeeper',
|
|
legacyRole: 'BEEKEEPER',
|
|
role: { connect: { key: 'BEEKEEPER' } },
|
|
},
|
|
});
|
|
beekeeperId = beekeeper.id;
|
|
adminToken = (await login(app, adminEmail, password)).accessToken;
|
|
beekeeperToken = (await login(app, beekeeperEmail, password)).accessToken;
|
|
});
|
|
|
|
afterAll(async () => {
|
|
if (apiaryId) {
|
|
await prisma.apiary.deleteMany({ where: { id: apiaryId } });
|
|
}
|
|
await prisma.auditLog.deleteMany({
|
|
where: { userId: { in: [adminId, beekeeperId] } },
|
|
});
|
|
await prisma.refreshToken.deleteMany({
|
|
where: { userId: { in: [adminId, beekeeperId] } },
|
|
});
|
|
await prisma.user.deleteMany({
|
|
where: { id: { in: [adminId, beekeeperId] } },
|
|
});
|
|
await app.close();
|
|
});
|
|
|
|
it('rejects the query for a non-admin user', () => {
|
|
return request(app.getHttpServer())
|
|
.get('/api/v1/audit-log')
|
|
.set('Authorization', `Bearer ${beekeeperToken}`)
|
|
.expect(403);
|
|
});
|
|
|
|
it('lets an ADMIN query the audit log for a created apiary', async () => {
|
|
const createResponse = await request(app.getHttpServer())
|
|
.post('/api/v1/apiaries')
|
|
.set('Authorization', `Bearer ${beekeeperToken}`)
|
|
.send({ name: `Stand ${Date.now()}` })
|
|
.expect(201);
|
|
const apiary = createResponse.body as { id: string };
|
|
apiaryId = apiary.id;
|
|
|
|
const response = await request(app.getHttpServer())
|
|
.get(`/api/v1/audit-log?entityType=Apiary&entityId=${apiaryId}`)
|
|
.set('Authorization', `Bearer ${adminToken}`)
|
|
.expect(200);
|
|
const entries = response.body as AuditLogEntryBody[];
|
|
expect(
|
|
entries.some(
|
|
(entry) =>
|
|
entry.entityType === 'Apiary' &&
|
|
entry.entityId === apiaryId &&
|
|
entry.action === 'CREATE',
|
|
),
|
|
).toBe(true);
|
|
});
|
|
});
|