v0.6.1: фикс — email в header (Выйти)
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ipwhitelist",
|
"name": "ipwhitelist",
|
||||||
"version": "0.6.0",
|
"version": "0.6.1",
|
||||||
"description": "IP WhiteList microservice for cloud provider",
|
"description": "IP WhiteList microservice for cloud provider",
|
||||||
"main": "server.js",
|
"main": "server.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
// ═══════════════════════════════════════════════════════════════════════════════
|
// ═══════════════════════════════════════════════════════════════════════════════
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
version: '0.6.0',
|
version: '0.6.1',
|
||||||
|
|
||||||
// ── IAM ──────────────────────────────────────────────────────────────────
|
// ── IAM ──────────────────────────────────────────────────────────────────
|
||||||
iamUrl: process.env.V2_IAM_URL || 'https://auth-api.ngcloud.ru/api/v1/auth/user',
|
iamUrl: process.env.V2_IAM_URL || 'https://auth-api.ngcloud.ru/api/v1/auth/user',
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ function createUserRouter() {
|
|||||||
version: config.version,
|
version: config.version,
|
||||||
isImpersonated: req.isImpersonated || false,
|
isImpersonated: req.isImpersonated || false,
|
||||||
originalUserEmail: req.impersonatedBy ? req.email : null,
|
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) {
|
} catch (e) {
|
||||||
res.status(500).send('<h2>Ошибка</h2><pre>' + e.message + '</pre><a href="/app">Назад</a>');
|
res.status(500).send('<h2>Ошибка</h2><pre>' + e.message + '</pre><a href="/app">Назад</a>');
|
||||||
|
|||||||
+1
-1
@@ -70,7 +70,7 @@
|
|||||||
<% }) %>
|
<% }) %>
|
||||||
</select>
|
</select>
|
||||||
</span>
|
</span>
|
||||||
<a href="/logout" class="btn" style="font-size:.8rem;">Выйти (<%= user.email %>)</a>
|
<a href="/logout" class="btn" style="font-size:.8rem;">Выйти (<%= email %>)</a>
|
||||||
</span>
|
</span>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user