handle PUT of VoipCarrier that is associated to a service provider

.dockerignore

@@ -1 +0,0 @@
-node_modules

.eslintrc.json

@@ -8,7 +8,7 @@
       "jsx": false,
       "modules": false
     },
-    "ecmaVersion": 2020
+    "ecmaVersion": 2018
   },
   "plugins": ["promise"],
   "rules": {

.github/workflows/ci.yml

@@ -1,15 +1,17 @@
 name: CI
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  push:
+  workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
         with:
-          node-version: lts/*
+          node-version: 14
       - run: npm install
       - run: npm run jslint
       - run: npm test

.github/workflows/docker-publish-dbcreate.yml

@@ -1,55 +0,0 @@
-name: Docker
-
-on:
-  push:
-    branches:
-      - main
-    tags:
-      - '*'
-
-jobs:
-  push:
-
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push'
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: prepare tag 
-        id: prepare_tag
-        run: |
-            IMAGE_ID=jambonz/db-create
-
-            # Strip git ref prefix from version
-            VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-
-            # Strip "v" prefix from tag name
-            [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-
-            # Use Docker `latest` tag convention
-            [ "$VERSION" == "main" ] && VERSION=latest
-
-            echo IMAGE_ID=$IMAGE_ID
-            echo VERSION=$VERSION
-
-            echo "image_id=$IMAGE_ID" >> $GITHUB_OUTPUT
-            echo "version=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: ./Dockerfile.db-create
-          push: true
-          tags: ${{ steps.prepare_tag.outputs.image_id }}:${{ steps.prepare_tag.outputs.version }}
-          build-args: |
-            GITHUB_REPOSITORY=$GITHUB_REPOSITORY
-            GITHUB_REF=$GITHUB_REF

.github/workflows/docker-publish.yml

@@ -1,54 +0,0 @@
-name: Docker
-
-on:
-  push:
-    branches:
-      - main
-    tags:
-      - '*'
-
-jobs:
-  push:
-
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push'
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: prepare tag 
-        id: prepare_tag
-        run: |
-            IMAGE_ID=jambonz/api-server
-
-            # Strip git ref prefix from version
-            VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-
-            # Strip "v" prefix from tag name
-            [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-
-            # Use Docker `latest` tag convention
-            [ "$VERSION" == "main" ] && VERSION=latest
-
-            echo IMAGE_ID=$IMAGE_ID
-            echo VERSION=$VERSION
-
-            echo "image_id=$IMAGE_ID" >> $GITHUB_OUTPUT
-            echo "version=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.prepare_tag.outputs.image_id }}:${{ steps.prepare_tag.outputs.version }}
-          build-args: |
-            GITHUB_REPOSITORY=$GITHUB_REPOSITORY
-            GITHUB_REF=$GITHUB_REF

.gitignore

@@ -1,7 +1,7 @@
 # Logs
 logs
 *.log
-run-tests.sh
+package-lock.json
 
 # Runtime data
 pids
@@ -43,7 +43,4 @@ create_db.sql
 .vscode
 
 .env.*
-.env
-
-test/postgres-data
-db/remove-account.sh
+.env

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npm run jslint

Dockerfile

@@ -1,23 +1,16 @@
-FROM --platform=linux/amd64 node:18.15-alpine3.16 as base
-
-RUN apk --update --no-cache add --virtual .builds-deps build-base python3
-
+FROM node:alpine as builder
+RUN apk update && apk add --no-cache python make g++
 WORKDIR /opt/app/
+COPY package.json ./
+RUN npm install
+RUN npm prune
 
-FROM base as build
-
-COPY package.json package-lock.json ./
-
-RUN npm ci
-
-COPY . .
-
-FROM base
-
-COPY --from=build /opt/app /opt/app/
+FROM node:alpine as app
+WORKDIR /opt/app
+COPY . /opt/app
+COPY --from=builder /opt/app/node_modules ./node_modules
 
 ARG NODE_ENV
-
 ENV NODE_ENV $NODE_ENV
 
-CMD [ "node", "app.js" ]
+CMD [ "npm", "start" ]

Dockerfile.db-create

@@ -1,23 +0,0 @@
-FROM --platform=linux/amd64 node:18.15-alpine3.16 as base
-
-RUN apk --update --no-cache add --virtual .builds-deps build-base python3
-
-WORKDIR /opt/app/
-
-FROM base as build
-
-COPY package.json package-lock.json ./
-
-RUN npm ci
-
-COPY . .
-
-FROM base
-
-COPY --from=build /opt/app /opt/app/
-
-ARG NODE_ENV
-
-ENV NODE_ENV $NODE_ENV
-
-CMD [ "npm", "run", "upgrade-db" ]

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Drachtio Communications Services, LLC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -1,46 +1,29 @@
 # jambonz-api-server ![Build Status](https://github.com/jambonz/jambonz-api-server/workflows/CI/badge.svg)
 
-Jambones REST API server of the jambones platform.
+Jambones REST API server.
 
 ## Configuration
 
-Configuration is provided via environment variables:
+This process requires the following environment variables to be set.
 
-| variable | meaning | required?|
-|----------|----------|---------|
-|JWT_SECRET| secret for signing JWT token |yes|
-|JWT_EXPIRES_IN| expiration time for JWT token(in minutes) |no|
-|ENCRYPTION_SECRET| secret for credential encryption(JWT_SECRET is deprecated) |yes|
-|HTTP_PORT| tcp port to listen on for API requests from jambonz-api-server |no|
-|JAMBONES_LOGLEVEL| log level for application, 'info' or 'debug' |no|
-|JAMBONES_MYSQL_HOST| mysql host |yes|
-|JAMBONES_MYSQL_USER| mysql username |yes|
-|JAMBONES_MYSQL_PASSWORD|  mysql password |yes|
-|JAMBONES_MYSQL_DATABASE| mysql data |yes|
-|JAMBONES_MYSQL_PORT| mysql port |no|
-|JAMBONES_MYSQL_CONNECTION_LIMIT| mysql connection limit |no|
-|JAMBONES_REDIS_HOST| redis host |yes|
-|JAMBONES_REDIS_PORT| redis port |no|
-|RATE_LIMIT_WINDOWS_MINS| rate limit window |no|
-|RATE_LIMIT_MAX_PER_WINDOW| number of requests per window |no|
-|JAMBONES_TRUST_PROXY| trust proxies, must be a number |no|
-|JAMBONES_API_VERSION| api version |no|
-|JAMBONES_TIME_SERIES_HOST| influxdb host |yes|
-|JAMBONES_CLUSTER_ID| cluster id |no|
-|HOMER_BASE_URL| HOMER URL |no|
-|HOMER_USERNAME| HOMER username |no|
-|HOMER_PASSWORD| HOMER password |no|
-|K8S| service running as kubernetes service |no|
-|K8S_FEATURE_SERVER_SERVICE_NAME| feature server name(required for K8S) |no|
-|K8S_FEATURE_SERVER_SERVICE_PORT| feature server port(required for K8S) |no|
-|JAMBONZ_RECORD_WS_USERNAME| recording websocket username|no|
-|JAMBONZ_RECORD_WS_PASSWORD| recording websocket password|no|
+```
+JAMBONES_MYSQL_HOST
+JAMBONES_MYSQL_USER
+JAMBONES_MYSQL_PASSWORD
+JAMBONES_MYSQL_DATABASE
+JAMBONES_MYSQL_CONNECTION_LIMIT   # defaults to 10
+JAMBONES_REDIS_HOST
+JAMBONES_REDIS_PORT
+JAMBONES_LOGLEVEL                 # defaults to info
+JAMBONES_API_VERSION              # defaults to v1
+HTTP_PORT                         # defaults to 3000
+```
 
 #### Database dependency
 A mysql database is used to store long-lived objects such as Accounts, Applications, etc. To create the database schema, use or review the scripts in the 'db' folder, particularly:
+- [create_db.sql](db/create_db.sql), which creates the database and associated user (you may want to edit the username and password),
 - [jambones-sql.sql](db/jambones-sql.sql), which creates the schema,
-- [seed-production-database-open-source.sql](db/seed-production-database-open-source.sql), which seeds the database with initial dataset(accounts, permissions, api keys, applications etc).
-- [create-admin-user.sql](db/create-admin-user.sql), which creates admin user with password set to "admin". The password will be forced to change after the first login.
+- [create-admin-token.sql](db/create-admin-token.sql), which creates an admin-level auth token that can be used for testing/exercising the API.
 
 > Note: due to the dependency on the npmjs [mysql](https://www.npmjs.com/package/mysql) package, the mysql database must be configured to use sql [native authentication](https://medium.com/@crmcmullen/how-to-run-mysql-8-0-with-native-password-authentication-502de5bac661).
 

app.js

@@ -1,59 +1,40 @@
 const assert = require('assert');
-const logger = require('./lib/logger');
+const opts = Object.assign({
+  timestamp: () => {
+    return `, "time": "${new Date().toISOString()}"`;
+  }
+}, {
+  level: process.env.JAMBONES_LOGLEVEL || 'info'
+});
+const logger = require('pino')(opts);
 const express = require('express');
 const app = express();
-const helmet = require('helmet');
-const nocache = require('nocache');
-const rateLimit = require('express-rate-limit');
 const cors = require('cors');
 const passport = require('passport');
 const routes = require('./lib/routes');
-const Registrar = require('@jambonz/mw-registrar');
 
 assert.ok(process.env.JAMBONES_MYSQL_HOST &&
   process.env.JAMBONES_MYSQL_USER &&
   process.env.JAMBONES_MYSQL_PASSWORD &&
   process.env.JAMBONES_MYSQL_DATABASE, 'missing JAMBONES_MYSQL_XXX env vars');
-if (process.env.JAMBONES_REDIS_SENTINELS) {
-  assert.ok(process.env.JAMBONES_REDIS_SENTINEL_MASTER_NAME,
-    'missing JAMBONES_REDIS_SENTINEL_MASTER_NAME env var, JAMBONES_REDIS_SENTINEL_PASSWORD env var is optional');
-} else {
-  assert.ok(process.env.JAMBONES_REDIS_HOST, 'missing JAMBONES_REDIS_HOST env var');
-}
+assert.ok(process.env.JAMBONES_REDIS_HOST, 'missing JAMBONES_REDIS_HOST env var');
 assert.ok(process.env.JAMBONES_TIME_SERIES_HOST, 'missing JAMBONES_TIME_SERIES_HOST env var');
-assert.ok(process.env.ENCRYPTION_SECRET || process.env.JWT_SECRET, 'missing ENCRYPTION_SECRET env var');
-assert.ok(process.env.JWT_SECRET, 'missing JWT_SECRET env var');
-
-const {
-  queryCdrs,
-  queryCdrsSP,
-  queryAlerts,
-  queryAlertsSP,
-  writeCdrs,
-  writeAlerts,
-  AlertType
-} = require('@jambonz/time-series')(
+const {queryCdrs, queryAlerts, writeCdrs, writeAlerts, AlertType} = require('@jambonz/time-series')(
   logger, process.env.JAMBONES_TIME_SERIES_HOST
 );
 const {
-  client,
   retrieveCall,
   deleteCall,
   listCalls,
-  listSortedSets,
   purgeCalls,
   retrieveSet,
   addKey,
   retrieveKey,
-  deleteKey,
-  incrKey
-} = require('./lib/helpers/realtimedb-helpers');
-const {
-  getTtsVoices,
-  getTtsSize,
-  purgeTtsCache,
-  synthAudio
-} = require('@jambonz/speech-utils')({}, logger);
+  deleteKey
+} = require('@jambonz/realtimedb-helpers')({
+  host: process.env.JAMBONES_REDIS_HOST || 'localhost',
+  port: process.env.JAMBONES_REDIS_PORT || 6379
+}, logger);
 const {
   lookupAppBySid,
   lookupAccountBySid,
@@ -61,8 +42,7 @@ const {
   lookupAppByPhoneNumber,
   lookupCarrierBySid,
   lookupSipGatewayBySid,
-  lookupSmppGatewayBySid,
-  lookupClientByAccountAndUsername
+  lookupSmppGatewayBySid
 } = require('@jambonz/db-helpers')({
   host: process.env.JAMBONES_MYSQL_HOST,
   user: process.env.JAMBONES_MYSQL_USER,
@@ -73,30 +53,21 @@ const {
 }, logger);
 const PORT = process.env.HTTP_PORT || 3000;
 const authStrategy = require('./lib/auth')(logger, retrieveKey);
-const {delayLoginMiddleware} = require('./lib/middleware');
-const Websocket = require('ws');
 
 passport.use(authStrategy);
 
 app.locals = app.locals || {};
 app.locals = {
   ...app.locals,
-  registrar: new Registrar(logger, client),
   logger,
   retrieveCall,
   deleteCall,
   listCalls,
-  listSortedSets,
   purgeCalls,
   retrieveSet,
   addKey,
-  incrKey,
   retrieveKey,
   deleteKey,
-  getTtsVoices,
-  getTtsSize,
-  purgeTtsCache,
-  synthAudio,
   lookupAppBySid,
   lookupAccountBySid,
   lookupAccountByPhoneNumber,
@@ -104,11 +75,8 @@ app.locals = {
   lookupCarrierBySid,
   lookupSipGatewayBySid,
   lookupSmppGatewayBySid,
-  lookupClientByAccountAndUsername,
   queryCdrs,
-  queryCdrsSP,
   queryAlerts,
-  queryAlertsSP,
   writeCdrs,
   writeAlerts,
   AlertType
@@ -121,38 +89,8 @@ const unless = (paths, middleware) => {
   };
 };
 
-const limiter = rateLimit({
-  windowMs: (process.env.RATE_LIMIT_WINDOWS_MINS || 5) * 60 * 1000, // 5 minutes
-  max: process.env.RATE_LIMIT_MAX_PER_WINDOW || 600, // Limit each IP to 600 requests per `window`
-  standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers
-  legacyHeaders: false, // Disable the `X-RateLimit-*` headers
-});
-
-// Setup websocket for recording audio
-const recordWsServer = require('./lib/record');
-const wsServer = new Websocket.Server({ noServer: true });
-wsServer.setMaxListeners(0);
-wsServer.on('connection', recordWsServer.bind(null, logger));
-
-if (process.env.JAMBONES_TRUST_PROXY) {
-  const proxyCount = parseInt(process.env.JAMBONES_TRUST_PROXY);
-  if (!isNaN(proxyCount) && proxyCount > 0) {
-    logger.info(`setting trust proxy to ${proxyCount} and mounting endpoint /ip`);
-    app.set('trust proxy', proxyCount);
-    app.get('/ip', (req, res) => {
-      logger.info({headers: req.headers}, 'received GET /ip');
-      res.send(req.ip);
-    });
-  }
-}
-app.use(limiter);
-app.use(helmet());
-app.use(helmet.hidePoweredBy());
-app.use(nocache());
-app.use(passport.initialize());
 app.use(cors());
 app.use(express.urlencoded({extended: true}));
-app.use(delayLoginMiddleware);
 app.use(unless(['/stripe'], express.json()));
 app.use('/v1', unless(
   [
@@ -174,52 +112,7 @@ app.use((err, req, res, next) => {
   });
 });
 logger.info(`listening for HTTP traffic on port ${PORT}`);
-const server = app.listen(PORT);
-
-
-const isValidWsKey = (hdr) => {
-  const username = process.env.JAMBONZ_RECORD_WS_USERNAME || process.env.JAMBONES_RECORD_WS_USERNAME;
-  const password = process.env.JAMBONZ_RECORD_WS_PASSWORD || process.env.JAMBONES_RECORD_WS_PASSWORD;
-  if (username && password) {
-    if (!hdr) {
-      // auth header is missing
-      return false;
-    }
-    const token = Buffer.from(`${username}:${password}`).toString('base64');
-    const arr = /^Basic (.*)$/.exec(hdr);
-    if (!Array.isArray(arr)) {
-      // malformed auth header
-      return false;
-    }
-    return arr[1] === token;
-  }
-  return true;
-};
-
-server.on('upgrade', (request, socket, head) => {
-  logger.debug({
-    url: request.url,
-    headers: request.headers,
-  }, 'received upgrade request');
-
-  /* verify the path starts with /transcribe */
-  if (!request.url.includes('/record/')) {
-    logger.info(`unhandled path: ${request.url}`);
-    return socket.write('HTTP/1.1 404 Not Found \r\n\r\n', () => socket.destroy());
-  }
-
-  /* verify the api key */
-  if (!isValidWsKey(request.headers['authorization'])) {
-    logger.info(`invalid auth header: ${request.headers['authorization'] || 'authorization header missing'}`);
-    return socket.write('HTTP/1.1 403 Forbidden \r\n\r\n', () => socket.destroy());
-  }
-
-  /* complete the upgrade */
-  wsServer.handleUpgrade(request, socket, head, (ws) => {
-    logger.info(`upgraded to websocket, url: ${request.url}`);
-    wsServer.emit('connection', ws, request.url);
-  });
-});
+app.listen(PORT);
 
 // purge old calls from active call set every 10 mins
 async function purge() {

db/add-predefined-carriers.sql

@@ -45,6 +45,8 @@ VALUES
 ('91cb050f-9826-4ac9-b736-84a10372a9fe', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.139.77', 32, 5060, 1, 0),
 ('58700fad-98bf-4d31-b61e-888c54911b35', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.140.77', 32, 5060, 1, 0),
 ('d020fd9e-7fdb-4bca-ae0d-e61b38142873', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.142.77', 32, 5060, 1, 0),
-('38d8520a-527f-4f8e-8456-f9dfca742561', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '172.86.225.77', 32, 5060, 1, 0),
-('834f8b0c-d4c2-4f3e-93d9-cf307995eedd', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '172.86.225.88', 32, 5060, 1, 0),
+('441fd2e7-c845-459c-963d-6e917063ed9a', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.141.77', 32, 5060, 1, 0),
+('1e0d3e80-9973-4184-9bec-07ae564f983f', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.143.77', 32, 5060, 1, 0),
+('e56ec745-5f37-443f-afb4-7bbda31ae7ac', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.140.34', 32, 5060, 1, 0),
+('e7447e7e-2c7d-4738-ab53-097c187236ff', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.143.66', 32, 5060, 1, 0),
 ('5f431d42-48e4-44ce-a311-d946f0b475b6', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', 'out.simwood.com', 32, 5060, 0, 1);

db/create-admin-user.sql

@@ -1,10 +0,0 @@
-/* hashed password is "admin" */
-insert into users (user_sid, name, email, hashed_password, force_change, provider, email_validated)
-values ('12c80508-edf9-4b22-8d09-55abd02648eb', 'admin', 'joe@foo.bar', '$argon2i$v=19$m=65536,t=3,p=4$c2FsdHNhbHRzYWx0c2FsdA$x5OO6gXFXS25oqUU2JvbYqrSgRxBujNUJBq6xv9EgjM', 1, 'local', 1);
-
-insert into user_permissions (user_permissions_sid, user_sid, permission_sid) 
-values ('8919e0dc-4d69-4de5-be56-a121598d9093', '12c80508-edf9-4b22-8d09-55abd02648eb', 'ffbc342a-546a-11ed-bdc3-0242ac120002');
-insert into user_permissions (user_permissions_sid, user_sid, permission_sid) 
-values ('d6fdf064-0a65-4b17-8b10-5500e956a159', '12c80508-edf9-4b22-8d09-55abd02648eb', 'ffbc3a10-546a-11ed-bdc3-0242ac120002');
-insert into user_permissions (user_permissions_sid, user_sid, permission_sid) 
-values ('f68185dd-0486-4767-a77d-a0b84c1b236e' ,'12c80508-edf9-4b22-8d09-55abd02648eb', 'ffbc3c5e-546a-11ed-bdc3-0242ac120002');

db/generate-beta-invite-codes.js

@@ -1,40 +0,0 @@
-#!/usr/bin/env node
-const crypto = require('crypto');
-const {promisePool} = require('../lib/db');
-const sql = 'INSERT INTO beta_invite_codes (invite_code) VALUES (?);';
-
-const rand_string = (n) => {
-  if (n <= 0) {
-    return '';
-  }
-  var rs = '';
-  try {
-    rs = crypto.randomBytes(Math.ceil(n/2)).toString('hex').slice(0,n);
-    /* note: could do this non-blocking, but still might fail */
-  }
-  catch (ex) {
-    /* known exception cause: depletion of entropy info for randomBytes */
-    console.error('Exception generating random string: ' + ex);
-    /* weaker random fallback */
-    rs = '';
-    var r = n % 8, q = (n - r) / 8, i;
-    for (i = 0; i < q; i++) {
-      rs += Math.random().toString(16).slice(2);
-    }
-    if (r > 0) {
-      rs += Math.random().toString(16).slice(2, i);
-    }
-  }
-  return rs;
-};
-
-const doIt = async(len) => {
-  for (let i = 0; i < 50; i++) {
-    const val = rand_string(len).toUpperCase();
-    await promisePool.execute(sql, [val]);
-  }
-  process.exit(0);
-};
-
-doIt(6);
-

db/jambones-sql.sql

@@ -4,8 +4,6 @@ SET FOREIGN_KEY_CHECKS=0;
 
 DROP TABLE IF EXISTS account_static_ips;
 
-DROP TABLE IF EXISTS account_limits;
-
 DROP TABLE IF EXISTS account_products;
 
 DROP TABLE IF EXISTS account_subscriptions;
@@ -14,52 +12,32 @@ DROP TABLE IF EXISTS beta_invite_codes;
 
 DROP TABLE IF EXISTS call_routes;
 
-DROP TABLE IF EXISTS clients;
-
 DROP TABLE IF EXISTS dns_records;
 
-DROP TABLE IF EXISTS lcr;
-
 DROP TABLE IF EXISTS lcr_carrier_set_entry;
 
 DROP TABLE IF EXISTS lcr_routes;
 
-DROP TABLE IF EXISTS password_settings;
-
-DROP TABLE IF EXISTS user_permissions;
-
-DROP TABLE IF EXISTS permissions;
-
 DROP TABLE IF EXISTS predefined_sip_gateways;
 
-DROP TABLE IF EXISTS predefined_smpp_gateways;
-
 DROP TABLE IF EXISTS predefined_carriers;
 
 DROP TABLE IF EXISTS account_offers;
 
 DROP TABLE IF EXISTS products;
 
-DROP TABLE IF EXISTS schema_version;
-
 DROP TABLE IF EXISTS api_keys;
 
 DROP TABLE IF EXISTS sbc_addresses;
 
 DROP TABLE IF EXISTS ms_teams_tenants;
 
-DROP TABLE IF EXISTS service_provider_limits;
-
 DROP TABLE IF EXISTS signup_history;
 
 DROP TABLE IF EXISTS smpp_addresses;
 
-DROP TABLE IF EXISTS google_custom_voices;
-
 DROP TABLE IF EXISTS speech_credentials;
 
-DROP TABLE IF EXISTS system_information;
-
 DROP TABLE IF EXISTS users;
 
 DROP TABLE IF EXISTS smpp_gateways;
@@ -87,15 +65,6 @@ private_ipv4 VARBINARY(16) NOT NULL UNIQUE ,
 PRIMARY KEY (account_static_ip_sid)
 );
 
-CREATE TABLE account_limits
-(
-account_limits_sid CHAR(36) NOT NULL UNIQUE ,
-account_sid CHAR(36) NOT NULL,
-category ENUM('api_rate','voice_call_session', 'device','voice_call_minutes','voice_call_session_license', 'voice_call_minutes_license') NOT NULL,
-quantity INTEGER NOT NULL,
-PRIMARY KEY (account_limits_sid)
-);
-
 CREATE TABLE account_subscriptions
 (
 account_subscription_sid CHAR(36) NOT NULL UNIQUE ,
@@ -132,19 +101,6 @@ application_sid CHAR(36) NOT NULL,
 PRIMARY KEY (call_route_sid)
 ) COMMENT='a regex-based pattern match for call routing';
 
-CREATE TABLE clients
-(
-client_sid CHAR(36) NOT NULL UNIQUE ,
-account_sid CHAR(36) NOT NULL,
-is_active BOOLEAN NOT NULL DEFAULT 1,
-username VARCHAR(64),
-password VARCHAR(1024),
-allow_direct_app_calling BOOLEAN NOT NULL DEFAULT 1,
-allow_direct_queue_calling BOOLEAN NOT NULL DEFAULT 1,
-allow_direct_user_calling BOOLEAN NOT NULL DEFAULT 1,
-PRIMARY KEY (client_sid)
-);
-
 CREATE TABLE dns_records
 (
 dns_record_sid CHAR(36) NOT NULL UNIQUE ,
@@ -157,38 +113,11 @@ PRIMARY KEY (dns_record_sid)
 CREATE TABLE lcr_routes
 (
 lcr_route_sid CHAR(36),
-lcr_sid CHAR(36) NOT NULL,
 regex VARCHAR(32) NOT NULL COMMENT 'regex-based pattern match against dialed number, used for LCR routing of PSTN calls',
 description VARCHAR(1024),
-priority INTEGER NOT NULL COMMENT 'lower priority routes are attempted first',
+priority INTEGER NOT NULL UNIQUE  COMMENT 'lower priority routes are attempted first',
 PRIMARY KEY (lcr_route_sid)
-) COMMENT='An ordered list of  digit patterns in an LCR table.  The patterns are tested in sequence until one matches';
-
-CREATE TABLE lcr
-(
-lcr_sid CHAR(36) NOT NULL UNIQUE ,
-name VARCHAR(64) COMMENT 'User-assigned name for this LCR table',
-is_active BOOLEAN NOT NULL DEFAULT 1,
-default_carrier_set_entry_sid CHAR(36) COMMENT 'default carrier/route to use when no digit match based results are found.',
-service_provider_sid CHAR(36),
-account_sid CHAR(36),
-PRIMARY KEY (lcr_sid)
-) COMMENT='An LCR (least cost routing) table that is used by a service provider or account to make decisions about routing outbound calls when multiple carriers are available.';
-
-CREATE TABLE password_settings
-(
-min_password_length INTEGER NOT NULL DEFAULT 8,
-require_digit BOOLEAN NOT NULL DEFAULT false,
-require_special_character BOOLEAN NOT NULL DEFAULT false
-);
-
-CREATE TABLE permissions
-(
-permission_sid CHAR(36) NOT NULL UNIQUE ,
-name VARCHAR(32) NOT NULL UNIQUE ,
-description VARCHAR(255),
-PRIMARY KEY (permission_sid)
-);
+) COMMENT='Least cost routing table';
 
 CREATE TABLE predefined_carriers
 (
@@ -219,20 +148,6 @@ predefined_carrier_sid CHAR(36) NOT NULL,
 PRIMARY KEY (predefined_sip_gateway_sid)
 );
 
-CREATE TABLE predefined_smpp_gateways
-(
-predefined_smpp_gateway_sid CHAR(36) NOT NULL UNIQUE ,
-ipv4 VARCHAR(128) NOT NULL COMMENT 'ip address or DNS name of the gateway. ',
-port INTEGER NOT NULL DEFAULT 2775 COMMENT 'smpp signaling port',
-inbound BOOLEAN NOT NULL COMMENT 'if true, whitelist this IP to allow inbound SMS from the gateway',
-outbound BOOLEAN NOT NULL COMMENT 'i',
-netmask INTEGER NOT NULL DEFAULT 32,
-is_primary BOOLEAN NOT NULL DEFAULT 1,
-use_tls BOOLEAN DEFAULT 0,
-predefined_carrier_sid CHAR(36) NOT NULL,
-PRIMARY KEY (predefined_smpp_gateway_sid)
-);
-
 CREATE TABLE products
 (
 product_sid CHAR(36) NOT NULL UNIQUE ,
@@ -259,11 +174,6 @@ stripe_product_id VARCHAR(56) NOT NULL,
 PRIMARY KEY (account_offer_sid)
 );
 
-CREATE TABLE schema_version
-(
-version VARCHAR(16)
-);
-
 CREATE TABLE api_keys
 (
 api_key_sid CHAR(36) NOT NULL UNIQUE ,
@@ -281,10 +191,7 @@ CREATE TABLE sbc_addresses
 sbc_address_sid CHAR(36) NOT NULL UNIQUE ,
 ipv4 VARCHAR(255) NOT NULL,
 port INTEGER NOT NULL DEFAULT 5060,
-tls_port INTEGER,
-wss_port INTEGER,
 service_provider_sid CHAR(36),
-last_updated DATETIME,
 PRIMARY KEY (sbc_address_sid)
 );
 
@@ -298,15 +205,6 @@ tenant_fqdn VARCHAR(255) NOT NULL UNIQUE ,
 PRIMARY KEY (ms_teams_tenant_sid)
 ) COMMENT='A Microsoft Teams customer tenant';
 
-CREATE TABLE service_provider_limits
-(
-service_provider_limits_sid CHAR(36) NOT NULL UNIQUE ,
-service_provider_sid CHAR(36) NOT NULL,
-category ENUM('api_rate','voice_call_session', 'device','voice_call_minutes','voice_call_session_license', 'voice_call_minutes_license') NOT NULL,
-quantity INTEGER NOT NULL,
-PRIMARY KEY (service_provider_limits_sid)
-);
-
 CREATE TABLE signup_history
 (
 email VARCHAR(255) NOT NULL,
@@ -340,27 +238,9 @@ last_tested DATETIME,
 tts_tested_ok BOOLEAN,
 stt_tested_ok BOOLEAN,
 created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-label VARCHAR(64),
 PRIMARY KEY (speech_credential_sid)
 );
 
-CREATE TABLE google_custom_voices
-(
-google_custom_voice_sid CHAR(36) NOT NULL UNIQUE ,
-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,
-PRIMARY KEY (google_custom_voice_sid)
-);
-
-CREATE TABLE system_information
-(
-domain_name VARCHAR(255),
-sip_domain_name VARCHAR(255),
-monitoring_domain_name VARCHAR(255)
-);
-
 CREATE TABLE users
 (
 user_sid CHAR(36) NOT NULL UNIQUE ,
@@ -380,7 +260,6 @@ email_activation_code VARCHAR(16),
 email_validated BOOLEAN NOT NULL DEFAULT false,
 phone_validated BOOLEAN NOT NULL DEFAULT false,
 email_content_opt_out BOOLEAN NOT NULL DEFAULT false,
-is_active BOOLEAN NOT NULL DEFAULT true,
 PRIMARY KEY (user_sid)
 );
 
@@ -408,21 +287,9 @@ smpp_password VARCHAR(64),
 smpp_enquire_link_interval INTEGER DEFAULT 0,
 smpp_inbound_system_id VARCHAR(255),
 smpp_inbound_password VARCHAR(64),
-register_from_user VARCHAR(128),
-register_from_domain VARCHAR(255),
-register_public_ip_in_contact BOOLEAN NOT NULL DEFAULT false,
-register_status VARCHAR(4096),
 PRIMARY KEY (voip_carrier_sid)
 ) COMMENT='A Carrier or customer PBX that can send or receive calls';
 
-CREATE TABLE user_permissions
-(
-user_permissions_sid CHAR(36) NOT NULL UNIQUE ,
-user_sid CHAR(36) NOT NULL,
-permission_sid CHAR(36) NOT NULL,
-PRIMARY KEY (user_permissions_sid)
-);
-
 CREATE TABLE smpp_gateways
 (
 smpp_gateway_sid CHAR(36) NOT NULL UNIQUE ,
@@ -440,7 +307,7 @@ PRIMARY KEY (smpp_gateway_sid)
 CREATE TABLE phone_numbers
 (
 phone_number_sid CHAR(36) UNIQUE ,
-number VARCHAR(132) NOT NULL,
+number VARCHAR(32) NOT NULL UNIQUE ,
 voip_carrier_sid CHAR(36),
 account_sid CHAR(36),
 application_sid CHAR(36),
@@ -453,14 +320,11 @@ CREATE TABLE sip_gateways
 sip_gateway_sid CHAR(36),
 ipv4 VARCHAR(128) NOT NULL COMMENT 'ip address or DNS name of the gateway.  For gateways providing inbound calling service, ip address is required.',
 netmask INTEGER NOT NULL DEFAULT 32,
-port INTEGER COMMENT 'sip signaling port',
+port INTEGER NOT NULL DEFAULT 5060 COMMENT 'sip signaling port',
 inbound BOOLEAN NOT NULL COMMENT 'if true, whitelist this IP to allow inbound calls from the gateway',
 outbound BOOLEAN NOT NULL COMMENT 'if true, include in least-cost routing when placing calls to the PSTN',
 voip_carrier_sid CHAR(36) NOT NULL,
 is_active BOOLEAN NOT NULL DEFAULT 1,
-send_options_ping BOOLEAN NOT NULL DEFAULT 0,
-pad_crypto BOOLEAN NOT NULL DEFAULT 0,
-protocol ENUM('udp','tcp','tls', 'tls/srtp') DEFAULT 'udp' COMMENT 'Outbound call protocol',
 PRIMARY KEY (sip_gateway_sid)
 ) COMMENT='A whitelisted sip gateway used for origination/termination';
 
@@ -493,24 +357,12 @@ account_sid CHAR(36) COMMENT 'account that this application belongs to (if null,
 call_hook_sid CHAR(36) COMMENT 'webhook to call for inbound calls ',
 call_status_hook_sid CHAR(36) COMMENT 'webhook to call for call status events',
 messaging_hook_sid CHAR(36) COMMENT 'webhook to call for inbound SMS/MMS ',
-app_json TEXT,
 speech_synthesis_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_synthesis_language VARCHAR(12) NOT NULL DEFAULT 'en-US',
-speech_synthesis_voice VARCHAR(256),
-speech_synthesis_label VARCHAR(64),
+speech_synthesis_voice VARCHAR(64),
 speech_recognizer_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_recognizer_language VARCHAR(64) NOT NULL DEFAULT 'en-US',
-speech_recognizer_label VARCHAR(64),
-use_for_fallback_speech BOOLEAN DEFAULT false,
-fallback_speech_synthesis_vendor VARCHAR(64),
-fallback_speech_synthesis_language VARCHAR(12),
-fallback_speech_synthesis_voice VARCHAR(256),
-fallback_speech_synthesis_label VARCHAR(64),
-fallback_speech_recognizer_vendor VARCHAR(64),
-fallback_speech_recognizer_language VARCHAR(64),
-fallback_speech_recognizer_label VARCHAR(64),
 created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-record_all_calls BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (application_sid)
 ) COMMENT='A defined set of behaviors to be applied to phone calls ';
 
@@ -543,14 +395,6 @@ disable_cdrs BOOLEAN NOT NULL DEFAULT 0,
 trial_end_date DATETIME,
 deactivated_reason VARCHAR(255),
 device_to_call_ratio INTEGER NOT NULL DEFAULT 5,
-subspace_client_id VARCHAR(255),
-subspace_client_secret VARCHAR(255),
-subspace_sip_teleport_id VARCHAR(255),
-subspace_sip_teleport_destinations VARCHAR(255),
-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',
 PRIMARY KEY (account_sid)
 ) COMMENT='An enterprise that uses the platform for comm services';
 
@@ -558,43 +402,24 @@ CREATE INDEX account_static_ip_sid_idx ON account_static_ips (account_static_ip_
 CREATE INDEX account_sid_idx ON account_static_ips (account_sid);
 ALTER TABLE account_static_ips ADD FOREIGN KEY account_sid_idxfk (account_sid) REFERENCES accounts (account_sid);
 
-CREATE INDEX account_sid_idx ON account_limits (account_sid);
-ALTER TABLE account_limits ADD FOREIGN KEY account_sid_idxfk_1 (account_sid) REFERENCES accounts (account_sid) ON DELETE CASCADE;
-
 CREATE INDEX account_subscription_sid_idx ON account_subscriptions (account_subscription_sid);
 CREATE INDEX account_sid_idx ON account_subscriptions (account_sid);
-ALTER TABLE account_subscriptions ADD FOREIGN KEY account_sid_idxfk_2 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE account_subscriptions ADD FOREIGN KEY account_sid_idxfk_1 (account_sid) REFERENCES accounts (account_sid);
 
 CREATE INDEX invite_code_idx ON beta_invite_codes (invite_code);
 CREATE INDEX call_route_sid_idx ON call_routes (call_route_sid);
-ALTER TABLE call_routes ADD FOREIGN KEY account_sid_idxfk_3 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE call_routes ADD FOREIGN KEY account_sid_idxfk_2 (account_sid) REFERENCES accounts (account_sid);
 
 ALTER TABLE call_routes ADD FOREIGN KEY application_sid_idxfk (application_sid) REFERENCES applications (application_sid);
 
-CREATE INDEX client_sid_idx ON clients (client_sid);
-ALTER TABLE clients ADD CONSTRAINT account_sid_idxfk_13 FOREIGN KEY account_sid_idxfk_13 (account_sid) REFERENCES accounts (account_sid);
-
 CREATE INDEX dns_record_sid_idx ON dns_records (dns_record_sid);
-ALTER TABLE dns_records ADD FOREIGN KEY account_sid_idxfk_4 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE dns_records ADD FOREIGN KEY account_sid_idxfk_3 (account_sid) REFERENCES accounts (account_sid);
 
-CREATE INDEX lcr_sid_idx ON lcr_routes (lcr_sid);
-ALTER TABLE lcr_routes ADD FOREIGN KEY lcr_sid_idxfk (lcr_sid) REFERENCES lcr (lcr_sid);
-
-CREATE INDEX lcr_sid_idx ON lcr (lcr_sid);
-ALTER TABLE lcr ADD FOREIGN KEY default_carrier_set_entry_sid_idxfk (default_carrier_set_entry_sid) REFERENCES lcr_carrier_set_entry (lcr_carrier_set_entry_sid);
-
-CREATE INDEX service_provider_sid_idx ON lcr (service_provider_sid);
-CREATE INDEX account_sid_idx ON lcr (account_sid);
-CREATE INDEX permission_sid_idx ON permissions (permission_sid);
 CREATE INDEX predefined_carrier_sid_idx ON predefined_carriers (predefined_carrier_sid);
 CREATE INDEX predefined_sip_gateway_sid_idx ON predefined_sip_gateways (predefined_sip_gateway_sid);
 CREATE INDEX predefined_carrier_sid_idx ON predefined_sip_gateways (predefined_carrier_sid);
 ALTER TABLE predefined_sip_gateways ADD FOREIGN KEY predefined_carrier_sid_idxfk (predefined_carrier_sid) REFERENCES predefined_carriers (predefined_carrier_sid);
 
-CREATE INDEX predefined_smpp_gateway_sid_idx ON predefined_smpp_gateways (predefined_smpp_gateway_sid);
-CREATE INDEX predefined_carrier_sid_idx ON predefined_smpp_gateways (predefined_carrier_sid);
-ALTER TABLE predefined_smpp_gateways ADD FOREIGN KEY predefined_carrier_sid_idxfk_1 (predefined_carrier_sid) REFERENCES predefined_carriers (predefined_carrier_sid);
-
 CREATE INDEX product_sid_idx ON products (product_sid);
 CREATE INDEX account_product_sid_idx ON account_products (account_product_sid);
 CREATE INDEX account_subscription_sid_idx ON account_products (account_subscription_sid);
@@ -604,14 +429,14 @@ ALTER TABLE account_products ADD FOREIGN KEY product_sid_idxfk (product_sid) REF
 
 CREATE INDEX account_offer_sid_idx ON account_offers (account_offer_sid);
 CREATE INDEX account_sid_idx ON account_offers (account_sid);
-ALTER TABLE account_offers ADD FOREIGN KEY account_sid_idxfk_5 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE account_offers ADD FOREIGN KEY account_sid_idxfk_4 (account_sid) REFERENCES accounts (account_sid);
 
 CREATE INDEX product_sid_idx ON account_offers (product_sid);
 ALTER TABLE account_offers ADD FOREIGN KEY product_sid_idxfk_1 (product_sid) REFERENCES products (product_sid);
 
 CREATE INDEX api_key_sid_idx ON api_keys (api_key_sid);
 CREATE INDEX account_sid_idx ON api_keys (account_sid);
-ALTER TABLE api_keys ADD FOREIGN KEY account_sid_idxfk_6 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE api_keys ADD FOREIGN KEY account_sid_idxfk_5 (account_sid) REFERENCES accounts (account_sid);
 
 CREATE INDEX service_provider_sid_idx ON api_keys (service_provider_sid);
 ALTER TABLE api_keys ADD FOREIGN KEY service_provider_sid_idxfk (service_provider_sid) REFERENCES service_providers (service_provider_sid);
@@ -625,72 +450,59 @@ ALTER TABLE sbc_addresses ADD FOREIGN KEY service_provider_sid_idxfk_1 (service_
 CREATE INDEX ms_teams_tenant_sid_idx ON ms_teams_tenants (ms_teams_tenant_sid);
 ALTER TABLE ms_teams_tenants ADD FOREIGN KEY service_provider_sid_idxfk_2 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
 
-ALTER TABLE ms_teams_tenants ADD FOREIGN KEY account_sid_idxfk_7 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE ms_teams_tenants ADD FOREIGN KEY account_sid_idxfk_6 (account_sid) REFERENCES accounts (account_sid);
 
 ALTER TABLE ms_teams_tenants ADD FOREIGN KEY application_sid_idxfk_1 (application_sid) REFERENCES applications (application_sid);
 
 CREATE INDEX tenant_fqdn_idx ON ms_teams_tenants (tenant_fqdn);
-CREATE INDEX service_provider_sid_idx ON service_provider_limits (service_provider_sid);
-ALTER TABLE service_provider_limits ADD FOREIGN KEY service_provider_sid_idxfk_3 (service_provider_sid) REFERENCES service_providers (service_provider_sid) ON DELETE CASCADE;
-
 CREATE INDEX email_idx ON signup_history (email);
 CREATE INDEX smpp_address_sid_idx ON smpp_addresses (smpp_address_sid);
 CREATE INDEX service_provider_sid_idx ON smpp_addresses (service_provider_sid);
-ALTER TABLE smpp_addresses ADD FOREIGN KEY service_provider_sid_idxfk_4 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
+ALTER TABLE smpp_addresses ADD FOREIGN KEY service_provider_sid_idxfk_3 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
+
+CREATE UNIQUE INDEX speech_credentials_idx_1 ON speech_credentials (vendor,account_sid);
 
 CREATE INDEX speech_credential_sid_idx ON speech_credentials (speech_credential_sid);
 CREATE INDEX service_provider_sid_idx ON speech_credentials (service_provider_sid);
-ALTER TABLE speech_credentials ADD FOREIGN KEY service_provider_sid_idxfk_5 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
+ALTER TABLE speech_credentials ADD FOREIGN KEY service_provider_sid_idxfk_4 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
 
 CREATE INDEX account_sid_idx ON speech_credentials (account_sid);
-ALTER TABLE speech_credentials ADD FOREIGN KEY account_sid_idxfk_8 (account_sid) REFERENCES accounts (account_sid);
-
-CREATE INDEX google_custom_voice_sid_idx ON google_custom_voices (google_custom_voice_sid);
-CREATE INDEX speech_credential_sid_idx ON google_custom_voices (speech_credential_sid);
-ALTER TABLE google_custom_voices ADD FOREIGN KEY speech_credential_sid_idxfk (speech_credential_sid) REFERENCES speech_credentials (speech_credential_sid) ON DELETE CASCADE;
+ALTER TABLE speech_credentials ADD FOREIGN KEY account_sid_idxfk_7 (account_sid) REFERENCES accounts (account_sid);
 
 CREATE INDEX user_sid_idx ON users (user_sid);
 CREATE INDEX email_idx ON users (email);
 CREATE INDEX phone_idx ON users (phone);
 CREATE INDEX account_sid_idx ON users (account_sid);
-ALTER TABLE users ADD FOREIGN KEY account_sid_idxfk_9 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE users ADD FOREIGN KEY account_sid_idxfk_8 (account_sid) REFERENCES accounts (account_sid);
 
 CREATE INDEX service_provider_sid_idx ON users (service_provider_sid);
-ALTER TABLE users ADD FOREIGN KEY service_provider_sid_idxfk_6 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
+ALTER TABLE users ADD FOREIGN KEY service_provider_sid_idxfk_5 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
 
 CREATE INDEX email_activation_code_idx ON users (email_activation_code);
 CREATE INDEX voip_carrier_sid_idx ON voip_carriers (voip_carrier_sid);
 CREATE INDEX account_sid_idx ON voip_carriers (account_sid);
-ALTER TABLE voip_carriers ADD FOREIGN KEY account_sid_idxfk_10 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE voip_carriers ADD FOREIGN KEY account_sid_idxfk_9 (account_sid) REFERENCES accounts (account_sid);
 
 CREATE INDEX service_provider_sid_idx ON voip_carriers (service_provider_sid);
-ALTER TABLE voip_carriers ADD FOREIGN KEY service_provider_sid_idxfk_7 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
+ALTER TABLE voip_carriers ADD FOREIGN KEY service_provider_sid_idxfk_6 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
 
 ALTER TABLE voip_carriers ADD FOREIGN KEY application_sid_idxfk_2 (application_sid) REFERENCES applications (application_sid);
 
-CREATE INDEX user_permissions_sid_idx ON user_permissions (user_permissions_sid);
-CREATE INDEX user_sid_idx ON user_permissions (user_sid);
-ALTER TABLE user_permissions ADD FOREIGN KEY user_sid_idxfk (user_sid) REFERENCES users (user_sid) ON DELETE CASCADE;
-
-ALTER TABLE user_permissions ADD FOREIGN KEY permission_sid_idxfk (permission_sid) REFERENCES permissions (permission_sid);
-
 CREATE INDEX smpp_gateway_sid_idx ON smpp_gateways (smpp_gateway_sid);
 CREATE INDEX voip_carrier_sid_idx ON smpp_gateways (voip_carrier_sid);
 ALTER TABLE smpp_gateways ADD FOREIGN KEY voip_carrier_sid_idxfk (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_sid);
 
-CREATE UNIQUE INDEX phone_numbers_unique_idx_voip_carrier_number ON phone_numbers (number,voip_carrier_sid);
-
 CREATE INDEX phone_number_sid_idx ON phone_numbers (phone_number_sid);
 CREATE INDEX number_idx ON phone_numbers (number);
 CREATE INDEX voip_carrier_sid_idx ON phone_numbers (voip_carrier_sid);
 ALTER TABLE phone_numbers ADD FOREIGN KEY voip_carrier_sid_idxfk_1 (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_sid);
 
-ALTER TABLE phone_numbers ADD FOREIGN KEY account_sid_idxfk_11 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE phone_numbers ADD FOREIGN KEY account_sid_idxfk_10 (account_sid) REFERENCES accounts (account_sid);
 
 ALTER TABLE phone_numbers ADD FOREIGN KEY application_sid_idxfk_3 (application_sid) REFERENCES applications (application_sid);
 
 CREATE INDEX service_provider_sid_idx ON phone_numbers (service_provider_sid);
-ALTER TABLE phone_numbers ADD FOREIGN KEY service_provider_sid_idxfk_8 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
+ALTER TABLE phone_numbers ADD FOREIGN KEY service_provider_sid_idxfk_7 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
 
 CREATE INDEX sip_gateway_idx_hostport ON sip_gateways (ipv4,port);
 
@@ -706,10 +518,10 @@ CREATE UNIQUE INDEX applications_idx_name ON applications (account_sid,name);
 
 CREATE INDEX application_sid_idx ON applications (application_sid);
 CREATE INDEX service_provider_sid_idx ON applications (service_provider_sid);
-ALTER TABLE applications ADD FOREIGN KEY service_provider_sid_idxfk_9 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
+ALTER TABLE applications ADD FOREIGN KEY service_provider_sid_idxfk_8 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
 
 CREATE INDEX account_sid_idx ON applications (account_sid);
-ALTER TABLE applications ADD FOREIGN KEY account_sid_idxfk_12 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE applications ADD FOREIGN KEY account_sid_idxfk_11 (account_sid) REFERENCES accounts (account_sid);
 
 ALTER TABLE applications ADD FOREIGN KEY call_hook_sid_idxfk (call_hook_sid) REFERENCES webhooks (webhook_sid);
 
@@ -725,7 +537,7 @@ ALTER TABLE service_providers ADD FOREIGN KEY registration_hook_sid_idxfk (regis
 CREATE INDEX account_sid_idx ON accounts (account_sid);
 CREATE INDEX sip_realm_idx ON accounts (sip_realm);
 CREATE INDEX service_provider_sid_idx ON accounts (service_provider_sid);
-ALTER TABLE accounts ADD FOREIGN KEY service_provider_sid_idxfk_10 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
+ALTER TABLE accounts ADD FOREIGN KEY service_provider_sid_idxfk_9 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
 
 ALTER TABLE accounts ADD FOREIGN KEY registration_hook_sid_idxfk_1 (registration_hook_sid) REFERENCES webhooks (webhook_sid);
 
@@ -733,6 +545,4 @@ ALTER TABLE accounts ADD FOREIGN KEY queue_event_hook_sid_idxfk (queue_event_hoo
 
 ALTER TABLE accounts ADD FOREIGN KEY device_calling_application_sid_idxfk (device_calling_application_sid) REFERENCES applications (application_sid);
 
-ALTER TABLE accounts ADD FOREIGN KEY siprec_hook_sid_idxfk (siprec_hook_sid) REFERENCES applications (application_sid);
-
 SET FOREIGN_KEY_CHECKS=1;

db/reset_admin_password.js

@@ -1,31 +1,24 @@
 #!/usr/bin/env node
+console.log('reset_admin_password');
 const {promisePool} = require('../lib/db');
-const { v4: uuidv4 } = require('uuid');
+const uuidv4 = require('uuid/v4');
 const {generateHashedPassword} = require('../lib/utils/password-utils');
 const sqlInsert = `INSERT into users 
 (user_sid, name, email, hashed_password, force_change, provider, email_validated) 
 values (?, ?, ?, ?, ?, ?, ?)
 `;
-const sqlInsertAdminToken = `INSERT into api_keys 
-(api_key_sid, token) 
-values (?, ?)`;
-const sqlQueryAccount = 'SELECT * from accounts LEFT JOIN api_keys ON api_keys.account_sid = accounts.account_sid';
-const sqlAddAccountToken = `INSERT into api_keys (api_key_sid, token, account_sid) 
+const sqlChangeAdminToken = `UPDATE api_keys set token = ? 
+WHERE account_sid IS NULL 
+AND service_provider_sid IS NULL`;
+const sqlQueryAccount = 'SELECT * from accounts LIMIT 1';
+const sqlAddAccountAdminToken = `INSERT into api_keys (api_key_sid, token, account_sid) 
 VALUES (?, ?, ?)`;
-const sqlInsertPermissions = `
-INSERT into user_permissions (user_permissions_sid, user_sid, permission_sid) 
-VALUES (?,?,?)`;
-
-const password = process.env.JAMBONES_ADMIN_INITIAL_PASSWORD || 'admin';
-console.log(`reset_admin_password, initial admin password is ${password}`);
 
 const doIt = async() => {
-  const passwordHash = await generateHashedPassword(password);
+  const passwordHash = await generateHashedPassword('admin');
   const sid = uuidv4();
   await promisePool.execute('DELETE from users where name = "admin"');
-  await promisePool.execute('DELETE from api_keys where account_sid is null and service_provider_sid is null');
-
-  await promisePool.execute(sqlInsert,
+  await promisePool.execute(sqlInsert, 
     [
       sid,
       'admin',
@@ -36,22 +29,16 @@ const doIt = async() => {
       1
     ]
   );
-  await promisePool.execute(sqlInsertAdminToken, [uuidv4(), uuidv4()]);
 
-  /* assign all permissions to the admin user */
-  const [p] = await promisePool.query('SELECT * from permissions');
-  for (const perm of p) {
-    await promisePool.execute(sqlInsertPermissions, [uuidv4(), sid, perm.permission_sid]);
-  }
+  /* reset admin token */
+  const uuid = uuidv4();
+  await promisePool.query(sqlChangeAdminToken, [uuid]);
 
   /* create admin token for single account */
-  const [r] = await promisePool.query({sql: sqlQueryAccount, nestTables: true});
-  if (1 === r.length && r[0].api_keys.api_key_sid === null) {
-    const api_key_sid = uuidv4();
-    const token = uuidv4();
-    const {account_sid} = r[0].accounts;
-    await promisePool.execute(sqlAddAccountToken, [api_key_sid, token, account_sid]);
-  }
+  const api_key_sid = uuidv4();
+  const token = uuidv4();
+  const [r] = await promisePool.query(sqlQueryAccount);
+  await promisePool.execute(sqlAddAccountAdminToken, [api_key_sid, token, r[0].account_sid]);
 
   process.exit(0);
 };

db/seed-integration-test.sql

@@ -1,12 +1,5 @@
 SET FOREIGN_KEY_CHECKS=0;
 
--- create standard 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');
-
 insert into sbc_addresses (sbc_address_sid, ipv4, port) 
 values('f6567ae1-bf97-49af-8931-ca014b689995', '52.55.111.178', 5060);
 insert into sbc_addresses (sbc_address_sid, ipv4, port) 
@@ -22,25 +15,17 @@ values ('3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', '38700987-c7a4-4685-a5bb-af378f9
 
 -- create one service provider and one account
 insert into service_providers (service_provider_sid, name, root_domain) 
-values ('2708b1b3-2736-40ea-b502-c53d8396247f', 'default service provider', 'sip.jambonz.cloud');
+values ('2708b1b3-2736-40ea-b502-c53d8396247f', 'default service provider', 'sip.jambonz.us');
 
 insert into accounts (account_sid, service_provider_sid, name, webhook_secret) 
 values ('9351f46a-678c-43f5-b8a6-d4eb58d131af','2708b1b3-2736-40ea-b502-c53d8396247f', 'default account', 'wh_secret_cJqgtMDPzDhhnjmaJH6Mtk');
 
--- create account level api key
-insert into api_keys (api_key_sid, token, service_provider_sid) 
-values ('3f35518f-5a0d-4c2e-90a5-2407bb3b36fa', '38700987-c7a4-4685-a5bb-af378f9734da', '9351f46a-678c-43f5-b8a6-d4eb58d131af');
-
--- create SP level api key
-insert into api_keys (api_key_sid, token, account_sid) 
-values ('3f35518f-5a0d-4c2e-90a5-2407bb3b36fs', '38700987-c7a4-4685-a5bb-af378f9734ds', '2708b1b3-2736-40ea-b502-c53d8396247f');
-
 -- create two applications
 insert into webhooks(webhook_sid, url, method)
 values 
-('84e3db00-b172-4e46-b54b-a503fdb19e4a', 'https://public-apps.jambonz.cloud/call-status', 'POST'),
-('d31568d0-b193-4a05-8ff6-778369bc6efe', 'https://public-apps.jambonz.cloud/hello-world', 'POST'),
-('81844b05-714d-4295-8bf3-3b0640a4bf02', 'https://public-apps.jambonz.cloud/dial-time', 'POST');
+('84e3db00-b172-4e46-b54b-a503fdb19e4a', 'https://public-apps.jambonz.us/call-status', 'POST'),
+('d31568d0-b193-4a05-8ff6-778369bc6efe', 'https://public-apps.jambonz.us/hello-world', 'POST'),
+('81844b05-714d-4295-8bf3-3b0640a4bf02', 'https://public-apps.jambonz.us/dial-time', 'POST');
 
 insert into applications (application_sid, account_sid, name, call_hook_sid, call_status_hook_sid, speech_synthesis_vendor, speech_synthesis_language, speech_synthesis_voice, speech_recognizer_vendor, speech_recognizer_language)
 VALUES
@@ -59,23 +44,12 @@ insert into predefined_carriers (predefined_carrier_sid, name, requires_static_i
 requires_register, register_username, register_password, 
 register_sip_realm, tech_prefix, inbound_auth_username, inbound_auth_password, diversion)
 VALUES
-('17479288-bb9f-421a-89d1-f4ac57af1dca', 'TelecomsXChange', 0, 0, 0, NULL, NULL, NULL, 'your-tech-prefix', NULL, NULL, NULL),
 ('7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', 'Twilio', 0, 1, 0, '<your-twilio-credential-username>', '<your-twilio-credential-password>', NULL, NULL, NULL, NULL, NULL),
 ('032d90d5-39e8-41c0-b807-9c88cffba65c', 'Voxbone', 0, 1, 0, '<your-voxbone-outbound-username>', '<your-voxbone-outbound-password>', NULL, NULL, NULL, NULL, '<your-voxbone-DID>'),
+('17479288-bb9f-421a-89d1-f4ac57af1dca', 'Peerless Network (US)', 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+('bdf70650-5328-47aa-b3d0-47cb219d9c6e', '382 Communications (US)', 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 ('e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', 'Simwood', 0, 1, 0, '<your-simwood-auth-trunk-username>',  '<your-simwood-auth-trunk-password>', NULL, NULL, NULL, NULL, NULL);
 
--- TelecomXchange gateways
-insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
-VALUES
-('c9c3643e-9a83-4b78-b172-9c09d911bef5', '17479288-bb9f-421a-89d1-f4ac57af1dca', '174.136.44.213', 32, 5060, 1, 0),
-('3b5b7fa5-4e61-4423-b921-05c3283b2101', '17479288-bb9f-421a-89d1-f4ac57af1dca', 'sip01.TelecomsXChange.com', 32, 5060, 0, 1);
-
-insert into predefined_smpp_gateways (predefined_smpp_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
-VALUES
-('9b72467a-cfe3-491f-80bf-652c38e666b9', '17479288-bb9f-421a-89d1-f4ac57af1dca', 'smpp01.telecomsxchange.com', 32, 2776, 0, 1),
-('d22883b9-f124-4a89-bab2-4487cf783f64', '17479288-bb9f-421a-89d1-f4ac57af1dca', '174.136.44.11', 32, 2775, 1, 0),
-('fdcf7f1e-1f5f-487b-afb3-c0f75ed0aa3d', '17479288-bb9f-421a-89d1-f4ac57af1dca', '174.136.44.213', 32, 2775, 1, 0);
-
 -- twilio gateways
 insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
 VALUES
@@ -87,7 +61,6 @@ VALUES
 ('81a0c8cb-a33e-42da-8f20-99083da6f02f', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.252.254.64', 30, 5060, 1, 0),
 ('eeeef07a-46b8-4ffe-a4f2-04eb32ca889e', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.169.127.128', 30, 5060, 1, 0),
 ('fbb6c194-4b68-4dff-9b42-52412be1c39e', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '177.71.206.192', 30, 5060, 1, 0),
-('973e7824-0cf3-4645-88e4-d2460ddb8577', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '168.86.128.0', 18, 5060, 1, 0),
 ('3ed1dd12-e1a7-44ff-811a-3cc5dc13dc72', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '<your-domain>.pstn.twilio.com', 32, 5060, 0, 1);
 
 -- voxbone gateways
@@ -101,15 +74,29 @@ VALUES
 ('7bae60b3-4237-4baa-a711-30ea3bce19d8', '032d90d5-39e8-41c0-b807-9c88cffba65c', '185.47.148.45', 32, 5060, 1, 0),
 ('bc933522-18a2-47d8-9ae4-9faa8de4e927', '032d90d5-39e8-41c0-b807-9c88cffba65c', 'outbound.voxbone.com', 32, 5060, 0, 1);
 
+-- Peerless gateways
+insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
+VALUES
+('4e23f698-a70a-4616-9bf0-c9dd5ab123af', '17479288-bb9f-421a-89d1-f4ac57af1dca', '208.79.54.182', 32, 5060, 1, 0),
+('e5c71c18-0511-41b8-bed9-1ba061bbcf10', '17479288-bb9f-421a-89d1-f4ac57af1dca', '208.79.52.192', 32, 5060, 0, 1),
+('226c7471-2f4f-440f-8525-37fd0512bd8b', '17479288-bb9f-421a-89d1-f4ac57af1dca', '208.79.54.185', 32, 5060, 0, 1);
+
+-- 382com gateways
+insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
+VALUES
+('23e4c250-8578-4d88-99b5-a7941a58e26f', 'bdf70650-5328-47aa-b3d0-47cb219d9c6e', '64.125.111.10', 32, 5060, 1, 0),
+('c726d435-c9a7-4c37-b891-775990a54638', 'bdf70650-5328-47aa-b3d0-47cb219d9c6e', '64.124.67.11', 32, 5060, 0, 1);
+
 -- simwood gateways
 insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
 VALUES
 ('91cb050f-9826-4ac9-b736-84a10372a9fe', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.139.77', 32, 5060, 1, 0),
 ('58700fad-98bf-4d31-b61e-888c54911b35', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.140.77', 32, 5060, 1, 0),
 ('d020fd9e-7fdb-4bca-ae0d-e61b38142873', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.142.77', 32, 5060, 1, 0),
-('38d8520a-527f-4f8e-8456-f9dfca742561', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '172.86.225.77', 32, 5060, 1, 0),
-('834f8b0c-d4c2-4f3e-93d9-cf307995eedd', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '172.86.225.88', 32, 5060, 1, 0),
+('441fd2e7-c845-459c-963d-6e917063ed9a', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.141.77', 32, 5060, 1, 0),
+('1e0d3e80-9973-4184-9bec-07ae564f983f', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.143.77', 32, 5060, 1, 0),
+('e56ec745-5f37-443f-afb4-7bbda31ae7ac', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.140.34', 32, 5060, 1, 0),
+('e7447e7e-2c7d-4738-ab53-097c187236ff', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.143.66', 32, 5060, 1, 0),
 ('5f431d42-48e4-44ce-a311-d946f0b475b6', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', 'out.simwood.com', 32, 5060, 0, 1);
 
-
 SET FOREIGN_KEY_CHECKS=1;

db/seed-production-database-open-source.sql

@@ -1,12 +1,5 @@
 SET FOREIGN_KEY_CHECKS=0;
 
--- create standard 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');
-
 -- create one service provider and account
 insert into api_keys (api_key_sid, token) 
 values ('3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', '38700987-c7a4-4685-a5bb-af378f9734de');
@@ -24,9 +17,10 @@ values ('09e92f3c-9d73-4303-b63f-3668574862ce', '1cf2f4f4-64c4-4249-9a3e-5bb4cb5
 -- create two applications
 insert into webhooks(webhook_sid, url, method)
 values 
-('84e3db00-b172-4e46-b54b-a503fdb19e4a', 'https://public-apps.jambonz.cloud/call-status', 'POST'),
-('d31568d0-b193-4a05-8ff6-778369bc6efe', 'https://public-apps.jambonz.cloud/hello-world', 'POST'),
-('81844b05-714d-4295-8bf3-3b0640a4bf02', 'https://public-apps.jambonz.cloud/dial-time', 'POST');
+('84e3db00-b172-4e46-b54b-a503fdb19e4a', 'https://public-apps.jambonz.us/call-status', 'POST'),
+('d31568d0-b193-4a05-8ff6-778369bc6efe', 'https://public-apps.jambonz.us/hello-world', 'POST'),
+('81844b05-714d-4295-8bf3-3b0640a4bf02', 'https://public-apps.jambonz.us/dial-time', 'POST');
+
 insert into applications (application_sid, account_sid, name, call_hook_sid, call_status_hook_sid, speech_synthesis_vendor, speech_synthesis_language, speech_synthesis_voice, speech_recognizer_vendor, speech_recognizer_language)
 VALUES
 ('7087fe50-8acb-4f3b-b820-97b573723aab', '9351f46a-678c-43f5-b8a6-d4eb58d131af', 'hello world', 'd31568d0-b193-4a05-8ff6-778369bc6efe', '84e3db00-b172-4e46-b54b-a503fdb19e4a', 'google', 'en-US', 'en-US-Wavenet-C', 'google', 'en-US'),
@@ -55,12 +49,6 @@ VALUES
 ('c9c3643e-9a83-4b78-b172-9c09d911bef5', '17479288-bb9f-421a-89d1-f4ac57af1dca', '174.136.44.213', 32, 5060, 1, 0),
 ('3b5b7fa5-4e61-4423-b921-05c3283b2101', '17479288-bb9f-421a-89d1-f4ac57af1dca', 'sip01.TelecomsXChange.com', 32, 5060, 0, 1);
 
-insert into predefined_smpp_gateways (predefined_smpp_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
-VALUES
-('9b72467a-cfe3-491f-80bf-652c38e666b9', '17479288-bb9f-421a-89d1-f4ac57af1dca', 'smpp01.telecomsxchange.com', 32, 2776, 0, 1),
-('d22883b9-f124-4a89-bab2-4487cf783f64', '17479288-bb9f-421a-89d1-f4ac57af1dca', '174.136.44.11', 32, 2775, 1, 0),
-('fdcf7f1e-1f5f-487b-afb3-c0f75ed0aa3d', '17479288-bb9f-421a-89d1-f4ac57af1dca', '174.136.44.213', 32, 2775, 1, 0);
-
 -- twilio gateways
 insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
 VALUES
@@ -72,7 +60,6 @@ VALUES
 ('81a0c8cb-a33e-42da-8f20-99083da6f02f', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.252.254.64', 30, 5060, 1, 0),
 ('eeeef07a-46b8-4ffe-a4f2-04eb32ca889e', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.169.127.128', 30, 5060, 1, 0),
 ('fbb6c194-4b68-4dff-9b42-52412be1c39e', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '177.71.206.192', 30, 5060, 1, 0),
-('973e7824-0cf3-4645-88e4-d2460ddb8577', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '168.86.128.0', 18, 5060, 1, 0),
 ('3ed1dd12-e1a7-44ff-811a-3cc5dc13dc72', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '<your-domain>.pstn.twilio.com', 32, 5060, 0, 1);
 
 -- voxbone gateways
@@ -86,14 +73,29 @@ VALUES
 ('7bae60b3-4237-4baa-a711-30ea3bce19d8', '032d90d5-39e8-41c0-b807-9c88cffba65c', '185.47.148.45', 32, 5060, 1, 0),
 ('bc933522-18a2-47d8-9ae4-9faa8de4e927', '032d90d5-39e8-41c0-b807-9c88cffba65c', 'outbound.voxbone.com', 32, 5060, 0, 1);
 
+-- Peerless gateways
+insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
+VALUES
+('4e23f698-a70a-4616-9bf0-c9dd5ab123af', '17479288-bb9f-421a-89d1-f4ac57af1dca', '208.79.54.182', 32, 5060, 1, 0),
+('e5c71c18-0511-41b8-bed9-1ba061bbcf10', '17479288-bb9f-421a-89d1-f4ac57af1dca', '208.79.52.192', 32, 5060, 0, 1),
+('226c7471-2f4f-440f-8525-37fd0512bd8b', '17479288-bb9f-421a-89d1-f4ac57af1dca', '208.79.54.185', 32, 5060, 0, 1);
+
+-- 382com gateways
+insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
+VALUES
+('23e4c250-8578-4d88-99b5-a7941a58e26f', 'bdf70650-5328-47aa-b3d0-47cb219d9c6e', '64.125.111.10', 32, 5060, 1, 0),
+('c726d435-c9a7-4c37-b891-775990a54638', 'bdf70650-5328-47aa-b3d0-47cb219d9c6e', '64.124.67.11', 32, 5060, 0, 1);
+
 -- simwood gateways
 insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
 VALUES
 ('91cb050f-9826-4ac9-b736-84a10372a9fe', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.139.77', 32, 5060, 1, 0),
 ('58700fad-98bf-4d31-b61e-888c54911b35', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.140.77', 32, 5060, 1, 0),
 ('d020fd9e-7fdb-4bca-ae0d-e61b38142873', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.142.77', 32, 5060, 1, 0),
-('38d8520a-527f-4f8e-8456-f9dfca742561', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '172.86.225.77', 32, 5060, 1, 0),
-('834f8b0c-d4c2-4f3e-93d9-cf307995eedd', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '172.86.225.88', 32, 5060, 1, 0),
+('441fd2e7-c845-459c-963d-6e917063ed9a', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.141.77', 32, 5060, 1, 0),
+('1e0d3e80-9973-4184-9bec-07ae564f983f', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.143.77', 32, 5060, 1, 0),
+('e56ec745-5f37-443f-afb4-7bbda31ae7ac', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.140.34', 32, 5060, 1, 0),
+('e7447e7e-2c7d-4738-ab53-097c187236ff', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.143.66', 32, 5060, 1, 0),
 ('5f431d42-48e4-44ce-a311-d946f0b475b6', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', 'out.simwood.com', 32, 5060, 0, 1);
 
 SET FOREIGN_KEY_CHECKS=1;

db/seed-production-database.sql

@@ -1,15 +1,6 @@
-SET FOREIGN_KEY_CHECKS=0;
-
--- create standard 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');
-
 -- create one service provider
 insert into service_providers (service_provider_sid, name, description, root_domain) 
-values ('2708b1b3-2736-40ea-b502-c53d8396247f', 'sip.jambonz.xyz', 'jambonz.xyz service provider', 'sip.jambonz.xyz');
+values ('2708b1b3-2736-40ea-b502-c53d8396247f', 'sip.jambonz.us', 'jambonz.us service provider', 'sip.jambonz.us');
 insert into api_keys (api_key_sid, token) 
 values ('3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', '38700987-c7a4-4685-a5bb-af378f9734de');
 
@@ -25,9 +16,9 @@ insert into predefined_carriers (predefined_carrier_sid, name, requires_static_i
 requires_register, register_username, register_password, 
 register_sip_realm, tech_prefix, inbound_auth_username, inbound_auth_password, diversion)
 VALUES
-('17479288-bb9f-421a-89d1-f4ac57af1dca', 'TelecomsXChange', 0, 0, 0, NULL, NULL, NULL, 'your-tech-prefix', NULL, NULL, NULL),
 ('7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', 'Twilio', 0, 1, 0, '<your-twilio-credential-username>', '<your-twilio-credential-password>', NULL, NULL, NULL, NULL, NULL),
 ('032d90d5-39e8-41c0-b807-9c88cffba65c', 'Voxbone', 0, 1, 0, '<your-voxbone-outbound-username>', '<your-voxbone-outbound-password>', NULL, NULL, NULL, NULL, '<your-voxbone-DID>'),
+('17479288-bb9f-421a-89d1-f4ac57af1dca', 'TelecomsXChange', 0, 0, 0, NULL, NULL, NULL, 'your-tech-prefix', NULL, NULL, NULL),
 ('e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', 'Simwood', 0, 1, 0, '<your-simwood-auth-trunk-username>',  '<your-simwood-auth-trunk-password>', NULL, NULL, NULL, NULL, NULL);
 
 -- TelecomXchange gateways
@@ -36,12 +27,6 @@ VALUES
 ('c9c3643e-9a83-4b78-b172-9c09d911bef5', '17479288-bb9f-421a-89d1-f4ac57af1dca', '174.136.44.213', 32, 5060, 1, 0),
 ('3b5b7fa5-4e61-4423-b921-05c3283b2101', '17479288-bb9f-421a-89d1-f4ac57af1dca', 'sip01.TelecomsXChange.com', 32, 5060, 0, 1);
 
-insert into predefined_smpp_gateways (predefined_smpp_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
-VALUES
-('9b72467a-cfe3-491f-80bf-652c38e666b9', '17479288-bb9f-421a-89d1-f4ac57af1dca', 'smpp01.telecomsxchange.com', 32, 2776, 0, 1),
-('d22883b9-f124-4a89-bab2-4487cf783f64', '17479288-bb9f-421a-89d1-f4ac57af1dca', '174.136.44.11', 32, 2775, 1, 0),
-('fdcf7f1e-1f5f-487b-afb3-c0f75ed0aa3d', '17479288-bb9f-421a-89d1-f4ac57af1dca', '174.136.44.213', 32, 2775, 1, 0);
-
 -- twilio gateways
 insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
 VALUES
@@ -53,7 +38,6 @@ VALUES
 ('81a0c8cb-a33e-42da-8f20-99083da6f02f', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.252.254.64', 30, 5060, 1, 0),
 ('eeeef07a-46b8-4ffe-a4f2-04eb32ca889e', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.169.127.128', 30, 5060, 1, 0),
 ('fbb6c194-4b68-4dff-9b42-52412be1c39e', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '177.71.206.192', 30, 5060, 1, 0),
-('973e7824-0cf3-4645-88e4-d2460ddb8577', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '168.86.128.0', 18, 5060, 1, 0),
 ('3ed1dd12-e1a7-44ff-811a-3cc5dc13dc72', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '<your-domain>.pstn.twilio.com', 32, 5060, 0, 1);
 
 -- voxbone gateways
@@ -67,14 +51,28 @@ VALUES
 ('7bae60b3-4237-4baa-a711-30ea3bce19d8', '032d90d5-39e8-41c0-b807-9c88cffba65c', '185.47.148.45', 32, 5060, 1, 0),
 ('bc933522-18a2-47d8-9ae4-9faa8de4e927', '032d90d5-39e8-41c0-b807-9c88cffba65c', 'outbound.voxbone.com', 32, 5060, 0, 1);
 
+-- Peerless gateways
+insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
+VALUES
+('4e23f698-a70a-4616-9bf0-c9dd5ab123af', '17479288-bb9f-421a-89d1-f4ac57af1dca', '208.79.54.182', 32, 5060, 1, 0),
+('e5c71c18-0511-41b8-bed9-1ba061bbcf10', '17479288-bb9f-421a-89d1-f4ac57af1dca', '208.79.52.192', 32, 5060, 0, 1),
+('226c7471-2f4f-440f-8525-37fd0512bd8b', '17479288-bb9f-421a-89d1-f4ac57af1dca', '208.79.54.185', 32, 5060, 0, 1);
+
+-- 382com gateways
+insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
+VALUES
+('23e4c250-8578-4d88-99b5-a7941a58e26f', 'bdf70650-5328-47aa-b3d0-47cb219d9c6e', '64.125.111.10', 32, 5060, 1, 0),
+('c726d435-c9a7-4c37-b891-775990a54638', 'bdf70650-5328-47aa-b3d0-47cb219d9c6e', '64.124.67.11', 32, 5060, 0, 1);
+
 -- simwood gateways
 insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
 VALUES
 ('91cb050f-9826-4ac9-b736-84a10372a9fe', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.139.77', 32, 5060, 1, 0),
 ('58700fad-98bf-4d31-b61e-888c54911b35', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.140.77', 32, 5060, 1, 0),
 ('d020fd9e-7fdb-4bca-ae0d-e61b38142873', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.142.77', 32, 5060, 1, 0),
-('38d8520a-527f-4f8e-8456-f9dfca742561', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '172.86.225.77', 32, 5060, 1, 0),
-('834f8b0c-d4c2-4f3e-93d9-cf307995eedd', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '172.86.225.88', 32, 5060, 1, 0),
+('441fd2e7-c845-459c-963d-6e917063ed9a', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.141.77', 32, 5060, 1, 0),
+('1e0d3e80-9973-4184-9bec-07ae564f983f', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.143.77', 32, 5060, 1, 0),
+('e56ec745-5f37-443f-afb4-7bbda31ae7ac', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.140.34', 32, 5060, 1, 0),
+('e7447e7e-2c7d-4738-ab53-097c187236ff', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.143.66', 32, 5060, 1, 0),
 ('5f431d42-48e4-44ce-a311-d946f0b475b6', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', 'out.simwood.com', 32, 5060, 0, 1);
 
-SET FOREIGN_KEY_CHECKS=1;

db/upgrade-jambonz-db.js

@@ -1,280 +0,0 @@
-#!/usr/bin/env node
-/* eslint-disable max-len */
-const assert = require('assert');
-const mysql = require('mysql2/promise');
-const {readFile} = require('fs/promises');
-const {execSync} = require('child_process');
-const {version:desiredVersion} = require('../package.json');
-const logger = require('pino')();
-
-logger.info(`upgrade-jambonz-db: desired version ${desiredVersion}`);
-
-assert.ok(process.env.JAMBONES_MYSQL_HOST, 'missing env JAMBONES_MYSQL_HOST');
-assert.ok(process.env.JAMBONES_MYSQL_DATABASE, 'missing env JAMBONES_MYSQL_DATABASE');
-assert.ok(process.env.JAMBONES_MYSQL_PASSWORD, 'missing env JAMBONES_MYSQL_PASSWORD');
-assert.ok(process.env.JAMBONES_MYSQL_USER, 'missing env JAMBONES_MYSQL_USER');
-
-const opts = {
-  host: process.env.JAMBONES_MYSQL_HOST,
-  user: process.env.JAMBONES_MYSQL_USER,
-  password: process.env.JAMBONES_MYSQL_PASSWORD,
-  database: process.env.JAMBONES_MYSQL_DATABASE,
-  port: process.env.JAMBONES_MYSQL_PORT || 3306,
-  multipleStatements: true
-};
-
-const sql = {
-  '7006': [
-    'ALTER TABLE `accounts` ADD COLUMN `siprec_hook_sid` CHAR(36)',
-    'ALTER TABLE accounts ADD FOREIGN KEY siprec_hook_sid_idxfk (siprec_hook_sid) REFERENCES applications (application_sid)'
-  ],
-  '7007': [
-    `CREATE TABLE service_provider_limits 
-    (service_provider_limits_sid CHAR(36) NOT NULL UNIQUE,
-    service_provider_sid CHAR(36) NOT NULL,
-    category ENUM('api_rate','voice_call_session', 'device') NOT NULL,
-    quantity INTEGER NOT NULL,
-    PRIMARY KEY (service_provider_limits_sid)
-    )`,
-    `CREATE TABLE account_limits
-    (
-    account_limits_sid CHAR(36) NOT NULL UNIQUE ,
-    account_sid CHAR(36) NOT NULL,
-    category ENUM('api_rate','voice_call_session', 'device') NOT NULL,
-    quantity INTEGER NOT NULL,
-    PRIMARY KEY (account_limits_sid)
-    )`,
-    'CREATE INDEX service_provider_sid_idx ON service_provider_limits (service_provider_sid)',
-    `ALTER TABLE service_provider_limits 
-    ADD FOREIGN KEY service_provider_sid_idxfk_3 (service_provider_sid) 
-    REFERENCES service_providers (service_provider_sid) 
-    ON DELETE CASCADE`,
-    'CREATE INDEX account_sid_idx ON account_limits (account_sid)',
-    `ALTER TABLE account_limits 
-    ADD FOREIGN KEY account_sid_idxfk_2 (account_sid) 
-    REFERENCES accounts (account_sid) 
-    ON DELETE CASCADE`,
-    'ALTER TABLE `voip_carriers` ADD COLUMN `register_from_user` VARCHAR(128)',
-    'ALTER TABLE `voip_carriers` ADD COLUMN `register_from_domain` VARCHAR(256)',
-    'ALTER TABLE `voip_carriers` ADD COLUMN `register_public_ip_in_contact` BOOLEAN NOT NULL DEFAULT false'
-  ],
-  '8000': [
-    'ALTER TABLE `applications` ADD COLUMN `app_json` TEXT',
-    'ALTER TABLE voip_carriers CHANGE register_public_domain_in_contact register_public_ip_in_contact BOOLEAN',
-    'alter table phone_numbers modify number varchar(132) NOT NULL UNIQUE',
-    `CREATE TABLE permissions
-    (
-    permission_sid CHAR(36) NOT NULL UNIQUE ,
-    name VARCHAR(32) NOT NULL UNIQUE ,
-    description VARCHAR(255),
-    PRIMARY KEY (permission_sid)
-    )`,
-    `CREATE TABLE user_permissions
-    (
-    user_permissions_sid CHAR(36) NOT NULL UNIQUE ,
-    user_sid CHAR(36) NOT NULL,
-    permission_sid CHAR(36) NOT NULL,
-    PRIMARY KEY (user_permissions_sid)
-    )`,
-    `CREATE TABLE password_settings
-    (
-    min_password_length INTEGER NOT NULL DEFAULT 8,
-    require_digit BOOLEAN NOT NULL DEFAULT false,
-    require_special_character BOOLEAN NOT NULL DEFAULT false
-    )`,
-    'CREATE INDEX user_permissions_sid_idx ON user_permissions (user_permissions_sid)',
-    'CREATE INDEX user_sid_idx ON user_permissions (user_sid)',
-    'ALTER TABLE user_permissions ADD FOREIGN KEY user_sid_idxfk (user_sid) REFERENCES users (user_sid) ON DELETE CASCADE',
-    'ALTER TABLE user_permissions ADD FOREIGN KEY permission_sid_idxfk (permission_sid) REFERENCES permissions (permission_sid)',
-    'ALTER TABLE `users` ADD COLUMN `is_active` BOOLEAN NOT NULL default true',
-  ],
-  '8003': [
-    'SET FOREIGN_KEY_CHECKS=0',
-    'ALTER TABLE `voip_carriers` ADD COLUMN `register_status` VARCHAR(4096)',
-    'ALTER TABLE `sbc_addresses` ADD COLUMN `last_updated` DATETIME',
-    'ALTER TABLE `sbc_addresses` ADD COLUMN `tls_port` INTEGER',
-    'ALTER TABLE `sbc_addresses` ADD COLUMN `wss_port` INTEGER',
-    `CREATE TABLE system_information
-    (
-    domain_name VARCHAR(255),
-    sip_domain_name VARCHAR(255),
-    monitoring_domain_name VARCHAR(255)
-    )`,
-    'DROP TABLE IF EXISTS `lcr_routes`',
-    'DROP TABLE IF EXISTS `lcr_carrier_set_entry`',
-    `CREATE TABLE lcr_routes
-    (
-    lcr_route_sid CHAR(36),
-    lcr_sid CHAR(36) NOT NULL,
-    regex VARCHAR(32) NOT NULL COMMENT 'regex-based pattern match against dialed number, used for LCR routing of PSTN calls',
-    description VARCHAR(1024),
-    priority INTEGER NOT NULL COMMENT 'lower priority routes are attempted first',
-    PRIMARY KEY (lcr_route_sid)
-    )`,
-    `CREATE TABLE lcr
-    (
-    lcr_sid CHAR(36) NOT NULL UNIQUE ,
-    name VARCHAR(64) COMMENT 'User-assigned name for this LCR table',
-    is_active BOOLEAN NOT NULL DEFAULT 1,
-    default_carrier_set_entry_sid CHAR(36) COMMENT 'default carrier/route to use when no digit match based results are found.',
-    service_provider_sid CHAR(36),
-    account_sid CHAR(36),
-    PRIMARY KEY (lcr_sid)
-    )`,
-    `CREATE TABLE lcr_carrier_set_entry
-    (
-    lcr_carrier_set_entry_sid CHAR(36),
-    workload INTEGER NOT NULL DEFAULT 1 COMMENT 'represents a proportion of traffic to send through the associated carrier; can be used for load balancing traffic across carriers with a common priority for a destination',
-    lcr_route_sid CHAR(36) NOT NULL,
-    voip_carrier_sid CHAR(36) NOT NULL,
-    priority INTEGER NOT NULL DEFAULT 0 COMMENT 'lower priority carriers are attempted first',
-    PRIMARY KEY (lcr_carrier_set_entry_sid)
-    )`,
-    'CREATE INDEX lcr_sid_idx ON lcr_routes (lcr_sid)',
-    'ALTER TABLE lcr_routes ADD FOREIGN KEY lcr_sid_idxfk (lcr_sid) REFERENCES lcr (lcr_sid)',
-    'CREATE INDEX lcr_sid_idx ON lcr (lcr_sid)',
-    'ALTER TABLE lcr ADD FOREIGN KEY default_carrier_set_entry_sid_idxfk (default_carrier_set_entry_sid) REFERENCES lcr_carrier_set_entry (lcr_carrier_set_entry_sid)',
-    'CREATE INDEX service_provider_sid_idx ON lcr (service_provider_sid)',
-    'CREATE INDEX account_sid_idx ON lcr (account_sid)',
-    'ALTER TABLE lcr_carrier_set_entry ADD FOREIGN KEY lcr_route_sid_idxfk (lcr_route_sid) REFERENCES lcr_routes (lcr_route_sid)',
-    'ALTER TABLE lcr_carrier_set_entry ADD FOREIGN KEY voip_carrier_sid_idxfk_3 (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_sid)',
-    'SET FOREIGN_KEY_CHECKS=1',
-  ],
-  '8004': [
-    'alter table accounts add column record_all_calls BOOLEAN NOT NULL DEFAULT false',
-    'alter table accounts add column bucket_credential VARCHAR(8192)',
-    'alter table accounts add column record_format VARCHAR(16) NOT NULL DEFAULT \'mp3\'',
-    'alter table applications add column record_all_calls BOOLEAN NOT NULL DEFAULT false',
-    'alter table phone_numbers DROP INDEX number',
-    'create unique index phone_numbers_unique_idx_voip_carrier_number ON phone_numbers (number,voip_carrier_sid)',
-    `CREATE TABLE clients
-    (
-    client_sid CHAR(36) NOT NULL UNIQUE ,
-    account_sid CHAR(36) NOT NULL,
-    is_active BOOLEAN NOT NULL DEFAULT 1,
-    username VARCHAR(64),
-    password VARCHAR(1024),
-    PRIMARY KEY (client_sid)
-    )`,
-    'CREATE INDEX client_sid_idx ON clients (client_sid)',
-    'ALTER TABLE clients ADD CONSTRAINT account_sid_idxfk_13 FOREIGN KEY account_sid_idxfk_13 (account_sid) REFERENCES accounts (account_sid)',
-    'ALTER TABLE sip_gateways ADD COLUMN protocol ENUM(\'udp\',\'tcp\',\'tls\', \'tls/srtp\') DEFAULT \'udp\''
-  ],
-  '8005': [
-    'DROP INDEX speech_credentials_idx_1 ON speech_credentials',
-    'ALTER TABLE speech_credentials ADD COLUMN label VARCHAR(64)',
-    'ALTER TABLE applications ADD COLUMN speech_synthesis_label VARCHAR(64)',
-    'ALTER TABLE applications ADD COLUMN speech_recognizer_label VARCHAR(64)',
-    'ALTER TABLE applications ADD COLUMN use_for_fallback_speech BOOLEAN DEFAULT false',
-    'ALTER TABLE applications ADD COLUMN fallback_speech_synthesis_vendor VARCHAR(64)',
-    'ALTER TABLE applications ADD COLUMN fallback_speech_synthesis_language VARCHAR(12)',
-    'ALTER TABLE applications ADD COLUMN fallback_speech_synthesis_voice VARCHAR(64)',
-    'ALTER TABLE applications ADD COLUMN fallback_speech_synthesis_label VARCHAR(64)',
-    'ALTER TABLE applications ADD COLUMN fallback_speech_recognizer_vendor VARCHAR(64)',
-    'ALTER TABLE applications ADD COLUMN fallback_speech_recognizer_language VARCHAR(64)',
-    'ALTER TABLE applications ADD COLUMN fallback_speech_recognizer_label VARCHAR(64)',
-    'ALTER TABLE sip_gateways ADD COLUMN pad_crypto BOOLEAN NOT NULL DEFAULT 0',
-    'ALTER TABLE sip_gateways MODIFY port INTEGER',
-    `CREATE TABLE google_custom_voices
-    (
-    google_custom_voice_sid CHAR(36) NOT NULL UNIQUE ,
-    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,
-    PRIMARY KEY (google_custom_voice_sid)
-    )
-    `,
-    'CREATE INDEX google_custom_voice_sid_idx ON google_custom_voices (google_custom_voice_sid)',
-    'CREATE INDEX speech_credential_sid_idx ON google_custom_voices (speech_credential_sid)',
-    'ALTER TABLE google_custom_voices ADD FOREIGN KEY speech_credential_sid_idxfk (speech_credential_sid) REFERENCES speech_credentials (speech_credential_sid) ON DELETE CASCADE',
-    'ALTER TABLE clients ADD COLUMN allow_direct_queue_calling BOOLEAN NOT NULL DEFAULT 1',
-    'ALTER TABLE clients ADD COLUMN allow_direct_user_calling BOOLEAN NOT NULL DEFAULT 1',
-    'ALTER TABLE clients ADD COLUMN allow_direct_app_calling BOOLEAN NOT NULL DEFAULT 1',
-  ],
-  9000: [
-    'ALTER TABLE sip_gateways ADD COLUMN send_options_ping BOOLEAN NOT NULL DEFAULT 0',
-    'ALTER TABLE applications MODIFY COLUMN speech_synthesis_voice VARCHAR(256)',
-    'ALTER TABLE applications MODIFY COLUMN fallback_speech_synthesis_voice VARCHAR(256)',
-  ]
-};
-
-const doIt = async() => {
-  let connection;
-  try {
-    logger.info({opts}, 'connecting to mysql database..');
-    connection = await mysql.createConnection(opts);
-  } catch (err) {
-    logger.error({err}, 'Error connecting to database with provided env vars');
-    process.exit(1);
-  }
-
-  try {
-    /* does the schema exist at all ? */
-    const [r] = await connection.execute('SELECT version from schema_version');
-    let errors = 0;
-    if (r.length) {
-      const {version} = r[0];
-      const arr = /v?(\d+)\.(\d+)\.(\d+)/.exec(version);
-      if (arr) {
-        const upgrades = [];
-        logger.info(`performing schema migration: ${version} => ${desiredVersion}`);
-        const val = (1000 * arr[1]) + (100 * arr[2]) + arr[3];
-        logger.info(`current schema value: ${val}`);
-
-        if (val < 7006) upgrades.push(...sql['7006']);
-        if (val < 7007) upgrades.push(...sql['7007']);
-        if (val < 8000) upgrades.push(...sql['8000']);
-        if (val < 8003) upgrades.push(...sql['8003']);
-        if (val < 8004) upgrades.push(...sql['8004']);
-        if (val < 8005) upgrades.push(...sql['8005']);
-        if (val < 9000) upgrades.push(...sql['9000']);
-
-        // perform all upgrades
-        logger.info({upgrades}, 'applying schema upgrades..');
-        for (const upgrade of upgrades) {
-          try {
-            await connection.execute(upgrade);
-          } catch (err) {
-            errors++;
-            logger.info({statement:upgrade, err}, 'Error applying statement');
-          }
-        }
-      }
-      if (errors === 0) await connection.execute(`UPDATE schema_version SET version = '${desiredVersion}'`);
-      await connection.end();
-      logger.info(`schema migration to ${desiredVersion} completed with ${errors} errors`);
-      return;
-    }
-  } catch (err) {
-  }
-  try {
-    await createSchema(connection);
-    await seedDatabase(connection);
-    logger.info('reset admin password..');
-    execSync(`${__dirname}/../db/reset_admin_password.js`);
-    await connection.query(`INSERT into schema_version (version) values('${desiredVersion}')`);
-    logger.info('database install/upgrade complete.');
-    await connection.end();
-  } catch (err) {
-    logger.error({err}, 'Error seeding database');
-    process.exit(1);
-  }
-};
-
-const createSchema = async(connection) => {
-  logger.info('reading schema..');
-  const sql = await readFile(`${__dirname}/../db/jambones-sql.sql`, {encoding: 'utf8'});
-  logger.info('creating schema..');
-  await connection.query(sql);
-};
-
-const seedDatabase = async(connection) => {
-  const sql = await readFile(`${__dirname}/../db/seed-production-database-open-source.sql`, {encoding: 'utf8'});
-  logger.info('seeding data..');
-  await connection.query(sql);
-};
-
-
-doIt();
-

db/webapp-tests.sql

@@ -2,7 +2,7 @@ SET FOREIGN_KEY_CHECKS=0;
 
 -- create one service provider
 insert into service_providers (service_provider_sid, name, description, root_domain) 
-values ('2708b1b3-2736-40ea-b502-c53d8396247f', 'jambonz.cloud', 'jambonz.cloud service provider', 'sip.yakeeda.com');
+values ('2708b1b3-2736-40ea-b502-c53d8396247f', 'jambonz.us', 'jambonz.us service provider', 'sip.yakeeda.com');
 insert into api_keys (api_key_sid, token) 
 values ('3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', '38700987-c7a4-4685-a5bb-af378f9734de');
 
@@ -19,8 +19,8 @@ insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, port, inbound
 values ('46b727eb-c7dc-44fa-b063-96e48d408e4a', '5145b436-2f38-4029-8d4c-fd8c67831c7a', '3.3.3.3', 5060, 1, 1, 1);
 
 -- create the test application and test phone number
-insert into webhooks (webhook_sid, url, method) values ('d9c205c6-a129-443e-a9c0-d1bb437d4bb7', 'https://flows.jambonz.cloud/testCall', 'POST');
-insert into webhooks (webhook_sid, url, method) values ('6ac36aeb-6bd0-428a-80a1-aed95640a296', 'https://flows.jambonz.cloud/callStatus', 'POST');
+insert into webhooks (webhook_sid, url, method) values ('d9c205c6-a129-443e-a9c0-d1bb437d4bb7', 'https://flows.jambonz.us/testCall', 'POST');
+insert into webhooks (webhook_sid, url, method) values ('6ac36aeb-6bd0-428a-80a1-aed95640a296', 'https://flows.jambonz.us/callStatus', 'POST');
 insert into applications (application_sid, name, service_provider_sid, call_hook_sid, call_status_hook_sid, 
 speech_synthesis_vendor, speech_synthesis_language, speech_synthesis_voice, speech_recognizer_vendor, speech_recognizer_language)
 values ('7a489343-02ed-471e-8df0-fc5e1b98ce8f', 'Test application', '2708b1b3-2736-40ea-b502-c53d8396247f', 
@@ -85,6 +85,9 @@ VALUES
 -- simwood gateways
 insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
 VALUES
+('91cb050f-9826-4ac9-b736-84a10372a9fe', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '149.91.14.0', 24, 5060, 1, 0),
+('58700fad-98bf-4d31-b61e-888c54911b35', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '154.51.137.96', 27, 5060, 1, 0),
+('d020fd9e-7fdb-4bca-ae0d-e61b38142873', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '78.40.245.160', 27, 5060, 1, 0),
 ('441fd2e7-c845-459c-963d-6e917063ed9a', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.136.24', 29, 5060, 1, 0),
 ('1e0d3e80-9973-4184-9bec-07ae564f983f', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.136.28', 28, 5060, 1, 0),
 ('e56ec745-5f37-443f-afb4-7bbda31ae7ac', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.140.48', 28, 5060, 1, 0),
@@ -95,7 +98,7 @@ VALUES
 ('b6ae6240-55ac-4c11-892f-a71b2155ea60', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.142.0', 26, 5060, 1, 0),
 ('5a976337-164b-408e-8748-d8bfb4bd5d76', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.143.0', 26, 5060, 1, 0),
 ('ed0434ca-7f26-4624-9523-0419d0d2924d', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.139.0', 26, 5060, 1, 0),
-('6bfb55e5-e248-48dc-a104-4f3eedd7d7de', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '172.86.225.0', 24, 5060, 1, 0),
+('d1a594c2-c14f-4ead-b621-96129bc87886', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '172.86.224.0', 24, 5060, 1, 0),
 ('5f431d42-48e4-44ce-a311-d946f0b475b6', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', 'out.simwood.com', 32, 5060, 0, 1);
 
 

lib/auth/index.js

@@ -1,56 +1,54 @@
 const Strategy = require('passport-http-bearer').Strategy;
 const {getMysqlConnection} = require('../db');
+const {hashString} = require('../utils/password-utils');
 const debug = require('debug')('jambonz:api-server');
-const {cacheClient} = require('../helpers');
 const jwt = require('jsonwebtoken');
 const sql = `
   SELECT *
   FROM api_keys
   WHERE api_keys.token = ?`;
 
-function makeStrategy(logger) {
+function makeStrategy(logger, retrieveKey) {
   return new Strategy(
     async function(token, done) {
+      logger.debug(`validating with token ${token}`);
       jwt.verify(token, process.env.JWT_SECRET, async(err, decoded) => {
         if (err) {
           if (err.name === 'TokenExpiredError') {
             logger.debug('jwt expired');
             return done(null, false);
           }
-          /* its not a jwt obtained through login, check api keys */
+          /* its not a jwt obtained through login, check api leys */
           checkApiTokens(logger, token, done);
         }
         else {
+          /* validated -- make sure it is not on blacklist */
           try {
-            const {user_sid} = decoded;
-            /* Valid jwt tokens are stored in redis by hashed user_id */
-            const redisKey = cacheClient.generateRedisKey('jwt', user_sid, 'v2');
-            const result = await cacheClient.get(redisKey);
-            if (result === null) {
-              debug(`result from searching for ${redisKey}: ${result}`);
+            const s = `jwt:${hashString(token)}`;
+            const result = await retrieveKey(s);
+            if (result) {
+              debug(`result from searching for ${s}: ${result}`);
               logger.info('jwt invalidated after logout');
               return done(null, false);
             }
-          } catch (error) {
+          } catch (err) {
             debug(err);
-            logger.info({err}, 'Error checking redis for jwt');
+            logger.info({err}, 'Error checking blacklist for jwt');
           }
-          const { user_sid, service_provider_sid, account_sid, email, name, scope, permissions } = decoded;
-
+          const {user_sid, account_sid, email, name} = decoded;
+          //logger.debug({user_sid, account_sid}, 'successfully validated jwt');
+          const scope = ['account'];
           const user = {
-            service_provider_sid,
             account_sid,
             user_sid,
             jwt: token,
             email,
             name,
-            permissions,
-            hasScope: (s) => s === scope,
-            hasAdminAuth: scope === 'admin',
-            hasServiceProviderAuth: scope === 'service_provider',
-            hasAccountAuth: scope === 'account'
+            hasScope: (s) => s === 'account',
+            hasAdminAuth: false,
+            hasServiceProviderAuth: false,
+            hasAccountAuth: true
           };
-          logger.debug({user}, 'successfully validated jwt');
           return done(null, user, {scope});
         }
       });
@@ -77,30 +75,26 @@ const checkApiTokens = (logger, token, done) => {
       }
 
       // found api key
-      let scope;
-      //const scope = [];
+      const scope = [];
       if (results[0].account_sid === null && results[0].service_provider_sid === null) {
-        //scope.push.apply(scope, ['admin', 'service_provider', 'account']);
-        scope = 'admin';
+        scope.push.apply(scope, ['admin', 'service_provider', 'account']);
       }
       else if (results[0].service_provider_sid) {
-        //scope.push.apply(scope, ['service_provider', 'account']);
-        scope = 'service_provider';
+        scope.push.apply(scope, ['service_provider', 'account']);
       }
       else {
-        //scope.push('account');
-        scope = 'account';
+        scope.push('account');
       }
 
       const user = {
         account_sid: results[0].account_sid,
         service_provider_sid: results[0].service_provider_sid,
-        hasScope: (s) => s === scope,
-        hasAdminAuth: scope === 'admin',
-        hasServiceProviderAuth: scope === 'service_provider',
-        hasAccountAuth: scope === 'account'
+        hasScope: (s) => scope.includes(s),
+        hasAdminAuth: scope.length === 3,
+        hasServiceProviderAuth: scope.includes('service_provider'),
+        hasAccountAuth: scope.includes('account') && !scope.includes('service_provider')
       };
-      logger.debug({user}, `successfully validated with scope ${scope}`);
+      logger.info(user, `successfully validated with scope ${scope}`);
       return done(null, user, {scope});
     });
   });

lib/helpers/cache-client.js

@@ -1,82 +0,0 @@
-const {
-  addKey: addKeyRedis,
-  deleteKey: deleteKeyRedis,
-  retrieveKey: retrieveKeyRedis,
-} = require('./realtimedb-helpers');
-const { hashString } = require('../utils/password-utils');
-const logger = require('../logger');
-
-class CacheClient {
-  constructor() { }
-
-  async set(params) {
-    const {
-      redisKey,
-      value = '1',
-      time = 3600,
-    } = params || {};
-
-    try {
-      await addKeyRedis(redisKey, value, time);
-
-    } catch (err) {
-      logger.error('CacheClient.get set', {
-        error: {
-          message: err.message,
-          name: err.name
-        },
-        ...params
-      });
-    }
-  }
-
-  async get(redisKey) {
-    try {
-      const result = await retrieveKeyRedis(redisKey);
-      return result;
-    } catch (err) {
-      logger.error('CacheClient.get error', {
-        error: {
-          message: err.message,
-          name: err.name
-        },
-        redisKey
-      });
-    }
-  }
-
-
-  async delete(key) {
-    try {
-      await deleteKeyRedis(key);
-      logger.debug('CacheClient.delete key from redis', { key });
-    } catch (err) {
-      logger.error('CacheClient.delete error', {
-        error: {
-          message: err.message,
-          name: err.name
-        },
-        key
-      });
-    }
-  }
-
-  generateRedisKey(type, key, version) {
-    let suffix = '';
-    if (version) {
-      suffix = `:version:${version}`;
-    }
-
-    switch (type) {
-      case 'reset-link':
-        return `reset-link:${key}`;
-      case 'jwt':
-      default:
-        return `jwt:${hashString(key)}${suffix}`;
-    }
-  }
-}
-
-const cacheClient = new CacheClient();
-
-module.exports = { cacheClient };

lib/helpers/index.js

@@ -1,4 +0,0 @@
-module.exports = {
-  ...require('./cache-client'),
-  ...require('./realtimedb-helpers'),
-};

lib/helpers/realtimedb-helpers.js

@@ -1,31 +0,0 @@
-const logger = require('../logger');
-
-const {
-  client,
-  retrieveCall,
-  deleteCall,
-  listCalls,
-  listSortedSets,
-  purgeCalls,
-  retrieveSet,
-  addKey,
-  retrieveKey,
-  deleteKey,
-  incrKey,
-  client: redisClient,
-} = require('@jambonz/realtimedb-helpers')({}, logger);
-
-module.exports = {
-  client,
-  retrieveCall,
-  deleteCall,
-  listCalls,
-  listSortedSets,
-  purgeCalls,
-  retrieveSet,
-  addKey,
-  retrieveKey,
-  deleteKey,
-  redisClient,
-  incrKey
-};

lib/logger.js

@@ -1,7 +0,0 @@
-const opts = {
-  level: process.env.JAMBONES_LOGLEVEL || 'info'
-};
-const pino = require('pino');
-const logger = pino(opts, pino.destination(1, {sync: false}));
-
-module.exports = logger;

lib/middleware.js

@@ -1,32 +0,0 @@
-const logger = require('./logger');
-
-function delayLoginMiddleware(req, res, next) {
-  if (req.path.includes('/login') || req.path.includes('/signin')) {
-    const min = 200;
-    const max = 1000;
-    /* Random delay between 200 - 1000ms */
-    const sendStatusDelay = Math.floor(Math.random() * (max - min + 1)) + min;
-
-    /* the res.json take longer, we decrease the max delay slightly to 0-800ms */
-    const jsonDelay = Math.floor(Math.random() * 800);
-    logger.debug(`delayLoginMiddleware: sendStatus ${sendStatusDelay} - json ${jsonDelay}`);
-    const sendStatus = res.sendStatus;
-    const json = res.json;
-
-    res.sendStatus = function(status) {
-      setTimeout(() => {
-        sendStatus.call(res, status);
-      }, sendStatusDelay);
-    };
-    res.json = function(body) {
-      setTimeout(() => {
-        json.call(res, body);
-      }, jsonDelay);
-    };
-  }
-  next();
-}
-
-module.exports = {
-  delayLoginMiddleware
-};

lib/models/account-limits.js

@@ -1,41 +0,0 @@
-const Model = require('./model');
-const {promisePool} = require('../db');
-const sql = 'SELECT * FROM account_limits WHERE account_sid = ?';
-
-class AccountLimits extends Model {
-  constructor() {
-    super();
-  }
-
-  static async retrieve(account_sid) {
-    const [rows] = await promisePool.query(sql, [account_sid]);
-    return rows;
-  }
-
-}
-
-AccountLimits.table = 'account_limits';
-AccountLimits.fields = [
-  {
-    name: 'account_limits_sid',
-    type: 'string',
-    primaryKey: true
-  },
-  {
-    name: 'account_sid',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'category',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'quantity',
-    type: 'number',
-    required: true
-  }
-];
-
-module.exports = AccountLimits;

lib/models/account.js

@@ -2,15 +2,12 @@ const debug = require('debug')('jambonz:api-server');
 const Model = require('./model');
 const {getMysqlConnection} = require('../db');
 const {promisePool} = require('../db');
-const { v4: uuid } = require('uuid');
-
-const {encrypt, decrypt} = require('../utils/encrypt-decrypt');
+const uuid = require('uuid').v4;
+const {encrypt} = require('../utils/encrypt-decrypt');
 
 const retrieveSql = `SELECT * from accounts acc
 LEFT JOIN webhooks AS rh
-ON acc.registration_hook_sid = rh.webhook_sid 
-LEFT JOIN webhooks AS qh
-ON acc.queue_event_hook_sid = qh.webhook_sid`;
+ON acc.registration_hook_sid = rh.webhook_sid`;
 
 const insertPendingAccountSubscriptionSql = `INSERT account_subscriptions 
 (account_subscription_sid, account_sid, pending, stripe_subscription_id, 
@@ -34,7 +31,7 @@ AND effective_end_date IS NULL
 AND pending=0`;
 
 const updatePaymentInfoSql = `UPDATE account_subscriptions 
-SET last4 = ?, stripe_payment_method_id=?, exp_month = ?, exp_year = ?, card_type = ? 
+SET last4 = ?, exp_month = ?, exp_year = ?, card_type = ? 
 WHERE account_sid = ? 
 AND effective_end_date IS NULL`;
 
@@ -55,35 +52,15 @@ WHERE account_sid = ?
 AND effective_end_date IS NULL 
 AND pending = 0`;
 
-const extractBucketCredential = (obj) => {
-  const {bucket_credential} = obj;
-  if (bucket_credential) {
-    obj.bucket_credential = JSON.parse(decrypt(bucket_credential));
-  }
-};
-
 function transmogrifyResults(results) {
   return results.map((row) => {
     const obj = row.acc;
-
-    /* registration hook */
     if (row.rh && Object.keys(row.rh).length && row.rh.url !== null) {
       Object.assign(obj, {registration_hook: row.rh});
       delete obj.registration_hook.webhook_sid;
     }
     else obj.registration_hook = null;
     delete obj.registration_hook_sid;
-
-    /* queue event hook */
-    if (row.qh && Object.keys(row.qh).length && row.qh.url !== null) {
-      Object.assign(obj, {queue_event_hook: row.qh});
-      delete obj.queue_event_hook.webhook_sid;
-    }
-    else obj.queue_event_hook = null;
-    delete obj.queue_event_hook_sid;
-
-    extractBucketCredential(obj);
-
     return obj;
   });
 }
@@ -199,18 +176,17 @@ class Account extends Model {
     debug(r3, 'Account.activateSubscription - replaced old subscription');
 
     /* update account.plan to paid, if it isnt already */
-    /* update account.is_active to 1, if account is deactivated */
     await promisePool.execute(
-      'UPDATE accounts SET plan_type = \'paid\', is_active = 1 WHERE account_sid = ?',
+      'UPDATE accounts SET plan_type = \'paid\' WHERE account_sid = ?',
       [account_sid]);
     return true;
   }
 
   static async updatePaymentInfo(logger, account_sid, pm) {
-    const {id, card} = pm;
+    const {card} = pm;
     const last4_encrypted = encrypt(card.last4);
     await promisePool.execute(updatePaymentInfoSql,
-      [last4_encrypted, id, card.exp_month, card.exp_year, card.brand, account_sid]);
+      [last4_encrypted, card.exp_month, card.exp_year, card.brand, account_sid]);
   }
 
   static async provisionPendingSubscription(logger, account_sid, products, payment_method, subscription_id) {
@@ -248,6 +224,7 @@ class Account extends Model {
     }));
     return account_subscription_sid;
   }
+
 }
 
 Account.table = 'accounts';
@@ -271,10 +248,6 @@ Account.fields = [
     name: 'sip_realm',
     type: 'string',
   },
-  {
-    name: 'queue_event_hook_sid',
-    type: 'string',
-  },
   {
     name: 'registration_hook_sid',
     type: 'string',
@@ -306,38 +279,6 @@ Account.fields = [
   {
     name: 'disable_cdrs',
     type: 'number',
-  },
-  {
-    name: 'subspace_client_id',
-    type: 'string',
-  },
-  {
-    name: 'subspace_client_secret',
-    type: 'string',
-  },
-  {
-    name: 'subspace_sip_teleport_id',
-    type: 'string',
-  },
-  {
-    name: 'subspace_sip_teleport_destinations',
-    type: 'string',
-  },
-  {
-    name: 'siprec_hook_sid',
-    type: 'string',
-  },
-  {
-    name: 'record_all_calls',
-    type: 'number'
-  },
-  {
-    name: 'record_format',
-    type: 'string'
-  },
-  {
-    name: 'bucket_credential',
-    type: 'string'
   }
 ];
 

lib/models/api-key.js

@@ -27,25 +27,6 @@ class ApiKey extends Model {
     });
   }
 
-  /**
-  * list all api keys for a service provider
-  */
-  static retrieveAllForSP(service_provider_sid) {
-    const sql = 'SELECT * from api_keys WHERE service_provider_sid = ?';
-    const args = [service_provider_sid];
-
-    return new Promise((resolve, reject) => {
-      getMysqlConnection((err, conn) => {
-        if (err) return reject(err);
-        conn.query(sql, args, (err, results) => {
-          conn.release();
-          if (err) return reject(err);
-          resolve(results);
-        });
-      });
-    });
-  }
-
   /**
   * update last_used api key for an account
   */

lib/models/application.js

@@ -120,10 +120,6 @@ Application.fields = [
   {
     name: 'messaging_hook_sid',
     type: 'string',
-  },
-  {
-    name: 'record_all_calls',
-    type: 'number',
   }
 ];
 

lib/models/client.js

@@ -1,70 +0,0 @@
-const Model = require('./model');
-const {promisePool} = require('../db');
-
-class Client extends Model {
-  constructor() {
-    super();
-  }
-
-  static async retrieveAllByAccountSid(account_sid) {
-    const sql = `SELECT * FROM ${this.table} WHERE account_sid = ?`;
-    const [rows] = await promisePool.query(sql, account_sid);
-    return rows;
-  }
-
-  static async retrieveAllByServiceProviderSid(service_provider_sid) {
-    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 = accs.service_provider_sid
-      WHERE sp.service_provider_sid = ?`;
-    const [rows] = await promisePool.query(sql, service_provider_sid);
-    return rows;
-  }
-
-  static async retrieveByAccountSidAndUserName(account_sid, username) {
-    const sql = `SELECT * FROM ${this.table} WHERE account_sid = ? AND username = ?`;
-    const [rows] = await promisePool.query(sql, [account_sid, username]);
-    return rows;
-  }
-}
-
-Client.table = 'clients';
-Client.fields = [
-  {
-    name: 'client_sid',
-    type: 'string',
-    primaryKey: true
-  },
-  {
-    name: 'account_sid',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'is_active',
-    type: 'number'
-  },
-  {
-    name: 'username',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'password',
-    type: 'string'
-  },
-  {
-    name: 'allow_direct_app_calling',
-    type: 'number'
-  },
-  {
-    name: 'allow_direct_queue_calling',
-    type: 'number'
-  },
-  {
-    name: 'allow_direct_user_calling',
-    type: 'number'
-  }
-];
-
-module.exports = Client;

lib/models/google-custom-voice.js

@@ -1,61 +0,0 @@
-const Model = require('./model');
-const {promisePool} = require('../db');
-
-class GoogleCustomVoice extends Model {
-  constructor() {
-    super();
-  }
-
-  static async retrieveAllBySpeechCredentialSid(speech_credential_sid) {
-    const sql = `SELECT * FROM ${this.table} WHERE speech_credential_sid = ?`;
-    const [rows] = await promisePool.query(sql, speech_credential_sid);
-    return rows;
-  }
-
-  static async deleteAllBySpeechCredentialSid(speech_credential_sid) {
-    const sql = `DELETE FROM ${this.table} WHERE speech_credential_sid = ?`;
-    const [rows] = await promisePool.query(sql, speech_credential_sid);
-    return rows;
-  }
-
-  static async retrieveAllByLabel(service_provider_sid, account_sid, label) {
-    let sql;
-    if (account_sid) {
-      sql = `SELECT gcv.* FROM ${this.table} gcv 
-LEFT JOIN speech_credentials sc ON gcv.speech_credential_sid = sc.speech_credential_sid 
-WHERE sc.account_sid = ? OR (sc.account_sid is NULL && sc.service_provider_sid = ?) 
-${label ? 'AND label = ?' : 'AND label is NULL'}`;
-    } else {
-      sql = `SELECT gcv.* FROM ${this.table} gcv 
-LEFT JOIN speech_credentials sc ON gcv.speech_credential_sid = sc.speech_credential_sid 
-WHERE sc.service_provider_sid = ? ${label ? 'AND label = ?' : 'AND label is NULL'}`;
-    }
-    const [rows] = await promisePool.query(sql, [...(account_sid ?
-      [account_sid, service_provider_sid] : [service_provider_sid]), label]);
-    return rows;
-  }
-}
-GoogleCustomVoice.table = 'google_custom_voices';
-GoogleCustomVoice.fields = [
-  {
-    name: 'google_custom_voice_sid',
-    type: 'string',
-    primaryKey: true
-  },
-  {
-    name: 'model',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'reported_usage',
-    type: 'number'
-  },
-  {
-    name: 'name',
-    type: 'string',
-    required: true
-  }
-];
-
-module.exports = GoogleCustomVoice;

lib/models/lcr-carrier-set-entry.js

@@ -1,47 +0,0 @@
-const Model = require('./model');
-const {promisePool} = require('../db');
-
-class LcrCarrierSetEntry extends Model {
-  constructor() {
-    super();
-  }
-
-  static async retrieveAllByLcrRouteSid(sid) {
-    const sql = `SELECT * FROM ${this.table} WHERE lcr_route_sid = ? ORDER BY priority`;
-    const [rows] = await promisePool.query(sql, sid);
-    return rows;
-  }
-
-  static async deleteByLcrRouteSid(sid) {
-    const sql = `DELETE FROM ${this.table} WHERE lcr_route_sid = ?`;
-    const [rows] = await promisePool.query(sql, sid);
-    return rows.affectedRows;
-  }
-}
-
-LcrCarrierSetEntry.table = 'lcr_carrier_set_entry';
-LcrCarrierSetEntry.fields = [
-  {
-    name: 'lcr_carrier_set_entry_sid',
-    type: 'string',
-    primaryKey: true
-  },
-  {
-    name: 'workload',
-    type: 'number'
-  },
-  {
-    name: 'lcr_route_sid',
-    type: 'string'
-  },
-  {
-    name: 'voip_carrier_sid',
-    type: 'string'
-  },
-  {
-    name: 'priority',
-    type: 'number'
-  }
-];
-
-module.exports = LcrCarrierSetEntry;

lib/models/lcr-route.js

@@ -1,54 +0,0 @@
-const Model = require('./model');
-const {promisePool} = require('../db');
-
-
-class LcrRoutes extends Model {
-  constructor() {
-    super();
-  }
-
-  static async retrieveAllByLcrSid(sid) {
-    const sql = `SELECT * FROM ${this.table} WHERE lcr_sid = ? ORDER BY priority`;
-    const [rows] = await promisePool.query(sql, sid);
-    return rows;
-  }
-
-  static async deleteByLcrSid(sid) {
-    const sql = `DELETE FROM ${this.table} WHERE lcr_sid = ?`;
-    const [rows] = await promisePool.query(sql, sid);
-    return rows.affectedRows;
-  }
-
-  static async countAllByLcrSid(sid) {
-    const sql = `SELECT COUNT(*) AS count FROM ${this.table} WHERE lcr_sid = ?`;
-    const [rows] = await promisePool.query(sql, sid);
-    return rows.length ? rows[0].count : 0;
-  }
-}
-
-LcrRoutes.table = 'lcr_routes';
-LcrRoutes.fields = [
-  {
-    name: 'lcr_route_sid',
-    type: 'string',
-    primaryKey: true
-  },
-  {
-    name: 'lcr_sid',
-    type: 'string'
-  },
-  {
-    name: 'regex',
-    type: 'string'
-  },
-  {
-    name: 'description',
-    type: 'string'
-  },
-  {
-    name: 'priority',
-    type: 'number'
-  }
-];
-
-module.exports = LcrRoutes;

lib/models/lcr.js

@@ -1,54 +0,0 @@
-const Model = require('./model');
-const {promisePool} = require('../db');
-
-class Lcr extends Model {
-  constructor() {
-    super();
-  }
-
-  static async retrieveAllByAccountSid(account_sid) {
-    const sql = `SELECT * FROM ${this.table} WHERE account_sid = ?`;
-    const [rows] = await promisePool.query(sql, account_sid);
-    return rows;
-  }
-
-  static async retrieveAllByServiceProviderSid(sid) {
-    const sql = `SELECT * FROM ${this.table} WHERE service_provider_sid = ?`;
-    const [rows] = await promisePool.query(sql, sid);
-    return rows;
-  }
-
-  static async releaseDefaultEntry(sid) {
-    const sql = `UPDATE ${this.table} SET default_carrier_set_entry_sid = null WHERE lcr_sid = ?`;
-    const [rows] = await promisePool.query(sql, sid);
-    return rows;
-  }
-}
-
-Lcr.table = 'lcr';
-Lcr.fields = [
-  {
-    name: 'lcr_sid',
-    type: 'string',
-    primaryKey: true
-  },
-  {
-    name: 'name',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'account_sid',
-    type: 'string'
-  },
-  {
-    name: 'service_provider_sid',
-    type: 'string'
-  },
-  {
-    name: 'default_carrier_set_entry_sid',
-    type: 'string'
-  }
-];
-
-module.exports = Lcr;

lib/models/model.js

@@ -1,5 +1,5 @@
 const Emitter = require('events');
-const { v4: uuidv4 } = require('uuid');
+const uuidv4 = require('uuid/v4');
 const assert = require('assert');
 const {getMysqlConnection} = require('../db');
 const {DbErrorBadRequest} = require('../utils/errors');
@@ -107,7 +107,7 @@ class Model extends Emitter {
       if (pk.name in obj) throw new DbErrorBadRequest(`primary key ${pk.name} is immutable`);
       getMysqlConnection((err, conn) => {
         if (err) return reject(err);
-        conn.query(`UPDATE ${this.table} SET ? WHERE ${pk.name} = ?`, [obj, sid], (err, results, fields) => {
+        conn.query(`UPDATE ${this.table} SET ? WHERE ${pk.name} = '${sid}'`, obj, (err, results, fields) => {
           conn.release();
           if (err) return reject(err);
           resolve(results.affectedRows);

lib/models/password-settings.js

@@ -1,70 +0,0 @@
-const {promisePool} = require('../db');
-
-class PasswordSettings {
-
-  /**
-   * Retrieve object from database
-   */
-  static async retrieve() {
-    const [r] = await promisePool.execute(`SELECT * FROM ${this.table}`);
-    return r;
-  }
-
-  /**
-  * Update object into the database
-  */
-  static async update(obj) {
-    let sql = `UPDATE ${this.table} SET `;
-    const values = [];
-    const keys = Object.keys(obj);
-    this.fields.forEach(({name}) => {
-      if (keys.includes(name)) {
-        sql = sql + `${name} = ?,`;
-        values.push(obj[name]);
-      }
-    });
-    if (values.length) {
-      sql = sql.slice(0, -1);
-      await promisePool.execute(sql, values);
-    }
-  }
-
-  /**
-     * insert object into the database
-     */
-  static async make(obj) {
-    let params = '', marks = '';
-    const values = [];
-    const keys = Object.keys(obj);
-    this.fields.forEach(({name}) => {
-      if (keys.includes(name)) {
-        params = params + `${name},`;
-        marks = marks + '?,';
-        values.push(obj[name]);
-      }
-    });
-    if (values.length) {
-      params = `(${params.slice(0, -1)})`;
-      marks = `values(${marks.slice(0, -1)})`;
-      return await promisePool.execute(`INSERT into ${this.table} ${params} ${marks}`, values);
-    }
-  }
-}
-
-
-PasswordSettings.table = 'password_settings';
-PasswordSettings.fields = [
-  {
-    name: 'min_password_length',
-    type: 'number'
-  },
-  {
-    name: 'require_digit',
-    type: 'number'
-  },
-  {
-    name: 'require_special_character',
-    type: 'number'
-  }
-];
-module.exports = PasswordSettings;

lib/models/phone-number.js

@@ -1,39 +1,45 @@
 const Model = require('./model');
-const {promisePool} = require('../db');
-const sqlRetrieveAll = 'SELECT * from phone_numbers WHERE account_sid = ? ORDER BY number';
-const sqlRetrieveOne = 'SELECT * from phone_numbers WHERE phone_number_sid = ? AND account_sid = ? ORDER BY number';
-const sqlSP = `SELECT * 
-FROM phone_numbers 
-WHERE account_sid IN 
-(
-  SELECT account_sid 
-  FROM accounts 
-  WHERE service_provider_sid = ?
-) ORDER BY number`;
+const {getMysqlConnection} = require('../db');
+const sql = 'SELECT * from phone_numbers WHERE account_sid = ?';
 
 class PhoneNumber extends Model {
   constructor() {
     super();
   }
 
-  static async retrieveAll(account_sid) {
-    if (!account_sid) return await super.retrieveAll();
-    const [rows] = await promisePool.query(sqlRetrieveAll, account_sid);
-    return rows;
-  }
-  static async retrieveAllForSP(service_provider_sid) {
-    const [rows] = await promisePool.query(sqlSP, service_provider_sid);
-    return rows;
+  static retrieveAll(account_sid) {
+    if (!account_sid) return super.retrieveAll();
+
+    return new Promise((resolve, reject) => {
+      getMysqlConnection((err, conn) => {
+        if (err) return reject(err);
+        conn.query(sql, account_sid, (err, results, fields) => {
+          conn.release();
+          if (err) return reject(err);
+          resolve(results);
+        });
+      });
+    });
   }
 
   /**
-   * retrieve a phone number
+   * retrieve an application
    */
-  static async retrieve(sid, account_sid) {
+  static retrieve(sid, account_sid) {
     if (!account_sid) return super.retrieve(sid);
-    const [rows] = await promisePool.query(sqlRetrieveOne, [sid, account_sid]);
-    return rows;
+
+    return new Promise((resolve, reject) => {
+      getMysqlConnection((err, conn) => {
+        if (err) return reject(err);
+        conn.query(`${sql} AND phone_number_sid = ?`, [account_sid, sid], (err, results, fields) => {
+          conn.release();
+          if (err) return reject(err);
+          resolve(results);
+        });
+      });
+    });
   }
+
 }
 
 PhoneNumber.table = 'phone_numbers';

lib/models/service-provider-limits.js

@@ -1,39 +0,0 @@
-const Model = require('./model');
-const {promisePool} = require('../db');
-const sql = 'SELECT * FROM service_provider_limits WHERE service_provider_sid = ?';
-
-class ServiceProviderLimits extends Model {
-  constructor() {
-    super();
-  }
-  static async retrieve(service_provider_sid) {
-    const [rows] = await promisePool.query(sql, [service_provider_sid]);
-    return rows;
-  }
-}
-
-ServiceProviderLimits.table = 'service_provider_limits';
-ServiceProviderLimits.fields = [
-  {
-    name: 'service_provider_limits_sid',
-    type: 'string',
-    primaryKey: true
-  },
-  {
-    name: 'service_provider_sid',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'category',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'quantity',
-    type: 'number',
-    required: true
-  }
-];
-
-module.exports = ServiceProviderLimits;

lib/models/service-provider.js

@@ -89,10 +89,6 @@ ServiceProvider.fields = [
   {
     name: 'ms_teams_fqdn',
     type: 'string',
-  },
-  {
-    name: 'lcr_sid',
-    type: 'string'
   }
 
 ];

lib/models/sip-gateway.js

@@ -51,10 +51,6 @@ SipGateway.fields = [
     name: 'is_active',
     type: 'number'
   },
-  {
-    name: 'pad_crypto',
-    type: 'number'
-  },
   {
     name: 'account_sid',
     type: 'string'
@@ -62,10 +58,6 @@ SipGateway.fields = [
   {
     name: 'application_sid',
     type: 'string'
-  },
-  {
-    name: 'protocol',
-    type: 'string'
   }
 ];
 

lib/models/speech-credential.js

@@ -1,7 +1,7 @@
 const Model = require('./model');
 const {promisePool} = require('../db');
 const retrieveSql = 'SELECT * from speech_credentials WHERE account_sid = ?';
-const retrieveSqlForSP = 'SELECT * from speech_credentials WHERE service_provider_sid = ? and account_sid is null';
+const retrieveSqlForSP = 'SELECT * from speech_credentials WHERE service_provider_sid = ?';
 
 class SpeechCredential extends Model {
   constructor() {
@@ -20,18 +20,6 @@ class SpeechCredential extends Model {
     return rows;
   }
 
-  static async getSpeechCredentialsByVendorAndLabel(service_provider_sid, account_sid, vendor, label) {
-    let sql;
-    if (account_sid) {
-      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 = ?
-        ${label ? 'AND label = ?' : ''}`;
-    }
-    const [rows] = await promisePool.query(sql, [account_sid ? account_sid : service_provider_sid, vendor, label]);
-    return rows;
-  }
-
   static async disableStt(account_sid) {
     await promisePool.execute('UPDATE speech_credentials SET use_for_stt = 0 WHERE account_sid = ?', [account_sid]);
   }
@@ -98,10 +86,6 @@ SpeechCredential.fields = [
   {
     name: 'last_tested',
     type: 'date'
-  },
-  {
-    name: 'label',
-    type: 'string'
   }
 ];
 

lib/models/system-information.js

@@ -1,38 +0,0 @@
-const Model = require('./model');
-const { promisePool } = require('../db');
-class SystemInformation extends Model {
-  constructor() {
-    super();
-  }
-
-  static async add(body) {
-    let [sysInfo] = await this.retrieveAll();
-    if (sysInfo) {
-      const sql = `UPDATE ${this.table} SET ?`;
-      await promisePool.query(sql, body);
-    } else {
-      const sql = `INSERT INTO ${this.table} SET ?`;
-      await promisePool.query(sql, body);
-    }
-    [sysInfo] = await this.retrieveAll();
-    return sysInfo;
-  }
-}
-
-SystemInformation.table = 'system_information';
-SystemInformation.fields = [
-  {
-    name: 'domain_name',
-    type: 'string',
-  },
-  {
-    name: 'sip_domain_name',
-    type: 'string',
-  },
-  {
-    name: 'monitoring_domain_name',
-    type: 'string',
-  },
-];
-
-module.exports = SystemInformation;

lib/models/user.js

@@ -1,117 +0,0 @@
-const Model = require('./model');
-const {promisePool} = require('../db');
-const sqlAll = `
-SELECT u.user_sid, u.name, u.email, u.account_sid, u.service_provider_sid, u.is_active, 
-u.force_change, u.phone, u.pending_email, u.provider, u.provider_userid, 
-u.email_activation_code, u.email_validated, 
-sp.name as service_provider_name, acc.name as account_name  
-FROM users u   
-LEFT JOIN service_providers as sp ON u.service_provider_sid = sp.service_provider_sid 
-LEFT JOIN accounts acc ON u.account_sid = acc.account_sid  
-`;
-const sqlAccount = `
-SELECT u.user_sid, u.name, u.email, u.account_sid, u.service_provider_sid, u.is_active, 
-u.force_change, u.phone, u.pending_email, u.provider, u.provider_userid, 
-u.email_activation_code, u.email_validated, 
-sp.name as service_provider_name, acc.name as account_name  
-FROM users u   
-LEFT JOIN service_providers as sp ON u.service_provider_sid = sp.service_provider_sid 
-LEFT JOIN accounts acc ON u.account_sid = acc.account_sid  
-WHERE u.account_sid = ? 
-`;
-const sqlSP = `
-SELECT u.user_sid, u.name, u.email, u.account_sid, u.service_provider_sid, u.is_active, 
-u.force_change, u.phone, u.pending_email, u.provider, u.provider_userid, 
-u.email_activation_code, u.email_validated, 
-sp.name as service_provider_name, acc.name as account_name  
-FROM users u   
-LEFT JOIN service_providers as sp ON u.service_provider_sid = sp.service_provider_sid 
-LEFT JOIN accounts acc ON u.account_sid = acc.account_sid  
-WHERE u.service_provider_sid = ? 
-`;
-
-class User extends Model {
-  constructor() {
-    super();
-  }
-
-  static async retrieveAll() {
-    const [rows] = await promisePool.query(sqlAll);
-    return rows;
-  }
-
-  static async retrieveAllForAccount(account_sid) {
-    const [rows] = await promisePool.query(sqlAccount, [account_sid]);
-    return rows;
-  }
-
-  static async retrieveAllForServiceProvider(service_provider_sid) {
-    const [rows] = await promisePool.query(sqlSP, [service_provider_sid]);
-    return rows;
-  }
-}
-
-User.table = 'users';
-User.fields = [
-  {
-    name: 'user_sid',
-    type: 'string',
-    primaryKey: true
-  },
-  {
-    name: 'name',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'email',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'pending_email',
-    type: 'string'
-  },
-  {
-    name: 'phone',
-    type: 'string'
-  },
-  {
-    name: 'hashed_password',
-    type: 'string'
-  },
-  {
-    name: 'account_sid',
-    type: 'string'
-  },
-  {
-    name: 'service_provider_sid',
-    type: 'string'
-  },
-  {
-    name: 'force_change',
-    type: 'number'
-  },
-  {
-    name: 'provider',
-    type: 'string'
-  },
-  {
-    name: 'provider_userid',
-    type: 'string'
-  },
-  {
-    name: 'email_activation_code',
-    type: 'string'
-  },
-  {
-    name: 'email_validated',
-    type: 'number'
-  },
-  {
-    name: 'is_active',
-    type: 'number'
-  },
-];
-
-module.exports = User;

lib/models/voip-carrier.js

@@ -11,16 +11,10 @@ class VoipCarrier extends Model {
   static async retrieveAll(account_sid) {
     if (!account_sid) return super.retrieveAll();
     const [rows] = await promisePool.query(retrieveSql, account_sid);
-    if (rows) {
-      rows.map((r) => r.register_status = JSON.parse(r.register_status || '{}'));
-    }
     return rows;
   }
   static async retrieveAllForSP(service_provider_sid) {
     const [rows] = await promisePool.query(retrieveSqlForSP, service_provider_sid);
-    if (rows) {
-      rows.map((r) => r.register_status = JSON.parse(r.register_status || '{}'));
-    }
     return rows;
   }
 }
@@ -61,10 +55,6 @@ VoipCarrier.fields = [
     name: 'requires_register',
     type: 'number'
   },
-  {
-    name: 'register_use_tls',
-    type: 'number'
-  },
   {
     name: 'register_username',
     type: 'string'
@@ -121,22 +111,6 @@ VoipCarrier.fields = [
     name: 'smpp_system_id',
     type: 'string'
   },
-  {
-    name: 'register_from_user',
-    type: 'string'
-  },
-  {
-    name: 'register_from_domain',
-    type: 'string'
-  },
-  {
-    name: 'register_public_ip_in_contact',
-    type: 'number'
-  },
-  {
-    name: 'register_status',
-    type: 'string'
-  }
 ];
 
 module.exports = VoipCarrier;

lib/record/azure-storage.js

@@ -1,71 +0,0 @@
-const { Writable } = require('stream');
-const { BlobServiceClient } = require('@azure/storage-blob');
-const { v4: uuidv4 } = require('uuid');
-const streamBuffers = require('stream-buffers');
-
-class AzureStorageUploadStream extends Writable {
-  constructor(logger, opts) {
-    super(opts);
-    const blobServiceClient = BlobServiceClient.fromConnectionString(opts.connection_string);
-    this.blockBlobClient = blobServiceClient.getContainerClient(opts.bucketName).getBlockBlobClient(opts.Key);
-
-    this.metadata = opts.metadata;
-    this.blocks = [];
-
-    this.bufferSize = 2 * 1024 * 1024; // Buffer size set to 2MB
-    this.buffer = new streamBuffers.WritableStreamBuffer({
-      initialSize: this.bufferSize,
-      incrementAmount: this.bufferSize
-    });
-  }
-
-  async _write(chunk, encoding, callback) {
-    this.buffer.write(chunk, encoding);
-
-    if (this.buffer.size() >= this.bufferSize) {
-      const blockID = uuidv4().replace(/-/g, '');
-      this.blocks.push(blockID);
-
-      try {
-        const dataToWrite = this.buffer.getContents();
-        await this.blockBlobClient.stageBlock(blockID, dataToWrite, dataToWrite.length);
-        callback();
-      } catch (error) {
-        callback(error);
-      }
-    } else {
-      callback();
-    }
-  }
-
-  async _final(callback) {
-    // Write any remaining data in buffer
-    if (this.buffer.size() > 0) {
-      const remainingData = this.buffer.getContents();
-      const blockID = uuidv4().replace(/-/g, '');
-      this.blocks.push(blockID);
-
-      try {
-        await this.blockBlobClient.stageBlock(blockID, remainingData, remainingData.length);
-      } catch (error) {
-        callback(error);
-        return;
-      }
-    }
-
-    try {
-      await this.blockBlobClient.commitBlockList(this.blocks);
-      // remove all null/undefined props
-      const filteredObj = Object.entries(this.metadata).reduce((acc, [key, val]) => {
-        if (val !== undefined && val !== null) acc[key] = val;
-        return acc;
-      }, {});
-      await this.blockBlobClient.setMetadata(filteredObj);
-      callback();
-    } catch (error) {
-      callback(error);
-    }
-  }
-}
-
-module.exports = AzureStorageUploadStream;

lib/record/encoder.js

@@ -1,61 +0,0 @@
-const { Transform } = require('stream');
-const lamejs = require('@jambonz/lamejs');
-
-class PCMToMP3Encoder extends Transform {
-  constructor(options, logger) {
-    super(options);
-
-    const channels = options.channels || 1;
-    const sampleRate = options.sampleRate || 8000;
-    const bitRate = options.bitRate || 128;
-
-    this.encoder = new lamejs.Mp3Encoder(channels, sampleRate, bitRate);
-    this.channels = channels;
-    this.logger = logger;
-  }
-
-  _transform(chunk, encoding, callback) {
-    try {
-      // Convert chunk buffer into Int16Array for lamejs
-      const samples = new Int16Array(chunk.buffer, chunk.byteOffset, chunk.length / 2);
-
-      // Split input samples into left and right channel arrays if stereo
-      let leftChannel, rightChannel;
-      if (this.channels === 2) {
-        leftChannel = new Int16Array(samples.length / 2);
-        rightChannel = new Int16Array(samples.length / 2);
-
-        for (let i = 0; i < samples.length; i += 2) {
-          leftChannel[i / 2] = samples[i];
-          rightChannel[i / 2] = samples[i + 1];
-        }
-      } else {
-        leftChannel = samples;
-      }
-
-      // Encode the input data
-      const mp3Data = this.encoder.encodeBuffer(leftChannel, rightChannel);
-
-      if (mp3Data.length > 0) {
-        this.push(Buffer.from(mp3Data));
-      }
-      callback();
-    } catch (err) {
-      this.logger.error(
-        { err },
-        'Error while mp3 transform');
-    }
-  }
-
-  _flush(callback) {
-    // Finalize encoding and flush the internal buffers
-    const mp3Data = this.encoder.flush();
-
-    if (mp3Data.length > 0) {
-      this.push(Buffer.from(mp3Data));
-    }
-    callback();
-  }
-}
-
-module.exports = PCMToMP3Encoder;

lib/record/google-storage.js

@@ -1,62 +0,0 @@
-const { Storage } = require('@google-cloud/storage');
-const { Writable } = require('stream');
-const streamBuffers = require('stream-buffers');
-
-class GoogleStorageUploadStream extends Writable {
-
-  constructor(logger, opts) {
-    super(opts);
-    this.logger = logger;
-    this.metadata = opts.metadata;
-
-    const storage = new Storage(opts.bucketCredential);
-    this.gcsFile = storage.bucket(opts.bucketName).file(opts.Key);
-    this.writeStream = this.gcsFile.createWriteStream();
-
-    this.bufferSize = 2 * 1024 * 1024; // Buffer size set to 2MB
-    this.buffer = new streamBuffers.WritableStreamBuffer({
-      initialSize: this.bufferSize,
-      incrementAmount: this.bufferSize
-    });
-
-    this.writeStream.on('error', (err) => this.logger.error(err));
-    this.writeStream.on('finish', () => {
-      this.logger.info('Google storage Upload completed.');
-      this._addMetadata();
-    });
-  }
-
-  _write(chunk, encoding, callback) {
-    this.buffer.write(chunk, encoding);
-
-    // Write to GCS when buffer reaches desired size
-    if (this.buffer.size() >= this.bufferSize) {
-      const dataToWrite = this.buffer.getContents();
-      this.writeStream.write(dataToWrite, callback);
-    } else {
-      callback();
-    }
-  }
-
-  _final(callback) {
-    // Write any remaining data in the buffer to GCS
-    if (this.buffer.size() > 0) {
-      const remainingData = this.buffer.getContents();
-      this.writeStream.write(remainingData);
-    }
-
-    this.writeStream.end();
-    this.writeStream.once('finish', callback);
-  }
-
-  async _addMetadata() {
-    try {
-      await this.gcsFile.setMetadata({metadata: this.metadata});
-      this.logger.info('Google storage Upload and metadata setting completed.');
-    } catch (err) {
-      this.logger.error(err, 'Google storage An error occurred while setting metadata');
-    }
-  }
-}
-
-module.exports = GoogleStorageUploadStream;

lib/record/index.js

@@ -1,6 +0,0 @@
-
-async function record(logger, socket) {
-  return require('./upload')(logger, socket);
-}
-
-module.exports = record;

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

@@ -1,103 +0,0 @@
-const { Writable } = require('stream');
-const {
-  S3Client,
-  CreateMultipartUploadCommand,
-  UploadPartCommand,
-  CompleteMultipartUploadCommand,
-} = require('@aws-sdk/client-s3');
-
-class S3MultipartUploadStream extends Writable {
-  constructor(logger, opts) {
-    super(opts);
-    this.logger = logger;
-    this.bucketName = opts.bucketName;
-    this.objectKey = opts.Key;
-    this.uploadId = null;
-    this.partNumber = 1;
-    this.multipartETags = [];
-    this.buffer = Buffer.alloc(0);
-    this.minPartSize = 2 * 1024 * 1024; // 5 MB
-    this.s3 = new S3Client(opts.bucketCredential);
-    this.metadata = opts.metadata;
-  }
-
-  async _initMultipartUpload() {
-    const command = new CreateMultipartUploadCommand({
-      Bucket: this.bucketName,
-      Key: this.objectKey,
-      Metadata: this.metadata
-    });
-    const response = await this.s3.send(command);
-    return response.UploadId;
-  }
-
-  async _uploadBuffer() {
-    const uploadPartCommand = new UploadPartCommand({
-      Bucket: this.bucketName,
-      Key: this.objectKey,
-      PartNumber: this.partNumber,
-      UploadId: this.uploadId,
-      Body: this.buffer,
-    });
-
-    const uploadPartResponse = await this.s3.send(uploadPartCommand);
-    this.multipartETags.push({
-      ETag: uploadPartResponse.ETag,
-      PartNumber: this.partNumber,
-    });
-    this.partNumber += 1;
-  }
-
-  async _write(chunk, encoding, callback) {
-    try {
-      if (!this.uploadId) {
-        this.uploadId = await this._initMultipartUpload();
-      }
-
-      this.buffer = Buffer.concat([this.buffer, chunk]);
-
-      if (this.buffer.length >= this.minPartSize) {
-        await this._uploadBuffer();
-        this.buffer = Buffer.alloc(0);
-      }
-
-      callback(null);
-    } catch (error) {
-      callback(error);
-    }
-  }
-
-  async _finalize(err) {
-    try {
-      if (this.buffer.length > 0) {
-        await this._uploadBuffer();
-      }
-
-      const completeMultipartUploadCommand = new CompleteMultipartUploadCommand({
-        Bucket: this.bucketName,
-        Key: this.objectKey,
-        MultipartUpload: {
-          Parts: this.multipartETags.sort((a, b) => a.PartNumber - b.PartNumber),
-        },
-        UploadId: this.uploadId,
-      });
-
-      await this.s3.send(completeMultipartUploadCommand);
-      this.logger.info('Finished upload to S3');
-    } catch (error) {
-      this.logger.error('Error completing multipart upload:', error);
-      throw error;
-    }
-  }
-
-  async _final(callback) {
-    try {
-      await this._finalize();
-      callback(null);
-    } catch (error) {
-      callback(error);
-    }
-  }
-}
-
-module.exports = S3MultipartUploadStream;

lib/record/upload.js

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

lib/record/utils.js

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

lib/routes/api/accounts.js

@@ -1,7 +1,6 @@
 const router = require('express').Router();
-const assert = require('assert');
 const request = require('request');
-const {DbErrorBadRequest, DbErrorForbidden, DbErrorUnprocessableRequest} = require('../../utils/errors');
+const {DbErrorBadRequest, DbErrorUnprocessableRequest} = require('../../utils/errors');
 const Account = require('../../models/account');
 const Application = require('../../models/application');
 const Webhook = require('../../models/webhook');
@@ -9,89 +8,27 @@ const ApiKey = require('../../models/api-key');
 const ServiceProvider = require('../../models/service-provider');
 const {deleteDnsRecords} = require('../../utils/dns-utils');
 const {deleteCustomer} = require('../../utils/stripe-utils');
-const { v4: uuidv4 } = require('uuid');
+const uuidv4 = require('uuid/v4');
 const snakeCase = require('../../utils/snake-case');
 const sysError = require('../error');
 const {promisePool} = require('../../db');
-const {
-  hasAccountPermissions,
-  parseAccountSid,
-  parseCallSid,
-  enableSubspace,
-  disableSubspace,
-  parseVoipCarrierSid
-} = require('./utils');
+const {hasAccountPermissions, parseAccountSid} = require('./utils');
 const short = require('short-uuid');
 const VoipCarrier = require('../../models/voip-carrier');
-const { encrypt } = require('../../utils/encrypt-decrypt');
-const { testS3Storage, testGoogleStorage, testAzureStorage } = require('../../utils/storage-utils');
 const translator = short();
 
 let idx = 0;
 
-const getFsUrl = async(logger, retrieveSet, setName) => {
-  if (process.env.K8S) {
-    const port = process.env.K8S_FEATURE_SERVER_SERVICE_PORT || 3000;
-    return `http://${process.env.K8S_FEATURE_SERVER_SERVICE_NAME}:${port}/v1/createCall`;
-  }
-
-  try {
-    const fs = await retrieveSet(setName);
-    if (0 === fs.length) {
-      logger.info('No available feature servers to handle createCall API request');
-      return ;
-    }
-    const f = fs[idx++ % fs.length];
-    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');
-  }
-};
-
-const validateRequest = async(req, account_sid) => {
-  try {
-    if (req.user.hasScope('admin')) {
-      return;
-    }
-
-    if (req.user.hasScope('account')) {
-      if (account_sid === req.user.account_sid) {
-        return;
-      }
-
-      throw new DbErrorForbidden('insufficient permissions');
-    }
-
-    if (req.user.hasScope('service_provider')) {
-      const [r] = await promisePool.execute(
-        'SELECT service_provider_sid from accounts WHERE account_sid = ?', [account_sid]
-      );
-
-      if (r.length === 1 && r[0].service_provider_sid === req.user.service_provider_sid) {
-        return;
-      }
-
-      throw new DbErrorForbidden('insufficient permissions');
-    }
-  } catch (error) {
-    throw error;
-  }
-};
-
 router.use('/:sid/SpeechCredentials', hasAccountPermissions, require('./speech-credentials'));
 router.use('/:sid/RecentCalls', hasAccountPermissions, require('./recent-calls'));
 router.use('/:sid/Alerts', hasAccountPermissions, require('./alerts'));
 router.use('/:sid/Charges', hasAccountPermissions, require('./charges'));
 router.use('/:sid/SipRealms', hasAccountPermissions, require('./sip-realm'));
 router.use('/:sid/PredefinedCarriers', hasAccountPermissions, require('./add-from-predefined-carrier'));
-router.use('/:sid/Limits', hasAccountPermissions, require('./limits'));
-router.use('/:sid/TtsCache', hasAccountPermissions, require('./tts-cache'));
 router.get('/:sid/Applications', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
     const account_sid = parseAccountSid(req);
-    await validateRequest(req, account_sid);
     const results = await Application.retrieveAll(null, account_sid);
     res.status(200).json(results);
   } catch (err) {
@@ -102,39 +39,17 @@ router.get('/:sid/VoipCarriers', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
     const account_sid = parseAccountSid(req);
-    await validateRequest(req, account_sid);
     const results = await VoipCarrier.retrieveAll(account_sid);
     res.status(200).json(results);
   } catch (err) {
     sysError(logger, res, err);
   }
 });
-router.put('/:sid/VoipCarriers/:voip_carrier_sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-
-  try {
-    const sid = parseVoipCarrierSid(req);
-    const account_sid = parseAccountSid(req);
-    await validateRequest(req, account_sid);
-
-    const rowsAffected = await VoipCarrier.update(sid, req.body);
-    if (rowsAffected === 0) {
-      return res.sendStatus(404);
-    }
-
-    return res.status(204).end();
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
 router.post('/:sid/VoipCarriers', async(req, res) => {
   const logger = req.app.locals.logger;
   const payload = req.body;
   try {
     const account_sid = parseAccountSid(req);
-    await validateRequest(req, account_sid);
-
     logger.debug({payload}, 'POST /:sid/VoipCarriers');
     const uuid = await VoipCarrier.make({
       account_sid,
@@ -146,88 +61,6 @@ router.post('/:sid/VoipCarriers', async(req, res) => {
   }
 });
 
-router.get('/:sid/RegisteredSipUsers', async(req, res) => {
-  const {logger, registrar} = req.app.locals;
-  try {
-    const account_sid = parseAccountSid(req);
-    await validateRequest(req, account_sid);
-    const result = await Account.retrieve(account_sid);
-    if (!result || result.length === 0) {
-      throw new DbErrorBadRequest(`account not found for sid ${account_sid}`);
-    }
-    if (!result[0].sip_realm) {
-      throw new DbErrorBadRequest('account does not have sip_realm configuration');
-    }
-    const users = await registrar.getRegisteredUsersForRealm(result[0].sip_realm);
-    res.status(200).json(users.map((u) => `${u}@${result[0].sip_realm}`));
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.post('/:sid/RegisteredSipUsers', async(req, res) => {
-  const {logger, registrar} = req.app.locals;
-  const users = req.body;
-  try {
-    const account_sid = parseAccountSid(req);
-    await validateRequest(req, account_sid);
-    const result = await Account.retrieve(account_sid);
-    if (!result || result.length === 0) {
-      throw new DbErrorBadRequest(`account not found for sid ${account_sid}`);
-    }
-    if (!result[0].sip_realm) {
-      throw new DbErrorBadRequest('account does not have sip_realm configuration');
-    }
-    if (!users || !Array.isArray(users) || users.length === 0) {
-      return res.status(200).json(await registrar.getRegisteredUsersDetailsForRealm(result[0].sip_realm));
-    }
-    const ret = [];
-    for (const u of users) {
-      const user = await registrar.query(`${u}@${result[0].sip_realm}`) || {
-        name: u,
-        contact:  null,
-        expiryTime:  0,
-        protocol: null
-      };
-      ret.push({
-        name: u,
-        ...user,
-        registered_status: user.expiryTime > 0 ? 'active' : 'inactive',
-      });
-    }
-    res.status(200).json(ret);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.get('/:sid/RegisteredSipUsers/:client', async(req, res) => {
-  const {logger, registrar, lookupClientByAccountAndUsername} = req.app.locals;
-  const client = req.params.client;
-  try {
-    const account_sid = parseAccountSid(req);
-    await validateRequest(req, account_sid);
-    const result = await Account.retrieve(account_sid);
-    if (!result || result.length === 0) {
-      throw new DbErrorBadRequest(`account not found for sid ${account_sid}`);
-    }
-    const user = await registrar.query(`${client}@${result[0].sip_realm}`);
-    const [clientDb] = await lookupClientByAccountAndUsername(account_sid, client);
-    res.status(200).json({
-      name: client,
-      contact: user ? user.contact : null,
-      expiryTime: user ? user.expiryTime : 0,
-      protocol: user ? user.protocol : null,
-      allow_direct_app_calling: clientDb ? clientDb.allow_direct_app_calling : 0,
-      allow_direct_queue_calling: clientDb ? clientDb.allow_direct_queue_calling : 0,
-      allow_direct_user_calling: clientDb ? clientDb.allow_direct_user_calling : 0,
-      registered_status: user ? 'active' : 'inactive'
-    });
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
 function coerceNumbers(callInfo) {
   if (Array.isArray(callInfo)) {
     return callInfo.map((ci) => {
@@ -258,15 +91,7 @@ function validateUpdateCall(opts) {
     'child_call_hook',
     'call_status',
     'listen_status',
-    'transcribe_status',
-    'conf_hold_status',
-    'conf_mute_status',
-    'mute_status',
-    'sip_request',
-    'record',
-    'tag',
-    'dtmf'
-  ]
+    'mute_status']
     .reduce((acc, prop) => (opts[prop] ? ++acc : acc), 0);
 
   switch (count) {
@@ -279,7 +104,6 @@ function validateUpdateCall(opts) {
       break;
     case 2:
       if (opts.call_hook && opts.child_call_hook) break;
-      else if (opts.conf_hold_status && opts.waitHook) break;
       // eslint-disable-next-line no-fallthrough
     default:
       throw new DbErrorBadRequest('multiple options are not allowed in updateCall');
@@ -294,28 +118,6 @@ function validateUpdateCall(opts) {
   if (opts.mute_status && !['mute', 'unmute'].includes(opts.mute_status)) {
     throw new DbErrorBadRequest('invalid mute_status');
   }
-  if (opts.conf_hold_status && !['hold', 'unhold'].includes(opts.conf_hold_status)) {
-    throw new DbErrorBadRequest('invalid conf_hold_status');
-  }
-  if (opts.conf_mute_status && !['mute', 'unmute'].includes(opts.conf_mute_status)) {
-    throw new DbErrorBadRequest('invalid conf_mute_status');
-  }
-  if (opts.sip_request &&
-    (!opts.sip_request.method || !opts.sip_request.content_type ||  !opts.sip_request.content)) {
-    throw new DbErrorBadRequest('sip_request requires method, content_type and content properties');
-  }
-  if (opts.record && !opts.record.action) {
-    throw new DbErrorBadRequest('record requires action property');
-  }
-  if (opts.dtmf && !opts.dtmf.digit) {
-    throw new DbErrorBadRequest('invalid dtmf');
-  }
-  if ('startCallRecording' === opts.record?.action && !opts.record.siprecServerURL) {
-    throw new DbErrorBadRequest('record requires siprecServerURL property when starting recording');
-  }
-  if (opts.tag && (typeof opts.tag !== 'object' || Array.isArray(opts.tag) || opts.tag === null)) {
-    throw new DbErrorBadRequest('invalid tag data');
-  }
 }
 
 function validateTo(to) {
@@ -335,7 +137,6 @@ function validateTo(to) {
   }
   throw new DbErrorBadRequest(`missing or invalid to property: ${JSON.stringify(to)}`);
 }
-
 async function validateCreateCall(logger, sid, req) {
   const {lookupAppBySid} = req.app.locals;
   const obj = req.body;
@@ -352,7 +153,6 @@ async function validateCreateCall(logger, sid, req) {
       const application = await lookupAppBySid(obj.application_sid);
       Object.assign(obj, {
         call_hook: application.call_hook,
-        app_json: application.app_json,
         call_status_hook: application.call_status_hook,
         speech_synthesis_vendor: application.speech_synthesis_vendor,
         speech_synthesis_language: application.speech_synthesis_language,
@@ -368,14 +168,15 @@ async function validateCreateCall(logger, sid, req) {
   }
   else {
     delete obj.application_sid;
-    if (!obj.speech_synthesis_vendor ||
-      !obj.speech_synthesis_language ||
-      !obj.speech_synthesis_voice ||
-      !obj.speech_recognizer_vendor ||
-      !obj.speech_recognizer_language)
-      throw new DbErrorBadRequest('either application_sid or set of' +
-        ' speech_synthesis_vendor, speech_synthesis_language, speech_synthesis_voice,' +
-        ' speech_recognizer_vendor, speech_recognizer_language required');
+
+    // TODO: these should be retrieved from account, using account_sid if provided
+    Object.assign(obj, {
+      speech_synthesis_vendor: 'google',
+      speech_synthesis_voice: 'en-US-Wavenet-C',
+      speech_synthesis_language: 'en-US',
+      speech_recognizer_vendor: 'google',
+      speech_recognizer_language: 'en-US'
+    });
   }
 
   if (!obj.call_hook && !obj.application_sid) {
@@ -401,17 +202,17 @@ async function validateCreateCall(logger, sid, req) {
   if (typeof obj.call_status_hook === 'object' && typeof obj.call_status_hook.url != 'string') {
     throw new DbErrorBadRequest('call_status_hook must be string or an object containing a url property');
   }
-  if (obj.call_hook && !/^https?:/.test(obj.call_hook.url) && !/^wss?:/.test(obj.call_hook.url)) {
+  if (obj.call_hook && !/^https?:/.test(obj.call_hook.url)) {
     throw new DbErrorBadRequest('call_hook url be an absolute url');
   }
-  if (obj.call_status_hook && !/^https?:/.test(obj.call_status_hook.url) && !/^wss?:/.test(obj.call_status_hook.url)) {
+  if (obj.call_status_hook && !/^https?:/.test(obj.call_status_hook.url)) {
     throw new DbErrorBadRequest('call_status_hook url be an absolute url');
   }
 }
 
 async function validateCreateMessage(logger, sid, req) {
   const obj = req.body;
-  logger.debug({payload: req.body}, 'validateCreateMessage');
+  //const {lookupAccountByPhoneNumber} = req.app.locals;
 
   if (req.user.account_sid !== sid) {
     throw new DbErrorBadRequest(`unauthorized createMessage request for account ${sid}`);
@@ -437,7 +238,7 @@ async function validateCreateMessage(logger, sid, req) {
 async function validateAdd(req) {
   /* account-level token can not be used to add accounts */
   if (req.user.hasAccountAuth) {
-    throw new DbErrorForbidden('insufficient permissions');
+    throw new DbErrorUnprocessableRequest('insufficient permissions to create accounts');
   }
   if (req.user.hasServiceProviderAuth && req.user.service_provider_sid) {
     /* service providers can only create accounts under themselves */
@@ -452,14 +253,10 @@ async function validateAdd(req) {
   if (req.body.registration_hook && typeof req.body.registration_hook !== 'object') {
     throw new DbErrorBadRequest('\'registration_hook\' must be an object when adding an account');
   }
-  if (req.body.queue_event_hook && typeof req.body.queue_event_hook !== 'object') {
-    throw new DbErrorBadRequest('\'queue_event_hook\' must be an object when adding an account');
-  }
 }
-
 async function validateUpdate(req, sid) {
   if (req.user.hasAccountAuth && req.user.account_sid !== sid) {
-    throw new DbErrorForbidden('insufficient privileges');
+    throw new DbErrorUnprocessableRequest('insufficient privileges to update this account');
   }
   if (req.user.hasAccountAuth && req.body.sip_realm) {
     throw new DbErrorBadRequest('use POST /Accounts/:sid/sip_realm/:realm to set or change the sip realm');
@@ -467,23 +264,12 @@ async function validateUpdate(req, sid) {
 
   if (req.user.service_provider_sid && !req.user.hasScope('admin')) {
     const result = await Account.retrieve(sid);
-    if (!result || result.length === 0) {
-      throw new DbErrorBadRequest(`account not found for sid ${sid}`);
-    }
     if (result[0].service_provider_sid !== req.user.service_provider_sid) {
-      throw new DbErrorForbidden('insufficient privileges');
-    }
-  }
-  if (req.user.hasScope('admin')) {
-    /* check to be sure that the account_sid exists */
-    const result = await Account.retrieve(sid);
-    if (!result || result.length === 0) {
-      throw new DbErrorBadRequest(`account not found for sid ${sid}`);
+      throw new DbErrorUnprocessableRequest('cannot update account from different service provider');
     }
   }
   if (req.body.service_provider_sid) throw new DbErrorBadRequest('service_provider_sid may not be modified');
 }
-
 async function validateDelete(req, sid) {
   if (req.user.hasAccountAuth && req.user.account_sid !== sid) {
     throw new DbErrorUnprocessableRequest('insufficient privileges to update this account');
@@ -491,11 +277,12 @@ async function validateDelete(req, sid) {
   if (req.user.service_provider_sid && !req.user.hasScope('admin')) {
     const result = await Account.retrieve(sid);
     if (result[0].service_provider_sid !== req.user.service_provider_sid) {
-      throw new DbErrorForbidden('insufficient privileges');
+      throw new DbErrorUnprocessableRequest('cannot delete account from different service provider');
     }
   }
 }
 
+
 /* add */
 router.post('/', async(req, res) => {
   const logger = req.app.locals.logger;
@@ -504,12 +291,12 @@ router.post('/', async(req, res) => {
     await validateAdd(req);
 
     // create webhooks if provided
-    const obj = {...req.body, webhook_secret: secret};
-    for (const prop of ['registration_hook', 'queue_event_hook']) {
-      if (obj[prop] && obj[prop].url && obj[prop].url.length > 0) {
+    const obj = Object.assign({webhook_secret: secret}, req.body);
+    for (const prop of ['registration_hook']) {
+      if (obj[prop]) {
         obj[`${prop}_sid`] = await Webhook.make(obj[prop]);
+        delete obj[prop];
       }
-      delete obj[prop];
     }
 
     logger.debug(`Attempting to add account ${JSON.stringify(obj)}`);
@@ -537,10 +324,8 @@ router.get('/', async(req, res) => {
 router.get('/:sid', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    const account_sid = parseAccountSid(req);
-    await validateRequest(req, account_sid);
     const service_provider_sid = req.user.hasServiceProviderAuth ? req.user.service_provider_sid : null;
-    const results = await Account.retrieve(account_sid, service_provider_sid);
+    const results = await Account.retrieve(req.params.sid, service_provider_sid);
     if (results.length === 0) return res.status(404).end();
     return res.status(200).json(results[0]);
   }
@@ -552,15 +337,13 @@ router.get('/:sid', async(req, res) => {
 router.get('/:sid/WebhookSecret', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    const account_sid = parseAccountSid(req);
-    await validateRequest(req, account_sid);
     const service_provider_sid = req.user.hasServiceProviderAuth ? req.user.service_provider_sid : null;
-    const results = await Account.retrieve(account_sid, service_provider_sid);
+    const results = await Account.retrieve(req.params.sid, service_provider_sid);
     if (results.length === 0) return res.status(404).end();
     let {webhook_secret} = results[0];
     if (req.query.regenerate) {
       const secret = `wh_secret_${translator.generate()}`;
-      await Account.update(account_sid, {webhook_secret: secret});
+      await Account.update(req.params.sid, {webhook_secret: secret});
       webhook_secret = secret;
     }
     return res.status(200).json({webhook_secret});
@@ -570,131 +353,20 @@ router.get('/:sid/WebhookSecret', async(req, res) => {
   }
 });
 
-router.post('/:sid/SubspaceTeleport', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const account_sid = parseAccountSid(req);
-    const service_provider_sid = req.user.hasServiceProviderAuth ? req.user.service_provider_sid : null;
-    const results = await Account.retrieve(account_sid, service_provider_sid);
-    if (results.length === 0) return res.status(404).end();
-    const {subspace_client_id, subspace_client_secret} = results[0];
-    const {destination} = req.body;
-    const arr = /^(.*):\d+$/.exec(destination);
-    const dest = arr ? `sip:${arr[1]}` : `sip:${destination}`;
-
-    const teleport = await enableSubspace({
-      subspace_client_id,
-      subspace_client_secret,
-      destination: dest
-    });
-    logger.info({destination, teleport}, 'SubspaceTeleport - create teleport');
-    await Account.update(account_sid, {
-      subspace_sip_teleport_id: teleport.id,
-      subspace_sip_teleport_destinations: JSON.stringify(teleport.teleport_entry_points)//hacky
-    });
-
-    return res.status(200).json({
-      subspace_sip_teleport_id: teleport.id,
-      subspace_sip_teleport_destinations: teleport.teleport_entry_points
-    });
-  }
-  catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.delete('/:sid/SubspaceTeleport', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const account_sid = parseAccountSid(req);
-    const service_provider_sid = req.user.hasServiceProviderAuth ? req.user.service_provider_sid : null;
-    const results = await Account.retrieve(account_sid, service_provider_sid);
-    if (results.length === 0) return res.status(404).end();
-    const {subspace_client_id, subspace_client_secret, subspace_sip_teleport_id} = results[0];
-
-    await disableSubspace({subspace_client_id, subspace_client_secret, subspace_sip_teleport_id});
-    await Account.update(account_sid, {
-      subspace_sip_teleport_id: null,
-      subspace_sip_teleport_destinations: null
-    });
-    return res.sendStatus(204);
-  }
-  catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-function encryptBucketCredential(obj) {
-  if (!obj.bucket_credential) return;
-  const {
-    vendor,
-    region,
-    name,
-    access_key_id,
-    secret_access_key,
-    tags,
-    service_key,
-    connection_string,
-    endpoint
-  } = obj.bucket_credential;
-
-  switch (vendor) {
-    case 'aws_s3':
-      assert(access_key_id, 'invalid aws S3 bucket credential: access_key_id is required');
-      assert(secret_access_key, 'invalid aws S3 bucket credential: secret_access_key is required');
-      assert(name, 'invalid aws bucket name: name is required');
-      assert(region, 'invalid aws bucket region: region is required');
-      const awsData = JSON.stringify({vendor, region, name, access_key_id,
-        secret_access_key, tags});
-      obj.bucket_credential = encrypt(awsData);
-      break;
-    case 's3_compatible':
-      assert(access_key_id, 'invalid aws S3 bucket credential: access_key_id is required');
-      assert(secret_access_key, 'invalid aws S3 bucket credential: secret_access_key is required');
-      assert(name, 'invalid aws bucket name: name is required');
-      assert(endpoint, 'invalid endpoint uri: endpoint is required');
-      const s3Data = JSON.stringify({vendor, endpoint, name, access_key_id,
-        secret_access_key, tags});
-      obj.bucket_credential = encrypt(s3Data);
-      break;
-    case 'google':
-      assert(service_key, 'invalid google cloud storage credential: service_key is required');
-      const googleData = JSON.stringify({vendor, name, service_key, tags});
-      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');
-      const azureData = JSON.stringify({vendor, name, connection_string, tags});
-      obj.bucket_credential = encrypt(azureData);
-      break;
-    case 'none':
-      obj.bucket_credential = null;
-      break;
-    default:
-      throw new DbErrorBadRequest(`unknown storage vendor: ${vendor}`);
-  }
-}
-
-/**
- * update
- */
+/* update */
 router.put('/:sid', async(req, res) => {
+  const sid = req.params.sid;
   const logger = req.app.locals.logger;
   try {
-    const sid = parseAccountSid(req);
-    await validateRequest(req, sid);
 
     // create webhooks if provided
     const obj = Object.assign({}, req.body);
-    for (const prop of ['registration_hook', 'queue_event_hook']) {
-      if (prop in obj) {
-        if (null === obj[prop] || !obj[prop].url || 0 === obj[prop].url.length) {
-          obj[`${prop}_sid`] = null;
-        }
-        else if (typeof obj[prop] === 'object') {
+    if (null !== obj.registration_hook) {
+      for (const prop of ['registration_hook']) {
+        if (prop in obj && Object.keys(obj[prop]).length) {
           if ('webhook_sid' in obj[prop]) {
             const sid = obj[prop]['webhook_sid'];
+            delete obj[prop]['webhook_sid'];
             await Webhook.update(sid, obj[prop]);
           }
           else {
@@ -702,37 +374,30 @@ router.put('/:sid', async(req, res) => {
             obj[`${prop}_sid`] = sid;
           }
         }
+        else {
+          obj[`${prop}_sid`] = null;
+        }
+        delete obj[prop];
       }
     }
 
     await validateUpdate(req, sid);
 
     if (Object.keys(obj).length) {
-      let orphanedRegHook, orphanedQueueHook;
+      let orphanedHook;
       if (null === obj.registration_hook) {
         const results = await Account.retrieve(sid);
-        if (results.length && results[0].registration_hook_sid) orphanedRegHook = results[0].registration_hook_sid;
+        if (results.length && results[0].registration_hook_sid) orphanedHook = results[0].registration_hook_sid;
         obj.registration_hook_sid = null;
+        delete obj.registration_hook;
       }
-      if (null === obj.queue_event_hook) {
-        const results = await Account.retrieve(sid);
-        if (results.length && results[0].queue_event_hook_sid) orphanedQueueHook = results[0].queue_event_hook_sid;
-        obj.queue_event_hook_sid = null;
-      }
-      delete obj.registration_hook;
-      delete obj.queue_event_hook;
-
-      encryptBucketCredential(obj);
-
+      logger.info({obj}, `about to update Account ${sid}`);
       const rowsAffected = await Account.update(sid, obj);
       if (rowsAffected === 0) {
         return res.status(404).end();
       }
-      if (orphanedRegHook) {
-        await Webhook.remove(orphanedRegHook);
-      }
-      if (orphanedQueueHook) {
-        await Webhook.remove(orphanedQueueHook);
+      if (orphanedHook) {
+        await Webhook.remove(orphanedHook);
       }
     }
 
@@ -745,18 +410,16 @@ router.put('/:sid', async(req, res) => {
 
 /* delete */
 router.delete('/:sid', async(req, res) => {
+  const sid = req.params.sid;
   const logger = req.app.locals.logger;
   const sqlDeleteGateways = `DELETE from sip_gateways 
     WHERE voip_carrier_sid IN
     (SELECT voip_carrier_sid from voip_carriers where account_sid = ?)`;
-
   try {
-    const sid = parseAccountSid(req);
-    await validateRequest(req, sid);
     await validateDelete(req, sid);
 
     const [account] = await promisePool.query('SELECT * FROM accounts WHERE account_sid = ?', sid);
-    const {sip_realm, stripe_customer_id, registration_hook_sid} = account[0];
+    const {sip_realm, stripe_customer_id} = account[0];
     /* remove dns records */
     if (process.env.NODE_ENV !== 'test' || process.env.DME_API_KEY) {
 
@@ -797,15 +460,6 @@ account_subscriptions WHERE account_sid = ?)
     await promisePool.execute('DELETE from applications where account_sid = ?', [sid]);
     await promisePool.execute('DELETE from accounts where account_sid = ?', [sid]);
 
-    if (registration_hook_sid) {
-      /* remove registration hook if only used by this account */
-      const sql = 'SELECT COUNT(*) as count FROM accounts WHERE registration_hook_sid = ?';
-      const [r] = await promisePool.query(sql, registration_hook_sid);
-      if (r[0]?.count === 0) {
-        await promisePool.execute('DELETE from webhooks where webhook_sid = ?', [registration_hook_sid]);
-      }
-    }
-
     if (stripe_customer_id) {
       const response = await deleteCustomer(logger, stripe_customer_id);
       logger.info({response}, `deleted stripe customer_id ${stripe_customer_id} for account_si ${sid}`);
@@ -816,57 +470,13 @@ account_subscriptions WHERE account_sid = ?)
   }
 });
 
-/* Test Bucket credential Keys */
-router.post('/:sid/BucketCredentialTest', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const account_sid = parseAccountSid(req);
-    await validateRequest(req, account_sid);
-    const {vendor, name, region, access_key_id, secret_access_key, service_key, connection_string, endpoint} = req.body;
-    const ret = {
-      status: 'not tested'
-    };
-
-    switch (vendor) {
-      case 'aws_s3':
-        await testS3Storage(logger, {vendor, name, region, access_key_id, secret_access_key});
-        ret.status = 'ok';
-        break;
-      case 's3_compatible':
-        await testS3Storage(logger, {vendor, name, endpoint, access_key_id, secret_access_key});
-        ret.status = 'ok';
-        break;
-      case 'google':
-        await testGoogleStorage(logger, {vendor, name, service_key});
-        ret.status = 'ok';
-        break;
-      case 'azure':
-        await testAzureStorage(logger, {vendor, name, connection_string});
-        ret.status = 'ok';
-        break;
-      default:
-        throw new DbErrorBadRequest(`Does not support test for ${vendor}`);
-    }
-    return res.status(200).json(ret);
-  }
-  catch (err) {
-    return res.status(200).json({status: 'failed', reason: err.message});
-  }
-});
-
-/**
- * retrieve account level api keys
- */
+/* retrieve account level api keys */
 router.get('/:sid/ApiKeys', async(req, res) => {
   const logger = req.app.locals.logger;
-
   try {
-    const sid = parseAccountSid(req);
-    await validateRequest(req, sid);
-
-    const results = await ApiKey.retrieveAll(sid);
+    const results = await ApiKey.retrieveAll(req.params.sid);
     res.status(200).json(results);
-    updateLastUsed(logger, sid, req).catch((err) => {});
+    updateLastUsed(logger, req.params.sid, req).catch((err) => {});
   } catch (err) {
     sysError(logger, res, err);
   }
@@ -876,19 +486,22 @@ router.get('/:sid/ApiKeys', async(req, res) => {
  * create a new Call
  */
 router.post('/:sid/Calls', async(req, res) => {
+  const sid = req.params.sid;
+  const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
   const {retrieveSet, logger} = req.app.locals;
-  const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:fs-service-url`;
-  const serviceUrl = await getFsUrl(logger, retrieveSet, setName);
-
-  if (!serviceUrl) {
-    return res.status(480).json({msg: 'no available feature servers at this time'});
-  }
 
   try {
-    const sid = parseAccountSid(req);
-    await validateRequest(req, sid);
-
+    const fs = await retrieveSet(setName);
+    if (0 === fs.length) {
+      logger.info('No available feature servers to handle createCall API request');
+      return res.json({msg: 'no available feature servers at this time'}).status(500);
+    }
+    const ip = fs[idx++ % fs.length];
+    logger.info({fs}, `feature servers available for createCall API request, selecting ${ip}`);
+    const serviceUrl = `http://${ip}:3000/v1/createCall`;
     await validateCreateCall(logger, sid, req);
+
+    logger.debug({payload: req.body}, `sending createCall API request to to ${ip}`);
     updateLastUsed(logger, sid, req).catch((err) => {});
     request({
       url: serviceUrl,
@@ -897,16 +510,14 @@ router.post('/:sid/Calls', async(req, res) => {
       body: Object.assign(req.body, {account_sid: sid})
     }, (err, response, body) => {
       if (err) {
-        logger.error(err, `Error sending createCall POST to ${serviceUrl}`);
+        logger.error(err, `Error sending createCall POST to ${ip}`);
         return res.sendStatus(500);
       }
-
       if (response.statusCode !== 201) {
-        logger.error({statusCode: response.statusCode}, `Non-success response returned by createCall ${serviceUrl}`);
+        logger.error({statusCode: response.statusCode}, `Non-success response returned by createCall ${ip}`);
         return res.sendStatus(500);
       }
-
-      return res.status(201).json(body);
+      res.status(201).json(body);
     });
   } catch (err) {
     sysError(logger, res, err);
@@ -917,18 +528,11 @@ router.post('/:sid/Calls', async(req, res) => {
  * retrieve info for a group of calls under an account
  */
 router.get('/:sid/Calls', async(req, res) => {
+  const accountSid = req.params.sid;
   const {logger, listCalls} = req.app.locals;
-  const {direction, from, to, callStatus} = req.query || {};
+
   try {
-    const accountSid = parseAccountSid(req);
-    await validateRequest(req, accountSid);
-    const calls = await listCalls({
-      accountSid,
-      direction,
-      from,
-      to,
-      callStatus
-    });
+    const calls = await listCalls(accountSid);
     logger.debug(`retrieved ${calls.length} calls for account sid ${accountSid}`);
     res.status(200).json(coerceNumbers(snakeCase(calls)));
     updateLastUsed(logger, accountSid, req).catch((err) => {});
@@ -941,12 +545,11 @@ router.get('/:sid/Calls', async(req, res) => {
  * retrieve single call
  */
 router.get('/:sid/Calls/:callSid', async(req, res) => {
+  const accountSid = req.params.sid;
+  const callSid = req.params.callSid;
   const {logger, retrieveCall} = req.app.locals;
 
   try {
-    const accountSid = parseAccountSid(req);
-    await validateRequest(req, accountSid);
-    const callSid = parseCallSid(req);
     const callInfo = await retrieveCall(accountSid, callSid);
     if (callInfo) {
       logger.debug(callInfo, `retrieved call info for call sid ${callSid}`);
@@ -966,12 +569,11 @@ router.get('/:sid/Calls/:callSid', async(req, res) => {
  * delete call
  */
 router.delete('/:sid/Calls/:callSid', async(req, res) => {
+  const accountSid = req.params.sid;
+  const callSid = req.params.callSid;
   const {logger, deleteCall} = req.app.locals;
 
   try {
-    const accountSid = parseAccountSid(req);
-    await validateRequest(req, accountSid);
-    const callSid = parseCallSid(req);
     const result = await deleteCall(accountSid, callSid);
     if (result) {
       logger.debug(`successfully deleted call ${callSid}`);
@@ -991,12 +593,11 @@ router.delete('/:sid/Calls/:callSid', async(req, res) => {
  * update a call
  */
 const updateCall = async(req, res) => {
+  const accountSid = req.params.sid;
+  const callSid = req.params.callSid;
   const {logger, retrieveCall} = req.app.locals;
 
   try {
-    const accountSid = parseAccountSid(req);
-    await validateRequest(req, accountSid);
-    const callSid = parseCallSid(req);
     validateUpdateCall(req.body);
     const call = await retrieveCall(accountSid, callSid);
     if (call) {
@@ -1023,7 +624,6 @@ const updateCall = async(req, res) => {
 router.post('/:sid/Calls/:callSid', async(req, res) => {
   await updateCall(req, res);
 });
-
 router.put('/:sid/Calls/:callSid', async(req, res) => {
   await updateCall(req, res);
 });
@@ -1032,15 +632,19 @@ router.put('/:sid/Calls/:callSid', async(req, res) => {
  * create a new Message
  */
 router.post('/:sid/Messages', async(req, res) => {
+  const account_sid = parseAccountSid(req);
+  const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
   const {retrieveSet, logger} = req.app.locals;
 
   try {
-    const account_sid = parseAccountSid(req);
-    await validateRequest(req, account_sid);
-
-    const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:fs-service-url`;
-    const serviceUrl = await getFsUrl(logger, retrieveSet, setName);
-    if (!serviceUrl) res.json({msg: 'no available feature servers at this time'}).status(480);
+    const fs = await retrieveSet(setName);
+    if (0 === fs.length) {
+      logger.info('No available feature servers to handle createMessage API request');
+      return res.json({msg: 'no available feature servers at this time'}).status(500);
+    }
+    const ip = fs[idx++ % fs.length];
+    logger.info({fs}, `feature servers available for createMessage API request, selecting ${ip}`);
+    const serviceUrl = `http://${ip}:3000/v1/createMessage/${account_sid}`;
     await validateCreateMessage(logger, account_sid, req);
 
     const payload = {
@@ -1048,7 +652,7 @@ router.post('/:sid/Messages', async(req, res) => {
       account_sid,
       ...req.body
     };
-    logger.debug({payload}, `sending createMessage API request to to ${serviceUrl}`);
+    logger.debug({payload}, `sending createMessage API request to to ${ip}`);
     updateLastUsed(logger, account_sid, req).catch(() => {});
     request({
       url: serviceUrl,
@@ -1057,12 +661,12 @@ router.post('/:sid/Messages', async(req, res) => {
       body: payload
     }, (err, response, body) => {
       if (err) {
-        logger.error(err, `Error sending createMessage POST to ${serviceUrl}`);
+        logger.error(err, `Error sending createMessage POST to ${ip}`);
         return res.sendStatus(500);
       }
       if (response.statusCode !== 200) {
         logger.error({statusCode: response.statusCode}, `Non-success response returned by createMessage ${serviceUrl}`);
-        return body ? res.status(response.statusCode).json(body) : res.sendStatus(response.statusCode);
+        return res.sendStatus(response.statusCode);
       }
       res.status(201).json(body);
     });
@@ -1071,23 +675,4 @@ router.post('/:sid/Messages', async(req, res) => {
   }
 });
 
-/**
- * retrieve info for a group of queues under an account
- */
-router.get('/:sid/Queues', async(req, res) => {
-  const {logger, listSortedSets} = req.app.locals;
-  const { search } = req.query || {};
-  try {
-    const accountSid = parseAccountSid(req);
-    await validateRequest(req, accountSid);
-    const queues = search ? await listSortedSets(accountSid, search) : await listSortedSets(accountSid);
-    logger.debug(`retrieved ${queues.length} queues for account sid ${accountSid}`);
-    res.status(200).json(queues);
-    updateLastUsed(logger, accountSid, req).catch((err) => {});
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-
 module.exports = router;

lib/routes/api/add-from-predefined-carrier.js

@@ -1,20 +1,19 @@
 const router = require('express').Router();
+const {DbErrorBadRequest} = require('../../utils/errors');
 const PredefinedCarrier = require('../../models/predefined-carrier');
 const VoipCarrier = require('../../models/voip-carrier');
 const SipGateway = require('../../models/sip-gateway');
-const SmppGateway = require('../../models/smpp-gateway');
 const {parseServiceProviderSid} = require('./utils');
-const short = require('short-uuid');
 const {promisePool} = require('../../db');
 const sysError = require('../error');
 
-
+const sqlSelectCarrierByName = `SELECT * FROM voip_carriers 
+WHERE account_sid = ? 
+AND name = ?`;
 const sqlSelectCarrierByNameForSP = `SELECT * FROM voip_carriers 
 WHERE service_provider_sid = ? 
 AND name = ?`;
-const sqlSelectTemplateSipGateways = `SELECT * FROM predefined_sip_gateways 
-WHERE predefined_carrier_sid = ?`;
-const sqlSelectTemplateSmppGateways = `SELECT * FROM predefined_smpp_gateways 
+const sqlSelectTemplateGateways = `SELECT * FROM predefined_sip_gateways 
 WHERE predefined_carrier_sid = ?`;
 
 
@@ -23,54 +22,44 @@ router.post('/:sid', async(req, res) => {
   const {sid } = req.params;
   let service_provider_sid;
   const {account_sid} = req.user;
-
-  try {
-    if (!account_sid) {
-      service_provider_sid = parseServiceProviderSid(req);
-    } else {
-      service_provider_sid = req.user.service_provider_sid;
+  if (!account_sid) {
+    if (!req.user.hasScope('service_provider')) {
+      logger.error({user: req.user}, 'invalid creds');
+      return res.sendStatus(403);
     }
-
+    service_provider_sid = parseServiceProviderSid(req);
+  }
+  try {
     const [template] = await PredefinedCarrier.retrieve(sid);
     logger.debug({template}, `Retrieved template carrier for sid ${sid}`);
     if (!template) return res.sendStatus(404);
 
     /* make sure not to add the same carrier twice */
-    const [r2] = await promisePool.query(sqlSelectCarrierByNameForSP, [service_provider_sid, template.name]);
+    const [r2] = account_sid ?
+      await promisePool.query(sqlSelectCarrierByName, [account_sid, template.name]) :
+      await promisePool.query(sqlSelectCarrierByNameForSP, [service_provider_sid, template.name]);
 
     if (r2.length > 0) {
-      template.name =  `${template.name}-${short.generate()}`;
+      logger.info({account_sid}, `Failed to add carrier with name ${template.name}, carrier of that name exists`);
+      throw new DbErrorBadRequest(`A carrier with name ${template.name} already exists`);
     }
 
-    /* retrieve all the sip gateways */
-    const [r3] = await promisePool.query(sqlSelectTemplateSipGateways, template.predefined_carrier_sid);
-    logger.debug({r3}, `retrieved template sip gateways for ${template.name}`);
-
-    /* retrieve all the smpp gateways */
-    const [r4] = await promisePool.query(sqlSelectTemplateSmppGateways, template.predefined_carrier_sid);
-    logger.debug({r4}, `retrieved template smpp gateways for ${template.name}`);
+    /* retrieve all the gateways */
+    const [r3] = await promisePool.query(sqlSelectTemplateGateways, template.predefined_carrier_sid);
+    logger.debug({r3}, `retrieved template gateways for ${template.name}`);
 
     /* add a voip_carrier */
     // eslint-disable-next-line no-unused-vars
     const {requires_static_ip, predefined_carrier_sid, ...obj} = template;
     const uuid = await VoipCarrier.make({...obj, account_sid, service_provider_sid});
 
-    /* add all the sipp gateways */
+    /* add all the gateways */
     for (const gw of r3) {
       // eslint-disable-next-line no-unused-vars
       const {predefined_carrier_sid, predefined_sip_gateway_sid, ...obj} = gw;
-      logger.debug({obj}, 'adding sip gateway');
+      logger.debug({obj}, 'adding gateway');
       await SipGateway.make({...obj, voip_carrier_sid: uuid});
     }
-
-    /* add all the smpp gateways */
-    for (const gw of r4) {
-      // eslint-disable-next-line no-unused-vars
-      const {predefined_carrier_sid, predefined_smpp_gateway_sid, ...obj} = gw;
-      logger.debug({obj}, 'adding smpp gateway');
-      await SmppGateway.make({...obj, voip_carrier_sid: uuid});
-    }
-
     logger.debug({sid: uuid}, 'Successfully added carrier from predefined list');
     res.status(201).json({sid: uuid});
   } catch (err) {

lib/routes/api/alerts.js

@@ -1,7 +1,6 @@
 const router = require('express').Router();
 const sysError = require('../error');
 const {DbErrorBadRequest} = require('../../utils/errors');
-const { parseServiceProviderSid } = require('./utils');
 
 const parseAccountSid = (url) => {
   const arr = /Accounts\/([^\/]*)/.exec(url);
@@ -9,41 +8,25 @@ const parseAccountSid = (url) => {
 };
 
 router.get('/', async(req, res) => {
-  const {logger, queryAlerts, queryAlertsSP} = req.app.locals;
+  const {logger, queryAlerts} = req.app.locals;
   try {
     logger.debug({opts: req.query}, 'GET /Alerts');
     const account_sid = parseAccountSid(req.originalUrl);
-    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 < 25 || count > 500) throw new DbErrorBadRequest('missing or invalid "count" query arg');
 
-    if (account_sid) {
-      const data = await queryAlerts({
-        account_sid,
-        page,
-        page_size: count,
-        alert_type,
-        days,
-        start: days ? undefined : start,
-        end: days ? undefined : end,
-      });
+    const data = await queryAlerts({
+      account_sid,
+      page,
+      page_size: count,
+      alert_type,
+      days,
+      start: days ? undefined : start,
+      end: days ? undefined : end,
+    });
 
-      res.status(200).json(data);
-    }
-    else {
-      const data = await queryAlertsSP({
-        service_provider_sid,
-        page,
-        page_size: count,
-        alert_type,
-        days,
-        start: days ? undefined : start,
-        end: days ? undefined : end,
-      });
-
-      res.status(200).json(data);
-    }
+    res.status(200).json(data);
   } catch (err) {
     sysError(logger, res, err);
   }

lib/routes/api/api-keys.js

@@ -3,7 +3,8 @@ const {DbErrorBadRequest} = require('../../utils/errors');
 const ApiKey = require('../../models/api-key');
 const Account = require('../../models/account');
 const decorate = require('./decorate');
-const { v4: uuidv4 } = require('uuid');
+const uuidv4 = require('uuid/v4');
+const assert = require('assert');
 const sysError = require('../error');
 const preconditions = {
   'add': validateAddToken,
@@ -70,7 +71,10 @@ async function validateDeleteToken(req, sid) {
 router.post('/', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    await validateAddToken(req);
+    if ('add' in preconditions) {
+      assert(typeof preconditions.add === 'function');
+      await preconditions.add(req);
+    }
     const uuid = await ApiKey.make(req.body);
     res.status(201).json({sid: uuid, token: req.body.token});
   } catch (err) {

lib/routes/api/applications.js

@@ -1,46 +1,14 @@
 const router = require('express').Router();
-const {DbErrorBadRequest, DbErrorUnprocessableRequest, DbErrorForbidden} = require('../../utils/errors');
+const {DbErrorBadRequest, DbErrorUnprocessableRequest} = require('../../utils/errors');
 const Application = require('../../models/application');
 const Account = require('../../models/account');
 const Webhook = require('../../models/webhook');
-const {promisePool} = require('../../db');
 const decorate = require('./decorate');
 const sysError = require('../error');
-const { validate } = require('@jambonz/verb-specifications');
-const { parseApplicationSid } = require('./utils');
 const preconditions = {
   'add': validateAdd,
-  'update': validateUpdate
-};
-
-const validateRequest = async(req, account_sid) => {
-  try {
-    if (req.user.hasScope('admin')) {
-      return;
-    }
-
-    if (req.user.hasScope('account')) {
-      if (account_sid === req.user.account_sid) {
-        return;
-      }
-
-      throw new DbErrorForbidden('insufficient permissions');
-    }
-
-    if (req.user.hasScope('service_provider')) {
-      const [r] = await promisePool.execute(
-        'SELECT service_provider_sid from accounts WHERE account_sid = ?', [account_sid]
-      );
-
-      if (r.length === 1 && r[0].service_provider_sid === req.user.service_provider_sid) {
-        return;
-      }
-
-      throw new DbErrorForbidden('insufficient permissions');
-    }
-  } catch (error) {
-    throw error;
-  }
+  'update': validateUpdate,
+  'delete': validateDelete
 };
 
 /* only user-level tokens can add applications */
@@ -53,7 +21,7 @@ async function validateAdd(req) {
     if (!req.body.account_sid) throw new DbErrorBadRequest('missing required field: \'account_sid\'');
     const result = await Account.retrieve(req.body.account_sid, req.user.service_provider_sid);
     if (result.length === 0) {
-      throw new DbErrorForbidden('insufficient privileges');
+      throw new DbErrorBadRequest('insufficient privileges to create an application under the specified account');
     }
   }
   if (req.body.call_hook && typeof req.body.call_hook !== 'object') {
@@ -65,26 +33,12 @@ async function validateAdd(req) {
 }
 
 async function validateUpdate(req, sid) {
-  const app = await Application.retrieve(sid);
-  if (req.user.hasAccountAuth) {
-    if (!app || 0 === app.length || app[0].account_sid !== req.user.account_sid) {
-      throw new DbErrorForbidden('insufficient privileges');
+  if (req.user.account_sid) {
+    const app = await Application.retrieve(sid);
+    if (!app || !app.length || app[0].account_sid !== req.user.account_sid) {
+      throw new DbErrorBadRequest('you may not update or delete an application associated with a different account');
     }
   }
-
-  if (req.user.hasServiceProviderAuth) {
-    const [r] = await promisePool.execute(
-      'SELECT service_provider_sid from accounts WHERE account_sid = ?', [app[0].account_sid]
-    );
-
-    if (r.length === 1 && r[0].service_provider_sid === req.user.service_provider_sid) {
-      return;
-    }
-
-    throw new DbErrorForbidden('insufficient permissions');
-  }
-
-
   if (req.body.call_hook && typeof req.body.call_hook !== 'object') {
     throw new DbErrorBadRequest('\'call_hook\' must be an object when updating an application');
   }
@@ -94,29 +48,18 @@ async function validateUpdate(req, sid) {
 }
 
 async function validateDelete(req, sid) {
-  const result = await Application.retrieve(sid);
   if (req.user.hasAccountAuth) {
+    const result = await Application.retrieve(sid);
     if (!result || 0 === result.length) throw new DbErrorBadRequest('application does not exist');
     if (result[0].account_sid !== req.user.account_sid) {
-      throw new DbErrorUnprocessableRequest('insufficient permissions');
+      throw new DbErrorUnprocessableRequest('cannot delete application owned by a different account');
     }
   }
-  if (req.user.hasServiceProviderAuth) {
-    const [r] = await promisePool.execute(
-      'SELECT service_provider_sid from accounts WHERE account_sid = ?', [result[0].account_sid]
-    );
-
-    if (r.length === 1 && r[0].service_provider_sid === req.user.service_provider_sid) {
-      return;
-    }
-
-    throw new DbErrorForbidden('insufficient permissions');
-  }
   const assignedPhoneNumbers = await Application.getForeignKeyReferences('phone_numbers.application_sid', sid);
   if (assignedPhoneNumbers > 0) throw new DbErrorUnprocessableRequest('cannot delete application with phone numbers');
 }
 
-decorate(router, Application, [], preconditions);
+decorate(router, Application, ['delete'], preconditions);
 
 /* add */
 router.post('/', async(req, res) => {
@@ -133,16 +76,6 @@ router.post('/', async(req, res) => {
       }
     }
 
-    // validate app json if required
-    if (obj['app_json']) {
-      const app_json = JSON.parse(obj['app_json']);
-      try {
-        validate(logger, app_json);
-      } catch (err) {
-        throw new DbErrorBadRequest(err);
-      }
-    }
-
     const uuid = await Application.make(obj);
     res.status(201).json({sid: uuid});
   } catch (err) {
@@ -167,65 +100,22 @@ router.get('/', async(req, res) => {
 router.get('/:sid', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    const application_sid = parseApplicationSid(req);
     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 results = await Application.retrieve(application_sid, service_provider_sid, account_sid);
+    const results = await Application.retrieve(req.params.sid, service_provider_sid, account_sid);
     if (results.length === 0) return res.status(404).end();
-    await validateRequest(req, results[0].account_sid);
-    return res.status(200).json(results[0]);
+    return res.status(200).json(results);
   }
   catch (err) {
     sysError(logger, res, err);
   }
 });
 
-/* delete */
-router.delete('/:sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const sid = parseApplicationSid(req);
-    await validateDelete(req, sid);
-
-    const [application] = await promisePool.query('SELECT * FROM applications WHERE application_sid = ?', sid);
-    const {call_hook_sid, call_status_hook_sid, messaging_hook_sid} = application[0];
-    logger.info({call_hook_sid, call_status_hook_sid, messaging_hook_sid, sid}, 'deleting application');
-    await promisePool.execute('DELETE from applications where application_sid = ?', [sid]);
-
-    if (call_hook_sid) {
-      /* remove call hook if only used by this app */
-      const sql = 'SELECT COUNT(*) as count FROM applications WHERE call_hook_sid = ?';
-      const [r] = await promisePool.query(sql, call_hook_sid);
-      if (r[0]?.count === 0) {
-        await promisePool.execute('DELETE from webhooks where webhook_sid = ?', [call_hook_sid]);
-      }
-    }
-    if (call_status_hook_sid) {
-      const sql = 'SELECT COUNT(*) as count FROM applications WHERE call_status_hook_sid = ?';
-      const [r] = await promisePool.query(sql, call_status_hook_sid);
-      if (r[0]?.count === 0) {
-        await promisePool.execute('DELETE from webhooks where webhook_sid = ?', [call_status_hook_sid]);
-      }
-    }
-    if (messaging_hook_sid) {
-      const sql = 'SELECT COUNT(*) as count FROM applications WHERE messaging_hook_sid = ?';
-      const [r] = await promisePool.query(sql, messaging_hook_sid);
-      if (r[0]?.count === 0) {
-        await promisePool.execute('DELETE from webhooks where webhook_sid = ?', [messaging_hook_sid]);
-      }
-    }
-
-    res.status(204).end();
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
 /* update */
 router.put('/:sid', async(req, res) => {
+  const sid = req.params.sid;
   const logger = req.app.locals.logger;
   try {
-    const sid = parseApplicationSid(req);
     await validateUpdate(req, sid);
 
     // create webhooks if provided
@@ -248,16 +138,6 @@ router.put('/:sid', async(req, res) => {
       delete obj[prop];
     }
 
-    // validate app json if required
-    if (obj['app_json']) {
-      const app_json = JSON.parse(obj['app_json']);
-      try {
-        validate(logger, app_json);
-      } catch (err) {
-        throw new DbErrorBadRequest(err);
-      }
-    }
-
     const rowsAffected = await Application.update(sid, obj);
     if (rowsAffected === 0) {
       return res.status(404).end();

lib/routes/api/change-password.js

@@ -1,15 +1,15 @@
 const router = require('express').Router();
+//const debug = require('debug')('jambonz:api-server');
 const {DbErrorBadRequest} = require('../../utils/errors');
 const {generateHashedPassword, verifyPassword} = require('../../utils/password-utils');
 const {promisePool} = require('../../db');
-const {cacheClient} = require('../../helpers');
 const sysError = require('../error');
 const sqlUpdatePassword = `UPDATE users 
 SET hashed_password= ? 
 WHERE user_sid = ?`;
 
 router.post('/', async(req, res) => {
-  const {logger} = req.app.locals;
+  const {logger, retrieveKey, deleteKey} = req.app.locals;
   const {user_sid} = req.user;
   const {old_password, new_password} = req.body;
   try {
@@ -26,10 +26,10 @@ router.post('/', async(req, res) => {
 
       const isCorrect = await verifyPassword(r[0].hashed_password, old_password);
       if (!isCorrect) {
-        const key = cacheClient.generateRedisKey('reset-link', old_password);
-        const user_sid = await cacheClient.get(key);
+        const key = `reset-link:${old_password}`;
+        const user_sid = await retrieveKey(key);
         if (!user_sid) throw new DbErrorBadRequest('old_password is incorrect');
-        await cacheClient.delete(key);
+        await deleteKey(key);
       }
     }
 
@@ -42,9 +42,6 @@ router.post('/', async(req, res) => {
     sysError(logger, res, err);
     return;
   }
-
-  const redisKey = cacheClient.generateRedisKey('jwt', user_sid, 'v2');
-  await cacheClient.delete(redisKey);
 });
 
 module.exports = router;

lib/routes/api/clients.js

@@ -1,88 +0,0 @@
-const router = require('express').Router();
-const decorate = require('./decorate');
-const sysError = require('../error');
-const Client = require('../../models/client');
-const Account = require('../../models/account');
-const { DbErrorBadRequest, DbErrorForbidden } = require('../../utils/errors');
-const { encrypt, decrypt, obscureKey } = require('../../utils/encrypt-decrypt');
-
-const commonCheck = async(req) => {
-  if (req.user.hasAccountAuth) {
-    req.body.account_sid = req.user.account_sid;
-  } else if (req.user.hasServiceProviderAuth && req.body.account_sid) {
-    const accounts = await Account.retrieve(req.body.account_sid, req.user.service_provider_sid);
-    if (accounts.length === 0) {
-      throw new DbErrorForbidden('insufficient permissions');
-    }
-  }
-
-  if (req.body.password) {
-    req.body.password = encrypt(req.body.password);
-  }
-};
-
-const validateAdd = async(req) => {
-  await commonCheck(req);
-
-  const clients = await Client.retrieveByAccountSidAndUserName(req.body.account_sid, req.body.username);
-  if (clients.length) {
-    throw new DbErrorBadRequest('the client\'s username already exists');
-  }
-};
-
-const validateUpdate = async(req, sid) => {
-  await commonCheck(req);
-
-  const clients = await Client.retrieveByAccountSidAndUserName(req.body.account_sid, req.body.username);
-  if (clients.length && clients[0].client_sid !== sid) {
-    throw new DbErrorBadRequest('the client\'s username already exists');
-  }
-};
-
-
-const preconditions = {
-  add: validateAdd,
-  update: validateUpdate,
-};
-
-decorate(router, Client, ['add', 'update', 'delete'], preconditions);
-
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const results = req.user.hasAdminAuth ?
-      await Client.retrieveAll() : req.user.hasAccountAuth ?
-        await Client.retrieveAllByAccountSid(req.user.hasAccountAuth ? req.user.account_sid : null) :
-        await Client.retrieveAllByServiceProviderSid(req.user.service_provider_sid);
-    const ret = results.map((c) => {
-      c.password = obscureKey(decrypt(c.password), 1);
-      return c;
-    });
-    res.status(200).json(ret);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.get('/:sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const results = await Client.retrieve(req.params.sid);
-    if (results.length === 0) return res.sendStatus(404);
-    const client = results[0];
-    client.password = obscureKey(decrypt(client.password), 1);
-    if (req.user.hasAccountAuth && client.account_sid !== req.user.account_sid) {
-      return res.sendStatus(404);
-    } else if (req.user.hasServiceProviderAuth) {
-      const accounts = await Account.retrieve(client.account_sid, req.user.service_provider_sid);
-      if (!accounts.length) {
-        return res.sendStatus(404);
-      }
-    }
-    return res.status(200).json(client);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/error.js

@@ -1,10 +1,6 @@
-const { BadRequestError, DbErrorBadRequest, DbErrorUnprocessableRequest } = require('../../utils/errors');
+const {DbErrorBadRequest, DbErrorUnprocessableRequest} = require('../../utils/errors');
 
 function sysError(logger, res, err) {
-  if (err instanceof BadRequestError) {
-    logger.info(err, err.message);
-    return res.status(400).json({msg: 'Bad request'});
-  }
   if (err instanceof DbErrorBadRequest) {
     logger.info(err, 'invalid client request');
     return res.status(400).json({msg: err.message});

lib/routes/api/forgot-password.js

@@ -4,9 +4,7 @@ const short = require('short-uuid');
 const translator = short();
 const {validateEmail, emailSimpleText} = require('../../utils/email-utils');
 const {promisePool} = require('../../db');
-const {cacheClient} = require('../../helpers');
 const sysError = require('../error');
-const assert = require('assert');
 const sql = `SELECT * from users user 
 LEFT JOIN accounts AS acc 
 ON acc.account_sid = user.account_sid 
@@ -27,8 +25,7 @@ function createOauthEmailText(provider) {
 }
 
 function createResetEmailText(link) {
-  assert(process.env.JAMBONZ_BASE_URL, 'process.env.JAMBONZ_BASE_URL is missing');
-  const baseUrl = process.env.JAMBONZ_BASE_URL;
+  const baseUrl = 'http://localhost:3001';
 
   return `Hi there!
 
@@ -48,7 +45,6 @@ function createResetEmailText(link) {
 router.post('/', async(req, res) => {
   const {logger, addKey} = req.app.locals;
   const {email} = req.body;
-
   let obj;
   try {
     if (!email || !validateEmail(email)) {
@@ -57,16 +53,11 @@ router.post('/', async(req, res) => {
 
     const [r] = await promisePool.query({sql, nestTables: true}, email);
     if (0 === r.length) {
-      logger.info('user not found');
-      return res.status(400).json({error: 'failed to reset your password'});
+      return res.status(400).json({error: 'email does not exist'});
     }
     obj = r[0];
-    if (!obj.user.is_active) {
-      logger.info(obj.user.name, 'user is inactive');
-      return res.status(400).json({error: 'failed to reset your password'});
-    } else if (obj.acc.account_sid !== null && !obj.acc.is_active) {
-      logger.info(obj.acc.account_sid, 'account is inactive');
-      return res.status(400).json({error: 'failed to reset your password'});
+    if (!obj.acc.is_active) {
+      return res.status(400).json({error: 'you may not reset the password of an inactive account'});
     }
     res.sendStatus(204);
   } catch (err) {
@@ -82,14 +73,10 @@ router.post('/', async(req, res) => {
   else {
     /* generate a link for this user to reset, send email */
     const link = translator.generate();
-    const redisKey = cacheClient.generateRedisKey('reset-link', link);
-    addKey(redisKey, obj.user.user_sid, 3600)
+    addKey(`reset-link:${link}`, obj.user.user_sid, 3600)
       .catch((err) => logger.error({err}, 'Error adding reset link to redis'));
     emailSimpleText(logger, email, 'Reset password request', createResetEmailText(link));
   }
-
-  const redisKey = cacheClient.generateRedisKey('jwt', obj.user.user_sid, 'v2');
-  await cacheClient.delete(redisKey);
 });
 
 module.exports = router;

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

@@ -1,77 +0,0 @@
-const router = require('express').Router();
-const GoogleCustomVoice = require('../../models/google-custom-voice');
-const SpeechCredential = require('../../models/speech-credential');
-const decorate = require('./decorate');
-const {DbErrorBadRequest, DbErrorForbidden} = require('../../utils/errors');
-const sysError = require('../error');
-
-const validateCredentialPermission = async(req) => {
-  const credential = await SpeechCredential.retrieve(req.body.speech_credential_sid);
-  if (!credential || credential.length === 0) {
-    throw new DbErrorBadRequest('Invalid speech_credential_sid');
-  }
-  const cred = credential[0];
-
-  if (req.user.hasServiceProviderAuth && cred.service_provider_sid !== req.user.service_provider_sid) {
-    throw new DbErrorForbidden('Insufficient privileges');
-  }
-  if (req.user.hasAccountAuth && cred.account_sid !== req.user.account_sid) {
-    throw new DbErrorForbidden('Insufficient privileges');
-  }
-};
-
-const validateAdd = async(req) => {
-  if (!req.body.speech_credential_sid) {
-    throw new DbErrorBadRequest('missing speech_credential_sid');
-  }
-
-  await validateCredentialPermission(req);
-};
-
-const validateUpdate = async(req) => {
-  if (req.body.speech_credential_sid) {
-    await validateCredentialPermission(req);
-  }
-};
-
-const preconditions = {
-  add: validateAdd,
-  update: validateUpdate,
-};
-
-decorate(router, GoogleCustomVoice, ['add', 'retrieve', 'update', 'delete'], preconditions);
-
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const account_sid = req.user.account_sid || req.query.account_sid;
-  const service_provider_sid = req.user.service_provider_sid || req.query.service_provider_sid;
-  const speech_credential_sid = req.query.speech_credential_sid;
-  const label = req.query.label;
-  try {
-    let results = [];
-    if (speech_credential_sid) {
-      const [cred] = await SpeechCredential.retrieve(speech_credential_sid);
-      if (!cred) {
-        return res.sendStatus(404);
-      }
-      if (account_sid && cred.account_sid && cred.account_sid !== account_sid) {
-        throw new DbErrorForbidden('Insufficient privileges');
-      }
-      if (service_provider_sid && cred.service_provider_sid && cred.service_provider_sid !== service_provider_sid) {
-        throw new DbErrorForbidden('Insufficient privileges');
-      }
-      results = await GoogleCustomVoice.retrieveAllBySpeechCredentialSid(speech_credential_sid);
-    } else {
-      if (!account_sid && !service_provider_sid) {
-        throw new DbErrorBadRequest('missing account_sid or service_provider_sid in query parameters');
-      }
-      results = await GoogleCustomVoice.retrieveAllByLabel(service_provider_sid, account_sid, label);
-    }
-    res.status(200).json(results);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-
-module.exports = router;

lib/routes/api/index.js

@@ -7,18 +7,9 @@ const isAdminScope = (req, res, next) => {
     message: 'insufficient privileges'
   });
 };
-// const isAdminOrSPScope = (req, res, next) => {
-//   if (req.user.hasScope('admin') || req.user.hasScope('service_provider')) return next();
-//   res.status(403).json({
-//     status: 'fail',
-//     message: 'insufficient privileges'
-//   });
-// };
 
 api.use('/BetaInviteCodes', isAdminScope, require('./beta-invite-codes'));
-api.use('/SystemInformation', isAdminScope, require('./system-information'));
-api.use('/TtsCache', isAdminScope, require('./tts-cache'));
-api.use('/ServiceProviders', require('./service-providers'));
+api.use('/ServiceProviders', isAdminScope, require('./service-providers'));
 api.use('/VoipCarriers', require('./voip-carriers'));
 api.use('/Webhooks', require('./webhooks'));
 api.use('/SipGateways', require('./sip-gateways'));
@@ -46,14 +37,6 @@ api.use('/Subscriptions', require('./subscriptions'));
 api.use('/Invoices', require('./invoices'));
 api.use('/InviteCodes', require('./invite-codes'));
 api.use('/PredefinedCarriers', require('./predefined-carriers'));
-api.use('/PasswordSettings', require('./password-settings'));
-// Least Cost Routing
-api.use('/Lcrs', require('./lcrs'));
-api.use('/LcrRoutes', require('./lcr-routes'));
-api.use('/LcrCarrierSetEntries', require('./lcr-carrier-set-entries'));
-api.use('/Clients', require('./clients'));
-// Google Custom Voices
-api.use('/GoogleCustomVoices', require('./google-custom-voices'));
 
 // messaging
 api.use('/Smpps', require('./smpps'));   // our smpp server info

lib/routes/api/lcr-carrier-set-entries.js

@@ -1,65 +0,0 @@
-const router = require('express').Router();
-const LcrCarrierSetEntry = require('../../models/lcr-carrier-set-entry');
-const LcrRoute = require('../../models/lcr-route');
-const decorate = require('./decorate');
-const {DbErrorBadRequest} = require('../../utils/errors');
-const sysError = require('../error');
-
-const validateAdd = async(req) => {
-  const {lookupCarrierBySid} = req.app.locals;
-  if (!req.body.lcr_route_sid) {
-    throw new DbErrorBadRequest('missing lcr_route_sid');
-  }
-  // check lcr_route_sid is exist
-  const lcrRoute = await LcrRoute.retrieve(req.body.lcr_route_sid);
-  if (lcrRoute.length === 0) {
-    throw new DbErrorBadRequest('unknown lcr_route_sid');
-  }
-  // check voip_carrier_sid is exist
-  if (!req.body.voip_carrier_sid) {
-    throw new DbErrorBadRequest('missing voip_carrier_sid');
-  }
-  const carrier = await lookupCarrierBySid(req.body.voip_carrier_sid);
-  if (!carrier) {
-    throw new DbErrorBadRequest('unknown voip_carrier_sid');
-  }
-};
-
-const validateUpdate = async(req) => {
-  const {lookupCarrierBySid} = req.app.locals;
-  if (req.body.lcr_route_sid) {
-    const lcrRoute = await LcrRoute.retrieve(req.body.lcr_route_sid);
-    if (lcrRoute.length === 0) {
-      throw new DbErrorBadRequest('unknown lcr_route_sid');
-    }
-  }
-
-  // check voip_carrier_sid is exist
-  if (req.body.voip_carrier_sid) {
-    const carrier = await lookupCarrierBySid(req.body.voip_carrier_sid);
-    if (!carrier) {
-      throw new DbErrorBadRequest('unknown voip_carrier_sid');
-    }
-  }
-};
-
-const preconditions = {
-  add: validateAdd,
-  update: validateUpdate,
-};
-
-decorate(router, LcrCarrierSetEntry, ['add', 'retrieve', 'update', 'delete'], preconditions);
-
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const lcr_route_sid = req.query.lcr_route_sid;
-  try {
-    const results = await LcrCarrierSetEntry.retrieveAllByLcrRouteSid(lcr_route_sid);
-    res.status(200).json(results);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-
-module.exports = router;

lib/routes/api/lcr-routes.js

@@ -1,96 +0,0 @@
-const router = require('express').Router();
-const LcrRoute = require('../../models/lcr-route');
-const Lcr = require('../../models/lcr');
-const LcrCarrierSetEntry = require('../../models/lcr-carrier-set-entry');
-const decorate = require('./decorate');
-const {DbErrorBadRequest} = require('../../utils/errors');
-const sysError = require('../error');
-
-const validateAdd = async(req) => {
-  // check if lcr sid is available
-  if (!req.body.lcr_sid) {
-    throw new DbErrorBadRequest('missing parameter lcr_sid');
-  }
-
-  const lcr = await Lcr.retrieve(req.body.lcr_sid);
-  if (lcr.length === 0) {
-    throw new DbErrorBadRequest('unknown lcr_sid');
-  }
-};
-
-const validateUpdate = async(req) => {
-  if (req.body.lcr_sid) {
-    const lcr = await Lcr.retrieve(req.body.lcr_sid);
-    if (lcr.length === 0) {
-      throw new DbErrorBadRequest('unknown lcr_sid');
-    }
-  }
-};
-
-const validateDelete = async(req, sid) => {
-  // delete all lcr carrier set entries
-  await LcrCarrierSetEntry.deleteByLcrRouteSid(sid);
-};
-
-const checkUserScope = async(req, lcr_sid) => {
-  if (!lcr_sid) {
-    throw new DbErrorBadRequest('missing lcr_sid');
-  }
-
-  if (req.user.hasAdminAuth) return;
-
-  const lcrList = await Lcr.retrieve(lcr_sid);
-  if (lcrList.length === 0) throw new DbErrorBadRequest('unknown lcr_sid');
-  const lcr = lcrList[0];
-  if (req.user.hasAccountAuth) {
-    if (!lcr.account_sid || lcr.account_sid !== req.user.account_sid) {
-      throw new DbErrorBadRequest('unknown lcr_sid');
-    }
-  }
-
-  if (req.user.hasServiceProviderAuth) {
-    if (!lcr.service_provider_sid  || lcr.service_provider_sid !== req.user.service_provider_sid) {
-      throw new DbErrorBadRequest('unknown lcr_sid');
-    }
-  }
-};
-
-const preconditions = {
-  add: validateAdd,
-  update: validateUpdate,
-  delete: validateDelete,
-};
-
-decorate(router, LcrRoute, ['add', 'update', 'delete'], preconditions);
-
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const lcr_sid = req.query.lcr_sid;
-  try {
-    await checkUserScope(req, lcr_sid);
-    const results = await LcrRoute.retrieveAllByLcrSid(lcr_sid);
-    for (const r of results) {
-      r.lcr_carrier_set_entries = await LcrCarrierSetEntry.retrieveAllByLcrRouteSid(r.lcr_route_sid);
-    }
-    res.status(200).json(results);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.get('/:sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const lcr_route_sid = req.params.sid;
-  try {
-    const results = await LcrRoute.retrieve(lcr_route_sid);
-    if (results.length === 0) return res.sendStatus(404);
-    const route = results[0];
-    route.lcr_carrier_set_entries = await LcrCarrierSetEntry.retrieveAllByLcrRouteSid(route.lcr_route_sid);
-    res.status(200).json(route);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-
-module.exports = router;

lib/routes/api/lcrs.js

@@ -1,225 +0,0 @@
-const router = require('express').Router();
-const Lcr = require('../../models/lcr');
-const LcrCarrierSetEntry = require('../../models/lcr-carrier-set-entry');
-const LcrRoutes = require('../../models/lcr-route');
-const decorate = require('./decorate');
-const {DbErrorBadRequest} = require('../../utils/errors');
-const sysError = require('../error');
-const ServiceProvider = require('../../models/service-provider');
-
-const validateAssociatedTarget = async(req, sid) => {
-  const {lookupAccountBySid} = req.app.locals;
-  if (req.body.account_sid) {
-    // Add only for account
-    req.body.service_provider_sid = null;
-    const account = await lookupAccountBySid(req.body.account_sid);
-    if (!account) throw new DbErrorBadRequest('unknown account_sid');
-    const lcr = await Lcr.retrieveAllByAccountSid(req.body.account_sid);
-    if (lcr.length > 0 && (!sid || sid !== lcr[0].lcr_sid)) {
-      throw new DbErrorBadRequest(`Account: ${account.name}  already has an active call routing table.`);
-    }
-  } else if (req.body.service_provider_sid) {
-    const serviceProviders = await ServiceProvider.retrieve(req.body.service_provider_sid);
-    if (serviceProviders.length === 0) throw new DbErrorBadRequest('unknown service_provider_sid');
-    const serviceProvider = serviceProviders[0];
-    const lcr = await Lcr.retrieveAllByServiceProviderSid(req.body.service_provider_sid);
-    if (lcr.length > 0 && (!sid || sid !== lcr[0].lcr_sid)) {
-      throw new DbErrorBadRequest(`Service Provider: ${serviceProvider.name} already 
-      has an active call routing table.`);
-    }
-  }
-};
-
-const validateAdd = async(req) => {
-  if (req.user.hasAccountAuth) {
-    // Account just create LCR for himself
-    req.body.account_sid = req.user.account_sid;
-  } else if (req.user.hasServiceProviderAuth) {
-    // SP just can create LCR for himself
-    req.body.service_provider_sid = req.user.service_provider_sid;
-    req.body.account_sid = null;
-  }
-
-  await validateAssociatedTarget(req);
-  // check if lcr_carrier_set_entry is available
-  if (req.body.lcr_carrier_set_entry) {
-    const e = await LcrCarrierSetEntry.retrieve(req.body.lcr_carrier_set_entry);
-    if (e.length === 0) throw new DbErrorBadRequest('unknown lcr_carrier_set_entry');
-  }
-
-};
-
-const validateUserPermissionForExistingEntity = async(req, sid) => {
-  const r = await Lcr.retrieve(sid);
-  if (r.length === 0) {
-    throw new DbErrorBadRequest('unknown lcr_sid');
-  }
-  const lcr = r[0];
-  if (req.user.hasAccountAuth) {
-    if (lcr.account_sid != req.user.account_sid) {
-      throw new DbErrorBadRequest('unknown lcr_sid');
-    }
-  } else if (req.user.hasServiceProviderAuth) {
-    if (lcr.service_provider_sid != req.user.service_provider_sid) {
-      throw new DbErrorBadRequest('unknown lcr_sid');
-    }
-  }
-};
-
-const validateUpdate = async(req, sid) => {
-  await validateUserPermissionForExistingEntity(req, sid);
-  await validateAssociatedTarget(req, sid);
-};
-
-const validateDelete = async(req, sid) => {
-  if (req.user.hasAccountAuth) {
-    /* can only delete Lcr for the user's account */
-    const r = await Lcr.retrieve(sid);
-    const lcr = r.length > 0 ? r[0] : null;
-    if (!lcr || (req.user.account_sid && lcr.account_sid != req.user.account_sid)) {
-      throw new DbErrorBadRequest('unknown lcr_sid');
-    }
-  }
-  await Lcr.releaseDefaultEntry(sid);
-  // fetch lcr route
-  const lcr_routes = await LcrRoutes.retrieveAllByLcrSid(sid);
-  // delete all lcr carrier set entries
-  for (const e of lcr_routes) {
-    await LcrCarrierSetEntry.deleteByLcrRouteSid(e.lcr_route_sid);
-  }
-
-  // delete all lcr routes
-  await LcrRoutes.deleteByLcrSid(sid);
-};
-
-const preconditions = {
-  add: validateAdd,
-  update: validateUpdate,
-  delete: validateDelete
-};
-
-decorate(router, Lcr, ['add', 'update', 'delete'], preconditions);
-
-const validateLcrBatchAdd = async(lcr_sid, body, lookupCarrierBySid) => {
-  for (const lcr_route of body) {
-    lcr_route.lcr_sid = lcr_sid;
-    if (!lcr_route.lcr_carrier_set_entries || lcr_route.lcr_carrier_set_entries.length === 0) {
-      throw new DbErrorBadRequest('Lcr Route batch process require lcr_carrier_set_entries');
-    }
-    for (const entry of lcr_route.lcr_carrier_set_entries) {
-      // check voip_carrier_sid is exist
-      if (!entry.voip_carrier_sid) {
-        throw new DbErrorBadRequest('One of lcr_carrier_set_entries is missing voip_carrier_sid');
-      }
-      const carrier = await lookupCarrierBySid(entry.voip_carrier_sid);
-      if (!carrier) {
-        throw new DbErrorBadRequest('unknown voip_carrier_sid');
-      }
-    }
-  }
-};
-
-
-const addNewLcrRoute = async(lcr_route) => {
-  const lcr_sid = lcr_route.lcr_sid;
-  const lcr_carrier_set_entries = lcr_route.lcr_carrier_set_entries;
-  delete lcr_route.lcr_carrier_set_entries;
-  const lcr_route_sid = await LcrRoutes.make(lcr_route);
-  for (const entry of lcr_carrier_set_entries) {
-    entry.lcr_route_sid = lcr_route_sid;
-    const lcr_carrier_set_entry_sid = await LcrCarrierSetEntry.make(entry);
-    if (lcr_route.priority === 9999) {
-      // this is default lcr set entry
-      const [lcr] = await Lcr.retrieve(lcr_sid);
-      if (lcr) {
-        lcr.default_carrier_set_entry_sid = lcr_carrier_set_entry_sid;
-        delete lcr.lcr_sid;
-        await Lcr.update(lcr_sid, lcr);
-      }
-    }
-  }
-};
-
-router.post('/:sid/Routes', async(req, res) => {
-  const results = await Lcr.retrieve(req.params.sid);
-  if (results.length === 0) return res.sendStatus(404);
-  const {logger, lookupCarrierBySid} = req.app.locals;
-  try {
-    const body = req.body;
-    await validateLcrBatchAdd(req.params.sid, body, lookupCarrierBySid);
-    for (const lcr_route of body) {
-      await addNewLcrRoute(lcr_route, lookupCarrierBySid);
-    }
-    res.sendStatus(204);
-
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.put('/:sid/Routes', async(req, res) => {
-  const results = await Lcr.retrieve(req.params.sid);
-  if (results.length === 0) return res.sendStatus(404);
-  const {logger, lookupCarrierBySid} = req.app.locals;
-  try {
-    const body = req.body;
-    await validateLcrBatchAdd(req.params.sid, body, lookupCarrierBySid);
-    for (const lcr_route of body) {
-      if (lcr_route.lcr_route_sid) {
-        const lcr_route_sid = lcr_route.lcr_route_sid;
-        delete lcr_route.lcr_route_sid;
-        const lcr_carrier_set_entries = lcr_route.lcr_carrier_set_entries;
-        delete lcr_route.lcr_carrier_set_entries;
-        await LcrRoutes.update(lcr_route_sid, lcr_route);
-        for (const entry of lcr_carrier_set_entries) {
-          const lcr_carrier_set_entry_sid = entry.lcr_carrier_set_entry_sid;
-          delete entry.lcr_carrier_set_entry_sid;
-          await LcrCarrierSetEntry.update(lcr_carrier_set_entry_sid, entry);
-        }
-      } else {
-        // Route is not available yet, let create it now
-        await addNewLcrRoute(lcr_route, lookupCarrierBySid);
-      }
-    }
-    res.sendStatus(204);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const results = req.user.hasAdminAuth ?
-      await Lcr.retrieveAll() : req.user.hasAccountAuth ?
-        await Lcr.retrieveAllByAccountSid(req.user.hasAccountAuth ? req.user.account_sid : null) :
-        await Lcr.retrieveAllByServiceProviderSid(req.user.service_provider_sid);
-
-    for (const lcr of results) {
-      lcr.number_routes = await LcrRoutes.countAllByLcrSid(lcr.lcr_sid);
-    }
-    res.status(200).json(results);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.get('/:sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const results = await Lcr.retrieve(req.params.sid);
-    if (results.length === 0) return res.sendStatus(404);
-    const lcr = results[0];
-    if (req.user.hasAccountAuth && lcr.account_sid !== req.user.account_sid) {
-      return res.sendStatus(404);
-    } else if (req.user.hasServiceProviderAuth && lcr.service_provider_sid !== req.user.service_provider_sid) {
-      return res.sendStatus(404);
-    }
-    lcr.number_routes = await LcrRoutes.countAllByLcrSid(lcr.lcr_sid);
-    return res.status(200).json(lcr);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/limits.js

@@ -1,133 +0,0 @@
-const router = require('express').Router();
-const sysError = require('../error');
-const AccountLimits = require('../../models/account-limits');
-const ServiceProviderLimits = require('../../models/service-provider-limits');
-const {parseAccountSid, parseServiceProviderSid} = require('./utils');
-const {promisePool} = require('../../db');
-const sqlDeleteSPLimits = `
-DELETE FROM service_provider_limits 
-WHERE service_provider_sid = ? 
-`;
-const sqlDeleteSPLimitsByCategory = `
-DELETE FROM service_provider_limits 
-WHERE service_provider_sid = ? 
-AND category = ?
-`;
-const sqlDeleteAccountLimits = `
-DELETE FROM account_limits 
-WHERE account_sid = ? 
-`;
-const sqlDeleteAccountLimitsByCategory = `
-DELETE FROM account_limits 
-WHERE account_sid = ? 
-AND category = ?
-`;
-
-router.post('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const {
-    category,
-    quantity
-  } = req.body;
-
-  try {
-    let service_provider_sid;
-    const account_sid = parseAccountSid(req);
-    if (!account_sid) {
-      if (!req.user.hasServiceProviderAuth && !req.user.hasAdminAuth) {
-        logger.error('POST /SpeechCredentials invalid credentials');
-        return res.sendStatus(403);
-      }
-      service_provider_sid = parseServiceProviderSid(req);
-    }
-
-    let uuid;
-    if (account_sid) {
-      const existing = (await AccountLimits.retrieve(account_sid) || [])
-        .find((el) => el.category === category);
-      if (existing) {
-        uuid = existing.account_limits_sid;
-        await AccountLimits.update(uuid, {category, quantity});
-      }
-      else {
-        uuid = await AccountLimits.make({
-          account_sid,
-          category,
-          quantity
-        });
-      }
-    }
-    else {
-      const existing = (await ServiceProviderLimits.retrieve(service_provider_sid) || [])
-        .find((el) => el.category === category);
-      if (existing) {
-        uuid = existing.service_provider_limits_sid;
-        await ServiceProviderLimits.update(uuid, {category, quantity});
-      }
-      else {
-        uuid = await ServiceProviderLimits.make({
-          service_provider_sid,
-          category,
-          quantity
-        });
-      }
-    }
-    res.status(201).json({sid: uuid});
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-/**
- * retrieve all limits for an account or service provider
- */
-router.get('/', async(req, res) => {
-  let service_provider_sid;
-  const logger = req.app.locals.logger;
-
-  try {
-    const account_sid = parseAccountSid(req);
-    if (!account_sid) service_provider_sid = parseServiceProviderSid(req);
-    const limits = account_sid ?
-      await AccountLimits.retrieve(account_sid) :
-      await ServiceProviderLimits.retrieve(service_provider_sid);
-
-    if (req.query?.category) {
-      return res.status(200).json(limits.filter((el) => el.category === req.query.category));
-    }
-    res.status(200).json(limits);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.delete('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-
-  try {
-    const account_sid = parseAccountSid(req);
-    const {category} = req.query;
-    const service_provider_sid = parseServiceProviderSid(req);
-    if (account_sid) {
-      if (category) {
-        await promisePool.execute(sqlDeleteAccountLimitsByCategory, [account_sid, category]);
-      }
-      else {
-        await promisePool.execute(sqlDeleteAccountLimits, [account_sid]);
-      }
-    }
-    else {
-      if (category) {
-        await promisePool.execute(sqlDeleteSPLimitsByCategory, [service_provider_sid, category]);
-      }
-      else {
-        await promisePool.execute(sqlDeleteSPLimits, [service_provider_sid]);
-      }
-    }
-    res.status(204).end();
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/login.js

@@ -1,109 +1,61 @@
 const router = require('express').Router();
-const jwt = require('jsonwebtoken');
+const {getMysqlConnection} = require('../../db');
 const {verifyPassword} = require('../../utils/password-utils');
-const {promisePool} = require('../../db');
-const {cacheClient} = require('../../helpers');
-const Account = require('../../models/account');
-const ServiceProvider = require('../../models/service-provider');
-const sysError = require('../error');
-const retrievePemissionsSql = `
-SELECT p.name 
-FROM permissions p, user_permissions up 
-WHERE up.permission_sid = p.permission_sid 
-AND up.user_sid = ? 
-`;
-const retrieveSql = 'SELECT * from users where name = ?';
 
-router.post('/', async(req, res) => {
-  const {logger, incrKey, retrieveKey} = req.app.locals;
+const retrieveSql = 'SELECT * from users where name = ?';
+const tokenSql = 'SELECT token from api_keys where account_sid IS NULL AND service_provider_sid IS NULL';
+
+
+router.post('/', (req, res) => {
+  const logger = req.app.locals.logger;
   const {username, password} = req.body;
   if (!username || !password) {
     logger.info('Bad POST to /login is missing username or password');
     return res.sendStatus(400);
   }
 
-  try {
-    const [r] = await promisePool.query(retrieveSql, username);
-    if (r.length === 0) {
-      logger.info(`Failed login attempt for user ${username}`);
-      return res.sendStatus(403);
+  getMysqlConnection((err, conn) => {
+    if (err) {
+      logger.error({err}, 'Error getting db connection');
+      return res.sendStatus(500);
     }
-    logger.info({r}, 'successfully retrieved user account');
-
-    const maxLoginAttempts = process.env.LOGIN_ATTEMPTS_MAX_RETRIES || 6;
-    const loginAttempsBlocked = await retrieveKey(`login:${r[0].user_sid}`) >= maxLoginAttempts;
-
-    if (loginAttempsBlocked) {
-      logger.info(`User ${r[0].user_sid} was blocked due to excessive login attempts with incorrect credentials.`);
-      return res.status(403)
-        .json({error: 'Maximum login attempts reached. Please try again later or reset your password.'});
-    }
-
-    const isCorrect = await verifyPassword(r[0].hashed_password, password);
-    if (!isCorrect) {
-      const attempTime = process.env.LOGIN_ATTEMPTS_TIME || 1800;
-      const newAttempt = await incrKey(`login:${r[0].user_sid}`, attempTime)
-        .catch((err) => logger.error({err}, 'Error adding logging attempt to redis'));
-      if (newAttempt >= maxLoginAttempts) {
-        logger.info(`User ${r[0].user_sid} is now blocked due to excessive login attempts with incorrect credentials.`);
-        return res.status(403)
-          .json({error: `Maximum login attempts reached. Please try again in ${attempTime} seconds.`});
+    conn.query(retrieveSql, [username], async(err, results) => {
+      conn.release();
+      if (err) {
+        logger.error({err}, 'Error getting db connection');
+        return res.sendStatus(500);
+      }
+      if (0 === results.length) {
+        logger.info(`Failed login attempt for user ${username}`);
+        return res.sendStatus(403);
       }
-      return res.sendStatus(403);
-    }
-    const force_change = !!r[0].force_change;
 
-    const [p] = await promisePool.query(retrievePemissionsSql, r[0].user_sid);
-    const permissions = p.map((x) => x.name);
-    const obj = {user_sid: r[0].user_sid, scope: 'admin', force_change, permissions};
-    if (r[0].service_provider_sid && r[0].account_sid) {
-      const account = await Account.retrieve(r[0].account_sid);
-      const service_provider = await ServiceProvider.retrieve(r[0].service_provider_sid);
-      obj.scope = 'account';
-      obj.service_provider_sid = r[0].service_provider_sid;
-      obj.account_sid = r[0].account_sid;
-      obj.account_name = account[0].name;
-      obj.service_provider_name = service_provider[0].name;
-    }
-    else if (r[0].service_provider_sid) {
-      const service_provider = await ServiceProvider.retrieve(r[0].service_provider_sid);
-      obj.scope = 'service_provider';
-      obj.service_provider_sid = r[0].service_provider_sid;
-      obj.service_provider_name = service_provider[0].name;
-    }
-    const payload = {
-      scope: obj.scope,
-      permissions,
-      ...(obj.service_provider_sid && {
-        service_provider_sid: obj.service_provider_sid,
-        service_provider_name: obj.service_provider_name
-      }),
-      ...(obj.account_sid && {
-        account_sid: obj.account_sid,
-        account_name: obj.account_name,
-        service_provider_name: obj.service_provider_name
-      }),
-      user_sid: obj.user_sid
-    };
+      logger.info({results}, 'successfully retrieved account');
+      const isCorrect = await verifyPassword(results[0].hashed_password, password);
+      if (!isCorrect) return res.sendStatus(403);
 
-    const expiresIn = parseInt(process.env.JWT_EXPIRES_IN || 60) * 60;
-    const token = jwt.sign(
-      payload,
-      process.env.JWT_SECRET,
-      { expiresIn }
-    );
-    res.json({token, ...obj});
+      const force_change = !!results[0].force_change;
 
-    /* Store jwt based on user_id after successful login */
-    await cacheClient.set({
-      redisKey: cacheClient.generateRedisKey('jwt', obj.user_sid, 'v2'),
-      value: token,
-      time: expiresIn,
+      getMysqlConnection((err, conn) => {
+        if (err) {
+          logger.error({err}, 'Error getting db connection');
+          return res.sendStatus(500);
+        }
+        conn.query(tokenSql, (err, tokenResults) => {
+          conn.release();
+          if (err) {
+            logger.error({err}, 'Error getting db connection');
+            return res.sendStatus(500);
+          }
+          if (0 === tokenResults.length) {
+            logger.error('Database has no admin token provisioned...run reset_admin_password');
+            return res.sendStatus(500);
+          }
+          res.json({user_sid: results[0].user_sid, force_change, token: tokenResults[0].token});
+        });
+      });
     });
-
-  } catch (err) {
-    sysError(logger, res, err);
-  }
+  });
 });
 
 

lib/routes/api/logout.js

@@ -1,18 +1,19 @@
 const router = require('express').Router();
 const debug = require('debug')('jambonz:api-server');
-const {cacheClient} = require('../../helpers');
+const {hashString} = require('../../utils/password-utils');
 const sysError = require('../error');
 
 router.post('/', async(req, res) => {
-  const {logger} = req.app.locals;
-  const {user_sid} = req.user;
+  const {logger, addKey} = req.app.locals;
+  const {jwt} = req.user;
 
-  debug(`logout user and invalidate jwt token for user: ${user_sid}`);
+  debug(`adding jwt to blacklist: ${jwt}`);
 
   try {
-    const redisKey = cacheClient.generateRedisKey('jwt', user_sid, 'v2');
-    await cacheClient.delete(redisKey);
-
+    /* add key to blacklist */
+    const s = `jwt:${hashString(jwt)}`;
+    const result = await addKey(s, '1', 3600);
+    debug(`result from adding ${s}: ${result}`);
     res.sendStatus(204);
   } catch (err) {
     sysError(logger, res, err);

lib/routes/api/password-settings.js

@@ -1,45 +0,0 @@
-const router = require('express').Router();
-const sysError = require('../error');
-const PasswordSettings = require('../../models/password-settings');
-const { DbErrorBadRequest } = require('../../utils/errors');
-
-const validate = (obj) => {
-  if (obj.min_password_length && (
-    obj.min_password_length < 8 ||
-    obj.min_password_length > 20
-  )) {
-    throw new DbErrorBadRequest('invalid min_password_length property: should be between 8-20');
-  }
-};
-
-router.post('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    if (!req.user.hasAdminAuth) {
-      return res.sendStatus(403);
-    }
-    validate(req.body);
-    const [existing] = (await PasswordSettings.retrieve() || []);
-    if (existing) {
-      await PasswordSettings.update(req.body);
-    } else {
-      await PasswordSettings.make(req.body);
-    }
-    res.status(201).json({});
-  }
-  catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const [results] = (await PasswordSettings.retrieve() || []);
-    return res.status(200).json(results || {min_password_length: 8});
-  }
-  catch (err) {
-    sysError(logger, res, err);
-  }
-});
-module.exports = router;

lib/routes/api/phone-numbers.js

@@ -1,10 +1,8 @@
 const router = require('express').Router();
-const {DbErrorBadRequest, DbErrorForbidden} = require('../../utils/errors');
+const {DbErrorUnprocessableRequest, DbErrorBadRequest} = require('../../utils/errors');
 const PhoneNumber = require('../../models/phone-number');
 const VoipCarrier = require('../../models/voip-carrier');
-const Account = require('../../models/account');
 const decorate = require('./decorate');
-const {promisePool} = require('../../db');
 const {e164} = require('../../utils/phone-number-utils');
 const preconditions = {
   'add': validateAdd,
@@ -12,7 +10,6 @@ const preconditions = {
   'update': validateUpdate
 };
 const sysError = require('../error');
-const { parsePhoneNumberSid } = require('./utils');
 
 
 /* check for required fields when adding */
@@ -23,10 +20,6 @@ async function validateAdd(req) {
       req.body.account_sid = req.user.account_sid;
     }
 
-    if (req.user.hasServiceProviderAuth) {
-      req.body.service_provider_sid = req.user.service_provider_sid;
-    }
-
     if (!req.body.number) throw new DbErrorBadRequest('number is required');
     const formattedNumber = e164(req.body.number);
     req.body.number = formattedNumber;
@@ -48,11 +41,11 @@ async function checkInUse(req, sid) {
   const phoneNumber = await PhoneNumber.retrieve(sid);
   if (req.user.hasAccountAuth) {
     if (phoneNumber && phoneNumber.length && phoneNumber[0].account_sid !== req.user.account_sid) {
-      throw new DbErrorForbidden('insufficient privileges');
+      throw new DbErrorUnprocessableRequest('cannot delete a phone number that belongs to another account');
     }
   }
   if (!req.user.hasAccountAuth && phoneNumber.account_sid) {
-    throw new DbErrorForbidden('insufficient privileges');
+    throw new DbErrorUnprocessableRequest('cannot delete phone number that is assigned to an account');
   }
 }
 
@@ -64,23 +57,10 @@ async function validateUpdate(req, sid) {
   const phoneNumber = await PhoneNumber.retrieve(sid);
   if (req.user.hasAccountAuth) {
     if (phoneNumber && phoneNumber.length && phoneNumber[0].account_sid !== req.user.account_sid) {
-      throw new DbErrorForbidden('insufficient privileges');
+      throw new DbErrorUnprocessableRequest('cannot operate on a phone number that belongs to another account');
     }
   }
-  if (req.user.hasServiceProviderAuth) {
-    let service_provider_sid;
 
-    if (!phoneNumber[0].service_provider_sid) {
-      const [r] = await Account.retrieve(phoneNumber[0].account_sid);
-      service_provider_sid = r.service_provider_sid;
-    } else {
-      service_provider_sid = phoneNumber[0].service_provider_sid;
-    }
-
-    if (phoneNumber && phoneNumber.length && service_provider_sid !== req.user.service_provider_sid) {
-      throw new DbErrorForbidden('insufficient privileges');
-    }
-  }
   // TODO: if we are assigning to an account, verify it exists
 
   // TODO: if we are assigning to an application, verify it is associated to the same account
@@ -94,9 +74,7 @@ decorate(router, PhoneNumber, ['add', 'update', 'delete'], preconditions);
 router.get('/', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    const results = req.user.hasServiceProviderAuth ?
-      await PhoneNumber.retrieveAllForSP(req.user.service_provider_sid) :
-      await PhoneNumber.retrieveAll(req.user.hasAccountAuth ? req.user.account_sid : null);
+    const results = await PhoneNumber.retrieveAll(req.user.hasAccountAuth ? req.user.account_sid : null);
     res.status(200).json(results);
   } catch (err) {
     sysError(logger, res, err);
@@ -107,22 +85,9 @@ router.get('/', async(req, res) => {
 router.get('/:sid', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    const sid = parsePhoneNumberSid(req);
     const account_sid = req.user.hasAccountAuth ? req.user.account_sid : null;
-    const results = await PhoneNumber.retrieve(sid, account_sid);
+    const results = await PhoneNumber.retrieve(req.params.sid, account_sid);
     if (results.length === 0) return res.status(404).end();
-
-    if (req.user.hasServiceProviderAuth && results.length === 1) {
-      const account_sid = results[0].account_sid;
-      const [r] = await promisePool.execute(
-        'SELECT service_provider_sid from accounts WHERE account_sid = ?', [account_sid]);
-      if (r.length === 1 && r[0].service_provider_sid !== req.user.service_provider_sid) {
-        throw new DbErrorBadRequest('insufficient privileges');
-      }
-    }
-    if (req.user.hasAccountAuth && results.length > 1) {
-      return res.status(200).json(results.filter((r) => r.phone_number_sid === sid)[0]);
-    }
     return res.status(200).json(results[0]);
   }
   catch (err) {

lib/routes/api/recent-calls.js

@@ -1,205 +1,37 @@
 const router = require('express').Router();
 const sysError = require('../error');
 const {DbErrorBadRequest} = require('../../utils/errors');
-const {getHomerApiKey, getHomerSipTrace, getHomerPcap} = require('../../utils/homer-utils');
-const {getJaegerTrace} = require('../../utils/jaeger-utils');
-const Account = require('../../models/account');
-const {
-  getS3Object,
-  getGoogleStorageObject,
-  getAzureStorageObject,
-  deleteS3Object,
-  deleteGoogleStorageObject,
-  deleteAzureStorageObject
-} = require('../../utils/storage-utils');
 
 const parseAccountSid = (url) => {
   const arr = /Accounts\/([^\/]*)/.exec(url);
   if (arr) return arr[1];
 };
 
-const parseServiceProviderSid = (url) => {
-  const arr = /ServiceProviders\/([^\/]*)/.exec(url);
-  if (arr) return arr[1];
-};
-
 router.get('/', async(req, res) => {
-  const {logger, queryCdrs, queryCdrsSP} = req.app.locals;
+  const {logger, queryCdrs} = req.app.locals;
   try {
     logger.debug({opts: req.query}, 'GET /RecentCalls');
     const account_sid = parseAccountSid(req.originalUrl);
-    const service_provider_sid = account_sid ? null : parseServiceProviderSid(req.originalUrl);
-    const {page, count, trunk, direction, days, answered, start, end, filter} = req.query || {};
+    const {page, count, trunk, direction, days, answered, start, end} = req.query || {};
     if (!page || page < 1) throw new DbErrorBadRequest('missing or invalid "page" query arg');
     if (!count || count < 25 || count > 500) throw new DbErrorBadRequest('missing or invalid "count" query arg');
 
-    if (account_sid) {
-      const data = await queryCdrs({
-        account_sid,
-        page,
-        page_size: count,
-        trunk,
-        direction,
-        days,
-        answered,
-        start: days ? undefined : start,
-        end: days ? undefined : end,
-        filter
-      });
-      res.status(200).json(data);
-    }
-    else {
-      const data = await queryCdrsSP({
-        service_provider_sid,
-        page,
-        page_size: count,
-        trunk,
-        direction,
-        days,
-        answered,
-        start: days ? undefined : start,
-        end: days ? undefined : end,
-        filter
-      });
-      res.status(200).json(data);
-    }
+    const data = await queryCdrs({
+      account_sid,
+      page,
+      page_size: count,
+      trunk,
+      direction,
+      days,
+      answered,
+      start: days ? undefined : start,
+      end: days ? undefined : end,
+    });
+
+    res.status(200).json(data);
   } catch (err) {
     sysError(logger, res, err);
   }
 });
 
-router.get('/:call_id', async(req, res) => {
-  const {logger} = req.app.locals;
-  try {
-    const token = await getHomerApiKey(logger);
-    if (!token) return res.sendStatus(400, {msg: 'Failed to get Homer API token; check server config'});
-    const obj = await getHomerSipTrace(logger, token, req.params.call_id);
-    if (!obj) {
-      logger.info(`/RecentCalls: unable to get sip traces from Homer for ${req.params.call_id}`);
-      return res.sendStatus(404);
-    }
-    res.status(200).json(obj);
-  } catch (err) {
-    logger.error({err}, '/RecentCalls error retrieving sip traces from homer');
-    res.sendStatus(err.statusCode || 500);
-  }
-});
-
-router.get('/:call_id/:method/pcap', async(req, res) => {
-  const {logger} = req.app.locals;
-  try {
-    const token = await getHomerApiKey(logger);
-    if (!token) return res.sendStatus(400, {msg: 'getHomerApiKey: Failed to get Homer API token; check server config'});
-    const stream = await getHomerPcap(logger, token, [req.params.call_id], req.params.method);
-    if (!stream) {
-      logger.info(`getHomerApiKey: unable to get sip traces from Homer for ${req.params.call_id}`);
-      return res.sendStatus(404);
-    }
-    res.set({
-      'Content-Type': 'application/octet-stream',
-      'Content-Disposition': `attachment; filename=callid-${req.params.call_id}.pcap`
-    });
-    stream.pipe(res);
-  } catch (err) {
-    logger.error({err}, 'getHomerApiKey error retrieving sip traces from homer');
-    res.sendStatus(err.statusCode || 500);
-  }
-});
-
-router.get('/trace/:trace_id', async(req, res) => {
-  const {logger} = req.app.locals;
-  const {trace_id} = req.params;
-  try {
-    const obj = await getJaegerTrace(logger, trace_id);
-    if (!obj) {
-      logger.info(`/RecentCalls: unable to get spans from jaeger for ${trace_id}`);
-      return res.sendStatus(404);
-    }
-    res.status(200).json(obj.result);
-  } catch (err) {
-    logger.error({err}, `/RecentCalls error retrieving jaeger trace ${trace_id}`);
-    res.sendStatus(500);
-  }
-});
-
-router.get('/:call_sid/record/:year/:month/:day/:format', async(req, res) => {
-  const {logger} = req.app.locals;
-  const {call_sid, year, month, day, format} = req.params;
-
-  try {
-    const account_sid = parseAccountSid(req.originalUrl);
-    const r = await Account.retrieve(account_sid);
-    if (r.length === 0 || !r[0].bucket_credential) return res.sendStatus(404);
-    const {bucket_credential} = r[0];
-    const getOptions  = {
-      ...bucket_credential,
-      key: `${year}/${month}/${day}/${call_sid}.${format || 'mp3'}`
-    };
-    let stream;
-    switch (bucket_credential.vendor) {
-      case 'aws_s3':
-      case 's3_compatible':
-        stream = await getS3Object(logger, getOptions);
-        break;
-      case 'google':
-        stream = await getGoogleStorageObject(logger, getOptions);
-        break;
-      case 'azure':
-        stream = await getAzureStorageObject(logger, getOptions);
-        break;
-      default:
-        logger.error(`There is no handler for fetching record from ${bucket_credential.vendor}`);
-        return res.sendStatus(500);
-    }
-    res.set({
-      'Content-Type': `audio/${format || 'mp3'}`
-    });
-    if (stream) {
-      stream.pipe(res);
-    } else {
-      return res.sendStatus(404);
-    }
-  }  catch (err) {
-    logger.error({err}, ` error retrieving recording ${call_sid}`);
-    res.sendStatus(404);
-  }
-});
-
-router.delete('/:call_sid/record/:year/:month/:day/:format', async(req, res) => {
-  const {logger} = req.app.locals;
-  const {call_sid, year, month, day, format} = req.params;
-
-  try {
-    const account_sid = parseAccountSid(req.originalUrl);
-    const r = await Account.retrieve(account_sid);
-    if (r.length === 0 || !r[0].bucket_credential) return res.sendStatus(404);
-    const {bucket_credential} = r[0];
-
-    const deleteOptions  = {
-      ...bucket_credential,
-      key: `${year}/${month}/${day}/${call_sid}.${format || 'mp3'}`
-    };
-
-    switch (bucket_credential.vendor) {
-      case 'aws_s3':
-      case 's3_compatible':
-        await deleteS3Object(logger, deleteOptions);
-        break;
-      case 'google':
-        await deleteGoogleStorageObject(logger, deleteOptions);
-        break;
-      case 'azure':
-        await deleteAzureStorageObject(logger, deleteOptions);
-        break;
-      default:
-        logger.error(`There is no handler for deleting record from ${bucket_credential.vendor}`);
-        return res.sendStatus(500);
-    }
-    res.sendStatus(204);
-  }  catch (err) {
-    logger.error({err}, ` error deleting recording ${call_sid}`);
-    res.sendStatus(404);
-  }
-});
-
 module.exports = router;

lib/routes/api/register.js

@@ -4,8 +4,7 @@ const {DbErrorBadRequest, DbErrorUnprocessableRequest} = require('../../utils/er
 const {promisePool} = require('../../db');
 const {doGithubAuth, doGoogleAuth, doLocalAuth} = require('../../utils/oauth-utils');
 const {validateEmail} = require('../../utils/email-utils');
-const {cacheClient} = require('../../helpers');
-const { v4: uuid } = require('uuid');
+const uuid = require('uuid').v4;
 const short = require('short-uuid');
 const translator = short();
 const jwt = require('jsonwebtoken');
@@ -16,19 +15,11 @@ const insertUserSql = `INSERT into users
 (user_sid, account_sid, name, email, provider, provider_userid, email_validated) 
 values (?, ?, ?, ?, ?, ?, 1)`;
 const insertUserLocalSql = `INSERT into users 
-(user_sid, account_sid, name, email, email_activation_code, email_validated, provider,
-hashed_password, service_provider_sid) 
-values (?, ?, ?, ?, ?, 0, 'local', ?, ?)`;
+(user_sid, account_sid, name, email, email_activation_code, email_validated, provider, hashed_password) 
+values (?, ?, ?, ?, ?, 0, 'local', ?)`;
 const insertAccountSql = `INSERT into accounts 
 (account_sid, service_provider_sid, name, is_active, webhook_secret, trial_end_date) 
 values (?, ?, ?, ?, ?, CURDATE() + INTERVAL 21 DAY)`;
-const insertWebookSql = `INSERT INTO webhooks (webhook_sid, url, method) 
-VALUES (?, ?, ?)`;
-const insertApplicationSql = `INSERT INTO applications 
-(application_sid, account_sid, name, call_hook_sid, call_status_hook_sid, 
-speech_synthesis_vendor, speech_synthesis_language, speech_synthesis_voice, 
-speech_recognizer_vendor, speech_recognizer_language)
-VALUES (?,?,?,?,?,?,?,?,?,?)`;
 const queryRootDomainSql = `SELECT root_domain 
 FROM service_providers 
 WHERE service_providers.service_provider_sid = ?`;
@@ -37,7 +28,7 @@ const insertSignupHistorySql = `INSERT into signup_history
 values (?, ?)`;
 
 const addLocalUser = async(logger, user_sid, account_sid,
-  name, email, email_activation_code, passwordHash, service_provider_sid) => {
+  name, email, email_activation_code, passwordHash) => {
   const [r] = await promisePool.execute(insertUserLocalSql,
     [
       user_sid,
@@ -45,8 +36,7 @@ const addLocalUser = async(logger, user_sid, account_sid,
       name,
       email,
       email_activation_code,
-      passwordHash,
-      service_provider_sid
+      passwordHash
     ]);
   debug({r}, 'Result from adding user');
 };
@@ -147,7 +137,7 @@ router.post('/', async(req, res) => {
       const user = await doGithubAuth(logger, req.body);
       logger.info({user}, 'retrieved user details from github');
       Object.assign(userProfile, {
-        name: user.email,
+        name: user.name,
         email: user.email,
         email_validated: user.email_validated,
         avatar_url: user.avatar_url,
@@ -159,7 +149,7 @@ router.post('/', async(req, res) => {
       const user = await doGoogleAuth(logger, req.body);
       logger.info({user}, 'retrieved user details from google');
       Object.assign(userProfile, {
-        name: user.email || user.email,
+        name: user.name,
         email: user.email,
         email_validated: user.verified_email,
         picture: user.picture,
@@ -172,7 +162,7 @@ router.post('/', async(req, res) => {
       logger.info({user}, 'retrieved user details for local provider');
       debug({user}, 'retrieved user details for local provider');
       Object.assign(userProfile, {
-        name: user.email,
+        name: user.name,
         email: user.email,
         provider: 'local',
         email_activation_code: user.email_activation_code
@@ -282,8 +272,7 @@ router.post('/', async(req, res) => {
         const passwordHash = await generateHashedPassword(req.body.password);
         debug(`hashed password: ${passwordHash}`);
         await addLocalUser(logger, userProfile.user_sid, userProfile.account_sid,
-          userProfile.name, userProfile.email, userProfile.email_activation_code,
-          passwordHash, req.body.service_provider_sid);
+          userProfile.name, userProfile.email, userProfile.email_activation_code, passwordHash);
         debug('added local user');
       }
       else {
@@ -292,30 +281,6 @@ router.post('/', async(req, res) => {
           userProfile.provider_userid);
       }
 
-      /* add hello-world and dial-time as starter applications */
-      const callStatusSid = uuid();
-      const helloWordSid = uuid();
-      const dialTimeSid = uuid();
-      const echoSid = uuid();
-
-      /* 4 webhooks */
-      await promisePool.execute(insertWebookSql,
-        [callStatusSid, 'https://public-apps.jambonz.cloud/call-status', 'POST']);
-      await promisePool.execute(insertWebookSql,
-        [helloWordSid, 'https://public-apps.jambonz.cloud/hello-world', 'POST']);
-      await promisePool.execute(insertWebookSql,
-        [dialTimeSid, 'https://public-apps.jambonz.cloud/dial-time', 'POST']);
-      await promisePool.execute(insertWebookSql,
-        [echoSid, 'https://public-apps.jambonz.cloud/echo', 'POST']);
-
-      /* 2 applications */
-      await promisePool.execute(insertApplicationSql, [uuid(), userProfile.account_sid, 'hello world',
-        helloWordSid, callStatusSid, 'google', 'en-US', 'en-US-Wavenet-C', 'google', 'en-US']);
-      await promisePool.execute(insertApplicationSql, [uuid(), userProfile.account_sid, 'dial time clock',
-        dialTimeSid, callStatusSid, 'google', 'en-US', 'en-US-Wavenet-C', 'google', 'en-US']);
-      await promisePool.execute(insertApplicationSql, [uuid(), userProfile.account_sid, 'simple echo test',
-        echoSid, callStatusSid, 'google', 'en-US', 'en-US-Wavenet-C', 'google', 'en-US']);
-
       Object.assign(userProfile, {
         pristine: true,
         is_active: req.body.provider !== 'local',
@@ -338,7 +303,7 @@ router.post('/', async(req, res) => {
 
         await addLocalUser(logger, userProfile.user_sid, userProfile.account_sid,
           userProfile.name, userProfile.email, userProfile.email_activation_code,
-          passwordHash, req.body.service_provider_sid);
+          passwordHash);
 
         /* note: we deactivate the old user once the new email is validated */
       }
@@ -350,21 +315,16 @@ router.post('/', async(req, res) => {
         /* deactivate the old/replaced user */
         const [r] = await promisePool.execute('DELETE FROM users WHERE user_sid = ?', [user_sid]);
         logger.debug({r}, 'register - removed old user');
-        const redisKey = cacheClient.generateRedisKey('jwt', user_sid, 'v2');
-        await cacheClient.delete(redisKey);
       }
     }
 
-    const expiresIn = parseInt(process.env.JWT_EXPIRES_IN || 60) * 60 ;
     // generate a json web token for this user
     const token = jwt.sign({
       user_sid: userProfile.user_sid,
       account_sid: userProfile.account_sid,
-      service_provider_sid: req.body.service_provider_sid,
-      scope: 'account',
       email: userProfile.email,
       name: userProfile.name
-    }, process.env.JWT_SECRET, { expiresIn });
+    }, process.env.JWT_SECRET, { expiresIn: '1h' });
 
     logger.debug({
       user_sid: userProfile.user_sid,
@@ -373,13 +333,6 @@ router.post('/', async(req, res) => {
 
     res.json({jwt: token, ...userProfile});
 
-    /* Store jwt based on user_id after successful login */
-    await cacheClient.set({
-      redisKey: cacheClient.generateRedisKey('jwt', userProfile.user_sid, 'v2'),
-      value: token,
-      time: expiresIn,
-    });
-
   } catch (err) {
     debug(err, 'Error');
     sysError(logger, res, err);

lib/routes/api/sbcs.js

@@ -2,46 +2,25 @@ const router = require('express').Router();
 const Sbc = require('../../models/sbc');
 const decorate = require('./decorate');
 const sysError = require('../error');
-const {DbErrorBadRequest} = require('../../utils/errors');
-const {promisePool} = require('../../db');
+//const {DbErrorBadRequest} = require('../../utils/errors');
+//const {promisePool} = require('../../db');
 
-const validate = (req, res) => {
-  if (req.user.hasScope('admin')) return;
-  res.status(403).json({
-    status: 'fail',
-    message: 'insufficient privileges'
-  });
-};
-
-const preconditions = {
-  'add': validate,
-  'delete': validate
-};
-
-decorate(router, Sbc, ['add', 'delete'], preconditions);
+decorate(router, Sbc, ['add', 'delete']);
 
 /* list */
 router.get('/', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    let service_provider_sid = req.query.service_provider_sid;
-
+    const service_provider_sid = req.query.service_provider_sid;
+    /*
     if (req.user.hasAccountAuth) {
       const [r] = await promisePool.query('SELECT * from accounts WHERE account_sid = ?', req.user.account_sid);
-      if (0 === r.length) throw new DbErrorBadRequest('invalid account_sid');
-
+      if (0 === r.length) throw new Error('invalid account_sid');
       service_provider_sid = r[0].service_provider_sid;
     }
-
-    if (req.user.hasServiceProviderAuth) {
-      service_provider_sid = req.user.service_provider_sid;
-    }
-
-    /** generally, we have a global set of SBCs that all accounts use.
-     * However, we can have a set of SBCs that are specific for use by a service provider.
-     */
-    let results = await Sbc.retrieveAll(service_provider_sid);
-    if (results.length === 0) results = await Sbc.retrieveAll();
+    if (!service_provider_sid) throw new DbErrorBadRequest('missing service_provider_sid in query');
+    */
+    const results = await Sbc.retrieveAll(service_provider_sid);
     res.status(200).json(results);
   } catch (err) {
     sysError(logger, res, err);

lib/routes/api/service-providers.js

@@ -1,144 +1,31 @@
 const router = require('express').Router();
-const {promisePool} = require('../../db');
-const {DbErrorForbidden} = require('../../utils/errors');
+const {DbErrorUnprocessableRequest} = require('../../utils/errors');
 const Webhook = require('../../models/webhook');
 const ServiceProvider = require('../../models/service-provider');
 const Account = require('../../models/account');
 const VoipCarrier = require('../../models/voip-carrier');
-const Application = require('../../models/application');
-const PhoneNumber = require('../../models/phone-number');
-const ApiKey = require('../../models/api-key');
-const {
-  hasServiceProviderPermissions,
-  parseServiceProviderSid,
-  parseVoipCarrierSid,
-} = require('./utils');
+const {hasServiceProviderPermissions, parseServiceProviderSid} = require('./utils');
 const sysError = require('../error');
 const decorate = require('./decorate');
 const preconditions = {
-  'delete': noActiveAccountsOrUsers
+  'delete': noActiveAccounts
 };
-const sqlDeleteSipGateways = `DELETE from sip_gateways 
-WHERE voip_carrier_sid IN (
-  SELECT voip_carrier_sid 
-  FROM voip_carriers 
-  WHERE service_provider_sid = ?
-)`;
-const sqlDeleteSmppGateways = `DELETE from smpp_gateways 
-WHERE voip_carrier_sid IN (
-  SELECT voip_carrier_sid 
-  FROM voip_carriers 
-  WHERE service_provider_sid = ?
-)`;
 
-/* only admin users can add a service provider */
-function validateAdd(req) {
-  if (!req.user.hasAdminAuth) {
-    throw new DbErrorForbidden('only admin users can add a service provider');
-  }
-}
-
-async function validateRetrieve(req) {
-  try {
-    const service_provider_sid = parseServiceProviderSid(req);
-
-    if (req.user.hasScope('admin')) {
-      return;
-    }
-
-    if (req.user.hasScope('service_provider') || req.user.hasScope('account')) {
-      if (service_provider_sid === req.user.service_provider_sid) return;
-    }
-
-    throw new DbErrorForbidden('insufficient permissions');
-  } catch (error) {
-    throw error;
-  }
-}
-
-function validateUpdate(req) {
-  try {
-    const service_provider_sid = parseServiceProviderSid(req);
-
-    if (req.user.hasScope('admin')) {
-      return;
-    }
-
-    if (req.user.hasScope('service_provider')) {
-      if (service_provider_sid === req.user.service_provider_sid) return;
-    }
-
-    throw new DbErrorForbidden('insufficient permissions to update service provider');
-  } catch (error) {
-    throw error;
-  }
-}
-
-/* can not delete a service provider if it has any active accounts or users*/
-async function noActiveAccountsOrUsers(req, sid) {
-  if (!req.user.hasAdminAuth) {
-    throw new DbErrorForbidden('only admin users can delete a service provider');
-  }
+/* can not delete a service provider if it has any active accounts */
+async function noActiveAccounts(req, sid) {
   const activeAccounts = await ServiceProvider.getForeignKeyReferences('accounts.service_provider_sid', sid);
-  const activeUsers = await ServiceProvider.getForeignKeyReferences('users.service_provider_sid', sid);
-  if (activeAccounts > 0 && activeUsers > 0) throw new DbErrorForbidden('insufficient privileges');
-
-  if (activeAccounts > 0) throw new DbErrorForbidden('insufficient privileges');
-  if (activeUsers > 0) throw new DbErrorForbidden('insufficient privileges');
-
-  /* ok we can delete -- no active accounts.  remove carriers and speech credentials */
-  await promisePool.execute('DELETE from speech_credentials WHERE service_provider_sid = ?', [sid]);
-  await promisePool.query(sqlDeleteSipGateways, [sid]);
-  await promisePool.query(sqlDeleteSmppGateways, [sid]);
-  await promisePool.query('DELETE from voip_carriers WHERE service_provider_sid = ?', [sid]);
-  await promisePool.query('DELETE from api_keys WHERE service_provider_sid = ?', [sid]);
+  if (activeAccounts > 0) throw new DbErrorUnprocessableRequest('cannot delete service provider with active accounts');
 }
 
 decorate(router, ServiceProvider, ['delete'], preconditions);
 
-router.use('/:sid/RecentCalls', hasServiceProviderPermissions, require('./recent-calls'));
-router.use('/:sid/Alerts', hasServiceProviderPermissions, require('./alerts'));
-router.use('/:sid/SpeechCredentials', require('./speech-credentials'));
-router.use('/:sid/Limits', hasServiceProviderPermissions, require('./limits'));
+router.use('/:sid/SpeechCredentials', hasServiceProviderPermissions, require('./speech-credentials'));
 router.use('/:sid/PredefinedCarriers', hasServiceProviderPermissions, require('./add-from-predefined-carrier'));
 router.get('/:sid/Accounts', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    await validateRetrieve(req);
     const service_provider_sid = parseServiceProviderSid(req);
-    let results = await Account.retrieveAll(service_provider_sid);
-    if (req.user.hasScope('account')) {
-      results = results.filter((r) => r.account_sid === req.user.account_sid);
-    }
-    res.status(200).json(results);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.get('/:sid/Applications', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    await validateRetrieve(req);
-    const service_provider_sid = parseServiceProviderSid(req);
-    let results = await Application.retrieveAll(service_provider_sid);
-    if (req.user.hasScope('account')) {
-      results = results.filter((r) => r.account_sid === req.user.account_sid);
-    }
-    res.status(200).json(results);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-router.get('/:sid/PhoneNumbers', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    await validateRetrieve(req);
-    const service_provider_sid = parseServiceProviderSid(req);
-    let results = await PhoneNumber.retrieveAllForSP(service_provider_sid);
-    if (req.user.hasScope('account')) {
-      results = results.filter((r) => r.account_sid === req.user.account_sid);
-    }
+    const results = await Account.retrieveAll(service_provider_sid);
     res.status(200).json(results);
   } catch (err) {
     sysError(logger, res, err);
@@ -147,15 +34,9 @@ router.get('/:sid/PhoneNumbers', async(req, res) => {
 router.get('/:sid/VoipCarriers', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    await validateRetrieve(req);
     const service_provider_sid = parseServiceProviderSid(req);
-    const carriers = await VoipCarrier.retrieveAllForSP(service_provider_sid);
-
-    if (req.user.hasScope('account')) {
-      return res.status(200).json(carriers.filter((c) => c.account_sid === req.user.account_sid || !c.account_sid));
-    }
-
-    res.status(200).json(carriers);
+    const results = await VoipCarrier.retrieveAllForSP(service_provider_sid);
+    res.status(200).json(results);
   } catch (err) {
     sysError(logger, res, err);
   }
@@ -163,7 +44,6 @@ router.get('/:sid/VoipCarriers', async(req, res) => {
 router.post('/:sid/VoipCarriers', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    validateUpdate(req);
     const service_provider_sid = parseServiceProviderSid(req);
     const uuid = await VoipCarrier.make({...req.body, service_provider_sid});
     res.status(201).json({sid: uuid});
@@ -174,9 +54,7 @@ router.post('/:sid/VoipCarriers', async(req, res) => {
 router.put('/:sid/VoipCarriers/:voip_carrier_sid', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    validateUpdate(req);
-    const sid = parseVoipCarrierSid(req);
-    const rowsAffected = await VoipCarrier.update(sid, req.body);
+    const rowsAffected = await VoipCarrier.update(req.params.voip_carrier_sid, req.body);
     if (rowsAffected === 0) {
       return res.sendStatus(404);
     }
@@ -185,17 +63,12 @@ router.put('/:sid/VoipCarriers/:voip_carrier_sid', async(req, res) => {
     sysError(logger, res, err);
   }
 });
-router.get('/:sid/ApiKeys', async(req, res) => {
+router.get(':sid/Acccounts', async(req, res) => {
   const logger = req.app.locals.logger;
-  const {sid} = req.params;
   try {
-    await validateRetrieve(req);
-    let results = await ApiKey.retrieveAllForSP(sid);
-    if (req.user.hasScope('account')) {
-      results = results.filter((r) => r.account_sid === req.user.account_sid);
-    }
+    const service_provider_sid = parseServiceProviderSid(req);
+    const results = await Account.retrieveAll(service_provider_sid);
     res.status(200).json(results);
-    await ApiKey.updateLastUsed(sid);
   } catch (err) {
     sysError(logger, res, err);
   }
@@ -205,7 +78,7 @@ router.get('/:sid/ApiKeys', async(req, res) => {
 router.post('/', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    validateAdd(req);
+
     // create webhooks if provided
     const obj = Object.assign({}, req.body);
     for (const prop of ['registration_hook']) {
@@ -228,12 +101,6 @@ router.get('/', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
     const results = await ServiceProvider.retrieveAll();
-    logger.debug({results, user: req.user}, 'ServiceProvider.retrieveAll');
-    if (req.user.hasScope('service_provider') || req.user.hasScope('account')) {
-      logger.debug(`Filtering results for ${req.user.service_provider_sid}`);
-      return res.status(200).json(results.filter((e) => req.user.service_provider_sid === e.service_provider_sid));
-    }
-
     res.status(200).json(results);
   } catch (err) {
     sysError(logger, res, err);
@@ -244,9 +111,7 @@ router.get('/', async(req, res) => {
 router.get('/:sid', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    await validateRetrieve(req);
-    const sid = parseServiceProviderSid(req);
-    const results = await ServiceProvider.retrieve(sid);
+    const results = await ServiceProvider.retrieve(req.params.sid);
     if (results.length === 0) return res.status(404).end();
     return res.status(200).json(results[0]);
   }
@@ -257,11 +122,9 @@ router.get('/:sid', async(req, res) => {
 
 /* update */
 router.put('/:sid', async(req, res) => {
+  const sid = req.params.sid;
   const logger = req.app.locals.logger;
   try {
-    validateUpdate(req);
-    const sid = parseServiceProviderSid(req);
-
     // create webhooks if provided
     const obj = Object.assign({}, req.body);
     for (const prop of ['registration_hook']) {
@@ -270,14 +133,15 @@ router.put('/:sid', async(req, res) => {
           const sid = obj[prop]['webhook_sid'];
           delete obj[prop]['webhook_sid'];
           await Webhook.update(sid, obj[prop]);
-        } else {
+        }
+        else {
           const sid = await Webhook.make(obj[prop]);
           obj[`${prop}_sid`] = sid;
         }
-      } else {
+      }
+      else {
         obj[`${prop}_sid`] = null;
       }
-
       delete obj[prop];
     }
 
@@ -285,7 +149,6 @@ router.put('/:sid', async(req, res) => {
     if (rowsAffected === 0) {
       return res.status(404).end();
     }
-
     res.status(204).end();
   } catch (err) {
     sysError(logger, res, err);

lib/routes/api/signin.js

@@ -3,17 +3,10 @@ const router = require('express').Router();
 const {DbErrorBadRequest} = require('../../utils/errors');
 const {promisePool} = require('../../db');
 const {verifyPassword} = require('../../utils/password-utils');
-const {cacheClient} = require('../../helpers');
 const jwt = require('jsonwebtoken');
 const sysError = require('../error');
-const retrievePermissionsSql = `
-SELECT p.name 
-FROM permissions p, user_permissions up 
-WHERE up.permission_sid = p.permission_sid 
-AND up.user_sid = ? 
-`;
 
-const validateRequest = (req) => {
+const validateRequest = async(req) => {
   const {email, password} = req.body || {};
 
   /* check required properties are there */
@@ -59,7 +52,6 @@ router.post('/', async(req, res) => {
       email: user.email,
       phone: user.phone,
       account_sid: user.account_sid,
-      service_provider_sid: a[0].service_provider_sid,
       force_change: !!user.force_change,
       provider: user.provider,
       provider_userid: user.provider_userid,
@@ -72,22 +64,11 @@ router.post('/', async(req, res) => {
       pristine: false
     });
 
-    const [p] = await promisePool.query(retrievePermissionsSql, user.user_sid);
-    const permissions = p.map((x) => x.name);
-
-    const expiresIn = parseInt(process.env.JWT_EXPIRES_IN || 60) * 60;
     // generate a json web token for this session
-    const payload = {
-      scope: 'account',
-      permissions,
+    const token = jwt.sign({
       user_sid: userProfile.user_sid,
-      account_sid: userProfile.account_sid,
-      service_provider_sid: userProfile.service_provider_sid
-    };
-    const token = jwt.sign(payload,
-      process.env.JWT_SECRET,
-      { expiresIn }
-    );
+      account_sid: userProfile.account_sid
+    }, process.env.JWT_SECRET, { expiresIn: '1h' });
 
     logger.debug({
       user_sid: userProfile.user_sid,
@@ -95,14 +76,6 @@ router.post('/', async(req, res) => {
     }, 'generated jwt');
 
     res.json({jwt: token, ...userProfile});
-
-    /* Store jwt based on user_id after successful login */
-    await cacheClient.set({
-      redisKey: cacheClient.generateRedisKey('jwt', userProfile.user_sid, 'v2'),
-      value: token,
-      time: expiresIn,
-    });
-
   } catch (err) {
     sysError(logger, res, err);
   }

lib/routes/api/sip-gateways.js

@@ -1,46 +1,11 @@
 const router = require('express').Router();
 const SipGateway = require('../../models/sip-gateway');
-const {DbErrorBadRequest, DbErrorForbidden} = require('../../utils/errors');
-//const {parseSipGatewaySid} = require('./utils');
+const {DbErrorBadRequest, DbErrorUnprocessableRequest} = require('../../utils/errors');
 const decorate = require('./decorate');
 const sysError = require('../error');
 
-const checkUserScope = async(req, voip_carrier_sid) => {
-  const {lookupCarrierBySid} = req.app.locals;
-  if (!voip_carrier_sid) {
-    throw new DbErrorBadRequest('missing voip_carrier_sid');
-  }
-
-  if (req.user.hasAdminAuth) return;
-  if (req.user.hasAccountAuth) {
-    const carrier = await lookupCarrierBySid(voip_carrier_sid);
-    if (!carrier) throw new DbErrorBadRequest('invalid voip_carrier_sid');
-
-    if ((!carrier.service_provider_sid || carrier.service_provider_sid === req.user.service_provider_sid) &&
-      (!carrier.account_sid || carrier.account_sid === req.user.account_sid)) {
-
-      if (req.method !== 'GET' && !carrier.account_sid) {
-        throw new DbErrorForbidden('insufficient privileges');
-      }
-
-      return;
-    }
-  }
-  if (req.user.hasServiceProviderAuth) {
-    const carrier = await lookupCarrierBySid(voip_carrier_sid);
-    if (!carrier) {
-      throw new DbErrorBadRequest('invalid voip_carrier_sid');
-    }
-
-    if (carrier.service_provider_sid === req.user.service_provider_sid) {
-      return;
-    }
-  }
-  throw new DbErrorForbidden('insufficient privileges');
-};
-
 const validate = async(req, sid) => {
-  const {lookupSipGatewayBySid} = req.app.locals;
+  const {lookupCarrierBySid, lookupSipGatewayBySid} = req.app.locals;
   let voip_carrier_sid;
 
   if (sid) {
@@ -52,7 +17,13 @@ const validate = async(req, sid) => {
     voip_carrier_sid = req.body.voip_carrier_sid;
     if (!voip_carrier_sid) throw new DbErrorBadRequest('missing voip_carrier_sid');
   }
-  await checkUserScope(req, voip_carrier_sid);
+  if (req.hasAccountAuth) {
+    const carrier = await lookupCarrierBySid(voip_carrier_sid);
+    if (!carrier) throw new DbErrorBadRequest('invalid voip_carrier_sid');
+    if (carrier.account_sid !== req.user.account_sid) {
+      throw new DbErrorUnprocessableRequest('user can not add gateway for voip_carrier belonging to other account');
+    }
+  }
 };
 
 const preconditions = {
@@ -68,7 +39,6 @@ router.get('/', async(req, res) => {
   const logger = req.app.locals.logger;
   const voip_carrier_sid = req.query.voip_carrier_sid;
   try {
-    await checkUserScope(req, voip_carrier_sid);
     if (!voip_carrier_sid) {
       logger.info('GET /SipGateways missing voip_carrier_sid param');
       return res.status(400).json({message: 'missing voip_carrier_sid query param'});

lib/routes/api/sip-realm.js

@@ -2,7 +2,7 @@ const router = require('express').Router();
 const {promisePool} = require('../../db');
 const {DbErrorBadRequest} = require('../../utils/errors');
 const {createDnsRecords, deleteDnsRecords} = require('../../utils/dns-utils');
-const { v4: uuid } = require('uuid');
+const uuid = require('uuid').v4;
 const sysError = require('../error');
 const insertDnsRecords = `INSERT INTO dns_records 
 (dns_record_sid, account_sid, record_type, record_id) 

lib/routes/api/smpp-gateways.js

@@ -1,38 +1,11 @@
 const router = require('express').Router();
-const SmppGateway = require('../../models/smpp-gateway');
-const {DbErrorBadRequest, DbErrorForbidden} = require('../../utils/errors');
+const SmppGateway = require('../../models/smpp_gateway');
+const {DbErrorBadRequest, DbErrorUnprocessableRequest} = require('../../utils/errors');
 const decorate = require('./decorate');
 const sysError = require('../error');
 
-const checkUserScope = async(req, voip_carrier_sid) => {
-  const {lookupCarrierBySid} = req.app.locals;
-  if (!voip_carrier_sid) {
-    throw new DbErrorBadRequest('missing voip_carrier_sid');
-  }
-
-  if (req.user.hasAdminAuth) return;
-
-  if (req.user.hasAccountAuth) {
-    const carrier = await lookupCarrierBySid(voip_carrier_sid);
-    if (!carrier) throw new DbErrorBadRequest('invalid voip_carrier_sid');
-
-    if ((!carrier.service_provider_sid || carrier.service_provider_sid === req.user.service_provider_sid) &&
-      (!carrier.account_sid || carrier.account_sid === req.user.account_sid)) {
-      return;
-    }
-  }
-  if (req.user.hasServiceProviderAuth) {
-    const carrier = await lookupCarrierBySid(voip_carrier_sid);
-    if (!carrier) throw new DbErrorBadRequest('invalid voip_carrier_sid');
-    if (carrier.service_provider_sid === req.user.service_provider_sid) {
-      return;
-    }
-  }
-  throw new DbErrorForbidden('insufficient privileges');
-};
-
 const validate = async(req, sid) => {
-  const {lookupSmppGatewayBySid} = req.app.locals;
+  const {lookupCarrierBySid, lookupSmppGatewayBySid} = req.app.locals;
   let voip_carrier_sid;
 
   if (sid) {
@@ -44,8 +17,13 @@ const validate = async(req, sid) => {
     voip_carrier_sid = req.body.voip_carrier_sid;
     if (!voip_carrier_sid) throw new DbErrorBadRequest('missing voip_carrier_sid');
   }
-
-  await checkUserScope(req, voip_carrier_sid);
+  if (req.hasAccountAuth) {
+    const carrier = await lookupCarrierBySid(voip_carrier_sid);
+    if (!carrier) throw new DbErrorBadRequest('invalid voip_carrier_sid');
+    if (carrier.account_sid !== req.user.account_sid) {
+      throw new DbErrorUnprocessableRequest('user can not add gateway for voip_carrier belonging to other account');
+    }
+  }
 };
 
 const preconditions = {
@@ -61,7 +39,6 @@ router.get('/', async(req, res) => {
   const logger = req.app.locals.logger;
   const voip_carrier_sid = req.query.voip_carrier_sid;
   try {
-    await checkUserScope(req, voip_carrier_sid);
     if (!voip_carrier_sid) {
       logger.info('GET /SmppGateways missing voip_carrier_sid param');
       return res.status(400).json({message: 'missing voip_carrier_sid query param'});

lib/routes/api/sms-inbound.js

@@ -1,35 +1,19 @@
 const router = require('express').Router();
 const request = require('request');
 const getProvider = require('../../utils/sms-provider');
-const { v4: uuidv4 } = require('uuid');
+const uuidv4 = require('uuid/v4');
 const sysError = require('../error');
 let idx = 0;
 
-const getFsUrl = async(logger, retrieveSet, setName, provider) => {
-  if (process.env.K8S) return `http://${process.env.K8S_FEATURE_SERVER_SERVICE_NAME}:3000/v1/messaging/${provider}`;
 
-  try {
-    const fs = await retrieveSet(setName);
-    if (0 === fs.length) {
-      logger.info('No available feature servers to handle createCall API request');
-      return ;
-    }
-    const f = fs[idx++ % fs.length];
-    logger.info({fs}, `feature servers available for createCall API request, selecting ${f}`);
-    return `${f}/v1/messaging/${provider}`;
-  } catch (err) {
-    logger.error({err}, 'getFsUrl: error retreving feature servers from redis');
-  }
-};
-
-const doSendResponse = async(res, respondFn, body) => {
+async function doSendResponse(res, respondFn, body) {
   if (typeof respondFn === 'number') res.sendStatus(respondFn);
   else if (typeof respondFn !== 'function') res.sendStatus(200);
   else {
     const payload = await respondFn(body);
     res.status(200).json(payload);
   }
-};
+}
 
 router.post('/:provider', async(req, res) => {
   const provider = req.params.provider;
@@ -38,7 +22,7 @@ router.post('/:provider', async(req, res) => {
     lookupAppByPhoneNumber,
     logger
   } = req.app.locals;
-  const setName = `${process.env.JAMBONES_CLUSTER_ID || 'default'}:fs-service-url`;
+  const setName = `${process.env.JAMBONES_CLUSTER_ID || 'default'}:active-fs`;
   logger.debug({path: req.path, body: req.body}, 'incomingSMS from carrier');
 
   // search for provider module
@@ -83,8 +67,17 @@ router.post('/:provider', async(req, res) => {
   }
 
   try {
-    const serviceUrl = await getFsUrl(logger, retrieveSet, setName, provider);
-    if (!serviceUrl) res.json({msg: 'no available feature servers at this time'}).status(480);
+    const fs = await retrieveSet(setName);
+    if (0 === fs.length) {
+      logger.info('No available feature servers to handle createCall API request');
+      return res
+        .json({
+          msg: 'no available feature servers at this time'
+        })
+        .status(480);
+    }
+    const ip = fs[idx++ % fs.length];
+    const serviceUrl = `http://${ip}:3000/v1/messaging/${provider}`;
     const messageSid = uuidv4();
     const payload = await Promise.resolve(filterFn({messageSid}, req.body));
 
@@ -120,7 +113,7 @@ router.post('/:provider', async(req, res) => {
 
     logger.debug({body: req.body, payload}, 'filtered incoming SMS');
 
-    logger.info({payload, url: serviceUrl}, `sending incomingSms API request to FS at ${serviceUrl}`);
+    logger.info({payload, url: serviceUrl}, `sending incomingSms API request to FS at ${ip}`);
 
     request({
       url: serviceUrl,
@@ -130,7 +123,7 @@ router.post('/:provider', async(req, res) => {
     },
     async(err, response, body) => {
       if (err) {
-        logger.error(err, `Error sending incomingSms POST to ${serviceUrl}`);
+        logger.error(err, `Error sending incomingSms POST to ${ip}`);
         return res.sendStatus(500);
       }
       if (200 === response.statusCode) {
@@ -138,7 +131,7 @@ router.post('/:provider', async(req, res) => {
         logger.info({body}, 'sending response to provider for incomingSMS');
         return doSendResponse(res, respondFn, body);
       }
-      logger.error({statusCode: response.statusCode}, `Non-success response returned by incomingSms ${serviceUrl}`);
+      logger.error({statusCode: response.statusCode}, `Non-success response returned by incomingSms ${ip}`);
       return res.sendStatus(500);
     });
   } catch (err) {

lib/routes/api/speech-credentials.js

@@ -1,299 +1,57 @@
 const router = require('express').Router();
-const assert = require('assert');
-const Account = require('../../models/account');
 const SpeechCredential = require('../../models/speech-credential');
 const sysError = require('../error');
 const {decrypt, encrypt} = require('../../utils/encrypt-decrypt');
-const {parseAccountSid, parseServiceProviderSid, parseSpeechCredentialSid} = require('./utils');
-const {decryptCredential, testWhisper, testDeepgramTTS,
-  getLanguagesAndVoicesForVendor,
-  testPlayHT,
-  testRimelabs} = require('../../utils/speech-utils');
-const {DbErrorUnprocessableRequest, DbErrorForbidden, DbErrorBadRequest} = require('../../utils/errors');
+const {parseAccountSid, parseServiceProviderSid} = require('./utils');
+const {DbErrorUnprocessableRequest, DbErrorBadRequest} = require('../../utils/errors');
 const {
   testGoogleTts,
   testGoogleStt,
   testAwsTts,
-  testAwsStt,
-  testMicrosoftStt,
-  testMicrosoftTts,
-  testWellSaidTts,
-  testNuanceStt,
-  testNuanceTts,
-  testDeepgramStt,
-  testSonioxStt,
-  testIbmTts,
-  testIbmStt,
-  testElevenlabs,
-  testAssemblyStt
+  testAwsStt
 } = require('../../utils/speech-utils');
-const {promisePool} = require('../../db');
-
-const validateAdd = async(req) => {
-  const account_sid = parseAccountSid(req);
-  const service_provider_sid = parseServiceProviderSid(req);
-
-  if (service_provider_sid) {
-    if (req.user.hasServiceProviderAuth && service_provider_sid !== req.user.service_provider_sid) {
-      throw new DbErrorForbidden('Insufficient privileges');
-    }
-    if (req.user.hasAccountAuth && service_provider_sid !== req.user.service_provider_sid &&
-      req.body.account_sid !== req.user.account_sid) {
-      throw new DbErrorForbidden('Insufficient privileges');
-    }
-  }
-
-  if (account_sid) {
-    if (req.user.hasAccountAuth && account_sid !== req.user.account_sid) {
-      throw new DbErrorForbidden('Insufficient privileges');
-    }
-
-    const [r] = await promisePool.execute(
-      'SELECT service_provider_sid from accounts WHERE account_sid = ?', [account_sid]
-    );
-
-    if (req.user.hasServiceProviderAuth && r[0].service_provider_sid !== req.user.service_provider_sid) {
-      throw new DbErrorForbidden('Insufficient privileges');
-    }
-  }
-  return;
-};
-
-const validateRetrieveUpdateDelete = async(req, speech_credentials) => {
-  if (req.user.hasServiceProviderAuth && speech_credentials[0].service_provider_sid !== req.user.service_provider_sid) {
-    throw new DbErrorForbidden('Insufficient privileges');
-  }
-
-  if (req.user.hasAccountAuth && speech_credentials[0].account_sid !== req.user.account_sid) {
-    throw new DbErrorForbidden('Insufficient privileges');
-  }
-  return;
-};
-
-const validateRetrieveList = async(req) => {
-  const service_provider_sid = parseServiceProviderSid(req);
-
-  if (service_provider_sid) {
-    if ((req.user.hasServiceProviderAuth || req.user.hasAccountAuth) &&
-     service_provider_sid !== req.user.service_provider_sid) {
-      throw new DbErrorForbidden('Insufficient privileges');
-    }
-  }
-  return;
-};
-
-const validateTest = async(req, speech_credentials) => {
-  if (req.user.hasAdminAuth) {
-    return;
-  }
-
-  if (!req.user.hasAdminAuth && speech_credentials.service_provider_sid !== req.user.service_provider_sid) {
-    throw new DbErrorForbidden('Insufficient privileges');
-  }
-
-  if (speech_credentials.service_provider_sid === req.user.service_provider_sid) {
-    if (req.user.hasServiceProviderAuth) {
-      return;
-    }
-
-    if (req.user.hasAccountAuth && (!speech_credentials.account_sid ||
-       speech_credentials.account_sid === req.user.account_sid)) {
-      return;
-    }
-
-    throw new DbErrorForbidden('Insufficient privileges');
-  }
-};
-
-const encryptCredential = (obj) => {
-  const {
-    vendor,
-    service_key,
-    access_key_id,
-    secret_access_key,
-    aws_region,
-    api_key,
-    region,
-    client_id,
-    secret,
-    nuance_tts_uri,
-    nuance_stt_uri,
-    deepgram_stt_uri,
-    deepgram_stt_use_tls,
-    use_custom_tts,
-    custom_tts_endpoint,
-    custom_tts_endpoint_url,
-    use_custom_stt,
-    custom_stt_endpoint,
-    custom_stt_endpoint_url,
-    tts_api_key,
-    tts_region,
-    stt_api_key,
-    stt_region,
-    riva_server_uri,
-    instance_id,
-    custom_stt_url,
-    custom_tts_url,
-    auth_token = '',
-    cobalt_server_uri,
-    model_id,
-    user_id,
-    voice_engine,
-    options
-  } = obj;
-
-  switch (vendor) {
-    case 'google':
-      assert(service_key, 'invalid json key: service_key is required');
-      try {
-        const o = JSON.parse(service_key);
-        assert(o.client_email && o.private_key, 'invalid google service account key');
-      }
-      catch (err) {
-        assert(false, 'invalid google service account key - not JSON');
-      }
-      return encrypt(service_key);
-
-    case 'aws':
-      assert(access_key_id, 'invalid aws speech credential: access_key_id is required');
-      assert(secret_access_key, 'invalid aws speech credential: secret_access_key is required');
-      assert(aws_region, 'invalid aws speech credential: aws_region is required');
-      const awsData = JSON.stringify({aws_region, access_key_id, secret_access_key});
-      return encrypt(awsData);
-
-    case 'microsoft':
-      if (!custom_tts_endpoint_url && !custom_stt_endpoint_url) {
-        assert(region, 'invalid azure speech credential: region is required');
-        assert(api_key, 'invalid azure speech credential: api_key is required');
-      }
-      const azureData = JSON.stringify({
-        ...(region && {region}),
-        ...(api_key && {api_key}),
-        use_custom_tts,
-        custom_tts_endpoint,
-        custom_tts_endpoint_url,
-        use_custom_stt,
-        custom_stt_endpoint,
-        custom_stt_endpoint_url
-      });
-      return encrypt(azureData);
-
-    case 'wellsaid':
-      assert(api_key, 'invalid wellsaid speech credential: api_key is required');
-      const wsData = JSON.stringify({api_key});
-      return encrypt(wsData);
-
-    case 'nuance':
-      const checked = (client_id && secret) || (nuance_tts_uri || nuance_stt_uri);
-      assert(checked, 'invalid nuance speech credential: either entered client id and\
-        secret or entered a nuance_tts_uri or nuance_stt_uri');
-      const nuanceData = JSON.stringify({client_id, secret, nuance_tts_uri, nuance_stt_uri});
-      return encrypt(nuanceData);
-
-    case 'deepgram':
-      // API key is optional if onprem
-      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});
-      return encrypt(deepgramData);
-
-    case 'ibm':
-      const ibmData = JSON.stringify({tts_api_key, tts_region, stt_api_key, stt_region, instance_id});
-      return encrypt(ibmData);
-
-    case 'nvidia':
-      assert(riva_server_uri, 'invalid riva server uri: riva_server_uri is required');
-      const nvidiaData = JSON.stringify({ riva_server_uri });
-      return encrypt(nvidiaData);
-
-    case 'soniox':
-      assert(api_key, 'invalid soniox speech credential: api_key is required');
-      const sonioxData = JSON.stringify({api_key});
-      return encrypt(sonioxData);
-
-    case 'cobalt':
-      assert(cobalt_server_uri, 'invalid cobalt speech credential: cobalt_server_uri is required');
-      const cobaltData = JSON.stringify({cobalt_server_uri});
-      return encrypt(cobaltData);
-
-    case 'elevenlabs':
-      assert(api_key, 'invalid elevenLabs speech credential: api_key is required');
-      assert(model_id, 'invalid elevenLabs speech credential: model_id is required');
-      const elevenlabsData = JSON.stringify({api_key, model_id, options});
-      return encrypt(elevenlabsData);
-
-    case 'playht':
-      assert(api_key, 'invalid playht speech credential: api_key is required');
-      assert(user_id, 'invalid playht speech credential: user_id is required');
-      assert(voice_engine, 'invalid voice_engine speech credential: voice_engine is required');
-      const playhtData = JSON.stringify({api_key, user_id, voice_engine, options});
-      return encrypt(playhtData);
-
-    case 'rimelabs':
-      assert(api_key, 'invalid rimelabs speech credential: api_key is required');
-      assert(model_id, 'invalid rimelabs speech credential: model_id is required');
-      const rimelabsData = JSON.stringify({api_key, model_id, options});
-      return encrypt(rimelabsData);
-
-    case 'assemblyai':
-      assert(api_key, 'invalid assemblyai speech credential: api_key is required');
-      const assemblyaiData = JSON.stringify({api_key});
-      return encrypt(assemblyaiData);
-
-    case 'whisper':
-      assert(api_key, 'invalid whisper speech credential: api_key is required');
-      assert(model_id, 'invalid whisper speech credential: model_id is required');
-      const whisperData = JSON.stringify({api_key, model_id});
-      return encrypt(whisperData);
-
-    default:
-      if (vendor.startsWith('custom:')) {
-        const customData = JSON.stringify({auth_token, custom_stt_url, custom_tts_url});
-        return encrypt(customData);
-      }
-      else assert(false, `invalid or missing vendor: ${vendor}`);
-  }
-};
 
 router.post('/', async(req, res) => {
   const logger = req.app.locals.logger;
-
+  const {use_for_stt, use_for_tts, vendor, service_key, access_key_id, secret_access_key, aws_region} = req.body;
+  const {account_sid} = req.user;
+  let service_provider_sid;
+  if (!account_sid) {
+    if (!req.user.hasServiceProviderAuth) {
+      logger.error('POST /SpeechCredentials invalid credentials');
+      return res.send(403);
+    }
+    service_provider_sid = parseServiceProviderSid(req);
+  }
   try {
-    const {
-      use_for_stt,
-      use_for_tts,
-      vendor,
-      label
-    } = req.body;
-    const account_sid = req.user.account_sid || req.body.account_sid;
-    const service_provider_sid = req.user.service_provider_sid ||
-    req.body.service_provider_sid || parseServiceProviderSid(req);
-
-    await validateAdd(req);
-
-    if (!account_sid) {
-      if (!req.user.hasServiceProviderAuth && !req.user.hasAdminAuth) {
-        logger.error('POST /SpeechCredentials invalid credentials');
-        return res.sendStatus(403);
+    let encrypted_credential;
+    if (vendor === 'google') {
+      let obj;
+      if (!service_key) throw new DbErrorBadRequest('invalid json key: service_key is required');
+      try {
+        obj = JSON.parse(service_key);
+        if (!obj.client_email || !obj.private_key) {
+          throw new DbErrorBadRequest('invalid google service account key');
+        }
       }
-    }
-
-    // Check if vendor and label is already used for account or SP
-    if (label) {
-      const existingSpeech = await SpeechCredential.getSpeechCredentialsByVendorAndLabel(
-        service_provider_sid, account_sid, vendor, label);
-      if (existingSpeech.length > 0) {
-        throw new DbErrorUnprocessableRequest(`Label ${label} is already in use for another speech credential`);
+      catch (err) {
+        throw new DbErrorBadRequest('invalid google service account key - not JSON');
       }
+      encrypted_credential = encrypt(service_key);
     }
-
-    const encrypted_credential = encryptCredential(req.body);
+    else if (vendor === 'aws') {
+      const data = JSON.stringify({
+        aws_region: aws_region || 'us-east-1',
+        access_key_id,
+        secret_access_key
+      });
+      encrypted_credential = encrypt(data);
+    }
+    else throw new DbErrorBadRequest(`invalid speech vendor ${vendor}`);
     const uuid = await SpeechCredential.make({
       account_sid,
       service_provider_sid,
       vendor,
-      label,
       use_for_tts,
       use_for_stt,
       credential: encrypted_credential
@@ -308,37 +66,24 @@ router.post('/', async(req, res) => {
  * retrieve all speech credentials for an account
  */
 router.get('/', async(req, res) => {
+  let service_provider_sid;
+  const account_sid = parseAccountSid(req);
+  if (!account_sid) service_provider_sid = parseServiceProviderSid(req);
   const logger = req.app.locals.logger;
-
   try {
-    const account_sid = parseAccountSid(req) ? parseAccountSid(req) : req.user.account_sid;
-    const service_provider_sid = parseServiceProviderSid(req);
-
-    await validateRetrieveList(req);
-
-    const credsAccount = account_sid ? await SpeechCredential.retrieveAll(account_sid) : [];
-    const credsSP = service_provider_sid ?
-      await SpeechCredential.retrieveAllForSP(service_provider_sid) :
-      await SpeechCredential.retrieveAllForSP((await Account.retrieve(account_sid))[0].service_provider_sid);
-
-    // filter out duplicates and discard those from other non-matching accounts
-    let creds = [...new Set([...credsAccount, ...credsSP].map((c) => JSON.stringify(c)))].map((c) => JSON.parse(c));
-    if (req.user.hasScope('account')) {
-      creds = creds.filter((c) => c.account_sid === req.user.account_sid || !c.account_sid);
-    }
+    const creds = account_sid ?
+      await SpeechCredential.retrieveAll(account_sid) :
+      await SpeechCredential.retrieveAllForSP(service_provider_sid);
 
     res.status(200).json(creds.map((c) => {
       const {credential, ...obj} = c;
-
-      decryptCredential(obj, credential, logger);
-
-      if (req.user.hasAccountAuth && obj.account_sid === null) {
-        delete obj.api_key;
-        delete obj.secret_access_key;
-        delete obj.secret;
-        delete obj.auth_token;
-        delete obj.stt_api_key;
-        delete obj.tts_api_key;
+      if ('google' === obj.vendor) {
+        obj.service_key = decrypt(credential);
+      }
+      else if ('aws' === obj.vendor) {
+        const o = decrypt(credential);
+        obj.access_key_id = o.access_key_id;
+        obj.secret_access_key = o.secret_access_key;
       }
       return obj;
     }));
@@ -351,26 +96,20 @@ router.get('/', async(req, res) => {
  * retrieve a specific speech credential
  */
 router.get('/:sid', async(req, res) => {
+  const sid = req.params.sid;
   const logger = req.app.locals.logger;
   try {
-    const sid = parseSpeechCredentialSid(req);
     const cred = await SpeechCredential.retrieve(sid);
     if (0 === cred.length) return res.sendStatus(404);
-
-    await validateRetrieveUpdateDelete(req, cred);
-
     const {credential, ...obj} = cred[0];
-    decryptCredential(obj, credential, logger);
-
-    if (req.user.hasAccountAuth && obj.account_sid === null) {
-      delete obj.api_key;
-      delete obj.secret_access_key;
-      delete obj.secret;
-      delete obj.auth_token;
-      delete obj.stt_api_key;
-      delete obj.tts_api_key;
+    if ('google' === obj.vendor) {
+      obj.service_key = decrypt(credential);
+    }
+    else if ('aws' === obj.vendor) {
+      const o = JSON.parse(decrypt(credential));
+      obj.access_key_id = o.access_key_id;
+      obj.secret_access_key = o.secret_access_key;
     }
-
     res.status(200).json(obj);
   } catch (err) {
     sysError(logger, res, err);
@@ -381,11 +120,9 @@ router.get('/:sid', async(req, res) => {
  * delete a speech credential
  */
 router.delete('/:sid', async(req, res) => {
+  const sid = req.params.sid;
   const logger = req.app.locals.logger;
   try {
-    const sid = parseSpeechCredentialSid(req);
-    const cred = await SpeechCredential.retrieve(sid);
-    await validateRetrieveUpdateDelete(req, cred);
     const count = await SpeechCredential.remove(sid);
     if (0 === count) return res.sendStatus(404);
     res.sendStatus(204);
@@ -399,11 +136,10 @@ router.delete('/:sid', async(req, res) => {
  * update a speech credential -- we only allow use_for_tts and use_for_stt to be updated
  */
 router.put('/:sid', async(req, res) => {
+  const sid = req.params.sid;
   const logger = req.app.locals.logger;
   try {
-    const sid = parseSpeechCredentialSid(req);
-    const {use_for_tts, use_for_stt, region, aws_region, stt_region, tts_region,
-      riva_server_uri, nuance_tts_uri, nuance_stt_uri} = req.body;
+    const {use_for_tts, use_for_stt} = req.body;
     if (typeof use_for_tts === 'undefined' && typeof use_for_stt === 'undefined') {
       throw new DbErrorUnprocessableRequest('use_for_tts and use_for_stt are the only updateable fields');
     }
@@ -415,69 +151,6 @@ router.put('/:sid', async(req, res) => {
       obj.use_for_stt = use_for_stt;
     }
 
-    /* update the credential if provided */
-    try {
-      const cred = await SpeechCredential.retrieve(sid);
-
-      await validateRetrieveUpdateDelete(req, cred);
-
-      if (1 === cred.length) {
-        const {credential, vendor} = cred[0];
-        const o = JSON.parse(decrypt(credential));
-        const {
-          use_custom_tts,
-          custom_tts_endpoint,
-          custom_tts_endpoint_url,
-          use_custom_stt,
-          custom_stt_endpoint,
-          custom_stt_endpoint_url,
-          custom_stt_url,
-          custom_tts_url,
-          cobalt_server_uri,
-          model_id,
-          voice_engine,
-          options,
-          deepgram_stt_uri,
-          deepgram_stt_use_tls,
-        } = req.body;
-
-        const newCred = {
-          ...o,
-          region,
-          vendor,
-          aws_region,
-          use_custom_tts,
-          custom_tts_endpoint,
-          custom_tts_endpoint_url,
-          use_custom_stt,
-          custom_stt_endpoint,
-          custom_stt_endpoint_url,
-          stt_region,
-          tts_region,
-          riva_server_uri,
-          nuance_stt_uri,
-          nuance_tts_uri,
-          custom_stt_url,
-          custom_tts_url,
-          cobalt_server_uri,
-          model_id,
-          voice_engine,
-          options,
-          deepgram_stt_uri,
-          deepgram_stt_use_tls,
-        };
-        logger.info({o, newCred}, 'updating speech credential with this new credential');
-        obj.credential = encryptCredential(newCred);
-        obj.vendor = vendor;
-      }
-      else {
-        logger.info({sid}, 'speech credential not found!!');
-      }
-    } catch (err) {
-      logger.error({err}, 'error updating speech credential');
-    }
-
-    logger.info({obj}, 'updating speech credential with changes');
     const rowsAffected = await SpeechCredential.update(sid, obj);
     if (rowsAffected === 0) {
       return res.sendStatus(404);
@@ -493,15 +166,12 @@ router.put('/:sid', async(req, res) => {
  * Test a credential
  */
 router.get('/:sid/test', async(req, res) => {
-  const {logger, synthAudio} = req.app.locals;
+  const sid = req.params.sid;
+  const logger = req.app.locals.logger;
   try {
-    const sid = parseSpeechCredentialSid(req);
     const creds = await SpeechCredential.retrieve(sid);
-
     if (!creds || 0 === creds.length) return res.sendStatus(404);
 
-    await validateTest(req, creds[0]);
-
     const cred = creds[0];
     const credential = JSON.parse(decrypt(cred.credential));
     const results = {
@@ -519,8 +189,7 @@ router.get('/:sid/test', async(req, res) => {
 
       if (cred.use_for_tts) {
         try {
-          const {getTtsVoices} = req.app.locals;
-          await testGoogleTts(logger, getTtsVoices, credential);
+          await testGoogleTts(logger, credential);
           results.tts.status = 'ok';
           SpeechCredential.ttsTestResult(sid, true);
         } catch (err) {
@@ -542,9 +211,8 @@ router.get('/:sid/test', async(req, res) => {
     }
     else if (cred.vendor === 'aws') {
       if (cred.use_for_tts) {
-        const {getTtsVoices} = req.app.locals;
         try {
-          await testAwsTts(logger, getTtsVoices, {
+          await testAwsTts(logger, {
             accessKeyId: credential.access_key_id,
             secretAccessKey: credential.secret_access_key,
             region: credential.aws_region || process.env.AWS_REGION
@@ -571,262 +239,7 @@ router.get('/:sid/test', async(req, res) => {
         }
       }
     }
-    else if (cred.vendor === 'microsoft') {
-      const {
-        api_key,
-        region,
-        use_custom_tts,
-        custom_tts_endpoint,
-        custom_tts_endpoint_url,
-        use_custom_stt,
-        custom_stt_endpoint,
-        custom_stt_endpoint_url
-      } = credential;
-      if (cred.use_for_tts) {
-        try {
-          await testMicrosoftTts(logger, synthAudio, {
-            api_key,
-            region,
-            use_custom_tts,
-            custom_tts_endpoint,
-            custom_tts_endpoint_url,
-            use_custom_stt,
-            custom_stt_endpoint,
-            custom_stt_endpoint_url
-          });
-          results.tts.status = 'ok';
-          SpeechCredential.ttsTestResult(sid, true);
-        } catch (err) {
-          results.tts = {status: 'fail', reason: err.message};
-          SpeechCredential.ttsTestResult(sid, false);
-        }
-      }
-      if (cred.use_for_stt) {
-        try {
-          await testMicrosoftStt(logger, {api_key, region});
-          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 === 'wellsaid') {
-      const {api_key} = credential;
-      if (cred.use_for_tts) {
-        try {
-          await testWellSaidTts(logger, {api_key});
-          results.tts.status = 'ok';
-          SpeechCredential.ttsTestResult(sid, true);
-        } catch (err) {
-          results.tts = {status: 'fail', reason: err.message};
-          SpeechCredential.ttsTestResult(sid, false);
-        }
-      }
-    }
-    else if (cred.vendor === 'nuance') {
-      const {getTtsVoices} = req.app.locals;
-
-      const {
-        client_id,
-        secret,
-        nuance_tts_uri,
-        nuance_stt_uri
-      } = credential;
-      if (cred.use_for_tts) {
-        try {
-          await testNuanceTts(logger, getTtsVoices, {
-            client_id,
-            secret,
-            nuance_tts_uri
-          });
-          results.tts.status = 'ok';
-          SpeechCredential.ttsTestResult(sid, true);
-        } catch (err) {
-          logger.error({err}, 'error testing nuance tts');
-          const reason = err.statusCode === 401 ?
-            'invalid client_id or secret' :
-            (err.message || 'error accessing nuance tts service with provided credentials');
-          results.tts = {status: 'fail', reason};
-          SpeechCredential.ttsTestResult(sid, false);
-        }
-      }
-      if (cred.use_for_stt) {
-        try {
-          await testNuanceStt(logger, {client_id, secret, nuance_stt_uri});
-          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 === 'deepgram') {
-      const {api_key} = credential;
-      if (cred.use_for_tts) {
-        try {
-          await testDeepgramTTS(logger, synthAudio, credential);
-          results.tts.status = 'ok';
-          SpeechCredential.ttsTestResult(sid, true);
-        } catch (err) {
-          results.tts = {status: 'fail', reason: err.message};
-          SpeechCredential.ttsTestResult(sid, false);
-        }
-      }
-      if (cred.use_for_stt && api_key) {
-        try {
-          await testDeepgramStt(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 === 'ibm') {
-      const {getTtsVoices} = req.app.locals;
-
-      if (cred.use_for_tts) {
-        const {tts_api_key, tts_region} = credential;
-        try {
-          await testIbmTts(logger, getTtsVoices, {
-            tts_api_key,
-            tts_region
-          });
-          results.tts.status = 'ok';
-          SpeechCredential.ttsTestResult(sid, true);
-        } catch (err) {
-          logger.error({err}, 'error testing ibm tts');
-          const reason = err.statusCode === 401 ?
-            'invalid api_key or region' :
-            (err.message || 'error accessing ibm tts service with provided credentials');
-          results.tts = {status: 'fail', reason};
-          SpeechCredential.ttsTestResult(sid, false);
-        }
-      }
-      if (cred.use_for_stt) {
-        const {stt_api_key, stt_region, instance_id} = credential;
-        try {
-          await testIbmStt(logger, {stt_region, stt_api_key, instance_id});
-          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 === 'soniox') {
-      const {api_key} = credential;
-      if (cred.use_for_stt) {
-        try {
-          await testSonioxStt(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 === 'elevenlabs') {
-      const {api_key, model_id} = credential;
-      if (cred.use_for_tts) {
-        try {
-          await testElevenlabs(logger, {api_key, model_id});
-          results.tts.status = 'ok';
-          SpeechCredential.ttsTestResult(sid, true);
-        } catch (err) {
-          results.tts = {status: 'fail', reason: err.message};
-          SpeechCredential.ttsTestResult(sid, false);
-        }
-      }
-    } else if (cred.vendor === 'playht') {
-      if (cred.use_for_tts) {
-        try {
-          await testPlayHT(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 {
-          await testRimelabs(logger, synthAudio, credential);
-          results.tts.status = 'ok';
-          SpeechCredential.ttsTestResult(sid, true);
-        } catch (err) {
-          results.tts = {status: 'fail', reason: err.message};
-          SpeechCredential.ttsTestResult(sid, false);
-        }
-      }
-    } else if (cred.vendor === 'assemblyai') {
-      const {api_key} = credential;
-      if (cred.use_for_stt) {
-        try {
-          await testAssemblyStt(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 {
-          await testWhisper(logger, synthAudio, credential);
-          results.tts.status = 'ok';
-          SpeechCredential.ttsTestResult(sid, true);
-        } catch (err) {
-          results.tts = {status: 'fail', reason: err.message};
-          SpeechCredential.ttsTestResult(sid, false);
-        }
-      }
-    }
-
     res.status(200).json(results);
-
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-/**
- * Fetch speech voices and languages
- */
-
-router.get('/speech/supportedLanguagesAndVoices', async(req, res) => {
-  const {logger, getTtsVoices} = req.app.locals;
-  try {
-    const {vendor, label} = req.query;
-    if (!vendor) {
-      throw new DbErrorBadRequest('vendor is required');
-    }
-    const account_sid = req.user.account_sid || req.body.account_sid;
-    const service_provider_sid = req.user.service_provider_sid ||
-      req.body.service_provider_sid || parseServiceProviderSid(req);
-
-    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;
-    try {
-      const data = await getLanguagesAndVoicesForVendor(logger, vendor, cred, getTtsVoices);
-      res.status(200).json(data);
-    } catch (err) {
-      throw new DbErrorUnprocessableRequest(err.message);
-    }
   } catch (err) {
     sysError(logger, res, err);
   }

lib/routes/api/system-information.js

@@ -1,14 +0,0 @@
-const router = require('express').Router();
-const SystemInformation = require('../../models/system-information');
-
-router.post('/', async(req, res) => {
-  const sysInfo = await SystemInformation.add(req.body);
-  res.status(201).json(sysInfo);
-});
-
-router.get('/', async(req, res) => {
-  const [sysInfo] = await SystemInformation.retrieveAll();
-  res.status(200).json(sysInfo || {});
-});
-
-module.exports = router;

lib/routes/api/tts-cache.js

@@ -1,126 +0,0 @@
-const router = require('express').Router();
-const {
-  parseAccountSid
-} = require('./utils');
-const SpeechCredential = require('../../models/speech-credential');
-const fs = require('fs');
-const { v4: uuidv4 } = require('uuid');
-const {DbErrorBadRequest} = require('../../utils/errors');
-const Account = require('../../models/account');
-const sysError = require('../error');
-const { getSpeechCredential, decryptCredential } = require('../../utils/speech-utils');
-const PCMToMP3Encoder = require('../../record/encoder');
-
-router.delete('/', async(req, res) => {
-  const {purgeTtsCache} = req.app.locals;
-  const account_sid = parseAccountSid(req);
-  if (account_sid) {
-    await purgeTtsCache({account_sid});
-  } else {
-    await purgeTtsCache();
-  }
-  res.sendStatus(204);
-});
-
-router.get('/', async(req, res) => {
-  const {getTtsSize} = req.app.locals;
-  const account_sid = parseAccountSid(req);
-  let size = 0;
-  if (account_sid) {
-    size = await getTtsSize(`tts:${account_sid}:*`);
-  } else {
-    size = await getTtsSize();
-  }
-  res.status(200).json({size});
-});
-
-router.post('/Synthesize', async(req, res) => {
-  const {logger, synthAudio} = req.app.locals;
-  try {
-    const accountSid = parseAccountSid(req);
-    const body = req.body;
-    const encodingMp3 = req.body.encodingMp3 || false;
-    if (!body.speech_credential_sid || !body.text || !body.language || !body.voice) {
-      throw new DbErrorBadRequest('speech_credential_sid, text, language, voice are all required');
-    }
-
-    const result = await Account.retrieve(accountSid);
-    if (!result || result.length === 0 || !result[0].is_active) {
-      throw new DbErrorBadRequest(`Account not found for sid ${accountSid}`);
-    }
-    const credentials = await SpeechCredential.retrieve(body.speech_credential_sid);
-    if (!credentials || credentials.length === 0) {
-      throw new
-      DbErrorBadRequest(`There is no available speech credential for ${body.speech_credential_sid}`);
-    }
-    const {credential, ...obj} = credentials[0];
-
-    decryptCredential(obj, credential, logger, false);
-    const cred = getSpeechCredential(obj, logger);
-
-    const { text, language, engine = 'standard' } = body;
-    const salt = uuidv4();
-    /* parse Nuance voices into name and model */
-    let voice = body.voice;
-    let model;
-    if (cred.vendor === 'nuance' && voice) {
-      const arr = /([A-Za-z-]*)\s+-\s+(enhanced|standard)/.exec(voice);
-      if (arr) {
-        voice = arr[1];
-        model = arr[2];
-      }
-    }
-    const stats = {
-      histogram: () => {},
-      increment: () => {},
-    };
-    const { filePath } = await synthAudio(stats, {
-      account_sid: accountSid,
-      text,
-      vendor: cred.vendor,
-      language,
-      voice,
-      engine,
-      model,
-      salt,
-      credentials: cred,
-      disableTtsCache: false
-    });
-
-    let contentType = 'audio/mpeg';
-
-    let readStream = fs.createReadStream(filePath);
-    if (['nuance', 'nvidia'].includes(cred.vendor) ||
-      (
-        process.env.JAMBONES_TTS_TRIM_SILENCE &&
-        ['microsoft', 'azure'].includes(cred.vendor)
-      )
-    ) {
-      if (encodingMp3) {
-        readStream = readStream
-          .pipe(new PCMToMP3Encoder({
-            channels: 1,
-            sampleRate: 8000,
-            bitRate: 128
-          }, logger));
-      } else {
-        contentType = 'application/octet-stream';
-      }
-    }
-    res.writeHead(200, {
-      'Content-Type': contentType,
-    });
-    readStream.pipe(res);
-    readStream.on('end', () => {
-      fs.unlink(filePath, (err) => {
-        if (err) throw err;
-        logger.info(`${filePath} was deleted`);
-      });
-    });
-
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/users.js

@@ -1,22 +1,16 @@
+//const assert = require('assert');
+//const debug = require('debug')('jambonz:api-server');
 const router = require('express').Router();
-const User = require('../../models/user');
-const {DbErrorBadRequest, BadRequestError, DbErrorForbidden} = require('../../utils/errors');
+const {DbErrorBadRequest} = require('../../utils/errors');
 const {generateHashedPassword, verifyPassword} = require('../../utils/password-utils');
 const {promisePool} = require('../../db');
-const {validatePasswordSettings, parseUserSid} = require('./utils');
 const {decrypt} = require('../../utils/encrypt-decrypt');
-const {cacheClient} = require('../../helpers');
 const sysError = require('../error');
 const retrieveMyDetails = `SELECT * 
 FROM users user
 JOIN accounts AS account ON account.account_sid = user.account_sid 
 LEFT JOIN service_providers as sp ON account.service_provider_sid = sp.service_provider_sid  
 WHERE user.user_sid = ?`;
-const retrieveMyDetails2 = `SELECT * 
-FROM users user
-LEFT JOIN accounts AS account ON account.account_sid = user.account_sid 
-LEFT JOIN service_providers as sp ON sp.service_provider_sid = user.service_provider_sid 
-WHERE user.user_sid = ?`;
 const retrieveSql = 'SELECT * from users where user_sid = ?';
 const retrieveProducts = `SELECT * 
 FROM account_products 
@@ -28,324 +22,123 @@ AND account_subscriptions.pending=0`;
 const updateSql = 'UPDATE users set hashed_password = ?, force_change = false WHERE user_sid = ?';
 const retrieveStaticIps = 'SELECT * FROM account_static_ips WHERE account_sid = ?';
 
-const validateRequest = async(user_sid, req) => {
-  const payload = req.body;
-  const {
-    old_password,
-    new_password,
-    initial_password,
-    name,
-    email,
-    email_activation_code,
-    force_change,
-    is_active
-  } = payload;
+const validateRequest = async(user_sid, payload) => {
+  const {old_password, new_password, name, email, email_activation_code} = payload;
 
   const [r] = await promisePool.query(retrieveSql, user_sid);
-  if (r.length === 0) {
-    throw new DbErrorBadRequest('Invalid request: user_sid does not exist');
-  }
+  if (r.length === 0) return null;
   const user = r[0];
 
-  /* it is not allowed for anyone to promote a user to a higher level of authority */
-  if (null === payload.account_sid || null === payload.service_provider_sid) {
-    throw new DbErrorBadRequest('Invalid request: user may not be promoted');
-  }
-
-  if (req.user.hasAccountAuth) {
-    /* account user may not change modify account_sid or service_provider_sid */
-    if ('account_sid' in payload && payload.account_sid !== user.account_sid) {
-      throw new DbErrorBadRequest('Invalid request: user may not be promoted or moved to another account');
-    }
-    if ('service_provider_sid' in payload && payload.service_provider_sid !== user.service_provider_sid) {
-      throw new DbErrorBadRequest('Invalid request: user may not be promoted or moved to another service provider');
-    }
-  }
-  if (req.user.hasServiceProviderAuth) {
-    if ('service_provider_sid' in payload && payload.service_provider_sid !== user.service_provider_sid) {
-      throw new DbErrorBadRequest('Invalid request: user may not be promoted or moved to another service provider');
-    }
-  }
-  if ('account_sid' in payload) {
-    const [r] = await promisePool.query('SELECT * FROM accounts WHERE account_sid = ?', payload.account_sid);
-    if (r.length === 0) throw new DbErrorBadRequest('Invalid request: account_sid does not exist');
-    const {service_provider_sid} = r[0];
-    if (service_provider_sid !== user.service_provider_sid) {
-      throw new DbErrorBadRequest('Invalid request: user may not be moved to another service provider');
-    }
-  }
-
-  if (initial_password) {
-    await validatePasswordSettings(initial_password);
-  }
-
   if ((old_password && !new_password) || (new_password && !old_password)) {
     throw new DbErrorBadRequest('new_password and old_password both required');
   }
-  if (new_password) {
-    await validatePasswordSettings(new_password);
-  }
   if (new_password && name) throw new DbErrorBadRequest('can not change name and password simultaneously');
   if (new_password && user.provider !== 'local') {
     throw new DbErrorBadRequest('can not change password when using oauth2');
   }
 
-  if (email_activation_code && !email) {
+  if ((email && !email_activation_code) || (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)
-    throw new DbErrorBadRequest('no updates requested');
+  if (!name && !new_password && !email) throw new DbErrorBadRequest('no updates requested');
 
   return user;
 };
 
-const getActiveAdminUsers = (users) => {
-  return users.filter((e) => !e.account_sid && !e.service_provider_sid && e.is_active);
-};
-
-const ensureUserActionIsAllowed = (req, user) => {
-  if (req.user.hasAdminAuth) {
-    return;
-  }
-
-  if (req.user.hasServiceProviderAuth && req.user.service_provider_sid === user.service_provider_sid) {
-    return;
-  }
-
-  if (req.user.hasAccountAuth && req.user.account_sid === user.account_sid) {
-    return;
-  }
-
-  throw new DbErrorForbidden('insufficient permissions');
-};
-
-const ensureUserDeletionIsAllowed = (req, activeAdminUsers, user) => {
-  try {
-    if (req.user.hasAdminAuth && activeAdminUsers.length === 1 && activeAdminUsers[0].user_sid === user[0].user_sid) {
-      throw new BadRequestError('cannot delete this admin user - there are no other active admin users');
-    }
-
-    ensureUserActionIsAllowed(req, user[0]);
-    return;
-  } catch (error) {
-    throw error;
-  }
-};
-
-const ensureUserRetrievalIsAllowed = (req, user) => {
-  try {
-    ensureUserActionIsAllowed(req, user);
-    return;
-  } catch (error) {
-    throw error;
-  }
-};
-
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-
-  let usersList;
-  try {
-    let results;
-    if (req.user.hasAdminAuth) {
-      results = await User.retrieveAll();
-    }
-    else if (req.user.hasAccountAuth) {
-      results = await User.retrieveAllForAccount(req.user.account_sid, true);
-    }
-    else if (req.user.hasServiceProviderAuth) {
-      results = await User.retrieveAllForServiceProvider(req.user.service_provider_sid, true);
-    }
-
-    if (results.length === 0) throw new Error('failure retrieving users list');
-
-    usersList = results.map((user) => {
-      const {
-        user_sid,
-        name,
-        email,
-        force_change,
-        is_active,
-        account_sid,
-        service_provider_sid,
-        account_name,
-        service_provider_name
-      } = user;
-      let scope;
-      if (account_sid && service_provider_sid) {
-        scope = 'account';
-      } else if (service_provider_sid) {
-        scope = 'service_provider';
-      } else {
-        scope = 'admin';
-      }
-
-      const obj = {
-        user_sid,
-        name,
-        email,
-        scope,
-        force_change,
-        is_active,
-        ...(account_sid && {account_sid}),
-        ...(account_name && {account_name}),
-        ...(service_provider_sid && {service_provider_sid}),
-        ...(service_provider_name && {service_provider_name})
-      };
-      return obj;
-    });
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-  res.status(200).json(usersList);
-});
-
 router.get('/me', async(req, res) => {
   const logger = req.app.locals.logger;
   const {user_sid} = req.user;
 
   if (!user_sid) return res.sendStatus(403);
 
-  let payload;
   try {
-    if (process.env.JAMBONES_HOSTING) {
-      const [r] = await promisePool.query({sql: retrieveMyDetails, nestTables: true}, user_sid);
-      logger.debug(r, 'retrieved user details');
-      payload = r[0];
-      const {user, account, sp} = payload;
-      ['hashed_password', 'salt', 'phone_activation_code', 'email_activation_code', 'account_sid'].forEach((prop) => {
-        delete user[prop];
-      });
-      ['email_validated', 'phone_validated', 'force_change'].forEach((prop) => user[prop] = !!user[prop]);
-      ['is_active'].forEach((prop) => account[prop] = !!account[prop]);
-      account.root_domain = sp.root_domain;
-      delete payload.sp;
+    const [r] = await promisePool.query({sql: retrieveMyDetails, nestTables: true}, user_sid);
+    logger.debug(r, 'retrieved user details');
+    const payload = r[0];
+    const {user, account, sp} = payload;
+    ['hashed_password', 'salt', 'phone_activation_code', 'email_activation_code', 'account_sid'].forEach((prop) => {
+      delete user[prop];
+    });
+    ['email_validated', 'phone_validated', 'force_change'].forEach((prop) => user[prop] = !!user[prop]);
+    ['is_active'].forEach((prop) => account[prop] = !!account[prop]);
+    account.root_domain = sp.root_domain;
+    delete payload.sp;
 
-      /* get api keys */
-      const [keys] = await promisePool.query('SELECT * from api_keys WHERE account_sid = ?', account.account_sid);
-      payload.api_keys = keys.map((k) => {
-        return {
-          api_key_sid: k.api_key_sid,
-          //token: k.token.replace(/.(?=.{4,}$)/g, '*'),
-          token: k.token,
-          last_used: k.last_used,
-          created_at: k.created_at
-        };
-      });
-
-      /* get products */
-      const [products] = await promisePool.query({sql: retrieveProducts, nestTables: true}, account.account_sid);
-      if (!products.length || !products[0].account_subscriptions) {
-        throw new Error('account is missing a subscription');
-      }
-      const account_subscription = products[0].account_subscriptions;
-      payload.subscription = {
-        status: 'active',
-        account_subscription_sid: account_subscription.account_subscription_sid,
-        start_date: account_subscription.effective_start_date,
-        products: products.map((prd) => {
-          return {
-            name: prd.products.name,
-            units: prd.products.unit_label,
-            quantity: prd.account_products.quantity
-          };
-        })
+    /* get api keys */
+    const [keys] = await promisePool.query('SELECT * from api_keys WHERE account_sid = ?', account.account_sid);
+    payload.api_keys = keys.map((k) => {
+      return {
+        api_key_sid: k.api_key_sid,
+        //token: k.token.replace(/.(?=.{4,}$)/g, '*'),
+        token: k.token,
+        last_used: k.last_used,
+        created_at: k.created_at
       };
-      if (account_subscription.pending) {
-        Object.assign(payload.subscription, {
-          status: 'suspended',
-          suspend_reason: account_subscription.pending_reason
-        });
-      }
-      const {
-        last4,
+    });
+
+    /* get products */
+    const [products] = await promisePool.query({sql: retrieveProducts, nestTables: true}, account.account_sid);
+    if (!products.length || !products[0].account_subscriptions) {
+      throw new Error('account is missing a subscription');
+    }
+    const account_subscription = products[0].account_subscriptions;
+    payload.subscription = {
+      status: 'active',
+      account_subscription_sid: account_subscription.account_subscription_sid,
+      start_date: account_subscription.effective_start_date,
+      products: products.map((prd) => {
+        return {
+          name: prd.products.name,
+          units: prd.products.unit_label,
+          quantity: prd.account_products.quantity
+        };
+      })
+    };
+    if (account_subscription.pending) {
+      Object.assign(payload.subscription, {
+        status: 'suspended',
+        suspend_reason: account_subscription.pending_reason
+      });
+    }
+    const {
+      last4,
+      exp_month,
+      exp_year,
+      card_type,
+      stripe_statement_descriptor
+    } = account_subscription;
+    if (last4) {
+      const real_last4 = decrypt(last4);
+      Object.assign(payload.subscription, {
+        last4: real_last4,
         exp_month,
         exp_year,
         card_type,
-        stripe_statement_descriptor
-      } = account_subscription;
-      if (last4) {
-        const real_last4 = decrypt(last4);
-        Object.assign(payload.subscription, {
-          last4: real_last4,
-          exp_month,
-          exp_year,
-          card_type,
-          statement_descriptor: stripe_statement_descriptor
-        });
-      }
-
-      /* get static ips */
-      const [static_ips] = await promisePool.query(retrieveStaticIps, account.account_sid);
-      payload.static_ips = static_ips.map((r) => r.public_ipv4);
-    }
-    else {
-      const [r] = await promisePool.query({sql: retrieveMyDetails2, nestTables: true}, user_sid);
-      logger.debug(r, 'retrieved user details');
-      payload = r[0];
-      const {user} = payload;
-      ['hashed_password', 'salt', 'phone_activation_code', 'email_activation_code'].forEach((prop) => {
-        delete user[prop];
+        statement_descriptor: stripe_statement_descriptor
       });
-      ['email_validated', 'phone_validated', 'force_change'].forEach((prop) => user[prop] = !!user[prop]);
     }
+
+    /* get static ips */
+    const [static_ips] = await promisePool.query(retrieveStaticIps, account.account_sid);
+    payload.static_ips = static_ips.map((r) => r.public_ipv4);
+
     logger.debug({payload}, 'returning user details');
+
     res.json(payload);
   } catch (err) {
     sysError(logger, res, err);
   }
 });
 
-router.get('/:user_sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-
-  try {
-    const user_sid = parseUserSid(req);
-    const [user] = await User.retrieve(user_sid);
-
-    if (!user) {
-      throw new Error('failure retrieving user');
-    }
-
-    ensureUserRetrievalIsAllowed(req, user);
-
-    // eslint-disable-next-line no-unused-vars
-    const { hashed_password, ...rest } = user;
-    return res.status(200).json(rest);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
 router.put('/:user_sid', async(req, res) => {
   const logger = req.app.locals.logger;
   const {user_sid} = req.params;
-  const user = await User.retrieve(user_sid);
-  const {hasAccountAuth, hasServiceProviderAuth, hasAdminAuth} = req.user;
-  const {
-    old_password,
-    new_password,
-    initial_password,
-    email_activation_code,
-    email,
-    name,
-    is_active,
-    force_change,
-    account_sid,
-    service_provider_sid
-  } = req.body;
+  const {old_password, new_password, name, email, email_activation_code} = req.body;
 
-  //if (req.user.user_sid && req.user.user_sid !== user_sid) return res.sendStatus(403);
-
-  if (!hasAdminAuth &&
-  !(hasAccountAuth && user[0] && req.user.account_sid === user[0].account_sid) &&
-  !(hasServiceProviderAuth && user[0] && req.user.service_provider_sid === user[0].service_provider_sid) &&
-  (req.user.user_sid && req.user.user_sid !== user_sid)) {
-    return res.sendStatus(403);
-  }
+  if (req.user.user_sid && req.user.user_sid !== user_sid) return res.sendStatus(403);
 
   try {
-    const user = await validateRequest(user_sid, req);
+    const user = await validateRequest(user_sid, req.body);
     if (!user) return res.sendStatus(404);
 
     if (new_password) {
@@ -356,11 +149,6 @@ router.put('/:user_sid', async(req, res) => {
         //debug(`PUT /Users/:sid pwd ${old_password} does not match hash ${old_hashed_password}`);
         return res.sendStatus(403);
       }
-
-      if (old_password === new_password) {
-        throw new Error('new password cannot be your old password');
-      }
-
       const passwordHash = await generateHashedPassword(new_password);
       //debug(`updating hashed_password to ${passwordHash}`);
       const r = await promisePool.execute(updateSql, [passwordHash, user_sid]);
@@ -372,55 +160,10 @@ router.put('/:user_sid', async(req, res) => {
       if (0 === r.changedRows) throw new Error('database update failed');
     }
 
-    if (initial_password) {
-      const passwordHash = await generateHashedPassword(initial_password);
-      const r = await promisePool.execute(
-        'UPDATE users SET hashed_password = ? WHERE user_sid = ?',
-        [passwordHash, user_sid]
-      );
-      if (0 === r.changedRows) throw new Error('database update failed');
-    }
-
-    if (typeof is_active !== 'undefined') {
-      const r = await promisePool.execute('UPDATE users SET is_active = ? WHERE user_sid = ?', [is_active, user_sid]);
-      if (0 === r.changedRows) throw new Error('database update failed');
-    }
-
-    if (typeof force_change !== 'undefined') {
-      const r = await promisePool.execute(
-        'UPDATE users SET force_change = ? WHERE user_sid = ?',
-        [force_change, user_sid]);
-      if (0 === r.changedRows) throw new Error('database update failed');
-    }
-
-    if (account_sid || account_sid === null) {
-      const r = await promisePool.execute(
-        'UPDATE users SET account_sid = ? WHERE user_sid = ?',
-        [account_sid, user_sid]);
-      if (0 === r.changedRows) throw new Error('database update failed');
-      const redisKey = cacheClient.generateRedisKey('jwt', user_sid, 'v2');
-      await cacheClient.delete(redisKey);
-    }
-
-    if (service_provider_sid || service_provider_sid === null) {
-      const r = await promisePool.execute(
-        'UPDATE users SET service_provider_sid = ? WHERE user_sid = ?',
-        [service_provider_sid, user_sid]);
-      if (0 === r.changedRows) throw new Error('database update failed');
-      const redisKey = cacheClient.generateRedisKey('jwt', user_sid, 'v2');
-      await cacheClient.delete(redisKey);
-    }
-
     if (email) {
-      if (email_activation_code) {
-        const r = await promisePool.execute(
-          'UPDATE users SET email = ?, email_activation_code = ?, email_validated = 0 WHERE user_sid = ?',
-          [email, email_activation_code, user_sid]);
-        if (0 === r.changedRows) throw new Error('database update failed');
-      }
       const r = await promisePool.execute(
-        'UPDATE users SET email = ? WHERE user_sid = ?',
-        [email, user_sid]);
+        'UPDATE users SET email = ?, email_activation_code = ?, email_validated = 0 WHERE user_sid = ?',
+        [email, email_activation_code, user_sid]);
       if (0 === r.changedRows) throw new Error('database update failed');
 
       if (process.env.NODE_ENV !== 'test') {
@@ -433,80 +176,5 @@ router.put('/:user_sid', async(req, res) => {
   }
 });
 
-router.post('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const passwordHash = await generateHashedPassword(req.body.initial_password);
-  const payload = {
-    ...req.body,
-    provider: 'local',
-    hashed_password: passwordHash,
-  };
-  const allUsers = await User.retrieveAll();
-  delete payload.initial_password;
-
-  try {
-    if (req.body.initial_password) {
-      await validatePasswordSettings(req.body.initial_password);
-    }
-    const email = allUsers.find((e) => e.email === payload.email);
-    const name = allUsers.find((e) => e.name === payload.name);
-
-    if (name) {
-      logger.debug({payload}, 'user with this username already exists');
-      return res.status(422).json({msg: 'invalid username or email'});
-    }
-
-    if (email) {
-      logger.debug({payload}, 'user with this email already exists');
-      return res.status(422).json({msg: 'invalid username or email'});
-    }
-
-    if (req.user.hasAdminAuth) {
-      logger.debug({payload}, 'POST /users');
-      const uuid = await User.make(payload);
-      res.status(201).json({user_sid: uuid});
-    }
-    else if (req.user.hasAccountAuth) {
-      logger.debug({payload}, 'POST /users');
-      const uuid = await User.make({
-        ...payload,
-        account_sid: req.user.account_sid,
-      });
-      res.status(201).json({user_sid: uuid});
-    }
-    else if (req.user.hasServiceProviderAuth) {
-      logger.debug({payload}, 'POST /users');
-      const uuid = await User.make({
-        ...payload,
-        service_provider_sid: req.user.service_provider_sid,
-      });
-      res.status(201).json({user_sid: uuid});
-    }
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.delete('/:user_sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-
-  try {
-    const user_sid = parseUserSid(req);
-    const allUsers = await User.retrieveAll();
-    const activeAdminUsers = getActiveAdminUsers(allUsers);
-    const user = allUsers.filter((user) => user.user_sid === user_sid);
-
-    ensureUserDeletionIsAllowed(req, activeAdminUsers, user);
-    await User.remove(user_sid);
-
-    /* invalidate the jwt of the deleted user */
-    const redisKey = cacheClient.generateRedisKey('jwt', user_sid, 'v2');
-    await cacheClient.delete(redisKey);
-
-    return res.sendStatus(204);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
 
 module.exports = router;

lib/routes/api/utils.js

@@ -1,18 +1,14 @@
-const { v4: uuid, validate } = require('uuid');
-const bent = require('bent');
+const uuid = require('uuid').v4;
 const Account = require('../../models/account');
 const {promisePool} = require('../../db');
 const {cancelSubscription, detachPaymentMethod} = require('../../utils/stripe-utils');
 const freePlans = require('../../utils/free_plans');
-const { BadRequestError, DbErrorBadRequest } = require('../../utils/errors');
 const insertAccountSubscriptionSql = `INSERT INTO account_subscriptions 
 (account_subscription_sid, account_sid) 
 values (?, ?)`;
 const replaceOldSubscriptionSql = `UPDATE account_subscriptions 
 SET effective_end_date = CURRENT_TIMESTAMP, change_reason = ?  
 WHERE account_subscription_sid = ?`;
-//const request = require('request');
-//require('request-debug')(request);
 
 const setupFreeTrial = async(logger, account_sid, isReturningUser) => {
   const sid = uuid();
@@ -78,13 +74,12 @@ const createTestCdrs = async(writeCdrs,  account_sid) => {
   for (let i = 0 ; i < points; i++) {
     const attempted_at = new Date(start.getTime() + (i * increment));
     const failed = 0 === i % 5;
-    const sip_callid = `685cd008-0a66-4974-b37a-bdd6d9a3c4a-${i % 2}`;
     data.push({
       call_sid: 'b6f48929-8e86-4d62-ae3b-64fb574d91f6',
       from: '15083084809',
       to: '18882349999',
       answered:  !failed,
-      sip_callid,
+      sip_callid: '685cd008-0a66-4974-b37a-bdd6d9a3c4aa@192.168.1.100',
       sip_status: 200,
       duration: failed ? 0 : 45,
       attempted_at: attempted_at.getTime(),
@@ -127,7 +122,7 @@ const createTestAlerts = async(writeAlerts, AlertType, account_sid) => {
         data.push({timestamp, account_sid, alert_type: AlertType.CARRIER_NOT_PROVISIONED});
         break;
       case 4:
-        data.push({timestamp, account_sid, alert_type: AlertType.ACCOUNT_CALL_LIMIT, count: 50});
+        data.push({timestamp, account_sid, alert_type: AlertType.CALL_LIMIT, count: 50});
         break;
       default:
         break;
@@ -138,306 +133,38 @@ const createTestAlerts = async(writeAlerts, AlertType, account_sid) => {
 
 };
 
-const validateSid = (model, req) => {
-  const arr = new RegExp(`${model}\/([^\/]*)`).exec(req.originalUrl);
-
-  if (arr) {
-    const sid = arr[1];
-    const sid_validation = validate(sid);
-    if (!sid_validation) {
-      throw new BadRequestError(`invalid ${model}Sid format`);
-    }
-
-    return arr[1];
-  }
-
-  return;
-};
-
 const parseServiceProviderSid = (req) => {
-  try {
-    return validateSid('ServiceProviders', req);
-  } catch (error) {
-    throw error;
-  }
+  const arr = /ServiceProviders\/([^\/]*)/.exec(req.originalUrl);
+  if (arr) return arr[1];
 };
 
 const parseAccountSid = (req) => {
-  try {
-    return validateSid('Accounts', req);
-  } catch (error) {
-    throw error;
-  }
+  const arr = /Accounts\/([^\/]*)/.exec(req.originalUrl);
+  if (arr) return arr[1];
 };
 
-const parseApplicationSid = (req) => {
-  try {
-    return validateSid('Applications', req);
-  } catch (error) {
-    throw error;
-  }
-};
-
-const parseCallSid = (req) => {
-  try {
-    return validateSid('Calls', req);
-  } catch (error) {
-    throw error;
-  }
-};
-
-const parsePhoneNumberSid = (req) => {
-  try {
-    return validateSid('PhoneNumbers', req);
-  } catch (error) {
-    throw error;
-  }
-};
-
-const parseSpeechCredentialSid = (req) => {
-  try {
-    return validateSid('SpeechCredentials', req);
-  } catch (error) {
-    throw error;
-  }
-};
-
-const parseVoipCarrierSid = (req) => {
-  try {
-    return validateSid('VoipCarriers', req);
-  } catch (error) {
-    throw error;
-  }
-};
-
-const parseWebhookSid = (req) => {
-  try {
-    return validateSid('Webhooks', req);
-  } catch (error) {
-    throw error;
-  }
-};
-
-const parseSipGatewaySid = (req) => {
-  try {
-    return validateSid('SipGateways', req);
-  } catch (error) {
-    throw error;
-  }
-};
-
-const parseUserSid = (req) => {
-  try {
-    return validateSid('Users', req);
-  } catch (error) {
-    throw error;
-  }
-};
-
-const parseLcrSid = (req) => {
-  try {
-    return validateSid('Lcrs', req);
-  } catch (error) {
-    throw error;
-  }
-};
-
-const hasAccountPermissions = async(req, res, next) => {
-  try {
-    if (req.user.hasScope('admin')) {
-      return next();
-    }
-
-    if (req.user.hasScope('service_provider')) {
-      const service_provider_sid = parseServiceProviderSid(req);
-      const account_sid = parseAccountSid(req);
-      if (service_provider_sid) {
-        if (service_provider_sid === req.user.service_provider_sid) {
-          return next();
-        }
-      }
-      if (account_sid) {
-        const [r] = await Account.retrieve(account_sid);
-        if (r && r.service_provider_sid === req.user.service_provider_sid) {
-          return next();
-        }
-      }
-    }
-
-    if (req.user.hasScope('account')) {
-      const account_sid = parseAccountSid(req);
-      const service_provider_sid = parseServiceProviderSid(req);
-      const [r] = await Account.retrieve(account_sid);
-
-      if (account_sid) {
-        if (r && r.account_sid === req.user.account_sid) {
-          return next();
-        }
-      }
-
-      if (service_provider_sid) {
-        if (r && r.service_provider_sid === req.user.service_provider_sid) {
-          return next();
-        }
-      }
-    }
-
-    res.status(403).json({
-      status: 'fail',
-      message: 'insufficient privileges'
-    });
-  } catch (error) {
-    throw error;
+const hasAccountPermissions = (req, res, next) => {
+  if (req.user.hasScope('admin')) return next();
+  if (req.user.hasScope('account')) {
+    const account_sid = parseAccountSid(req);
+    if (account_sid === req.user.account_sid) return next();
   }
+  res.status(403).json({
+    status: 'fail',
+    message: 'insufficient privileges'
+  });
 };
 
 const hasServiceProviderPermissions = (req, res, next) => {
-  try {
-    if (req.user.hasScope('admin')) {
-      return next();
-    }
-
-    if (req.user.hasScope('service_provider')) {
-      const service_provider_sid = parseServiceProviderSid(req);
-      if (service_provider_sid === req.user.service_provider_sid) {
-        return next();
-      }
-    }
-
-    res.status(403).json({
-      status: 'fail',
-      message: 'insufficient privileges'
-    });
-  } catch (error) {
-    throw error;
+  if (req.user.hasScope('admin')) return next();
+  if (req.user.hasScope('service_provider')) {
+    const service_provider_sid = parseServiceProviderSid(req);
+    if (service_provider_sid === req.user.service_provider_sid) return next();
   }
-};
-
-const checkLimits = async(req, res, next) => {
-  const logger = req.app.locals.logger;
-  if (process.env.APPLY_JAMBONZ_DB_LIMITS && req.user.hasScope('account')) {
-    const account_sid = req.user.account_sid;
-    const url = req.originalUrl;
-    let sql;
-    let limit;
-
-    if (/Applications/.test(url)) {
-      limit = 50;
-      sql = 'SELECT count(*) as count from applications where account_sid = ?';
-    }
-    else if (/VoipCarriers/.test(url)) {
-      limit = 10;
-      sql = 'SELECT count(*) as count from voip_carriers where account_sid = ?';
-    }
-    else if (/SipGateways/.test(url)) {
-      limit = 150;
-      sql = `SELECT count(*) as count 
-      from sip_gateways 
-      where voip_carrier_sid IN (
-        SELECT voip_carrier_sid from voip_carriers
-        where account_sid = ?
-      )`;
-    }
-    else if (/PhoneNumbers/.test(url)) {
-      limit = 200;
-      sql = 'SELECT count(*) as count from phone_numbers where account_sid = ?';
-    }
-    else if (/SpeechCredentials/.test(url)) {
-      limit = 10;
-      sql = 'SELECT count(*) as count from speech_credentials where account_sid = ?';
-    }
-    else if (/ApiKeys/.test(url)) {
-      limit = 10;
-      sql = 'SELECT count(*) as count from api_keys where account_sid = ?';
-    }
-
-    if (sql) {
-      try {
-        const [r] = await promisePool.execute(sql, [account_sid]);
-        if (r[0].count >= limit) {
-          res.status(422).json({
-            status: 'fail',
-            message: `exceeded limits - you have created ${r.count} instances of this resource`
-          });
-          return;
-        }
-      } catch (err) {
-        logger.error({err}, 'Error checking limits');
-      }
-    }
-  }
-  next();
-};
-
-const getSubspaceJWT = async(id, secret) => {
-  const postJwt = bent('https://id.subspace.com', 'POST', 'json', 200);
-  const jwt = await postJwt('/oauth/token',
-    {
-      client_id: id,
-      client_secret: secret,
-      audience: 'https://api.subspace.com/',
-      grant_type: 'client_credentials',
-    }
-  );
-  return jwt.access_token;
-};
-
-const enableSubspace = async(opts) => {
-  const {subspace_client_id, subspace_client_secret, destination} = opts;
-  const accessToken = await getSubspaceJWT(subspace_client_id, subspace_client_secret);
-  const postTeleport = bent('https://api.subspace.com', 'POST', 'json', 200);
-
-  const teleport = await postTeleport('/v1/sipteleport',
-    {
-      name: 'Jambonz',
-      destination,
-      status: 'ENABLED'
-    },
-    {
-      'Content-Type': 'application/json',
-      Authorization: `Bearer ${accessToken}`
-    }
-  );
-
-  return teleport;
-};
-
-const disableSubspace = async(opts) => {
-  const {subspace_client_id, subspace_client_secret, subspace_sip_teleport_id} = opts;
-  const accessToken = await getSubspaceJWT(subspace_client_id, subspace_client_secret);
-  const relativeUrl = `/v1/sipteleport/${subspace_sip_teleport_id}`;
-  const deleteTeleport = bent('https://api.subspace.com', 'DELETE', 'json', 200);
-  await deleteTeleport(relativeUrl, {},
-    {
-      Authorization: `Bearer ${accessToken}`
-    }
-  );
-  return;
-};
-
-const validatePasswordSettings = async(password) => {
-  const sql = 'SELECT * from password_settings';
-  const [rows] = await promisePool.execute(sql);
-  const specialChars = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]+/;
-  const numbers = /[0-9]+/;
-  if (rows.length === 0) {
-    if (password.length < 8 || password.length > 20) {
-      throw new DbErrorBadRequest('password length must be between 8 and 20');
-    }
-  } else {
-    if (rows[0].min_password_length && password.length < rows[0].min_password_length) {
-      throw new DbErrorBadRequest(`password must be at least ${rows[0].min_password_length} characters long`);
-    }
-
-    if (rows[0].require_digit === 1 && !numbers.test(password)) {
-      throw new DbErrorBadRequest('password must contain at least one digit');
-    }
-
-    if (rows[0].require_special_character === 1 && !specialChars.test(password)) {
-      throw new DbErrorBadRequest('password must contain at least one special character');
-    }
-  }
-  return;
+  res.status(403).json({
+    status: 'fail',
+    message: 'insufficient privileges'
+  });
 };
 
 module.exports = {
@@ -445,20 +172,7 @@ module.exports = {
   createTestCdrs,
   createTestAlerts,
   parseAccountSid,
-  parseApplicationSid,
-  parseCallSid,
-  parsePhoneNumberSid,
   parseServiceProviderSid,
-  parseSpeechCredentialSid,
-  parseVoipCarrierSid,
-  parseWebhookSid,
-  parseSipGatewaySid,
-  parseUserSid,
-  parseLcrSid,
   hasAccountPermissions,
-  hasServiceProviderPermissions,
-  checkLimits,
-  enableSubspace,
-  disableSubspace,
-  validatePasswordSettings
+  hasServiceProviderPermissions
 };

lib/routes/api/voip-carriers.js

@@ -4,7 +4,6 @@ const VoipCarrier = require('../../models/voip-carrier');
 const {promisePool} = require('../../db');
 const decorate = require('./decorate');
 const sysError = require('../error');
-const { parseVoipCarrierSid } = require('./utils');
 
 const validate = async(req) => {
   const {lookupAppBySid, lookupAccountBySid} = req.app.locals;
@@ -74,14 +73,7 @@ decorate(router, VoipCarrier, ['add', 'update', 'delete'], preconditions);
 router.get('/', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    const results = req.user.hasAdminAuth ?
-      await VoipCarrier.retrieveAll(req.user.hasAccountAuth ? req.user.account_sid : null) :
-      await VoipCarrier.retrieveAllForSP(req.user.service_provider_sid);
-
-    if (req.user.hasScope('account')) {
-      return res.status(200).json(results.filter((c) => c.account_sid === req.user.account_sid || !c.account_sid));
-    }
-
+    const results = await VoipCarrier.retrieveAll(req.user.hasAccountAuth ? req.user.account_sid : null);
     res.status(200).json(results);
   } catch (err) {
     sysError(logger, res, err);
@@ -92,24 +84,9 @@ router.get('/', async(req, res) => {
 router.get('/:sid', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    const sid = parseVoipCarrierSid(req);
     const account_sid = req.user.hasAccountAuth ? req.user.account_sid : null;
-    const results = await VoipCarrier.retrieve(sid, account_sid);
+    const results = await VoipCarrier.retrieve(req.params.sid, account_sid);
     if (results.length === 0) return res.status(404).end();
-    const ret = results[0];
-    ret.register_status = JSON.parse(ret.register_status || '{}');
-
-    if (req.user.hasServiceProviderAuth && results.length === 1) {
-      if (results.length === 1 && results[0].service_provider_sid !== req.user.service_provider_sid) {
-        throw new DbErrorBadRequest('insufficient privileges');
-      }
-    }
-    if (req.user.hasAccountAuth && results.length === 1) {
-      if (results.length === 1 && results[0].account_sid !== req.user.account_sid) {
-        throw new DbErrorBadRequest('insufficient privileges');
-      }
-    }
-
     return res.status(200).json(results[0]);
   }
   catch (err) {

lib/routes/api/webhooks.js

@@ -2,37 +2,15 @@ const router = require('express').Router();
 const Webhook = require('../../models/webhook');
 const decorate = require('./decorate');
 const sysError = require('../error');
-const {DbErrorForbidden} = require('../../utils/errors');
-const { parseWebhookSid } = require('./utils');
-const {promisePool} = require('../../db');
 
 decorate(router, Webhook, ['add']);
 
 /* retrieve */
 router.get('/:sid', async(req, res) => {
   const logger = req.app.locals.logger;
-
   try {
-    const sid = parseWebhookSid(req);
-    const results = await Webhook.retrieve(sid);
-
+    const results = await Webhook.retrieve(req.params.sid);
     if (results.length === 0) return res.status(404).end();
-
-    if (req.user.hasAccountAuth) {
-      /* can only update carriers for the user's account */
-      if (results[0].account_sid !== req.user.account_sid) {
-        throw new DbErrorForbidden('insufficient privileges');
-      }
-    }
-    if (req.user.hasServiceProviderAuth) {
-      const [r] = await promisePool.execute(
-        'SELECT service_provider_sid from accounts WHERE account_sid = ?', [results[0].account_sid]
-      );
-      if (r.length === 1 && r[0].service_provider_sid === req.user.service_provider_sid) {
-        return;
-      }
-      throw new DbErrorForbidden('insufficient permissions');
-    }
     return res.status(200).json(results[0]);
   }
   catch (err) {

lib/routes/error.js

@@ -1,15 +1,6 @@
-const {
-  BadRequestError,
-  DbErrorBadRequest,
-  DbErrorUnprocessableRequest,
-  DbErrorForbidden
-} = require('../utils/errors');
+const {DbErrorBadRequest, DbErrorUnprocessableRequest, DbErrorForbidden} = require('../utils/errors');
 
 function sysError(logger, res, err) {
-  if (err instanceof BadRequestError) {
-    logger.info(err, err.message);
-    return res.status(400).json({msg: 'Bad request'});
-  }
   if (err instanceof DbErrorBadRequest) {
     logger.info(err, 'invalid client request');
     return res.status(400).json({msg: err.message});

lib/routes/index.js

@@ -5,17 +5,9 @@ const path = require('path');
 const swaggerDocument = YAML.load(path.resolve(__dirname, '../swagger/swagger.yaml'));
 const api = require('./api');
 const stripe = require('./stripe');
-const {checkLimits} = require('./api/utils');
 
 const routes = express.Router();
 
-routes.post([
-  '/v1/Applications',
-  '/v1/VoipCarriers',
-  '/v1/SipGateways',
-  '/v1/PhoneNumbers',
-  '/v1/Accounts'
-], checkLimits);
 routes.use('/v1', api);
 routes.use('/stripe', stripe);
 routes.use('/swagger', swaggerUi.serve);

lib/routes/stripe/webhook.js

@@ -61,7 +61,8 @@ router.post('/', express.raw({type: 'application/json'}), async(req, res) => {
   }
 
   /* process event */
-  if (evt?.type?.startsWith('invoice.')) handleInvoiceEvents(logger, evt);
+  logger.info(`received webhook: ${evt.type}`);
+  if (evt.type.startsWith('invoice.')) handleInvoiceEvents(logger, evt);
   else {
     logger.debug(evt, 'unhandled stripe webook');
   }

lib/utils/dns-utils.js

@@ -89,12 +89,7 @@ const createDnsRecords = async(logger, domain, name, value, ttl = 3600) => {
       const str = await res.text();
       return JSON.parse(str);
     }
-    let body;
-    try {
-      body = await res.json();
-    } catch (err) {
-    }
-    logger.error({headers: res.headers, body}, `Error creating records, status ${res.statusCode}`);
+    logger.error({res}, 'Error creating records');
   } catch (err) {
     logger.error({err}, 'Error retrieving domains');
   }

lib/utils/email-utils.js

@@ -1,7 +1,6 @@
 const formData = require('form-data');
 const Mailgun = require('mailgun.js');
 const mailgun = new Mailgun(formData);
-const bent = require('bent');
 const validateEmail = (email) => {
   // eslint-disable-next-line max-len
   const re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
@@ -9,67 +8,23 @@ const validateEmail = (email) => {
 };
 
 const emailSimpleText = async(logger, to, subject, text) => {
-  const from = 'jambonz Support <support@jambonz.org>';
-  if (process.env.CUSTOM_EMAIL_VENDOR_URL) {
-    await sendEmailByCustomVendor(logger, from, to, subject, text);
-  } else {
-    await sendEmailByMailgun(logger, from, to, subject, text);
-  }
-
-};
-
-const sendEmailByCustomVendor = async(logger, from, to, subject, text) => {
-  try {
-    const post = bent('POST', {
-      'Content-Type': 'application/json',
-      ...((process.env.CUSTOM_EMAIL_VENDOR_USERNAME && process.env.CUSTOM_EMAIL_VENDOR_PASSWORD) &&
-        ({
-          'Authorization':`Basic ${Buffer.from(
-            `${process.env.CUSTOM_EMAIL_VENDOR_USERNAME}:${process.env.CUSTOM_EMAIL_VENDOR_PASSWORD}`
-          ).toString('base64')}`
-        }))
-    });
-
-    const res = await post(process.env.CUSTOM_EMAIL_VENDOR_URL, {
-      from,
-      to,
-      subject,
-      text
-    });
-    logger.debug({
-      res
-    }, 'sent email to custom vendor.');
-  } catch (err) {
-    logger.info({
-      err
-    }, 'Error sending email From Custom email vendor');
-  }
-};
-
-const sendEmailByMailgun = async(logger, from, to, subject, text) => {
+  const mg = mailgun.client({
+    username: 'api',
+    key: process.env.MAILGUN_API_KEY
+  });
   if (!process.env.MAILGUN_API_KEY) throw new Error('MAILGUN_API_KEY env variable is not defined!');
   if (!process.env.MAILGUN_DOMAIN) throw new Error('MAILGUN_DOMAIN env variable is not defined!');
 
-  const mg = mailgun.client({
-    username: 'api',
-    key: process.env.MAILGUN_API_KEY,
-    ...(process.env.MAILGUN_URL && {url: process.env.MAILGUN_URL})
-  });
-
   try {
     const res = await mg.messages.create(process.env.MAILGUN_DOMAIN, {
-      from,
+      from: 'jambonz Support <support@jambonz.org>',
       to,
       subject,
       text
     });
-    logger.debug({
-      res
-    }, 'sent email');
+    logger.debug({res}, 'sent email');
   } catch (err) {
-    logger.info({
-      err
-    }, 'Error sending email From mailgun');
+    logger.info({err}, 'Error sending email');
   }
 };
 

lib/utils/encrypt-decrypt.js

@@ -1,10 +1,10 @@
 const crypto = require('crypto');
-const algorithm = process.env.LEGACY_CRYPTO ? 'aes-256-ctr' : 'aes-256-cbc';
+const algorithm = 'aes-256-ctr';
 const iv = crypto.randomBytes(16);
 const secretKey = crypto.createHash('sha256')
-  .update(process.env.ENCRYPTION_SECRET || process.env.JWT_SECRET)
+  .update(String(process.env.JWT_SECRET))
   .digest('base64')
-  .substring(0, 32);
+  .substr(0, 32);
 
 const encrypt = (text) => {
   const cipher = crypto.createCipheriv(algorithm, secretKey, iv);
@@ -23,18 +23,7 @@ const decrypt = (data) => {
   return decrpyted.toString();
 };
 
-const obscureKey = (key, key_spoiler_length = 6) => {
-  const key_spoiler_char = 'X';
-
-  if (!key || key.length <= key_spoiler_length) {
-    return key;
-  }
-
-  return `${key.slice(0, key_spoiler_length)}${key_spoiler_char.repeat(key.length - key_spoiler_length)}`;
-};
-
 module.exports = {
   encrypt,
-  decrypt,
-  obscureKey
+  decrypt
 };

lib/utils/errors.js

@@ -1,9 +1,3 @@
-class BadRequestError extends Error {
-  constructor(msg) {
-    super(msg);
-  }
-}
-
 class DbError extends Error {
   constructor(msg) {
     super(msg);
@@ -29,7 +23,6 @@ class DbErrorForbidden extends DbError {
 }
 
 module.exports = {
-  BadRequestError,
   DbError,
   DbErrorBadRequest,
   DbErrorUnprocessableRequest,

lib/utils/free_plans.json

@@ -2,7 +2,7 @@
   "trial": [
     {
       "category": "voice_call_session",
-      "quantity": 5
+      "quantity": 20
     },
     {
       "category": "device",