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/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 %>