v2: user CRUD + schema автозапуск + router тесты — модуль пользователя готов

2026-06-12 21:09:30 +04:00
parent df72fa2fe1
commit a835cf0f16
6 changed files with 253 additions and 12 deletions
@@ -6,7 +6,7 @@
 // ═══════════════════════════════════════════════════════════════════════════════

 module.exports = {
-  version: '0.5.75',
+  version: '0.5.76',
  iamUrl:  process.env.V2_IAM_API_URL || 'https://auth-api.ngcloud.ru',
  appUrl:  process.env.V2_APP_URL      || 'https://whitelist.nodejsk8s.services.ngcloud.ru',
 };
@@ -0,0 +1,64 @@
+const { resolveContext } = require('./index');
+let passed = 0, failed = 0;
+
+function t(name, session, expected) {
+  const res = { _redirect: undefined, redirect(u) { this._redirect = u; } };
+  const req = { session: session || {} };
+  resolveContext(req, res, () => {});
+
+  if (res._redirect !== (expected._redirect || undefined)) {
+    console.log('❌', name, 'redirect:', res._redirect, '!=', expected._redirect);
+    failed++; return;
+  }
+
+  for (const k of Object.keys(expected).filter(k => k !== '_redirect')) {
+    if (JSON.stringify(req[k]) !== JSON.stringify(expected[k])) {
+      console.log('❌', name, k, ':', JSON.stringify(req[k]), '!=', JSON.stringify(expected[k]));
+      failed++; return;
+    }
+  }
+  console.log('✅', name); passed++;
+}
+
+t('нет сессии', {}, { _redirect: '/v2/login' });
+t('нет v2_user', { v2_user: null }, { _redirect: '/v2/login' });
+
+t('обычный юзер 1 компания', { v2_user: {
+  email: 'u@t.ru', clientId: 'WZ03709', activeClientId: 'WZ03709',
+  allClientIds: ['WZ03709'], companyName: 'test', isAdmin: false, profiles: []
+}}, { 'v2_email': 'u@t.ru', 'v2_clientId': 'WZ03709', 'v2_isAdmin': false, 'v2_isImpersonated': false, 'v2_impersonatedBy': null });
+
+t('юзер 2 компании', { v2_user: {
+  email: 'm@t.ru', clientId: 'WZ88888', activeClientId: 'WZ77777',
+  allClientIds: ['WZ88888','WZ77777'], companyName: 'AB', isAdmin: false, profiles: []
+}}, { 'v2_email': 'm@t.ru', 'v2_clientId': 'WZ77777', 'v2_allClientIds': ['WZ88888','WZ77777'] });
+
+t('админ adminMode', { v2_user: {
+  email: 'a@t.ru', clientId: 'WZ01112', activeClientId: 'WZ01112',
+  allClientIds: ['WZ01112'], isAdmin: true, profiles: []
+}, v2_adminMode: true }, { 'v2_email': 'a@t.ru', 'v2_clientId': 'WZ01112', 'v2_isAdmin': true });
+
+t('админ без adminMode', { v2_user: {
+  email: 'a@t.ru', clientId: 'WZ01112', activeClientId: 'WZ01112',
+  allClientIds: ['WZ01112'], isAdmin: true, profiles: []
+} }, { 'v2_email': 'a@t.ru', 'v2_clientId': 'WZ01112', 'v2_isAdmin': false });
+
+t('имперсонация', { v2_user: {
+  email: 'admin@t.ru', clientId: 'WZ01112', activeClientId: 'WZ01112',
+  allClientIds: ['WZ01112','WZ03709'], isAdmin: true, isImpersonated: true,
+  originalUserEmail: 'real@t.ru', impersonatedCompanyId: 'WZ03709', profiles: []
+}, v2_adminMode: true }, { 'v2_email': 'real@t.ru', 'v2_clientId': 'WZ03709', 'v2_isImpersonated': true, 'v2_impersonatedBy': 'admin@t.ru' });
+
+t('имперс. без origEmail', { v2_user: {
+  email: 'x@t.ru', clientId: 'WZ01112', activeClientId: 'WZ01112',
+  allClientIds: ['WZ01112'], isAdmin: true, isImpersonated: true,
+  originalUserEmail: '', impersonatedCompanyId: '', profiles: []
+} }, { 'v2_email': 'x@t.ru', 'v2_clientId': 'WZ01112', 'v2_impersonatedBy': 'x@t.ru' });
+
+t('без activeClientId', { v2_user: {
+  email: 'y@t.ru', clientId: 'WZ03709', allClientIds: ['WZ03709'],
+  isAdmin: false, profiles: []
+} }, { 'v2_email': 'y@t.ru', 'v2_clientId': 'WZ03709' });
+
+console.log(`\n${passed} passed, ${failed} failed`);
+if (failed) process.exit(1);
@@ -1,24 +1,144 @@
 // ═══════════════════════════════════════════════════════════════════════════════
