v0.5.129: кнопка Выбрать, убран весь debug
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
// ═══════════════════════════════════════════════════════════════════════════════
|
||||
|
||||
module.exports = {
|
||||
version: '0.5.128',
|
||||
version: '0.5.129',
|
||||
|
||||
// ── IAM ──────────────────────────────────────────────────────────────────
|
||||
iamUrl: process.env.V2_IAM_URL || 'https://auth-api.ngcloud.ru/api/v1/auth/user',
|
||||
|
||||
@@ -26,24 +26,9 @@ function enhanceImpersonation(req, res, next) {
|
||||
const u = req.session && req.session.user;
|
||||
if (!u) return next();
|
||||
|
||||
console.log('[v2:impersonation] enter', {
|
||||
sessionID: req.sessionID,
|
||||
email: u.email,
|
||||
activeClientId: u.activeClientId,
|
||||
clientId: u.clientId,
|
||||
isImpersonated: u.isImpersonated,
|
||||
originalUserEmail: u.originalUserEmail,
|
||||
path: req.originalUrl,
|
||||
});
|
||||
|
||||
// ── IAM-имперсонация (уже есть в сессии) — просто добавляем компании ──
|
||||
if (u.isImpersonated && u.originalUserEmail === ORIGINAL_EMAIL) {
|
||||
addExtraCompanies(u);
|
||||
console.log('[v2:impersonation] addExtraCompanies', {
|
||||
sessionID: req.sessionID,
|
||||
activeClientId: u.activeClientId,
|
||||
allClientIds: u.allClientIds,
|
||||
});
|
||||
return next();
|
||||
}
|
||||
|
||||
@@ -71,14 +56,6 @@ function enhanceImpersonation(req, res, next) {
|
||||
is_active_profile: cid === MAIN_COMPANY,
|
||||
}));
|
||||
|
||||
console.log('[v2:impersonation] applied test impersonation', {
|
||||
sessionID: req.sessionID,
|
||||
activeClientId: u.activeClientId,
|
||||
clientId: u.clientId,
|
||||
originalUserEmail: u.originalUserEmail,
|
||||
allClientIds: u.allClientIds,
|
||||
});
|
||||
|
||||
return next();
|
||||
}
|
||||
|
||||
|
||||
@@ -29,15 +29,6 @@
|
||||
function resolveContext(req, res, next) {
|
||||
const u = req.session && req.session.user;
|
||||
|
||||
console.log('[v2:resolveContext] enter', {
|
||||
sessionID: req.sessionID,
|
||||
hasSession: !!req.session,
|
||||
hasUser: !!u,
|
||||
sessionActiveClientId: u ? u.activeClientId : null,
|
||||
sessionClientId: u ? u.clientId : null,
|
||||
url: req.originalUrl,
|
||||
});
|
||||
|
||||
// Нет сессии — нет доступа
|
||||
if (!u) return res.redirect('/v2/login');
|
||||
|
||||
@@ -62,14 +53,6 @@ function resolveContext(req, res, next) {
|
||||
req.allClientIds = allCids;
|
||||
req.profiles = u.profiles || [];
|
||||
|
||||
console.log('[v2:resolveContext] exit', {
|
||||
sessionID: req.sessionID,
|
||||
reqClientId: req.clientId,
|
||||
reqEmail: req.email,
|
||||
canAdmin: req.canAdmin,
|
||||
isImpersonated: req.isImpersonated,
|
||||
});
|
||||
|
||||
next();
|
||||
}
|
||||
|
||||
|
||||
@@ -55,10 +55,8 @@ function createUserRouter() {
|
||||
const targetId = req.query.switchTo;
|
||||
const allowed = isAdmin || (req.profiles || []).find(p => p.client_id === targetId);
|
||||
if (allowed) {
|
||||
const oldId = req.session.user.activeClientId;
|
||||
req.session.user.activeClientId = targetId;
|
||||
clId = targetId; // использовать новый для crud.list
|
||||
switchDebug = { from: oldId, to: targetId, sessionID: req.sessionID };
|
||||
clId = targetId;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,11 +81,6 @@ function createUserRouter() {
|
||||
entries, limit, used,
|
||||
companies,
|
||||
activeClientId: clId,
|
||||
debugClientId: clId,
|
||||
sessionId: req.sessionID || '',
|
||||
sessionActiveClientId: req.session && req.session.user ? (req.session.user.activeClientId || '') : '',
|
||||
sessionClientId: req.session && req.session.user ? (req.session.user.clientId || '') : '',
|
||||
switchDebug,
|
||||
user: templateUser,
|
||||
includeDeleted,
|
||||
version: config.version,
|
||||
|
||||
Reference in New Issue
Block a user