From 2c3bdc9be0975b6708721f5b70036f802a640650 Mon Sep 17 00:00:00 2001
From: Dave Horton <daveh@beachdognet.com>
Date: Mon, 6 Dec 2021 16:31:19 -0500
Subject: [PATCH] more subspace fixes

---
 lib/routes/api/accounts.js |  2 +-
 lib/routes/api/utils.js    | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/routes/api/accounts.js b/lib/routes/api/accounts.js
index c7288b0..6bd1b1a 100644
--- a/lib/routes/api/accounts.js
+++ b/lib/routes/api/accounts.js
@@ -416,7 +416,7 @@ router.delete('/:sid/SubspaceTeleport', async(req, res) => {
       subspace_sip_teleport_id: null,
       subspace_sip_teleport_destinations: null
     });
-    return res.status(204);
+    return res.sendStatus(204);
   }
   catch (err) {
     sysError(logger, res, err);
diff --git a/lib/routes/api/utils.js b/lib/routes/api/utils.js
index a2dcefb..462d97d 100644
--- a/lib/routes/api/utils.js
+++ b/lib/routes/api/utils.js
@@ -243,7 +243,6 @@ const getSubspaceJWT = async(id, secret) => {
 const enableSubspace = async(opts) => {
   const {subspace_client_id, subspace_client_secret, destination} = opts;
   const accessToken = await getSubspaceJWT(subspace_client_id, subspace_client_secret);
-  console.log(`got jwt ${accessToken}`);
   const postTeleport = bent('https://api.subspace.com', 'POST', 'json', 200);
 
   const teleport = await postTeleport('/v1/sip-teleports',
@@ -261,14 +260,12 @@ const enableSubspace = async(opts) => {
 };
 
 const disableSubspace = async(opts) => {
-  const accessToken = await getSubspaceJWT(opts.subspace_client_id, opts.subspace_client_secret);
-
-  const deleteTeleport = bent(
-    `https://api.subspace.com/v1/sip-teleports/${opts.subspace_sip_teleport_id}`, 'DELETE', 'json', 200);
-
-  await deleteTeleport(
+  const {subspace_client_id, subspace_client_secret, subspace_sip_teleport_id} = opts;
+  const accessToken = await getSubspaceJWT(subspace_client_id, subspace_client_secret);
+  const relativeUrl = `/v1/sipteleport/${subspace_sip_teleport_id}`;
+  const deleteTeleport = bent('https://api.subspace.com', 'DELETE', 'json', 200);
+  await deleteTeleport(relativeUrl, {},
     {
-      'Content-Type': 'application/json',
       Authorization: `Bearer ${accessToken}`
     }
   );