From b1d30f72b471f70ede2f96e833199dad7454f33a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CNaeel=E2=80=9D?= <tazet@narod.ru>
Date: Mon, 15 Jun 2026 10:35:03 +0400
Subject: [PATCH] =?UTF-8?q?v0.6.9:=20=D0=B7=D0=B0=D1=89=D0=B8=D1=82=D0=B0?=
 =?UTF-8?q?=20=D0=BE=D1=82=20=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?clientId=20(null=20client=5Fid)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json           | 2 +-
 v2/src/crud/index.js   | 1 +
 v2/src/router/index.js | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6250232..5c56b96 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ipwhitelist",
-  "version": "0.6.8",
+  "version": "0.6.9",
   "description": "IP WhiteList microservice for cloud provider",
   "main": "server.js",
   "scripts": {
diff --git a/v2/src/crud/index.js b/v2/src/crud/index.js
index 4837e96..bfcf2de 100644
--- a/v2/src/crud/index.js
+++ b/v2/src/crud/index.js
@@ -31,6 +31,7 @@ const { validate } = require('../validators');
 // Возвращает { id, client_id, name, custom_limit }.
 // Вызывается из list/add/edit/remove перед каждой операцией.
 async function resolve(clientId) {
+  if (!clientId || !clientId.trim()) throw new Error('Ошибка: не определён clientId (W-номер компании). Обратитесь к администратору.');
   return q.getOrCreateCompany(clientId, clientId);
 }
 
diff --git a/v2/src/router/index.js b/v2/src/router/index.js
index 66692d7..db3357e 100644
--- a/v2/src/router/index.js
+++ b/v2/src/router/index.js
@@ -42,6 +42,7 @@ function resolveContext(req, res, next) {
   // ВЕЗДЕ: created_by, экран, формы
   req.email            = u.email || '';
   req.clientId         = isImpersonated ? u.impersonatedCompanyId : (u.activeClientId || u.clientId || '');
+  if (!req.clientId) return res.status(400).send('<h2>Ошибка</h2><p>Не удалось определить W-номер компании. Проверьте настройки IAM.</p><p><a href="/logout">Выйти</a></p>');
   req.companyName      = u.companyName || req.clientId;
   req.isAdmin          = !!(u.isAdmin && u.adminMode) || (ADMIN_EMAIL && u.email === ADMIN_EMAIL);
   req.isImpersonated   = isImpersonated;