Revert "v0.5.121: clientId всегда activeClientId || clientId, без спецлогики"

This reverts commit 1b043713a9.
This commit is contained in:
2026-06-15 15:33:51 +04:00
parent 1b043713a9
commit 08e20c10ac
4 changed files with 7 additions and 3 deletions
+1 -1
View File
@@ -9,7 +9,7 @@
// ═══════════════════════════════════════════════════════════════════════════════
module.exports = {
version: '0.5.121',
version: '0.5.120',
// ── IAM ──────────────────────────────────────────────────────────────────
iamUrl: process.env.V2_IAM_URL || 'https://auth-api.ngcloud.ru/api/v1/auth/user',
+4 -1
View File
@@ -38,7 +38,10 @@ function resolveContext(req, res, next) {
const isImpersonated = !!(u.originalUserEmail && u.impersonatedCompanyId);
req.email = u.email || '';
req.clientId = u.activeClientId || u.clientId || '';
// activeClientId может переопределять impersonatedCompanyId при switchTo
req.clientId = isImpersonated
? (u.activeClientId || u.impersonatedCompanyId || u.clientId || '')
: (u.activeClientId || u.clientId || '');
req.companyName = u.companyName || req.clientId;
// Админ: пользователь с WZ01112 — всегда админ
const allCids = u.allClientIds || [u.clientId || ''];
+1
View File
@@ -33,6 +33,7 @@ function createUserRouter() {
const targetId = req.query.switchTo;
if (isAdmin) {
req.session.user.activeClientId = targetId;
if (req.session.user.isImpersonated) req.session.user.impersonatedCompanyId = targetId;
return res.redirect('/v2/app');
} else {
const allowed = (req.profiles || []).find(p => p.client_id === targetId);