Malin/domnitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add user isolation mode and transfer features

Browse Source 
Introduces user isolation mode, allowing domains, groups, and tags to be visible only to their owners when enabled. Adds user_id fields to domains and notification_groups, updates models and controllers for isolation-aware queries, and provides admin UI and endpoints for transferring domains and groups between users (single and bulk). Includes migration, settings UI, and routes for toggling isolation mode and handling data migration.
This commit is contained in:
Hosteroid
2025-10-20 17:04:13 +03:00
parent 52d20c2996
commit 6fbed15c7d
13 changed files with 825 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
app/Views/groups/index.php
View File

@@ -37,6 +37,13 @@ ob_start();
<div class="flex items-center gap-4">
<span id="selected-count" class="text-sm font-medium text-blue-900"></span>
<?php if (\Core\Auth::user()['role'] === 'admin'): ?>
<button type="button" onclick="bulkTransfer()" class="inline-flex items-center px-4 py-2 bg-green-600 text-white text-sm rounded-lg hover:bg-green-700 transition-colors font-medium">
<i class="fas fa-exchange-alt mr-2"></i>
Transfer Selected
</button>
<?php endif; ?>
<button type="button" onclick="bulkDelete()" class="inline-flex items-center px-4 py-2 bg-red-600 text-white text-sm rounded-lg hover:bg-red-700 transition-colors font-medium">
<i class="fas fa-trash mr-2"></i>
Delete Selected
@@ -106,6 +113,13 @@ ob_start();
<a href="/groups/edit?id=<?= $group['id'] ?>" class="text-blue-600 hover:text-blue-800" title="Manage">
<i class="fas fa-cog"></i>
</a>
<?php if (\Core\Auth::user()['role'] === 'admin'): ?>
<button onclick="transferGroup(<?= $group['id'] ?>, '<?= htmlspecialchars($group['name']) ?>')"
class="text-green-600 hover:text-green-800"
title="Transfer Group">
<i class="fas fa-exchange-alt"></i>
</button>
<?php endif; ?>
<a href="/groups/delete?id=<?= $group['id'] ?>"
class="text-red-600 hover:text-red-800"
title="Delete"
@@ -252,6 +266,110 @@ function bulkDelete() {
document.body.appendChild(form);
form.submit();
}
// Transfer single group
function transferGroup(groupId, groupName) {
const users = <?= json_encode($users ?? []) ?>;
if (users.length === 0) {
alert('No users available for transfer');
return;
}
const userOptions = users.map(user =>
`<option value="${user.id}">${user.username} (${user.full_name || 'No name'})</option>`
).join('');
const modal = document.createElement('div');
modal.className = 'fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50';
modal.innerHTML = `
<div class="bg-white rounded-lg p-6 w-96">
<h3 class="text-lg font-semibold mb-4">Transfer Group</h3>
<p class="text-sm text-gray-600 mb-4">Transfer group "${groupName}" to another user:</p>
<form method="POST" action="/groups/transfer">
<input type="hidden" name="csrf_token" value="<?= csrf_token() ?>">
<input type="hidden" name="group_id" value="${groupId}">
<div class="mb-4">
<label class="block text-sm font-medium text-gray-700 mb-2">Transfer to User:</label>
<select name="target_user_id" required class="w-full px-3 py-2 border border-gray-300 rounded-lg">
<option value="">Select User</option>
${userOptions}
</select>
</div>
<div class="flex justify-end space-x-3">
<button type="button" onclick="this.closest('.fixed').remove()"
class="px-4 py-2 border border-gray-300 rounded-lg hover:bg-gray-50">
Cancel
</button>
<button type="submit" class="px-4 py-2 bg-green-600 text-white rounded-lg hover:bg-green-700">
Transfer
</button>
</div>
</form>
</div>
`;
document.body.appendChild(modal);
}
// Bulk transfer groups
function bulkTransfer() {
const selectedCheckboxes = document.querySelectorAll('input[name="group_ids[]"]:checked');
if (selectedCheckboxes.length === 0) {
alert('Please select groups to transfer');
return;
}
const users = <?= json_encode($users ?? []) ?>;
if (users.length === 0) {
alert('No users available for transfer');
return;
}
const userOptions = users.map(user =>
`<option value="${user.id}">${user.username} (${user.full_name || 'No name'})</option>`
).join('');
const modal = document.createElement('div');
modal.className = 'fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50';
modal.innerHTML = `
<div class="bg-white rounded-lg p-6 w-96">
<h3 class="text-lg font-semibold mb-4">Transfer Groups</h3>
<p class="text-sm text-gray-600 mb-4">Transfer ${selectedCheckboxes.length} selected group(s) to another user:</p>
<form method="POST" action="/groups/bulk-transfer">
<input type="hidden" name="csrf_token" value="<?= csrf_token() ?>">
${Array.from(selectedCheckboxes).map(cb =>
`<input type="hidden" name="group_ids[]" value="${cb.value}">`
).join('')}
<div class="mb-4">
<label class="block text-sm font-medium text-gray-700 mb-2">Transfer to User:</label>
<select name="target_user_id" required class="w-full px-3 py-2 border border-gray-300 rounded-lg">
<option value="">Select User</option>
${userOptions}
</select>
</div>
<div class="flex justify-end space-x-3">
<button type="button" onclick="this.closest('.fixed').remove()"
class="px-4 py-2 border border-gray-300 rounded-lg hover:bg-gray-50">
Cancel
</button>
<button type="submit" class="px-4 py-2 bg-green-600 text-white rounded-lg hover:bg-green-700">
Transfer All
</button>
</div>
</form>
</div>
`;
document.body.appendChild(modal);
}
</script>
<?php

