fix(bff): agregar endpoint /settings/demo-mode y proxy /api/v1 en Express Node.js y Flask API
This commit is contained in:
@@ -229,6 +229,31 @@ const buildingsRoutes = require('./routes/buildings');
|
||||
const adminRoutes = require('./routes/admin');
|
||||
const mySubjectsRoutes = require('./routes/my_subjects');
|
||||
|
||||
// Proxy transparente hacia la API REST de Flask para llamadas AJAX frontend
|
||||
app.use('/api/v1', async (req, res) => {
|
||||
try {
|
||||
const token = req.cookies.auth_token;
|
||||
const targetUrl = `${process.env.FLASK_API_URL || 'http://localhost:5000/api/v1'}${req.url}`;
|
||||
const headers = { ...req.headers };
|
||||
delete headers.host;
|
||||
if (token && !headers.authorization) {
|
||||
headers.authorization = `Bearer ${token}`;
|
||||
}
|
||||
const resp = await axios({
|
||||
method: req.method,
|
||||
url: targetUrl,
|
||||
data: req.body,
|
||||
params: req.query,
|
||||
headers,
|
||||
validateStatus: () => true
|
||||
});
|
||||
return res.status(resp.status).json(resp.data);
|
||||
} catch (err) {
|
||||
console.error('API v1 proxy error:', err.message);
|
||||
return res.status(500).json({ error: 'ProxyError', message: 'Error de comunicación con el backend API: ' + err.message });
|
||||
}
|
||||
});
|
||||
|
||||
app.use('/', indexRoutes);
|
||||
app.use('/auth', authRoutes);
|
||||
app.use('/dashboard', dashboardRoutes);
|
||||
|
||||
@@ -1307,22 +1307,76 @@ const handleGlobalSettings = async (req, res) => {
|
||||
google_oauth: { allowed_domains: 'unicaba.edu.ar', callback_url: '/auth/google/callback' },
|
||||
moodle: { server_url: 'http://10.0.0.207/moodle', auto_sync_enabled: true, sync_interval_minutes: 15 }
|
||||
};
|
||||
let demo_access_enabled = true;
|
||||
let demo_accounts_active = true;
|
||||
|
||||
try {
|
||||
const resp = await req.apiClient.get('/admin/settings/all');
|
||||
if (resp.data && resp.data.data) {
|
||||
if (resp.data && resp.data.settings) {
|
||||
settings = resp.data.settings;
|
||||
} else if (resp.data && resp.data.data) {
|
||||
settings = resp.data.data;
|
||||
}
|
||||
} catch (e) {
|
||||
console.warn('Global settings fetch notice:', e.message);
|
||||
}
|
||||
|
||||
try {
|
||||
const demoResp = await req.apiClient.get('/settings/demo-mode');
|
||||
if (demoResp.data) {
|
||||
if (demoResp.data.demo_access_enabled !== undefined) {
|
||||
demo_access_enabled = Boolean(demoResp.data.demo_access_enabled);
|
||||
}
|
||||
if (demoResp.data.demo_accounts_active !== undefined) {
|
||||
demo_accounts_active = Boolean(demoResp.data.demo_accounts_active);
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
console.warn('Demo mode status fetch notice:', e.message);
|
||||
}
|
||||
|
||||
res.render('admin/settings/global_config', {
|
||||
title: 'Configuración Global del Sistema - Admin Edu-Space',
|
||||
settings
|
||||
settings,
|
||||
demo_access_enabled,
|
||||
demo_accounts_active
|
||||
});
|
||||
};
|
||||
|
||||
router.get(['/settings', '/global-config', '/config'], handleGlobalSettings);
|
||||
|
||||
// Endpoint específico para alternar modo demo y cuentas default
|
||||
router.post(['/settings/demo-mode', '/demo-mode'], async (req, res) => {
|
||||
try {
|
||||
const resp = await req.apiClient.post('/settings/demo-mode', req.body);
|
||||
return res.status(resp.status || 200).json(resp.data);
|
||||
} catch (err) {
|
||||
console.error('Error in POST /admin/settings/demo-mode:', err.response?.data || err.message);
|
||||
return res.status(err.response?.status || 500).json(err.response?.data || {
|
||||
status: 'error',
|
||||
message: 'Error al comunicarse con el servicio de configuración: ' + (err.response?.data?.message || err.message)
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// Proxy para cualquier subruta de configuración (smtp, google-oauth, moodle, etc.)
|
||||
router.all('/settings/*', async (req, res) => {
|
||||
try {
|
||||
const subPath = req.params[0];
|
||||
const resp = await req.apiClient({
|
||||
method: req.method,
|
||||
url: `/settings/${subPath}`,
|
||||
data: req.body,
|
||||
params: req.query
|
||||
});
|
||||
return res.status(resp.status).json(resp.data);
|
||||
} catch (err) {
|
||||
console.error(`Error in /admin/settings/${req.params[0]}:`, err.response?.data || err.message);
|
||||
return res.status(err.response?.status || 500).json(err.response?.data || {
|
||||
status: 'error',
|
||||
message: err.response?.data?.message || err.message
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
|
||||
@@ -11,11 +11,17 @@ const isSecureCookie = (req) => {
|
||||
router.get('/login', async (req, res) => {
|
||||
let providers = { local: true, google: false, moodle: false };
|
||||
let google_client_id = '';
|
||||
let demo_access_enabled = true;
|
||||
try {
|
||||
const resp = await apiClient.get('/auth/providers');
|
||||
if (resp.data && resp.data.providers) {
|
||||
providers = resp.data.providers;
|
||||
if (resp.data) {
|
||||
if (resp.data.providers) {
|
||||
providers = resp.data.providers;
|
||||
}
|
||||
google_client_id = resp.data.google_client_id || '';
|
||||
if (resp.data.demo_access_enabled !== undefined) {
|
||||
demo_access_enabled = Boolean(resp.data.demo_access_enabled);
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
// Fallback default
|
||||
@@ -24,7 +30,8 @@ router.get('/login', async (req, res) => {
|
||||
res.render('auth/login', {
|
||||
error: req.query.error || null,
|
||||
providers,
|
||||
google_client_id
|
||||
google_client_id,
|
||||
demo_access_enabled
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user