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

This reverts commit 24153b29ea.
2026-06-15 15:33:51 +04:00
parent 24153b29ea
commit 8241d095fa
3 changed files with 6 additions and 2 deletions
@@ -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 || ''];