fs
1bd4607b66
Cluster-7 batch-replay of the departments-create pilot (step 9). All
three remaining create actions follow the same shape with minor
domain-specific variations.
Each migration touches one action and one policy:
* roles-create + RoleAuthorizationPolicy::authorizeAdminRolesCreate —
policy previously returned bare allow() with no capabilities; now
emits ['can_view_page' => true]. Action passes viewAuthFlags: [].
* permissions-create + PermissionAuthorizationPolicy::authorizeAdminPermissionsCreate —
same pattern as roles-create.
* tenants-create + TenantAuthorizationPolicy::authorizeAdminTenantsCreate —
policy already emitted can_manage_sso + can_manage_custom_fields;
can_view_page is added as the first capability. Action passes
viewAuthFlags: ['can_manage_sso', 'can_manage_custom_fields'] and
materializes both booleans from the aggregator capabilities.
All three policy updates are tautological — every actor that survives
the deny() branches in each policy can by definition see the page.
View, Create, and EditContext now share a consistent capability shape
across all four core master-data domains (departments, roles,
permissions, tenants).
Three drift decisions reproduced:
* notFoundFlashScopeKey is N/A (no model lookup in create flows).
* t() consistency: Flash::success('Role created' / 'Permission created'
/ 'Tenant created') now flow through t().
* Defensive scope consumption: $canManageAllTenants reads
$tenantScope['scope'] === 'all' as a resilient hook even where the
policy emits no manage-all flag (roles/permissions are global,
tenants-create has no filter logic). Inline comments document the
intentional non-consumption of $tenantScope['ids'].
Two contract-test pattern updates (AuthzAdminMasterDataContractTest +
AuthzAdminTenantsContractTest) shift the assertion targets from
AuthorizationService::class to actionCreateContext( — semantically
equivalent because the aggregator wraps the same authorize call
internally.
ActionContextCsrfPairingContractTest now covers nine callers
(five edits + four creates) and stays green. Helper file
core/Support/helpers/action_context.php is 0-diff for the seventh
consecutive migration.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
119 lines
4.4 KiB
PHP
119 lines
4.4 KiB
PHP
<?php
|
|
|
|
use MintyPHP\Buffer;
|
|
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();
|
|
$request = requestInput();
|
|
$returnTarget = requestResolveReturnTarget();
|
|
$closeTarget = requestResolveReturnTarget('admin/roles');
|
|
$createTarget = requestPathWithReturnTarget('admin/roles/create', $returnTarget);
|
|
|
|
$currentUserId = (int) ($session['user']['id'] ?? 0);
|
|
|
|
$context = actionCreateContext([
|
|
'abilityKey' => RoleAuthorizationPolicy::ABILITY_ADMIN_ROLES_CREATE,
|
|
'context' => ['actor_user_id' => $currentUserId],
|
|
'viewAuthFlags' => [],
|
|
'forbiddenStrategy' => 'deny',
|
|
]);
|
|
$capabilities = $context['capabilities'];
|
|
$tenantScope = $context['tenantScope'];
|
|
$viewAuth = $context['viewAuth'];
|
|
// Roles are global; $tenantScope['ids'] is intentionally not consumed here.
|
|
// $canManageAllTenants stays as a resilient hook for future policy extensions.
|
|
$canManageAllTenants = $tenantScope['scope'] === 'all';
|
|
|
|
$errorBag = formErrors();
|
|
$errors = [];
|
|
$warnings = [];
|
|
$form = [
|
|
'description' => '',
|
|
'code' => '',
|
|
'active' => 1,
|
|
];
|
|
$permissionRepository = app(\MintyPHP\Repository\Access\PermissionRepository::class);
|
|
$rolePermissionRepository = app(\MintyPHP\Repository\Access\RolePermissionRepository::class);
|
|
$permissions = $permissionRepository->listActive();
|
|
$selectedPermissionIds = [];
|
|
|
|
if ($request->isMethod('POST') && !actionRequireCsrf($createTarget, $createTarget, 'csrf_expired')) {
|
|
return;
|
|
}
|
|
|
|
if ($request->isMethod('POST')) {
|
|
$dbSession = app(\MintyPHP\Repository\Support\DatabaseSessionRepository::class);
|
|
$transactionStarted = false;
|
|
|
|
try {
|
|
$dbSession->beginTransaction();
|
|
$transactionStarted = true;
|
|
|
|
$result = app(\MintyPHP\Service\Access\RoleService::class)->createFromAdmin($request->bodyAll(), $currentUserId);
|
|
$form = $result['form'] ?? $form;
|
|
$warnings = $result['warnings'] ?? [];
|
|
$errorBag->merge($result['errors'] ?? []);
|
|
$selectedPermissionIds = toIntIds($request->body('permission_ids', $selectedPermissionIds));
|
|
|
|
if (($result['ok'] ?? false) && !$errorBag->hasAny()) {
|
|
$permissionIds = toIntIds($request->body('permission_ids', []));
|
|
$createdId = (int) ($result['id'] ?? 0);
|
|
if ($createdId <= 0) {
|
|
throw new \RuntimeException('role_create_missing_id');
|
|
}
|
|
$rolePermissionRepository->replaceForRole($createdId, $permissionIds);
|
|
$dbSession->commitTransaction();
|
|
$transactionStarted = false;
|
|
|
|
$action = (string) $request->body('action', 'create');
|
|
if ($action === 'create_close') {
|
|
if ($warnings) {
|
|
Flash::info(implode(' ', $warnings), $closeTarget, 'role_warning');
|
|
}
|
|
Flash::success(t('Role created'), $closeTarget, 'role_created');
|
|
Router::redirect($closeTarget);
|
|
} else {
|
|
$uuid = (string) ($result['uuid'] ?? '');
|
|
if ($uuid !== '') {
|
|
$target = requestPathWithReturnTarget("admin/roles/edit/{$uuid}", $returnTarget);
|
|
if ($warnings) {
|
|
Flash::info(implode(' ', $warnings), $target, 'role_warning');
|
|
}
|
|
Flash::success(t('Role created'), $target, 'role_created');
|
|
Router::redirect($target);
|
|
} else {
|
|
if ($warnings) {
|
|
Flash::info(implode(' ', $warnings), $closeTarget, 'role_warning');
|
|
}
|
|
Flash::success(t('Role created'), $closeTarget, 'role_created');
|
|
Router::redirect($closeTarget);
|
|
}
|
|
}
|
|
}
|
|
} catch (\Throwable) {
|
|
if ($transactionStarted) {
|
|
try {
|
|
$dbSession->rollbackTransaction();
|
|
} catch (\Throwable) {
|
|
}
|
|
}
|
|
if (!$errorBag->hasAny()) {
|
|
$errorBag->merge([t('Failed to update role permissions')]);
|
|
}
|
|
}
|
|
}
|
|
|
|
$validationSummaryErrors = $errorBag->toArray();
|
|
$errors = $errorBag->toFlatList();
|
|
Buffer::set('title', t('Create role'));
|
|
$breadcrumbs = [
|
|
['label' => t('Home'), 'path' => 'admin'],
|
|
['label' => t('Roles'), 'path' => 'admin/roles'],
|
|
['label' => t('Create role')],
|
|
];
|