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

v0.5.103: WZ01112 админ по умолчанию, adminMode auto-on

Browse Source
This commit is contained in:
naeel
2026-06-15 13:39:04 +04:00
parent a31b3e61f2
commit f00b7f3e87
3 changed files with 4 additions and 3 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.102", "version": "0.5.103",
"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.99', version: '0.5.100',
// ── 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
+2 -1
View File
@@ -41,9 +41,10 @@ function resolveContext(req, res, next) {
req.clientId = isImpersonated ? u.impersonatedCompanyId : (u.activeClientId || u.clientId || ''); req.clientId = isImpersonated ? u.impersonatedCompanyId : (u.activeClientId || u.clientId || '');
req.companyName = u.companyName || req.clientId; req.companyName = u.companyName || req.clientId;
// Админ: пользователь с WZ01112 + включён toggle «Администратор» // Админ: пользователь с WZ01112 + включён toggle «Администратор»
// По умолчанию adminMode=true для админов (не надо нажимать toggle)
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;
req.adminMode = !!u.adminMode; req.adminMode = u.adminMode !== undefined ? !!u.adminMode : req.canAdmin;
req.isAdmin = req.canAdmin && req.adminMode; req.isAdmin = req.canAdmin && req.adminMode;
req.isImpersonated = isImpersonated; req.isImpersonated = isImpersonated;
req.impersonatedBy = isImpersonated ? u.email : null; req.impersonatedBy = isImpersonated ? u.email : null;