v0.6.2: email юзера справа от статистики + loginEmail в header

This commit is contained in:
2026-06-15 09:55:35 +04:00
parent 6acb8770c5
commit 9f7150c345
4 changed files with 10 additions and 5 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "ipwhitelist", "name": "ipwhitelist",
"version": "0.6.1", "version": "0.6.2",
"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.1', version: '0.6.2',
// ── 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
View File
@@ -42,6 +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 || '',
}); });
} 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>');
+7 -3
View File
@@ -70,7 +70,7 @@
<% }) %> <% }) %>
</select> </select>
</span> </span>
<a href="/logout" class="btn" style="font-size:.8rem;">Выйти (<%= email %>)</a> <a href="/logout" class="btn" style="font-size:.8rem;">Выйти (<%= loginEmail %>)</a>
</span> </span>
</header> </header>
@@ -79,8 +79,8 @@
<!-- Имперсонация --> <!-- Имперсонация -->
<% if (typeof isImpersonated !== 'undefined' && isImpersonated) { %> <% if (typeof isImpersonated !== 'undefined' && isImpersonated) { %>
<div class="alert alert-warn"> <div class="alert alert-warn">
⚠️ Режим имперсонации — данные от имени <strong><%= user.activeClientId || user.clientId %></strong> ⚠️ Режим имперсонации — данные от имени <strong><%= activeClientId %></strong>
(вы: <%= user.originalUserEmail || user.email %>) (вы: <%= loginEmail %>)
</div> </div>
<% } %> <% } %>
@@ -98,6 +98,10 @@
<div class="card-body"> <div class="card-body">
<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);">
<%= email %>
<% if (isImpersonated) { %><span style="font-size:.75rem;color:var(--amber);margin-left:.5rem;">(имперсонация)</span><% } %>
</div>
</div> </div>
<!-- Форма добавления --> <!-- Форма добавления -->