fs
c429ff43cd
- Add user-assignment dependency check to DepartmentService.deleteByUuid (409 when users assigned)
- Standardize POST detection to isMethod('POST') in 10 create/edit actions
- Align RoleService code uniqueness to warning pattern (matching departments)
- Normalize repository create() return types from mixed to int|false (3 repos + 3 interfaces)
- Add JSON response branches to 4 non-user delete actions
- Document delete authorization ordering pattern
- Decompose AdminSettingsService.updateFromAdmin into domain-scoped private methods
Workflow: .agents/runs/CRUD-CONSISTENCY-001/
Reviewed by: Code Reviewer (pass), Security Reviewer (pass), Acceptance Tester (pass)
Quality gates: QG-001 PHPUnit pass, QG-002 PHPStan pass, QG-003 Architecture pass
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
75 lines
2.3 KiB
PHP
75 lines
2.3 KiB
PHP
<?php
|
|
|
|
use MintyPHP\Http\Request;
|
|
use MintyPHP\Http\SessionStoreInterface;
|
|
use MintyPHP\Router;
|
|
use MintyPHP\Service\Access\RoleAuthorizationPolicy;
|
|
use MintyPHP\Support\Flash;
|
|
use MintyPHP\Support\Guard;
|
|
|
|
$session = app(SessionStoreInterface::class)->all();
|
|
Guard::requireLogin();
|
|
|
|
$currentUserId = (int) ($session['user']['id'] ?? 0);
|
|
$authorizationService = app(\MintyPHP\Service\Access\AuthorizationService::class);
|
|
// Authorization is checked generically (can user delete ANY role?) before loading the entity.
|
|
// Context-aware policies (departments, tenants, users) load the entity first to pass target_id.
|
|
// Both patterns are valid; context-aware is preferred for new code.
|
|
$decision = $authorizationService->authorize(RoleAuthorizationPolicy::ABILITY_ADMIN_ROLES_DELETE, [
|
|
'actor_user_id' => $currentUserId,
|
|
]);
|
|
if (!$decision->isAllowed()) {
|
|
if (Request::wantsJson()) {
|
|
http_response_code($decision->status());
|
|
Router::json(['error' => $decision->error()]);
|
|
return;
|
|
}
|
|
Guard::deny();
|
|
}
|
|
|
|
$uuid = trim((string) ($id ?? ''));
|
|
if ($uuid === '') {
|
|
Router::redirect('admin/roles');
|
|
return;
|
|
}
|
|
|
|
$role = app(\MintyPHP\Service\Access\RoleService::class)->findByUuid($uuid);
|
|
$affectedUserIds = [];
|
|
if ($role) {
|
|
$roleId = (int) ($role['id'] ?? 0);
|
|
if ($roleId > 0) {
|
|
$affectedUserIds = app(\MintyPHP\Repository\Access\UserRoleRepository::class)->listUserIdsByRoleIds([$roleId]);
|
|
}
|
|
}
|
|
|
|
$result = app(\MintyPHP\Service\Access\RoleService::class)->deleteByUuid($uuid);
|
|
if (!($result['ok'] ?? false)) {
|
|
$error = $result['error'] ?? 'not_found';
|
|
$status = $result['status'] ?? 500;
|
|
if (Request::wantsJson()) {
|
|
http_response_code($status);
|
|
Router::json(['error' => $error]);
|
|
return;
|
|
}
|
|
if ($error === 'admin_role_protected') {
|
|
Flash::error('The Admin role cannot be deleted', 'admin/roles', 'admin_role_protected');
|
|
} else {
|
|
Flash::error('Role not found', 'admin/roles', 'role_not_found');
|
|
}
|
|
Router::redirect('admin/roles');
|
|
return;
|
|
}
|
|
|
|
if ($affectedUserIds) {
|
|
app(\MintyPHP\Repository\User\UserWriteRepository::class)->bumpAuthzVersionByUserIds($affectedUserIds);
|
|
}
|
|
|
|
if (Request::wantsJson()) {
|
|
http_response_code(204);
|
|
Router::json([]);
|
|
return;
|
|
}
|
|
|
|
Flash::success('Role deleted', 'admin/roles', 'role_deleted');
|
|
Router::redirect('admin/roles');
|