v0.6.5: loginEmail из originalUserEmail, компания слева от email

This commit is contained in:
2026-06-15 10:19:07 +04:00
parent 6032a574a9
commit 1c2b7fe189
4 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "ipwhitelist", "name": "ipwhitelist",
"version": "0.6.4", "version": "0.6.5",
"description": "IP WhiteList microservice for cloud provider", "description": "IP WhiteList microservice for cloud provider",
"main": "server.js", "main": "server.js",
"scripts": { "scripts": {
+1 -1
View File
@@ -9,7 +9,7 @@
// ═══════════════════════════════════════════════════════════════════════════════ // ═══════════════════════════════════════════════════════════════════════════════
module.exports = { module.exports = {
version: '0.6.4', version: '0.6.5',
// ── 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',
+1 -1
View File
@@ -42,7 +42,7 @@ function createUserRouter() {
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) || '', 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) { } 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>');
+2 -1
View File
@@ -101,7 +101,8 @@
<div class="stats" style="margin-bottom:1rem;"> <div class="stats" style="margin-bottom:1rem;">
<div class="stat <%= used >= limit ? 'full' : '' %>"><div class="num"><%= used %></div><div class="lbl">из <%= limit %></div></div> <div class="stat <%= used >= limit ? 'full' : '' %>"><div class="num"><%= used %></div><div class="lbl">из <%= limit %></div></div>
<div style="margin-left:auto;display:flex;align-items:center;font-weight:600;font-size:1.1rem;color:var(--text);"> <div style="margin-left:auto;display:flex;align-items:center;font-weight:600;font-size:1.1rem;color:var(--text);">
<%= email %> <span style="font-weight:600;font-size:1.1rem;color:var(--muted);margin-right:.75rem;"><%= activeClientId %></span>
<span style="font-weight:600;font-size:1.1rem;"><%= email %></span>
</div> </div>
</div> </div>