-// V2 — пользовательский CRUD (пустышка)
-// Будет: таблица записей, форма добавления, выбор компании из дропдауна
+// V2 — пользовательский CRUD
+// Вход: req.v2_* из resolveContext (email, clientId, allClientIds, profiles, ...)
+// Всегда показывает выбор компании (даже если одна).
 // ═══════════════════════════════════════════════════════════════════════════════

 const express = require('express');
+const q = require('../db/queries');

 function createUserRouter() {
  const router = express.Router();

-  router.get('/', (req, res) => {
-    res.send(`<h2>User CRUD</h2>
-      <p>email: ${req.v2_email}</p>
-      <p>clientId: ${req.v2_clientId}</p>
-      <p>isAdmin: ${req.v2_isAdmin}</p>
-      <p>isImpersonated: ${req.v2_isImpersonated}</p>
-      <p><a href="/v2/admin">Админка</a> | <a href="/v2/logout">Выйти</a></p>
-    `);
+  // ── GET / — главная: список записей + форма ────────────────────────────
+  router.get('/', async (req, res) => {
+    try {
+      const clId = req.v2_clientId;
+      const allCompanies = req.v2_profiles.length > 0
+        ? req.v2_profiles
+        : [{ client_id: clId, company_name: req.v2_companyName || clId }];
+
+      const company = await q.getOrCreateCompany(clId, allCompanies.find(c => c.client_id === clId)?.company_name || clId);
+      const includeDeleted = req.query.deleted === '1';
+      const entries = await q.listEntries(company.id, includeDeleted);
+      const limit = await q.getLimit(company);
+      const used = entries.filter(e => !e.deleted_at).length;
+
+      // Переключение компании
+      if (req.query.switchTo && allCompanies.find(c => c.client_id === req.query.switchTo)) {
+        req.session.v2_user.activeClientId = req.query.switchTo;
+        return res.redirect('/v2/app');
+      }
+
+      res.send(renderPage({ entries, company, limit, used, allCompanies, clId, user: req.v2_user, includeDeleted }));
+    } catch (e) {
+      res.status(500).send('<h2>Ошибка</h2><pre>' + e.message + '</pre><a href="/v2/app">Назад</a>');
+    }
+  });
+
+  // ── POST /add ───────────────────────────────────────────────────────────
+  router.post('/add', async (req, res) => {
+    try {
+      const clId = req.v2_clientId;
+      const company = await q.getOrCreateCompany(clId, clId);
+      const result = await q.createEntry(company.id, req.body.cidr || '', req.body.comment || '', req.v2_email, req.v2_impersonatedBy);
+      const msg = result.wasNormalized ? 'Добавлено (адрес нормализован)' : 'Добавлено';
+      res.redirect('/v2/app?msg=' + encodeURIComponent(msg));
+    } catch (e) {
+      res.redirect('/v2/app?error=' + encodeURIComponent(e.message));
+    }
+  });
+
+  // ── POST /edit/:id ──────────────────────────────────────────────────────
+  router.post('/edit/:id', async (req, res) => {
+    try {
+      const clId = req.v2_clientId;
+      const company = await q.getOrCreateCompany(clId, clId);
+      const result = await q.updateEntry(parseInt(req.params.id), company.id, req.body.cidr || '', req.body.comment || '', req.v2_email, req.v2_impersonatedBy);
+      const msg = result.wasNormalized ? 'Изменено (адрес нормализован)' : 'Изменено';
+      res.redirect('/v2/app?msg=' + encodeURIComponent(msg));
+    } catch (e) {
+      res.redirect('/v2/app?error=' + encodeURIComponent(e.message));
+    }
+  });
+
+  // ── POST /delete/:id ────────────────────────────────────────────────────
+  router.post('/delete/:id', async (req, res) => {
+    try {
+      const clId = req.v2_clientId;
+      const company = await q.getOrCreateCompany(clId, clId);
+      await q.deleteEntry(parseInt(req.params.id), company.id, req.v2_email, req.v2_impersonatedBy);
+      res.redirect('/v2/app?msg=Удалено');
+    } catch (e) {
+      res.redirect('/v2/app?error=' + encodeURIComponent(e.message));
+    }
  });

  return router;
 }

+// ── HTML-рендеринг (временный, будет заменён на EJS) ─────────────────────
+
+function renderPage({ entries, company, limit, used, allCompanies, clId, user, includeDeleted }) {
+  const companyOptions = allCompanies.map(c =>
+    `<option value="${c.client_id}" ${c.client_id === clId ? 'selected' : ''}>${c.company_name || c.client_id} (${c.client_id})</option>`
+  ).join('');
+
+  const rows = entries.map(e => {
+    const del = e.deleted_at;
+    const style = del ? 'text-decoration:line-through;opacity:0.5' : '';
+    const actions = del ? '<span style="color:#888">удалено</span>' : `
+      <form method="POST" action="/v2/app/edit/${e.id}" style="display:inline">
+        <input name="cidr" value="${e.value_cidr}" size="18">
+        <input name="comment" value="${e.comment || ''}" size="20">
+        <button>изменить</button>
+      </form>
+      <form method="POST" action="/v2/app/delete/${e.id}" style="display:inline">
+        <button onclick="return confirm('Удалить?')">удалить</button>
+      </form>`;
+    return `<tr style="${style}"><td>${e.value_cidr}</td><td>${e.comment || ''}</td><td>${e.created_by}</td><td>${new Date(e.created_at).toLocaleString('ru')}</td><td>${actions}</td></tr>`;
+  }).join('');
+
+  return `<!DOCTYPE html>
+<html><head><meta charset="utf-8"><title>V2 IP WhiteList</title>
+<style>
+  body{font-family:sans-serif;max-width:960px;margin:20px auto;color:#222}
+  table{width:100%;border-collapse:collapse;margin:10px 0}
+  th,td{border:1px solid #ccc;padding:6px;text-align:left}
+  th{background:#f5f5f5}
+  .bar{display:flex;justify-content:space-between;align-items:center;background:#eee;padding:10px;margin-bottom:10px}
+  button,input,select{padding:4px 8px}
+  .add-form{background:#f0f8ff;padding:10px;margin:10px 0}
+</style></head><body>
+<div class="bar">
+  <span><strong>V2 IP WhiteList</strong></span>
+  <span>${user.email} ${user.isAdmin ? '| <a href="/v2/admin">ADMIN</a>' : ''}</span>
+  <span>
+    <form method="GET" action="/v2/app" style="display:inline">
+      <select name="switchTo" onchange="this.form.submit()">${companyOptions}</select>
+    </form>
+    <a href="/v2/logout">Выйти</a>
+  </span>
+</div>
+<script>
+  const p=new URLSearchParams(location.search);
+  if(p.get('msg')){document.body.insertAdjacentHTML('afterbegin','<div style="background:#4caf50;color:#fff;padding:8px">'+p.get('msg')+'</div>');history.replaceState(null,'','/v2/app')}
+  if(p.get('error')){document.body.insertAdjacentHTML('afterbegin','<div style="background:#f44336;color:#fff;padding:8px">'+p.get('error')+'</div>');history.replaceState(null,'','/v2/app')}
+</script>
+<p>Записей: <strong>${used}</strong> из ${limit}</p>
+<div class="add-form">
+  <form method="POST" action="/v2/app/add">
+    <input name="cidr" placeholder="x.x.x.x/xx" size="18" required>
+    <input name="comment" placeholder="комментарий" size="30">
+    <button>Добавить</button>
+  </form>
+</div>
+<table>
+  <tr><th>CIDR</th><th>Комментарий</th><th>Кто</th><th>Когда</th><th></th></tr>
+  ${rows || '<tr><td colspan="5">Нет записей</td></tr>'}
+</table>
+<p><a href="/v2/app?deleted=${includeDeleted ? '0' : '1'}">${includeDeleted ? 'Скрыть удалённые' : 'Показать удалённые'}</a></p>
+</body></html>`;
+}
+
 module.exports = { createUserRouter };