diff --git a/package.json b/package.json index d7087f6..98bc48a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ipwhitelist", - "version": "0.6.0", + "version": "0.6.1", "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 466c5c7..5f14790 100644 --- a/v2/src/config/index.js +++ b/v2/src/config/index.js @@ -9,7 +9,7 @@ // ═══════════════════════════════════════════════════════════════════════════════ module.exports = { - version: '0.6.0', + version: '0.6.1', // ── 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 51cb1a4..c22a750 100644 --- a/v2/src/user/index.js +++ b/v2/src/user/index.js @@ -41,6 +41,7 @@ function createUserRouter() { version: config.version, 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) || '', }); } catch (e) { res.status(500).send('

Ошибка

' + e.message + '
Назад'); diff --git a/views/v2/user.ejs b/views/v2/user.ejs index 91e11a2..b287b80 100644 --- a/views/v2/user.ejs +++ b/views/v2/user.ejs @@ -70,7 +70,7 @@ <% }) %> - Выйти (<%= user.email %>) + Выйти (<%= email %>)