Four fields were still frozen because changing them would have bypassed the record that makes the change traceable, and a user's login data could not be corrected at all. Locking a field is the wrong trade: a wrong value stays in the system forever. The fix is to let the edit write the same history entry the dedicated endpoint writes. - A colony's apiary is editable through PATCH and writes the same ColonyApiaryHistory entry POST /colonies/:id/move writes, so the location history never skips a stand the colony was recorded on. - A honey batch's storage container is editable through PATCH and writes the same HoneyBatchRelocation entry POST /honey-batches/:id/relocate writes. - A stock item's quantity is editable and books the difference as an ADJUSTMENT movement, so the stored level stays the sum of its movements. - A role's key is editable (system roles were already rejected outright by RolesService.update, which keeps the seed's ADMIN lookup intact). - A user's e-mail - the login identity - is editable. A typo there previously locked the account out for good. - New POST /users/:id/reset-password lets an administrator set someone else's password: there is no self-service reset flow, so a forgotten password was the one thing no edit could repair. It revokes every refresh token and clears the permission cache exactly as a self-service change does, refuses to act on your own account (that goes through /profile/password, which proves ownership by asking for the current one), and never writes the password to the log. Frontend: - Users had no edit UI at all, although PATCH /users/:id existed. New EditUserDialog covers name, e-mail, role and an optional new password. - Colony, honey batch and stock item forms gained the newly editable fields, each with a note saying the correction is recorded as a move, a relocation or a stock adjustment. - The role dialog gained the key field. Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
255 lines
7.4 KiB
TypeScript
255 lines
7.4 KiB
TypeScript
import {
|
|
ConflictException,
|
|
ForbiddenException,
|
|
Injectable,
|
|
NotFoundException,
|
|
} from '@nestjs/common';
|
|
import { Prisma } from '../../generated/prisma';
|
|
import { PrismaService } from '../prisma/prisma.service';
|
|
import { AuditLogService } from '../audit/audit-log.service';
|
|
import { PermissionResolverService } from '../auth/permissions/permission-resolver.service';
|
|
import { CreateRoleDto } from './dto/create-role.dto';
|
|
import { UpdateRoleDto } from './dto/update-role.dto';
|
|
|
|
export interface RoleSummary {
|
|
id: string;
|
|
key: string;
|
|
name: string;
|
|
description: string | null;
|
|
isSystem: boolean;
|
|
status: string;
|
|
userCount: number;
|
|
permissionKeys: string[];
|
|
createdAt: Date;
|
|
updatedAt: Date;
|
|
deactivatedAt: Date | null;
|
|
}
|
|
|
|
const ROLE_INCLUDE = {
|
|
permissions: { select: { permission: { select: { key: true } } } },
|
|
_count: { select: { users: true } },
|
|
} satisfies Prisma.RoleInclude;
|
|
|
|
type RoleWithRelations = Prisma.RoleGetPayload<{
|
|
include: typeof ROLE_INCLUDE;
|
|
}>;
|
|
|
|
@Injectable()
|
|
export class RolesService {
|
|
constructor(
|
|
private readonly prisma: PrismaService,
|
|
private readonly auditLog: AuditLogService,
|
|
private readonly permissionResolver: PermissionResolverService,
|
|
) {}
|
|
|
|
private toSummary(role: RoleWithRelations): RoleSummary {
|
|
return {
|
|
id: role.id,
|
|
key: role.key,
|
|
name: role.name,
|
|
description: role.description,
|
|
isSystem: role.isSystem,
|
|
status: role.status,
|
|
userCount: role._count.users,
|
|
permissionKeys: role.permissions.map((grant) => grant.permission.key),
|
|
createdAt: role.createdAt,
|
|
updatedAt: role.updatedAt,
|
|
deactivatedAt: role.deactivatedAt,
|
|
};
|
|
}
|
|
|
|
async findAll(): Promise<RoleSummary[]> {
|
|
const roles = await this.prisma.role.findMany({
|
|
include: ROLE_INCLUDE,
|
|
orderBy: [{ isSystem: 'desc' }, { name: 'asc' }],
|
|
});
|
|
return roles.map((role) => this.toSummary(role));
|
|
}
|
|
|
|
async findById(id: string): Promise<RoleWithRelations> {
|
|
const role = await this.prisma.role.findUnique({
|
|
where: { id },
|
|
include: ROLE_INCLUDE,
|
|
});
|
|
if (!role) {
|
|
throw new NotFoundException('Role not found');
|
|
}
|
|
return role;
|
|
}
|
|
|
|
async findSummaryById(id: string): Promise<RoleSummary> {
|
|
return this.toSummary(await this.findById(id));
|
|
}
|
|
|
|
/**
|
|
* Nobody can grant a role a permission they do not hold themselves - a
|
|
* caller with only roles:update could otherwise turn any role (including
|
|
* one they belong to) into a shadow-admin by adding every catalog key, no
|
|
* users:assign-role needed at all since editing a role's own grants
|
|
* doesn't touch User.roleId. This is the standard "can't escalate beyond
|
|
* what you have" RBAC rule.
|
|
*/
|
|
private async assertCanGrantPermissions(
|
|
permissionKeys: string[],
|
|
actingUserId?: string,
|
|
): Promise<void> {
|
|
if (!actingUserId) {
|
|
return;
|
|
}
|
|
const callerPermissions =
|
|
await this.permissionResolver.getPermissions(actingUserId);
|
|
const missing = permissionKeys.filter((key) => !callerPermissions.has(key));
|
|
if (missing.length > 0) {
|
|
throw new ForbiddenException(
|
|
`Cannot grant permissions you do not hold yourself: ${missing.join(', ')}`,
|
|
);
|
|
}
|
|
}
|
|
|
|
async create(
|
|
dto: CreateRoleDto,
|
|
actingUserId?: string,
|
|
): Promise<RoleSummary> {
|
|
const existing = await this.prisma.role.findUnique({
|
|
where: { key: dto.key },
|
|
});
|
|
if (existing) {
|
|
throw new ConflictException('Role key already in use');
|
|
}
|
|
await this.assertCanGrantPermissions(dto.permissionKeys, actingUserId);
|
|
const role = await this.prisma.$transaction(async (tx) => {
|
|
const created = await tx.role.create({
|
|
data: {
|
|
key: dto.key,
|
|
name: dto.name,
|
|
description: dto.description,
|
|
},
|
|
});
|
|
await this.replacePermissions(tx, created.id, dto.permissionKeys);
|
|
return tx.role.findUniqueOrThrow({
|
|
where: { id: created.id },
|
|
include: ROLE_INCLUDE,
|
|
});
|
|
});
|
|
this.permissionResolver.invalidateAll();
|
|
const summary = this.toSummary(role);
|
|
await this.auditLog.record({
|
|
entityType: 'Role',
|
|
entityId: role.id,
|
|
action: 'CREATE',
|
|
userId: actingUserId,
|
|
afterData: summary,
|
|
});
|
|
return summary;
|
|
}
|
|
|
|
async update(
|
|
id: string,
|
|
dto: UpdateRoleDto,
|
|
actingUserId?: string,
|
|
): Promise<RoleSummary> {
|
|
const before = await this.findById(id);
|
|
if (before.isSystem) {
|
|
throw new ForbiddenException('System roles cannot be edited');
|
|
}
|
|
if (dto.permissionKeys) {
|
|
await this.assertCanGrantPermissions(dto.permissionKeys, actingUserId);
|
|
}
|
|
const role = await this.prisma.$transaction(async (tx) => {
|
|
await tx.role.update({
|
|
where: { id },
|
|
data: { key: dto.key, name: dto.name, description: dto.description },
|
|
});
|
|
if (dto.permissionKeys) {
|
|
await this.replacePermissions(tx, id, dto.permissionKeys);
|
|
}
|
|
return tx.role.findUniqueOrThrow({
|
|
where: { id },
|
|
include: ROLE_INCLUDE,
|
|
});
|
|
});
|
|
this.permissionResolver.invalidateAll();
|
|
const summary = this.toSummary(role);
|
|
await this.auditLog.record({
|
|
entityType: 'Role',
|
|
entityId: id,
|
|
action: 'UPDATE',
|
|
userId: actingUserId,
|
|
beforeData: this.toSummary(before),
|
|
afterData: summary,
|
|
});
|
|
return summary;
|
|
}
|
|
|
|
async deactivate(id: string, actingUserId?: string): Promise<RoleSummary> {
|
|
const before = await this.findById(id);
|
|
if (before.isSystem) {
|
|
throw new ForbiddenException('System roles cannot be deactivated');
|
|
}
|
|
if (before._count.users > 0) {
|
|
throw new ConflictException(
|
|
'Role still has users assigned; reassign them before deactivating',
|
|
);
|
|
}
|
|
const role = await this.prisma.role.update({
|
|
where: { id },
|
|
data: { status: 'INACTIVE', deactivatedAt: new Date() },
|
|
include: ROLE_INCLUDE,
|
|
});
|
|
this.permissionResolver.invalidateAll();
|
|
const summary = this.toSummary(role);
|
|
await this.auditLog.record({
|
|
entityType: 'Role',
|
|
entityId: id,
|
|
action: 'DEACTIVATE',
|
|
userId: actingUserId,
|
|
beforeData: this.toSummary(before),
|
|
afterData: summary,
|
|
});
|
|
return summary;
|
|
}
|
|
|
|
async reactivate(id: string, actingUserId?: string): Promise<RoleSummary> {
|
|
const before = await this.findById(id);
|
|
if (before.status === 'ACTIVE') {
|
|
throw new ConflictException('Role is already active');
|
|
}
|
|
const role = await this.prisma.role.update({
|
|
where: { id },
|
|
data: { status: 'ACTIVE', deactivatedAt: null },
|
|
include: ROLE_INCLUDE,
|
|
});
|
|
this.permissionResolver.invalidateAll();
|
|
const summary = this.toSummary(role);
|
|
await this.auditLog.record({
|
|
entityType: 'Role',
|
|
entityId: id,
|
|
action: 'UPDATE',
|
|
userId: actingUserId,
|
|
beforeData: this.toSummary(before),
|
|
afterData: summary,
|
|
});
|
|
return summary;
|
|
}
|
|
|
|
private async replacePermissions(
|
|
tx: Prisma.TransactionClient,
|
|
roleId: string,
|
|
permissionKeys: string[],
|
|
): Promise<void> {
|
|
const permissions = await tx.permission.findMany({
|
|
where: { key: { in: permissionKeys } },
|
|
select: { id: true },
|
|
});
|
|
await tx.rolePermission.deleteMany({ where: { roleId } });
|
|
if (permissions.length > 0) {
|
|
await tx.rolePermission.createMany({
|
|
data: permissions.map((permission) => ({
|
|
roleId,
|
|
permissionId: permission.id,
|
|
})),
|
|
});
|
|
}
|
|
}
|
|
}
|