feat: refactor super admin to use is_super_admin flag and enhance site deletion logic
- Changed super admin detection from role-based to `is_super_admin` flag in AdminUser model
- Added `requireDefaultAdminSiteId()` method to throw validation error when no integration site exists
- Enhanced site deletion to migrate platform role bindings to fallback site and auto-delete site-specific admin accounts
- Made agent line code optional with auto-generation fallback using `{site_code}-agent-{counter}` format
This commit is contained in:
@@ -26,11 +26,10 @@ final class AdminUserDestroyController extends Controller
|
||||
return ApiMessage::errorResponse($request, 'admin.user_cannot_delete_self', ErrorCode::ValidationFailed->value, null, 422);
|
||||
}
|
||||
|
||||
$admin_user->load('roles');
|
||||
if ($admin_user->isSuperAdmin()) {
|
||||
$hasOther = AdminUser::query()
|
||||
->whereKeyNot($admin_user->getKey())
|
||||
->whereHas('roles', static fn ($q) => $q->where('admin_roles.slug', AdminUser::ROLE_SUPER_ADMIN))
|
||||
->where('is_super_admin', true)
|
||||
->exists();
|
||||
if (! $hasOther) {
|
||||
return ApiMessage::errorResponse($request, 'admin.user_cannot_delete_last_super_admin', ErrorCode::ValidationFailed->value, null, 422);
|
||||
|
||||
@@ -25,7 +25,7 @@ final class AdminUserPermissionSyncController extends Controller
|
||||
(array) ($input['permissions'] ?? $input['permission_slugs'] ?? []),
|
||||
static fn ($v) => is_string($v) && $v !== '',
|
||||
)));
|
||||
$siteId = AdminUser::defaultAdminSiteId();
|
||||
$siteId = AdminUser::requireDefaultAdminSiteId();
|
||||
|
||||
$codes = [];
|
||||
foreach ($slugs as $slug) {
|
||||
|
||||
Reference in New Issue
Block a user