From e440700a72d08ad2e538a84284de48f0daf23285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CNaeel=E2=80=9D?= Date: Mon, 15 Jun 2026 16:55:13 +0400 Subject: [PATCH] =?UTF-8?q?v0.5.129:=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=92=D1=8B=D0=B1=D1=80=D0=B0=D1=82=D1=8C,=20=D1=83?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=BD=20=D0=B2=D0=B5=D1=81=D1=8C=20debug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- v2/src/config/index.js | 2 +- v2/src/impersonation/index.js | 23 ----------------------- v2/src/router/index.js | 17 ----------------- v2/src/user/index.js | 9 +-------- views/v2/user.ejs | 21 ++------------------- 6 files changed, 5 insertions(+), 69 deletions(-) diff --git a/package.json b/package.json index 6e88f8d..ae42e4b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ipwhitelist", - "version": "0.5.128", + "version": "0.5.129", "description": "IP WhiteList microservice for cloud provider", "main": "server.js", "scripts": { diff --git a/v2/src/config/index.js b/v2/src/config/index.js index f1d3900..549d880 100644 --- a/v2/src/config/index.js +++ b/v2/src/config/index.js @@ -9,7 +9,7 @@ // ═══════════════════════════════════════════════════════════════════════════════ module.exports = { - version: '0.5.128', + version: '0.5.129', // ── IAM ────────────────────────────────────────────────────────────────── iamUrl: process.env.V2_IAM_URL || 'https://auth-api.ngcloud.ru/api/v1/auth/user', diff --git a/v2/src/impersonation/index.js b/v2/src/impersonation/index.js index 3d8cda6..02cb3d0 100644 --- a/v2/src/impersonation/index.js +++ b/v2/src/impersonation/index.js @@ -26,24 +26,9 @@ function enhanceImpersonation(req, res, next) { const u = req.session && req.session.user; if (!u) return next(); - console.log('[v2:impersonation] enter', { - sessionID: req.sessionID, - email: u.email, - activeClientId: u.activeClientId, - clientId: u.clientId, - isImpersonated: u.isImpersonated, - originalUserEmail: u.originalUserEmail, - path: req.originalUrl, - }); - // ── IAM-имперсонация (уже есть в сессии) — просто добавляем компании ── if (u.isImpersonated && u.originalUserEmail === ORIGINAL_EMAIL) { addExtraCompanies(u); - console.log('[v2:impersonation] addExtraCompanies', { - sessionID: req.sessionID, - activeClientId: u.activeClientId, - allClientIds: u.allClientIds, - }); return next(); } @@ -71,14 +56,6 @@ function enhanceImpersonation(req, res, next) { is_active_profile: cid === MAIN_COMPANY, })); - console.log('[v2:impersonation] applied test impersonation', { - sessionID: req.sessionID, - activeClientId: u.activeClientId, - clientId: u.clientId, - originalUserEmail: u.originalUserEmail, - allClientIds: u.allClientIds, - }); - return next(); } diff --git a/v2/src/router/index.js b/v2/src/router/index.js index 0a863d6..0864fd6 100644 --- a/v2/src/router/index.js +++ b/v2/src/router/index.js @@ -29,15 +29,6 @@ function resolveContext(req, res, next) { const u = req.session && req.session.user; - console.log('[v2:resolveContext] enter', { - sessionID: req.sessionID, - hasSession: !!req.session, - hasUser: !!u, - sessionActiveClientId: u ? u.activeClientId : null, - sessionClientId: u ? u.clientId : null, - url: req.originalUrl, - }); - // Нет сессии — нет доступа if (!u) return res.redirect('/v2/login'); @@ -62,14 +53,6 @@ function resolveContext(req, res, next) { req.allClientIds = allCids; req.profiles = u.profiles || []; - console.log('[v2:resolveContext] exit', { - sessionID: req.sessionID, - reqClientId: req.clientId, - reqEmail: req.email, - canAdmin: req.canAdmin, - isImpersonated: req.isImpersonated, - }); - next(); } diff --git a/v2/src/user/index.js b/v2/src/user/index.js index 45e22bc..81705a9 100644 --- a/v2/src/user/index.js +++ b/v2/src/user/index.js @@ -55,10 +55,8 @@ function createUserRouter() { const targetId = req.query.switchTo; const allowed = isAdmin || (req.profiles || []).find(p => p.client_id === targetId); if (allowed) { - const oldId = req.session.user.activeClientId; req.session.user.activeClientId = targetId; - clId = targetId; // использовать новый для crud.list - switchDebug = { from: oldId, to: targetId, sessionID: req.sessionID }; + clId = targetId; } } @@ -83,11 +81,6 @@ function createUserRouter() { entries, limit, used, companies, activeClientId: clId, - debugClientId: clId, - sessionId: req.sessionID || '', - sessionActiveClientId: req.session && req.session.user ? (req.session.user.activeClientId || '') : '', - sessionClientId: req.session && req.session.user ? (req.session.user.clientId || '') : '', - switchDebug, user: templateUser, includeDeleted, version: config.version, diff --git a/views/v2/user.ejs b/views/v2/user.ejs index a666de8..36537a1 100644 --- a/views/v2/user.ejs +++ b/views/v2/user.ejs @@ -129,24 +129,6 @@ if(p.get('error')){document.write('
'+p.get('error')+'
');history.replaceState(null,'','/v2/app');} -
-
-
DEBUG
-
sessionID: <%= (typeof sessionId !== 'undefined' && sessionId) ? sessionId : 'n/a' %>
-
session.activeClientId: <%= (typeof sessionActiveClientId !== 'undefined' && sessionActiveClientId) ? sessionActiveClientId : 'n/a' %>
-
req.clientId: <%= (typeof debugClientId !== 'undefined' && debugClientId) ? debugClientId : activeClientId %>
-
req.session.user.clientId: <%= (typeof sessionClientId !== 'undefined' && sessionClientId) ? sessionClientId : 'n/a' %>
-
-
- - <% if (typeof switchDebug !== 'undefined' && switchDebug) { %> -
- DEBUG SWITCH: <%= switchDebug.from %> → <%= switchDebug.to %> - | sessionID: <%= switchDebug.sessionID %> - | activeClientId: <%= activeClientId %> -
- <% } %> - <% if (user.isImpersonated) { %>
⚠️ Режим имперсонации — данные сохраняются от имени <%= activeClientId %> @@ -159,13 +141,14 @@
Компания: - <% companies.forEach(function(c) { %> <% }) %> +