revert/fix unittests

RunOnFlux · Feb 19, 2024 · 128da27 · 128da27
1 parent ce6327e
commit 128da27
Showing 1 changed file with 85 additions and 75 deletions.
diff --git a/ZelBack/src/services/fluxService.js b/ZelBack/src/services/fluxService.js
@@ -1198,14 +1198,14 @@ async function adjustRouterIP(req, res) {
  * @param {object} res Response.
  */
 async function adjustBlockedPorts(req, res) {
-  let body = '';
-  req.on('data', (data) => {
-    body += data;
-  });
-  req.on('end', async () => {
-    try {
-      const authorized = await verificationHelper.verifyPrivilege('adminandfluxteam', req);
-      if (authorized === true) {
+  try {
+    const authorized = await verificationHelper.verifyPrivilege('adminandfluxteam', req);
+    if (authorized === true) {
+      let body = '';
+      req.on('data', (data) => {
+        body += data;
+      });
+      req.on('end', async () => {
         try {
           if (!body) {
             throw new Error('Missing Blocked Ports Information.');
@@ -1244,20 +1244,20 @@ async function adjustBlockedPorts(req, res) {
           );
           res.json(errorResponse);
         }
-      } else {
-        const errMessage = messageHelper.errUnauthorizedMessage();
-        res.json(errMessage);
-      }
-    } catch (error) {
-      log.error(error);
-      const errorResponse = messageHelper.createErrorMessage(
-        error.message || error,
-        error.name,
-        error.code,
-      );
-      res.json(errorResponse);
+      });
+    } else {
+      const errMessage = messageHelper.errUnauthorizedMessage();
+      res.json(errMessage);
     }
-  });
+  } catch (error) {
+    log.error(error);
+    const errorResponse = messageHelper.createErrorMessage(
+      error.message || error,
+      error.name,
+      error.code,
+    );
+    res.json(errorResponse);
+  }
 }
 
 /**
@@ -1316,63 +1316,73 @@ async function adjustAPIPort(req, res) {
  * @param {object} res Response.
  */
 async function adjustBlockedRepositories(req, res) {
-  let body = '';
-  req.on('data', (data) => {
-    body += data;
-  });
-  req.on('end', async () => {
-    try {
-      const authorized = await verificationHelper.verifyPrivilege('adminandfluxteam', req);
-      if (authorized === true) {
-        if (!body) {
-          throw new Error('Missing Blocked Repositories Information.');
-        }
-        log.info(`body: ${JSON.stringify(body)}`);
-        const processedBody = serviceHelper.ensureObject(body);
-        const { blockedRepositories } = processedBody;
-        log.info(`blockedRepositories: ${JSON.stringify(blockedRepositories)}`);
-        if (!Array.isArray(blockedRepositories)) {
-          throw new Error('Blocked Repositories is not a valid array');
-        }
-        blockedRepositories.forEach((parameter) => {
-          if (typeof parameter !== 'string') {
-            throw new Error('Blocked Repositories are invalid');
+  try {
+    const authorized = await verificationHelper.verifyPrivilege('adminandfluxteam', req);
+    if (authorized === true) {
+      let body = '';
+      req.on('data', (data) => {
+        body += data;
+      });
+      req.on('end', async () => {
+        try {
+          if (!body) {
+            throw new Error('Missing Blocked Repositories Information.');
           }
-        });
-
-        const dataToWrite = `module.exports = {
-          initial: {
-            ipaddress: '${userconfig.initial.ipaddress || '127.0.0.1'}',
-            zelid: '${userconfig.initial.zelid || config.fluxTeamZelId}',
-            kadena: '${userconfig.initial.kadena || ''}',
-            testnet: ${userconfig.initial.testnet || false},
-            development: ${userconfig.initial.development || false},
-            apiport: ${Number(userconfig.initial.apiport || config.server.apiport)},
-            routerIP: '${userconfig.initial.routerIP || ''}',
-            pgpPrivateKey: \`${userconfig.initial.pgpPrivateKey || ''}\`,
-            pgpPublicKey: \`${userconfig.initial.pgpPublicKey || ''}\`,
-            blockedPorts: ${JSON.stringify(userconfig.initial.blockedPorts || [])},
-            blockedRepositories: ${JSON.stringify(blockedRepositories || []).replace(/"/g, "'")},
+          log.info(`body: ${JSON.stringify(body)}`);
+          const processedBody = serviceHelper.ensureObject(body);
+          const { blockedRepositories } = processedBody;
+          log.info(`blockedRepositories: ${JSON.stringify(blockedRepositories)}`);
+          if (!Array.isArray(blockedRepositories)) {
+            throw new Error('Blocked Repositories is not a valid array');
           }
-        }`;
-        const fluxDirPath = path.join(__dirname, '../../../config/userconfig.js');
-        await fsPromises.writeFile(fluxDirPath, dataToWrite);
-        const successMessage = messageHelper.createSuccessMessage('User Blocked Repositories adjusted');
-        res.json(successMessage);
-      } else {
-        const errMessage = messageHelper.errUnauthorizedMessage();
-        res.json(errMessage);
-      }
-    } catch (error) {
-      log.error(error);
-      const errorResponse = messageHelper.createErrorMessage(
-        error.message || error,
-        error.name,
-        error.code,
-      );
-      res.json(errorResponse);
+          blockedRepositories.forEach((parameter) => {
+            if (typeof parameter !== 'string') {
+              throw new Error('Blocked Repositories are invalid');
+            }
+          });
+
+          const dataToWrite = `module.exports = {
+            initial: {
+              ipaddress: '${userconfig.initial.ipaddress || '127.0.0.1'}',
+              zelid: '${userconfig.initial.zelid || config.fluxTeamZelId}',
+              kadena: '${userconfig.initial.kadena || ''}',
+              testnet: ${userconfig.initial.testnet || false},
+              development: ${userconfig.initial.development || false},
+              apiport: ${Number(userconfig.initial.apiport || config.server.apiport)},
+              routerIP: '${userconfig.initial.routerIP || ''}',
+              pgpPrivateKey: \`${userconfig.initial.pgpPrivateKey || ''}\`,
+              pgpPublicKey: \`${userconfig.initial.pgpPublicKey || ''}\`,
+              blockedPorts: ${JSON.stringify(userconfig.initial.blockedPorts || [])},
+              blockedRepositories: ${JSON.stringify(blockedRepositories || []).replace(/"/g, "'")},
+            }
+          }`;
+          const fluxDirPath = path.join(__dirname, '../../../config/userconfig.js');
+          await fsPromises.writeFile(fluxDirPath, dataToWrite);
+          const successMessage = messageHelper.createSuccessMessage('User Blocked Repositories adjusted');
+          res.json(successMessage);
+        } catch (error) {
+          log.error(error);
+          const errorResponse = messageHelper.createErrorMessage(
+            error.message || error,
+            error.name,
+            error.code,
+          );
+          res.json(errorResponse);
+        }
+      });
+    } else {
+      const errMessage = messageHelper.errUnauthorizedMessage();
+      res.json(errMessage);
     }
-  });
+  } catch (error) {
+    log.error(error);
+    const errorResponse = messageHelper.createErrorMessage(
+      error.message || error,
+      error.name,
+      error.code,
+    );
+    res.json(errorResponse);
+  }
 }
 
 /**