diff --git a/package.json b/package.json index 4348abd..dc7f580 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ipwhitelist", - "version": "0.6.6", + "version": "0.6.7", "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 b4c1221..a1470e4 100644 --- a/v2/src/config/index.js +++ b/v2/src/config/index.js @@ -9,7 +9,7 @@ // ═══════════════════════════════════════════════════════════════════════════════ module.exports = { - version: '0.6.6', + version: '0.6.7', // ── IAM ────────────────────────────────────────────────────────────────── iamUrl: process.env.V2_IAM_URL || 'https://auth-api.ngcloud.ru/api/v1/auth/user', diff --git a/v2/src/router/index.js b/v2/src/router/index.js index 31434d6..66692d7 100644 --- a/v2/src/router/index.js +++ b/v2/src/router/index.js @@ -38,15 +38,15 @@ function resolveContext(req, res, next) { const ADMIN_EMAIL = process.env.ADMIN_EMAIL || ''; const isImpersonated = !!(u.originalUserEmail && u.impersonatedCompanyId) || u.isImpersonated; - // req.email — для АУДИТА (реальный юзер при имперсонации) - req.email = isImpersonated ? u.originalUserEmail : (u.email || ''); - // req.displayEmail — для ПОКАЗА на экране (текущий, может быть имперсонированным) - req.displayEmail = u.email || ''; + // req.email = ТЕКУЩИЙ юзер (имперсонированный или реальный) + // ВЕЗДЕ: created_by, экран, формы + req.email = u.email || ''; req.clientId = isImpersonated ? u.impersonatedCompanyId : (u.activeClientId || u.clientId || ''); req.companyName = u.companyName || req.clientId; req.isAdmin = !!(u.isAdmin && u.adminMode) || (ADMIN_EMAIL && u.email === ADMIN_EMAIL); req.isImpersonated = isImpersonated; - req.impersonatedBy = isImpersonated ? u.email : null; + // req.impersonatedBy = РЕАЛЬНЫЙ юзер (только в колонке impersonated_by аудита) + req.impersonatedBy = isImpersonated ? (u.originalUserEmail || '') : null; req.allClientIds = u.allClientIds || [req.clientId]; req.profiles = u.profiles || []; diff --git a/v2/src/user/index.js b/v2/src/user/index.js index 6b558f3..c117815 100644 --- a/v2/src/user/index.js +++ b/v2/src/user/index.js @@ -43,7 +43,8 @@ function createUserRouter() { originalUserEmail: req.impersonatedBy ? req.email : null, email: req.email || (req.user && req.user.email) || (req.session && req.session.user && req.session.user.email) || '', loginEmail: (req.session && req.session.user && (req.session.user.originalUserEmail || req.session.user.email)) || req.email || '', - displayEmail: req.displayEmail || req.email || '', + email: req.email || '', + }); } catch (e) { res.status(500).send('
' + e.message + 'Назад'); diff --git a/views/v2/user.ejs b/views/v2/user.ejs index c91a63e..0647e1a 100644 --- a/views/v2/user.ejs +++ b/views/v2/user.ejs @@ -80,7 +80,7 @@ <% if (typeof isImpersonated !== 'undefined' && isImpersonated) { %> <% if (isImpersonated) { %>