From a6a12db8cab735eff85eaf8b4eacfc423ba83c5e Mon Sep 17 00:00:00 2001
From: ShahanaFarooqui <shahana.farooqui@gmail.com>
Date: Fri, 26 Apr 2024 11:17:07 -0700
Subject: [PATCH] Update node settings

---
 backend/controllers/shared/RTLConf.js | 7 ++++---
 server/controllers/shared/RTLConf.ts  | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/backend/controllers/shared/RTLConf.js b/backend/controllers/shared/RTLConf.js
index 3bd89c0a..3e8665c1 100644
--- a/backend/controllers/shared/RTLConf.js
+++ b/backend/controllers/shared/RTLConf.js
@@ -216,16 +216,17 @@ export const updateNodeSettings = (req, res, next) => {
     const config = JSON.parse(fs.readFileSync(RTLConfFile, 'utf-8'));
     const node = config.nodes.find((node) => (node.index === req.session.selectedNode.index));
     if (node && node.settings) {
-        node.settings = req.body;
+        delete req.body.settings.currencyUnits;
+        node.settings = req.body.settings;
     }
     try {
         fs.writeFileSync(RTLConfFile, JSON.stringify(config, null, 2), 'utf-8');
         const selectedNode = common.findNode(req.session.selectedNode.index);
         if (selectedNode && selectedNode.settings) {
-            selectedNode.settings = req.body;
+            selectedNode.settings = req.body.settings;
             common.replaceNode(req, selectedNode);
         }
-        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Node Settings Updated', data: maskPasswords(config) });
+        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Node Settings Updated', data: req.session.selectedNode.settings });
         res.status(201).json({ message: 'Node Settings Updated Successfully' });
     }
     catch (errRes) {
diff --git a/server/controllers/shared/RTLConf.ts b/server/controllers/shared/RTLConf.ts
index ad9d2e44..4a1770c8 100644
--- a/server/controllers/shared/RTLConf.ts
+++ b/server/controllers/shared/RTLConf.ts
@@ -221,16 +221,17 @@ export const updateNodeSettings = (req, res, next) => {
   const config = JSON.parse(fs.readFileSync(RTLConfFile, 'utf-8'));
   const node = config.nodes.find((node) => (node.index === req.session.selectedNode.index));
   if (node && node.settings) {
-    node.settings = req.body;
+    delete req.body.settings.currencyUnits;
+    node.settings = req.body.settings;
   }
   try {
     fs.writeFileSync(RTLConfFile, JSON.stringify(config, null, 2), 'utf-8');
     const selectedNode = common.findNode(req.session.selectedNode.index);
     if (selectedNode && selectedNode.settings) {
-      selectedNode.settings = req.body;
+      selectedNode.settings = req.body.settings;
       common.replaceNode(req, selectedNode);
     }
-    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Node Settings Updated', data: maskPasswords(config) });
+    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Node Settings Updated', data: req.session.selectedNode.settings });
     res.status(201).json({ message: 'Node Settings Updated Successfully' });
   } catch (errRes) {
     const errMsg = 'Update Node Settings Error';