Bump word-wrap from 1.2.3 to 1.2.5

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.5.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.5)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

db/jambones-sql.sql

@@ -156,7 +156,7 @@ regex VARCHAR(32) NOT NULL COMMENT 'regex-based pattern match against dialed num
 description VARCHAR(1024),
 priority INTEGER NOT NULL COMMENT 'lower priority routes are attempted first',
 PRIMARY KEY (lcr_route_sid)
-) COMMENT='An ordered list of  digit patterns in an LCR table.  The pat';
+) COMMENT='An ordered list of  digit patterns in an LCR table.  The patterns are tested in sequence until one matches';
 
 CREATE TABLE lcr
 (
@@ -167,7 +167,7 @@ default_carrier_set_entry_sid CHAR(36) COMMENT 'default carrier/route to use whe
 service_provider_sid CHAR(36),
 account_sid CHAR(36),
 PRIMARY KEY (lcr_sid)
-) COMMENT='An LCR (least cost routing) table that is used by a service ';
+) COMMENT='An LCR (least cost routing) table that is used by a service provider or account to make decisions about routing outbound calls when multiple carriers are available.';
 
 CREATE TABLE password_settings
 (
@@ -442,7 +442,6 @@ inbound BOOLEAN NOT NULL COMMENT 'if true, whitelist this IP to allow inbound ca
 outbound BOOLEAN NOT NULL COMMENT 'if true, include in least-cost routing when placing calls to the PSTN',
 voip_carrier_sid CHAR(36) NOT NULL,
 is_active BOOLEAN NOT NULL DEFAULT 1,
-pad_crypto BOOLEAN NOT NULL DEFAULT 0,
 protocol ENUM('udp','tcp','tls', 'tls/srtp') DEFAULT 'udp' COMMENT 'Outbound call protocol',
 PRIMARY KEY (sip_gateway_sid)
 ) COMMENT='A whitelisted sip gateway used for origination/termination';
@@ -485,12 +484,12 @@ speech_recognizer_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_recognizer_language VARCHAR(64) NOT NULL DEFAULT 'en-US',
 speech_recognizer_label VARCHAR(64),
 use_for_fallback_speech BOOLEAN DEFAULT false,
-fallback_speech_synthesis_vendor VARCHAR(64),
-fallback_speech_synthesis_language VARCHAR(12),
+fallback_speech_synthesis_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
+fallback_speech_synthesis_language VARCHAR(12) NOT NULL DEFAULT 'en-US',
 fallback_speech_synthesis_voice VARCHAR(64),
 fallback_speech_synthesis_label VARCHAR(64),
-fallback_speech_recognizer_vendor VARCHAR(64),
-fallback_speech_recognizer_language VARCHAR(64),
+fallback_speech_recognizer_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
+fallback_speech_recognizer_language VARCHAR(64) NOT NULL DEFAULT 'en-US',
 fallback_speech_recognizer_label VARCHAR(64),
 created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
 record_all_calls BOOLEAN NOT NULL DEFAULT false,
