swagger updated for call records

.github/workflows/ci.yml

@@ -7,22 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install Docker Compose
-        run: |
-          sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-          sudo chmod +x /usr/local/bin/docker-compose
-          docker-compose --version
       - uses: actions/setup-node@v3
         with:
           node-version: lts/*
       - run: npm install
       - run: npm run jslint
-      - name: Install Docker Compose
-        run: |
-          sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-          sudo chmod +x /usr/local/bin/docker-compose
-          docker-compose --version
       - run: npm test
-      - run: npm run test:encrypt-decrypt
 
  

app.js

@@ -7,7 +7,6 @@ const nocache = require('nocache');
 const rateLimit = require('express-rate-limit');
 const cors = require('cors');
 const passport = require('passport');
-const {verifyViewOnlyUser} = require('./lib/middleware');
 const routes = require('./lib/routes');
 const Registrar = require('@jambonz/mw-registrar');
 
@@ -173,19 +172,6 @@ app.use('/v1', unless(
     '/InviteCodes',
     '/PredefinedCarriers'
   ], passport.authenticate('bearer', {session: false})));
-app.use('/v1', unless(
-  [
-    '/register',
-    '/forgot-password',
-    '/signin',
-    '/login',
-    '/messaging',
-    '/outboundSMS',
-    '/AccountTest',
-    '/InviteCodes',
-    '/PredefinedCarriers',
-    '/logout'
-  ], verifyViewOnlyUser));
 app.use('/', routes);
 app.use((err, req, res, next) => {
   logger.error(err, 'burped error');
@@ -236,7 +222,7 @@ server.on('upgrade', (request, socket, head) => {
 
   /* complete the upgrade */
   wsServer.handleUpgrade(request, socket, head, (ws) => {
-    logger.debug(`upgraded to websocket, url: ${request.url}`);
+    logger.info(`upgraded to websocket, url: ${request.url}`);
     wsServer.emit('connection', ws, request.url);
   });
 });

db/export_jambonz.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-# This script exports the 'jambones' database (schema and data)
-# from the source MySQL server into a file.
-
-# Configuration variables
-SOURCE_HOST=
-DB_USER=
-DB_PASS=
-DB_NAME=
-EXPORT_FILE="jambones_export.sql"
-
-# Export the database using mysqldump
-echo "Exporting database '$DB_NAME' from $SOURCE_HOST..."
-mysqldump -h "$SOURCE_HOST" -u "$DB_USER" -p"$DB_PASS" "$DB_NAME" > "$EXPORT_FILE"
-
-# Check for errors
-if [ $? -eq 0 ]; then
-    echo "Database export successful. Export file created: $EXPORT_FILE"
-else
-    echo "Error exporting database '$DB_NAME'."
-    exit 1
-fi

db/import_jambonz.sh

@@ -1,31 +0,0 @@
-#!/bin/bash
-# This script imports the SQL dump file into the target MySQL server.
-# It first drops the existing 'jambones' database (if it exists),
-# recreates it, and then imports the dump file.
-
-# Configuration variables
-TARGET_HOST=
-DB_USER=
-DB_PASS=
-DB_NAME=
-IMPORT_FILE="jambones_export.sql"
-
-# Drop the existing database (if any) and create a new one
-echo "Dropping and recreating database '$DB_NAME' on $TARGET_HOST..."
-mysql -h "$TARGET_HOST" -u "$DB_USER" -p"$DB_PASS" -e "DROP DATABASE IF EXISTS \`$DB_NAME\`; CREATE DATABASE \`$DB_NAME\`;"
-
-if [ $? -ne 0 ]; then
-    echo "Error dropping/creating database '$DB_NAME'."
-    exit 1
-fi
-
-# Import the SQL dump into the newly created database
-echo "Importing dump file '$IMPORT_FILE' into database '$DB_NAME'..."
-mysql -h "$TARGET_HOST" -u "$DB_USER" -p"$DB_PASS" "$DB_NAME" < "$IMPORT_FILE"
-
-if [ $? -eq 0 ]; then
-    echo "Database import successful."
-else
-    echo "Error importing the database."
-    exit 1
-fi

db/jambones-sql.sql

@@ -351,8 +351,6 @@ speech_credential_sid CHAR(36) NOT NULL,
 model VARCHAR(512) NOT NULL,
 reported_usage ENUM('REPORTED_USAGE_UNSPECIFIED','REALTIME','OFFLINE') DEFAULT 'REALTIME',
 name VARCHAR(64) NOT NULL,
-voice_cloning_key MEDIUMTEXT,
-use_voice_cloning_key BOOLEAN DEFAULT false,
 PRIMARY KEY (google_custom_voice_sid)
 );
 
@@ -360,9 +358,7 @@ CREATE TABLE system_information
 (
 domain_name VARCHAR(255),
 sip_domain_name VARCHAR(255),
-monitoring_domain_name VARCHAR(255),
-private_network_cidr VARCHAR(8192),
-log_level ENUM('info', 'debug') NOT NULL DEFAULT 'info'
+monitoring_domain_name VARCHAR(255)
 );
 
 CREATE TABLE users
@@ -416,8 +412,6 @@ register_from_user VARCHAR(128),
 register_from_domain VARCHAR(255),
 register_public_ip_in_contact BOOLEAN NOT NULL DEFAULT false,
 register_status VARCHAR(4096),
-dtmf_type ENUM('rfc2833','tones','info') NOT NULL DEFAULT 'rfc2833',
-outbound_sip_proxy VARCHAR(255),
 PRIMARY KEY (voip_carrier_sid)
 ) COMMENT='A Carrier or customer PBX that can send or receive calls';
 
@@ -558,7 +552,6 @@ siprec_hook_sid CHAR(36),
 record_all_calls BOOLEAN NOT NULL DEFAULT false,
 record_format VARCHAR(16) NOT NULL DEFAULT 'mp3',
 bucket_credential VARCHAR(8192) COMMENT 'credential used to authenticate with storage service',
-enable_debug_log BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (account_sid)
 ) COMMENT='An enterprise that uses the platform for comm services';
 

db/prepare-permissions-test.sql

@@ -1,11 +0,0 @@
-/* remove VIEW_ONLY permission for admin user as it will prevent write operations*/
-delete from user_permissions;
-
-delete from permissions;
-
-insert into permissions (permission_sid, name, description)
-values 
-('ffbc342a-546a-11ed-bdc3-0242ac120002', 'VIEW_ONLY', 'Can view data but not make changes'),
-('ffbc3a10-546a-11ed-bdc3-0242ac120002', 'PROVISION_SERVICES', 'Can provision services'),
-('ffbc3c5e-546a-11ed-bdc3-0242ac120002', 'PROVISION_USERS', 'Can provision users');
-

db/upgrade-jambonz-db.js

@@ -6,7 +6,6 @@ const {readFile} = require('fs/promises');
 const {execSync} = require('child_process');
 const {version:desiredVersion} = require('../package.json');
 const logger = require('pino')();
-const fs = require('fs');
 
 logger.info(`upgrade-jambonz-db: desired version ${desiredVersion}`);
 
@@ -23,20 +22,6 @@ const opts = {
   port: process.env.JAMBONES_MYSQL_PORT || 3306,
   multipleStatements: true
 };
