borg/drone-detector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix jwt-token

Browse Source
This commit is contained in:
Alexander Borg
2025-09-14 10:15:06 +02:00
parent 5353f391e7
commit 045539e4eb
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/pages/Settings.jsx
View File

@@ -480,6 +480,7 @@ const SecuritySettings = ({ tenantConfig, onRefresh }) => {
const handleSave = async () => { const handleSave = async () => {
setSaving(true); setSaving(true);
try { try {
console.log('🔒 Sending security settings:', securitySettings);
await api.put('/tenant/security', securitySettings); await api.put('/tenant/security', securitySettings);
toast.success('Security settings updated successfully'); toast.success('Security settings updated successfully');
if (onRefresh) onRefresh(); if (onRefresh) onRefresh();

20
server/routes/tenant.js
View File

@@ -259,8 +259,11 @@ router.put('/branding', authenticateToken, requirePermissions(['branding.edit'])
*/ */
router.put('/security', authenticateToken, requirePermissions(['security.edit']), async (req, res) => { router.put('/security', authenticateToken, requirePermissions(['security.edit']), async (req, res) => {
try { try {
console.log('🔒 Security settings update request:', req.body);
// Determine tenant from request // Determine tenant from request
const tenantId = await multiAuth.determineTenant(req); const tenantId = await multiAuth.determineTenant(req);
console.log('🔍 Security update - tenant:', tenantId);
if (!tenantId) { if (!tenantId) {
return res.status(400).json({ return res.status(400).json({
success: false, success: false,
@@ -276,6 +279,12 @@ router.put('/security', authenticateToken, requirePermissions(['security.edit'])
}); });
} }
console.log('🔍 Current tenant settings:', {
ip_restriction_enabled: tenant.ip_restriction_enabled,
ip_whitelist: tenant.ip_whitelist,
ip_restriction_message: tenant.ip_restriction_message
});
const { ip_restriction_enabled, ip_whitelist, ip_restriction_message } = req.body; const { ip_restriction_enabled, ip_whitelist, ip_restriction_message } = req.body;
// Validate IP whitelist if provided // Validate IP whitelist if provided
@@ -295,15 +304,26 @@ router.put('/security', authenticateToken, requirePermissions(['security.edit'])
const updates = {}; const updates = {};
if (typeof ip_restriction_enabled === 'boolean') { if (typeof ip_restriction_enabled === 'boolean') {
updates.ip_restriction_enabled = ip_restriction_enabled; updates.ip_restriction_enabled = ip_restriction_enabled;
console.log('🔧 Setting ip_restriction_enabled to:', ip_restriction_enabled);
} }
if (ip_whitelist) { if (ip_whitelist) {
updates.ip_whitelist = ip_whitelist; updates.ip_whitelist = ip_whitelist;
console.log('🔧 Setting ip_whitelist to:', ip_whitelist);
} }
if (ip_restriction_message) { if (ip_restriction_message) {
updates.ip_restriction_message = ip_restriction_message; updates.ip_restriction_message = ip_restriction_message;
console.log('🔧 Setting ip_restriction_message to:', ip_restriction_message);
} }
console.log('🔧 Final updates object:', updates);
await tenant.update(updates); await tenant.update(updates);
await tenant.reload(); // Refresh the tenant object
console.log('🔧 After update - tenant settings:', {
ip_restriction_enabled: tenant.ip_restriction_enabled,
ip_whitelist: tenant.ip_whitelist,
ip_restriction_message: tenant.ip_restriction_message
});
console.log(`✅ Tenant "${tenantId}" security settings updated by user "${req.user.username}"`); console.log(`✅ Tenant "${tenantId}" security settings updated by user "${req.user.username}"`);