@@ -713,5 +712,4 @@ ALTER TABLE accounts ADD FOREIGN KEY queue_event_hook_sid_idxfk (queue_event_hoo
 ALTER TABLE accounts ADD FOREIGN KEY device_calling_application_sid_idxfk (device_calling_application_sid) REFERENCES applications (application_sid);
 
 ALTER TABLE accounts ADD FOREIGN KEY siprec_hook_sid_idxfk (siprec_hook_sid) REFERENCES applications (application_sid);
-
-SET FOREIGN_KEY_CHECKS=1;
+SET FOREIGN_KEY_CHECKS=1;

db/jambones.sqs

@@ -2248,7 +2248,7 @@
         </location>
         <size>
             <width>281.00</width>
-            <height>240.00</height>
+            <height>220.00</height>
         </size>
         <zorder>7</zorder>
         <SQLField>
@@ -2316,13 +2316,6 @@
             <notNull><![CDATA[1]]></notNull>
             <uid><![CDATA[27D4A5BD-8093-4ADD-B5B5-D546844206F9]]></uid>
         </SQLField>
-        <SQLField>
-            <name><![CDATA[pad_crypto]]></name>
-            <type><![CDATA[BOOLEAN]]></type>
-            <defaultValue><![CDATA[0]]></defaultValue>
-            <notNull><![CDATA[1]]></notNull>
-            <uid><![CDATA[C5C0043B-100A-4476-BF01-BE0777AE27C0]]></uid>
-        </SQLField>
         <SQLIndex>
             <name><![CDATA[sip_gateway_idx_hostport]]></name>
             <fieldName><![CDATA[ipv4]]></fieldName>
@@ -2361,7 +2354,7 @@
             <y>917.00</y>
         </location>
         <size>
-            <width>345.00</width>
+            <width>363.00</width>
             <height>540.00</height>
         </size>
         <zorder>0</zorder>
@@ -2516,13 +2509,15 @@
         <SQLField>
             <name><![CDATA[fallback_speech_synthesis_vendor]]></name>
             <type><![CDATA[VARCHAR(64)]]></type>
-            <notNull><![CDATA[0]]></notNull>
+            <defaultValue><![CDATA[google]]></defaultValue>
+            <notNull><![CDATA[1]]></notNull>
             <uid><![CDATA[26BBDEEF-E179-4280-9917-6F2BD6367459]]></uid>
         </SQLField>
         <SQLField>
             <name><![CDATA[fallback_speech_synthesis_language]]></name>
             <type><![CDATA[VARCHAR(12)]]></type>
-            <notNull><![CDATA[0]]></notNull>
+            <defaultValue><![CDATA[en-US]]></defaultValue>
+            <notNull><![CDATA[1]]></notNull>
             <uid><![CDATA[E008D6D7-9BB7-4372-8B46-F92C0EB15082]]></uid>
         </SQLField>
         <SQLField>
@@ -2540,13 +2535,15 @@
         <SQLField>
             <name><![CDATA[fallback_speech_recognizer_vendor]]></name>
             <type><![CDATA[VARCHAR(64)]]></type>
-            <notNull><![CDATA[0]]></notNull>
+            <defaultValue><![CDATA[google]]></defaultValue>
+            <notNull><![CDATA[1]]></notNull>
             <uid><![CDATA[14ECF5EA-81C5-4EAE-9575-9785CEB672E6]]></uid>
         </SQLField>
         <SQLField>
             <name><![CDATA[fallback_speech_recognizer_language]]></name>
             <type><![CDATA[VARCHAR(64)]]></type>
-            <notNull><![CDATA[0]]></notNull>
+            <defaultValue><![CDATA[en-US]]></defaultValue>
+            <notNull><![CDATA[1]]></notNull>
             <uid><![CDATA[EC792500-6B2B-4E54-AA89-43E7A0FD8642]]></uid>
         </SQLField>
         <SQLField>
@@ -3014,17 +3011,17 @@
         <overviewPanelHidden><![CDATA[0]]></overviewPanelHidden>
         <pageBoundariesVisible><![CDATA[0]]></pageBoundariesVisible>
         <PageGridVisible><![CDATA[0]]></PageGridVisible>
-        <RightSidebarWidth><![CDATA[1235.000000]]></RightSidebarWidth>
+        <RightSidebarWidth><![CDATA[1405.000000]]></RightSidebarWidth>
         <sidebarIndex><![CDATA[2]]></sidebarIndex>
         <snapToGrid><![CDATA[0]]></snapToGrid>
         <SourceSidebarWidth><![CDATA[0.000000]]></SourceSidebarWidth>
         <SQLEditorFileFormatVersion><![CDATA[4]]></SQLEditorFileFormatVersion>
         <uid><![CDATA[58C99A00-06C9-478C-A667-C63842E088F3]]></uid>
-        <windowHeight><![CDATA[870.000000]]></windowHeight>
-        <windowLocationX><![CDATA[0.000000]]></windowLocationX>
-        <windowLocationY><![CDATA[74.000000]]></windowLocationY>
-        <windowScrollOrigin><![CDATA[{0, 0.5}]]></windowScrollOrigin>
-        <windowWidth><![CDATA[1512.000000]]></windowWidth>
+        <windowHeight><![CDATA[1055.000000]]></windowHeight>
+        <windowLocationX><![CDATA[1728.000000]]></windowLocationX>
+        <windowLocationY><![CDATA[37.000000]]></windowLocationY>
+        <windowScrollOrigin><![CDATA[{0, 597}]]></windowScrollOrigin>
+        <windowWidth><![CDATA[1682.000000]]></windowWidth>
     </SQLDocumentInfo>
     <AllowsIndexRenamingOnInsert><![CDATA[1]]></AllowsIndexRenamingOnInsert>
     <defaultLabelExpanded><![CDATA[1]]></defaultLabelExpanded>

db/upgrade-jambonz-db.js

@@ -173,7 +173,6 @@ const sql = {
     'ALTER TABLE applications ADD COLUMN fallback_speech_recognizer_vendor VARCHAR(64)',
     'ALTER TABLE applications ADD COLUMN fallback_speech_recognizer_language VARCHAR(64)',
     'ALTER TABLE applications ADD COLUMN fallback_speech_recognizer_label VARCHAR(64)',
-    'ALTER TABLE sip_gateways ADD COLUMN pad_crypto BOOLEAN NOT NULL DEFAULT 0,',
   ]
 };
 

