feat get registered client status

app.js

@@ -46,14 +46,17 @@ const {
   addKey,
   retrieveKey,
   deleteKey,
-  incrKey
+  incrKey,
+  JAMBONES_REDIS_SENTINELS
 } = require('./lib/helpers/realtimedb-helpers');
 const {
   getTtsVoices,
   getTtsSize,
-  purgeTtsCache,
-  synthAudio
-} = require('@jambonz/speech-utils')({}, logger);
+  purgeTtsCache
+} = require('@jambonz/speech-utils')(JAMBONES_REDIS_SENTINELS || {
+  host: process.env.JAMBONES_REDIS_HOST,
+  port: process.env.JAMBONES_REDIS_PORT || 6379
+}, logger);
 const {
   lookupAppBySid,
   lookupAccountBySid,
@@ -61,8 +64,7 @@ const {
   lookupAppByPhoneNumber,
   lookupCarrierBySid,
   lookupSipGatewayBySid,
-  lookupSmppGatewayBySid,
-  lookupClientByAccountAndUsername
+  lookupSmppGatewayBySid
 } = require('@jambonz/db-helpers')({
   host: process.env.JAMBONES_MYSQL_HOST,
   user: process.env.JAMBONES_MYSQL_USER,
@@ -96,7 +98,6 @@ app.locals = {
   getTtsVoices,
   getTtsSize,
   purgeTtsCache,
-  synthAudio,
   lookupAppBySid,
   lookupAccountBySid,
   lookupAccountByPhoneNumber,
@@ -104,7 +105,6 @@ app.locals = {
   lookupCarrierBySid,
   lookupSipGatewayBySid,
   lookupSmppGatewayBySid,
-  lookupClientByAccountAndUsername,
   queryCdrs,
   queryCdrsSP,
   queryAlerts,

db/jambones-sql.sql

@@ -1,5 +1,4 @@
 /* SQLEditor (MySQL (2))*/
-
 SET FOREIGN_KEY_CHECKS=0;
 
 DROP TABLE IF EXISTS account_static_ips;
@@ -139,9 +138,6 @@ account_sid CHAR(36) NOT NULL,
 is_active BOOLEAN NOT NULL DEFAULT 1,
 username VARCHAR(64),
 password VARCHAR(1024),
-allow_direct_app_calling BOOLEAN NOT NULL DEFAULT 1,
-allow_direct_queue_calling BOOLEAN NOT NULL DEFAULT 1,
-allow_direct_user_calling BOOLEAN NOT NULL DEFAULT 1,
 PRIMARY KEY (client_sid)
 );
 
@@ -162,7 +158,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
 (
@@ -173,7 +169,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
 (
@@ -733,5 +729,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

@@ -2251,8 +2251,8 @@
             <y>1496.00</y>
         </location>
         <size>
-            <width>282.00</width>
-            <height>180.00</height>
+            <width>228.00</width>
+            <height>120.00</height>
         </size>
         <zorder>36</zorder>
         <SQLField>
@@ -2297,27 +2297,6 @@
             <notNull><![CDATA[0]]></notNull>
             <uid><![CDATA[2963DB28-7248-4D58-92E6-F21F2EB9E680]]></uid>
         </SQLField>
-        <SQLField>
-            <name><![CDATA[allow_direct_app_calling]]></name>
-            <type><![CDATA[BOOLEAN]]></type>
-            <defaultValue><![CDATA[1]]></defaultValue>
-            <notNull><![CDATA[1]]></notNull>
-            <uid><![CDATA[EA252940-708B-4BD3-B211-5EC59AA540D3]]></uid>
-        </SQLField>
-        <SQLField>
-            <name><![CDATA[allow_direct_queue_calling]]></name>
-            <type><![CDATA[BOOLEAN]]></type>
-            <defaultValue><![CDATA[1]]></defaultValue>
-            <notNull><![CDATA[1]]></notNull>
-            <uid><![CDATA[76CE0DFC-7CC6-46EE-82C6-2CF16C7EAD4D]]></uid>
-        </SQLField>
-        <SQLField>
-            <name><![CDATA[allow_direct_user_calling]]></name>
-            <type><![CDATA[BOOLEAN]]></type>
-            <defaultValue><![CDATA[1]]></defaultValue>
-            <notNull><![CDATA[1]]></notNull>
-            <uid><![CDATA[206E169C-E5F6-4774-8D4A-5BECF25E49A3]]></uid>
-        </SQLField>
         <labelWindowIndex><![CDATA[2]]></labelWindowIndex>
         <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
         <uid><![CDATA[C2CDB45C-3F50-40B3-B8CE-2F093EB0D517]]></uid>
@@ -3097,17 +3076,17 @@
         <overviewPanelHidden><![CDATA[0]]></overviewPanelHidden>
         <pageBoundariesVisible><![CDATA[0]]></pageBoundariesVisible>
         <PageGridVisible><![CDATA[0]]></PageGridVisible>
-        <RightSidebarWidth><![CDATA[1924.000000]]></RightSidebarWidth>
+        <RightSidebarWidth><![CDATA[1405.000000]]></RightSidebarWidth>
         <sidebarIndex><![CDATA[2]]></sidebarIndex>
         <snapToGrid><![CDATA[0]]></snapToGrid>
-        <SourceSidebarWidth><![CDATA[0.000000]]></SourceSidebarWidth>
+        <SourceSidebarWidth><![CDATA[312.000000]]></SourceSidebarWidth>
         <SQLEditorFileFormatVersion><![CDATA[4]]></SQLEditorFileFormatVersion>
         <uid><![CDATA[58C99A00-06C9-478C-A667-C63842E088F3]]></uid>
-        <windowHeight><![CDATA[985.000000]]></windowHeight>
-        <windowLocationX><![CDATA[-1307.000000]]></windowLocationX>
-        <windowLocationY><![CDATA[1008.000000]]></windowLocationY>
-        <windowScrollOrigin><![CDATA[{1.5, 786}]]></windowScrollOrigin>
-        <windowWidth><![CDATA[2201.000000]]></windowWidth>
+        <windowHeight><![CDATA[1055.000000]]></windowHeight>
+        <windowLocationX><![CDATA[1728.000000]]></windowLocationX>
+        <windowLocationY><![CDATA[37.000000]]></windowLocationY>
+        <windowScrollOrigin><![CDATA[{1397, 626}]]></windowScrollOrigin>
+        <windowWidth><![CDATA[1682.000000]]></windowWidth>
     </SQLDocumentInfo>
     <AllowsIndexRenamingOnInsert><![CDATA[1]]></AllowsIndexRenamingOnInsert>
     <defaultLabelExpanded><![CDATA[1]]></defaultLabelExpanded>

db/upgrade-jambonz-db.js

@@ -187,10 +187,7 @@ const sql = {
     `,
     'CREATE INDEX google_custom_voice_sid_idx ON google_custom_voices (google_custom_voice_sid)',
     'CREATE INDEX speech_credential_sid_idx ON google_custom_voices (speech_credential_sid)',
-    'ALTER TABLE google_custom_voices ADD FOREIGN KEY speech_credential_sid_idxfk (speech_credential_sid) REFERENCES speech_credentials (speech_credential_sid) ON DELETE CASCADE',
-    'ALTER TABLE clients ADD COLUMN allow_direct_queue_calling BOOLEAN NOT NULL DEFAULT 1',
-    'ALTER TABLE clients ADD COLUMN allow_direct_user_calling BOOLEAN NOT NULL DEFAULT 1',
-    'ALTER TABLE clients ADD COLUMN allow_direct_app_calling BOOLEAN NOT NULL DEFAULT 1'
+    'ALTER TABLE google_custom_voices ADD FOREIGN KEY speech_credential_sid_idxfk (speech_credential_sid) REFERENCES speech_credentials (speech_credential_sid) ON DELETE CASCADE'
   ]
 };
 

lib/helpers/realtimedb-helpers.js

@@ -1,5 +1,29 @@
 const logger = require('../logger');
 
+const JAMBONES_REDIS_SENTINELS = process.env.JAMBONES_REDIS_SENTINELS ? {
+  sentinels: process.env.JAMBONES_REDIS_SENTINELS.split(',').map((sentinel) => {
+    let host, port = 26379;
+    if (sentinel.includes(':')) {
+      const arr = sentinel.split(':');
+      host = arr[0];
+      port = parseInt(arr[1], 10);
+    } else {
+      host = sentinel;
+    }
+    return {host, port};
+  }),
+  name: process.env.JAMBONES_REDIS_SENTINEL_MASTER_NAME,
+  ...(process.env.JAMBONES_REDIS_SENTINEL_PASSWORD && {
+    password: process.env.JAMBONES_REDIS_SENTINEL_PASSWORD
+  }),
+  ...(process.env.JAMBONES_REDIS_SENTINEL_USERNAME && {
+    username: process.env.JAMBONES_REDIS_SENTINEL_USERNAME
+  }),
+  ...(process.env.JAMBONES_REDIS_SENTINEL_SENTINAL_PASSWORD && {
+    sentinelPassword: process.env.JAMBONES_REDIS_SENTINEL_SENTINAL_PASSWORD
+  }),
+} : null;
+
 const {
   client,
   retrieveCall,
@@ -13,7 +37,10 @@ const {
   deleteKey,
   incrKey,
   client: redisClient,
-} = require('@jambonz/realtimedb-helpers')({}, logger);
+} = require('@jambonz/realtimedb-helpers')(JAMBONES_REDIS_SENTINELS || {
+  host: process.env.JAMBONES_REDIS_HOST || 'localhost',
+  port: process.env.JAMBONES_REDIS_PORT || 6379
+}, logger);
 
 module.exports = {
   client,
@@ -27,5 +54,6 @@ module.exports = {
   retrieveKey,
   deleteKey,
   redisClient,
-  incrKey
+  incrKey,
+  JAMBONES_REDIS_SENTINELS
 };

lib/models/client.js

@@ -52,18 +52,6 @@ Client.fields = [
   {
     name: 'password',
     type: 'string'
-  },
-  {
-    name: 'allow_direct_app_calling',
-    type: 'number'
-  },
-  {
-    name: 'allow_direct_queue_calling',
-    type: 'number'
-  },
-  {
-    name: 'allow_direct_user_calling',
-    type: 'number'
   }
 ];
 

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.Key;
+    this.objectKey = opts.objectKey;
     this.uploadId = null;
     this.partNumber = 1;
     this.multipartETags = [];

lib/record/utils.js

@@ -5,7 +5,7 @@ const S3MultipartUploadStream = require('./s3-multipart-upload-stream');
 const getUploader = (key, metadata, bucket_credential, logger) => {
   const uploaderOpts = {
     bucketName: bucket_credential.name,
-    Key: key,
+    objectKey: key,
     metadata
   };
   try {

lib/routes/api/accounts.js

@@ -155,9 +155,6 @@ router.get('/:sid/RegisteredSipUsers', async(req, res) => {
     if (!result || result.length === 0) {
       throw new DbErrorBadRequest(`account not found for sid ${account_sid}`);
     }
-    if (!result[0].sip_realm) {
-      throw new DbErrorBadRequest('account does not have sip_realm configuration');
-    }
     const users = await registrar.getRegisteredUsersForRealm(result[0].sip_realm);
     res.status(200).json(users.map((u) => `${u}@${result[0].sip_realm}`));
   } catch (err) {
@@ -165,44 +162,8 @@ router.get('/:sid/RegisteredSipUsers', async(req, res) => {
   }
 });
 
-router.post('/:sid/RegisteredSipUsers', async(req, res) => {
-  const {logger, registrar} = req.app.locals;
-  const users = req.body;
-  try {
-    const account_sid = parseAccountSid(req);
-    await validateRequest(req, account_sid);
-    const result = await Account.retrieve(account_sid);
-    if (!result || result.length === 0) {
-      throw new DbErrorBadRequest(`account not found for sid ${account_sid}`);
-    }
-    if (!result[0].sip_realm) {
-      throw new DbErrorBadRequest('account does not have sip_realm configuration');
-    }
-    if (!users || !Array.isArray(users) || users.length === 0) {
-      return res.status(200).json(await registrar.getRegisteredUsersDetailsForRealm(result[0].sip_realm));
-    }
-    const ret = [];
-    for (const u of users) {
-      const user = await registrar.query(`${u}@${result[0].sip_realm}`) || {
-        name: u,
-        contact:  null,
-        expiryTime:  0,
-        protocol: null
-      };
-      ret.push({
-        name: u,
-        ...user,
-        registered_status: user.expiryTime > 0 ? 'active' : 'inactive',
-      });
-    }
-    res.status(200).json(ret);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
 router.get('/:sid/RegisteredSipUsers/:client', async(req, res) => {
-  const {logger, registrar, lookupClientByAccountAndUsername} = req.app.locals;
+  const {logger, registrar} = req.app.locals;
   const client = req.params.client;
   try {
     const account_sid = parseAccountSid(req);
@@ -212,15 +173,11 @@ router.get('/:sid/RegisteredSipUsers/:client', async(req, res) => {
       throw new DbErrorBadRequest(`account not found for sid ${account_sid}`);
     }
     const user = await registrar.query(`${client}@${result[0].sip_realm}`);
-    const [clientDb] = await lookupClientByAccountAndUsername(account_sid, client);
     res.status(200).json({
       name: client,
       contact: user ? user.contact : null,
       expiryTime: user ? user.expiryTime : 0,
       protocol: user ? user.protocol : null,
-      allow_direct_app_calling: clientDb ? clientDb.allow_direct_app_calling : 0,
-      allow_direct_queue_calling: clientDb ? clientDb.allow_direct_queue_calling : 0,
-      allow_direct_user_calling: clientDb ? clientDb.allow_direct_user_calling : 0,
       registered_status: user ? 'active' : 'inactive'
     });
   } catch (err) {
@@ -263,9 +220,7 @@ function validateUpdateCall(opts) {
     'conf_mute_status',
     'mute_status',
     'sip_request',
-    'record',
-    'tag',
-    'dtmf'
+    'record'
   ]
     .reduce((acc, prop) => (opts[prop] ? ++acc : acc), 0);
 
@@ -307,15 +262,9 @@ function validateUpdateCall(opts) {
   if (opts.record && !opts.record.action) {
     throw new DbErrorBadRequest('record requires action property');
   }
-  if (opts.dtmf && !opts.dtmf.digit) {
-    throw new DbErrorBadRequest('invalid dtmf');
-  }
   if ('startCallRecording' === opts.record?.action && !opts.record.siprecServerURL) {
     throw new DbErrorBadRequest('record requires siprecServerURL property when starting recording');
   }
-  if (opts.tag && (typeof opts.tag !== 'object' || Array.isArray(opts.tag) || opts.tag === null)) {
-    throw new DbErrorBadRequest('invalid tag data');
-  }
 }
 
 function validateTo(to) {
@@ -1089,5 +1038,4 @@ router.get('/:sid/Queues', async(req, res) => {
   }
 });
 
-
 module.exports = router;

lib/routes/api/lcrs.js

@@ -100,93 +100,6 @@ const preconditions = {
 
 decorate(router, Lcr, ['add', 'update', 'delete'], preconditions);
 
-const validateLcrBatchAdd = async(lcr_sid, body, lookupCarrierBySid) => {
-  for (const lcr_route of body) {
-    lcr_route.lcr_sid = lcr_sid;
-    if (!lcr_route.lcr_carrier_set_entries || lcr_route.lcr_carrier_set_entries.length === 0) {
-      throw new DbErrorBadRequest('Lcr Route batch process require lcr_carrier_set_entries');
-    }
-    for (const entry of lcr_route.lcr_carrier_set_entries) {
-      // check voip_carrier_sid is exist
-      if (!entry.voip_carrier_sid) {
-        throw new DbErrorBadRequest('One of lcr_carrier_set_entries is missing voip_carrier_sid');
-      }
-      const carrier = await lookupCarrierBySid(entry.voip_carrier_sid);
-      if (!carrier) {
-        throw new DbErrorBadRequest('unknown voip_carrier_sid');
-      }
-    }
-  }
-};
-
-
-const addNewLcrRoute = async(lcr_route) => {
-  const lcr_sid = lcr_route.lcr_sid;
-  const lcr_carrier_set_entries = lcr_route.lcr_carrier_set_entries;
-  delete lcr_route.lcr_carrier_set_entries;
-  const lcr_route_sid = await LcrRoutes.make(lcr_route);
-  for (const entry of lcr_carrier_set_entries) {
-    entry.lcr_route_sid = lcr_route_sid;
-    const lcr_carrier_set_entry_sid = await LcrCarrierSetEntry.make(entry);
-    if (lcr_route.priority === 9999) {
-      // this is default lcr set entry
-      const [lcr] = await Lcr.retrieve(lcr_sid);
-      if (lcr) {
-        lcr.default_carrier_set_entry_sid = lcr_carrier_set_entry_sid;
-        delete lcr.lcr_sid;
-        await Lcr.update(lcr_sid, lcr);
-      }
-    }
-  }
-};
-
-router.post('/:sid/Routes', async(req, res) => {
-  const results = await Lcr.retrieve(req.params.sid);
-  if (results.length === 0) return res.sendStatus(404);
-  const {logger, lookupCarrierBySid} = req.app.locals;
-  try {
-    const body = req.body;
-    await validateLcrBatchAdd(req.params.sid, body, lookupCarrierBySid);
-    for (const lcr_route of body) {
-      await addNewLcrRoute(lcr_route, lookupCarrierBySid);
-    }
-    res.sendStatus(204);
-
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.put('/:sid/Routes', async(req, res) => {
-  const results = await Lcr.retrieve(req.params.sid);
-  if (results.length === 0) return res.sendStatus(404);
-  const {logger, lookupCarrierBySid} = req.app.locals;
-  try {
-    const body = req.body;
-    await validateLcrBatchAdd(req.params.sid, body, lookupCarrierBySid);
-    for (const lcr_route of body) {
-      if (lcr_route.lcr_route_sid) {
-        const lcr_route_sid = lcr_route.lcr_route_sid;
-        delete lcr_route.lcr_route_sid;
-        const lcr_carrier_set_entries = lcr_route.lcr_carrier_set_entries;
-        delete lcr_route.lcr_carrier_set_entries;
-        await LcrRoutes.update(lcr_route_sid, lcr_route);
-        for (const entry of lcr_carrier_set_entries) {
-          const lcr_carrier_set_entry_sid = entry.lcr_carrier_set_entry_sid;
-          delete entry.lcr_carrier_set_entry_sid;
-          await LcrCarrierSetEntry.update(lcr_carrier_set_entry_sid, entry);
-        }
-      } else {
-        // Route is not available yet, let create it now
-        await addNewLcrRoute(lcr_route, lookupCarrierBySid);
-      }
-    }
-    res.sendStatus(204);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
 router.get('/', async(req, res) => {
   const logger = req.app.locals.logger;
   try {

lib/routes/api/speech-credentials.js

@@ -3,9 +3,8 @@ const assert = require('assert');
 const Account = require('../../models/account');
 const SpeechCredential = require('../../models/speech-credential');
 const sysError = require('../error');
-const {decrypt, encrypt} = require('../../utils/encrypt-decrypt');
+const {decrypt, encrypt, obscureKey} = require('../../utils/encrypt-decrypt');
 const {parseAccountSid, parseServiceProviderSid, parseSpeechCredentialSid} = require('./utils');
-const {decryptCredential, testWhisper, testDeepgramTTS} = require('../../utils/speech-utils');
 const {DbErrorUnprocessableRequest, DbErrorForbidden} = require('../../utils/errors');
 const {
   testGoogleTts,
@@ -132,8 +131,7 @@ const encryptCredential = (obj) => {
     custom_tts_url,
     auth_token = '',
     cobalt_server_uri,
-    model_id,
-    options
+    model_id
   } = obj;
 
   switch (vendor) {
@@ -211,7 +209,7 @@ const encryptCredential = (obj) => {
     case 'elevenlabs':
       assert(api_key, 'invalid elevenLabs speech credential: api_key is required');
       assert(model_id, 'invalid elevenLabs speech credential: model_id is required');
-      const elevenlabsData = JSON.stringify({api_key, model_id, options});
+      const elevenlabsData = JSON.stringify({api_key, model_id});
       return encrypt(elevenlabsData);
 
     case 'assemblyai':
@@ -219,12 +217,6 @@ const encryptCredential = (obj) => {
       const assemblyaiData = JSON.stringify({api_key});
       return encrypt(assemblyaiData);
 
-    case 'whisper':
-      assert(api_key, 'invalid whisper speech credential: api_key is required');
-      assert(model_id, 'invalid whisper speech credential: model_id is required');
-      const whisperData = JSON.stringify({api_key, model_id});
-      return encrypt(whisperData);
-
     default:
       if (vendor.startsWith('custom:')) {
         const customData = JSON.stringify({auth_token, custom_stt_url, custom_tts_url});
@@ -282,6 +274,79 @@ router.post('/', async(req, res) => {
   }
 });
 
+function decryptCredential(obj, credential, logger) {
+  if ('google' === obj.vendor) {
+    const o = JSON.parse(decrypt(credential));
+    const key_header = '-----BEGIN PRIVATE KEY-----\n';
+    const obscured = {
+      ...o,
+      private_key: `${key_header}${obscureKey(o.private_key.slice(key_header.length, o.private_key.length))}`
+    };
+    obj.service_key = JSON.stringify(obscured);
+  }
+  else if ('aws' === obj.vendor) {
+    const o = JSON.parse(decrypt(credential));
+    obj.access_key_id = o.access_key_id;
+    obj.secret_access_key = obscureKey(o.secret_access_key);
+    obj.aws_region = o.aws_region;
+    logger.info({obj, o}, 'retrieving aws speech credential');
+  }
+  else if ('microsoft' === obj.vendor) {
+    const o = JSON.parse(decrypt(credential));
+    obj.api_key = obscureKey(o.api_key);
+    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) {
+    const o = JSON.parse(decrypt(credential));
+    obj.api_key = obscureKey(o.api_key);
+  }
+  else if ('nuance' === obj.vendor) {
+    const o = JSON.parse(decrypt(credential));
+    obj.client_id = o.client_id;
+    obj.secret = o.secret ? obscureKey(o.secret) : null;
+  }
+  else if ('deepgram' === obj.vendor) {
+    const o = JSON.parse(decrypt(credential));
+    obj.api_key = obscureKey(o.api_key);
+  }
+  else if ('ibm' === obj.vendor) {
+    const o = JSON.parse(decrypt(credential));
+    obj.tts_api_key = obscureKey(o.tts_api_key);
+    obj.tts_region = o.tts_region;
+    obj.stt_api_key = obscureKey(o.stt_api_key);
+    obj.stt_region = o.stt_region;
+    obj.instance_id = o.instance_id;
+  } else if ('nvidia' === obj.vendor) {
+    const o = JSON.parse(decrypt(credential));
+    obj.riva_server_uri = o.riva_server_uri;
+  } else if ('cobalt' === obj.vendor) {
+    const o = JSON.parse(decrypt(credential));
+    obj.cobalt_server_uri = o.cobalt_server_uri;
+  } else if ('soniox' === obj.vendor) {
+    const o = JSON.parse(decrypt(credential));
+    obj.api_key = obscureKey(o.api_key);
+  } else if ('elevenlabs' === obj.vendor) {
+    const o = JSON.parse(decrypt(credential));
+    obj.api_key = obscureKey(o.api_key);
+    obj.model_id = o.model_id;
+  } else if (obj.vendor.startsWith('custom:')) {
+    const o = JSON.parse(decrypt(credential));
+    obj.auth_token = obscureKey(o.auth_token);
+    obj.custom_stt_url = o.custom_stt_url;
+    obj.custom_tts_url = o.custom_tts_url;
+  } else if ('assemblyai' === obj.vendor) {
+    const o = JSON.parse(decrypt(credential));
+    obj.api_key = obscureKey(o.api_key);
+  }
+}
+
 /**
  * retrieve all speech credentials for an account
  */
@@ -412,8 +477,6 @@ router.put('/:sid', async(req, res) => {
           custom_stt_url,
           custom_tts_url,
           cobalt_server_uri,
-          model_id,
-          options
         } = req.body;
 
         const newCred = {
@@ -434,9 +497,7 @@ router.put('/:sid', async(req, res) => {
           nuance_tts_uri,
           custom_stt_url,
           custom_tts_url,
-          cobalt_server_uri,
-          model_id,
-          options
+          cobalt_server_uri
         };
         logger.info({o, newCred}, 'updating speech credential with this new credential');
         obj.credential = encryptCredential(newCred);
@@ -465,7 +526,7 @@ router.put('/:sid', async(req, res) => {
  * Test a credential
  */
 router.get('/:sid/test', async(req, res) => {
-  const {logger, synthAudio} = req.app.locals;
+  const logger = req.app.locals.logger;
   try {
     const sid = parseSpeechCredentialSid(req);
     const creds = await SpeechCredential.retrieve(sid);
@@ -556,7 +617,7 @@ router.get('/:sid/test', async(req, res) => {
       } = credential;
       if (cred.use_for_tts) {
         try {
-          await testMicrosoftTts(logger, synthAudio, {
+          await testMicrosoftTts(logger, {
             api_key,
             region,
             use_custom_tts,
@@ -637,16 +698,6 @@ router.get('/:sid/test', async(req, res) => {
     }
     else if (cred.vendor === 'deepgram') {
       const {api_key} = credential;
-      if (cred.use_for_tts) {
-        try {
-          await testDeepgramTTS(logger, synthAudio, credential);
-          results.tts.status = 'ok';
-          SpeechCredential.ttsTestResult(sid, true);
-        } catch (err) {
-          results.tts = {status: 'fail', reason: err.message};
-          SpeechCredential.ttsTestResult(sid, false);
-        }
-      }
       if (cred.use_for_stt) {
         try {
           await testDeepgramStt(logger, {api_key});
@@ -727,17 +778,6 @@ router.get('/:sid/test', async(req, res) => {
           SpeechCredential.sttTestResult(sid, false);
         }
       }
-    } else if (cred.vendor === 'whisper') {
-      if (cred.use_for_tts) {
-        try {
-          await testWhisper(logger, synthAudio, credential);
-          results.tts.status = 'ok';
-          SpeechCredential.ttsTestResult(sid, true);
-        } catch (err) {
-          results.tts = {status: 'fail', reason: err.message};
-          SpeechCredential.ttsTestResult(sid, false);
-        }
-      }
     }
 
     res.status(200).json(results);

lib/routes/api/tts-cache.js

@@ -2,13 +2,6 @@ const router = require('express').Router();
 const {
   parseAccountSid
 } = require('./utils');
-const SpeechCredential = require('../../models/speech-credential');
-const fs = require('fs');
-const { v4: uuidv4 } = require('uuid');
-const {DbErrorBadRequest} = require('../../utils/errors');
-const Account = require('../../models/account');
-const sysError = require('../error');
-const { getSpeechCredential, decryptCredential } = require('../../utils/speech-utils');
 
 router.delete('/', async(req, res) => {
   const {purgeTtsCache} = req.app.locals;
@@ -33,79 +26,4 @@ router.get('/', async(req, res) => {
   res.status(200).json({size});
 });
 
-router.post('/Synthesize', async(req, res) => {
-  const {logger, synthAudio} = req.app.locals;
-  try {
-    const accountSid = parseAccountSid(req);
-    const body = req.body;
-    if (!body.speech_credential_sid || !body.text || !body.language || !body.voice) {
-      throw new DbErrorBadRequest('speech_credential_sid, text, language, voice are all required');
-    }
-
-    const result = await Account.retrieve(accountSid);
-    if (!result || result.length === 0 || !result[0].is_active) {
-      throw new DbErrorBadRequest(`Account not found for sid ${accountSid}`);
-    }
-    const credentials = await SpeechCredential.retrieve(body.speech_credential_sid);
-    if (!credentials || credentials.length === 0) {
-      throw new
-      DbErrorBadRequest(`There is no available speech credential for ${body.speech_credential_sid}`);
-    }
-    const {credential, ...obj} = credentials[0];
-
-    decryptCredential(obj, credential, logger, false);
-    const cred = getSpeechCredential(obj, logger);
-
-    const { text, language, engine = 'standard' } = body;
-    const salt = uuidv4();
-    /* parse Nuance voices into name and model */
-    let voice = body.voice;
-    let model;
-    if (cred.vendor === 'nuance' && voice) {
-      const arr = /([A-Za-z-]*)\s+-\s+(enhanced|standard)/.exec(voice);
-      if (arr) {
-        voice = arr[1];
-        model = arr[2];
-      }
-    }
-    const stats = {
-      histogram: () => {},
-      increment: () => {},
-    };
-    const { filePath } = await synthAudio(stats, {
-      account_sid: accountSid,
-      text,
-      vendor: cred.vendor,
-      language,
-      voice,
-      engine,
-      model,
-      salt,
-      credentials: cred,
-      disableTtsCache: false
-    });
-
-    const stat = fs.statSync(filePath);
-    res.writeHead(200, {
-      'Content-Type': 'audio/mpeg',
-      'Content-Length': stat.size,
-    });
-
-    const readStream = fs.createReadStream(filePath);
-    // We replaced all the event handlers with a simple call to readStream.pipe()
-    readStream.pipe(res);
-
-    readStream.on('end', () => {
-      // Delete the file after it's been read
-      fs.unlink(filePath, (err) => {
-        if (err) throw err;
-        logger.info(`${filePath} was deleted`);
-      });
-    });
-
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
 module.exports = router;

lib/swagger/swagger.yaml

@@ -1,7 +1,7 @@
 openapi: 3.0.0
 info:
-  title: Jambonz REST API
-  description: Jambonz REST API specification
+  title: jambonz REST API
+  description: jambonz REST API
   contact:
     email: daveh@drachtio.org
   license:
@@ -3799,7 +3799,7 @@ paths:
   /Accounts/{AccountSid}/Calls:
     post:
       tags:
-      - Accounts
+       - Accounts
       summary: create a call
       operationId: createCall
       parameters:
@@ -3858,10 +3858,6 @@ paths:
                   type: object
                   description: The customer SIP headers to associate with the call
                   example: {"X-Custom-Header": "Hello"}
-                sipRequestWithinDialogHook:
-                  type: string
-                  description: The sip indialog hook to receive session messages
-                  example: '/customHook'
       responses:
         201:
           description: call successfully created
@@ -4192,27 +4188,6 @@ paths:
                 type: array
                 items:
                   type: string
-    post:
-      tags:
-        - Accounts
-      summary: retrieve online sip users for an account by list of sip username
-      operationId: listRegisteredSipUsers
-      requestBody:
-        content:
-          application/json:
-            schema:
-              type: array
-              items:
-                type: string
-      responses:
-        200:
-          description: retrieve online sip users for an account
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/RegisteredClient'
   /Accounts/{AccountSid}/RegisteredSipUsers/{Client}:
     parameters:
       - name: Client
@@ -4234,65 +4209,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/RegisteredClient'
-  /Accounts/{AccountSid}/TtsCache/Synthesize:
-    post:
-      tags:
-        - Accounts
-      summary: get TTS from provider
-      operationId: Synthesize
-      requestBody:
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                speech_credential_sid:
-                  type: string
-                  description: Speech credential Sid
-                  example: 553b4b6b-8918-4394-a46d-1e3c5a3c717b
-                text:
-                  type: string
-                  description: the text to convert to audio
-                  example: Hello How are you
-                language:
-                  type: string
-                  description: language is used in text
-                  example: en-US
-                voice:
-                  type: string
-                  description: voice ID
-                  example: en-US-Standard-C
-              required:
-                - speech_credential_sid
-                - text
-                - language
-                - voice
-      responses:
-        200:
-          description: Audio is created
-          content:
-            audio/mpeg:
-              schema:
-                type: string
-                format: binary
-        400:
-          description: bad request
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/GeneralError'
-        422:
-          description: unprocessable entity
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/GeneralError'
-        500:
-          description: system error
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/GeneralError'
   /Lcrs:
     post:
       tags:
@@ -4440,69 +4356,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/GeneralError'
-  /Lcrs/{LcrSid}/Routes:
-    parameters:
-      - name: LcrSid
-        in: path
-        required: true
-        style: simple
-        explode: false
-        schema:
-          type: string
-    post:
-      tags:
-        - Lcrs
-      summary: Create least cost routing routes and carrier set entries
-      operationId: createLeastCostRoutingRoutesAndCarrierEntries
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/LcrRoutes'
-      responses:
-        204:
-          description: least cost routing routes and carrier set entries created
-        400:
-          description: bad request
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/GeneralError'
-        404:
-          description: least cost routing not found
-        500:
-          description: system error
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/GeneralError'
-    put:
-      tags:
-        - Lcrs
-      summary: update least cost routing routes and carrier set entries
-      operationId: updateLeastCostRoutingRoutesAndCarrierEntries
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/LcrRoutes'
-      responses:
-        204:
-          description: least cost routing ruoutes and carrier entries updated
-        400:
-          description: bad request
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/GeneralError'
-        404:
-          description: least cost routing not found
-        500:
-          description: system error
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/GeneralError'
   /LcrRoutes:
     post:
       tags:
@@ -5920,19 +5773,6 @@ components:
       - lcr_route_sid
       - voip_carrier_sid
       - priority
-    LcrRouteAndCarrierEntries:
-      allOf:
-        - $ref: '#/components/schemas/LcrRoute'
-        - type: object
-          properties:
-            lcr_carrier_set_entries:
-              type: array
-              items:
-                $ref: '#/components/schemas/LcrCarrierSetEntry'
-    LcrRoutes:
-      type: array
-      items:
-        $ref: '#/components/schemas/LcrRouteAndCarrierEntries'
     GoogleCustomVoice:
       type: object
       properties:
@@ -5968,15 +5808,6 @@ components:
         protocol:
           type: string
           example: wss
-        allow_direct_app_calling:
-          type: number
-          example: 1
-        allow_direct_queue_calling:
-          type: number
-          example: 1
-        allow_direct_user_calling:
-          type: number
-          example: 1
         registered_status:
           type: string
           enum:

lib/utils/speech-utils.js

@@ -6,7 +6,6 @@ const { SpeechClient } = require('@soniox/soniox-node');
 const bent = require('bent');
 const fs = require('fs');
 const { AssemblyAI } = require('assemblyai');
-const {decrypt, obscureKey} = require('./encrypt-decrypt');
 
 
 const testSonioxStt = async(logger, credentials) => {
@@ -95,13 +94,6 @@ const testMicrosoftStt = async(logger, credentials) => {
   const speechConfig = sdk.SpeechConfig.fromSubscription(api_key, region);
   const audioConfig = sdk.AudioConfig.fromWavFileInput(fs.readFileSync(`${__dirname}/../../data/test_audio.wav`));
   speechConfig.speechRecognitionLanguage = 'en-US';
-
-  if (process.env.JAMBONES_HTTP_PROXY_IP && process.env.JAMBONES_HTTP_PROXY_PORT) {
-    logger.debug(
-      `testMicrosoftStt: using proxy ${process.env.JAMBONES_HTTP_PROXY_IP}:${process.env.JAMBONES_HTTP_PROXY_PORT}`);
-    speechConfig.setProxy(process.env.JAMBONES_HTTP_PROXY_IP, process.env.JAMBONES_HTTP_PROXY_PORT);
-  }
-
   const speechRecognizer = new sdk.SpeechRecognizer(speechConfig, audioConfig);
 
   return new Promise((resolve, reject) => {
@@ -157,19 +149,38 @@ const testAwsStt = async(logger, credentials) => {
   }
 };
 
-const testMicrosoftTts = async(logger, synthAudio, credentials) => {
+const testMicrosoftTts = async(logger, credentials) => {
+  const {
+    api_key,
+    region,
+    // eslint-disable-next-line no-unused-vars
+    use_custom_tts,
+    // eslint-disable-next-line no-unused-vars
+    custom_tts_endpoint,
+    // eslint-disable-next-line no-unused-vars
+    use_custom_stt,
+    // eslint-disable-next-line no-unused-vars
+    custom_stt_endpoint
+  } = credentials;
+
+  logger.info({
+    api_key,
+    region,
+    use_custom_tts,
+    custom_tts_endpoint,
+    use_custom_stt,
+    custom_stt_endpoint
+  }, 'testing microsoft tts');
+  if (!api_key) throw new Error('testMicrosoftTts: credentials are missing api_key');
+  if (!region) throw new Error('testMicrosoftTts: credentials are missing region');
   try {
-    await synthAudio({increment: () => {}, histogram: () => {}},
-      {
-        vendor: 'microsoft',
-        credentials,
-        language: 'en-US',
-        voice: 'en-US-JennyMultilingualNeural',
-        text: 'Hi there and welcome to jambones!'
-      }
-    );
+    const getJSON = bent('json', {
+      'Ocp-Apim-Subscription-Key': api_key
+    });
+    const response = await getJSON(`https://${region}.tts.speech.microsoft.com/cognitiveservices/voices/list`);
+    return response;
   } catch (err) {
-    logger.info({err}, 'testMicrosoftTts returned error');
+    logger.info({err}, `testMicrosoftTts - failed to list voices for region ${region}`);
     throw err;
   }
 };
@@ -216,41 +227,6 @@ const testElevenlabs = async(logger, credentials) => {
   }
 };
 
-const testWhisper = async(logger, synthAudio, credentials) => {
-  try {
-    await synthAudio({increment: () => {}, histogram: () => {}},
-      {
-        vendor: 'whisper',
-        credentials,
-        language: 'en-US',
-        voice: 'alloy',
-        text: 'Hi there and welcome to jambones!'
-      }
-    );
-  } catch (err) {
-    logger.info({err}, 'synthEvenlabs returned error');
-    throw err;
-  }
-};
-
-const testDeepgramTTS = async(logger, synthAudio, credentials) => {
-  try {
-    await synthAudio({increment: () => {}, histogram: () => {}},
-      {
-        vendor: 'deepgram',
-        credentials,
-        language: 'en-US',
-        voice: 'alpha-aurora-en-v2',
-        model: 'alpha-aurora-en-v2',
-        text: 'Hi there and welcome to jambones!'
-      }
-    );
-  } catch (err) {
-    logger.info({err}, 'testDeepgramTTS returned error');
-    throw err;
-  }
-};
-
 const testIbmTts = async(logger, getTtsVoices, credentials) => {
   const {tts_api_key, tts_region} = credentials;
   const voices = await getTtsVoices({vendor: 'ibm', credentials: {tts_api_key, tts_region}});
@@ -311,114 +287,6 @@ const testAssemblyStt = async(logger, credentials) => {
   });
 };
 
-const getSpeechCredential = (credential, logger) => {
-  const {vendor} = credential;
-  logger.info(
-    `Speech vendor: ${credential.vendor} ${credential.label ? `, label: ${credential.label}` : ''} selected`);
-  if ('google' === vendor) {
-    try {
-      const cred = JSON.parse(credential.service_key.replace(/\n/g, '\\n'));
-      return {
-        ...credential,
-        credentials: cred
-      };
-    } catch (err) {
-      logger.info({err}, `malformed google service_key provisioned for account ${credential.speech_credential_sid}`);
-    }
-  }
-  else if (['aws', 'polly'].includes(vendor)) {
-    return {
-      ...credential,
-      accessKeyId: credential.access_key_id,
-      secretAccessKey: credential.secret_access_key,
-      region: credential.aws_region || 'us-east-1'
-    };
-  }
-  return credential;
-};
-
-function decryptCredential(obj, credential, logger, isObscureKey = true) {
-  if ('google' === obj.vendor) {
-    const o = JSON.parse(decrypt(credential));
-    const key_header = '-----BEGIN PRIVATE KEY-----\n';
-    const obscured = {
-      ...o,
-      private_key: `${key_header}${isObscureKey ?
-        obscureKey(o.private_key.slice(key_header.length, o.private_key.length)) :
-        o.private_key.slice(key_header.length, o.private_key.length)}`
-    };
-    obj.service_key = JSON.stringify(obscured);
-  }
-  else if ('aws' === obj.vendor) {
-    const o = JSON.parse(decrypt(credential));
-    obj.access_key_id = o.access_key_id;
-    obj.secret_access_key = isObscureKey ? obscureKey(o.secret_access_key) : o.secret_access_key;
-    obj.aws_region = o.aws_region;
-    logger.info({obj, o}, 'retrieving aws speech credential');
-  }
-  else if ('microsoft' === obj.vendor) {
-    const o = JSON.parse(decrypt(credential));
-    obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
-    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) {
-    const o = JSON.parse(decrypt(credential));
-    obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
-  }
-  else if ('nuance' === obj.vendor) {
-    const o = JSON.parse(decrypt(credential));
-    obj.client_id = o.client_id;
-    obj.secret = o.secret ? (isObscureKey ? obscureKey(o.secret) : o.secret) : null;
-    obj.nuance_tts_uri = o.nuance_tts_uri;
-    obj.nuance_stt_uri = o.nuance_stt_uri;
-  }
-  else if ('deepgram' === obj.vendor) {
-    const o = JSON.parse(decrypt(credential));
-    obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
-  }
-  else if ('ibm' === obj.vendor) {
-    const o = JSON.parse(decrypt(credential));
-    obj.tts_api_key = isObscureKey ? obscureKey(o.tts_api_key) : o.tts_api_key;
-    obj.tts_region = o.tts_region;
-    obj.stt_api_key = isObscureKey ? obscureKey(o.stt_api_key) : o.stt_api_key;
-    obj.stt_region = o.stt_region;
-    obj.instance_id = o.instance_id;
-  } else if ('nvidia' === obj.vendor) {
-    const o = JSON.parse(decrypt(credential));
-    obj.riva_server_uri = o.riva_server_uri;
-  } else if ('cobalt' === obj.vendor) {
-    const o = JSON.parse(decrypt(credential));
-    obj.cobalt_server_uri = o.cobalt_server_uri;
-  } else if ('soniox' === obj.vendor) {
-    const o = JSON.parse(decrypt(credential));
-    obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
-  } else if ('elevenlabs' === obj.vendor) {
-    const o = JSON.parse(decrypt(credential));
-    obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
-    obj.model_id = o.model_id;
-    obj.options = o.options;
-  } else if (obj.vendor.startsWith('custom:')) {
-    const o = JSON.parse(decrypt(credential));
-    obj.auth_token = isObscureKey ? obscureKey(o.auth_token) : o.auth_token;
-    obj.custom_stt_url = o.custom_stt_url;
-    obj.custom_tts_url = o.custom_tts_url;
-  } else if ('assemblyai' === obj.vendor) {
-    const o = JSON.parse(decrypt(credential));
-    obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
-  } else if ('whisper' === obj.vendor) {
-    const o = JSON.parse(decrypt(credential));
-    obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
-    obj.model_id = o.model_id;
-  }
-}
-
 module.exports = {
   testGoogleTts,
   testGoogleStt,
@@ -435,9 +303,5 @@ module.exports = {
   testIbmStt,
   testSonioxStt,
   testElevenlabs,
-  testAssemblyStt,
-  testDeepgramTTS,
-  getSpeechCredential,
-  decryptCredential,
-  testWhisper
+  testAssemblyStt
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jambonz-api-server",
-  "version": "0.8.5",
+  "version": "0.8.4",
   "description": "",
   "main": "app.js",
   "scripts": {
@@ -25,13 +25,13 @@
     "@deepgram/sdk": "^1.21.0",
     "@google-cloud/speech": "^5.2.0",
     "@google-cloud/storage": "^6.12.0",
-    "@jambonz/db-helpers": "^0.9.1",
+    "@jambonz/db-helpers": "^0.9.0",
     "@jambonz/lamejs": "^1.2.2",
-    "@jambonz/mw-registrar": "^0.2.7",
+    "@jambonz/mw-registrar": "^0.2.5",
     "@jambonz/realtimedb-helpers": "^0.8.7",
-    "@jambonz/speech-utils": "^0.0.33",
+    "@jambonz/speech-utils": "^0.0.15",
     "@jambonz/time-series": "^0.2.8",
-    "@jambonz/verb-specifications": "^0.0.45",
+    "@jambonz/verb-specifications": "^0.0.29",
     "@soniox/soniox-node": "^1.1.1",
     "argon2": "^0.30.3",
     "assemblyai": "^3.0.1",
@@ -45,7 +45,7 @@
     "ibm-watson": "^7.1.2",
     "jsonwebtoken": "^9.0.0",
     "mailgun.js": "^9.1.2",
-    "microsoft-cognitiveservices-speech-sdk": "1.31.0",
+    "microsoft-cognitiveservices-speech-sdk": "^1.24.1",
     "mysql2": "^2.3.3",
     "nocache": "3.0.4",
     "passport": "^0.6.0",

test/clients.js

@@ -56,10 +56,7 @@ test('client test', async(t) => {
         account_sid,
         username: 'client1',
         password: 'sdf12412',
-        is_active: 1,
-        allow_direct_app_calling: 0,
-        allow_direct_queue_calling: 1,
-        allow_direct_user_calling: 1,
+        is_active: 1
       }
     });
     t.ok(result.statusCode === 201, 'successfully created Client');
@@ -85,24 +82,6 @@ test('client test', async(t) => {
     t.ok(result.length === 1 && result[0] === 'dhorton@drachtio.org', 
       'successfully queried all registered clients');
 
-    result = await request.post(`/Accounts/${account_sid}/RegisteredSipUsers`, {
-      resolveWithFullResponse: true,
-      auth: authAdmin,
-      json: true,
-      body: ['dhorton']
-    });
-    t.ok(result.body.length === 1 && result.body[0].name === 'dhorton', 
-      'successfully queried all registered clients');
-
-      result = await request.post(`/Accounts/${account_sid}/RegisteredSipUsers`, {
-        resolveWithFullResponse: true,
-        auth: authAdmin,
-        json: true,
-        body: []
-      });
-      t.ok(result.body.length === 1 && result.body[0].name === 'dhorton', 
-        'successfully queried all registered clients');
-
     /* query all entity */
     result = await request.get('/Clients', {
       auth: authAdmin,
@@ -120,7 +99,6 @@ test('client test', async(t) => {
     t.ok(result.username ===  'client1', 'successfully retrieved Client by sid');
     t.ok(result.is_active === 1 , 'successfully retrieved Client by sid');
     t.ok(result.password === 'sXXXXXXX' , 'successfully retrieved Client by sid');
-    t.ok(result.allow_direct_app_calling === 0 , 'successfully retrieved Client by sid');
 
     /* update the entity */
     result = await request.put(`/Clients/${sid}`, {