v0.5.132: ADMIN_EMAIL в resolveContext для всех
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ipwhitelist",
|
"name": "ipwhitelist",
|
||||||
"version": "0.5.131",
|
"version": "0.5.132",
|
||||||
"description": "IP WhiteList microservice for cloud provider",
|
"description": "IP WhiteList microservice for cloud provider",
|
||||||
"main": "server.js",
|
"main": "server.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
// ═══════════════════════════════════════════════════════════════════════════════
|
// ═══════════════════════════════════════════════════════════════════════════════
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
version: '0.5.131',
|
version: '0.5.132',
|
||||||
|
|
||||||
// ── 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',
|
||||||
|
|||||||
@@ -40,7 +40,6 @@ function enhanceImpersonation(req, res, next) {
|
|||||||
u.activeClientId = u.activeClientId || MAIN_COMPANY;
|
u.activeClientId = u.activeClientId || MAIN_COMPANY;
|
||||||
u.allClientIds = ALL_TARGET_CIDS;
|
u.allClientIds = ALL_TARGET_CIDS;
|
||||||
u.companyName = MAIN_COMPANY;
|
u.companyName = MAIN_COMPANY;
|
||||||
u.isAdmin = (TARGET_EMAIL === (process.env.ADMIN_EMAIL || ''));
|
|
||||||
u.isImpersonated = true;
|
u.isImpersonated = true;
|
||||||
u.impersonatedCompanyId = MAIN_COMPANY;
|
u.impersonatedCompanyId = MAIN_COMPANY;
|
||||||
u.originalUserEmail = ORIGINAL_EMAIL;
|
u.originalUserEmail = ORIGINAL_EMAIL;
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ function resolveContext(req, res, next) {
|
|||||||
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 || ''];
|
||||||
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.adminMode = req.canAdmin;
|
||||||
req.isAdmin = req.canAdmin;
|
req.isAdmin = req.canAdmin;
|
||||||
req.isImpersonated = isImpersonated;
|
req.isImpersonated = isImpersonated;
|
||||||
|
|||||||
Reference in New Issue
Block a user