From 6188afa4afbfd78495801e3fded5bc3b6a10d26a Mon Sep 17 00:00:00 2001
From: PauI Ostrovckij <pavel.ostrovskij@onlyoffice.com>
Date: Fri, 10 Oct 2025 19:27:34 +0300
Subject: [PATCH] [bug] Return merged config on patch /config; Fix bug 77505

---
 AdminPanel/server/sources/routes/config/router.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/AdminPanel/server/sources/routes/config/router.js b/AdminPanel/server/sources/routes/config/router.js
index 9a0c586c..22a3b9e7 100644
--- a/AdminPanel/server/sources/routes/config/router.js
+++ b/AdminPanel/server/sources/routes/config/router.js
@@ -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});