@intranefr/superbackend 1.5.3 → 1.6.3

package/views/admin-users.ejs

@@ -135,9 +135,12 @@
         <div>
           <label class="block text-sm font-medium text-gray-700 mb-1">Role</label>
           <select id="edit-role" class="w-full border rounded px-3 py-2">
-            <option value="user">user</option>
-            <option value="admin">admin</option>
+            <option value="">Select a role</option>
           </select>
+          <div id="edit-role-info" class="mt-2 p-2 bg-gray-50 rounded text-sm hidden">
+            <div id="edit-role-description" class="text-gray-600"></div>
+            <div id="edit-role-grants" class="text-gray-500 text-xs mt-1"></div>
+          </div>
         </div>
         <div>
           <label class="block text-sm font-medium text-gray-700 mb-1">Plan</label>
@@ -257,10 +260,15 @@
         </div>
         <div>
           <label class="block text-sm font-medium text-gray-700 mb-1">Role</label>
-          <select id="register-role" class="w-full border rounded px-3 py-2">
-            <option value="user">User</option>
-            <option value="admin">Admin</option>
-          </select>
+          <div class="space-y-2">
+            <select id="register-role" class="w-full border rounded px-3 py-2">
+              <option value="">Loading roles...</option>
+            </select>
+            <div id="role-info" class="hidden text-xs text-gray-600 bg-gray-50 p-2 rounded border">
+              <div id="role-description"></div>
+              <div id="role-grants" class="mt-1"></div>
+            </div>
+          </div>
         </div>
         <div id="register-error" class="hidden text-red-600 text-sm"></div>
       </form>
@@ -301,10 +309,55 @@
     }
 
     const state = { offset: 0, limit: 50, total: 0 };