-const rejectUnauthorized = process.env.JAMBONES_MYSQL_REJECT_UNAUTHORIZED;
-const ssl_ca_file = process.env.JAMBONES_MYSQL_SSL_CA_FILE;
-const ssl_cert_file = process.env.JAMBONES_MYSQL_SSL_CERT_FILE;
-const ssl_key_file = process.env.JAMBONES_MYSQL_SSL_KEY_FILE;
-const sslFilesProvided = Boolean(ssl_ca_file && ssl_cert_file && ssl_key_file);
-if (rejectUnauthorized !== undefined || sslFilesProvided) {
-  opts.ssl = {
-    ...(rejectUnauthorized !== undefined && { rejectUnauthorized: rejectUnauthorized === '0' ? false : true }),
-    ...(ssl_ca_file && { ca: fs.readFileSync(ssl_ca_file) }),
-    ...(ssl_cert_file && { cert: fs.readFileSync(ssl_cert_file) }),
-    ...(ssl_key_file && { key: fs.readFileSync(ssl_key_file) })
-  };
-}
-
 
 const sql = {
   '7006': [
@@ -212,19 +197,6 @@ const sql = {
     'ALTER TABLE applications MODIFY COLUMN speech_synthesis_voice VARCHAR(256)',
     'ALTER TABLE applications MODIFY COLUMN fallback_speech_synthesis_voice VARCHAR(256)',
     'ALTER TABLE sip_gateways ADD COLUMN use_sips_scheme BOOLEAN NOT NULL DEFAULT 0',
-  ],
-  9002: [
-    'ALTER TABLE system_information ADD COLUMN private_network_cidr VARCHAR(8192)',
-    'ALTER TABLE system_information ADD COLUMN log_level ENUM(\'info\', \'debug\') NOT NULL DEFAULT \'info\'',
-    'ALTER TABLE accounts ADD COLUMN enable_debug_log BOOLEAN NOT NULL DEFAULT false',
-    'ALTER TABLE google_custom_voices ADD COLUMN use_voice_cloning_key BOOLEAN DEFAULT false',
-    'ALTER TABLE google_custom_voices ADD COLUMN voice_cloning_key MEDIUMTEXT',
-  ],
-  9003: [
-    'ALTER TABLE google_custom_voices ADD COLUMN voice_cloning_key MEDIUMTEXT',
-    'ALTER TABLE google_custom_voices ADD COLUMN use_voice_cloning_key BOOLEAN DEFAULT false',
-    'ALTER TABLE voip_carriers ADD COLUMN dtmf_type ENUM(\'rfc2833\',\'tones\',\'info\') NOT NULL DEFAULT \'rfc2833\'',
-    'ALTER TABLE voip_carriers ADD COLUMN outbound_sip_proxy VARCHAR(255)',
   ]
 };
 
@@ -258,8 +230,6 @@ const doIt = async() => {
         if (val < 8004) upgrades.push(...sql['8004']);
         if (val < 8005) upgrades.push(...sql['8005']);
         if (val < 9000) upgrades.push(...sql['9000']);
-        if (val < 9002) upgrades.push(...sql['9002']);
-        if (val < 9003) upgrades.push(...sql['9003']);
 
         // perform all upgrades
         logger.info({upgrades}, 'applying schema upgrades..');

lib/auth/index.js

@@ -35,8 +35,8 @@ function makeStrategy(logger) {
             debug(err);
             logger.info({err}, 'Error checking redis for jwt');
           }
-          const { user_sid, service_provider_sid, account_sid, email,
-            name, scope, permissions, is_view_only } = decoded;
+          const { user_sid, service_provider_sid, account_sid, email, name, scope, permissions } = decoded;
+
           const user = {
             service_provider_sid,
             account_sid,
@@ -45,7 +45,6 @@ function makeStrategy(logger) {
             email,
             name,
             permissions,
-            is_view_only,
             hasScope: (s) => s === scope,
             hasAdminAuth: scope === 'admin',
             hasServiceProviderAuth: scope === 'service_provider',

lib/middleware.js

@@ -1,5 +1,4 @@
 const logger = require('./logger');
-const {UserPermissionError} = require('./utils/errors');
 
 function delayLoginMiddleware(req, res, next) {
   if (req.path.includes('/login') || req.path.includes('/signin')) {
@@ -28,26 +27,6 @@ function delayLoginMiddleware(req, res, next) {
   next();
 }
 
-function verifyViewOnlyUser(req, res, next) {
-  // Skip check for GET requests
-  if (req.method === 'GET') {
-    return next();
-  }
-  // current user is changing their password which shuould be allowed
-  if (req.body?.old_password && req.body?.new_password) {
-    return next();
-  }
-  // Check if user is read-only
-  if (req.user && !!req.user.is_view_only) {
-    const upError = new UserPermissionError('User has view-only access');
-    upError.status = 403;
-    throw upError;
-  }
-
-  next();
-}
-
 module.exports = {
-  delayLoginMiddleware,
-  verifyViewOnlyUser
+  delayLoginMiddleware
 };

lib/models/account.js

@@ -56,13 +56,9 @@ AND effective_end_date IS NULL
 AND pending = 0`;
 
 const extractBucketCredential = (obj) => {
-  try {
-    const {bucket_credential} = obj;
-    if (bucket_credential) {
-      obj.bucket_credential = JSON.parse(decrypt(bucket_credential));
-    }
-  } catch (error) {
-    console.error('Error while decrypting data', error);
+  const {bucket_credential} = obj;
+  if (bucket_credential) {
+    obj.bucket_credential = JSON.parse(decrypt(bucket_credential));
   }
 };
 

lib/models/application.js

@@ -37,24 +37,19 @@ class Application extends Model {
   }
 
   /**
-   * list all applications - for all service providers, for one service provider, or for one account,
-   * or by an optional name
+   * list all applications - for all service providers, for one service provider, or for one account
    */
-  static retrieveAll(service_provider_sid, account_sid, name) {
-    let sql = retrieveSql + ' WHERE 1 = 1';
+  static retrieveAll(service_provider_sid, account_sid) {
+    let sql = retrieveSql;
     const args = [];
     if (account_sid) {
-      sql = `${sql} AND app.account_sid = ?`;
+      sql = `${sql} WHERE app.account_sid = ?`;
       args.push(account_sid);
     }
     else if (service_provider_sid) {
-      sql = `${sql} AND account_sid in (SELECT account_sid from accounts WHERE service_provider_sid = ?)`;
+      sql = `${sql} WHERE account_sid in (SELECT account_sid from accounts WHERE service_provider_sid = ?)`;
       args.push(service_provider_sid);
     }
-    if (name) {
-      sql = `${sql} AND app.name = ?`;
-      args.push(name);
-    }
     return new Promise((resolve, reject) => {
       getMysqlConnection((err, conn) => {
         if (err) return reject(err);

lib/models/client.js

@@ -13,9 +13,9 @@ class Client extends Model {
   }
 
   static async retrieveAllByServiceProviderSid(service_provider_sid) {
-    const sql = `SELECT c.client_sid, c.account_sid, c.is_active, c.username, c.password
+    const sql = `SELECT c.client_sid, c.account_sid, c.is_active, c.username, c.hashed_password
       FROM ${this.table} AS c LEFT JOIN accounts AS acc ON c.account_sid = acc.account_sid
-      LEFT JOIN service_providers AS sp ON sp.service_provider_sid = acc.service_provider_sid
+      LEFT JOIN service_providers AS sp ON sp.service_provider_sid = accs.service_provider_sid
       WHERE sp.service_provider_sid = ?`;
     const [rows] = await promisePool.query(sql, service_provider_sid);
     return rows;

lib/models/permissions.js

@@ -1,45 +0,0 @@
-const Model = require('./model');
-const {promisePool} = require('../db');
-const sqlAll = `
-SELECT * from permissions
-`;
-const sqlByName = `
-SELECT * from permissions where name = ?
-`;
-
-class Permissions extends Model {
-  constructor() {
-    super();
-  }
-
-  static async retrieveAll() {
-    const [rows] = await promisePool.query(sqlAll);
-    return rows;
-  }
-
-  static async retrieveByName(name) {
-    const [rows] = await promisePool.query(sqlByName, [name]);
-    return rows;
-  }
-}
-
-Permissions.table = 'permissions';
-Permissions.fields = [
-  {
-    name: 'permission_sid',
-    type: 'string',
-    primaryKey: true
-  },
-  {
-    name: 'name',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'description',
-    type: 'string',
-    required: true
-  }
-];
-
-module.exports = Permissions;

lib/models/speech-credential.js

@@ -22,17 +22,13 @@ class SpeechCredential extends Model {
 
   static async getSpeechCredentialsByVendorAndLabel(service_provider_sid, account_sid, vendor, label) {
     let sql;
-    let rows = [];
     if (account_sid) {
-      sql = `SELECT * FROM speech_credentials WHERE account_sid = ? AND vendor = ?
-        AND label ${label ? '= ?' : 'is NULL'}`;
-      [rows] = await promisePool.query(sql, [account_sid, vendor, label]);
-    }
-    if (rows.length === 0) {
+      sql = `SELECT * FROM speech_credentials WHERE account_sid = ? AND vendor = ? ${label ? 'AND label = ?' : ''}`;
+    } else {
       sql = `SELECT * FROM speech_credentials WHERE service_provider_sid = ? AND vendor = ?
-        AND label ${label ? '= ?' : 'is NULL'}`;
-      [rows] = await promisePool.query(sql, [service_provider_sid, vendor, label]);
+        ${label ? 'AND label = ?' : ''}`;
     }
+    const [rows] = await promisePool.query(sql, [account_sid ? account_sid : service_provider_sid, vendor, label]);
     return rows;
   }
 

lib/models/system-information.js

@@ -33,10 +33,6 @@ SystemInformation.fields = [
     name: 'monitoring_domain_name',
     type: 'string',
   },
-  {
-    name: 'private_network_cidr',
-    type: 'string',
-  },
 ];
 
 module.exports = SystemInformation;

lib/models/user-permissions.js

@@ -1,53 +0,0 @@
-const Model = require('./model');
-const {promisePool} = require('../db');
-const sqlAll = `
-SELECT * from user_permissions
-`;
-const sqlByUserIdPermissionSid = `
-SELECT * from user_permissions where user_sid = ? and permission_sid = ?
-`;
-const sqlByUserId = `
-SELECT * from user_permissions where user_sid = ?
-`;
-
-class UserPermissions extends Model {
-  constructor() {
-    super();
-  }
-
-  static async retrieveAll() {
-    const [rows] = await promisePool.query(sqlAll);
-    return rows;
-  }
-
-  static async retrieveByUserIdPermissionSid(user_sid, permission_sid) {
-    const [rows] = await promisePool.query(sqlByUserIdPermissionSid, [user_sid, permission_sid]);
-    return rows;
-  }
-  static async retrieveByUserId(user_sid) {
-    const [rows] = await promisePool.query(sqlByUserId, [user_sid]);
-    return rows;
-  }
-
-}
-
-UserPermissions.table = 'user_permissions';
-UserPermissions.fields = [
-  {
-    name: 'user_permissions_sid',
-    type: 'string',
-    primaryKey: true
-  },
-  {
-    name: 'user_sid',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'permission_sid',
-    type: 'string',
-    required: true
-  }
-];
-
-module.exports = UserPermissions;

lib/models/voip-carrier.js

@@ -136,14 +136,6 @@ VoipCarrier.fields = [
   {
     name: 'register_status',
     type: 'string'
-  },
-  {
-    name: 'dtmf_type',
-    type: 'string'
-  },
-  {
-    name: 'sip_proxy',
-    type: 'string'
   }
 ];
 

lib/routes/api/accounts.js

@@ -19,12 +19,11 @@ const {
   parseCallSid,
   enableSubspace,
   disableSubspace,
-  parseVoipCarrierSid,
-  hasValue,
+  parseVoipCarrierSid
 } = require('./utils');
 const short = require('short-uuid');
 const VoipCarrier = require('../../models/voip-carrier');
-const { encrypt, obscureBucketCredentialsSensitiveData, isObscureKey } = require('../../utils/encrypt-decrypt');
+const { encrypt } = require('../../utils/encrypt-decrypt');
 const { testS3Storage, testGoogleStorage, testAzureStorage } = require('../../utils/storage-utils');
 const translator = short();
 
@@ -43,7 +42,7 @@ const getFsUrl = async(logger, retrieveSet, setName) => {
       return ;
     }
     const f = fs[idx++ % fs.length];
-    logger.debug({fs}, `feature servers available for createCall API request, selecting ${f}`);
+    logger.info({fs}, `feature servers available for createCall API request, selecting ${f}`);
     return `${f}/v1/createCall`;
   } catch (err) {
     logger.error({err}, 'getFsUrl: error retreving feature servers from redis');
@@ -267,8 +266,7 @@ function validateUpdateCall(opts) {
     'record',
     'tag',
     'dtmf',
-    'conferenceParticipantAction',
-    'dub'
+    'conferenceParticipantAction'
   ]
     .reduce((acc, prop) => (opts[prop] ? ++acc : acc), 0);
 
@@ -556,12 +554,9 @@ router.get('/:sid', async(req, res) => {
     const account_sid = parseAccountSid(req);
     await validateRequest(req, account_sid);
     const service_provider_sid = req.user.hasServiceProviderAuth ? req.user.service_provider_sid : null;
-    const [result] = await Account.retrieve(account_sid, service_provider_sid) || [];
-    if (!result) return res.status(404).end();
-
-    result.bucket_credential = obscureBucketCredentialsSensitiveData(result.bucket_credential);
-
-    return res.status(200).json(result);
+    const results = await Account.retrieve(account_sid, service_provider_sid);
+    if (results.length === 0) return res.status(404).end();
+    return res.status(200).json(results[0]);
   }
   catch (err) {
     sysError(logger, res, err);
@@ -643,20 +638,18 @@ router.delete('/:sid/SubspaceTeleport', async(req, res) => {
   }
 });
 
-function encryptBucketCredential(obj, storedCredentials = {}) {
-  if (!hasValue(obj?.bucket_credential)) return;
+function encryptBucketCredential(obj) {
+  if (!obj.bucket_credential) return;
   const {
     vendor,
     region,
     name,
     access_key_id,
-    tags,
-    endpoint
-  } = obj.bucket_credential;
-  let {
     secret_access_key,
+    tags,
     service_key,
-    connection_string
+    connection_string,
+    endpoint
   } = obj.bucket_credential;
 
   switch (vendor) {
@@ -665,9 +658,6 @@ function encryptBucketCredential(obj, storedCredentials = {}) {
       assert(secret_access_key, 'invalid aws S3 bucket credential: secret_access_key is required');
       assert(name, 'invalid aws bucket name: name is required');
       assert(region, 'invalid aws bucket region: region is required');
-      if (isObscureKey(obj.bucket_credential) && hasValue(storedCredentials)) {
-        secret_access_key = storedCredentials.secret_access_key;
-      }
       const awsData = JSON.stringify({vendor, region, name, access_key_id,
         secret_access_key, tags});
       obj.bucket_credential = encrypt(awsData);
@@ -677,27 +667,18 @@ function encryptBucketCredential(obj, storedCredentials = {}) {
       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');
-      if (isObscureKey(obj.bucket_credential) && hasValue(storedCredentials)) {
-        secret_access_key = storedCredentials.secret_access_key;
-      }
       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');
-      if (isObscureKey(obj.bucket_credential) && hasValue(storedCredentials)) {
-        service_key = storedCredentials.service_key;
-      }
       const googleData = JSON.stringify({vendor, name, service_key, tags});
       obj.bucket_credential = encrypt(googleData);
       break;
     case 'azure':
       assert(name, 'invalid azure container name: name is required');
       assert(connection_string, 'invalid azure cloud storage credential: connection_string is required');
-      if (isObscureKey(obj.bucket_credential) && hasValue(storedCredentials)) {
-        connection_string = storedCredentials.connection_string;
-      }
       const azureData = JSON.stringify({vendor, name, connection_string, tags});
       obj.bucket_credential = encrypt(azureData);
       break;
@@ -755,17 +736,7 @@ router.put('/:sid', async(req, res) => {
       delete obj.registration_hook;
       delete obj.queue_event_hook;
 
-      let storedBucketCredentials = {};
-      if (isObscureKey(obj?.bucket_credential)) {
-        const [account] = await Account.retrieve(sid) || [];
-        /* to avoid overwriting valid credentials with the obscured secret,
-         * that the frontend might send, we pass the stored account bucket credentials
-         * in the case it is a obscured key, we replace it with the stored one
-         */
-        storedBucketCredentials = account.bucket_credential;
-      }
-
-      encryptBucketCredential(obj, storedBucketCredentials);
+      encryptBucketCredential(obj);
 
       const rowsAffected = await Account.update(sid, obj);
       if (rowsAffected === 0) {
@@ -865,13 +836,6 @@ router.post('/:sid/BucketCredentialTest', async(req, res) => {
   try {
     const account_sid = parseAccountSid(req);
     await validateRequest(req, account_sid);
-    /* if the req.body bucket credentials contain an obscured key, replace with stored account.bucket_credential */
-    if (isObscureKey(req.body)) {
-      const service_provider_sid = req.user.hasServiceProviderAuth ? req.user.service_provider_sid : null;
-      const [account] = await Account.retrieve(account_sid, service_provider_sid) || [];
-      if (!account) return res.status(404).end();
-      req.body = account.bucket_credential;
-    }
     const {vendor, name, region, access_key_id, secret_access_key, service_key, connection_string, endpoint} = req.body;
     const ret = {
       status: 'not tested'

lib/routes/api/alerts.js

@@ -16,7 +16,7 @@ router.get('/', async(req, res) => {
     const service_provider_sid = account_sid ? null : parseServiceProviderSid(req.originalUrl);
     const {page, count, alert_type, days, start, end} = req.query || {};
     if (!page || page < 1) throw new DbErrorBadRequest('missing or invalid "page" query arg');
-    if (!count || count > 500) throw new DbErrorBadRequest('missing or invalid "count" query arg');
+    if (!count || count < 25 || count > 500) throw new DbErrorBadRequest('missing or invalid "count" query arg');
 
     if (account_sid) {
       const data = await queryAlerts({

lib/routes/api/applications.js

@@ -156,8 +156,7 @@ router.get('/', async(req, res) => {
   try {
     const service_provider_sid = req.user.hasServiceProviderAuth ? req.user.service_provider_sid : null;
     const account_sid = req.user.hasAccountAuth ? req.user.account_sid : null;
-    const name = req.query.name;
-    const results = await Application.retrieveAll(service_provider_sid, account_sid, name);
+    const results = await Application.retrieveAll(service_provider_sid, account_sid);
     res.status(200).json(results);
   } catch (err) {
     sysError(logger, res, err);

lib/routes/api/google-custom-voices.js

@@ -4,9 +4,6 @@ const SpeechCredential = require('../../models/speech-credential');
 const decorate = require('./decorate');
 const {DbErrorBadRequest, DbErrorForbidden} = require('../../utils/errors');
 const sysError = require('../error');
-const multer = require('multer');
-const upload = multer({ dest: '/tmp/csv/' });
-const fs = require('fs');
 
 const validateCredentialPermission = async(req) => {
   const credential = await SpeechCredential.retrieve(req.body.speech_credential_sid);
@@ -44,33 +41,6 @@ const preconditions = {
 
 decorate(router, GoogleCustomVoice, ['add', 'retrieve', 'update', 'delete'], preconditions);
 
-const voiceCloningKeySubString = (voice_cloning_key) => {
-  return voice_cloning_key ? voice_cloning_key.substring(0, 100) + '...' : undefined;
-};
-
-router.get('/: sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const {sid} = req.params;
-    const account_sid = req.user.account_sid;
-    const service_provider_sid = req.user.service_provider_sid;
-
-    const google_voice = await GoogleCustomVoice.retrieve(sid);
-    google_voice.voice_cloning_key = voiceCloningKeySubString(google_voice.voice_cloning_key);
-    if (!google_voice) {
-      return res.sendStatus(404);
-    }
-    if (req.user.hasScope('service_provider') && google_voice.service_provider_sid !== service_provider_sid ||
-      req.user.hasScope('account') && google_voice.account_sid !== account_sid) {
-      throw new DbErrorForbidden('Insufficient privileges');
-    }
-
-    return res.status(200).json(google_voice);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
 router.get('/', async(req, res) => {
   const logger = req.app.locals.logger;
   const account_sid = req.user.account_sid || req.query.account_sid;
@@ -97,37 +67,7 @@ router.get('/', async(req, res) => {
       }
       results = await GoogleCustomVoice.retrieveAllByLabel(service_provider_sid, account_sid, label);
     }
-    res.status(200).json(results.map((r) => {
-      r.voice_cloning_key = voiceCloningKeySubString(r.voice_cloning_key);
-      return r;
-    }));
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.post('/:sid/VoiceCloningKey', upload.single('file'), async(req, res) => {
-  const {logger} = req.app.locals;
-  const {sid} = req.params;
-  const account_sid = req.user.account_sid;
-  const service_provider_sid = req.user.service_provider_sid;
-  try {
-    const google_voice = await GoogleCustomVoice.retrieve(sid);
-    if (!google_voice) {
-      return res.sendStatus(404);
-    }
-    if (req.user.hasScope('service_provider') && google_voice.service_provider_sid !== service_provider_sid ||
-      req.user.hasScope('account') && google_voice.account_sid !== account_sid) {
-      throw new DbErrorForbidden('Insufficient privileges');
-    }
-
-    const voice_cloning_key = Buffer.from(fs.readFileSync(req.file.path)).toString();
-    await GoogleCustomVoice.update(sid, {
-      voice_cloning_key
-    });
-    fs.unlinkSync(req.file.path);
-    return res.sendStatus(204);
-
+    res.status(200).json(results);
   } catch (err) {
     sysError(logger, res, err);
   }

lib/routes/api/login.js

@@ -29,9 +29,6 @@ router.post('/', async(req, res) => {
       return res.sendStatus(403);
     }
     logger.info({r}, 'successfully retrieved user account');
-    if (r[0].provider !== 'local') {
-      return res.sendStatus(403);
-    }
 
     const maxLoginAttempts = process.env.LOGIN_ATTEMPTS_MAX_RETRIES || 6;
     const loginAttempsBlocked = await retrieveKey(`login:${r[0].user_sid}`) >= maxLoginAttempts;
@@ -74,13 +71,9 @@ router.post('/', async(req, res) => {
       obj.service_provider_sid = r[0].service_provider_sid;
       obj.service_provider_name = service_provider[0].name;
     }
-    // if there is only one permission and it is VIEW_ONLY, then the user is view only
-    // this is to prevent write operations on the API
-    const is_view_only = permissions.length === 1 && permissions.includes('VIEW_ONLY');
     const payload = {
       scope: obj.scope,
       permissions,
-      is_view_only,
       ...(obj.service_provider_sid && {
         service_provider_sid: obj.service_provider_sid,
         service_provider_name: obj.service_provider_name
@@ -90,8 +83,7 @@ router.post('/', async(req, res) => {
         account_name: obj.account_name,
         service_provider_name: obj.service_provider_name
       }),
-      user_sid: obj.user_sid,
-      name: username
+      user_sid: obj.user_sid
     };
 
     const expiresIn = parseInt(process.env.JWT_EXPIRES_IN || 60) * 60;

lib/routes/api/phone-numbers.js

@@ -40,10 +40,6 @@ async function validateAdd(req) {
     if (!result || result.length === 0) {
       throw new DbErrorBadRequest(`voip_carrier not found for sid ${req.body.voip_carrier_sid}`);
     }
-    const carrier = result[0];
-    if (carrier.account_sid && req.body.account_sid && req.body.account_sid !== carrier.account_sid) {
-      throw new DbErrorBadRequest('voip_carrier_sid does not belong to the account');
-    }
   }
 }
 

lib/routes/api/recent-calls.js

@@ -4,7 +4,6 @@ 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 { CloudWatchLogsClient, FilterLogEventsCommand } = require('@aws-sdk/client-cloudwatch-logs');
 const {
   getS3Object,
   getGoogleStorageObject,
@@ -32,7 +31,7 @@ router.get('/', async(req, res) => {
     const service_provider_sid = account_sid ? null : parseServiceProviderSid(req.originalUrl);
     const {page, count, trunk, direction, days, answered, start, end, filter} = req.query || {};
     if (!page || page < 1) throw new DbErrorBadRequest('missing or invalid "page" query arg');
-    if (!count || count > 500) throw new DbErrorBadRequest('missing or invalid "count" query arg');
+    if (!count || count < 25 || count > 500) throw new DbErrorBadRequest('missing or invalid "count" query arg');
 
     if (account_sid) {
       const data = await queryCdrs({
@@ -107,71 +106,6 @@ router.get('/:call_id/:method/pcap', async(req, res) => {
   }
 });
 
-router.get('/:call_sid/logs', async(req, res) => {
-  const {logger, queryCdrs} = req.app.locals;
-  const aws_region = process.env.AWS_REGION;
-  const {call_sid} = req.params;
-  const {logGroupName = 'jambonz-feature_server'} = req.query;
-  const account_sid = parseAccountSid(req.originalUrl);
-  if (!aws_region) {
-    return res.status(400).send({msg: 'Logs are only available in AWS environments'});
-  }
-  if (!account_sid) {
-    return res.status(400).send({msg: 'account_sid is required,' +
-      'please use /Accounts/{account_sid}/RecentCalls/{call_sid}/logs'});
-  }
-  try {
-    //find back the call in CDR to get timestame of the call
-    // this allow us limit search in cloudwatch logs
-    const data = await queryCdrs({
-      account_sid,
-      filter: call_sid,
-      page: 0,
-      page_size: 50
-    });
-    if (!data || data.data.length === 0) {
-      return res.status(404).send({msg: 'Call not found'});
-    }
-
-    const {
-      attempted_at, //2025-02-24T13:11:51.969Z
-      terminated_at, //2025-02-24T13:11:56.153Z
-      sip_callid
-    } = data.data[0];
-    const TIMEBUFFER = 60; //60 seconds
-    const startTime = new Date(attempted_at).getTime() - TIMEBUFFER * 1000;
-    const endTime = new Date(terminated_at).getTime() + TIMEBUFFER * 1000;
-    const client = new CloudWatchLogsClient({ region: aws_region });
-    let params = {
-      logGroupName,
-      startTime,
-      endTime,
-      filterPattern: `{ ($.callSid = "${call_sid}") || ($.callId = "${sip_callid}") }`
-    };
-    const command = new FilterLogEventsCommand(params);
-    const response = await client.send(command);
-    // if response have nextToken, we need to fetch all logs
-    while (response.nextToken) {
-      params = {
-        ...params,
-        nextToken: response.nextToken
-      };
-      const command = new FilterLogEventsCommand(params);
-      const response2 = await client.send(command);
-      response.events = response.events.concat(response2.events);
-      response.nextToken = response2.nextToken;
-    }
-    let logs = [];
-    if (response.events && response.events.length > 0) {
-      logs = response.events.map((e) => e.message);
-    }
-    res.status(200).json(logs);
-  } catch (err) {
-    logger.error({err}, 'Cannot fetch logs from cloudwatch');
-    res.status(500).send({msg: err.message});
-  }
-});
-
 router.get('/trace/:trace_id', async(req, res) => {
   const {logger} = req.app.locals;
   const {trace_id} = req.params;

lib/routes/api/register.js

@@ -3,7 +3,7 @@ const debug = require('debug')('jambonz:api-server');
 const {DbErrorBadRequest, DbErrorUnprocessableRequest} = require('../../utils/errors');
 const {promisePool} = require('../../db');
 const {doGithubAuth, doGoogleAuth, doLocalAuth} = require('../../utils/oauth-utils');
-const {validateEmail, emailSimpleText} = require('../../utils/email-utils');
+const {validateEmail} = require('../../utils/email-utils');
 const {cacheClient} = require('../../helpers');
 const { v4: uuid } = require('uuid');
 const short = require('short-uuid');
@@ -12,7 +12,6 @@ const jwt = require('jsonwebtoken');
 const {setupFreeTrial, createTestCdrs, createTestAlerts} = require('./utils');
 const {generateHashedPassword} = require('../../utils/password-utils');
 const sysError = require('../error');
-
 const insertUserSql = `INSERT into users 
 (user_sid, account_sid, name, email, provider, provider_userid, email_validated) 
 values (?, ?, ?, ?, ?, ?, 1)`;
@@ -37,17 +36,6 @@ const insertSignupHistorySql = `INSERT into signup_history
 (email, name) 
 values (?, ?)`;
 
-const slackEmail = `Hi there and welcome to jambonz!
-
-We are excited to have you on board. Feel free to join the community on Slack at https://joinslack.jambonz.org, 
-where you can connect with other jambonz users, ask questions, share your experiences, and learn from others.
-
-Hope to see you there!
-
-Best, 
-
-DaveH and the jambonz team`;
-
 const addLocalUser = async(logger, user_sid, account_sid,
   name, email, email_activation_code, passwordHash, service_provider_sid) => {
   const [r] = await promisePool.execute(insertUserLocalSql,
@@ -336,15 +324,6 @@ router.post('/', async(req, res) => {
         tutorial_completion: 0,
         scope: 'read-write'
       });
-
-      // send invite to Slack
-      if (process.env.SEND_SLACK_INVITE_ON_SIGNUP) {
-        try {
-          emailSimpleText(logger, userProfile.email, 'Welcome to jambonz!', slackEmail);
-        } catch (err) {
-          logger.info({err}, 'Error sending slack invite');
-        }
-      }
     }
     else if (user_sid) {
       /* add a new user for existing account */

lib/routes/api/sip-gateways.js

@@ -41,7 +41,6 @@ const checkUserScope = async(req, voip_carrier_sid) => {
 
 const validate = async(req, sid) => {
   const {lookupSipGatewayBySid} = req.app.locals;
-  const {netmask} = req.body;
   let voip_carrier_sid;
 
   if (sid) {
@@ -53,12 +52,6 @@ const validate = async(req, sid) => {
     voip_carrier_sid = req.body.voip_carrier_sid;
     if (!voip_carrier_sid) throw new DbErrorBadRequest('missing voip_carrier_sid');
   }
-  if (netmask &&
-    process.env.JAMBONZ_MIN_GATEWAY_NETMASK &&
-    parseInt(netmask) < process.env.JAMBONZ_MIN_GATEWAY_NETMASK) {
-    throw new DbErrorBadRequest(
-      `netmask required to have value equal or greater than ${process.env.JAMBONZ_MIN_GATEWAY_NETMASK}`);
-  }
   await checkUserScope(req, voip_carrier_sid);
 };
 

lib/routes/api/speech-credentials.js

@@ -10,11 +10,7 @@ const {decryptCredential, testWhisper, testDeepgramTTS,
   testPlayHT,
   testRimelabs,
   testVerbioTts,
-  testVerbioStt,
-  testSpeechmaticsStt,
-  testCartesia,
-  testVoxistStt,
-  testOpenAiStt} = require('../../utils/speech-utils');
+  testVerbioStt} = require('../../utils/speech-utils');
 const {DbErrorUnprocessableRequest, DbErrorForbidden, DbErrorBadRequest} = require('../../utils/errors');
 const {
   testGoogleTts,
@@ -126,10 +122,8 @@ const encryptCredential = (obj) => {
     secret,
     nuance_tts_uri,
     nuance_stt_uri,
-    speechmatics_stt_uri,
     deepgram_stt_uri,
     deepgram_stt_use_tls,
-    deepgram_tts_uri,
     use_custom_tts,
     custom_tts_endpoint,
     custom_tts_endpoint_url,
@@ -144,7 +138,6 @@ const encryptCredential = (obj) => {
     instance_id,
     custom_stt_url,
     custom_tts_url,
-    custom_tts_streaming_url,
     auth_token = '',
     cobalt_server_uri,
     model_id,
@@ -211,10 +204,10 @@ const encryptCredential = (obj) => {
 
     case 'deepgram':
       // API key is optional if onprem
-      if (!deepgram_stt_uri || !deepgram_tts_uri) {
+      if (!deepgram_stt_uri) {
         assert(api_key, 'invalid deepgram speech credential: api_key is required');
       }
-      const deepgramData = JSON.stringify({api_key, deepgram_stt_uri, deepgram_stt_use_tls, deepgram_tts_uri});
+      const deepgramData = JSON.stringify({api_key, deepgram_stt_uri, deepgram_stt_use_tls});
       return encrypt(deepgramData);
 
     case 'ibm':
@@ -242,12 +235,6 @@ const encryptCredential = (obj) => {
       const elevenlabsData = JSON.stringify({api_key, model_id, options});
       return encrypt(elevenlabsData);
 
-    case 'speechmatics':
-      assert(api_key, 'invalid speechmatics speech credential: api_key is required');
-      assert(speechmatics_stt_uri, 'invalid speechmatics speech credential: speechmatics_stt_uri is required');
-      const speechmaticsData = JSON.stringify({api_key, speechmatics_stt_uri, options});
-      return encrypt(speechmaticsData);
-
     case 'playht':
       assert(api_key, 'invalid playht speech credential: api_key is required');
       assert(user_id, 'invalid playht speech credential: user_id is required');
@@ -255,12 +242,6 @@ const encryptCredential = (obj) => {
       const playhtData = JSON.stringify({api_key, user_id, voice_engine, options});
       return encrypt(playhtData);
 
-    case 'cartesia':
-      assert(api_key, 'invalid cartesia speech credential: api_key is required');
-      assert(model_id, 'invalid cartesia speech credential: model_id is required');
-      const cartesiaData = JSON.stringify({api_key, model_id, options});
-      return encrypt(cartesiaData);
-
     case 'rimelabs':
       assert(api_key, 'invalid rimelabs speech credential: api_key is required');
       assert(model_id, 'invalid rimelabs speech credential: model_id is required');
@@ -272,23 +253,12 @@ const encryptCredential = (obj) => {
       const assemblyaiData = JSON.stringify({api_key});
       return encrypt(assemblyaiData);
 
-    case 'voxist':
-      assert(api_key, 'invalid voxist speech credential: api_key is required');
-      const voxistData = JSON.stringify({api_key});
-      return encrypt(voxistData);
-
     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);
 
-    case 'openai':
-      assert(api_key, 'invalid openai speech credential: api_key is required');
-      assert(model_id, 'invalid openai speech credential: model_id is required');
-      const openaiData = JSON.stringify({api_key, model_id});
-      return encrypt(openaiData);
-
     case 'verbio':
       assert(engine_version, 'invalid verbio speech credential: client_id is required');
       assert(client_id, 'invalid verbio speech credential: client_id is required');
@@ -298,7 +268,7 @@ const encryptCredential = (obj) => {
 
     default:
       if (vendor.startsWith('custom:')) {
-        const customData = JSON.stringify({auth_token, custom_stt_url, custom_tts_url, custom_tts_streaming_url});
+        const customData = JSON.stringify({auth_token, custom_stt_url, custom_tts_url});
         return encrypt(customData);
       }
       else assert(false, `invalid or missing vendor: ${vendor}`);
@@ -482,14 +452,12 @@ router.put('/:sid', async(req, res) => {
           custom_stt_endpoint_url,
           custom_stt_url,
           custom_tts_url,
-          custom_tts_streaming_url,
           cobalt_server_uri,
           model_id,
           voice_engine,
           options,
           deepgram_stt_uri,
           deepgram_stt_use_tls,
-          deepgram_tts_uri,
           engine_version
         } = req.body;
 
@@ -511,14 +479,12 @@ router.put('/:sid', async(req, res) => {
           nuance_tts_uri,
           custom_stt_url,
           custom_tts_url,
-          custom_tts_streaming_url,
           cobalt_server_uri,
           model_id,
           voice_engine,
           options,
           deepgram_stt_uri,
           deepgram_stt_use_tls,
-          deepgram_tts_uri,
           engine_version
         };
         logger.info({o, newCred}, 'updating speech credential with this new credential');
@@ -799,18 +765,6 @@ router.get('/:sid/test', async(req, res) => {
           SpeechCredential.ttsTestResult(sid, false);
         }
       }
-    } else if (cred.vendor === 'speechmatics') {
-      const {api_key} = credential;
-      if (cred.use_for_stt) {
-        try {
-          await testSpeechmaticsStt(logger, {api_key});
-          results.stt.status = 'ok';
-          SpeechCredential.ttsTestResult(sid, true);
-        } catch (err) {
-          results.stt = {status: 'fail', reason: err.message};
-          SpeechCredential.ttsTestResult(sid, false);
-        }
-      }
     } else if (cred.vendor === 'playht') {
       if (cred.use_for_tts) {
         try {
@@ -827,22 +781,6 @@ router.get('/:sid/test', async(req, res) => {
           SpeechCredential.ttsTestResult(sid, false);
         }
       }
-    } else if (cred.vendor === 'cartesia') {
-      if (cred.use_for_tts) {
-        try {
-          await testCartesia(logger, synthAudio, credential);
-          results.tts.status = 'ok';
-          SpeechCredential.ttsTestResult(sid, true);
-        } catch (err) {
-          let reason = err.message;
-          // if error is from bent, let get the body
-          try {
-            reason = await err.text();
-          } catch {}
-          results.tts = {status: 'fail', reason};
-          SpeechCredential.ttsTestResult(sid, false);
-        }
-      }
     } else if (cred.vendor === 'rimelabs') {
       if (cred.use_for_tts) {
         try {
@@ -866,18 +804,6 @@ router.get('/:sid/test', async(req, res) => {
           SpeechCredential.sttTestResult(sid, false);
         }
       }
-    } else if (cred.vendor === 'voxist') {
-      const {api_key} = credential;
-      if (cred.use_for_stt) {
-        try {
-          await testVoxistStt(logger, {api_key});
-          results.stt.status = 'ok';
-          SpeechCredential.sttTestResult(sid, true);
-        } catch (err) {
-          results.stt = {status: 'fail', reason: err.message};
-          SpeechCredential.sttTestResult(sid, false);
-        }
-      }
     } else if (cred.vendor === 'whisper') {
       if (cred.use_for_tts) {
         try {
@@ -889,17 +815,6 @@ router.get('/:sid/test', async(req, res) => {
           SpeechCredential.ttsTestResult(sid, false);
         }
       }
-    } else if (cred.vendor === 'openai') {
-      if (cred.use_for_stt) {
-        try {
-          await testOpenAiStt(logger, credential);
-          results.stt.status = 'ok';
-          SpeechCredential.sttTestResult(sid, true);
-        } catch (err) {
-          results.stt = {status: 'fail', reason: err.message};
-          SpeechCredential.sttTestResult(sid, false);
-        }
-      }
     } else if (cred.vendor === 'verbio') {
       if (cred.use_for_tts) {
         try {
@@ -937,7 +852,7 @@ router.get('/:sid/test', async(req, res) => {
 router.get('/speech/supportedLanguagesAndVoices', async(req, res) => {
   const {logger, getTtsVoices} = req.app.locals;
   try {
-    const {vendor, label, create_new} = req.query;
+    const {vendor, label} = req.query;
     if (!vendor) {
       throw new DbErrorBadRequest('vendor is required');
     }
@@ -945,7 +860,7 @@ router.get('/speech/supportedLanguagesAndVoices', async(req, res) => {
     const service_provider_sid = req.user.service_provider_sid ||
       req.body.service_provider_sid || parseServiceProviderSid(req);
 
-    const credentials = create_new ? null : await SpeechCredential.getSpeechCredentialsByVendorAndLabel(
+    const credentials = await SpeechCredential.getSpeechCredentialsByVendorAndLabel(
       service_provider_sid, account_sid, vendor, label);
     const tmp = credentials && credentials.length > 0 ? credentials[0] : null;
     const cred = tmp ? JSON.parse(decrypt(tmp.credential)) : null;

lib/routes/api/users.js

@@ -1,7 +1,5 @@
 const router = require('express').Router();
 const User = require('../../models/user');
-const UserPermissions = require('../../models/user-permissions');
-const Permissions = require('../../models/permissions');
 const {DbErrorBadRequest, BadRequestError, DbErrorForbidden} = require('../../utils/errors');
 const {generateHashedPassword, verifyPassword} = require('../../utils/password-utils');
 const {promisePool} = require('../../db');
@@ -40,8 +38,7 @@ const validateRequest = async(user_sid, req) => {
     email,
     email_activation_code,
     force_change,
-    is_active,
-    is_view_only
+    is_active
   } = payload;
 
   const [r] = await promisePool.query(retrieveSql, user_sid);
@@ -96,8 +93,7 @@ const validateRequest = async(user_sid, req) => {
   if (email_activation_code && !email) {
     throw new DbErrorBadRequest('email and email_activation_code both required');
   }
-  if (!name && !new_password && !email && !initial_password && !force_change && !is_active &&
-    is_view_only === undefined)
+  if (!name && !new_password && !email && !initial_password && !force_change && !is_active)
     throw new DbErrorBadRequest('no updates requested');
 
   return user;
@@ -144,35 +140,7 @@ const ensureUserRetrievalIsAllowed = (req, user) => {
     throw error;
   }
 };
-async function updateViewOnlyUserPermission(is_view_only, user_sid) {
-  try {
-    const [viewOnlyPermission] = await Permissions.retrieveByName('VIEW_ONLY');
-    if (!viewOnlyPermission) {
-      throw new Error('VIEW_ONLY permission not found');
-    }
 
-    const existingPermissions = await UserPermissions.retrieveByUserIdPermissionSid(
-      user_sid,
-      viewOnlyPermission.permission_sid
-    );
-    if (is_view_only && existingPermissions.length === 0) {
-      await UserPermissions.make({
-        user_sid,
-        permission_sid: viewOnlyPermission.permission_sid,
-      });
-    } else if (!is_view_only && existingPermissions.length > 0) {
-      await UserPermissions.remove(existingPermissions[0].user_permissions_sid);
-    }
-  } catch (err) {
-    throw new Error(`Failed to update user permissions: ${err.message}`);
-  }
-}
-async function removeViewOnlyUserPermission(user_id) {
-  const [viewOnlyPermission] = await Permissions.retrieveByName('VIEW_ONLY');
-  if (viewOnlyPermission) {
-    await UserPermissions.remove(user_id, viewOnlyPermission.permission_sid);
-  }
-}
 router.get('/', async(req, res) => {
   const logger = req.app.locals.logger;
 
@@ -340,14 +308,7 @@ router.get('/:user_sid', async(req, res) => {
     }
 
     ensureUserRetrievalIsAllowed(req, user);
-    const [viewOnlyPermission] = await Permissions.retrieveByName('VIEW_ONLY');
-    const existingPermissions = await UserPermissions.retrieveByUserId(
-      user_sid
-    );
-    logger.debug(`existingPermissions of ${user_sid}: ${JSON.stringify(existingPermissions)}`);
-    user.is_view_only = existingPermissions.length === 1 &&
-      existingPermissions[0].permission_sid === viewOnlyPermission.permission_sid;
-    logger.debug(`User ${user_sid} is view-only user: ${user.is_view_only}`);
+
     // eslint-disable-next-line no-unused-vars
     const { hashed_password, ...rest } = user;
     return res.status(200).json(rest);
@@ -371,9 +332,9 @@ router.put('/:user_sid', async(req, res) => {
     is_active,
     force_change,
     account_sid,
-    service_provider_sid,
-    is_view_only
+    service_provider_sid
   } = req.body;
+
   //if (req.user.user_sid && req.user.user_sid !== user_sid) return res.sendStatus(403);
 
   if (!hasAdminAuth &&
@@ -466,8 +427,6 @@ router.put('/:user_sid', async(req, res) => {
         //TODO: send email with activation code
       }
     }
-    // update user permissions
-    await updateViewOnlyUserPermission(is_view_only, user_sid);
     res.sendStatus(204);
   } catch (err) {
     sysError(logger, res, err);
@@ -484,8 +443,6 @@ router.post('/', async(req, res) => {
   };
   const allUsers = await User.retrieveAll();
   delete payload.initial_password;
-  const is_view_only = payload.is_view_only;
-  delete payload.is_view_only;
 
   try {
     if (req.body.initial_password) {
@@ -507,7 +464,6 @@ router.post('/', async(req, res) => {
     if (req.user.hasAdminAuth) {
       logger.debug({payload}, 'POST /users');
       const uuid = await User.make(payload);
-      await updateViewOnlyUserPermission(is_view_only, uuid);
       res.status(201).json({user_sid: uuid});
     }
     else if (req.user.hasAccountAuth) {
@@ -516,7 +472,6 @@ router.post('/', async(req, res) => {
         ...payload,
         account_sid: req.user.account_sid,
       });
-      await updateViewOnlyUserPermission(is_view_only, uuid);
       res.status(201).json({user_sid: uuid});
     }
     else if (req.user.hasServiceProviderAuth) {
@@ -525,7 +480,6 @@ router.post('/', async(req, res) => {
         ...payload,
         service_provider_sid: req.user.service_provider_sid,
       });
-      await updateViewOnlyUserPermission(is_view_only, uuid);
       res.status(201).json({user_sid: uuid});
     }
   } catch (err) {
@@ -543,8 +497,6 @@ router.delete('/:user_sid', async(req, res) => {
     const user = allUsers.filter((user) => user.user_sid === user_sid);
 
     ensureUserDeletionIsAllowed(req, activeAdminUsers, user);
-    logger.debug(`Removing view-only permission for user ${user_sid}`);
-    await removeViewOnlyUserPermission(user_sid);
     await User.remove(user_sid);
 
     /* invalidate the jwt of the deleted user */

lib/routes/api/utils.js

@@ -440,22 +440,6 @@ const validatePasswordSettings = async(password) => {
   return;
 };
 
-function hasValue(data) {
-  if (typeof data === 'string') {
-    return data && data.length > 0;
-  } else if (Array.isArray(data)) {
-    return data && data.length > 0;
-  } else if (typeof data === 'object') {
-    return data && Object.keys(data).length > 0;
-  } else if (typeof data === 'number') {
-    return data !== null;
-  } else if (typeof data === 'boolean') {
-    return data !== null;
-  } else {
-    return false;
-  }
-}
-
 module.exports = {
   setupFreeTrial,
   createTestCdrs,
@@ -476,6 +460,5 @@ module.exports = {
   checkLimits,
   enableSubspace,
   disableSubspace,
-  validatePasswordSettings,
-  hasValue,
+  validatePasswordSettings
 };

lib/swagger/swagger.yaml

@@ -130,7 +130,71 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/GeneralError'      
+                $ref: '#/components/schemas/GeneralError'
+  /Accounts/{accountSid}/RecentCalls/{callSid}/record/{year}/{month}/{day}/{format}:
+    get:
+      tags:
+        - Call Records
+      summary: 'Retrieve a recording of a recent call in specified format'
+      description: 'Gets the recording of a recent call by specifying the account ID, call ID, the date of the call, and the format of the recording (e.g., MP3 or WAV).'
+      operationId: getRecordingByFormat
+      security:
+        - ApiKeyAuth: [ ]
+      parameters:
+        - name: accountSid
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: callSid
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: year
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: month
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: day
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: format
+          in: path
+          required: true
+          schema:
+            type: string
+            enum:
+              - mp3
+              - wav
+      responses:
+        200:
+          description: Successfully retrieved the recording file.
+          content:
+            audio/*:
+              schema:
+                type: string
+                format: binary
+        404:
+          description: Call record not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/GeneralError'
+        500:
+          description: System error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/GeneralError'
+
   /Sbcs:
     post:
       tags:

lib/utils/encrypt-decrypt.js

@@ -17,15 +17,10 @@ const encrypt = (text) => {
 };
 
 const decrypt = (data) => {
-  try {
-    const hash = JSON.parse(data);
-    const decipher = crypto.createDecipheriv(algorithm, secretKey, Buffer.from(hash.iv, 'hex'));
-    const decrpyted = Buffer.concat([decipher.update(Buffer.from(hash.content, 'hex')), decipher.final()]);
-    return decrpyted.toString();
-  } catch (error) {
-    console.error('Error while decrypting data', error);
-    return '{}';
-  }
+  const hash = JSON.parse(data);
+  const decipher = crypto.createDecipheriv(algorithm, secretKey, Buffer.from(hash.iv, 'hex'));
+  const decrpyted = Buffer.concat([decipher.update(Buffer.from(hash.content, 'hex')), decipher.final()]);
+  return decrpyted.toString();
 };
 
 const obscureKey = (key, key_spoiler_length = 6) => {
@@ -38,85 +33,8 @@ const obscureKey = (key, key_spoiler_length = 6) => {
   return `${key.slice(0, key_spoiler_length)}${key_spoiler_char.repeat(key.length - key_spoiler_length)}`;
 };
 
-function isObscureKey(bucketCredentials) {
-  if (!bucketCredentials) {
-    return false;
-  }
-
-  try {
-    const {
-      vendor,
-      secret_access_key = '',
-      service_key = '',
-      connection_string = ''
-    } = bucketCredentials || {};
-    let pattern;
-    switch (vendor) {
-      case 'aws_s3':
-      case 's3_compatible':
-        pattern = /^([A-Za-z0-9]{4,6}X+$)/;
-        return pattern.test(secret_access_key);
-      case 'azure':
-        pattern = /^https:[A-Za-z0-9\/.:?=&_-]+$/;
-        return pattern.test(connection_string);
-
-      case 'google': {
-        pattern = /^([A-Za-z0-9]{4,6}X+$)/;
-        let {private_key} = JSON.parse(service_key);
-        const key_header = '-----BEGIN PRIVATE KEY-----\n';
-        private_key = private_key.slice(key_header.length, private_key.length);
-        return pattern.test(private_key || '');
-      }
-    }
-    return false;
-  } catch (error) {
-    console.log('Error in isObscureKey', error);
-    return false;
-  }
-}
-
-/**
- * obscure sensitive data in bucket credentials
- * an obscured key contains of 6 'spoiled' characters of the key followed by 'X' characters
- * '123456XXXXXXXXXXXXXXXXXXXXXXXX'
- * @param {*} obj
- * @returns
- */
-function obscureBucketCredentialsSensitiveData(obj) {
-  if (!obj) return obj;
-  const {vendor, service_key, connection_string, secret_access_key} = obj;
-  switch (vendor) {
-    case 'aws_s3':
-    case 's3_compatible':
-      obj.secret_access_key = obscureKey(secret_access_key);
-      break;
-    case 'google':
-      const o = JSON.parse(service_key);
-      let private_key = o.private_key;
-      if (!isObscureKey(obj)) {
-        const key_header = '-----BEGIN PRIVATE KEY-----\n';
-        private_key = o.private_key.slice(key_header.length, o.private_key.length);
-        private_key = `${key_header}${obscureKey(private_key)}`;
-      }
-      const obscured = {
-        ...o,
-        private_key
-      };
-      obj.service_key = JSON.stringify(obscured);
-      break;
-    case 'azure':
-      obj.connection_string = obscureKey(connection_string);
-      break;
-  }
-
-  return obj;
-}
-
-
 module.exports = {
   encrypt,
   decrypt,
-  obscureKey,
-  isObscureKey,
-  obscureBucketCredentialsSensitiveData,
+  obscureKey
 };

lib/utils/errors.js

@@ -27,17 +27,11 @@ class DbErrorForbidden extends DbError {
     super(msg);
   }
 }
-class UserPermissionError extends Error {
-  constructor(msg) {
-    super(msg);
-  }
-}
 
 module.exports = {
   BadRequestError,
   DbError,
   DbErrorBadRequest,
   DbErrorUnprocessableRequest,
-  DbErrorForbidden,
-  UserPermissionError
+  DbErrorForbidden
 };

lib/utils/speech-data/stt-deepgram.js

@@ -1,56 +1,138 @@
 module.exports = [
-  { name: 'Multilingual', value: 'multi' },
-  { name: 'Bulgarian', value: 'bg' },
-  { name: 'Catalan', value: 'ca' },
-  { name: 'Chinese (Mandarin, Simplified)', value: 'zh' },
-  { name: 'Chinese (Mandarin, Simplified - China)', value: 'zh-CN' },
-  { name: 'Chinese (Mandarin, Simplified - Hans)', value: 'zh-Hans' },
-  { name: 'Chinese (Mandarin, Traditional)', value: 'zh-TW' },
-  { name: 'Chinese (Mandarin, Traditional - Hant)', value: 'zh-Hant' },
-  { name: 'Chinese (Cantonese, Traditional - Hong Kong)', value: 'zh-HK' },
-  { name: 'Czech', value: 'cs' },
-  { name: 'Danish', value: 'da' },
-  { name: 'Danish (Denmark)', value: 'da-DK' },
-  { name: 'Dutch', value: 'nl' },
-  { name: 'English', value: 'en' },
-  { name: 'English (United States)', value: 'en-US' },
-  { name: 'English (Australia)', value: 'en-AU' },
-  { name: 'English (United Kingdom)', value: 'en-GB' },
-  { name: 'English (New Zealand)', value: 'en-NZ' },
-  { name: 'English (India)', value: 'en-IN' },
-  { name: 'Estonian', value: 'et' },
-  { name: 'Finnish', value: 'fi' },
-  { name: 'Flemish', value: 'nl-BE' },
-  { name: 'French', value: 'fr' },
-  { name: 'French (Canada)', value: 'fr-CA' },
-  { name: 'German', value: 'de' },
-  { name: 'German (Switzerland)', value: 'de-CH' },
-  { name: 'Greek', value: 'el' },
-  { name: 'Hindi', value: 'hi' },
-  { name: 'Hungarian', value: 'hu' },
-  { name: 'Indonesian', value: 'id' },
-  { name: 'Italian', value: 'it' },
-  { name: 'Japanese', value: 'ja' },
-  { name: 'Korean', value: 'ko' },
-  { name: 'Korean (South Korea)', value: 'ko-KR' },
-  { name: 'Latvian', value: 'lv' },
-  { name: 'Lithuanian', value: 'lt' },
-  { name: 'Malay', value: 'ms' },
-  { name: 'Norwegian', value: 'no' },
-  { name: 'Polish', value: 'pl' },
-  { name: 'Portuguese', value: 'pt' },
-  { name: 'Portuguese (Brazil)', value: 'pt-BR' },
-  { name: 'Portuguese (Portugal)', value: 'pt-PT' },
-  { name: 'Romanian', value: 'ro' },
-  { name: 'Russian', value: 'ru' },
-  { name: 'Slovak', value: 'sk' },
-  { name: 'Spanish', value: 'es' },
-  { name: 'Spanish (Latin America)', value: 'es-419' },
-  { name: 'Swedish', value: 'sv' },
-  { name: 'Swedish (Sweden)', value: 'sv-SE' },
-  { name: 'Thai', value: 'th' },
-  { name: 'Thai (Thailand)', value: 'th-TH' },
-  { name: 'Turkish', value: 'tr' },
-  { name: 'Ukrainian', value: 'uk' },
-  { name: 'Vietnamese', value: 'vi' }
+  {
+    name: 'Chinese - general',
+    value: 'zh',
+  },
+  {
+    name: 'Chinese (China)',
+    value: 'zh-CN',
+  },
+  {
+    name: 'Chinese (Taiwan)',
+    value: 'zh-TW',
+  },
+  {
+    name: 'Dutch - general',
+    value: 'nl',
+  },
+  {
+    name: 'English - general',
+    value: 'en',
+  },
+  {
+    name: 'English (Australia)',
+    value: 'en-AU',
+  },
+  {
+    name: 'English (United Kingdom)',
+    value: 'en-GB',
+  },
+  {
+    name: 'English (India)',
+    value: 'en-IN',
+  },
+  {
+    name: 'English (New Zealand)',
+    value: 'en-NZ',
+  },
+  {
+    name: 'English (United States)',
+    value: 'en-US',
+  },
+  {
+    name: 'French - general',
+    value: 'fr',
+  },
+  {
+    name: 'French (Canada)',
+    value: 'fr-CA',
+  },
+  {
+    name: 'German - general',
+    value: 'de',
+  },
+  {
+    name: 'Hindi - general',
+    value: 'hi',
+  },
+  {
+    name: 'Hindi (Roman Script)',
+    value: 'hi-Latin',
+  },
+  {
+    name: 'Indonesian - general',
+    value: 'in',
+  },
+  {
+    name: 'Italian - general',
+    value: 'it',
+  },
+  {
+    name: 'Japanese - general',
+    value: 'ja',
+  },
+  {
+    name: 'Korean - general',
+    value: 'ko',
+  },
+  {
+    name: 'Norwegian - general',
+    value: 'no',
+  },
+  {
+    name: 'Polish - general',
+    value: 'pl',
+  },
+  {
+    name: 'Portuguese - general',
+    value: 'pt',
+  },
+  {
+    name: 'Portuguese (Brazil)',
+    value: 'pt-BR',
+  },
+  {
+    name: 'Portuguese (Portugal)',
+    value: 'pt-PT',
+  },
+  {
+    name: 'Russian - general',
+    value: 'ru',
+  },
+  {
+    name: 'Spanish - general',
+    value: 'es',
+  },
+  {
+    name: 'Spanish (Latin America)',
+    value: 'es-419',
+  },
+  {
+    name: 'Swedish - general',
+    value: 'sv',
+  },
+  {
+    name: 'Turkish - general',
+    value: 'tr',
+  },
+  {
+    name: 'Ukrainian - general',
+    value: 'uk',
+  },
+  {
+    name: 'Flemish - general',
+    value: 'nl-BE',
+  },
+  {
+    name: 'Danish - general',
+    value: 'da',
+  },
+  {
+    name: 'Tamil - general',
+    value: 'ta',
+  },
+  {
+    name: 'Tamasheq - general',
+    value: 'taq',
+  },
 ];

lib/utils/speech-data/stt-model-openai.js

@@ -1,6 +0,0 @@
-module.exports = [
-  { name: 'Whisper', value: 'whisper-1' },
-  { name: 'GPT 4o Mini Transcribe', value: 'gpt-4o-mini-transcribe' },
-  { name: 'GLT 4o Transcribe', value: 'gpt-4o-transcribe' },
-];
-

lib/utils/speech-data/stt-openai.js

@@ -1,59 +0,0 @@
-module.exports = [
-  { name: 'Afrikaans', value: 'af' },
-  { name: 'Arabic', value: 'ar' },
-  { name: 'Azerbaijani', value: 'az' },
-  { name: 'Belarusian', value: 'be' },
-  { name: 'Bulgarian', value: 'bg' },
-  { name: 'Bosnian', value: 'bs' },
-  { name: 'Catalan', value: 'ca' },
-  { name: 'Czech', value: 'cs' },
-  { name: 'Welsh', value: 'cy' },
-  { name: 'Danish', value: 'da' },
-  { name: 'German', value: 'de' },
-  { name: 'Greek', value: 'el' },
-  { name: 'English', value: 'en' },
-  { name: 'Spanish', value: 'es' },
-  { name: 'Estonian', value: 'et' },
-  { name: 'Persian', value: 'fa' },
-  { name: 'Finnish', value: 'fi' },
-  { name: 'French', value: 'fr' },
-  { name: 'Galician', value: 'gl' },
-  { name: 'Hebrew', value: 'he' },
-  { name: 'Hindi', value: 'hi' },
-  { name: 'Croatian', value: 'hr' },
-  { name: 'Hungarian', value: 'hu' },
-  { name: 'Armenian', value: 'hy' },
-  { name: 'Indonesian', value: 'id' },
-  { name: 'Icelandic', value: 'is' },
-  { name: 'Italian', value: 'it' },
-  { name: 'Japanese', value: 'ja' },
-  { name: 'Kazakh', value: 'kk' },
-  { name: 'Kannada', value: 'kn' },
-  { name: 'Korean', value: 'ko' },
-  { name: 'Lithuanian', value: 'lt' },
-  { name: 'Latvian', value: 'lv' },
-  { name: 'Maori', value: 'mi' },
-  { name: 'Macedonian', value: 'mk' },
-  { name: 'Marathi', value: 'mr' },
-  { name: 'Malay', value: 'ms' },
-  { name: 'Nepali', value: 'ne' },
-  { name: 'Dutch', value: 'nl' },
-  { name: 'Norwegian', value: 'no' },
-  { name: 'Polish', value: 'pl' },
-  { name: 'Portuguese', value: 'pt' },
-  { name: 'Romanian', value: 'ro' },
-  { name: 'Russian', value: 'ru' },
-  { name: 'Slovak', value: 'sk' },
-  { name: 'Slovenian', value: 'sl' },
-  { name: 'Serbian', value: 'sr' },
-  { name: 'Swedish', value: 'sv' },
-  { name: 'Swahili', value: 'sw' },
-  { name: 'Tamil', value: 'ta' },
-  { name: 'Thai', value: 'th' },
-  { name: 'Tagalog', value: 'tl' },
-  { name: 'Turkish', value: 'tr' },
-  { name: 'Ukrainian', value: 'uk' },
-  { name: 'Urdu', value: 'ur' },
-  { name: 'Vietnamese', value: 'vi' },
-  { name: 'Chinese', value: 'zh' },
-];

lib/utils/speech-data/stt-speechmatics.js

@@ -1,218 +0,0 @@
-module.exports = [
-  {
-    name: 'Automatic',
-    value: 'auto',
-  },
-  {
-    name: 'Arabic',
-    value: 'ar',
-  },
-  {
-    name: 'Bashkir',
-    value: 'ba',
-  },
-  {
-    name: 'Basque',
-    value: 'eu',
-  },
-  {
-    name: 'Belarusian',
-    value: 'be',
-  },
-  {
-    name: 'Bulgarian',
-    value: 'bg',
-  },
-  {
-    name: 'Cantonese',
-    value: 'yue',
-  },
-  {
-    name: 'Catalan',
-    value: 'ca',
-  },
-  {
-    name: 'Croatian',
-    value: 'hr',
-  },
-  {
-    name: 'Czech',
-    value: 'cs',
-  },
-  {
-    name: 'Danish',
-    value: 'da',
-  },
-  {
-    name: 'Dutch',
-    value: 'nl',
-  },
-  {
-    name: 'English',
-    value: 'en',
-  },
-  {
-    name: 'Esperanto',
-    value: 'eo',
-  },
-  {
-    name: 'Estonian',
-    value: 'et',
-  },
-  {
-    name: 'Finnish',
-    value: 'fi',
-  },
-  {
-    name: 'French',
-    value: 'fr',
-  },
-  {
-    name: 'Galician',
-    value: 'gl',
-  },
-  {
-    name: 'German',
-    value: 'de',
-  },
-  {
-    name: 'Greek',
-    value: 'el',
-  },
-  {
-    name: 'Hebrew',
-    value: 'he',
-  },
-  {
-    name: 'Hindi',
-    value: 'hi',
-  },
-  {
-    name: 'Hungarian',
-    value: 'hu',
-  },
-  {
-    name: 'Irish',
-    value: 'ga',
-  },
-  {
-    name: 'Interlingua',
-    value: 'ia',
-  },
-  {
-    name: 'Italian',
-    value: 'it',
-  },
-  {
-    name: 'Indonesian',
-    value: 'id',
-  },
-  {
-    name: 'Japanese',
-    value: 'ja',
-  },
-  {
-    name: 'Korean',
-    value: 'ko',
-  },
-  {
-    name: 'Latvian',
-    value: 'lv',
-  },
-  {
-    name: 'Lithuanian',
-    value: 'lt',
-  },
-  {
-    name: 'Maltese',
-    value: 'mt',
-  },
-  {
-    name: 'Malay',
-    value: 'ms',
-  },
-  {
-    name: 'Mandarin',
-    value: 'cmn',
-  },
-  {
-    name: 'Marathi',
-    value: 'mr',
-  },
-  {
-    name: 'Mongolian',
-    value: 'mn',
-  },
-  {
-    name: 'Norwegian',
-    value: 'no',
-  },
-  {
-    name: 'Persian',
-    value: 'fa',
-  },
-  {
-    name: 'Polish',
-    value: 'pl',
-  },
-  {
-    name: 'Portuguese',
-    value: 'pt',
-  },
-  {
-    name: 'Romanian',
-    value: 'ro',
-  },
-  {
-    name: 'Russian',
-    value: 'ru',
-  },
-  {
-    name: 'Slovakian',
-    value: 'sk',
-  },
-  {
-    name: 'Slovenian',
-    value: 'sl',
-  },
-  {
-    name: 'Spanish',
-    value: 'es',
-  },
-  {
-    name: 'Spanish & English bilingual',
-    value: 'es',
-  },
-  {
-    name: 'Swedish',
-    value: 'sv',
-  },
-  {
-    name: 'Tamil',
-    value: 'ta',
-  },
-  {
-    name: 'Thai',
-    value: 'th',
-  },
-  {
-    name: 'Turkish',
-    value: 'tr',
-  },
-  {
-    name: 'Uyghur',
-    value: 'ug',
-  },
-  {
-    name: 'Ukrainian',
-    value: 'uk',
-  },
-  {
-    name: 'Vietnamese',
-    value: 'vi',
-  },
-  {
-    name: 'Welsh',
-    value: 'cy',
-  },
-];

lib/utils/speech-data/stt-voxist.js

@@ -1,8 +0,0 @@
-module.exports = [
-  { name: 'English', value: 'en' },
-  { name: 'French', value: 'fr' },
-  { name: 'German', value: 'de' },
-  { name: 'Dutch', value: 'nl' },
-  { name: 'Italian', value: 'it' },
-  { name: 'Spanish', value: 'sp' },
-];

lib/utils/speech-data/tts-cartesia.js

@@ -1,301 +0,0 @@
-/* eslint-disable max-len */
-module.exports = [
-  {
-    value: 'en',
-    name: 'English',
-    voices: [
-      {
-        value: '79f8b5fb-2cc8-479a-80df-29f7a7cf1a3e',
-        name: 'Nonfiction Man - This voice is smooth, confident, and resonant, perfect for narrating educational content',
-      },
-      {
-        value: 'e00d0e4c-a5c8-443f-a8a3-473eb9a62355',
-        name: 'Friendly Sidekick - This voice is friendly and supportive, designed for voicing characters in games and videos',
-      },
-      {
-        value: '3b554273-4299-48b9-9aaf-eefd438e3941',
-        name: 'Indian Lady - This voice is young, rich, and curious, perfect for a narrator or fictional character',
-      },
-      {
-        value: '71a7ad14-091c-4e8e-a314-022ece01c121',
-        name: 'British Reading Lady - This is a calm and elegant voice with a British accent, perfect for storytelling and narration',
-      },
-      {
-        value: '4d2fd738-3b3d-4368-957a-bb4805275bd9',
-        name: 'British Narration Lady - This is a neutral voice with a British accent, perfect for narrations ',
-      },
-      {
-        value: '15a9cd88-84b0-4a8b-95f2-5d583b54c72e',
-        name: 'Reading Lady - This voice is monotone and deliberate, perfect for a slower-paced and more serious reading voice',
-      },
-      {
-        value: 'd46abd1d-2d02-43e8-819f-51fb652c1c61',
-        name: 'Newsman - This voice is neutral and educational, perfect for a news anchor',
-      },
-      {
-        value: '2ee87190-8f84-4925-97da-e52547f9462c',
-        name: 'Child - This voice is young and full, perfect for a child',
-      },
-      {
-        value: 'cd17ff2d-5ea4-4695-be8f-42193949b946',
-        name: 'Meditation Lady - This voice is calm, soothing, and relaxing, perfect for meditation',
-      },
-      {
-        value: '5345cf08-6f37-424d-a5d9-8ae1101b9377',
-        name: 'Maria - This voice is laid back, natural, and conversational, like you\'re catching up with a good friend',
-      },
-      {
-        value: '41534e16-2966-4c6b-9670-111411def906',
-        name: '1920\'s Radioman - This voice is energetic and confident, great for an entertainer or radio host',
-      },
-      {
-        value: 'bf991597-6c13-47e4-8411-91ec2de5c466',
-        name: 'Newslady - This voice is authoritative and educational, perfect for a news anchor',
-      },
-      {
-        value: '00a77add-48d5-4ef6-8157-71e5437b282d',
-        name: 'Calm Lady - This voice is calm and nurturing, perfect for a narrator',
-      },
-      {
-        value: '156fb8d2-335b-4950-9cb3-a2d33befec77',
-        name: 'Helpful Woman - This voice is friendly and conversational, designed for customer support agents and casual conversations',
-      },
-      {
-        value: '36b42fcb-60c5-4bec-b077-cb1a00a92ec6',
-        name: 'Pilot over Intercom - This voice sounds like a British Pilot character speaking over an Intercom',
-      },
-      {
-        value: 'f146dcec-e481-45be-8ad2-96e1e40e7f32',
-        name: 'Reading Man - Male with calm narrational voice.',
-      },
-      {
-        value: '34575e71-908f-4ab6-ab54-b08c95d6597d',
-        name: 'New York Man - This voice is compelling and husky, with a New York accent, perfect for sales pitches and motivational content',
-      },
-      {
-        value: 'a0e99841-438c-4a64-b679-ae501e7d6091',
-        name: 'Barbershop Man - This voice is smooth and relaxing, perfect for a casual conversation',
-      },
-      {
-        value: '638efaaa-4d0c-442e-b701-3fae16aad012',
-        name: 'Indian Man - This voice is smooth with an Indian accent, perfect for a narrator',
-      },
-      {
-        value: '41f3c367-e0a8-4a85-89e0-c27bae9c9b6d',
-        name: 'Australian Customer Support Man - This voice is warm with an Australian accent, perfect for customer support agents',
-      },
-      {
-        value: '421b3369-f63f-4b03-8980-37a44df1d4e8',
-        name: 'Friendly Australian Man - This voice is rich and deep, with an Australian accent, perfect for casual conversations with a friend',
-      },
-      {
-        value: 'b043dea0-a007-4bbe-a708-769dc0d0c569',
-        name: 'Wise Man - This is a deep and deliberate voice, suited for educational content and conversations',
-      },
-      {
-        value: '69267136-1bdc-412f-ad78-0caad210fb40',
-        name: 'Friendly Reading Man - This voice is energetic and friendly, like having your friend read his favorite book to you',
-      },
-      {
-        value: 'a167e0f3-df7e-4d52-a9c3-f949145efdab',
-        name: 'Customer Support Man - This voice is clear and calm, perfect for a call center',
-      },
-      {
-        value: '4f8651b0-bbbd-46ac-8b37-5168c5923303',
-        name: 'Kentucky Woman - This voice is energetic and upbeat, with a slight Kentucky accent, perfect for speeches and rallies',
-      },
-      {
-        value: 'daf747c6-6bc2-4083-bd59-aa94dce23f5d',
-        name: 'Middle Eastern Woman - This voice is clear with a Middle Eastern Accent, perfect for a narrator',
-      },
-      {
-        value: '694f9389-aac1-45b6-b726-9d9369183238',
-        name: 'Sarah - This voice is natural and expressive with an American accent, perfect for a wide range of conversational use cases including customer support, sales, reception, and more.',
-      },
-      {
-        value: '794f9389-aac1-45b6-b726-9d9369183238',
-        name: 'Sarah Curious - This voice is similar to Sarah, but has improved emphasis for questions.',
-      },
-      {
-        value: '21b81c14-f85b-436d-aff5-43f2e788ecf8',
-        name: 'Laidback Woman - This voice is laid back and husky, with a slight Californian accent',
-      },
-      {
-        value: 'a3520a8f-226a-428d-9fcd-b0a4711a6829',
-        name: 'Reflective Woman - This voice is even, full, and reflective, perfect for a young narrator for an audiobook or movie',
-      },
-      {
-        value: '829ccd10-f8b3-43cd-b8a0-4aeaa81f3b30',
-        name: 'Customer Support Lady - This voice is polite and helpful, perfect for customer support agents',
-      },
-      {
-        value: '79a125e8-cd45-4c13-8a67-188112f4dd22',
-        name: 'British Lady - This voice is elegant with a slight British accent, perfect for storytelling and narrating',
-      },
-      {
-        value: 'c8605446-247c-4d39-acd4-8f4c28aa363c',
-        name: 'Wise Lady - This voice is wise and authoritative, perfect for a confident narrator',
-      },
-      {
-        value: '8985388c-1332-4ce7-8d55-789628aa3df4',
-        name: 'Australian Narrator Lady - This voice is even and neutral, with an Australian accent, designed for narrating content and stories',
-      },
-      {
-        value: 'ff1bb1a9-c582-4570-9670-5f46169d0fc8',
-        name: 'Indian Customer Support Lady - This voice is clear and polite, with an Indian accent, suitable for customer support agents',
-      },
-      {
-        value: '820a3788-2b37-4d21-847a-b65d8a68c99a',
-        name: 'Salesman - This voice is smooth and persuasive, perfect for sales pitches and phone conversations',
-      },
-      {
-        value: 'f114a467-c40a-4db8-964d-aaba89cd08fa',
-        name: 'Yogaman - This voice is calm, soothing, and stable, perfect for a yoga instructor',
-      },
-      {
-        value: 'c45bc5ec-dc68-4feb-8829-6e6b2748095d',
-        name: 'Movieman - This voice is deep, resonant, and assertive, perfect for a movie narrator',
-      },
-      {
-        value: '87748186-23bb-4158-a1eb-332911b0b708',
-        name: 'Wizardman - This voice is wise and mysterious, perfect for a Wizard character',
-      },
-      {
-        value: '043cfc81-d69f-4bee-ae1e-7862cb358650',
-        name: 'Australian Woman - This voice is deliberate and confident, with a slight Australian accent, perfect for inspiring characters in videos and stories',
-      },
-      {
-        value: '5619d38c-cf51-4d8e-9575-48f61a280413',
-        name: 'Announcer Man - This voice is deep and inviting, perfect for entertainment and broadcasting content',
-      },
-      {
-        value: '42b39f37-515f-4eee-8546-73e841679c1d',
-        name: 'Wise Guide Man - This voice is deep and deliberate, perfect for inspiring and guiding characters in games and videos',
-      },
-      {
-        value: '565510e8-6b45-45de-8758-13588fbaec73',
-        name: 'Midwestern Man - This voice is neutral and smooth, with a slight midwestern accent, perfect for narrations',
-      },
-      {
-        value: '726d5ae5-055f-4c3d-8355-d9677de68937',
-        name: 'Kentucky Man - This voice is laidback and smooth, with a Kentucky accent, perfect for a casual conversation',
-      },
-      {
-        value: '63ff761f-c1e8-414b-b969-d1833d1c870c',
-        name: 'Confident British Man - This voice is disciplined with a British accent, perfect for a commanding character or narrator',
-      },
-      {
-        value: '98a34ef2-2140-4c28-9c71-663dc4dd7022',
-        name: 'Southern Man - This voice is warm with a Southern accent, perfect for a narrator',
-      },
-      {
-        value: '95856005-0332-41b0-935f-352e296aa0df',
-        name: 'Classy British Man - This voice is light and smooth with a British accent, perfect for casual conversation',
-      },
-      {
-        value: 'ee7ea9f8-c0c1-498c-9279-764d6b56d189',
-        name: 'Polite Man - This voice is polite and conversational, with a slight accent, designed for customer support and casual conversations',
-      },
-      {
-        value: '40104aff-a015-4da1-9912-af950fbec99e',
-        name: 'Alabama Male - This voice has a strong Southern Accent, perfect for conversations and instructional videos',
-      },
-      {
-        value: '13524ffb-a918-499a-ae97-c98c7c4408c4',
-        name: 'Australian Male - This voice is smooth and disciplined, with an Australian Accent, suited for narrating educational content',
-      },
-      {
-        value: '1001d611-b1a8-46bd-a5ca-551b23505334',
-        name: 'Anime Girl - This voice is expressive and has a high pitch, suitable for anime or gaming characters',
-      },
-      {
-        value: 'e3827ec5-697a-4b7c-9704-1a23041bbc51',
-        name: 'Sweet Lady - This voice is sweet and passionate, perfect for a character in a game or book',
-      },
-      {
-        value: 'c2ac25f9-ecc4-4f56-9095-651354df60c0',
-        name: 'Commercial Lady - This voice is inviting, enthusiastic, and relatable, perfect for a commercial or advertisement',
-      },
-      {
-        value: '573e3144-a684-4e72-ac2b-9b2063a50b53',
-        name: 'Teacher Lady - This voice is neutral and clear, perfect for narrating educational content',
-      },
-      {
-        value: '8f091740-3df1-4795-8bd9-dc62d88e5131',
-        name: 'Princess - This voice is light, freindly and has a flourish, perfect for character work in videos and games',
-      },
-      {
-        value: '7360f116-6306-4e9a-b487-1235f35a0f21',
-        name: 'Commercial Man - This voice is upbeat and enthusiastic, perfect for commercials and advertisements',
-      },
-      {
-        value: '03496517-369a-4db1-8236-3d3ae459ddf7',
-        name: 'ASMR Lady - This voice is calming and soft, perfect for guided meditations and soothing content',
-      },
-      {
-        value: '248be419-c632-4f23-adf1-5324ed7dbf1d',
-        name: 'Professional Woman - This voice is neutral and calm, perfect for a call center',
-      },
-      {
-        value: 'bd9120b6-7761-47a6-a446-77ca49132781',
-        name: 'Tutorial Man - This voice is inviting and calming, perfect for tutorials',
-      },
-      {
-        value: '34bde396-9fde-4ebf-ad03-e3a1d1155205',
-        name: 'New York Woman - This voice commands authority, with a New York accent, perfect for a commanding narrator or character',
-      },
-      {
-        value: '11af83e2-23eb-452f-956e-7fee218ccb5c',
-        name: 'Midwestern Woman - This voice is neutral and deliberate, with a midwestern accent, suitable for news broadcasts and narration',
-      },
-      {
-        value: 'ed81fd13-2016-4a49-8fe3-c0d2761695fc',
-        name: 'Sportsman - This voice is energetic and enthusiastic, perfect for a sports broadcaster',
-      },
-      {
-        value: '996a8b96-4804-46f0-8e05-3fd4ef1a87cd',
-        name: 'Storyteller Lady - This voice is neutral and smooth, with a slight Canadian accent, perfect for narrations',
-      },
-      {
-        value: 'fb26447f-308b-471e-8b00-8e9f04284eb5',
-        name: 'Doctor Mischief - This is an expressive character voice, suited to whimsical characters for games and educational content',
-      },
-      {
-        value: '50d6beb4-80ea-4802-8387-6c948fe84208',
-        name: 'The Merchant - This voice is playful and quirky, designed for character work in games and videos',
-      },
-      {
-        value: 'e13cae5c-ec59-4f71-b0a6-266df3c9bb8e',
-        name: 'Madame Mischief - This voice is mischeivious and playful, suitable for voicing characters for kids content and games',
-      },
-      {
-        value: '5c42302c-194b-4d0c-ba1a-8cb485c84ab9',
-        name: 'Female Nurse - This voice is clear and firm, perfect for nurse characters and instructional videos',
-      },
-      {
-        value: 'f9836c6e-a0bd-460e-9d3c-f7299fa60f94',
-        name: 'Southern Woman - This voice is friendly and inviting, with a slight Southern Accent, perfect for conversations and phone calls',
-      },
-      {
-        value: 'a01c369f-6d2d-4185-bc20-b32c225eab70',
-        name: 'British Customer Support Lady - This voice is friendly and polite, with a British accent, perfect for phone conversations',
-      },
-      {
-        value: 'b7d50908-b17c-442d-ad8d-810c63997ed9',
-        name: 'California Girl - This voice is enthusiastic and friendly, perfect for a casual conversation between friends',
-      },
-      {
-        value: 'f785af04-229c-4a7c-b71b-f3194c7f08bb',
-        name: 'John - This voice is natural and empathetic with an American accent, perfect for use cases like demos and customer support calls.',
-      },
-      {
-        value: '729651dc-c6c3-4ee5-97fa-350da1f88600',
-        name: 'Pleasant Man - A pleasant male voice that\'s good for use cases like demos and customer support calls',
-      },
-      {
-        value: '91b4cf29-5166-44eb-8054-30d40ecc8081',
-        name: 'Anna - This voice is natural and expressive with an American accent, perfect for use cases like interviews and customer support calls.',
-      },
-    ],
-  },
-];

lib/utils/speech-data/tts-deepgram.js

@@ -1,28 +0,0 @@
-const TtsDeepgramLanguagesVoiceRaw = require('./tts-model-deepgram');
-
-const languagesVoices = [];
-
-TtsDeepgramLanguagesVoiceRaw.forEach((data) => {
-  const lang = languagesVoices.find((l) => {
-    return l.value === data.locale;
-  });
-
-  if (!lang) {
-    languagesVoices.push({
-      value: data.locale,
-      name: data.localeName,
-      voices: TtsDeepgramLanguagesVoiceRaw
-        .filter((d) => {
-          return d.locale === data.locale;
-        })
-        .map((d) => {
-          return {
-            value: d.value,
-            name: `${d.name}`,
-          };
-        }),
-    });
-  }
-});
-
-module.exports = languagesVoices;

lib/utils/speech-data/tts-languages-playht.js

@@ -1,152 +0,0 @@
-// languages.js
-
-module.exports = [
-  {
-    name: 'English',
-    value: 'english'
-  },
-  {
-    name: 'Mandarin',
-    value: 'mandarin'
-  },
-  {
-    name: 'Hindi',
-    value: 'hindi'
-  },
-  {
-    name: 'Japanese',
-    value: 'japanese'
-  },
-  {
-    name: 'Korean',
-    value: 'korean'
-  },
-  {
-    name: 'Arabic',
-    value: 'arabic'
-  },
-  {
-    name: 'Spanish',
-    value: 'spanish'
-  },
-  {
-    name: 'French',
-    value: 'french'
-  },
-  {
-    name: 'Italian',
-    value: 'italian'
-  },
-  {
-    name: 'Portuguese',
-    value: 'portuguese'
-  },
-  {
-    name: 'German',
-    value: 'german'
-  },
-  {
-    name: 'Dutch',
-    value: 'dutch'
-  },
-  {
-    name: 'Swedish',
-    value: 'swedish'
-  },
-  {
-    name: 'Czech',
-    value: 'czech'
-  },
-  {
-    name: 'Polish',
-    value: 'polish'
-  },
-  {
-    name: 'Russian',
-    value: 'russian'
-  },
-  {
-    name: 'Bulgarian',
-    value: 'bulgarian'
-  },
-  {
-    name: 'Hebrew',
-    value: 'hebrew'
-  },
-  {
-    name: 'Greek',
-    value: 'greek'
-  },
-  {
-    name: 'Turkish',
-    value: 'turkish'
-  },
-  {
-    name: 'Afrikaans',
-    value: 'afrikaans'
-  },
-  {
-    name: 'Xhosa',
-    value: 'xhosa'
-  },
-  {
-    name: 'Tagalog',
-    value: 'tagalog'
-  },
-  {
-    name: 'Malay',
-    value: 'malay'
-  },
-  {
-    name: 'Indonesian',
-    value: 'indonesian'
-  },
-  {
-    name: 'Bengali',
-    value: 'bengali'
-  },
-  {
-    name: 'Serbian',
-    value: 'serbian'
-  },
-  {
-    name: 'Thai',
-    value: 'thai'
-  },
-  {
-    name: 'Urdu',
-    value: 'urdu'
-  },
-  {
-    name: 'Croatian',
-    value: 'croatian'
-  },
-  {
-    name: 'Hungarian',
-    value: 'hungarian'
-  },
-  {
-    name: 'Danish',
-    value: 'danish'
-  },
-  {
-    name: 'Amharic',
-    value: 'amharic'
-  },
-  {
-    name: 'Albanian',
-    value: 'albanian'
-  },
-  {
-    name: 'Catalan',
-    value: 'catalan'
-  },
-  {
-    name: 'Ukrainian',
-    value: 'ukrainian'
-  },
-  {
-    name: 'Galician',
-    value: 'galician'
-  }
-];

lib/utils/speech-data/tts-model-cartesia.js

@@ -1,35 +0,0 @@
-module.exports = [
-  {
-    name: 'Sonic',
-    value: 'sonic',
-    languages: ['en', 'fr', 'de', 'es', 'pt', 'zh', 'ja', 'hi', 'it', 'ko', 'nl', 'pl', 'ru', 'sv', 'tr']
-  },
-  {
-    name: 'Sonic 2',
-    value: 'sonic-2',
-    languages: ['en', 'fr', 'de', 'es', 'pt', 'zh', 'ja', 'hi', 'it', 'ko', 'nl', 'pl', 'ru', 'sv', 'tr']
-  },
-  {
-    name: 'Sonic Turbo',
-    value: 'sonic-turbo',
-    languages: ['en', 'fr', 'de', 'es', 'pt', 'zh', 'ja', 'hi', 'it', 'ko', 'nl', 'pl', 'ru', 'sv', 'tr']
-  },
-  { name: 'Sonic Preview', value: 'sonic-preview', languages: ['en'] },
-  {
-    name: 'Sonic 2024-12-12',
-    value: 'sonic-2024-12-12',
-    languages: ['en', 'fr', 'de', 'es', 'pt', 'zh', 'ja', 'hi', 'it', 'ko', 'nl', 'pl', 'ru', 'sv', 'tr']
-  },
-  {
-    name: 'Sonic 2024-10-19',
-    value: 'sonic-2024-10-19',
-    languages: ['en', 'fr', 'de', 'es', 'pt', 'zh', 'ja', 'hi', 'it', 'ko', 'nl', 'pl', 'ru', 'sv', 'tr']
-  },
-  { name: 'Sonic English', value: 'sonic-english', languages: ['en'] },
-  {
-    name: 'Sonic Multilingual',
-    value: 'sonic-multilingual',
-    languages: ['en', 'fr', 'de', 'es', 'pt', 'zh', 'ja', 'hi', 'it', 'ko', 'nl', 'pl', 'ru', 'sv', 'tr']
-  },
-];
-

lib/utils/speech-data/tts-model-deepgram.js

@@ -1,68 +1,14 @@
 module.exports = [
-  {
-    locale: 'en-US',
-    localeName: 'English (US)',
-    name: 'Asteria English (US) Female',
-    value: 'aura-asteria-en'
-  },
-  {
-    locale: 'en-US',
-    localeName: 'English (US)',
-    name: 'Luna English (US) Female',
-    value: 'aura-luna-en'
-  },
-  {
-    locale: 'en-US',
-    localeName: 'English (US)',
-    name: 'Stella English (US) Female',
-    value: 'aura-stella-en'
-  },
-  {
-    locale: 'en-GB',
-    localeName: 'English (UK)',
-    name: 'Stella English (UK) Female',
-    value: 'aura-athena-en'
-  },
-  {
-    locale: 'en-US',
-    localeName: 'English (US)',
-    name: 'Hera English (US) Female',
-    value: 'aura-hera-en'
-  },
-  {
-    locale: 'en-US',
-    localeName: 'English (US)',
-    name: 'Orion English (US) Male',
-    value: 'aura-orion-en'
-  },
-  {
-    locale: 'en-US',
-    localeName: 'English (US)',
-    name: 'Arcas English (US) Male',
-    value: 'aura-arcas-en'
-  },
-  {
-    locale: 'en-US',
-    localeName: 'English (US)',
-    name: 'Perseus English (US) Male',
-    value: 'aura-perseus-en'
-  },
-  {
-    locale: 'en-IE',
-    localeName: 'English (Ireland)',
-    name: 'Angus English (Ireland) Male',
-    value: 'aura-angus-en'
-  },
-  {
-    locale: 'en-US',
-    localeName: 'English (US)',
-    name: 'Orpheus English (US) Male',
-    value: 'aura-orpheus-en'
-  },
-  {
-    locale: 'en-US',
-    localeName: 'English (US)',
-    name: 'Zeus English (US) Male',
-    value: 'aura-zeus-en'
-  },
+  { name: 'Asteria English (US) Female', value: 'aura-asteria-en' },
+  { name: 'Luna English (US) Female', value: 'aura-luna-en' },
+  { name: 'Stella English (US) Female', value: 'aura-stella-en' },
+  { name: 'Stella English (UK) Female', value: 'aura-athena-en' },
+  { name: 'Hera English (US) Female', value: 'aura-hera-en' },
+  { name: 'Orion English (US) Male', value: 'aura-orion-en' },
+  { name: 'Arcas English (US) Male', value: 'aura-arcas-en' },
+  { name: 'Perseus English (US) Male', value: 'aura-perseus-en' },
+  { name: 'Angus English (Ireland) Male', value: 'aura-angus-en' },
+  { name: 'Orpheus English (US) Male', value: 'aura-orpheus-en' },
+  { name: 'Helios English (UK) Male', value: 'aura-helios-en' },
+  { name: 'Zeus English (US) Male', value: 'aura-zeus-en' },
 ];

lib/utils/speech-data/tts-model-elevenlabs.js

@@ -1,11 +1,7 @@
 module.exports = [
   { name: 'Turbo v2', value: 'eleven_turbo_v2' },
-  { name: 'Turbo v2.5', value: 'eleven_turbo_v2_5' },
-  { name: 'Flash v2', value: 'eleven_flash_v2' },
-  { name: 'Flash v2.5', value: 'eleven_flash_v2_5' },
-  { name: 'Multilingual v1', value: 'eleven_multilingual_v1' },
   { name: 'Multilingual v2', value: 'eleven_multilingual_v2' },
-  { name: 'Multilingual STS v2', value: 'eleven_multilingual_sts_v2' },
+  { name: 'Multilingual v1', value: 'eleven_multilingual_v1' },
   { name: 'English v1', value: 'eleven_monolingual_v1' },
   { name: 'English v2', value: 'eleven_english_sts_v2' },
 ];

lib/utils/speech-data/tts-model-openai.js

@@ -1,6 +0,0 @@
-module.exports = [
-  { name: 'TTS-1', value: 'tts-1' },
-  { name: 'TTS-1-HD', value: 'tts-1-hd' },
-  { name: 'GPT-4o-Mini-TTS', value: 'gpt-4o-mini-tts' },
-];
-

lib/utils/speech-data/tts-model-playht.js

@@ -1,5 +1,4 @@
 module.exports = [
-  { name: 'Play3.0', value: 'Play3.0' },
   { name: 'PlayHT2.0-turbo', value: 'PlayHT2.0-turbo' },
   { name: 'PlayHT2.0', value: 'PlayHT2.0' },
   { name: 'PlayHT1.0', value: 'PlayHT1.0' },

lib/utils/speech-data/tts-model-rimelabs.js

@@ -1,6 +1,5 @@
 module.exports = [
   { name: 'Mist', value: 'mist' },
-  { name: 'Mistv2', value: 'mistv2' },
   { name: 'V1', value: 'v1' },
 ];
 

lib/utils/speech-data/tts-verbio.js

@@ -1,4 +1,14 @@
 module.exports = [
+  {
+    value: 'en-US',
+    name: 'US English',
+    voices: [
+      {
+        value: 'tommy_en_us',
+        name: 'Tommy-Male',
+      },
+    ],
+  },
   {
     value: 'es-ES',
     name: 'Castilian Spanish',
@@ -17,6 +27,12 @@ module.exports = [
         value: 'miguel_es_pe',
         name: 'Miguel-Male',
       },
+    ],
+  },
+  {
+    value: 'es-PE',
+    name: 'Peruvian Spanish',
+    voices: [
       {
         value: 'luz_es_pe',
         name: 'Luz-Female',

lib/utils/speech-utils.js

@@ -7,7 +7,6 @@ const bent = require('bent');
 const fs = require('fs');
 const { AssemblyAI } = require('assemblyai');
 const {decrypt, obscureKey} = require('./encrypt-decrypt');
-const { RealtimeSession } = require('speechmatics');
 
 const TtsGoogleLanguagesVoices = require('./speech-data/tts-google');
 const TtsAwsLanguagesVoices = require('./speech-data/tts-aws');
@@ -20,17 +19,12 @@ const TtsElevenlabsLanguagesVoices = require('./speech-data/tts-elevenlabs');
 const TtsWhisperLanguagesVoices = require('./speech-data/tts-whisper');
 const TtsPlayHtLanguagesVoices = require('./speech-data/tts-playht');
 const TtsVerbioLanguagesVoices = require('./speech-data/tts-verbio');
-const ttsCartesia = require('./speech-data/tts-cartesia');
 
 const TtsModelDeepgram = require('./speech-data/tts-model-deepgram');
-const TtsLanguagesDeepgram = require('./speech-data/tts-deepgram');
 const TtsModelElevenLabs = require('./speech-data/tts-model-elevenlabs');
 const TtsModelWhisper = require('./speech-data/tts-model-whisper');
 const TtsModelPlayHT = require('./speech-data/tts-model-playht');
-const ttsLanguagesPlayHt = require('./speech-data/tts-languages-playht');
 const TtsModelRimelabs = require('./speech-data/tts-model-rimelabs');
-const TtsModelCartesia = require('./speech-data/tts-model-cartesia');
-const TtsModelOpenai = require('./speech-data/tts-model-openai');
 
 const SttGoogleLanguagesVoices = require('./speech-data/stt-google');
 const SttAwsLanguagesVoices = require('./speech-data/stt-aws');
@@ -41,15 +35,8 @@ const SttIbmLanguagesVoices = require('./speech-data/stt-ibm');
 const SttNvidiaLanguagesVoices = require('./speech-data/stt-nvidia');
 const SttCobaltLanguagesVoices = require('./speech-data/stt-cobalt');
 const SttSonioxLanguagesVoices = require('./speech-data/stt-soniox');
-const SttSpeechmaticsLanguagesVoices = require('./speech-data/stt-speechmatics');
 const SttAssemblyaiLanguagesVoices = require('./speech-data/stt-assemblyai');
-const SttVoxistLanguagesVoices = require('./speech-data/stt-voxist');
 const SttVerbioLanguagesVoices = require('./speech-data/stt-verbio');
-const SttOpenaiLanguagesVoices = require('./speech-data/stt-openai');
-
-
-const SttModelOpenai = require('./speech-data/stt-model-openai');
-
 
 const testSonioxStt = async(logger, credentials) => {
   const api_key = credentials;
@@ -67,61 +54,6 @@ const testSonioxStt = async(logger, credentials) => {
   });
 };
 
-const testSpeechmaticsStt = async(logger, credentials) => {
-  const {api_key, speechmatics_stt_uri} = credentials;
-  return new Promise(async(resolve, reject) => {
-    try {
-      const session = new RealtimeSession({ apiKey: api_key, realtimeUrl: speechmatics_stt_uri });
-      let transcription = '';
-      session.addListener('Error', (error) => {
-        reject(error);
-      });
-
-      session.addListener('AddTranscript', (message) => {
-        transcription += message.metadata.transcript;
-      });
-
-      session.addListener('EndOfTranscript', () => {
-        resolve(transcription);
-      });
-
-      session
-        .start({
-          transcription_config: {
-            language: 'en',
-            operating_point: 'enhanced',
-            enable_partials: true,
-            max_delay: 2,
-          },
-          audio_format: { type: 'file' },
-        })
-        .then(() => {
-          //prepare file stream
-          const fileStream = fs.createReadStream(`${__dirname}/../../data/test_audio.wav`);
-
-          //send it
-          fileStream.on('data', (sample) => {
-            session.sendAudio(sample);
-          });
-
-          //end the session
-          fileStream.on('end', () => {
-            session.stop();
-          });
-
-          return;
-
-        })
-        .catch((error) => {
-          reject(error);
-        });
-    } catch (error) {
-      logger.info({error}, 'failed to get speechmatics transcript');
-      reject(error);
-    }
-  });
-};
-
 const testNuanceTts = async(logger, getTtsVoices, credentials) => {
   const voices = await getTtsVoices({vendor: 'nuance', credentials});
   return voices;
@@ -160,8 +92,8 @@ const testGoogleStt = async(logger, credentials) => {
 };
 
 const testDeepgramStt = async(logger, credentials) => {
-  const {api_key, deepgram_stt_uri, deepgram_stt_use_tls} = credentials;
-  const deepgram = new Deepgram(api_key, deepgram_stt_uri, deepgram_stt_uri && deepgram_stt_use_tls);
+  const {api_key} = credentials;
+  const deepgram = new Deepgram(api_key);
 
   const mimetype = 'audio/wav';
   const source = {
@@ -338,10 +270,9 @@ const testPlayHT = async(logger, synthAudio, credentials) => {
       {
         vendor: 'playht',
         credentials,
-        language: 'english',
+        language: 'en-US',
         voice: 's3://voice-cloning-zero-shot/d9ff78ba-d016-47f6-b0ef-dd630f59414e/female-cs/manifest.json',
-        text: 'Hi there and welcome to jambones!',
-        renderForCaching: true
+        text: 'Hi there and welcome to jambones!'
       }
     );
     // Test if playHT can fetch voices
@@ -364,8 +295,7 @@ const testRimelabs = async(logger, synthAudio, credentials) => {
         credentials,
         language: 'en-US',
         voice: 'amber',
-        text: 'Hi there and welcome to jambones!',
-        renderForCaching: true
+        text: 'Hi there and welcome to jambones!'
       }
     );
   } catch (err) {
@@ -382,8 +312,7 @@ const testWhisper = async(logger, synthAudio, credentials) => {
         credentials,
         language: 'en-US',
         voice: 'alloy',
-        text: 'Hi there and welcome to jambones!',
-        renderForCaching: true
+        text: 'Hi there and welcome to jambones!'
       }
     );
   } catch (err) {
@@ -399,8 +328,7 @@ const testDeepgramTTS = async(logger, synthAudio, credentials) => {
         vendor: 'deepgram',
         credentials,
         model: 'aura-asteria-en',
-        text: 'Hi there and welcome to jambones!',
-        renderForCaching: true
+        text: 'Hi there and welcome to jambones!'
       }
     );
   } catch (err) {
@@ -455,8 +383,7 @@ const testVerbioTts = async(logger, synthAudio, credentials) => {
         credentials,
         language: 'en-US',
         voice: 'tommy_en-us',
-        text: 'Hi there and welcome to jambones!',
-        renderForCaching: true
+        text: 'Hi there and welcome to jambones!'
       }
     );
   } catch (err) {
@@ -481,43 +408,6 @@ const testVerbioStt = async(logger, getVerbioAccessToken, credentials) => {
   }
 };
 
-const testOpenAiStt = async(logger, credentials) => {
-  const {api_key} = credentials;
-  try {
-    // Create a FormData object to properly format the multipart request
-    const formData = new FormData();
-
-    // Add the audio file as 'file' field
-    const audioBuffer = fs.readFileSync(`${__dirname}/../../data/test_audio.wav`);
-    const blob = new Blob([audioBuffer], { type: 'audio/wav' });
-    formData.append('file', blob, 'audio.wav');
-
-    // Add the model parameter (required by OpenAI)
-    formData.append('model', 'whisper-1');
-
-    // Make the request using fetch
-    const response = await fetch('https://api.openai.com/v1/audio/transcriptions', {
-      method: 'POST',
-      headers: {
-        'Authorization': `Bearer ${api_key}`,
-        'User-Agent': 'jambonz'
-      },
-      body: formData
-    });
-
-    if (!response.ok) {
-      throw new Error(`OpenAI API error: ${response.status} ${(await response.json()).error?.message}`);
-    }
-
-    const json = await response.json();
-    logger.debug({json}, 'successfully speech to text from OpenAI');
-    return json;
-  } catch (err) {
-    logger.info({err}, 'OpenAI speech-to-text request failed');
-    throw err;
-  }
-};
-
 const testAssemblyStt = async(logger, credentials) => {
   const {api_key} = credentials;
 
@@ -544,20 +434,6 @@ const testAssemblyStt = async(logger, credentials) => {
   });
 };
 
-const testVoxistStt = async(logger, credentials) => {
-  const {api_key} = credentials;
-  try {
-    const get = bent('https://api-asr.voxist.com', 'GET', 'json', {
-      'Accept': 'application/json',
-      'x-lvl-key': api_key
-    });
-    await get('/clients');
-  } catch (err) {
-    logger.info({err}, 'failed to get clients from Voxist');
-    throw err;
-  }
-};
-
 const getSpeechCredential = (credential, logger) => {
   const {vendor} = credential;
   logger.info(
@@ -633,7 +509,6 @@ function decryptCredential(obj, credential, logger, isObscureKey = true) {
     obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
     obj.deepgram_stt_uri = o.deepgram_stt_uri;
     obj.deepgram_stt_use_tls = o.deepgram_stt_use_tls;
-    obj.deepgram_tts_uri = o.deepgram_tts_uri;
   }
   else if ('ibm' === obj.vendor) {
     const o = JSON.parse(decrypt(credential));
@@ -651,10 +526,6 @@ function decryptCredential(obj, credential, logger, isObscureKey = true) {
   } else if ('soniox' === obj.vendor) {
     const o = JSON.parse(decrypt(credential));
     obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
-  } else if ('speechmatics' === obj.vendor) {
-    const o = JSON.parse(decrypt(credential));
-    obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
-    obj.speechmatics_stt_uri = o.speechmatics_stt_uri;
   } else if ('elevenlabs' === obj.vendor) {
     const o = JSON.parse(decrypt(credential));
     obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
@@ -666,11 +537,6 @@ function decryptCredential(obj, credential, logger, isObscureKey = true) {
     obj.user_id = o.user_id;
     obj.voice_engine = o.voice_engine;
     obj.options = o.options;
-  } else if ('cartesia' === 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 ('rimelabs' === obj.vendor) {
     const o = JSON.parse(decrypt(credential));
     obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
@@ -681,21 +547,13 @@ function decryptCredential(obj, credential, logger, isObscureKey = true) {
     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;
-    obj.custom_tts_streaming_url = o.custom_tts_streaming_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 ('voxist' === 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;
-  } else if ('openai' === 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;
   } else if ('verbio' === obj.vendor) {
     const o = JSON.parse(decrypt(credential));
     obj.client_id = o.client_id;
@@ -755,18 +613,10 @@ async function getLanguagesAndVoicesForVendor(logger, vendor, credential, getTts
       return await getLanguagesVoicesForRimelabs(credential, getTtsVoices, logger);
     case 'assemblyai':
       return await getLanguagesVoicesForAssemblyAI(credential, getTtsVoices, logger);
-    case 'voxist':
-      return await getLanguagesVoicesForVoxist(credential, getTtsVoices, logger);
     case 'whisper':
       return await getLanguagesVoicesForWhisper(credential, getTtsVoices, logger);
-    case 'openai':
-      return await getLanguagesVoicesForOpenAi(credential, getTtsVoices, logger);
     case 'verbio':
       return await getLanguagesVoicesForVerbio(credential, getTtsVoices, logger);
-    case 'speechmatics':
-      return await getLanguagesVoicesForSpeechmatics(credential, getTtsVoices, logger);
-    case 'cartesia':
-      return await getLanguagesVoicesForCartesia(credential, getTtsVoices, logger);
     default:
       logger.info(`invalid vendor ${vendor}, return empty result`);
       throw new Error(`Invalid vendor ${vendor}`);
@@ -848,7 +698,7 @@ async function getLanguagesVoicesForNuane(credential, getTtsVoices, logger) {
 }
 
 async function getLanguagesVoicesForDeepgram(credential) {
-  return tranform(TtsLanguagesDeepgram, SttDeepgramLanguagesVoices, TtsModelDeepgram);
+  return tranform(undefined, SttDeepgramLanguagesVoices, TtsModelDeepgram);
 }
 
 async function getLanguagesVoicesForIbm(credential, getTtsVoices, logger) {
@@ -879,10 +729,6 @@ async function getLanguagesVoicesForSoniox(credential) {
   return tranform(undefined, SttSonioxLanguagesVoices);
 }
 
-async function getLanguagesVoicesForSpeechmatics(credential) {
-  return tranform(undefined, SttSpeechmaticsLanguagesVoices);
-}
-
 async function getLanguagesVoicesForElevenlabs(credential) {
   if (credential) {
     const get = bent('https://api.elevenlabs.io', 'GET', 'json', {
@@ -892,13 +738,6 @@ async function getLanguagesVoicesForElevenlabs(credential) {
     const [langResp, voiceResp] = await Promise.all([get('/v1/models'), get('/v1/voices')]);
 
     const model = langResp.find((m) => m.model_id === credential.model_id);
-    const models = langResp.map((m) => {
-      return {
-        value: m.model_id,
-        name: m.name
-      };
-    }).sort((a, b) => a.name.localeCompare(b.name));
-
     const languages = model ? model.languages.map((l) => {
       return {
         value: l.language_id,
@@ -907,35 +746,27 @@ async function getLanguagesVoicesForElevenlabs(credential) {
     }).sort((a, b) => a.name.localeCompare(b.name)) : [];
 
     if (languages && languages.length > 0) {
-      // using if condition to avoid \n character in name
       const voices = voiceResp ? voiceResp.voices.map((v) => {
-        let name = `${v.name}${v.category !== 'premade' ? ` (${v.category.trim()})` : ''} - (`;
-        if (v.labels.accent) name += `${v.labels.accent}, `;
-        if (v.labels.description) name += `${v.labels.description}, `;
-        if (v.labels.age) name += `${v.labels.age}, `;
-        if (v.labels.gender) name += `${v.labels.gender}, `;
-        if (v.labels['use case']) name += `${v.labels['use case']}, `;
-
+        let name = `${v.name}${v.category !== 'premade' ? ` (${v.category})` : ''} -
+  ${v.labels.accent ? ` ${v.labels.accent},` : ''}
+  ${v.labels.description ? ` ${v.labels.description},` : ''}
+  ${v.labels.age ? ` ${v.labels.age},` : ''}
+  ${v.labels.gender ? ` ${v.labels.gender},` : ''}
+  ${v.labels['use case'] ? ` ${v.labels['use case']},` : ''}
+  `;
         const lastIndex = name.lastIndexOf(',');
         if (lastIndex !== -1) {
           name = name.substring(0, lastIndex);
         }
-        name += ')';
         return {
           value: v.voice_id,
           name
         };
       }).sort((a, b) => a.name.localeCompare(b.name)) : [];
-      for (const language of languages) {
-        language.voices = voices;
-      }
+      languages[0].voices = voices;
     }
-    return tranform(languages, undefined, models);
+    return tranform(languages, undefined, TtsModelElevenLabs);
   } else {
-    const voices = TtsElevenlabsLanguagesVoices[0].voices;
-    for (const language of TtsElevenlabsLanguagesVoices) {
-      language.voices = voices;
-    }
     return tranform(TtsElevenlabsLanguagesVoices, undefined, TtsModelElevenLabs);
   }
 }
@@ -965,67 +796,42 @@ const fetchLayHTVoices = async(credential) => {
 
 async function getLanguagesVoicesForPlayHT(credential) {
   if (credential) {
-    const {voice_engine} = credential;
     const [cloned_voice, voices] = await fetchLayHTVoices(credential);
     const list_voices = [...cloned_voice, ...voices];
 
     const buildVoice = (d) => {
-      let name = `${d.name} - (${concat(d.accent)}${concat(d.age)}${concat(d.gender)}${concat(d.loudness)}` +
+      let name = `${d.name} -${concat(d.accent)}${concat(d.age)}${concat(d.gender)}${concat(d.loudness)}` +
       `${concat(d.style)}${concat(d.tempo)}${concat(d.texture)}` ;
       name = name.endsWith(',') ? name.trim().slice(0, -1) : name;
-      name += !d.language_code ? ' - Custom Voice' : '';
-      name += ')';
-      name = name.replaceAll('( ', '(');
-
       return {
         value: `${d.id}`,
         name
       };
     };
 
-    const buildPlay30Payload = () => {
-      // PlayHT3.0 can play different languages with differrent voice.
-      // all voices will be added to english language by default and orther langauges will get voices from english.
-      const ttsVoices = ttsLanguagesPlayHt.map((l) => ({
-        ...l,
-        voices: l.value === 'english' ? list_voices.map((v) => buildVoice(v)) : []
-      }));
-      return tranform(ttsVoices, undefined, TtsModelPlayHT);
-    };
-
-    const buildPayload = () => {
-      const ttsVoices = list_voices.reduce((acc, voice) => {
-        if (!voice_engine.includes(voice.voice_engine)) {
-          return acc;
-        }
-        const languageCode = voice.language_code;
-        // custom voice does not have language code
-        if (!languageCode) {
-          voice.language_code = 'en';
-          voice.language = 'Custom-English';
-        }
-        const existingLanguage = acc.find((lang) => lang.value === languageCode);
-        if (existingLanguage) {
-          existingLanguage.voices.push(buildVoice(voice));
-        } else {
-          acc.push({
-            value: voice.language_code,
-            name: voice.language,
-            voices: [buildVoice(voice)]
-          });
-        }
+    const ttsVoices = list_voices.reduce((acc, voice) => {
+      if (!credential.voice_engine.includes(voice.voice_engine)) {
         return acc;
-      }, []);
-      return tranform(ttsVoices, undefined, TtsModelPlayHT);
-    };
-
-    switch (voice_engine) {
-      case 'Play3.0':
-        return buildPlay30Payload();
-
-      default:
-        return buildPayload();
-    }
+      }
+      const languageCode = voice.language_code;
+      // custom voice does not have language code
+      if (!languageCode) {
+        voice.language_code = 'en';
+        voice.language = 'Custom-English';
+      }
+      const existingLanguage = acc.find((lang) => lang.value === languageCode);
+      if (existingLanguage) {
+        existingLanguage.voices.push(buildVoice(voice));
+      } else {
+        acc.push({
+          value: voice.language_code,
+          name: voice.language,
+          voices: [buildVoice(voice)]
+        });
+      }
+      return acc;
+    }, []);
+    return tranform(ttsVoices, undefined, TtsModelPlayHT);
   }
   return tranform(TtsPlayHtLanguagesVoices, undefined, TtsModelPlayHT);
 }
@@ -1035,17 +841,19 @@ async function getLanguagesVoicesForRimelabs(credential) {
   const get = bent('https://users.rime.ai', 'GET', 'json', {
     'Accept': 'application/json'
   });
-  const voices = await get('/data/voices/all-v2.json');
-  const modelVoices = model_id ? voices[model_id] :
-    Object.keys(voices).length > 0 ? voices[Object.keys(voices)[0]] : [];
-  const ttsVoices = Object.entries(modelVoices).map(([key, voices]) => ({
-    value: key,
-    name: key.charAt(0).toUpperCase() + key.slice(1),
-    voices: voices.map((v) => ({
-      name: v.charAt(0).toUpperCase() + v.slice(1),
-      value: v
-    }))
+  const voices = await get('/data/voices/all.json');
+  let selectedVoices = model_id ? voices[model_id] : Object.values(voices).reduce((acc, val) => [...acc, ...val], []);
+  selectedVoices = selectedVoices.map((v) => ({
+    name: v.charAt(0).toUpperCase() + v.slice(1),
+    value: v
   }));
+  const ttsVoices = [
+    {
+      value: 'en-US',
+      name: 'English (US)',
+      voices: selectedVoices
+    }
+  ];
   return tranform(ttsVoices, undefined, TtsModelRimelabs);
 }
 
@@ -1053,44 +861,32 @@ async function getLanguagesVoicesForAssemblyAI(credential) {
   return tranform(undefined, SttAssemblyaiLanguagesVoices);
 }
 
-async function getLanguagesVoicesForVoxist(credential) {
-  return tranform(undefined, SttVoxistLanguagesVoices);
-}
-
 async function getLanguagesVoicesForWhisper(credential) {
   return tranform(TtsWhisperLanguagesVoices, undefined, TtsModelWhisper);
 }
 
-async function getLanguagesVoicesForOpenAi(credential) {
-  return tranform(undefined, SttOpenaiLanguagesVoices, TtsModelOpenai, SttModelOpenai);
-}
-
 async function getLanguagesVoicesForVerbio(credentials, getTtsVoices, logger) {
   const stt = SttVerbioLanguagesVoices.reduce((acc, v) => {
-    if (!v.version || (credentials && credentials.engine_version === v.version)) {
+    if (!v.version || credentials.engine_version === v.version) {
       acc.push(v);
     }
     return acc;
   }, []);
   try {
-    if (credentials) {
-      const data = await getTtsVoices({vendor: 'verbio', credentials});
-      const voices = parseVerbioLanguagesVoices(data);
-      return tranform(voices, stt, undefined);
-    }
-    return tranform(TtsVerbioLanguagesVoices, stt, undefined);
+    const data = await getTtsVoices({vendor: 'verbio', credentials});
+    const voices = parseVerbioLanguagesVoices(data);
+    return tranform(voices, stt, undefined);
   } catch (err) {
     logger.info({err}, 'there is error while fetching verbio speech voices');
     return tranform(TtsVerbioLanguagesVoices, stt, undefined);
   }
 }
 
-function tranform(tts, stt, models, sttModels) {
+function tranform(tts, stt, models) {
   return {
     ...(tts && {tts}),
     ...(stt && {stt}),
-    ...(models && {models}),
-    ...(sttModels && {sttModels})
+    ...(models && {models})
   };
 }
 
@@ -1149,7 +945,7 @@ function parseAwsLanguagesVoices(data) {
     if (existingLanguage) {
       existingLanguage.voices.push({
         value: voice.Id,
-        name: `${voice.Name} (${voice.Gender})`
+        name: `(${voice.Gender}) ${voice.Name}`
       });
     } else {
       acc.push({
@@ -1157,7 +953,7 @@ function parseAwsLanguagesVoices(data) {
         name: voice.LanguageName,
         voices: [{
           value: voice.Id,
-          name: `${voice.Name} (${voice.Gender})`
+          name: `(${voice.Gender}) ${voice.Name}`
         }]
       });
     }
@@ -1214,7 +1010,7 @@ function parseMicrosoftLanguagesVoices(data) {
 }
 
 function parseVerbioLanguagesVoices(data) {
-  return data.voices.reduce((acc, voice) => {
+  return data.reduce((acc, voice) => {
     const languageCode = voice.language;
     const existingLanguage = acc.find((lang) => lang.value === languageCode);
     if (existingLanguage) {
@@ -1236,95 +1032,6 @@ function parseVerbioLanguagesVoices(data) {
   }, []);
 }
 
-const fetchCartesiaVoices = async(credential) => {
-  if (credential) {
-    const get = bent('https://api.cartesia.ai', 'GET', 'json', {
-      'X-API-Key' : credential.api_key,
-      'Cartesia-Version': '2024-06-10',
-      'Accept': 'application/json'
-    });
-
-    const voices = await get('/voices');
-    return voices;
-  }
-};
-
-const testCartesia = async(logger, synthAudio, credentials) => {
-  try {
-    await synthAudio(
-      {
-        increment: () => {},
-        histogram: () => {}
-      },
-      {
-        vendor: 'cartesia',
-        credentials,
-        language: 'en',
-        voice: '694f9389-aac1-45b6-b726-9d9369183238',
-        text: 'Hi there and welcome to jambones!',
-        renderForCaching: true
-      }
-    );
-    // Test if Cartesia can fetch voices
-    await fetchCartesiaVoices(credentials);
-  } catch (err) {
-    logger.info({err}, 'synth cartesia returned error');
-    throw err;
-  }
-};
-
-async function getLanguagesVoicesForCartesia(credential) {
-  if (credential) {
-    const {model_id} = credential;
-    const {languages} = TtsModelCartesia.find((m) => m.value === model_id);
-    const voices = await fetchCartesiaVoices(credential);
-
-    const buildVoice = (d) => (
-      {
-        value: `${d.id}`,
-        name: `${d.name} - ${d.description}`
-      });
-    const languageMap = {
-      en: 'English',
-      fr: 'French',
-      de: 'German',
-      es: 'Spanish',
-      pt: 'Portuguese',
-      zh: 'Chinese',
-      ja: 'Japanese',
-      hi: 'Hindi',
-      it: 'Italian',
-      ko: 'Korean',
-      nl: 'Dutch',
-      pl: 'Polish',
-      ru: 'Russian',
-      sv: 'Swedish',
-      tr: 'Turkish',
-    };
-    const ttsVoices = voices.reduce((acc, voice) => {
-      if (!languages.includes(voice.language)) {
-        return acc;
-      }
-
-      const languageCode = voice.language;
-      const existingLanguage = acc.find((lang) => lang.value === languageCode);
-      if (existingLanguage) {
-        existingLanguage.voices.push(buildVoice(voice));
-      } else {
-        acc.push({
-          value: languageCode,
-          name: languageMap[languageCode],
-          voices: [buildVoice(voice)]
-        });
-      }
-      return acc;
-    }, []);
-
-    return tranform(ttsVoices, undefined, TtsModelCartesia);
-  }
-  return tranform(ttsCartesia, undefined, TtsModelCartesia);
-}
-
 module.exports = {
   testGoogleTts,
   testGoogleStt,
@@ -1350,9 +1057,5 @@ module.exports = {
   testWhisper,
   testVerbioTts,
   testVerbioStt,
-  getLanguagesAndVoicesForVendor,
-  testSpeechmaticsStt,
-  testCartesia,
-  testVoxistStt,
-  testOpenAiStt
+  getLanguagesAndVoicesForVendor
 };

package.json

@@ -1,12 +1,11 @@
 {
   "name": "jambonz-api-server",
-  "version": "0.9.3",
+  "version": "0.9.0",
   "description": "",
   "main": "app.js",
   "scripts": {
     "start": "node app.js",
     "test": "NODE_ENV=test APPLY_JAMBONZ_DB_LIMITS=1 JWT_SECRET=foobarbazzle JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_PORT=3360 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=localhost JAMBONES_REDIS_PORT=16379 JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_LOGLEVEL=error JAMBONES_CREATE_CALL_URL=http://localhost/v1/createCall K8S=true K8S_FEATURE_SERVER_SERVICE_NAME=127.0.0.1 K8S_FEATURE_SERVER_SERVICE_PORT=3100 node test/ ",
-    "test:encrypt-decrypt": "ENCRYPTION_SECRET=12345 node --test ./test/encrypt-decrypt.test.js",
     "integration-test": "NODE_ENV=test JAMBONES_AUTH_USE_JWT=1 JAMBONES_TIME_SERIES_HOST=127.0.0.1 AWS_REGION='us-east-1' JAMBONES_CURRENCY=USD JWT_SECRET=foobarbazzle JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_PORT=3360 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=localhost JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=debug JAMBONES_CREATE_CALL_URL=http://localhost/v1/createCall node test/serve-integration.js",
     "upgrade-db": "node ./db/upgrade-jambonz-db.js",
     "coverage": "./node_modules/.bin/nyc --reporter html --report-dir ./coverage npm run test",
@@ -20,18 +19,17 @@
     "url": "https://github.com/jambonz/jambonz-api-server.git"
   },
   "dependencies": {
-    "@aws-sdk/client-cloudwatch-logs": "^3.750.0",
     "@aws-sdk/client-s3": "^3.550.0",
     "@aws-sdk/client-transcribe": "^3.549.0",
     "@azure/storage-blob": "^12.17.0",
     "@deepgram/sdk": "^1.21.0",
     "@google-cloud/speech": "^6.5.0",
     "@google-cloud/storage": "^7.9.0",
-    "@jambonz/db-helpers": "^0.9.11",
+    "@jambonz/db-helpers": "^0.9.3",
     "@jambonz/lamejs": "^1.2.2",
     "@jambonz/mw-registrar": "^0.2.7",
-    "@jambonz/realtimedb-helpers": "^0.8.13",
-    "@jambonz/speech-utils": "^0.2.3",
+    "@jambonz/realtimedb-helpers": "^0.8.9",
+    "@jambonz/speech-utils": "^0.1.11",
     "@jambonz/time-series": "^0.2.8",
     "@jambonz/verb-specifications": "^0.0.72",
     "@soniox/soniox-node": "^1.2.2",
@@ -48,14 +46,12 @@
     "jsonwebtoken": "^9.0.2",
     "mailgun.js": "^10.2.1",
     "microsoft-cognitiveservices-speech-sdk": "1.36.0",
-    "multer": "^1.4.5-lts.1",
-    "mysql2": "^3.11.0",
+    "mysql2": "^3.9.3",
     "nocache": "4.0.0",
     "passport": "^0.7.0",
     "passport-http-bearer": "^1.0.1",
     "pino": "^8.20.0",
     "short-uuid": "^4.2.2",
-    "speechmatics": "^4.0.0",
     "stream-buffers": "^3.0.2",
     "stripe": "^14.24.0",
     "swagger-ui-express": "^5.0.0",

test/accounts.js

@@ -152,9 +152,7 @@ test('account tests', async(t) => {
       auth: authAdmin,
       json: true,
     });
-    console.log(result);
     t.ok(result.name === 'daveh' , 'successfully retrieved account by sid');
-    t.ok(result.enable_debug_log  === 0 , 'enable_debug_log default value ok');
 
     /* update account with account level token */
     result = await request.put(`/Accounts/${sid}`, {
@@ -179,8 +177,8 @@ test('account tests', async(t) => {
           name: 'recordings',
           access_key_id: 'access_key_id',
           secret_access_key: 'secret access key'
-        },
-        enable_debug_log: true
+        }
+        
       }
     });
     t.ok(result.statusCode === 204, 'successfully updated account using account level token');
@@ -196,7 +194,6 @@ test('account tests', async(t) => {
     t.ok(result.bucket_credential.access_key_id === 'access_key_id', 'bucket_access_key_id was updated');
     t.ok(result.record_all_calls === 1, 'record_all_calls was updated');
     t.ok(result.record_format === 'wav', 'record_format was updated');
-    t.ok(result.enable_debug_log, 'enable_debug_log was updated');
 
     /* verify that account level api key last_used was updated*/
     result = await request.get(`/Accounts/${sid}/ApiKeys`, {

test/applications.js

@@ -121,25 +121,6 @@ test('application tests', async(t) => {
     let app_json = JSON.parse(result.app_json);
     t.ok(app_json[0].verb === 'play', 'successfully retrieved app_json from application')
 
-    /* query one application by name*/
-    result = await request.get(`/Applications`, {
-      qs : {
-        name: 'daveh'
-      },
-      auth: authAdmin,
-      json: true,
-    });
-    t.ok(result.length === 1 && result[0].name === 'daveh', 'successfully queried application by name');
-
-    /* query application with invalid name*/
-    result = await request.get(`/Applications`, {
-      qs : {
-        name: 'daveh-invalid'
-      },
-      auth: authAdmin,
-      json: true,
-    });
-    t.ok(result.length === 0, 'successfully queried application by invalid name, no results found');
 
     /* update applications */
     result = await request.put(`/Applications/${sid}`, {

test/create-test-db.js

@@ -32,11 +32,3 @@ test('add predefined carriers', (t) => {
     t.end();
   });
 });
-
-test('prepare permissions', (t) => {
-  exec(`mysql -h 127.0.0.1 -u root  --protocol=tcp --port=3360 -D jambones_test < ${__dirname}/../db/prepare-permissions-test.sql`, (err, stdout, stderr) => {
-    if (err) return t.end(err);
-    t.pass('permissions prepared');
-    t.end();
-  });
-});

test/encrypt-decrypt.test.js

@@ -1,132 +0,0 @@
-const assert = require('node:assert');
-const { describe, it, beforeEach, before } = require('node:test');
-const { obscureBucketCredentialsSensitiveData, isObscureKey, obscureKey } = require('../lib/utils/encrypt-decrypt');
-const { randomUUID } = require('node:crypto');
-
-let bucket_credential = {};
-let service_key = {};
-
-describe('encrypt-decrypt test suite', { skip: false }, () => {
-    before(() => {
-        process.env.ENCRYPTION_SECRET = "12345";
-    });
-    beforeEach(() => {
-        service_key = {
-            "type": "service_account",
-            "project_id": "voice-gateway",
-            "private_key_id": randomUUID(),
-            "private_key": "-----BEGIN PRIVATE KEY-----\nJ6T2sQmBAD8TBm0frkGeyw0FA0aVAASVBJcwggSjBgEAAoabAQDUbiVwgufJm9R3\nv7YpECxRnQgHduX8jnbjtubi6FVqqVx78W3NM/gFNJFBC7NXtpsslqefKM6SmlkK\nNP6XqXy/ppXO8u00se7+cOFhsS6crncnsCeIYPxLFPV8P4BjExi7v88RBdektLeV\nX6sRWhxiYeWe+ORxkyC0KR4IKZjHt7ZHrg0kNQyuNx1KOhJnN3rRUkKSP2zozd1c\n3V+4EfpZjGmlQegXNHzkwUjvTOe6nuyxynWe3smjsSw/3RQda5m674Kh9tnVWEiX\n5KWnfRbWDdEBp5azzOAdeSR5W+qQfS0Jo6blREDQxWfMNmut87m81gmn+DKMhq6k\nV0JVRQStAgMBAAECggEAAf7AsAdI24zUdXkZv98gEuC4S10e2Luoz6Yvm41V3sP6\nWx0mdgY7RB9RW8U4WPnu3GhPGGJj03SyHUuI8Ix15MNM9WGDAaV3S+kRb1LqChLO\nCoNSO/qYPPg4t1iQ9+s7sWTnM93MAXjujmSveHJd7+MrUQOxOdPjB7I/ozMkBXBb\nWYsBIfeOG/7DsC4N4V/hKVXAq9NekGQv85yCUPR/DpuG9vqpztXwaSC1Wihntlu3\nNJYmMave4PbO3OxAekBl70WmukERZo7ksR+34WWse4HXlphaUVbpvnbQdGT1EzXW\nZukanqpfkIwrHme2Ko5NdP0C54pRhg6kpmWszVUMQQKBgQD6yWMuuwdPuFLg0wc2\nnDUeyHZSq/SEMSrb1wNXhL3qhaL2tCjBZwG9CHDuFMhqDLU5F36mEdAsM5MHCzyC\nTJ7VbqvCFz69SRt1CVp76Hu4HO/1Nhxm1GhF+NKSDIbnUg3o4DaC7EUtLpqYXcWj\nsXHEqVEhkrNVQ/JOIfJr42LDfQKBgQDM0U3ghGg9ufe9mb0dOonwtJA/ay/pd08Q\nyq3ue9C3yoQiNf28bP3AGKIjhA6wtd0KTSkQs6ktabGHIM8o/eTrMAMQllKh/3xe\nON7iND8Xz2GFMuIraQ7Mq9RvYWiqqIkVg1GQfJmiQ9wcmGj2PHy25LfjBXfHAYqK\nQ++P/i+s8QKBgD0pRi4MYNEZY+T+skCoQfA69VheJWjj0M8ClgcPEX4Tj1XZRCM+\nqtbeKyR1Hxd19/BvgWyg5YMSJOZP4Dbq1sW4ktzn7F4faTnWySF05k9Vh1PnGXAe\nlzuRXlFOCsx5X3kOzVyKoKhPOFa2b8/nI5bRsD6e12uRAZP6hXO4ZcrFAoGABVJ/\nCpGGP+xgMq4XCvZldTrL8MnxQcjW5iHOKT9QaiY6DsWGZWoTofVB6VhaJV9kcgsV\nQRjaEZMIiPFiULdgRnhF7B1r4kfITI5/xDMFXLIH37U1yVj+iHUCnS5T0PN2NHfo\nG7ARMfU/eALB33ws5XfGC4Et3p78oaEoTX6WcJECgYEAhysSt4qieGRSXn24V0+u\ny/ubU4dysn4SFe8BB4bjgYa8v+6VwucU+nnU4wOwykEgJmzN/ukzpvFN0CkN8eAN\n8xwtjBX9Zc1S90Wf7/7IrQGlUnsSFpDh5TW+oCqVo8JK7UGxJHR1mCvJmYVmSk3c\nD4AMvJ2x/Z5d9NKIAzdET4o=\n-----END PRIVATE KEY-----\n",
-            "client_email": "voicegatewayteam@voice-gateway.iam.gserviceaccount.com",
-            "client_id": "333827616171177028875",
-            "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-            "token_uri": "https://oauth2.googleapis.com/token",
-            "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-            "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/cognigyvoicegatewayteam%40cognigy-voice-gateway.iam.gserviceaccount.com",
-            "universe_domain": "googleapis.com"
-        };
-        bucket_credential = {
-            "vendor": "google",
-            "service_key": "",
-            "connection_string": "",
-            "secret_access_key": ""
-        }
-    });
-
-    describe('obscureBucketCredentialsSensitiveData', { skip: false }, () => {
-        it('should obscure "private_key" - vendor: google', { skip: false }, () => {
-            bucket_credential = {
-                ...bucket_credential,
-                "vendor": "google",
-                "service_key": JSON.stringify(service_key),
-            };
-            const result = obscureBucketCredentialsSensitiveData(bucket_credential);
-            const googleCredentials = JSON.parse(result.service_key);
-            assert.strictEqual(googleCredentials.private_key, '-----BEGIN PRIVATE KEY-----\nJ6T2sQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX');
-            assert.strictEqual(googleCredentials.private_key_id, googleCredentials.private_key_id);
-            assert.strictEqual(googleCredentials.project_id, googleCredentials.project_id);
-            assert.strictEqual(googleCredentials.client_email, googleCredentials.client_email);
-            assert.strictEqual(googleCredentials.client_id, googleCredentials.client_id);
-            assert.strictEqual(googleCredentials.auth_uri, googleCredentials.auth_uri);
-            assert.strictEqual(googleCredentials.token_uri, googleCredentials.token_uri);
-        });
-
-        it('should skip obscure since it is already obscured. vendor: google - "private key"', { skip: false }, () => {
-            service_key.private_key = '-----BEGIN PRIVATE KEY-----\nJ6T2sQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
-            bucket_credential = {
-                ...bucket_credential,
-                "vendor": "google",
-                "service_key": JSON.stringify(service_key),
-            };
-            const result = obscureBucketCredentialsSensitiveData(bucket_credential);
-            const googleCredentials = JSON.parse(result.service_key);
-            assert.strictEqual(googleCredentials.private_key, '-----BEGIN PRIVATE KEY-----\nJ6T2sQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX');
-            assert.strictEqual(googleCredentials.private_key_id, googleCredentials.private_key_id);
-            assert.strictEqual(googleCredentials.project_id, googleCredentials.project_id);
-            assert.strictEqual(googleCredentials.client_email, googleCredentials.client_email);
-            assert.strictEqual(googleCredentials.client_id, googleCredentials.client_id);
-            assert.strictEqual(googleCredentials.auth_uri, googleCredentials.auth_uri);
-            assert.strictEqual(googleCredentials.token_uri, googleCredentials.token_uri);
-        });
-    });
-
-    describe('isObscureKey', { skip: false }, () => {
-        it('vendor: google - should return true', { skip: false }, () => {
-            service_key.private_key = '-----BEGIN PRIVATE KEY-----\nJ6T2sQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
-            bucket_credential = {
-                ...bucket_credential,
-                "vendor": "google",
-                "service_key": JSON.stringify(service_key),
-            };
-            const result = isObscureKey(bucket_credential);
-            assert.strictEqual(result, true);
-        });
-        it('vendor: google - should return false', { skip: false }, () => {
-            bucket_credential = {
-                ...bucket_credential,
-                "vendor": "google",
-                "service_key": JSON.stringify(service_key),
-            };
-            const result = isObscureKey(bucket_credential);
-            assert.strictEqual(result, false);
-        });
-        it('vendor: aws_s3 - should return true', { skip: false }, () => {
-            const obscuredKey = "J6T2sQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
-            bucket_credential = {
-                ...bucket_credential,
-                "vendor": "aws_s3",
-                "secret_access_key": obscuredKey,
-            };
-            const result = isObscureKey(bucket_credential);
-            assert.strictEqual(result, true);
-        });
-        it('vendor: aws_s3 - should return false', { skip: false }, () => {
-            bucket_credential = {
-                ...bucket_credential,
-                "vendor": "aws_s3",
-                "service_key": "EFEU2fhcbqiw3211ffw3f1kezhcbqiw3211ffw3f",
-            };
-            const result = isObscureKey(bucket_credential);
-            assert.strictEqual(result, false);
-        });
-        it('vendor: azure - should return true', { skip: false }, () => {
-            const obscuredKey = 'https:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
-            bucket_credential = {
-                ...bucket_credential,
-                "vendor": "azure",
-                "connection_string": obscuredKey,
-            };
-            const result = isObscureKey(bucket_credential);
-            assert.strictEqual(result, true);
-        });
-        it('vendor: azure - should return false', { skip: false }, () => {
-            bucket_credential = {
-                ...bucket_credential,
-                "vendor": "azure",
-                connection_string: 'https://cognigydevstorage.blob.core.windows.net/voicegateway-test?sp=rw&st=2023-09-10T13:35:44Z&se=2023-09-11T21:35:44Z&spr=https&sv=2022-11-02&sr=c&sig=9WN8Bg5UMOvnV1h1cJpCnTUG%2FnonTbRZ1Q1rbKnDUl4%3D',
-            };
-            const result = isObscureKey(bucket_credential);
-            assert.strictEqual(result, false);
-        });
-    });
-});
-

test/index.js

@@ -13,7 +13,6 @@ require('./ms-teams');
 require('./speech-credentials');
 require('./recent-calls');
 require('./users');
-require('./users-view-only');
 require('./login');
 require('./webapp_tests');
 // require('./homer');

test/sip-gateways.js

@@ -17,53 +17,6 @@ test('sip gateway tests', async(t) => {
     let result;
     const voip_carrier_sid = await createVoipCarrier(request);
 
-    /* add a invalid sip gateway */
-    const STORED_JAMBONZ_MIN_GATEWAY_NETMASK = process.env.JAMBONZ_MIN_GATEWAY_NETMASK;
-    process.env.JAMBONZ_MIN_GATEWAY_NETMASK = 24;
-    
-    result = await request.post('/SipGateways', {
-      resolveWithFullResponse: true,
-      auth: authAdmin,
-      json: true,
-      simple: false,
-      body: {
-        voip_carrier_sid,
-        ipv4: '1.2.3.4',
-        netmask: 1,
-        inbound: true,
-        outbound: true,
-        protocol: 'tcp'
-      }
-    });
-    t.ok(result.statusCode === 400, 'successfully created sip gateway ');
-
-    result = await request.post('/SipGateways', {
-      resolveWithFullResponse: true,
-      auth: authAdmin,
-      json: true,
-      body: {
-        voip_carrier_sid,
-        ipv4: '1.2.3.4',
-        netmask: 24,
-        inbound: true,
-        outbound: true,
-        protocol: 'tcp'
-      }
-    });
-    t.ok(result.statusCode === 201, 'successfully created sip gateway ');
-
-    process.env.JAMBONZ_MIN_GATEWAY_NETMASK = STORED_JAMBONZ_MIN_GATEWAY_NETMASK;
-
-    /* delete sip gateways */
-    result = await request.delete(`/SipGateways/${result.body.sid}`, {
-      resolveWithFullResponse: true,
-      simple: false,
-      json: true,
-      auth: authAdmin
-    });
-    //console.log(`result: ${JSON.stringify(result)}`);
-    t.ok(result.statusCode === 204, 'successfully deleted sip gateway');
-
     /* add a sip gateway */
     result = await request.post('/SipGateways', {
       resolveWithFullResponse: true,

test/speech-credentials.js

@@ -371,8 +371,7 @@ test('speech credentials tests', async(t) => {
         vendor: 'deepgram',
         use_for_stt: true,
         deepgram_stt_uri: "127.0.0.1:50002",
-        deepgram_stt_use_tls: true,
-        deepgram_tts_uri: 'https://server.com'
+        deepgram_stt_use_tls: true
       }
     });
     t.ok(result.statusCode === 201, 'successfully added speech credential for deepgram');
@@ -387,7 +386,6 @@ test('speech credentials tests', async(t) => {
     t.ok(result.statusCode === 200, 'successfully get speech credential for deepgram');
     t.ok(result.body.deepgram_stt_uri === '127.0.0.1:50002', "deepgram_stt_uri is correct for deepgram");
     t.ok(result.body.deepgram_stt_use_tls === true, "deepgram_stt_use_tls is correct for deepgram");
-    t.ok(result.body.deepgram_tts_uri === 'https://server.com', "deepgram_tts_uri is correct for deepgram")
 
     result = await request.put(`/Accounts/${account_sid}/SpeechCredentials/${dg_sid}`, {
       resolveWithFullResponse: true,
@@ -397,8 +395,7 @@ test('speech credentials tests', async(t) => {
         vendor: 'deepgram',
         use_for_stt: true,
         deepgram_stt_uri: "127.0.0.2:50002",
-        deepgram_stt_use_tls: false,
-        deepgram_tts_uri: 'https://server2.com'
+        deepgram_stt_use_tls: false
       }
     });
     t.ok(result.statusCode === 204, 'successfully updated speech credential for deepgram onprem');
@@ -412,7 +409,6 @@ test('speech credentials tests', async(t) => {
     t.ok(result.statusCode === 200, 'successfully get speech credential for deepgram onprem');
     t.ok(result.body.deepgram_stt_uri === '127.0.0.2:50002', "deepgram_stt_uri is correct for deepgram onprem");
     t.ok(result.body.deepgram_stt_use_tls === false, "deepgram_stt_use_tls is correct for deepgram onprem");
-    t.ok(result.body.deepgram_tts_uri === 'https://server2.com', "deepgram_tts_uri is correct for deepgram onprem");
 
     result = await request.delete(`/Accounts/${account_sid}/SpeechCredentials/${dg_sid}`, {
       auth: authUser,
@@ -532,39 +528,6 @@ test('speech credentials tests', async(t) => {
       t.ok(result.statusCode === 204, 'successfully deleted speech credential');
     }
 
-    /* add a credential for Speechmatics */
-    if (process.env.SPEECHMATICS_API_KEY) {
-      result = await request.post(`/Accounts/${account_sid}/SpeechCredentials`, {
-        resolveWithFullResponse: true,
-        auth: authUser,
-        json: true,
-        body: {
-          vendor: 'speechmatics',
-          use_for_stt: true,
-          api_key: process.env.SPEECHMATICS_API_KEY,
-          speechmatics_stt_uri: 'eu2.rt.speechmatics.com'
-        }
-      });
-      t.ok(result.statusCode === 201, 'successfully added speech credential for speechmatics');
-      const ms_sid = result.body.sid;
-
-      /* test the speech credential */
-      result = await request.get(`/Accounts/${account_sid}/SpeechCredentials/${ms_sid}/test`, {
-        resolveWithFullResponse: true,
-        auth: authUser,
-        json: true,   
-      });
-      console.log(JSON.stringify(result));
-      t.ok(result.statusCode === 200 && result.body.stt.status === 'ok', 'successfully tested speech credential for speechmatics');
-
-      /* delete the credential */
-      result = await request.delete(`/Accounts/${account_sid}/SpeechCredentials/${ms_sid}`, {
-        auth: authUser,
-        resolveWithFullResponse: true,
-      });
-      t.ok(result.statusCode === 204, 'successfully deleted speech credential');
-    }
-
     /* add a credential for nvidia */
     result = await request.post(`/Accounts/${account_sid}/SpeechCredentials`, {
       resolveWithFullResponse: true,
@@ -780,27 +743,6 @@ test('speech credentials tests', async(t) => {
     });
     t.ok(result.statusCode === 204, 'successfully deleted speech credential');
 
-    /* add a credential for Voxist */
-    result = await request.post(`/Accounts/${account_sid}/SpeechCredentials`, {
-      resolveWithFullResponse: true,
-      auth: authUser,
-      json: true,
-      body: {
-        vendor: 'voxist',
-        use_for_stt: true,
-        api_key: "APIKEY"
-      }
-    });
-    t.ok(result.statusCode === 201, 'successfully added speech credential for Voxist');
-    const voxistSid = result.body.sid;
-
-    /* delete the credential */
-    result = await request.delete(`/Accounts/${account_sid}/SpeechCredentials/${voxistSid}`, {
-      auth: authUser,
-      resolveWithFullResponse: true,
-    });
-    t.ok(result.statusCode === 204, 'successfully deleted speech credential');
-
     /* add a credential for aws polly by roleArn */
     result = await request.post(`/Accounts/${account_sid}/SpeechCredentials`, {
       resolveWithFullResponse: true,
@@ -993,15 +935,6 @@ test('speech credentials tests', async(t) => {
     });
     t.ok(result.body.stt.length !== 0, 'successfully get assemblyai supported languages and voices');
 
-    /* Check voxist supportedLanguagesAndVoices */
-    result = await request.get(`/Accounts/${account_sid}/SpeechCredentials/speech/supportedLanguagesAndVoices?vendor=voxist`, {
-      resolveWithFullResponse: true,
-      simple: false,
-      auth: authAdmin,
-      json: true,
-    });
-    t.ok(result.body.stt.length !== 0, 'successfully get voxist supported languages and voices');
-
     /* Check whisper supportedLanguagesAndVoices */
     result = await request.get(`/Accounts/${account_sid}/SpeechCredentials/speech/supportedLanguagesAndVoices?vendor=whisper`, {
       resolveWithFullResponse: true,

test/system-information.js

@@ -16,9 +16,7 @@ test('system information test', async(t) => {
       body: {
         domain_name: 'test.com',
         sip_domain_name: 'sip.test.com',
-        monitoring_domain_name: 'monitor.test.com',
-        private_network_cidr: '192.168.1.0/24, 10.10.100.1',
-        log_level: 'info'
+        monitoring_domain_name: 'monitor.test.com'
       }
     });
     t.ok(result.statusCode === 201, 'successfully created system information ');
@@ -26,8 +24,6 @@ test('system information test', async(t) => {
     t.ok(body.domain_name === 'test.com', 'added domain_name ok');
     t.ok(body.sip_domain_name === 'sip.test.com', 'added sip_domain_name ok');
     t.ok(body.monitoring_domain_name === 'monitor.test.com', 'added monitoring_domain_name ok');
-    t.ok(body.private_network_cidr === '192.168.1.0/24, 10.10.100.1', 'added private_network_cidr ok');
-    t.ok(body.log_level === 'info', 'added log_level ok');
 
     result = await request.get('/SystemInformation', {
       auth: authAdmin,
@@ -36,8 +32,6 @@ test('system information test', async(t) => {
     t.ok(result.domain_name === 'test.com', 'get domain_name ok');
     t.ok(result.sip_domain_name === 'sip.test.com', 'get sip_domain_name ok');
     t.ok(result.monitoring_domain_name === 'monitor.test.com', 'get monitoring_domain_name ok');
-    t.ok(result.private_network_cidr === '192.168.1.0/24, 10.10.100.1', 'get private_network_cidr ok'); 
-    t.ok(result.log_level === 'info', 'added log_level ok');
 
     result = await request.post('/SystemInformation', {
       resolveWithFullResponse: true,
@@ -46,9 +40,7 @@ test('system information test', async(t) => {
       body: {
         domain_name: 'test1.com',
         sip_domain_name: 'sip1.test.com',
-        monitoring_domain_name: 'monitor1.test.com',
-        private_network_cidr: '',
-        log_level: 'debug'
+        monitoring_domain_name: 'monitor1.test.com'
       }
     });
     t.ok(result.statusCode === 201, 'successfully updated system information ');
@@ -56,8 +48,6 @@ test('system information test', async(t) => {
     t.ok(body.domain_name === 'test1.com', 'updated domain_name ok');
     t.ok(body.sip_domain_name === 'sip1.test.com', 'updated sip_domain_name ok');
     t.ok(body.monitoring_domain_name === 'monitor1.test.com', 'updated monitoring_domain_name ok');
-    t.ok(body.private_network_cidr === '', 'updated private_network_cidr ok');
-    t.ok(body.log_level === 'debug', 'updated log_level ok');
 
     result = await request.get('/SystemInformation', {
       auth: authAdmin,
@@ -66,7 +56,6 @@ test('system information test', async(t) => {
     t.ok(result.domain_name === 'test1.com', 'get domain_name ok');
     t.ok(result.sip_domain_name === 'sip1.test.com', 'get sip_domain_name ok');
     t.ok(result.monitoring_domain_name === 'monitor1.test.com', 'get monitoring_domain_name ok');
-    t.ok(result.log_level === 'debug', 'updated log_level ok');
 
   } catch(err) {
     console.error(err);

test/tts-cache.js

@@ -24,24 +24,16 @@ function makeSynthKey({account_sid = '', vendor, language, voice, engine = '', t
 test('tts-cache', async(t) => {
   const app = require('../app');
   try {
-    // clear cache to start
-    let result = await request.delete('/TtsCache', {
-      auth: authAdmin,
-      resolveWithFullResponse: true,
-    });
-    t.ok(result.statusCode === 204, 'successfully purged cache for start of test');
-
     // create caches
     const minRecords = 8;
     for (const i in Array(minRecords).fill(0)) {
       await client.set(makeSynthKey({vendor: i, language: i, voice: i, engine: i, text: i}), i);
     }
 
-    result = await request.get('/TtsCache', {
+    let result = await request.get('/TtsCache', {
       auth: authAdmin,
       json: true,
     });
-    //console.log(result);
 
     t.ok(result.size === minRecords, 'get cache correctly');
 
@@ -49,7 +41,7 @@ test('tts-cache', async(t) => {
       auth: authAdmin,
       resolveWithFullResponse: true,
     });
-    t.ok(result.statusCode === 204, 'successfully purged cache');
+    t.ok(result.statusCode === 204, 'successfully deleted application after removing phone number');
 
     result = await request.get('/TtsCache', {
       auth: authAdmin,

test/users-view-only.js

@@ -1,296 +0,0 @@
-const test = require('tape') ;
-const jwt = require('jsonwebtoken');
-const request = require('request-promise-native').defaults({
-  baseUrl: 'http://127.0.0.1:3000/v1'
-});
-const exec = require('child_process').exec ;
-const {generateHashedPassword} = require('../lib/utils/password-utils');
-process.on('unhandledRejection', (reason, p) => {
-  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-});
-test('add an admin user', (t) => {
-  exec(`${__dirname}/../db/reset_admin_password.js`, (err, stdout, stderr) => {
-    console.log(stderr);
-    console.log(stdout);
-    if (err) return t.end(err);
-    t.pass('successfully added admin user');
-    t.end();
-  });
-});
-
-
-test('prepare permissions', (t) => {
-  exec(`mysql -h 127.0.0.1 -u root  --protocol=tcp --port=3360 -D jambones_test < ${__dirname}/../db/prepare-permissions-test.sql`, (err, stdout, stderr) => {
-    if (err) return t.end(err);
-    t.pass('permissions prepared');
-    t.end();
-  });
-});
-
-test('view-only user tests', async(t) => {
-  const app = require('../app');
-  const password = 'abcde12345-';
-  try {
-    let result;
-    /* login as admin to get a jwt */
-    result = await request.post('/login', {
-      resolveWithFullResponse: true,
-      json: true,
-      body: {
-        username: 'admin',
-        password: 'admin',  
-      }
-    });
-    t.ok(result.statusCode === 200 && result.body.token, 'successfully logged in as admin');
-    const authAdmin = {bearer: result.body.token};
-    const decodedJwt = jwt.verify(result.body.token, process.env.JWT_SECRET);
-    /* add admin user */
-    result = await request.post(`/Users`, {
-      resolveWithFullResponse: true,
-      json: true,
-      auth: authAdmin,
-      body: {
-        name: 'admin2',
-        email: 'admin2@jambonz.com',
-        is_active: true,
-        force_change: true,
-        initial_password: password,
-      }
-    });
-    t.ok(result.statusCode === 201 && result.body.user_sid, 'admin user created');
-    const admin_user_sid = result.body.user_sid;
-    /* add a service provider */
-    result = await request.post('/ServiceProviders', {
-      resolveWithFullResponse: true,
-      auth: authAdmin,
-      json: true,
-      body: {
-        name: 'sp1',
-      }
-    });
-    t.ok(result.statusCode === 201, 'successfully created service provider');
-    const sp_sid = result.body.sid;
-    /* add service_provider read only user */
-    result = await request.post(`/Users`, {
-      resolveWithFullResponse: true,
-      json: true,
-      auth: authAdmin,
-      body: {
-        name: 'service_provider',
-        email: 'sp@jambonz.com',
-        is_active: true,
-        force_change: true,
-        initial_password: password,
-        service_provider_sid: sp_sid,
-        is_view_only: true
-      }
-    });
-    t.ok(result.statusCode === 201 && result.body.user_sid, 'service_provider scope view-only user created');
-    
-    // login as service_provider read only user
-    result = await request.post('/login', {
-      resolveWithFullResponse: true,
-      json: true,
-      body: {
-        username: 'service_provider',
-        password: password,  
-      }
-    });
-    t.ok(result.statusCode === 200 && result.body.token, 'successfully logged in as service provider view-only user');
-    const spToken = {bearer: result.body.token};
-    const spDecodedJwt = jwt.verify(result.body.token, process.env.JWT_SECRET);
-    try {
-      result = await request.post('/Accounts', {
-        resolveWithFullResponse: true,
-        auth: spToken,
-        json: true,
-        body: {
-          name: 'sample_account',
-          service_provider_sid: sp_sid,
-          registration_hook: {
-            url: 'http://example.com/reg',
-            method: 'get'
-          },
-          webhook_secret: 'foobar'
-        }
-      })
-    } catch(err) {
-      t.ok(err.statusCode === 403, 'As a view-only user, you cannot create an account');
-    }
-    result = await request.post('/Accounts', {
-      resolveWithFullResponse: true,
-      auth: authAdmin,
-      json: true,
-      body: {
-        name: 'sample_account',
-        service_provider_sid: sp_sid,
-        registration_hook: {
-          url: 'http://example.com/reg',
-          method: 'get'
-        },
-        webhook_secret: 'foobar'
-      }
-    })
-    t.ok(result.statusCode === 201, 'successfully created account using admin token');
-    const account_sid = result.body.sid;
-    /* add account scope view-only user */
-    result = await request.post(`/Users`, {
-      resolveWithFullResponse: true,
-      json: true,
-      auth: authAdmin,
-      body: {
-        name: 'account',
-        email: 'account@jambonz.com',
-        is_active: true,
-        force_change: true,
-        initial_password: password,
-        service_provider_sid: sp_sid,
-        account_sid: account_sid,
-        is_view_only: true
-      }
-    });
-    t.ok(result.statusCode === 201 && result.body.user_sid, 'account scope user created');
-    const account_user_sid = result.body.user_sid;
-    // login as account read only user
-    result = await request.post('/login', {
-      resolveWithFullResponse: true,
-      json: true,
-      body: {
-        username: 'account',
-        password: password,  
-      }
-    });
-    t.ok(result.statusCode === 200 && result.body.token, 'successfully logged in as account view-only user');
-    let userToken = {bearer: result.body.token};
-    /* add an application which should fail as the logged in user is a view-only user */
-    try {
-      result = await request.post('/Applications', {
-        resolveWithFullResponse: true,
-        auth: userToken,
-        json: true,
-        body: {
-          name: 'daveh',
-          account_sid,
-          call_hook: {
-            url: 'http://example.com'
-          },
-          call_status_hook: {
-            url: 'http://example.com/status',
-            method: 'POST'
-          },
-          messaging_hook: {
-            url: 'http://example.com/sms'
-          },
-          app_json : '[\
-              {\
-                "verb": "play",\
-                "url": "https://example.com/example.mp3",\
-                "timeoutSecs": 10,\
-                "seekOffset": 8000,\
-                "actionHook": "/play/action"\
-            }\
-          ]',
-          use_for_fallback_speech: 1,
-          fallback_speech_synthesis_vendor: 'google',
-          fallback_speech_synthesis_language: 'en-US',
-          fallback_speech_synthesis_voice: 'man',
-          fallback_speech_synthesis_label: 'label1',
-          fallback_speech_recognizer_vendor: 'google',
-          fallback_speech_recognizer_language: 'en-US',
-          fallback_speech_recognizer_label: 'label1'
-        }
-      });
-    } catch(err) {
-      t.ok(err.statusCode === 403, 'As a view-only user, you cannot create an application');
-    }
-    // change user as read/write user and create an application - it should succeed
-    result = await request.put(`/Users/${account_user_sid}`, {
-      resolveWithFullResponse: true,
-      json: true,
-      auth: authAdmin,
-      body: {
-        is_view_only: false
-      }
-    });
-    t.ok(result.statusCode === 204, 'successfully updated user to read/write permissions');
-    // login as account read only user
-    result = await request.post('/login', {
-      resolveWithFullResponse: true,
-      json: true,
-      body: {
-        username: 'account',
-        password: password,  
-      }
-    });
-    t.ok(result.statusCode === 200 && result.body.token, 'successfully logged in as account read-write user');
-    userToken = {bearer: result.body.token};
-    /* add an application which should succeed as the logged in user is a read-write user */
-    result = await request.post('/Applications', {
-      resolveWithFullResponse: true,
-      auth: userToken,
-      json: true,
-      body: {
-        name: 'daveh',
-        account_sid,
-        call_hook: {
-          url: 'http://example.com'
-        },
-        call_status_hook: {
-          url: 'http://example.com/status',
-          method: 'POST'
-        },
-        messaging_hook: {
-          url: 'http://example.com/sms'
-        },
-        app_json : '[\
-            {\
-              "verb": "play",\
-              "url": "https://example.com/example.mp3",\
-              "timeoutSecs": 10,\
-              "seekOffset": 8000,\
-              "actionHook": "/play/action"\
-          }\
-        ]',
-        use_for_fallback_speech: 1,
-        fallback_speech_synthesis_vendor: 'google',
-        fallback_speech_synthesis_language: 'en-US',
-        fallback_speech_synthesis_voice: 'man',
-        fallback_speech_synthesis_label: 'label1',
-        fallback_speech_recognizer_vendor: 'google',
-        fallback_speech_recognizer_language: 'en-US',
-        fallback_speech_recognizer_label: 'label1'
-      }
-    });
-    t.ok(result.statusCode === 201, 'successfully created an application');
-    // change user back to view-only and query the application - it should succeed
-    result = await request.put(`/Users/${account_user_sid}`, {
-      resolveWithFullResponse: true,
-      json: true,
-      auth: authAdmin,
-      body: {
-        is_view_only: true
-      }
-    });
-    t.ok(result.statusCode === 204, 'successfully updated user permission to view-only');
-    // login as account read only user
-    result = await request.post('/login', {
-      resolveWithFullResponse: true,
-      json: true,
-      body: {
-        username: 'account',
-        password: password,  
-      }
-    });
-    t.ok(result.statusCode === 200 && result.body.token, 'successfully logged in as account view-only user');
-    userToken = {bearer: result.body.token};
-    result = await request.get('/Applications', {
-      auth: userToken,
-      json: true,
-    });
-    //console.log(`result: ${JSON.stringify(result)}`);
-    t.ok(result.length === 1 , 'successfully queried all applications with view-only user');
-  } catch (err) {
-      console.error(err);
-      t.end(err);
-    }
-});

test/users.js

@@ -20,13 +20,7 @@ test('add an admin user', (t) => {
     t.end();
   });
 });
-test('prepare permissions', (t) => {
-  exec(`mysql -h 127.0.0.1 -u root  --protocol=tcp --port=3360 -D jambones_test < ${__dirname}/../db/prepare-permissions-test.sql`, (err, stdout, stderr) => {
-    if (err) return t.end(err);
-    t.pass('permissions prepared');
-    t.end();
-  });
-});
+
 test('user tests', async(t) => {
   const app = require('../app');
   const password = 'abcde12345-';

test/voip-carriers.js

@@ -15,7 +15,6 @@ test('voip carrier tests', async(t) => {
   let sid;
   try {
     let result;
-    const outbound_sip_proxy = 'foo.bar.com';
 
     /* add a voip carrier */
     result = await request.post('/VoipCarriers', {
@@ -24,8 +23,7 @@ test('voip carrier tests', async(t) => {
       json: true,
       body: {
         name: 'daveh',
-        e164_leading_plus: true,
-        outbound_sip_proxy,
+        e164_leading_plus: true
       }
     });
     t.ok(result.statusCode === 201, 'successfully created voip carrier');
@@ -37,7 +35,6 @@ test('voip carrier tests', async(t) => {
       json: true,
     });
     t.ok(result.length === 1 && result[0].e164_leading_plus, 'successfully queried all voip carriers');
-    t.ok(result.length === 1 && result[0].outbound_sip_proxy === outbound_sip_proxy, 'successfully queried all voip carriers');
 
     /* query one voip carriers */
     result = await request.get(`/VoipCarriers/${sid}`, {
@@ -210,8 +207,7 @@ test('voip carrier tests', async(t) => {
       json: true,
       body: {
         name: 'twilio',
-        e164_leading_plus: true,
-        dtmf_type: 'tones'
+        e164_leading_plus: true
       }
     });
     t.ok(result.statusCode === 201, 'successfully created voip carrier for a service provider');
@@ -225,7 +221,6 @@ test('voip carrier tests', async(t) => {
     });
     //console.log(result.body);
     t.ok(result.statusCode === 200, 'successfully retrieved voip carrier for a service provider');
-    //console.log(result.body);
     sid = result.body[0].voip_carrier_sid;
   
     await deleteObjectBySid(request, '/VoipCarriers', sid);

test/webapp_tests.js

@@ -24,13 +24,7 @@ test('seeding database for webapp tests', (t) => {
     t.end();
   });
 });
-test('prepare permissions', (t) => {
-  exec(`mysql -h 127.0.0.1 -u root  --protocol=tcp --port=3360 -D jambones_test < ${__dirname}/../db/prepare-permissions-test.sql`, (err, stdout, stderr) => {
-    if (err) return t.end(err);
-    t.pass('permissions prepared');
-    t.end();
-  });
-});
+
 test('webapp tests', async(t) => {
   const app = require('../app');
   let sid;