lib/models/phone-number.js

@@ -16,7 +16,7 @@ class PhoneNumber extends Model {
   }
 
   static async retrieveAll(account_sid) {
-    if (!account_sid) return await super.retrieveAll();
+    if (!account_sid) return super.retrieveAll();
     const [rows] = await promisePool.query(sql, account_sid);
     return rows;
   }

lib/models/sip-gateway.js

@@ -51,10 +51,6 @@ SipGateway.fields = [
     name: 'is_active',
     type: 'number'
   },
-  {
-    name: 'pad_crypto',
-    type: 'number'
-  },
   {
     name: 'account_sid',
     type: 'string'

lib/record/s3-multipart-upload-stream.js

@@ -11,7 +11,7 @@ class S3MultipartUploadStream extends Writable {
     super(opts);
     this.logger = logger;
     this.bucketName = opts.bucketName;
-    this.objectKey = opts.objectKey;
+    this.objectKey = opts.Key;
     this.uploadId = null;
     this.partNumber = 1;
     this.multipartETags = [];

lib/record/upload.js

@@ -5,6 +5,7 @@ const wav = require('wav');
 const { getUploader } = require('./utils');
 
 async function upload(logger, socket) {
+
   socket._recvInitialMetadata = false;
   socket.on('message', async function(data, isBinary) {
     try {
@@ -12,9 +13,9 @@ async function upload(logger, socket) {
         socket._recvInitialMetadata = true;
         logger.debug(`initial metadata: ${data}`);
         const obj = JSON.parse(data.toString());
-        logger.info({ obj }, 'received JSON message from jambonz');
-        const { sampleRate, accountSid, callSid, direction, from, to,
-          callId, applicationSid, originatingSipIp, originatingSipTrunkName } = obj;
+        logger.info({obj}, 'received JSON message from jambonz');
+        const {sampleRate, accountSid, callSid, direction, from, to,
+          callId, applicationSid, originatingSipIp, originatingSipTrunkName} = obj;
         const account = await Account.retrieve(accountSid);
         if (account && account.length && account[0].bucket_credential) {
           const obj = account[0].bucket_credential;
@@ -38,11 +39,11 @@ async function upload(logger, socket) {
           }
           // create S3 path
           const day = new Date();
-          let key = `${day.getFullYear()}/${(day.getMonth() + 1).toString().padStart(2, '0')}`;
-          key += `/${day.getDate().toString().padStart(2, '0')}/${callSid}.${account[0].record_format}`;
+          let Key = `${day.getFullYear()}/${(day.getMonth() + 1).toString().padStart(2, '0')}`;
+          Key += `/${day.getDate().toString().padStart(2, '0')}/${callSid}.${account[0].record_format}`;
 
           // Uploader
-          const uploadStream = getUploader(key, metadata, obj, logger);
+          const uploadStream = getUploader(Key, metadata, obj, logger);
           if (!uploadStream) {
             logger.info('There is no available record uploader, close the socket.');
             socket.close();
@@ -60,39 +61,26 @@ async function upload(logger, socket) {
               bitrate: 128
             });
           }
-          const handleError = (err, streamType) => {
-            logger.error(
-              { err },
-              `Error while streaming for vendor: ${obj.vendor}, pipe: ${streamType}: ${err.message}`
-            );
-          };
-
           /* start streaming data */
           const duplex = Websocket.createWebSocketStream(socket);
-          duplex
-            .on('error', (err) => handleError(err, 'duplex'))
-            .pipe(encoder)
-            .on('error', (err) => handleError(err, 'encoder'))
-            .pipe(uploadStream)
-            .on('error', (err) => handleError(err, 'uploadStream'));
-
+          duplex.pipe(encoder).pipe(uploadStream);
         } else {
           logger.info(`account ${accountSid} does not have any bucket credential, close the socket`);
           socket.close();
         }
       }
     } catch (err) {
-      logger.error({ err, data }, 'error parsing message during connection');
+      logger.error({err, data}, 'error parsing message during connection');
     }
   });
   socket.on('error', function(err) {
-    logger.error({ err }, 'record upload: error');
+    logger.error({err}, 'aws upload: error');
   });
   socket.on('close', (data) => {
-    logger.info({ data }, 'record upload: close');
+    logger.info({data}, 'aws_s3: close');
   });
   socket.on('end', function(err) {
-    logger.error({ err }, 'record upload: socket closed from jambonz');
+    logger.error({err}, 'aws upload: socket closed from jambonz');
   });
 }
 

lib/record/utils.js

@@ -2,53 +2,39 @@ const AzureStorageUploadStream = require('./azure-storage');
 const GoogleStorageUploadStream = require('./google-storage');
 const S3MultipartUploadStream = require('./s3-multipart-upload-stream');
 
-const getUploader = (key, metadata, bucket_credential, logger) => {
+const getUploader = (Key, metadata, bucket_credential, logger) => {
   const uploaderOpts = {
     bucketName: bucket_credential.name,
-    objectKey: key,
+    Key,
     metadata
   };
-  try {
-    switch (bucket_credential.vendor) {
-      case 'aws_s3':
-        uploaderOpts.bucketCredential = {
-          credentials: {
-            accessKeyId: bucket_credential.access_key_id,
-            secretAccessKey: bucket_credential.secret_access_key,
-          },
-          region: bucket_credential.region || 'us-east-1'
-        };
-        return new S3MultipartUploadStream(logger, uploaderOpts);
-      case 's3_compatible':
-        uploaderOpts.bucketCredential = {
-          endpoint: bucket_credential.endpoint,
-          credentials: {
-            accessKeyId: bucket_credential.access_key_id,
-            secretAccessKey: bucket_credential.secret_access_key,
-          },
-          region: 'us-east-1',
-          forcePathStyle: true
-        };
-        return new S3MultipartUploadStream(logger, uploaderOpts);
-      case 'google':
-        const serviceKey = JSON.parse(bucket_credential.service_key);
-        uploaderOpts.bucketCredential = {
-          projectId: serviceKey.project_id,
-          credentials: {
-            client_email: serviceKey.client_email,
-            private_key: serviceKey.private_key
-          }
-        };
-        return new GoogleStorageUploadStream(logger, uploaderOpts);
-      case 'azure':
-        uploaderOpts.connection_string = bucket_credential.connection_string;
-        return new AzureStorageUploadStream(logger, uploaderOpts);
-      default:
-        logger.error(`unknown bucket vendor: ${bucket_credential.vendor}`);
-        break;
-    }
-  } catch (err) {
-    logger.error(`Error creating uploader, vendor: ${bucket_credential.vendor}, reason: ${err.message}`);
+  switch (bucket_credential.vendor) {
+    case 'aws_s3':
+      uploaderOpts.bucketCredential = {
+        credentials: {
+          accessKeyId: bucket_credential.access_key_id,
+          secretAccessKey: bucket_credential.secret_access_key,
+        },
+        region: bucket_credential.region || 'us-east-1'
+      };
+      return new S3MultipartUploadStream(logger, uploaderOpts);
+    case 'google':
+      const serviceKey = JSON.parse(bucket_credential.service_key);
+      uploaderOpts.bucketCredential = {
+        projectId: serviceKey.project_id,
+        credentials: {
+          client_email: serviceKey.client_email,
+          private_key: serviceKey.private_key
+        }
+      };
+      return new GoogleStorageUploadStream(logger, uploaderOpts);
+    case 'azure':
+      uploaderOpts.connection_string = bucket_credential.connection_string;
+      return new AzureStorageUploadStream(logger, uploaderOpts);
+
+    default:
+      logger.error(`unknown bucket vendor: ${bucket_credential.vendor}`);
+      break;
   }
   return null;
 };

lib/routes/api/accounts.js

@@ -24,7 +24,7 @@ const {
 const short = require('short-uuid');
 const VoipCarrier = require('../../models/voip-carrier');
 const { encrypt } = require('../../utils/encrypt-decrypt');
-const { testS3Storage, testGoogleStorage, testAzureStorage } = require('../../utils/storage-utils');
+const { testAwsS3, testGoogleStorage, testAzureStorage } = require('../../utils/storage-utils');
 const translator = short();
 
 let idx = 0;
@@ -176,7 +176,6 @@ function validateUpdateCall(opts) {
     'child_call_hook',
     'call_status',
     'listen_status',
-    'transcribe_status',
     'conf_hold_status',
     'conf_mute_status',
     'mute_status',
@@ -544,8 +543,7 @@ function encryptBucketCredential(obj) {
     secret_access_key,
     tags,
     service_key,
-    connection_string,
-    endpoint
+    connection_string
   } = obj.bucket_credential;
 
   switch (vendor) {
@@ -558,15 +556,6 @@ function encryptBucketCredential(obj) {
         secret_access_key, tags});
       obj.bucket_credential = encrypt(awsData);
       break;
-    case 's3_compatible':
-      assert(access_key_id, 'invalid aws S3 bucket credential: access_key_id is required');
-      assert(secret_access_key, 'invalid aws S3 bucket credential: secret_access_key is required');
-      assert(name, 'invalid aws bucket name: name is required');
-      assert(endpoint, 'invalid endpoint uri: endpoint is required');
-      const s3Data = JSON.stringify({vendor, endpoint, name, access_key_id,
-        secret_access_key, tags});
-      obj.bucket_credential = encrypt(s3Data);
-      break;
     case 'google':
       assert(service_key, 'invalid google cloud storage credential: service_key is required');
       const googleData = JSON.stringify({vendor, name, service_key, tags});
@@ -582,7 +571,7 @@ function encryptBucketCredential(obj) {
       obj.bucket_credential = null;
       break;
     default:
-      throw new DbErrorBadRequest(`unknown storage vendor: ${vendor}`);
+      throw new DbErrorBadRequest(`unknow storage vendor: ${vendor}`);
   }
 }
 
@@ -732,18 +721,14 @@ router.post('/:sid/BucketCredentialTest', async(req, res) => {
   try {
     const account_sid = parseAccountSid(req);
     await validateRequest(req, account_sid);
-    const {vendor, name, region, access_key_id, secret_access_key, service_key, connection_string, endpoint} = req.body;
+    const {vendor, name, region, access_key_id, secret_access_key, service_key, connection_string} = req.body;
     const ret = {
       status: 'not tested'
     };
 
     switch (vendor) {
       case 'aws_s3':
-        await testS3Storage(logger, {vendor, name, region, access_key_id, secret_access_key});
-        ret.status = 'ok';
-        break;
-      case 's3_compatible':
-        await testS3Storage(logger, {vendor, name, endpoint, access_key_id, secret_access_key});
+        await testAwsS3(logger, {vendor, name, region, access_key_id, secret_access_key});
         ret.status = 'ok';
         break;
       case 'google':

lib/routes/api/phone-numbers.js

@@ -94,9 +94,9 @@ decorate(router, PhoneNumber, ['add', 'update', 'delete'], preconditions);
 router.get('/', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    const results = req.user.hasServiceProviderAuth ?
-      await PhoneNumber.retrieveAllForSP(req.user.service_provider_sid) :
-      await PhoneNumber.retrieveAll(req.user.hasAccountAuth ? req.user.account_sid : null);
+    const results = req.user.hasAdminAuth ?
+      await PhoneNumber.retrieveAll(req.user.hasAccountAuth ? req.user.account_sid : null) :
+      await PhoneNumber.retrieveAllForSP(req.user.service_provider_sid);
     res.status(200).json(results);
   } catch (err) {
     sysError(logger, res, err);
@@ -120,9 +120,6 @@ router.get('/:sid', async(req, res) => {
         throw new DbErrorBadRequest('insufficient privileges');
       }
     }
-    if (req.user.hasAccountAuth && results.length > 1) {
-      return res.status(200).json(results.filter((r) => r.phone_number_sid === sid)[0]);
-    }
     return res.status(200).json(results[0]);
   }
   catch (err) {

lib/routes/api/recent-calls.js

@@ -4,14 +4,7 @@ const {DbErrorBadRequest} = require('../../utils/errors');
 const {getHomerApiKey, getHomerSipTrace, getHomerPcap} = require('../../utils/homer-utils');
 const {getJaegerTrace} = require('../../utils/jaeger-utils');
 const Account = require('../../models/account');
-const {
-  getS3Object,
-  getGoogleStorageObject,
-  getAzureStorageObject,
-  deleteS3Object,
-  deleteGoogleStorageObject,
-  deleteAzureStorageObject
-} = require('../../utils/storage-utils');
+const { getS3Object, getGoogleStorageObject, getAzureStorageObject } = require('../../utils/storage-utils');
 
 const parseAccountSid = (url) => {
   const arr = /Accounts\/([^\/]*)/.exec(url);
@@ -138,7 +131,6 @@ router.get('/:call_sid/record/:year/:month/:day/:format', async(req, res) => {
     let stream;
     switch (bucket_credential.vendor) {
       case 'aws_s3':
-      case 's3_compatible':
         stream = await getS3Object(logger, getOptions);
         break;
       case 'google':
@@ -154,52 +146,10 @@ router.get('/:call_sid/record/:year/:month/:day/:format', async(req, res) => {
     res.set({
       'Content-Type': `audio/${format || 'mp3'}`
     });
-    if (stream) {
-      stream.pipe(res);
-    } else {
-      return res.sendStatus(404);
-    }
+    stream.pipe(res);
   }  catch (err) {
     logger.error({err}, ` error retrieving recording ${call_sid}`);
     res.sendStatus(404);
   }
 });
-
-router.delete('/:call_sid/record/:year/:month/:day/:format', async(req, res) => {
-  const {logger} = req.app.locals;
-  const {call_sid, year, month, day, format} = req.params;
-
-  try {
-    const account_sid = parseAccountSid(req.originalUrl);
-    const r = await Account.retrieve(account_sid);
-    if (r.length === 0 || !r[0].bucket_credential) return res.sendStatus(404);
-    const {bucket_credential} = r[0];
-
-    const deleteOptions  = {
-      ...bucket_credential,
-      key: `${year}/${month}/${day}/${call_sid}.${format || 'mp3'}`
-    };
-
-    switch (bucket_credential.vendor) {
-      case 'aws_s3':
-      case 's3_compatible':
-        await deleteS3Object(logger, deleteOptions);
-        break;
-      case 'google':
-        await deleteGoogleStorageObject(logger, deleteOptions);
-        break;
-      case 'azure':
-        await deleteAzureStorageObject(logger, deleteOptions);
-        break;
-      default:
-        logger.error(`There is no handler for deleting record from ${bucket_credential.vendor}`);
-        return res.sendStatus(500);
-    }
-    res.sendStatus(204);
-  }  catch (err) {
-    logger.error({err}, ` error deleting recording ${call_sid}`);
-    res.sendStatus(404);
-  }
-});
-
 module.exports = router;

lib/routes/api/speech-credentials.js

@@ -114,10 +114,8 @@ const encryptCredential = (obj) => {
     nuance_stt_uri,
     use_custom_tts,
     custom_tts_endpoint,
-    custom_tts_endpoint_url,
     use_custom_stt,
     custom_stt_endpoint,
-    custom_stt_endpoint_url,
     tts_api_key,
     tts_region,
     stt_api_key,
@@ -149,19 +147,15 @@ const encryptCredential = (obj) => {
       return encrypt(awsData);
 
     case 'microsoft':
-      if (!custom_tts_endpoint_url && !custom_stt_endpoint_url) {
-        assert(region, 'invalid azure speech credential: region is required');
-        assert(api_key, 'invalid azure speech credential: api_key is required');
-      }
+      assert(region, 'invalid azure speech credential: region is required');
+      assert(api_key, 'invalid azure speech credential: api_key is required');
       const azureData = JSON.stringify({
-        ...(region && {region}),
-        ...(api_key && {api_key}),
+        region,
+        api_key,
         use_custom_tts,
         custom_tts_endpoint,
-        custom_tts_endpoint_url,
         use_custom_stt,
-        custom_stt_endpoint,
-        custom_stt_endpoint_url
+        custom_stt_endpoint
       });
       return encrypt(azureData);
 
@@ -301,10 +295,8 @@ router.get('/', async(req, res) => {
         obj.region = o.region;
         obj.use_custom_tts = o.use_custom_tts;
         obj.custom_tts_endpoint = o.custom_tts_endpoint;
-        obj.custom_tts_endpoint_url = o.custom_tts_endpoint_url;
         obj.use_custom_stt = o.use_custom_stt;
         obj.custom_stt_endpoint = o.custom_stt_endpoint;
-        obj.custom_stt_endpoint_url = o.custom_stt_endpoint_url;
         logger.info({obj, o}, 'retrieving azure speech credential');
       }
       else if ('wellsaid' === obj.vendor) {
@@ -391,10 +383,8 @@ router.get('/:sid', async(req, res) => {
       obj.region = o.region;
       obj.use_custom_tts = o.use_custom_tts;
       obj.custom_tts_endpoint = o.custom_tts_endpoint;
-      obj.custom_tts_endpoint_url = o.custom_tts_endpoint_url;
       obj.use_custom_stt = o.use_custom_stt;
       obj.custom_stt_endpoint = o.custom_stt_endpoint;
-      obj.custom_stt_endpoint_url = o.custom_stt_endpoint_url;
     }
     else if ('wellsaid' === obj.vendor) {
       const o = JSON.parse(decrypt(credential));
@@ -498,10 +488,8 @@ router.put('/:sid', async(req, res) => {
         const {
           use_custom_tts,
           custom_tts_endpoint,
-          custom_tts_endpoint_url,
           use_custom_stt,
           custom_stt_endpoint,
-          custom_stt_endpoint_url,
           custom_stt_url,
           custom_tts_url
         } = req.body;
@@ -513,10 +501,8 @@ router.put('/:sid', async(req, res) => {
           aws_region,
           use_custom_tts,
           custom_tts_endpoint,
-          custom_tts_endpoint_url,
           use_custom_stt,
           custom_stt_endpoint,
-          custom_stt_endpoint_url,
           stt_region,
           tts_region,
           riva_server_uri,
@@ -636,10 +622,8 @@ router.get('/:sid/test', async(req, res) => {
         region,
         use_custom_tts,
         custom_tts_endpoint,
-        custom_tts_endpoint_url,
         use_custom_stt,
-        custom_stt_endpoint,
-        custom_stt_endpoint_url
+        custom_stt_endpoint
       } = credential;
       if (cred.use_for_tts) {
         try {
@@ -648,10 +632,8 @@ router.get('/:sid/test', async(req, res) => {
             region,
             use_custom_tts,
             custom_tts_endpoint,
-            custom_tts_endpoint_url,
             use_custom_stt,
-            custom_stt_endpoint,
-            custom_stt_endpoint_url
+            custom_stt_endpoint
           });
           results.tts.status = 'ok';
           SpeechCredential.ttsTestResult(sid, true);

lib/utils/storage-utils.js

@@ -1,10 +1,8 @@
-const { S3Client, PutObjectCommand, GetObjectCommand, DeleteObjectCommand } = require('@aws-sdk/client-s3');
+const { S3Client, PutObjectCommand, GetObjectCommand } = require('@aws-sdk/client-s3');
 const {Storage} = require('@google-cloud/storage');
 const fs = require('fs');
 const { BlobServiceClient } = require('@azure/storage-blob');
 
-// Azure
-
 async function testAzureStorage(logger, opts) {
   const blobServiceClient = BlobServiceClient.fromConnectionString(opts.connection_string);
   const containerClient = blobServiceClient.getContainerClient(opts.name);
@@ -21,29 +19,16 @@ async function getAzureStorageObject(logger, opts) {
   return response.readableStreamBody;
 }
 
-async function deleteAzureStorageObject(logger, opts) {
-  const blobServiceClient = BlobServiceClient.fromConnectionString(opts.connection_string);
-  const containerClient = blobServiceClient.getContainerClient(opts.name);
-  const blockBlobClient = containerClient.getBlockBlobClient(opts.key);
-  await blockBlobClient.delete();
-}
-
-// Google
-
-function _initGoogleClient(opts) {
-  const serviceKey = JSON.parse(opts.service_key);
-  return new Storage({
-    projectId: serviceKey.project_id,
-    credentials: {
-      client_email: serviceKey.client_email,
-      private_key: serviceKey.private_key
-    },
-  });
-}
-
-async function testGoogleStorage(logger, opts) {
+function testGoogleStorage(logger, opts) {
   return new Promise((resolve, reject) => {
-    const storage = _initGoogleClient(opts);
+    const serviceKey = JSON.parse(opts.service_key);
+    const storage = new Storage({
+      projectId: serviceKey.project_id,
+      credentials: {
+        client_email: serviceKey.client_email,
+        private_key: serviceKey.private_key
+      },
+    });
 
     const blob = storage.bucket(opts.name).file('jambonz-sample.text');
 
@@ -55,80 +40,62 @@ async function testGoogleStorage(logger, opts) {
 }
 
 async function getGoogleStorageObject(logger, opts) {
-  const storage = _initGoogleClient(opts);
-
-  const bucket = storage.bucket(opts.name);
-  const file = bucket.file(opts.key);
-  const [exists] = await file.exists();
-  if (exists) {
-    return file.createReadStream();
-  }
-}
-
-async function deleteGoogleStorageObject(logger, opts) {
-  const storage = _initGoogleClient(opts);
+  const serviceKey = JSON.parse(opts.service_key);
+  const storage = new Storage({
+    projectId: serviceKey.project_id,
+    credentials: {
+      client_email: serviceKey.client_email,
+      private_key: serviceKey.private_key
+    },
+  });
 
   const bucket = storage.bucket(opts.name);
   const file = bucket.file(opts.key);
 
-  await file.delete();
+  return file.createReadStream();
 }
 
-// S3
-
-function _initS3Client(opts) {
-  return new S3Client({
+async function testAwsS3(logger, opts) {
+  const s3 = new S3Client({
     credentials: {
       accessKeyId: opts.access_key_id,
       secretAccessKey: opts.secret_access_key,
     },
-    region: opts.region || 'us-east-1',
-    ...(opts.vendor === 's3_compatible' && { endpoint: opts.endpoint, forcePathStyle: true })
+    region: opts.region || 'us-east-1'
   });
-}
 
-async function testS3Storage(logger, opts) {
-  const s3 = _initS3Client(opts);
   const input = {
     'Body': 'Hello From Jambonz',
     'Bucket': opts.name,
     'Key': 'jambonz-sample.text'
   };
+
   const command = new PutObjectCommand(input);
+
   await s3.send(command);
 }
 
 async function getS3Object(logger, opts) {
-  const s3 = _initS3Client(opts);
-  const command = new GetObjectCommand(
-    {
-      Bucket: opts.name,
-      Key: opts.key
-    }
-  );
+  const s3 = new S3Client({
+    credentials: {
+      accessKeyId: opts.access_key_id,
+      secretAccessKey: opts.secret_access_key,
+    },
+    region: opts.region || 'us-east-1'
+  });
+  const command = new GetObjectCommand({
+    Bucket: opts.name,
+    Key: opts.key
+  });
   const res = await s3.send(command);
   return res.Body;
 }
 
-async function deleteS3Object(logger, opts) {
-  const s3 = _initS3Client(opts);
-  const command = new DeleteObjectCommand(
-    {
-      Bucket: opts.name,
-      Key: opts.key
-    }
-  );
-  await s3.send(command);
-}
-
 module.exports = {
-  testS3Storage,
+  testAwsS3,
   getS3Object,
-  deleteS3Object,
   testGoogleStorage,
   getGoogleStorageObject,
-  deleteGoogleStorageObject,
   testAzureStorage,
-  getAzureStorageObject,
-  deleteAzureStorageObject
+  getAzureStorageObject
 };

package-lock.json

@@ -9526,9 +9526,9 @@
       }
     },
     "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -17053,9 +17053,9 @@
       }
     },
     "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="
     },
     "wrap-ansi": {
       "version": "7.0.0",