Second pilot of the cluster rollout. Tenants-edit follows the same
pattern as departments-edit (step 2): the CONTEXT-stage vorspiel
collapses into one declarative actionEditContext call, the POST branch
(CSRF → SUBMIT-authorize → can_update gate → service call → PRG) stays
callsite-specific.
Confirms the analyst hypothesis from this run: actionEditContext is
strong enough for a second standard edit action without any further
API extension. The notFoundFlashScopeKey arg added during step 2 is
the only hook needed; helpers stay 0-diff.
The three drift decisions from step 2 are reproduced verbatim:
* notFoundFlashScopeKey: 'tenant_not_found' to preserve the existing
Flash dedup-scope-key.
* t() consistency: both Flash::success('Tenant updated', …) calls now
flow through t(), so German users see fully translated success
messages rather than a German/English mix.
* Defensive scope consumption: $canManageAllTenants reads
$tenantScope['scope'] === 'all'. Tenants-edit has no tenant-scope
filtering of its own (the action edits tenants themselves), so
$tenantScope['ids'] is intentionally not consumed; an inline
comment documents that.
ActionContextCsrfPairingContractTest now covers two callers
(departments-edit, tenants-edit) and stays green.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
194 lines
9.2 KiB
PHP
194 lines
9.2 KiB
PHP
<?php
|
|
|
|
use MintyPHP\Buffer;
|
|
use MintyPHP\Http\SessionStoreInterface;
|
|
use MintyPHP\Router;
|
|
use MintyPHP\Service\Access\TenantAuthorizationPolicy;
|
|
use MintyPHP\Service\CustomField\TenantCustomFieldService;
|
|
use MintyPHP\Support\Flash;
|
|
use MintyPHP\Support\Guard;
|
|
|
|
$session = app(SessionStoreInterface::class)->all();
|
|
Guard::requireLogin();
|
|
$request = requestInput();
|
|
$returnTarget = requestResolveReturnTarget();
|
|
$closeTarget = requestResolveReturnTarget('admin/tenants');
|
|
|
|
$currentUserId = (int) ($session['user']['id'] ?? 0);
|
|
if ($currentUserId > 0) {
|
|
app(\MintyPHP\Service\Access\PermissionService::class)->getUserPermissions($currentUserId);
|
|
}
|
|
$uuid = trim((string) ($id ?? ''));
|
|
$editTarget = requestPathWithReturnTarget("admin/tenants/edit/{$uuid}", $returnTarget);
|
|
|
|
// Resolve the tenant BEFORE the aggregator so the authorize-context can carry
|
|
// the real target_tenant_id (matches today's order: lookup → CONTEXT authorize
|
|
// → can_view_page). The aggregator receives a trivial finder that returns the
|
|
// already-loaded model so its not-found branch fires only when findByUuid
|
|
// returned null.
|
|
$tenant = $uuid !== '' ? app(\MintyPHP\Service\Tenant\TenantService::class)->findByUuid($uuid) : null;
|
|
$tenantId = (int) ($tenant['id'] ?? 0);
|
|
|
|
$context = actionEditContext([
|
|
'finder' => static fn (string $_id): mixed => $tenant,
|
|
'rawId' => $uuid,
|
|
'notFoundFlashKey' => 'Tenant not found',
|
|
'notFoundRedirectPath' => $closeTarget,
|
|
'notFoundFlashScopeKey' => 'tenant_not_found',
|
|
'abilityKey' => TenantAuthorizationPolicy::ABILITY_ADMIN_TENANTS_EDIT_CONTEXT,
|
|
'context' => [
|
|
'actor_user_id' => $currentUserId,
|
|
'target_tenant_id' => $tenantId,
|
|
],
|
|
'viewAuthFlags' => ['can_update_tenant', 'can_delete_tenant', 'can_manage_custom_fields', 'can_manage_sso'],
|
|
'forbiddenStrategy' => 'redirect',
|
|
]);
|
|
$tenant = is_array($context['model']) ? $context['model'] : $tenant;
|
|
$capabilities = $context['capabilities'];
|
|
$tenantScope = $context['tenantScope'];
|
|
$viewAuth = $context['viewAuth'];
|
|
$canUpdateTenant = (bool) ($capabilities['can_update_tenant'] ?? false);
|
|
$canDeleteTenant = (bool) ($capabilities['can_delete_tenant'] ?? false);
|
|
$canManageCustomFields = (bool) ($capabilities['can_manage_custom_fields'] ?? false);
|
|
$canManageSso = (bool) ($capabilities['can_manage_sso'] ?? false);
|
|
// Tenants-Edit konsumiert $tenantScope['ids'] bewusst NICHT — wir editieren
|
|
// die Mandanten selbst, kein Filter-Szenario wie bei Departments-Edit.
|
|
// $canManageAllTenants bleibt als Hook fuer kuenftige Policy-Erweiterungen
|
|
// definiert.
|
|
$canManageAllTenants = $tenantScope['scope'] === 'all';
|
|
|
|
$tenantSsoService = app(\MintyPHP\Service\Auth\TenantSsoService::class);
|
|
$authService = app(\MintyPHP\Service\Auth\AuthService::class);
|
|
$authorizationService = app(\MintyPHP\Service\Access\AuthorizationService::class);
|
|
|
|
$tenantCustomFieldService = app(TenantCustomFieldService::class);
|
|
$customFieldDefinitions = $canManageCustomFields
|
|
? $tenantCustomFieldService->listForTenant($tenantId)
|
|
: [];
|
|
$ssoConfig = $canManageSso ? $tenantSsoService->getTenantMicrosoftAuth($tenantId) : [];
|
|
$ssoUiState = $canManageSso ? $tenantSsoService->buildMicrosoftUiState($tenantId, $ssoConfig) : [];
|
|
$ldapConfig = $canManageSso ? $tenantSsoService->getTenantLdapAuth($tenantId) : [];
|
|
$ldapUiState = $canManageSso ? $tenantSsoService->buildLdapUiState($tenantId) : [];
|
|
app(\MintyPHP\Service\Audit\AuditMetadataEnricherInterface::class)->enrich($tenant, ['created_by', 'modified_by', 'status_changed_by']);
|
|
|
|
$errorBag = formErrors();
|
|
$errors = [];
|
|
$form = array_merge($tenant, $ssoConfig);
|
|
$form['microsoft_enabled'] = $ssoConfig['enabled'] ?? false;
|
|
$form['ldap_enabled'] = $ldapConfig['enabled'] ?? false;
|
|
|
|
if ($request->isMethod('POST') && !actionRequireCsrf($editTarget, $editTarget, 'csrf_expired')) {
|
|
return;
|
|
}
|
|
|
|
if ($request->isMethod('POST')) {
|
|
$post = $request->bodyAll();
|
|
$submitDecision = $authorizationService->authorize(TenantAuthorizationPolicy::ABILITY_ADMIN_TENANTS_EDIT_SUBMIT, [
|
|
'actor_user_id' => $currentUserId,
|
|
'target_tenant_id' => $tenantId,
|
|
'input' => $post,
|
|
]);
|
|
if (!$submitDecision->isAllowed()) {
|
|
Router::redirect('error/forbidden');
|
|
return;
|
|
}
|
|
|
|
$submitCapabilities = $submitDecision->attribute('capabilities', []);
|
|
if (is_array($submitCapabilities)) {
|
|
$canUpdateTenant = (bool) ($submitCapabilities['can_update_tenant'] ?? $canUpdateTenant);
|
|
$canDeleteTenant = (bool) ($submitCapabilities['can_delete_tenant'] ?? $canDeleteTenant);
|
|
$canManageCustomFields = (bool) ($submitCapabilities['can_manage_custom_fields'] ?? $canManageCustomFields);
|
|
$canManageSso = (bool) ($submitCapabilities['can_manage_sso'] ?? $canManageSso);
|
|
$viewAuth['page'] = [
|
|
'can_update_tenant' => $canUpdateTenant,
|
|
'can_delete_tenant' => $canDeleteTenant,
|
|
'can_manage_custom_fields' => $canManageCustomFields,
|
|
'can_manage_sso' => $canManageSso,
|
|
];
|
|
}
|
|
if (!$canUpdateTenant) {
|
|
Router::redirect('error/forbidden');
|
|
return;
|
|
}
|
|
|
|
$result = app(\MintyPHP\Service\Tenant\TenantService::class)->updateFromAdmin($tenantId, $post, $currentUserId);
|
|
$form = $result['form'] ?? $form;
|
|
$errorBag->merge($result['errors'] ?? []);
|
|
|
|
if (($result['ok'] ?? false) && !$errorBag->hasAny()) {
|
|
if ($canManageSso) {
|
|
$ssoSaveResult = $tenantSsoService->saveTenantMicrosoftAuth($tenantId, $post);
|
|
if (!($ssoSaveResult['ok'] ?? false)) {
|
|
$errorBag->merge($ssoSaveResult['errors'] ?? [t('Tenant SSO settings could not be saved')]);
|
|
}
|
|
$ldapSaveResult = $tenantSsoService->saveTenantLdapAuth($tenantId, $post);
|
|
if (!($ldapSaveResult['ok'] ?? false)) {
|
|
$errorBag->merge($ldapSaveResult['errors'] ?? [t('Tenant LDAP settings could not be saved')]);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (($result['ok'] ?? false) && !$errorBag->hasAny()) {
|
|
if ($currentUserId > 0) {
|
|
$authService->loadTenantDataIntoSession($currentUserId);
|
|
}
|
|
$action = (string) ($post['action'] ?? 'save');
|
|
if ($action === 'save_close') {
|
|
Flash::success(t('Tenant updated'), $closeTarget, 'tenant_updated');
|
|
Router::redirect($closeTarget);
|
|
} else {
|
|
Flash::success(t('Tenant updated'), $editTarget, 'tenant_updated');
|
|
Router::redirect($editTarget);
|
|
}
|
|
}
|
|
|
|
if ($canManageSso) {
|
|
$form = array_merge($form, [
|
|
'microsoft_enabled' => !empty($post['microsoft_enabled']) ? '1' : '0',
|
|
'enforce_microsoft_login' => !empty($post['enforce_microsoft_login']) ? '1' : '0',
|
|
'sync_profile_on_login' => !empty($post['sync_profile_on_login']) ? '1' : '0',
|
|
'sync_profile_fields_list' => $tenantSsoService->normalizeProfileSyncFields($post['sync_profile_fields'] ?? []),
|
|
'entra_tenant_id' => trim((string) ($post['entra_tenant_id'] ?? '')),
|
|
'allowed_domains' => trim((string) ($post['allowed_domains'] ?? '')),
|
|
'use_shared_app' => !empty($post['use_shared_app']) ? '1' : '0',
|
|
'client_id_override' => trim((string) ($post['client_id_override'] ?? '')),
|
|
'auto_remember_mode' => $post['microsoft_auto_remember_mode'] ?? null,
|
|
]);
|
|
$ssoUiState = $tenantSsoService->buildMicrosoftUiState($tenantId, $post);
|
|
$ldapUiState = $tenantSsoService->buildLdapUiState($tenantId, $post);
|
|
$form = array_merge($form, [
|
|
'ldap_enabled' => !empty($post['ldap_enabled']) ? '1' : '0',
|
|
'enforce_ldap_login' => !empty($post['enforce_ldap_login']) ? '1' : '0',
|
|
'ldap_host' => trim((string) ($post['ldap_host'] ?? '')),
|
|
'ldap_port' => (int) ($post['ldap_port'] ?? 389),
|
|
'ldap_encryption_mode' => (string) ($post['ldap_encryption_mode'] ?? 'starttls'),
|
|
'ldap_verify_tls_certificate' => !empty($post['ldap_verify_tls_certificate']) ? '1' : '0',
|
|
'ldap_base_dn' => trim((string) ($post['ldap_base_dn'] ?? '')),
|
|
'ldap_user_search_filter' => trim((string) ($post['ldap_user_search_filter'] ?? '')),
|
|
'ldap_bind_method' => (string) ($post['ldap_bind_method'] ?? 'search_then_bind'),
|
|
'ldap_bind_username_format' => trim((string) ($post['ldap_bind_username_format'] ?? '')),
|
|
'ldap_unique_id_attribute' => trim((string) ($post['ldap_unique_id_attribute'] ?? 'objectGUID')),
|
|
'ldap_sync_profile_on_login' => !empty($post['ldap_sync_profile_on_login']) ? '1' : '0',
|
|
]);
|
|
}
|
|
}
|
|
|
|
if ($canManageSso && empty($ssoUiState)) {
|
|
$ssoUiState = $tenantSsoService->buildMicrosoftUiState($tenantId, $form);
|
|
}
|
|
if ($canManageSso && empty($ldapUiState)) {
|
|
$ldapUiState = $tenantSsoService->buildLdapUiState($tenantId);
|
|
}
|
|
|
|
$validationSummaryErrors = $errorBag->toArray();
|
|
$errors = $errorBag->toFlatList();
|
|
$tenantLabel = trim((string) ($form['description'] ?? $tenant['description'] ?? ''));
|
|
$fallbackTitle = $canUpdateTenant ? t('Edit tenant') : t('View tenant');
|
|
$titleText = $tenantLabel !== '' ? $tenantLabel : $fallbackTitle;
|
|
Buffer::set('title', $titleText);
|
|
$breadcrumbs = [
|
|
['label' => t('Home'), 'path' => 'admin'],
|
|
['label' => t('Tenants'), 'path' => 'admin/tenants'],
|
|
['label' => $titleText],
|
|
];
|