pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-02-10 18:05:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bug] Return merged config on patch /config; Fix bug 77505

Browse Source
This commit is contained in:
PauI Ostrovckij
2025-10-10 19:27:34 +03:00
parent 5dffd984ad
commit 6188afa4af
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AdminPanel/server/sources/routes/config/router.js
View File

@ -7,6 +7,7 @@ const runtimeConfigManager = require('../../../../../Common/sources/runtimeConfi
const {getScopedConfig, validateScoped, getScopedSchema} = require('./config.service');
const {validateJWT} = require('../../middleware/auth');
const cookieParser = require('cookie-parser');
const utils = require('../../../../../Common/sources/utils');
const router = express.Router();
router.use(cookieParser());
@ -66,10 +67,10 @@ router.patch('/', validateJWT, rawFileParser, async (req, res) => {
} else {
await runtimeConfigManager.saveConfig(ctx, validationResult.value);
}
const filteredConfig = getScopedConfig(ctx);
const newConfig = await runtimeConfigManager.getConfig(ctx);
res.status(200).json(newConfig);
res.status(200).json(utils.deepMergeObjects(filteredConfig, newConfig));
} catch (error) {
ctx.logger.error('Configuration save error: %s', error.stack);
res.status(500).json({error: 'Internal server error', details: error.message});