v0.5.127: clId обновляется после switchTo
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ipwhitelist",
|
"name": "ipwhitelist",
|
||||||
"version": "0.5.126",
|
"version": "0.5.127",
|
||||||
"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.126',
|
version: '0.5.127',
|
||||||
|
|
||||||
// ── 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',
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ function createUserRouter() {
|
|||||||
router.get('/', async (req, res) => {
|
router.get('/', async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const isAdmin = req.canAdmin;
|
const isAdmin = req.canAdmin;
|
||||||
const clId = req.clientId;
|
let clId = req.clientId;
|
||||||
|
|
||||||
// ── Компании для dropdown ───────────────────────────────────────
|
// ── Компании для dropdown ───────────────────────────────────────
|
||||||
let companies;
|
let companies;
|
||||||
@@ -57,7 +57,7 @@ function createUserRouter() {
|
|||||||
if (allowed) {
|
if (allowed) {
|
||||||
const oldId = req.session.user.activeClientId;
|
const oldId = req.session.user.activeClientId;
|
||||||
req.session.user.activeClientId = targetId;
|
req.session.user.activeClientId = targetId;
|
||||||
// clId теперь новый — рендерим сразу, без редиректа
|
clId = targetId; // использовать новый для crud.list
|
||||||
switchDebug = { from: oldId, to: targetId, sessionID: req.sessionID };
|
switchDebug = { from: oldId, to: targetId, sessionID: req.sessionID };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -82,7 +82,7 @@ function createUserRouter() {
|
|||||||
res.render('v2/user', {
|
res.render('v2/user', {
|
||||||
entries, limit, used,
|
entries, limit, used,
|
||||||
companies,
|
companies,
|
||||||
activeClientId: switchDebug ? switchDebug.to : clId,
|
activeClientId: clId,
|
||||||
debugClientId: clId,
|
debugClientId: clId,
|
||||||
sessionId: req.sessionID || '',
|
sessionId: req.sessionID || '',
|
||||||
sessionActiveClientId: req.session && req.session.user ? (req.session.user.activeClientId || '') : '',
|
sessionActiveClientId: req.session && req.session.user ? (req.session.user.activeClientId || '') : '',
|
||||||
|
|||||||
Reference in New Issue
Block a user