From 1c2b7fe189d14f1db47a7d789ce4b95f07e28556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CNaeel=E2=80=9D?= Date: Mon, 15 Jun 2026 10:19:07 +0400 Subject: [PATCH] =?UTF-8?q?v0.6.5:=20loginEmail=20=D0=B8=D0=B7=20originalU?= =?UTF-8?q?serEmail,=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B0=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D1=81=D0=BB=D0=B5=D0=B2=D0=B0=20=D0=BE=D1=82=20email?= 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/user/index.js | 2 +- views/v2/user.ejs | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index fcbbfe7..2f6231c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ipwhitelist", - "version": "0.6.4", + "version": "0.6.5", "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 bc496ed..6c51a09 100644 --- a/v2/src/config/index.js +++ b/v2/src/config/index.js @@ -9,7 +9,7 @@ // ═══════════════════════════════════════════════════════════════════════════════ module.exports = { - version: '0.6.4', + version: '0.6.5', // ── IAM ────────────────────────────────────────────────────────────────── iamUrl: process.env.V2_IAM_URL || 'https://auth-api.ngcloud.ru/api/v1/auth/user', diff --git a/v2/src/user/index.js b/v2/src/user/index.js index 08dd3bb..fbdce60 100644 --- a/v2/src/user/index.js +++ b/v2/src/user/index.js @@ -42,7 +42,7 @@ function createUserRouter() { isImpersonated: req.isImpersonated || false, 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.email) || req.email || '', + loginEmail: (req.session && req.session.user && (req.session.user.originalUserEmail || req.session.user.email)) || req.email || '', }); } catch (e) { res.status(500).send('

Ошибка

' + e.message + '
Назад'); diff --git a/views/v2/user.ejs b/views/v2/user.ejs index 4c34b07..bd990ed 100644 --- a/views/v2/user.ejs +++ b/views/v2/user.ejs @@ -101,7 +101,8 @@
<%= used %>
из <%= limit %>
- <%= email %> + <%= activeClientId %> + <%= email %>