refactor: handled each cases in error response

errsole · Sep 24, 2024 · 853035d · 853035d
1 parent 078ee74
commit 853035d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/main/server/controllers/logController.js b/lib/main/server/controllers/logController.js
@@ -41,7 +41,7 @@ exports.getLogs = async (req, res) => {
       const errorData = [
         {
           error: 'Bad Request',
-          message: logs.error || 'invalid request'
+          message: (logs && logs.error) ? logs.error : 'invalid request'
         }
       ];
       res.status(400).send({ errors: errorData });
@@ -69,7 +69,7 @@ exports.getLogsTTL = async (req, res) => {
       const errorData = [
         {
           error: 'Bad Request',
-          message: result.error || 'invalid request'
+          message: (result && result.error) ? result.error : 'invalid request'
         }
       ];
       res.status(400).send({ errors: errorData });
@@ -100,7 +100,7 @@ exports.updateLogsTTL = async (req, res) => {
         const errorData = [
           {
             error: 'Bad Request',
-            message: result.error || 'invalid request'
+            message: (result && result.error) ? result.error : 'invalid request'
           }
         ];
         res.status(400).send({ errors: errorData });
@@ -183,7 +183,7 @@ exports.getHostnames = async (req, res) => {
       const errorData = [
         {
           error: 'Bad Request',
-          message: result.error || 'invalid request'
+          message: (result && result.error) ? result.error : 'invalid request'
         }
       ];
       res.status(400).send({ errors: errorData });

diff --git a/lib/main/server/controllers/userController.js b/lib/main/server/controllers/userController.js
@@ -260,7 +260,7 @@ exports.addUser = async (req, res) => {
       } else {
         const errorData = [{
           error: 'Forbidden',
-          message: userDetails.error || 'Not allowed'
+          message: (userDetails && userDetails.error) ? userDetails.error : 'Not allowed'
         }];
         res.status(403).send({ errors: errorData });
       }
@@ -301,7 +301,7 @@ exports.removeUser = async (req, res) => {
       } else {
         const errorData = [{
           error: 'Forbidden',
-          message: userDetails.error || 'Not allowed'
+          message: (userDetails && userDetails.error) ? userDetails.error : 'Not allowed'
         }];
         res.status(403).send({ errors: errorData });
       }