77
app/Views/settings/index.php
View File

@@ -48,6 +48,10 @@ foreach ($notificationPresets as $key => $preset) {
<i class="fas fa-bell mr-2"></i>
Monitoring
</button>
<button onclick="switchTab('isolation')" id="tab-isolation" class="tab-button px-6 py-3 text-sm font-medium border-b-2 border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 whitespace-nowrap">
<i class="fas fa-users mr-2"></i>
User Isolation
</button>
<button onclick="switchTab('security')" id="tab-security" class="tab-button px-6 py-3 text-sm font-medium border-b-2 border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 whitespace-nowrap">
<i class="fas fa-shield-alt mr-2"></i>
Security
@@ -423,6 +427,77 @@ foreach ($notificationPresets as $key => $preset) {
</div>
</div>
<!-- Tab Content: User Isolation Settings -->
<div id="content-isolation" class="tab-content hidden">
<div class="bg-white rounded-lg border border-gray-200 overflow-hidden">
<div class="px-6 py-4 border-b border-gray-200 bg-gray-50">
<h3 class="text-lg font-semibold text-gray-900">User Isolation Settings</h3>
<p class="text-sm text-gray-600 mt-1">Configure how users see domains, groups, and tags</p>
</div>
<form method="POST" action="/settings/toggle-isolation" class="p-6">
<?= csrf_field() ?>
<div class="space-y-6">
<!-- Isolation Mode -->
<div>
<label class="block text-sm font-medium text-gray-700 mb-2">
User Data Visibility
</label>
<select name="user_isolation_mode" class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-primary focus:border-primary">
<option value="shared" <?= $isolationSettings['user_isolation_mode'] === 'shared' ? 'selected' : '' ?>>
🔓 Shared - All users see all domains, groups, and tags
</option>
<option value="isolated" <?= $isolationSettings['user_isolation_mode'] === 'isolated' ? 'selected' : '' ?>>
🔒 Isolated - Users only see their own domains, groups, and tags
</option>
</select>
<p class="text-xs text-gray-500 mt-1">
<strong>Shared:</strong> Current behavior - everyone sees everything<br>
<strong>Isolated:</strong> Users only see what they created
</p>
</div>
<?php if ($isolationSettings['user_isolation_mode'] === 'shared'): ?>
<div class="bg-yellow-50 border border-yellow-200 rounded-lg p-4">
<div class="flex">
<i class="fas fa-exclamation-triangle text-yellow-600 mt-1"></i>
<div class="ml-3">
<h4 class="text-sm font-medium text-yellow-800">Migration Notice</h4>
<p class="text-sm text-yellow-700 mt-1">
When switching to isolated mode, all existing domains and groups will be assigned to the first admin user.
You can then transfer them to other users as needed.
</p>
</div>
</div>
</div>
<?php endif; ?>
<?php if ($isolationSettings['user_isolation_mode'] === 'isolated'): ?>
<div class="bg-blue-50 border border-blue-200 rounded-lg p-4">
<div class="flex">
<i class="fas fa-info-circle text-blue-600 mt-1"></i>
<div class="ml-3">
<h4 class="text-sm font-medium text-blue-800">Isolation Mode Active</h4>
<p class="text-sm text-blue-700 mt-1">
Users can only see their own domains, groups, and tags. Admins can transfer domains and groups between users.
</p>
</div>
</div>
</div>
<?php endif; ?>
<div class="flex justify-end">
<button type="submit" class="btn btn-primary">
<i class="fas fa-save mr-2"></i>
Update Isolation Mode
</button>
</div>
</div>
</form>
</div>
</div>
<!-- Tab Content: Security Settings -->
<div id="content-security" class="tab-content hidden">
<div class="bg-white rounded-lg border border-gray-200 overflow-hidden">
@@ -795,7 +870,7 @@ function switchTab(tabName) {
// Load tab from URL hash on page load
window.addEventListener('DOMContentLoaded', function() {
const hash = window.location.hash.substring(1); // Remove the #
const validTabs = ['app', 'email', 'monitoring', 'security', 'system', 'maintenance'];
const validTabs = ['app', 'email', 'monitoring', 'isolation', 'security', 'system', 'maintenance'];
if (hash && validTabs.includes(hash)) {
switchTab(hash);