+    const isIframe = <%= typeof isIframe !== 'undefined' && isIframe %>;
+
+    // Enhanced fetch function for iframe communication
+    async function apiFetch(url, options = {}) {
+      if (isIframe) {
+        // In iframe mode, request data from parent window
+        return new Promise((resolve, reject) => {
+          const messageId = 'api-request-' + Date.now() + '-' + Math.random();
+          
+          const handleMessage = (event) => {
+            if (event.data.type === 'api-response' && event.data.messageId === messageId) {
+              window.removeEventListener('message', handleMessage);
+              if (event.data.error) {
+                reject(new Error(event.data.error));
+              } else {
+                resolve({
+                  ok: event.data.ok,
+                  json: async () => event.data.data,
+                  text: async () => JSON.stringify(event.data.data)
+                });
+              }
+            }
+          };
+          
+          window.addEventListener('message', handleMessage);
+          
+          // Request data from parent
+          window.parent.postMessage({
+            type: 'api-request',
+            messageId: messageId,
+            url: url,
+            options: options
+          }, '*');
+          
+          // Timeout after 10 seconds
+          setTimeout(() => {
+            window.removeEventListener('message', handleMessage);
+            reject(new Error('Timeout waiting for parent response'));
+          }, 10000);
+        });
+      } else {
+        // Normal mode - direct fetch
+        return fetch(url, options);
+      }
+    }
 
     async function loadStats() {
       try {
-        const res = await fetch(`${API_BASE}/api/admin/users/stats`);
+        const res = await apiFetch(`${API_BASE}/api/admin/users/stats`);
         const data = await res.json();
         if (res.ok) {
           document.getElementById('stat-total').textContent = data.total ?? '-';
@@ -331,7 +384,7 @@
 
       try {
         const url = `${API_BASE}/api/admin/users${qs({ q, role, subscriptionStatus, currentPlan, limit: state.limit, offset: state.offset })}`;
-        const res = await fetch(url);
+        const res = await apiFetch(url);
         const data = await res.json();
 
         if (!res.ok) { showToast(data?.error || 'Failed to load users', 'error'); return; }
@@ -433,13 +486,19 @@
       } catch (e) { showToast(e.message, 'error'); }
     }
 
-    function openEditModal(userId, name, role, plan, subscription) {
+    async function openEditModal(userId, name, role, plan, subscription) {
       document.getElementById('edit-user-id').value = userId;
       document.getElementById('edit-name').value = name || '';
-      document.getElementById('edit-role').value = role || 'user';
       document.getElementById('edit-plan').value = plan || 'free';
       document.getElementById('edit-subscription').value = subscription || 'none';
       
+      // Load RBAC roles for edit form
+      await loadEditRbacRoles();
+      
+      // Set the role after loading RBAC roles
+      document.getElementById('edit-role').value = role || 'user';
+      displayEditRoleInfo(role || 'user');
+      
       // Reset password fields
       document.getElementById('edit-reset-password').checked = false;
       document.getElementById('password-fields').classList.add('hidden');
@@ -625,13 +684,141 @@
       } catch (e) { showToast(e.message, 'error'); }
     }
 
+    // RBAC Role Management Functions
+    let rbacRoles = [];
+
+    async function loadRbacRoles() {
+      try {
+        const res = await fetch(`${API_BASE}/api/admin/rbac/roles`);
+        const data = await res.json();
+        if (res.ok) {
+          rbacRoles = data.roles || [];
+          populateRoleSelect();
+        } else {
+          console.error('Failed to load RBAC roles:', data.error);
+          // Fallback to hardcoded options
+          rbacRoles = [
+            { key: 'user', name: 'User', description: 'Regular user with no admin access' },
+            { key: 'admin', name: 'Admin', description: 'Admin with panel access' }
+          ];
+          populateRoleSelect();
+        }
+      } catch (error) {
+        console.error('Error loading RBAC roles:', error);
+        // Fallback to hardcoded options
+        rbacRoles = [
+          { key: 'user', name: 'User', description: 'Regular user with no admin access' },
+          { key: 'admin', name: 'Admin', description: 'Admin with panel access' }
+        ];
+        populateRoleSelect();
+      }
+    }
+
+    function populateRoleSelect() {
+      const select = document.getElementById('register-role');
+      select.innerHTML = '<option value="">Select a role</option>';
+      
+      rbacRoles.forEach(role => {
+        const option = document.createElement('option');
+        option.value = role.key;
+        option.textContent = `${role.name} - ${role.description}`;
+        select.appendChild(option);
+      });
+    }
+
+    function displayRoleInfo(roleKey) {
+      const role = rbacRoles.find(r => r.key === roleKey);
+      const infoDiv = document.getElementById('role-info');
+      const descDiv = document.getElementById('role-description');
+      const grantsDiv = document.getElementById('role-grants');
+
+      if (!role) {
+        infoDiv.classList.add('hidden');
+        return;
+      }
+
+      descDiv.textContent = role.description || '';
+      
+      // Show grants information if available
+      if (role.grants && role.grants.length > 0) {
+        grantsDiv.innerHTML = `<strong>Permissions:</strong> ${role.grants.slice(0, 3).join(', ')}${role.grants.length > 3 ? '...' : ''}`;
+      } else {
+        grantsDiv.innerHTML = '<strong>Permissions:</strong> Admin panel access';
+      }
+      
+      infoDiv.classList.remove('hidden');
+    }
+
+    // Edit Form RBAC Functions
+    async function loadEditRbacRoles() {
+      try {
+        const res = await fetch(`${API_BASE}/api/admin/rbac/roles`);
+        const data = await res.json();
+        if (res.ok) {
+          rbacRoles = data.roles || [];
+          populateEditRoleSelect();
+        } else {
+          rbacRoles = [
+            { key: 'user', name: 'User', description: 'Regular user with no admin access' },
+            { key: 'admin', name: 'Admin', description: 'Admin Panel Access - Full administrative privileges' }
+          ];
+          populateEditRoleSelect();
+        }
+      } catch (error) {
+        rbacRoles = [
+          { key: 'user', name: 'User', description: 'Regular user with no admin access' },
+          { key: 'admin', name: 'Admin', description: 'Admin Panel Access - Full administrative privileges' }
+        ];
+        populateEditRoleSelect();
+      }
+    }
+
+    function populateEditRoleSelect() {
+      const select = document.getElementById('edit-role');
+      select.innerHTML = '<option value="">Select a role</option>';
+      
+      rbacRoles.forEach(role => {
+        const option = document.createElement('option');
+        option.value = role.key;
+        option.textContent = `${role.name} - ${role.description}`;
+        select.appendChild(option);
+      });
+    }
+
+    function displayEditRoleInfo(roleKey) {
+      const role = rbacRoles.find(r => r.key === roleKey);
+      const infoDiv = document.getElementById('edit-role-info');
+      const descDiv = document.getElementById('edit-role-description');
+      const grantsDiv = document.getElementById('edit-role-grants');
+
+      if (!role) {
+        infoDiv.classList.add('hidden');
+        return;
+      }
+
+      descDiv.textContent = role.description || '';
+      
+      // Show grants information if available
+      if (role.grants && role.grants.length > 0) {
+        grantsDiv.innerHTML = `<strong>Permissions:</strong> ${role.grants.slice(0, 3).join(', ')}${role.grants.length > 3 ? '...' : ''}`;
+      } else {
+        grantsDiv.innerHTML = '<strong>Permissions:</strong> Admin panel access';
+      }
+      
+      infoDiv.classList.remove('hidden');
+    }
+
     function openRegisterModal() {
       document.getElementById('register-email').value = '';
       document.getElementById('register-password').value = '';
       document.getElementById('register-name').value = '';
-      document.getElementById('register-role').value = 'user';
+      document.getElementById('register-role').value = '';
       document.getElementById('register-error').classList.add('hidden');
+      document.getElementById('role-info').classList.add('hidden');
       document.getElementById('modal-register').classList.remove('hidden');
+      
+      // Load RBAC roles when modal opens
+      loadRbacRoles();
     }
 
     function closeRegisterModal() {
@@ -866,6 +1053,15 @@
       document.getElementById('btn-register-submit').onclick = registerUser;
       document.getElementById('toggle-password').onclick = togglePasswordVisibility;
       
+      // Role selection change events
+      document.getElementById('register-role').onchange = (e) => {
+        displayRoleInfo(e.target.value);
+      };
+      
+      document.getElementById('edit-role').onchange = (e) => {
+        displayEditRoleInfo(e.target.value);
+      };
+      
       // Form submission
       document.getElementById('register-form').onsubmit = (e) => {
         e.preventDefault();

package/views/partials/dashboard/nav-items.ejs

@@ -38,12 +38,14 @@
         title: 'System & DevOps',
         items: [
           { id: 'settings', label: 'Global Settings', path: adminPath + '/global-settings', icon: 'ti-settings' },
+          { id: 'plugins-system', label: 'Plugins system', path: adminPath + '/plugins-system', icon: 'ti-puzzle' },
           { id: 'flags', label: 'Feature Flags', path: adminPath + '/feature-flags', icon: 'ti-flag' },
           { id: 'ejs', label: 'Virtual EJS', path: adminPath + '/ejs-virtual', icon: 'ti-code' },
           { id: 'rate-limiter', label: 'Rate Limiter', path: adminPath + '/rate-limiter', icon: 'ti-traffic-cone' },
           { id: 'proxy', label: 'Proxy system', path: adminPath + '/proxy', icon: 'ti-world' },
           { id: 'cache', label: 'Cache Layer', path: adminPath + '/cache', icon: 'ti-database' },
 	          { id: 'db-browser', label: 'DB Browser', path: adminPath + '/db-browser', icon: 'ti-database-search' },
+          { id: 'data-cleanup', label: 'Data cleanup', path: adminPath + '/data-cleanup', icon: 'ti-broom' },
           { id: 'migration', label: 'Migration', path: adminPath + '/migration', icon: 'ti-database-export' },
           { id: 'webhooks', label: 'Webhooks', path: adminPath + '/webhooks', icon: 'ti-webhook' },
           { id: 'coolify', label: 'Coolify Deploy', path: adminPath + '/coolify-deploy', icon: 'ti-rocket' },

package/views/partials/llm-provider-model-picker.ejs

@@ -20,164 +20,3 @@
   <input id="<%= modelInputId %>" class="w-full border rounded px-2 py-2 text-sm" placeholder="e.g. google/gemini-2.5-flash-lite" list="<%= modelInputId %>__datalist" />
   <datalist id="<%= modelInputId %>__datalist"></datalist>
 </div>
-
-<script>
-  (function () {
-    if (!window.__llmProviderModelPicker) {
-      window.__llmProviderModelPicker = { instances: {} };
-    }
-
-    function safeJsonParse(raw, fallback) {
-      try {
-        return JSON.parse(raw);
-      } catch (_) {
-        return fallback;
-      }
-    }
-
-    async function fetchJson(url) {
-      const res = await fetch(url);
-      const data = await res.json();
-      if (!res.ok) {
-        throw new Error(data?.error || 'Request failed');
-      }
-      return data;
-    }
-
-    function setDatalistOptions(datalistEl, items) {
-      datalistEl.innerHTML = '';
-      const uniq = Array.from(new Set((items || []).filter(Boolean)));
-      for (const item of uniq) {
-        const opt = document.createElement('option');
-        opt.value = String(item);
-        datalistEl.appendChild(opt);
-      }
-    }
-
-    function trim(v) {
-      return String(v || '').trim();
-    }
-
-    function isOpenRouterProvider({ providerKey, providerConfig }) {
-      const pk = String(providerKey || '').trim().toLowerCase();
-      if (pk === 'openrouter') return true;
-
-      const baseUrl = providerConfig && typeof providerConfig === 'object'
-        ? String(providerConfig.baseUrl || providerConfig.baseURL || '').trim().toLowerCase()
-        : '';
-
-      return Boolean(baseUrl && baseUrl.includes('openrouter'));
-    }
-
-    function getInstanceKey({ providerInputId, modelInputId }) {
-      return `${String(providerInputId || '').trim()}::${String(modelInputId || '').trim()}`;
-    }
-
-    function getOrCreateInstance(opts) {
-      const key = getInstanceKey(opts);
-      const existing = window.__llmProviderModelPicker.instances[key];
-      if (existing) return existing;
-
-      const inst = {
-        apiBase: opts.apiBase,
-        providerInputId: opts.providerInputId,
-        modelInputId: opts.modelInputId,
-        providers: {},
-        providerModels: {},
-      };
-
-      window.__llmProviderModelPicker.instances[key] = inst;
-      return inst;
-    }
-
-    async function loadConfig(inst) {
-      const data = await fetchJson(`${inst.apiBase}/api/admin/llm/config`);
-      inst.providers = data.providers || {};
-      inst.providerModels = data.providerModels || {};
-      return data;
-    }
-
-    function renderProviderOptions(inst) {
-      const providerInput = document.getElementById(inst.providerInputId);
-      const providerList = document.getElementById(`${inst.providerInputId}__datalist`);
-      if (!providerInput || !providerList) return;
-
-      const providerKeys = Object.keys(inst.providers || {}).sort();
-      setDatalistOptions(providerList, providerKeys);
-    }
-
-    function renderModelOptions(inst) {
-      const providerInput = document.getElementById(inst.providerInputId);
-      const modelList = document.getElementById(`${inst.modelInputId}__datalist`);
-      if (!providerInput || !modelList) return;
-
-      const providerKey = trim(providerInput.value);
-      const models = providerKey && inst.providerModels && typeof inst.providerModels === 'object'
-        ? inst.providerModels[providerKey]
-        : null;
-
-      setDatalistOptions(modelList, Array.isArray(models) ? models : []);
-    }
-
-    async function maybeAutoFetchOpenRouterModels(inst) {
-      try {
-        const providerInput = document.getElementById(inst.providerInputId);
-        if (!providerInput) return;
-
-        const providerKey = trim(providerInput.value);
-        const providerConfig = inst.providers && typeof inst.providers === 'object' ? inst.providers[providerKey] : null;
-        if (!isOpenRouterProvider({ providerKey, providerConfig })) return;
-
-        const existing = inst.providerModels && typeof inst.providerModels === 'object' ? inst.providerModels.openrouter : null;
-        if (Array.isArray(existing) && existing.length > 0) return;
-
-        await fetchOpenRouterModels({
-          apiBase: inst.apiBase,
-          providerInputId: inst.providerInputId,
-          modelInputId: inst.modelInputId,
-        });
-      } catch {
-        // ignore
-      }
-    }
-
-    async function fetchOpenRouterModels(opts) {
-      const inst = getOrCreateInstance(opts || {});
-      inst.apiBase = (opts && opts.apiBase) || inst.apiBase || window.__llmProviderModelPicker.defaultApiBase || null;
-      if (!inst.apiBase) return;
-
-      const data = await fetchJson(`${inst.apiBase}/api/admin/llm/openrouter/models`);
-      const models = Array.isArray(data?.models) ? data.models : [];
-
-      inst.providerModels = inst.providerModels && typeof inst.providerModels === 'object' ? inst.providerModels : {};
-      inst.providerModels.openrouter = models;
-      renderModelOptions(inst);
-    }
-
-    async function init(opts) {
-      const inst = getOrCreateInstance(opts || {});
-
-      if (opts && opts.apiBase) {
-        window.__llmProviderModelPicker.defaultApiBase = opts.apiBase;
-      }
-
-      await loadConfig(inst);
-      renderProviderOptions(inst);
-      renderModelOptions(inst);
-      await maybeAutoFetchOpenRouterModels(inst);
-
-      const providerInput = document.getElementById(inst.providerInputId);
-      if (providerInput) {
-        providerInput.addEventListener('change', async () => {
-          renderModelOptions(inst);
-          await maybeAutoFetchOpenRouterModels(inst);
-        });
-        providerInput.addEventListener('input', () => renderModelOptions(inst));
-      }
-    }
-
-    window.__llmProviderModelPicker.init = init;
-    window.__llmProviderModelPicker.fetchOpenRouterModels = fetchOpenRouterModels;
-    window.__llmProviderModelPicker._util = { safeJsonParse };
-  })();
-</script>