fixing issue from disable secret

Core-ISP · Mar 19, 2021 · a617cda · a617cda
1 parent a769a45
commit a617cda
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 17 deletions.
diff --git a/routes/v1/ppp/ppp_interface_remove/index.js b/routes/v1/ppp/ppp_interface_remove/index.js
@@ -8,10 +8,10 @@ const {
 router.post('/interface_remove', (req, res) => {
 
     let host_params = {
-        host: req.body.host_string.host,
-        user: req.body.host_string.user,
-        password: req.body.host_string.password,
-        port: req.body.host_string.port || 8728
+        host: req.body?.host_string?.host,
+        user: req.body?.host_string?.user,
+        password: req.body?.host_string?.password,
+        port: req.body?.host_string?.port || 8728
     }
     const name = req.body.name
 

diff --git a/routes/v1/ppp/ppp_secret_disable/index.js b/routes/v1/ppp/ppp_secret_disable/index.js
@@ -8,25 +8,43 @@ const {
 router.post('/secret_disable', (req, res) => {
 
     let host_params = {
-        host: req.body.host_string.host,
-        user: req.body.host_string.user,
-        password: req.body.host_string.password,
-        port: req.body.host_string.port || 8728
+        host: req?.body?.host_string?.host,
+        user: req?.body?.host_string?.user,
+        password: req?.body?.host_string?.password,
+        port: req?.body?.host_string.port || 8728
     }
     const name = req.body.name
 
     try {
         const script = '/ppp/secret/disable';
         const remove = `=numbers=${name}`;
         const peramitter = [remove]
+
+        // Interface Removed
+        const script_interface = '/interface/pppoe-server/remove';
+        const remove_interface = `=numbers=<pppoe-${name}>`;
+        const peramitter_interface = [remove_interface]
 
         with_params({
             script,
             peramitter,
             host_params
-        }).then(retn => {
+        }).then(async retn => {
             console.log("log: ppp secret disable")
             retn = Array.isArray(retn) ? retn : [retn]
+
+            // Remove Interface
+            try {
+                await with_params({
+                    script: script_interface,
+                    peramitter: peramitter_interface,
+                    host_params
+                })
+                console.log("log: ppp interface remove")
+            } catch (error) {
+                console.log("failed: Interface Not Removed")
+            }
+
             res.json({
                 success: true,
                 message: "done",

diff --git a/utils/mikrotik_cmd.js b/utils/mikrotik_cmd.js
@@ -10,7 +10,7 @@ const connection = require('../function/connection');
  */
 
 
-const with_params = ({
+const with_params = async ({
     script,
     peramitter = [],
     host_params =
@@ -40,24 +40,24 @@ const with_params = ({
                         resolve(data)
                     }).catch((err) => {
                         conn.close();
-                        console.log("with_params -> Server Error")
+                        console.log("with_params -> Server Exec Error")
                         resolve([])
                     });
                 })
                 .catch(err => {
                     conn.close();
-                    console.log("with_params -> Server Error")
+                    console.log("with_params -> Server Connect Error")
                     resolve([])
                 })
         } catch (e) {
-            console.log("with_params -> catch -> Server Error")
+            console.log("with_params -> catch -> Server Catch Error")
             resolve([])
         }
     })
 }
 
 
-const without_params = ({
+const without_params = async ({
     script,
     host_params =
     {
@@ -84,16 +84,16 @@ const without_params = ({
                     resolver(get)
                 }).catch((err) => {
                     conn.close();
-                    console.log("without_params -> Server Error")
+                    console.log("without_params -> Server Exec Error")
                     resolver([])
                 });
             }).catch(err => {
                 conn.close();
-                console.log("without_params -> Server Error")
+                console.log("without_params -> Server Connect Error")
                 resolver([])
             })
         } catch (e) {
-            console.log("without_params -> catch -> Server Error")
+            console.log("without_params -> catch -> Server Catch Error")
             resolver([])
         }
     })