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]>
120 lines
4.0 KiB
TypeScript
120 lines
4.0 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 { UserBody, login } from './utils/api';
|
|
|
|
describe('Users (e2e)', () => {
|
|
let app: INestApplication<App>;
|
|
let prisma: PrismaService;
|
|
const adminEmail = `users-e2e-admin-${Date.now()}@example.com`;
|
|
const staffEmail = `users-e2e-staff-${Date.now()}@example.com`;
|
|
const password = 'SuperSecret123!';
|
|
let adminId: string;
|
|
let staffId: string;
|
|
let adminAccessToken: string;
|
|
let staffAccessToken: string;
|
|
let createdUserId: 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: 'Users E2E Admin',
|
|
legacyRole: 'ADMIN',
|
|
role: { connect: { key: 'ADMIN' } },
|
|
},
|
|
});
|
|
adminId = admin.id;
|
|
const staff = await prisma.user.create({
|
|
data: {
|
|
email: staffEmail,
|
|
passwordHash,
|
|
name: 'Users E2E Staff',
|
|
legacyRole: 'STAFF',
|
|
role: { connect: { key: 'STAFF' } },
|
|
},
|
|
});
|
|
staffId = staff.id;
|
|
|
|
adminAccessToken = (await login(app, adminEmail, password)).accessToken;
|
|
staffAccessToken = (await login(app, staffEmail, password)).accessToken;
|
|
});
|
|
|
|
afterAll(async () => {
|
|
const userIds = [adminId, staffId, createdUserId].filter(Boolean);
|
|
await prisma.refreshToken.deleteMany({
|
|
where: { userId: { in: userIds } },
|
|
});
|
|
await prisma.auditLog.deleteMany({ where: { userId: { in: userIds } } });
|
|
if (createdUserId) {
|
|
await prisma.user.delete({ where: { id: createdUserId } });
|
|
}
|
|
await prisma.user.deleteMany({ where: { id: { in: [adminId, staffId] } } });
|
|
await app.close();
|
|
});
|
|
|
|
it('rejects non-admin roles from listing users', () => {
|
|
return request(app.getHttpServer())
|
|
.get('/api/v1/users')
|
|
.set('Authorization', `Bearer ${staffAccessToken}`)
|
|
.expect(403);
|
|
});
|
|
|
|
it('lets an admin create a user and writes an audit log entry', async () => {
|
|
const response = await request(app.getHttpServer())
|
|
.post('/api/v1/users')
|
|
.set('Authorization', `Bearer ${adminAccessToken}`)
|
|
.send({
|
|
email: `users-e2e-created-${Date.now()}@example.com`,
|
|
password: 'AnotherSecret123!',
|
|
name: 'Created via e2e',
|
|
role: 'BEEKEEPER',
|
|
})
|
|
.expect(201);
|
|
const created = response.body as UserBody & { passwordHash?: string };
|
|
|
|
expect(created.id).toEqual(expect.any(String));
|
|
expect(created.passwordHash).toBeUndefined();
|
|
createdUserId = created.id;
|
|
|
|
const auditEntry = await prisma.auditLog.findFirst({
|
|
where: { entityType: 'User', entityId: createdUserId, action: 'CREATE' },
|
|
});
|
|
expect(auditEntry).not.toBeNull();
|
|
});
|
|
|
|
it('lets an admin deactivate a user', async () => {
|
|
const response = await request(app.getHttpServer())
|
|
.post(`/api/v1/users/${createdUserId}/deactivate`)
|
|
.set('Authorization', `Bearer ${adminAccessToken}`)
|
|
.expect(201);
|
|
const deactivated = response.body as UserBody;
|
|
|
|
expect(deactivated.isActive).toBe(false);
|
|
expect(deactivated.deactivatedAt).not.toBeNull();
|
|
});
|
|
|
|
it('lets an admin reactivate a deactivated user, and rejects reactivating an already-active one', async () => {
|
|
const activated = await request(app.getHttpServer())
|
|
.post(`/api/v1/users/${createdUserId}/activate`)
|
|
.set('Authorization', `Bearer ${adminAccessToken}`)
|
|
.expect(201);
|
|
const body = activated.body as UserBody;
|
|
expect(body.isActive).toBe(true);
|
|
expect(body.deactivatedAt).toBeNull();
|
|
|
|
await request(app.getHttpServer())
|
|
.post(`/api/v1/users/${createdUserId}/activate`)
|
|
.set('Authorization', `Bearer ${adminAccessToken}`)
|
|
.expect(409);
|
|
});
|
|
});
|