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

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": {

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('<h2>Ошибка</h2><pre>' + e.message + '</pre><a href="/app">Назад</a>');

views/v2/user.ejs

@@ -101,7 +101,8 @@
     <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 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>