mirror of
https://github.com/jambonz/jambonz-api-server.git
synced 2026-10-31 03:44:17 +00:00
fix stripe bug
This commit is contained in:
1 parent
21ffad6c8d
commit
bda5e69cbb
2 files changed
+9
-5
No files matched your search
@@ -19,6 +19,12 @@ const translator = short();
|
|||||||
|
|
||||||
let idx = 0;
|
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/SpeechCredentials', hasAccountPermissions, require('./speech-credentials'));
|
||||||
router.use('/:sid/RecentCalls', hasAccountPermissions, require('./recent-calls'));
|
router.use('/:sid/RecentCalls', hasAccountPermissions, require('./recent-calls'));
|
||||||
router.use('/:sid/Alerts', hasAccountPermissions, require('./alerts'));
|
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');
|
logger.info('No available feature servers to handle createCall API request');
|
||||||
return res.json({msg: 'no available feature servers at this time'}).status(500);
|
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}`);
|
logger.info({fs}, `feature servers available for createCall API request, selecting ${ip}`);
|
||||||
const serviceUrl = `http://${ip}:3000/v1/createCall`;
|
const serviceUrl = `http://${ip}:3000/v1/createCall`;
|
||||||
await validateCreateCall(logger, sid, req);
|
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');
|
logger.info('No available feature servers to handle createMessage API request');
|
||||||
return res.json({msg: 'no available feature servers at this time'}).status(500);
|
return res.json({msg: 'no available feature servers at this time'}).status(500);
|
||||||
}
|
}
|
||||||
let ip = fs[idx++ % fs.length];
|
const ip = stripPort(fs[idx++ % fs.length]);
|
||||||
const arr = /^(.*):\d+$/.exec(ip);
|
|
||||||
if (arr) ip = arr[1];
|
|
||||||
logger.info({fs}, `feature servers available for createMessage API request, selecting ${ip}`);
|
logger.info({fs}, `feature servers available for createMessage API request, selecting ${ip}`);
|
||||||
const serviceUrl = `http://${ip}:3000/v1/createMessage/${account_sid}`;
|
const serviceUrl = `http://${ip}:3000/v1/createMessage/${account_sid}`;
|
||||||
await validateCreateMessage(logger, account_sid, req);
|
await validateCreateMessage(logger, account_sid, req);
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ assert.ok(process.env.STRIPE_BASE_URL || process.env.NODE_ENV === 'test',
|
|||||||
'missing env STRIPE_BASE_URL for billing operations');
|
'missing env STRIPE_BASE_URL for billing operations');
|
||||||
|
|
||||||
const bent = require('bent');
|
const bent = require('bent');
|
||||||
const formurlencoded = require('form-urlencoded').default;
|
const formurlencoded = require('form-urlencoded');
|
||||||
const qs = require('qs');
|
const qs = require('qs');
|
||||||
const toBase64 = (str) => Buffer.from(str || '', 'utf8').toString('base64');
|
const toBase64 = (str) => Buffer.from(str || '', 'utf8').toString('base64');
|
||||||
const basicAuth = () => {
|
const basicAuth = () => {
|
||||||
|
|||||||
Reference in new issue
Block a user