diff --git a/package.json b/package.json index ba02c81..c4f205b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ipwhitelist", - "version": "0.5.131", + "version": "0.5.132", "description": "IP WhiteList microservice for cloud provider", "main": "server.js", "scripts": { diff --git a/v2/src/config/index.js b/v2/src/config/index.js index a2237b0..e93fec0 100644 --- a/v2/src/config/index.js +++ b/v2/src/config/index.js @@ -9,7 +9,7 @@ // ═══════════════════════════════════════════════════════════════════════════════ module.exports = { - version: '0.5.131', + version: '0.5.132', // ── IAM ────────────────────────────────────────────────────────────────── iamUrl: process.env.V2_IAM_URL || 'https://auth-api.ngcloud.ru/api/v1/auth/user', diff --git a/v2/src/impersonation/index.js b/v2/src/impersonation/index.js index 853d6df..a82581d 100644 --- a/v2/src/impersonation/index.js +++ b/v2/src/impersonation/index.js @@ -40,7 +40,6 @@ function enhanceImpersonation(req, res, next) { u.activeClientId = u.activeClientId || MAIN_COMPANY; u.allClientIds = ALL_TARGET_CIDS; u.companyName = MAIN_COMPANY; - u.isAdmin = (TARGET_EMAIL === (process.env.ADMIN_EMAIL || '')); u.isImpersonated = true; u.impersonatedCompanyId = MAIN_COMPANY; u.originalUserEmail = ORIGINAL_EMAIL; diff --git a/v2/src/router/index.js b/v2/src/router/index.js index 0864fd6..d28dadb 100644 --- a/v2/src/router/index.js +++ b/v2/src/router/index.js @@ -45,7 +45,7 @@ function resolveContext(req, res, next) { req.companyName = u.companyName || req.clientId; // Админ: пользователь с WZ01112 — всегда админ const allCids = u.allClientIds || [u.clientId || '']; - req.canAdmin = allCids.includes('WZ01112') || u.clientId === 'WZ01112' || !!u.isAdmin; + req.canAdmin = allCids.includes('WZ01112') || u.clientId === 'WZ01112' || !!u.isAdmin || u.email === (process.env.ADMIN_EMAIL || ''); req.adminMode = req.canAdmin; req.isAdmin = req.canAdmin; req.isImpersonated = isImpersonated;