Nail/ipwhitelist-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
naeel
2026-06-15 15:33:38 +04:00
parent 799406df78
commit 1b043713a9
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "ipwhitelist", "name": "ipwhitelist",
"version": "0.5.120", "version": "0.5.121",
"description": "IP WhiteList microservice for cloud provider", "description": "IP WhiteList microservice for cloud provider",
"main": "server.js", "main": "server.js",
"scripts": { "scripts": {
v2/src/config/index.js
+1 -1
View File
@@ -9,7 +9,7 @@
// ═══════════════════════════════════════════════════════════════════════════════ // ═══════════════════════════════════════════════════════════════════════════════
module.exports = { module.exports = {
version: '0.5.120', version: '0.5.121',
// ── 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',
v2/src/router/index.js
+1 -4
View File
@@ -38,10 +38,7 @@ function resolveContext(req, res, next) {
const isImpersonated = !!(u.originalUserEmail && u.impersonatedCompanyId); const isImpersonated = !!(u.originalUserEmail && u.impersonatedCompanyId);
req.email = u.email || ''; req.email = u.email || '';
// activeClientId может переопределять impersonatedCompanyId при switchTo req.clientId = u.activeClientId || u.clientId || '';
req.clientId = isImpersonated
? (u.activeClientId || u.impersonatedCompanyId || u.clientId || '')
: (u.activeClientId || u.clientId || '');
req.companyName = u.companyName || req.clientId; req.companyName = u.companyName || req.clientId;
// Админ: пользователь с WZ01112 — всегда админ // Админ: пользователь с WZ01112 — всегда админ
const allCids = u.allClientIds || [u.clientId || '']; const allCids = u.allClientIds || [u.clientId || ''];
v2/src/user/index.js
-1
View File
@@ -33,7 +33,6 @@ function createUserRouter() {
const targetId = req.query.switchTo; const targetId = req.query.switchTo;
if (isAdmin) { if (isAdmin) {
req.session.user.activeClientId = targetId; req.session.user.activeClientId = targetId;
if (req.session.user.isImpersonated) req.session.user.impersonatedCompanyId = targetId;
return res.redirect('/v2/app'); return res.redirect('/v2/app');
} else { } else {
const allowed = (req.profiles || []).find(p => p.client_id === targetId); const allowed = (req.profiles || []).find(p => p.client_id === targetId);