From bda5e69cbb4e062d056cc66a54409cd4bcd811df Mon Sep 17 00:00:00 2001
From: Dave Horton <daveh@beachdognet.com>
Date: Sun, 26 Sep 2021 12:15:28 -0400
Subject: [PATCH] fix stripe bug

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

diff --git a/lib/routes/api/accounts.js b/lib/routes/api/accounts.js
index 5376f95..415b209 100644
--- a/lib/routes/api/accounts.js
+++ b/lib/routes/api/accounts.js
@@ -19,6 +19,12 @@ const translator = short();
 
 let idx = 0;
 
+const stripPort = (hostport) => {
+  const arr = /^(.*):(.*)$/.exec(hostport);
+  if (arr) return arr[1];
+  return hostport;
+};
+
 router.use('/:sid/SpeechCredentials', hasAccountPermissions, require('./speech-credentials'));
 router.use('/:sid/RecentCalls', hasAccountPermissions, require('./recent-calls'));
 router.use('/:sid/Alerts', hasAccountPermissions, require('./alerts'));
@@ -515,7 +521,7 @@ router.post('/:sid/Calls', async(req, res) => {
       logger.info('No available feature servers to handle createCall API request');
       return res.json({msg: 'no available feature servers at this time'}).status(500);
     }
-    const ip = fs[idx++ % fs.length];
+    const ip = stripPort(fs[idx++ % fs.length]);
     logger.info({fs}, `feature servers available for createCall API request, selecting ${ip}`);
     const serviceUrl = `http://${ip}:3000/v1/createCall`;
     await validateCreateCall(logger, sid, req);
@@ -661,9 +667,7 @@ router.post('/:sid/Messages', async(req, res) => {
       logger.info('No available feature servers to handle createMessage API request');
       return res.json({msg: 'no available feature servers at this time'}).status(500);
     }
-    let ip = fs[idx++ % fs.length];
-    const arr = /^(.*):\d+$/.exec(ip);
-    if (arr) ip = arr[1];
+    const ip = stripPort(fs[idx++ % fs.length]);
     logger.info({fs}, `feature servers available for createMessage API request, selecting ${ip}`);
     const serviceUrl = `http://${ip}:3000/v1/createMessage/${account_sid}`;
     await validateCreateMessage(logger, account_sid, req);
diff --git a/lib/utils/stripe-utils.js b/lib/utils/stripe-utils.js
index b4bb005..9630893 100644
--- a/lib/utils/stripe-utils.js
+++ b/lib/utils/stripe-utils.js
@@ -7,7 +7,7 @@ assert.ok(process.env.STRIPE_BASE_URL || process.env.NODE_ENV === 'test',
   'missing env STRIPE_BASE_URL for billing operations');
 
 const bent = require('bent');
-const formurlencoded = require('form-urlencoded').default;
+const formurlencoded = require('form-urlencoded');
 const qs = require('qs');
 const toBase64 = (str) => Buffer.from(str || '', 'utf8').toString('base64');
 const basicAuth = () => {