add inbound and outbound messaging support

.dockerignore

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

.eslintrc.json

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

.github/workflows/ci.yml

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

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

@@ -1,51 +0,0 @@
-name: Docker
-
-on:
-  push:
-    # Publish `main` as Docker `latest` image.
-    branches:
-      - main
-
-    # Publish `v1.2.3` tags as releases.
-    tags:
-      - v*
-
-env:
-  IMAGE_NAME: db-create
-
-jobs:
-  push:
-
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push'
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build image
-        run: docker build . --file Dockerfile.db-create --tag $IMAGE_NAME
-
-      - name: Log into registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
-      - name: Push image
-        run: |
-          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
-
-          # Change all uppercase to lowercase
-          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-
-          # 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
-
-          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:$VERSION

.github/workflows/docker-publish.yml

@@ -1,51 +0,0 @@
-name: Docker
-
-on:
-  push:
-    # Publish `main` as Docker `latest` image.
-    branches:
-      - main
-
-    # Publish `v1.2.3` tags as releases.
-    tags:
-      - v*
-
-env:
-  IMAGE_NAME: api-server
-
-jobs:
-  push:
-
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push'
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build image
-        run: docker build . --file Dockerfile --tag $IMAGE_NAME
-
-      - name: Log into registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
-      - name: Push image
-        run: |
-          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
-
-          # Change all uppercase to lowercase
-          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-
-          # 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
-
-          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:$VERSION

.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

.travis.yml

@@ -0,0 +1,8 @@
+dist: bionic
+language: node_js
+node_js:
+  - "lts/*"
+services:
+  - mysql
+script:
+  - npm test

Dockerfile

@@ -1,23 +1,13 @@
-FROM --platform=linux/amd64 node:18-alpine3.16 as base
+FROM node:lts-alpine
 
-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/
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
 
 ARG NODE_ENV
-
 ENV NODE_ENV $NODE_ENV
 
-CMD [ "node", "app.js" ]
+COPY package.json /usr/src/app/
+RUN npm install
+COPY . /usr/src/app
+
+CMD [ "npm", "start" ]

Dockerfile.db-create

@@ -1,23 +0,0 @@
-FROM --platform=linux/amd64 node:18.9.0-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,4 +1,4 @@
-# jambonz-api-server ![Build Status](https://github.com/jambonz/jambonz-api-server/workflows/CI/badge.svg)
+# jambones-api-server [![Build Status](https://secure.travis-ci.org/jambonz/jambones-api-server.png)](http://travis-ci.org/jambonz/jambones-api-server)
 
 Jambones REST API server.
 

app.js

@@ -9,10 +9,9 @@ const opts = Object.assign({
 const logger = require('pino')(opts);
 const express = require('express');
 const app = express();
-const helmet = require('helmet');
-const rateLimit = require('express-rate-limit');
 const cors = require('cors');
 const passport = require('passport');
+const authStrategy = require('./lib/auth')(logger);
 const routes = require('./lib/routes');
 
 assert.ok(process.env.JAMBONES_MYSQL_HOST &&
@@ -20,28 +19,13 @@ assert.ok(process.env.JAMBONES_MYSQL_HOST &&
   process.env.JAMBONES_MYSQL_PASSWORD &&
   process.env.JAMBONES_MYSQL_DATABASE, 'missing JAMBONES_MYSQL_XXX env vars');
 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');
-const {
-  queryCdrs,
-  queryCdrsSP,
-  queryAlerts,
-  queryAlertsSP,
-  writeCdrs,
-  writeAlerts,
-  AlertType
-} = require('@jambonz/time-series')(
-  logger, process.env.JAMBONES_TIME_SERIES_HOST
-);
+
 const {
   retrieveCall,
   deleteCall,
   listCalls,
   purgeCalls,
-  retrieveSet,
-  addKey,
-  retrieveKey,
-  deleteKey,
-  getTtsVoices
+  retrieveSet
 } = require('@jambonz/realtimedb-helpers')({
   host: process.env.JAMBONES_REDIS_HOST || 'localhost',
   port: process.env.JAMBONES_REDIS_PORT || 6379
@@ -50,51 +34,31 @@ const {
   lookupAppBySid,
   lookupAccountBySid,
   lookupAccountByPhoneNumber,
-  lookupAppByPhoneNumber,
-  lookupCarrierBySid,
-  lookupSipGatewayBySid,
-  lookupSmppGatewayBySid
+  lookupAppByPhoneNumber
 } = require('@jambonz/db-helpers')({
   host: process.env.JAMBONES_MYSQL_HOST,
   user: process.env.JAMBONES_MYSQL_USER,
-  port: process.env.JAMBONES_MYSQL_PORT || 3306,
   password: process.env.JAMBONES_MYSQL_PASSWORD,
   database: process.env.JAMBONES_MYSQL_DATABASE,
   connectionLimit: process.env.JAMBONES_MYSQL_CONNECTION_LIMIT || 10
 }, logger);
 const PORT = process.env.HTTP_PORT || 3000;
-const authStrategy = require('./lib/auth')(logger, retrieveKey);
 
 passport.use(authStrategy);
 
 app.locals = app.locals || {};
-app.locals = {
-  ...app.locals,
+Object.assign(app.locals, {
   logger,
   retrieveCall,
   deleteCall,
   listCalls,
   purgeCalls,
   retrieveSet,
-  addKey,
-  retrieveKey,
-  deleteKey,
-  getTtsVoices,
   lookupAppBySid,
   lookupAccountBySid,
   lookupAccountByPhoneNumber,
-  lookupAppByPhoneNumber,
-  lookupCarrierBySid,
-  lookupSipGatewayBySid,
-  lookupSmppGatewayBySid,
-  queryCdrs,
-  queryCdrsSP,
-  queryAlerts,
-  queryAlertsSP,
-  writeCdrs,
-  writeAlerts,
-  AlertType
-};
+  lookupAppByPhoneNumber
+});
 
 const unless = (paths, middleware) => {
   return (req, res, next) => {
@@ -103,43 +67,14 @@ 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
-});
-
-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(passport.initialize());
 app.use(cors());
-app.use(express.urlencoded({extended: true}));
-app.use(unless(['/stripe'], express.json()));
-app.use('/v1', unless(
-  [
-    '/register',
-    '/forgot-password',
-    '/signin',
-    '/login',
-    '/messaging',
-    '/outboundSMS',
-    '/AccountTest',
-    '/InviteCodes',
-    '/PredefinedCarriers'
-  ], passport.authenticate('bearer', {session: false})));
+app.use(express.urlencoded({
+  extended: true
+}));
+app.use(express.json());
+app.use('/v1', unless(['/login', '/Users', '/messaging', '/outboundSMS'], passport.authenticate('bearer', {
+  session: false
+})));
 app.use('/', routes);
 app.use((err, req, res, next) => {
   logger.error(err, 'burped error');

db/add-predefined-carriers.sql

@@ -1,50 +0,0 @@
-
--- create predefined carriers
-insert into predefined_carriers (predefined_carrier_sid, name, requires_static_ip, e164_leading_plus, 
-requires_register, register_username, register_password, 
-register_sip_realm, tech_prefix, inbound_auth_username, inbound_auth_password, diversion)
-VALUES
-('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
-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);
-
--- twilio gateways
-insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
-VALUES
-('d2ccfcb1-9198-4fe9-a0ca-6e49395837c4', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.172.60.0', 30, 5060, 1, 0),
-('6b1d0032-4430-41f1-87c6-f22233d394ef', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.244.51.0', 30, 5060, 1, 0),
-('0de40217-8bd5-4aa8-a9fd-1994282953c6', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.171.127.192', 30, 5060, 1, 0),
-('37bc0b20-b53c-4c31-95a6-f82b1c3713e3', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '35.156.191.128', 30, 5060, 1, 0),
-('39791f4e-b612-4882-a37e-e92711a39f3f', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.65.63.192', 30, 5060, 1, 0),
-('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),
-('3ed1dd12-e1a7-44ff-811a-3cc5dc13dc72', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '<your-domain>.pstn.twilio.com', 32, 5060, 0, 1);
-
--- voxbone gateways
-insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
-VALUES
-('d531c582-2103-42a0-b9f0-f80c215b3ec5', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.83.45', 32, 5060, 1, 0),
-('95c888e5-c959-4d92-82c4-8597dddff75e', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.86.45', 32, 5060, 1, 0),
-('1de3b2a1-96f0-407a-bcc4-ce371d823a8d', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.82.45', 32, 5060, 1, 0),
-('50c1f91a-6080-4495-a241-6bba6e9d9688', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.85.45', 32, 5060, 1, 0),
-('e6ebad33-80d5-4dbb-bc6f-a7ae08160cc6', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.84.45', 32, 5060, 1, 0),
-('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);
-
--- 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),
-('5f431d42-48e4-44ce-a311-d946f0b475b6', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', 'out.simwood.com', 32, 5060, 0, 1);

db/create-default-account.sql

@@ -1,4 +1,4 @@
 insert into service_providers (service_provider_sid, name) 
 values ('2708b1b3-2736-40ea-b502-c53d8396247f', 'default service provider');
-insert into accounts (account_sid, service_provider_sid, name, webhook_secret) 
-values ('9351f46a-678c-43f5-b8a6-d4eb58d131af','2708b1b3-2736-40ea-b502-c53d8396247f', 'default account', 'foobar');
+insert into accounts (account_sid, service_provider_sid, name) 
+values ('9351f46a-678c-43f5-b8a6-d4eb58d131af','2708b1b3-2736-40ea-b502-c53d8396247f', 'default account');

db/create_test_db.sql

@@ -1,3 +1,3 @@
 create database jambones_test;
-create user jambones_test@'%' IDENTIFIED WITH mysql_native_password by 'jambones_test';
-grant all on jambones_test.* to jambones_test@'%';
+create user jambones_test@localhost IDENTIFIED WITH mysql_native_password by 'jambones_test';
+grant all on jambones_test.* to jambones_test@localhost;

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

@@ -2,60 +2,20 @@
 
 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;
-
-DROP TABLE IF EXISTS beta_invite_codes;
-
 DROP TABLE IF EXISTS call_routes;
 
-DROP TABLE IF EXISTS dns_records;
-
 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 speech_credentials;
+DROP TABLE IF EXISTS sbc_addresses;
 
 DROP TABLE IF EXISTS users;
 
-DROP TABLE IF EXISTS smpp_gateways;
-
 DROP TABLE IF EXISTS phone_numbers;
 
 DROP TABLE IF EXISTS sip_gateways;
@@ -70,50 +30,6 @@ DROP TABLE IF EXISTS service_providers;
 
 DROP TABLE IF EXISTS webhooks;
 
-CREATE TABLE account_static_ips
-(
-account_static_ip_sid CHAR(36) NOT NULL UNIQUE ,
-account_sid CHAR(36) NOT NULL,
-public_ipv4 VARCHAR(16) NOT NULL UNIQUE ,
-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 ,
-account_sid CHAR(36) NOT NULL,
-pending BOOLEAN NOT NULL DEFAULT false,
-effective_start_date DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-effective_end_date DATETIME,
-change_reason VARCHAR(255),
-stripe_subscription_id VARCHAR(56),
-stripe_payment_method_id VARCHAR(56),
-stripe_statement_descriptor VARCHAR(255),
-last4 VARCHAR(512),
-exp_month INTEGER,
-exp_year INTEGER,
-card_type VARCHAR(16),
-pending_reason VARBINARY(52),
-PRIMARY KEY (account_subscription_sid)
-);
-
-CREATE TABLE beta_invite_codes
-(
-invite_code CHAR(6) NOT NULL UNIQUE ,
-in_use BOOLEAN NOT NULL DEFAULT false,
-PRIMARY KEY (invite_code)
-);
-
 CREATE TABLE call_routes
 (
 call_route_sid CHAR(36) NOT NULL UNIQUE ,
@@ -122,16 +38,7 @@ account_sid CHAR(36) NOT NULL,
 regex VARCHAR(255) NOT NULL,
 application_sid CHAR(36) NOT NULL,
 PRIMARY KEY (call_route_sid)
-) COMMENT='a regex-based pattern match for call routing';
-
-CREATE TABLE dns_records
-(
-dns_record_sid CHAR(36) NOT NULL UNIQUE ,
-account_sid CHAR(36) NOT NULL,
-record_type VARCHAR(6) NOT NULL,
-record_id INTEGER NOT NULL,
-PRIMARY KEY (dns_record_sid)
-);
+) ENGINE=InnoDB COMMENT='a regex-based pattern match for call routing';
 
 CREATE TABLE lcr_routes
 (
@@ -142,115 +49,17 @@ priority INTEGER NOT NULL UNIQUE  COMMENT 'lower priority routes are attempted f
 PRIMARY KEY (lcr_route_sid)
 ) COMMENT='Least cost routing table';
 
-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)
-);
-
-CREATE TABLE predefined_carriers
-(
-predefined_carrier_sid CHAR(36) NOT NULL UNIQUE ,
-name VARCHAR(64) NOT NULL,
-requires_static_ip BOOLEAN NOT NULL DEFAULT false,
-e164_leading_plus BOOLEAN NOT NULL DEFAULT false COMMENT 'if true, a leading plus should be prepended to outbound phone numbers',
-requires_register BOOLEAN NOT NULL DEFAULT false,
-register_username VARCHAR(64),
-register_sip_realm VARCHAR(64),
-register_password VARCHAR(64),
-tech_prefix VARCHAR(16) COMMENT 'tech prefix to prepend to outbound calls to this carrier',
-inbound_auth_username VARCHAR(64),
-inbound_auth_password VARCHAR(64),
-diversion VARCHAR(32),
-PRIMARY KEY (predefined_carrier_sid)
-);
-
-CREATE TABLE predefined_sip_gateways
-(
-predefined_sip_gateway_sid CHAR(36) NOT NULL UNIQUE ,
-ipv4 VARCHAR(128) NOT NULL COMMENT 'ip address or DNS name of the gateway.  For gateways providing inbound calling service, ip address is required.',
-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',
-netmask INTEGER NOT NULL DEFAULT 32,
-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 ,
-name VARCHAR(32) NOT NULL,
-category ENUM('api_rate','voice_call_session', 'device') NOT NULL,
-PRIMARY KEY (product_sid)
-);
-
-CREATE TABLE account_products
-(
-account_product_sid CHAR(36) NOT NULL UNIQUE ,
-account_subscription_sid CHAR(36) NOT NULL,
-product_sid CHAR(36) NOT NULL,
-quantity INTEGER NOT NULL,
-PRIMARY KEY (account_product_sid)
-);
-
-CREATE TABLE account_offers
-(
-account_offer_sid CHAR(36) NOT NULL UNIQUE ,
-account_sid CHAR(36) NOT NULL,
-product_sid CHAR(36) NOT NULL,
-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 ,
 token CHAR(36) NOT NULL UNIQUE ,
 account_sid CHAR(36),
 service_provider_sid CHAR(36),
-expires_at TIMESTAMP NULL  DEFAULT NULL,
-last_used TIMESTAMP NULL  DEFAULT NULL,
+expires_at TIMESTAMP NULL,
+last_used TIMESTAMP NULL,
 created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (api_key_sid)
-) COMMENT='An authorization token that is used to access the REST api';
-
-CREATE TABLE sbc_addresses
-(
-sbc_address_sid CHAR(36) NOT NULL UNIQUE ,
-ipv4 VARCHAR(255) NOT NULL,
-port INTEGER NOT NULL DEFAULT 5060,
-service_provider_sid CHAR(36),
-PRIMARY KEY (sbc_address_sid)
-);
+) ENGINE=InnoDB COMMENT='An authorization token that is used to access the REST api';
 
 CREATE TABLE ms_teams_tenants
 (
@@ -262,142 +71,60 @@ tenant_fqdn VARCHAR(255) NOT NULL UNIQUE ,
 PRIMARY KEY (ms_teams_tenant_sid)
 ) COMMENT='A Microsoft Teams customer tenant';
 
-CREATE TABLE service_provider_limits
+CREATE TABLE sbc_addresses
 (
-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,
-name VARCHAR(255),
-signed_up_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-PRIMARY KEY (email)
-);
-
-CREATE TABLE smpp_addresses
-(
-smpp_address_sid CHAR(36) NOT NULL UNIQUE ,
+sbc_address_sid CHAR(36) NOT NULL UNIQUE ,
 ipv4 VARCHAR(255) NOT NULL,
 port INTEGER NOT NULL DEFAULT 5060,
-use_tls BOOLEAN NOT NULL DEFAULT 0,
-is_primary BOOLEAN NOT NULL DEFAULT 1,
 service_provider_sid CHAR(36),
-PRIMARY KEY (smpp_address_sid)
-);
-
-CREATE TABLE speech_credentials
-(
-speech_credential_sid CHAR(36) NOT NULL UNIQUE ,
-service_provider_sid CHAR(36),
-account_sid CHAR(36),
-vendor VARCHAR(32) NOT NULL,
-credential VARCHAR(8192) NOT NULL,
-use_for_tts BOOLEAN DEFAULT true,
-use_for_stt BOOLEAN DEFAULT true,
-last_used DATETIME,
-last_tested DATETIME,
-tts_tested_ok BOOLEAN,
-stt_tested_ok BOOLEAN,
-created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-PRIMARY KEY (speech_credential_sid)
+PRIMARY KEY (sbc_address_sid)
 );
 
 CREATE TABLE users
 (
 user_sid CHAR(36) NOT NULL UNIQUE ,
-name VARCHAR(255) NOT NULL,
-email VARCHAR(255) NOT NULL,
-pending_email VARCHAR(255),
-phone VARCHAR(20) UNIQUE ,
-hashed_password VARCHAR(1024),
-account_sid CHAR(36),
-service_provider_sid CHAR(36),
-force_change BOOLEAN NOT NULL DEFAULT FALSE,
-provider VARCHAR(255) NOT NULL,
-provider_userid VARCHAR(255),
-scope VARCHAR(16) NOT NULL DEFAULT 'read-write',
-phone_activation_code VARCHAR(16),
-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,
+name CHAR(36) NOT NULL UNIQUE ,
+hashed_password VARCHAR(1024) NOT NULL,
+salt CHAR(16) NOT NULL,
+force_change BOOLEAN NOT NULL DEFAULT TRUE,
 PRIMARY KEY (user_sid)
 );
 
 CREATE TABLE voip_carriers
 (
 voip_carrier_sid CHAR(36) NOT NULL UNIQUE ,
-name VARCHAR(64) NOT NULL,
+name VARCHAR(64) NOT NULL UNIQUE ,
 description VARCHAR(255),
-account_sid CHAR(36) COMMENT 'if provided, indicates this entity represents a sip trunk that is associated with a specific account',
-service_provider_sid CHAR(36),
+account_sid CHAR(36) COMMENT 'if provided, indicates this entity represents a customer PBX that is associated with a specific account',
 application_sid CHAR(36) COMMENT 'If provided, all incoming calls from this source will be routed to the associated application',
-e164_leading_plus BOOLEAN NOT NULL DEFAULT false COMMENT 'if true, a leading plus should be prepended to outbound phone numbers',
-requires_register BOOLEAN NOT NULL DEFAULT false,
-register_username VARCHAR(64),
-register_sip_realm VARCHAR(64),
-register_password VARCHAR(64),
-tech_prefix VARCHAR(16) COMMENT 'tech prefix to prepend to outbound calls to this carrier',
-inbound_auth_username VARCHAR(64),
-inbound_auth_password VARCHAR(64),
-diversion VARCHAR(32),
-is_active BOOLEAN NOT NULL DEFAULT true,
-created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-smpp_system_id VARCHAR(255),
-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,
+e164_leading_plus BOOLEAN NOT NULL DEFAULT false,
 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 ,
-ipv4 VARCHAR(128) NOT NULL,
-port INTEGER NOT NULL DEFAULT 2775,
-netmask INTEGER NOT NULL DEFAULT 32,
-is_primary BOOLEAN NOT NULL DEFAULT 1,
-inbound BOOLEAN NOT NULL DEFAULT 0 COMMENT 'if true, whitelist this IP to allow inbound calls from the gateway',
-outbound BOOLEAN NOT NULL DEFAULT 1 COMMENT 'if true, include in least-cost routing when placing calls to the PSTN',
-use_tls BOOLEAN DEFAULT 0,
-voip_carrier_sid CHAR(36) NOT NULL,
-PRIMARY KEY (smpp_gateway_sid)
-);
+) ENGINE=InnoDB COMMENT='A Carrier or customer PBX that can send or receive calls';
 
 CREATE TABLE phone_numbers
 (
 phone_number_sid CHAR(36) UNIQUE ,
-number VARCHAR(132) NOT NULL UNIQUE ,
-voip_carrier_sid CHAR(36),
+number VARCHAR(32) NOT NULL UNIQUE ,
+voip_carrier_sid CHAR(36) NOT NULL,
 account_sid CHAR(36),
 application_sid CHAR(36),
-service_provider_sid CHAR(36) COMMENT 'if not null, this number is a test number for the associated service provider',
 PRIMARY KEY (phone_number_sid)
-) COMMENT='A phone number that has been assigned to an account';
+) ENGINE=InnoDB COMMENT='A phone number that has been assigned to an account';
+
+CREATE TABLE webhooks
+(
+webhook_sid CHAR(36) NOT NULL UNIQUE ,
+url VARCHAR(1024) NOT NULL,
+method ENUM("GET","POST") NOT NULL DEFAULT 'POST',
+username VARCHAR(255),
+password VARCHAR(255),
+PRIMARY KEY (webhook_sid)
+) COMMENT='An HTTP callback';
 
 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 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',
@@ -416,34 +143,21 @@ priority INTEGER NOT NULL DEFAULT 0 COMMENT 'lower priority carriers are attempt
 PRIMARY KEY (lcr_carrier_set_entry_sid)
 ) COMMENT='An entry in the LCR routing list';
 
-CREATE TABLE webhooks
-(
-webhook_sid CHAR(36) NOT NULL UNIQUE ,
-url VARCHAR(1024) NOT NULL,
-method ENUM("GET","POST") NOT NULL DEFAULT 'POST',
-username VARCHAR(255),
-password VARCHAR(255),
-PRIMARY KEY (webhook_sid)
-) COMMENT='An HTTP callback';
-
 CREATE TABLE applications
 (
 application_sid CHAR(36) NOT NULL UNIQUE ,
 name VARCHAR(64) NOT NULL,
-service_provider_sid CHAR(36) COMMENT 'if non-null, this application is a test application that can be used by any account under the associated service provider',
-account_sid CHAR(36) COMMENT 'account that this application belongs to (if null, this is a service provider test application)',
+account_sid CHAR(36) NOT NULL COMMENT 'account that this application belongs to',
 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(64),
 speech_recognizer_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_recognizer_language VARCHAR(64) NOT NULL DEFAULT 'en-US',
-created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (application_sid)
-) COMMENT='A defined set of behaviors to be applied to phone calls ';
+) ENGINE=InnoDB COMMENT='A defined set of behaviors to be applied to phone calls ';
 
 CREATE TABLE service_providers
 (
@@ -454,7 +168,7 @@ root_domain VARCHAR(128) UNIQUE ,
 registration_hook_sid CHAR(36),
 ms_teams_fqdn VARCHAR(255),
 PRIMARY KEY (service_provider_sid)
-) COMMENT='A partition of the platform used by one service provider';
+) ENGINE=InnoDB COMMENT='A partition of the platform used by one service provider';
 
 CREATE TABLE accounts
 (
@@ -463,166 +177,67 @@ name VARCHAR(64) NOT NULL,
 sip_realm VARCHAR(132) UNIQUE  COMMENT 'sip domain that will be used for devices registering under this account',
 service_provider_sid CHAR(36) NOT NULL COMMENT 'service provider that owns the customer relationship with this account',
 registration_hook_sid CHAR(36) COMMENT 'webhook to call when devices underr this account attempt to register',
-queue_event_hook_sid CHAR(36),
 device_calling_application_sid CHAR(36) COMMENT 'application to use for outbound calling from an account',
 is_active BOOLEAN NOT NULL DEFAULT true,
-created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-plan_type ENUM('trial','free','paid') NOT NULL DEFAULT 'trial',
-stripe_customer_id VARCHAR(56),
-webhook_secret VARCHAR(36) NOT NULL,
-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),
 PRIMARY KEY (account_sid)
-) COMMENT='An enterprise that uses the platform for comm services';
+) ENGINE=InnoDB COMMENT='An enterprise that uses the platform for comm services';
 
-CREATE INDEX account_static_ip_sid_idx ON account_static_ips (account_static_ip_sid);
-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);
-
-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 (account_sid) REFERENCES accounts (account_sid);
 
 ALTER TABLE call_routes ADD FOREIGN KEY application_sid_idxfk (application_sid) REFERENCES applications (application_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);
-
-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);
-ALTER TABLE account_products ADD FOREIGN KEY account_subscription_sid_idxfk (account_subscription_sid) REFERENCES account_subscriptions (account_subscription_sid);
-
-ALTER TABLE account_products ADD FOREIGN KEY product_sid_idxfk (product_sid) REFERENCES products (product_sid);
-
-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);
-
-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_1 (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);
 
-CREATE INDEX sbc_addresses_idx_host_port ON sbc_addresses (ipv4,port);
-
-CREATE INDEX sbc_address_sid_idx ON sbc_addresses (sbc_address_sid);
-CREATE INDEX service_provider_sid_idx ON sbc_addresses (service_provider_sid);
-ALTER TABLE sbc_addresses ADD FOREIGN KEY service_provider_sid_idxfk_1 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
-
 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 service_provider_sid_idxfk_1 (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_2 (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 sbc_addresses_idx_host_port ON sbc_addresses (ipv4,port);
 
-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);
-
-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);
-
-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 sbc_address_sid_idx ON sbc_addresses (sbc_address_sid);
+CREATE INDEX service_provider_sid_idx ON sbc_addresses (service_provider_sid);
+ALTER TABLE sbc_addresses ADD FOREIGN KEY service_provider_sid_idxfk_2 (service_provider_sid) REFERENCES service_providers (service_provider_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);
-
-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);
-
-CREATE INDEX email_activation_code_idx ON users (email_activation_code);
+CREATE INDEX name_idx ON users (name);
 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);
-
-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);
+CREATE INDEX name_idx ON voip_carriers (name);
+ALTER TABLE voip_carriers ADD FOREIGN KEY account_sid_idxfk_3 (account_sid) REFERENCES accounts (account_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 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 voip_carrier_sid_idxfk (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_4 (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);
+CREATE INDEX webhook_sid_idx ON webhooks (webhook_sid);
+CREATE UNIQUE INDEX sip_gateway_idx_hostport ON sip_gateways (ipv4,port);
 
-CREATE INDEX sip_gateway_idx_hostport ON sip_gateways (ipv4,port);
-
-CREATE INDEX voip_carrier_sid_idx ON sip_gateways (voip_carrier_sid);
-ALTER TABLE sip_gateways ADD FOREIGN KEY voip_carrier_sid_idxfk_2 (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_sid);
+ALTER TABLE sip_gateways ADD FOREIGN KEY voip_carrier_sid_idxfk_1 (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_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);
+ALTER TABLE lcr_carrier_set_entry ADD FOREIGN KEY voip_carrier_sid_idxfk_2 (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_sid);
 
-CREATE INDEX webhook_sid_idx ON webhooks (webhook_sid);
 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);
-
 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_5 (account_sid) REFERENCES accounts (account_sid);
 
 ALTER TABLE applications ADD FOREIGN KEY call_hook_sid_idxfk (call_hook_sid) REFERENCES webhooks (webhook_sid);
 
@@ -638,14 +253,10 @@ 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_3 (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);
 
-ALTER TABLE accounts ADD FOREIGN KEY queue_event_hook_sid_idxfk (queue_event_hook_sid) REFERENCES webhooks (webhook_sid);
-
 ALTER TABLE accounts ADD FOREIGN KEY device_calling_application_sid_idxfk (device_calling_application_sid) REFERENCES applications (application_sid);
 
-ALTER TABLE accounts ADD FOREIGN KEY siprec_hook_sid_idxfk (siprec_hook_sid) REFERENCES applications (application_sid);
-
-SET FOREIGN_KEY_CHECKS=1;
+SET FOREIGN_KEY_CHECKS=1;

db/reset_admin_password.js

@@ -1,59 +1,71 @@
 #!/usr/bin/env node
-const {promisePool} = require('../lib/db');
-const { v4: uuidv4 } = require('uuid');
-const {generateHashedPassword} = require('../lib/utils/password-utils');
+const {getMysqlConnection} = require('../lib/db');
+const crypto = require('crypto');
+const uuidv4 = require('uuid/v4');
 const sqlInsert = `INSERT into users 
-(user_sid, name, email, hashed_password, force_change, provider, email_validated) 
-values (?, ?, ?, ?, ?, ?, ?)
+(user_sid, name, hashed_password, salt) 
+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) 
-VALUES (?, ?, ?)`;
-const sqlInsertPermissions = `
-INSERT into user_permissions (user_permissions_sid, user_sid, permission_sid) 
-VALUES (?,?,?)`;
+const sqlChangeAdminToken = `UPDATE api_keys set token = ? 
+WHERE account_sid IS NULL 
+AND service_provider_sid IS NULL`;
 
-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 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,
-    [
-      sid,
-      'admin',
-      'joe@foo.bar',
-      passwordHash,
-      1,
-      'local',
-      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]);
-  }
-
-  /* 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]);
-  }
-
-  process.exit(0);
+/**
+ * generates random string of characters i.e salt
+ * @function
+ * @param {number} length - Length of the random string.
+ */
+const genRandomString = (len) => {
+  return crypto.randomBytes(Math.ceil(len / 2))
+    .toString('hex') /** convert to hexadecimal format */
+    .slice(0, len);   /** return required number of characters */
 };
 
-doIt();
+/**
+ * hash password with sha512.
+ * @function
+ * @param {string} password - List of required fields.
+ * @param {string} salt - Data to be validated.
+ */
+const sha512 = function(password, salt) {
+  const hash = crypto.createHmac('sha512', salt); /** Hashing algorithm sha512 */
+  hash.update(password);
+  var value = hash.digest('hex');
+  return {
+    salt:salt,
+    passwordHash:value
+  };
+};
+
+const saltHashPassword = (userpassword) => {
+  var salt = genRandomString(16); /** Gives us salt of length 16 */
+  return sha512(userpassword, salt);
+};
+
+/* reset admin password */
+getMysqlConnection((err, conn) => {
+  if (err) return console.log(err, 'Error connecting to database');
+
+  /* delete admin user if it exists */
+  conn.query('DELETE from users where name = "admin"', (err) => {
+    if (err) return console.log(err, 'Error removing admin user');
+    const {salt, passwordHash} = saltHashPassword('admin');
+    const sid = uuidv4();
+    conn.query(sqlInsert, [
+      sid,
+      'admin',
+      passwordHash,
+      salt
+    ], (err) => {
+      if (err) return console.log(err, 'Error inserting admin user');
+      console.log('successfully reset admin password');
+      const uuid = uuidv4();
+      conn.query(sqlChangeAdminToken, [uuid], (err) => {
+        if (err) return console.log(err, 'Error updating admin token');
+        console.log('successfully changed admin tokens');
+        conn.release();
+        process.exit(0);
+      });
+    });
+  });
+});

db/seed-integration-test.sql

@@ -1,106 +0,0 @@
-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) 
-values('de5ed2f1-bccd-4600-a95e-cef46e9a3a4f', '3.34.102.122', 5060);
-insert into smpp_addresses (smpp_address_sid, ipv4, port, use_tls, is_primary) 
-values('de5ed2f1-bccd-4600-a95e-cef46e9a3a4f', '34.197.99.29', 2775, 0, 1);
-insert into smpp_addresses (smpp_address_sid, ipv4, port, use_tls, is_primary) 
-values('049078a0', '3.209.58.102', 3550, 1, 1);
-
--- 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');
-
--- 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.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 two applications
-insert into webhooks(webhook_sid, url, method)
-values 
-('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'),
-('4ca2fb6a-8636-4f2e-96ff-8966c5e26f8e', '9351f46a-678c-43f5-b8a6-d4eb58d131af', 'dial time', '81844b05-714d-4295-8bf3-3b0640a4bf02', '84e3db00-b172-4e46-b54b-a503fdb19e4a', 'google', 'en-US', 'en-US-Wavenet-C', 'google', 'en-US');
-
--- create our products
-insert into products (product_sid, name, category)
-values
-('c4403cdb-8e75-4b27-9726-7d8315e3216d', 'concurrent call session', 'voice_call_session'),
-('2c815913-5c26-4004-b748-183b459329df', 'registered device', 'device'),
-('35a9fb10-233d-4eb9-aada-78de5814d680', 'api call', 'api_rate');
-
--- create predefined carriers
-insert into predefined_carriers (predefined_carrier_sid, name, requires_static_ip, e164_leading_plus, 
-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>'),
-('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
-('d2ccfcb1-9198-4fe9-a0ca-6e49395837c4', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.172.60.0', 30, 5060, 1, 0),
-('6b1d0032-4430-41f1-87c6-f22233d394ef', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.244.51.0', 30, 5060, 1, 0),
-('0de40217-8bd5-4aa8-a9fd-1994282953c6', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.171.127.192', 30, 5060, 1, 0),
-('37bc0b20-b53c-4c31-95a6-f82b1c3713e3', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '35.156.191.128', 30, 5060, 1, 0),
-('39791f4e-b612-4882-a37e-e92711a39f3f', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.65.63.192', 30, 5060, 1, 0),
-('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),
-('3ed1dd12-e1a7-44ff-811a-3cc5dc13dc72', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '<your-domain>.pstn.twilio.com', 32, 5060, 0, 1);
-
--- voxbone gateways
-insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
-VALUES
-('d531c582-2103-42a0-b9f0-f80c215b3ec5', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.83.45', 32, 5060, 1, 0),
-('95c888e5-c959-4d92-82c4-8597dddff75e', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.86.45', 32, 5060, 1, 0),
-('1de3b2a1-96f0-407a-bcc4-ce371d823a8d', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.82.45', 32, 5060, 1, 0),
-('50c1f91a-6080-4495-a241-6bba6e9d9688', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.85.45', 32, 5060, 1, 0),
-('e6ebad33-80d5-4dbb-bc6f-a7ae08160cc6', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.84.45', 32, 5060, 1, 0),
-('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);
-
--- 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),
-('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,102 +0,0 @@
-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');
-
--- create one service provider and one account
-insert into service_providers (service_provider_sid, name) 
-values ('2708b1b3-2736-40ea-b502-c53d8396247f', 'default service provider');
-
-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');
-
-insert into api_keys (api_key_sid, token, account_sid) 
-values ('09e92f3c-9d73-4303-b63f-3668574862ce', '1cf2f4f4-64c4-4249-9a3e-5bb4cb597c2a', '9351f46a-678c-43f5-b8a6-d4eb58d131af');
-
--- create two applications
-insert into webhooks(webhook_sid, url, method)
-values 
-('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'),
-('4ca2fb6a-8636-4f2e-96ff-8966c5e26f8e', '9351f46a-678c-43f5-b8a6-d4eb58d131af', 'dial time', '81844b05-714d-4295-8bf3-3b0640a4bf02', '84e3db00-b172-4e46-b54b-a503fdb19e4a', 'google', 'en-US', 'en-US-Wavenet-C', 'google', 'en-US');
-
--- create our products
-insert into products (product_sid, name, category)
-values
-('c4403cdb-8e75-4b27-9726-7d8315e3216d', 'concurrent call session', 'voice_call_session'),
-('2c815913-5c26-4004-b748-183b459329df', 'registered device', 'device'),
-('35a9fb10-233d-4eb9-aada-78de5814d680', 'api call', 'api_rate');
-
--- create predefined carriers
-insert into predefined_carriers (predefined_carrier_sid, name, requires_static_ip, e164_leading_plus, 
-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>'),
-('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
-('d2ccfcb1-9198-4fe9-a0ca-6e49395837c4', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.172.60.0', 30, 5060, 1, 0),
-('6b1d0032-4430-41f1-87c6-f22233d394ef', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.244.51.0', 30, 5060, 1, 0),
-('0de40217-8bd5-4aa8-a9fd-1994282953c6', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.171.127.192', 30, 5060, 1, 0),
-('48b108e3-1ce7-4f18-a4cb-e41e63688bdf', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.171.127.193', 30, 5060, 1, 0),
-('d9131a69-fe44-4c2a-ba82-4adc81f628dd', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.171.127.194', 30, 5060, 1, 0),
-('34a6a311-4bd6-49ca-aa77-edd3cb92c6e1', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.171.127.195', 30, 5060, 1, 0),
-('37bc0b20-b53c-4c31-95a6-f82b1c3713e3', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '35.156.191.128', 30, 5060, 1, 0),
-('39791f4e-b612-4882-a37e-e92711a39f3f', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.65.63.192', 30, 5060, 1, 0),
-('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),
-('3ed1dd12-e1a7-44ff-811a-3cc5dc13dc72', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '<your-domain>.pstn.twilio.com', 32, 5060, 0, 1);
-
--- voxbone gateways
-insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
-VALUES
-('d531c582-2103-42a0-b9f0-f80c215b3ec5', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.83.45', 32, 5060, 1, 0),
-('95c888e5-c959-4d92-82c4-8597dddff75e', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.86.45', 32, 5060, 1, 0),
-('1de3b2a1-96f0-407a-bcc4-ce371d823a8d', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.82.45', 32, 5060, 1, 0),
-('50c1f91a-6080-4495-a241-6bba6e9d9688', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.85.45', 32, 5060, 1, 0),
-('e6ebad33-80d5-4dbb-bc6f-a7ae08160cc6', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.84.45', 32, 5060, 1, 0),
-('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);
-
--- 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),
-('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,79 +0,0 @@
-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');
-insert into api_keys (api_key_sid, token) 
-values ('3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', '38700987-c7a4-4685-a5bb-af378f9734de');
-
--- create our products
-insert into products (product_sid, name, category)
-values
-('c4403cdb-8e75-4b27-9726-7d8315e3216d', 'concurrent call session', 'voice_call_session'),
-('2c815913-5c26-4004-b748-183b459329df', 'registered device', 'device'),
-('35a9fb10-233d-4eb9-aada-78de5814d680', 'api call', 'api_rate');
-
--- create predefined carriers
-insert into predefined_carriers (predefined_carrier_sid, name, requires_static_ip, e164_leading_plus, 
-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>'),
-('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
-('d2ccfcb1-9198-4fe9-a0ca-6e49395837c4', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.172.60.0', 30, 5060, 1, 0),
-('6b1d0032-4430-41f1-87c6-f22233d394ef', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.244.51.0', 30, 5060, 1, 0),
-('0de40217-8bd5-4aa8-a9fd-1994282953c6', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.171.127.192', 30, 5060, 1, 0),
-('37bc0b20-b53c-4c31-95a6-f82b1c3713e3', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '35.156.191.128', 30, 5060, 1, 0),
-('39791f4e-b612-4882-a37e-e92711a39f3f', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.65.63.192', 30, 5060, 1, 0),
-('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),
-('3ed1dd12-e1a7-44ff-811a-3cc5dc13dc72', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '<your-domain>.pstn.twilio.com', 32, 5060, 0, 1);
-
--- voxbone gateways
-insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
-VALUES
-('d531c582-2103-42a0-b9f0-f80c215b3ec5', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.83.45', 32, 5060, 1, 0),
-('95c888e5-c959-4d92-82c4-8597dddff75e', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.86.45', 32, 5060, 1, 0),
-('1de3b2a1-96f0-407a-bcc4-ce371d823a8d', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.82.45', 32, 5060, 1, 0),
-('50c1f91a-6080-4495-a241-6bba6e9d9688', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.85.45', 32, 5060, 1, 0),
-('e6ebad33-80d5-4dbb-bc6f-a7ae08160cc6', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.84.45', 32, 5060, 1, 0),
-('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);
-
--- 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),
-('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,167 +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',
-  ]
-};
-
-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']);
-
-        // 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

@@ -1,102 +0,0 @@
-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.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');
-
--- one sbc
-insert into sbc_addresses (sbc_address_sid, service_provider_sid, ipv4, port) values ('8d6d0fda-4550-41ab-8e2f-60761d81fe7d', null, '3.39.45.30', '5060');
-
--- two smpp server
-insert into smpp_addresses (smpp_address_sid, service_provider_sid, ipv4, port, use_tls, is_primary) values ('e5e8345b-d533-4c29-940b-57aaccc59f8b', null, '3.39.45.30', '2775', false, true);
-insert into smpp_addresses (smpp_address_sid, service_provider_sid, ipv4, port, use_tls, is_primary) values ('ae060ef3-d5a4-4842-b331-426ec9329fbe', null, '3.39.45.30', '3550', true, true);
-
--- one voip carrier with one gateway
-insert into voip_carriers (voip_carrier_sid, name) values ('5145b436-2f38-4029-8d4c-fd8c67831c7a', 'my test carrier');
-insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, port, inbound, outbound, is_active)
-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.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', 
-'d9c205c6-a129-443e-a9c0-d1bb437d4bb7','6ac36aeb-6bd0-428a-80a1-aed95640a296','google', 'en-US', 'en-US-Standard-C', 'google', 'en-US');
-insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, service_provider_sid)
-values ('ec028c46-1363-4b3f-81db-ee33f179d6ba', '18005551212', '5145b436-2f38-4029-8d4c-fd8c67831c7a', '2708b1b3-2736-40ea-b502-c53d8396247f');
-
--- create our products
-insert into products (product_sid, name, category)
-values
-('c4403cdb-8e75-4b27-9726-7d8315e3216d', 'concurrent call session', 'voice_call_session'),
-('2c815913-5c26-4004-b748-183b459329df', 'registered device', 'device'),
-('35a9fb10-233d-4eb9-aada-78de5814d680', 'api call', 'api_rate');
-
--- create predefined carriers
-insert into predefined_carriers (predefined_carrier_sid, name, requires_static_ip, e164_leading_plus, 
-requires_register, register_username, register_password, 
-register_sip_realm, tech_prefix, inbound_auth_username, inbound_auth_password, diversion)
-VALUES
-('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);
-
--- twilio gateways
-insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
-VALUES
-('d2ccfcb1-9198-4fe9-a0ca-6e49395837c4', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.172.60.0', 30, 5060, 1, 0),
-('6b1d0032-4430-41f1-87c6-f22233d394ef', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.244.51.0', 30, 5060, 1, 0),
-('0de40217-8bd5-4aa8-a9fd-1994282953c6', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.171.127.192', 30, 5060, 1, 0),
-('37bc0b20-b53c-4c31-95a6-f82b1c3713e3', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '35.156.191.128', 30, 5060, 1, 0),
-('39791f4e-b612-4882-a37e-e92711a39f3f', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.65.63.192', 30, 5060, 1, 0),
-('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),
-('3ed1dd12-e1a7-44ff-811a-3cc5dc13dc72', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '<your-domain>.pstn.twilio.com', 32, 5060, 0, 1);
-
--- voxbone gateways
-insert into predefined_sip_gateways (predefined_sip_gateway_sid, predefined_carrier_sid, ipv4, netmask, port, inbound, outbound)
-VALUES
-('d531c582-2103-42a0-b9f0-f80c215b3ec5', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.83.45', 32, 5060, 1, 0),
-('95c888e5-c959-4d92-82c4-8597dddff75e', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.86.45', 32, 5060, 1, 0),
-('1de3b2a1-96f0-407a-bcc4-ce371d823a8d', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.82.45', 32, 5060, 1, 0),
-('50c1f91a-6080-4495-a241-6bba6e9d9688', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.85.45', 32, 5060, 1, 0),
-('e6ebad33-80d5-4dbb-bc6f-a7ae08160cc6', '032d90d5-39e8-41c0-b807-9c88cffba65c', '81.201.84.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
-('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),
-('e7447e7e-2c7d-4738-ab53-097c187236ff', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.140.242', 32, 5060, 1, 0),
-('279807e7-649e-41dd-931a-00c460bcc0a2', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '178.22.143.80', 28, 5060, 1, 0),
-('f5fd66f7-97f6-4979-ab19-eea1557bc872', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.140.0', 26, 5060, 1, 0),
-('efcfefdc-451c-4e59-960a-f9e4952d964f', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', '185.63.141.0', 26, 5060, 1, 0),
-('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),
-('5f431d42-48e4-44ce-a311-d946f0b475b6', 'e6fb301a-1af0-4fb8-a1f6-f65530c6e1c6', 'out.simwood.com', 32, 5060, 0, 1);
-
-
-SET FOREIGN_KEY_CHECKS=1;

lib/auth/index.js

@@ -1,108 +1,56 @@
 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 jwt = require('jsonwebtoken');
 const sql = `
   SELECT *
   FROM api_keys
   WHERE api_keys.token = ?`;
 
-function makeStrategy(logger, retrieveKey) {
+function makeStrategy(logger) {
   return new Strategy(
-    async function(token, done) {
-      //logger.debug(`validating with token ${token}`);
-      jwt.verify(token, process.env.JWT_SECRET, async(err, decoded) => {
+    function(token, done) {
+      logger.info(`validating with token ${token}`);
+      getMysqlConnection((err, conn) => {
         if (err) {
-          if (err.name === 'TokenExpiredError') {
-            logger.debug('jwt expired');
+          logger.error(err, 'Error retrieving mysql connection');
+          return done(err);
+        }
+        conn.query(sql, [token], (err, results, fields) => {
+          conn.release();
+          if (err) {
+            logger.error(err, 'Error querying for api key');
+            return done(err);
+          }
+          if (0 == results.length) return done(null, false);
+          if (results.length > 1) {
+            logger.info(`api key ${token} exists in multiple rows of api_keys table!!`);
             return done(null, false);
           }
-          /* 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 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 (err) {
-            debug(err);
-            logger.info({err}, 'Error checking blacklist for jwt');
+
+          // found api key
+          const scope = [];
+          if (results[0].account_sid === null && results[0].service_provider_sid === null) {
+            scope.push.apply(scope, ['admin', 'service_provider', 'account']);
           }
-          const {user_sid, service_provider_sid, account_sid, email, name, scope, permissions} = decoded;
+          else if (results[0].service_provider_sid) {
+            scope.push.apply(scope, ['service_provider', 'account']);
+          }
+          else {
+            scope.push('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'
+            account_sid: results[0].account_sid,
+            service_provider_sid: results[0].service_provider_sid,
+            hasScope: (s) => scope.includes(s),
+            hasAdminAuth: scope.length === 3,
+            hasServiceProviderAuth: scope.includes('service_provider') && !scope.includes('admin'),
+            hasAccountAuth: scope.includes('account') && !scope.includes('service_provider')
           };
-          logger.debug({user}, 'successfully validated jwt');
+          logger.info(user, `successfully validated with scope ${scope}`);
           return done(null, user, {scope});
-        }
+        });
       });
-    }
-  );
+    });
 }
 
-const checkApiTokens = (logger, token, done) => {
-  getMysqlConnection((err, conn) => {
-    if (err) {
-      logger.error(err, 'Error retrieving mysql connection');
-      return done(err);
-    }
-    conn.query(sql, [token], (err, results, fields) => {
-      conn.release();
-      if (err) {
-        logger.error(err, 'Error querying for api key');
-        return done(err);
-      }
-      if (0 == results.length) return done(null, false);
-      if (results.length > 1) {
-        logger.info(`api key ${token} exists in multiple rows of api_keys table!!`);
-        return done(null, false);
-      }
-
-      // found api key
-      let 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';
-      }
-      else if (results[0].service_provider_sid) {
-        //scope.push.apply(scope, ['service_provider', 'account']);
-        scope = 'service_provider';
-      }
-      else {
-        //scope.push('account');
-        scope = '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'
-      };
-      logger.info(user, `successfully validated with scope ${scope}`);
-      return done(null, user, {scope});
-    });
-  });
-};
-
 module.exports = makeStrategy;

lib/db/index.js

@@ -1,7 +1,5 @@
 const getMysqlConnection = require('./mysql');
-const promisePool = require('./pool');
 
 module.exports = {
-  getMysqlConnection,
-  promisePool
+  getMysqlConnection
 };

lib/db/mysql.js

@@ -1,7 +1,6 @@
 const mysql = require('mysql2');
 const pool = mysql.createPool({
   host: process.env.JAMBONES_MYSQL_HOST,
-  port: process.env.JAMBONES_MYSQL_PORT || 3306,
   user: process.env.JAMBONES_MYSQL_USER,
   password: process.env.JAMBONES_MYSQL_PASSWORD,
   database: process.env.JAMBONES_MYSQL_DATABASE,
@@ -13,7 +12,6 @@ pool.getConnection((err, conn) => {
   conn.ping((err) => {
     if (err) return console.error(err, `Error pinging mysql at ${JSON.stringify({
       host: process.env.JAMBONES_MYSQL_HOST,
-      port: process.env.JAMBONES_MYSQL_PORT || 3306,
       user: process.env.JAMBONES_MYSQL_USER,
       password: process.env.JAMBONES_MYSQL_PASSWORD,
       database: process.env.JAMBONES_MYSQL_DATABASE,

lib/db/pool.js

@@ -1,10 +0,0 @@
-const mysql = require('mysql2');
-const pool = mysql.createPool({
-  host: process.env.JAMBONES_MYSQL_HOST,
-  port: process.env.JAMBONES_MYSQL_PORT || 3306,
-  user: process.env.JAMBONES_MYSQL_USER,
-  password: process.env.JAMBONES_MYSQL_PASSWORD,
-  database: process.env.JAMBONES_MYSQL_DATABASE,
-  connectionLimit: process.env.JAMBONES_MYSQL_CONNECTION_LIMIT || 10
-});
-module.exports = pool.promise();

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

@@ -1,80 +1,19 @@
-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} = 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`;
-
-const insertPendingAccountSubscriptionSql = `INSERT account_subscriptions 
-(account_subscription_sid, account_sid, pending, stripe_subscription_id, 
-stripe_payment_method_id, last4, exp_month, exp_year, card_type) 
-VALUES (?,?,1,?,?,?,?,?,?)`;
-
-const activateSubscriptionSql = `UPDATE account_subscriptions 
-SET pending=0, effective_start_date = CURRENT_TIMESTAMP, stripe_subscription_id = ? 
-WHERE account_subscription_sid = ? 
-AND pending=1`;
-
-const queryPendingSubscriptionSql = `SELECT * FROM account_subscriptions 
-WHERE account_sid = ? 
-AND effective_end_date IS NULL 
-AND pending=1`;
-
-const deactivateSubscriptionSql = `UPDATE account_subscriptions 
-SET pending=1, pending_reason = ? 
-WHERE account_sid = ? 
-AND effective_end_date IS NULL 
-AND pending=0`;
-
-const updatePaymentInfoSql = `UPDATE account_subscriptions 
-SET last4 = ?, exp_month = ?, exp_year = ?, card_type = ? 
-WHERE account_sid = ? 
-AND effective_end_date IS NULL`;
-
-const insertAccountProductsSql = `INSERT account_products 
-(account_product_sid, account_subscription_sid, product_sid, quantity) 
-VALUES (?,?,?,?);
-`;
-
-const replaceOldSubscriptionSql = `UPDATE account_subscriptions 
-SET effective_end_date = CURRENT_TIMESTAMP, change_reason = ?  
-WHERE account_sid = ? 
-AND effective_end_date IS NULL 
-AND account_subscription_sid <> ?`;
-
-const retrieveActiveSubscriptionSql = `SELECT * 
-FROM account_subscriptions 
-WHERE account_sid = ? 
-AND effective_end_date IS NULL 
-AND pending = 0`;
+ON acc.registration_hook_sid = rh.webhook_sid`;
 
 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;
-
     return obj;
   });
 }
@@ -134,111 +73,6 @@ class Account extends Model {
     });
   }
 
-  static async updateStripeCustomerId(sid, customerId) {
-    await promisePool.execute(
-      'UPDATE accounts SET stripe_customer_id = ? WHERE account_sid = ?',
-      [customerId, sid]);
-  }
-
-  static async getSubscription(sid) {
-    const [r] = await promisePool.execute(retrieveActiveSubscriptionSql, [sid]);
-    debug(r, `Account.getSubscription ${sid}`);
-    return r.length > 0 ? r[0] : null;
-  }
-
-  static async deactivateSubscription(logger, account_sid, reason) {
-    logger.debug('deactivateSubscription');
-
-    /**
-     * Two cases:
-     * (1) A subscription renewal fails.  In this case we deactivate subscription
-     * and the customer is down until they provide payment.
-     * (2) A customer adds capacity during the month, and the pro-rated amount fails.
-     * In this case, we leave the new subscription in a pending state
-     * The customer continues (for the rest of the month at least) at
-     * previous capacity levels.
-     */
-    const [r] = await promisePool.query(queryPendingSubscriptionSql, account_sid);
-    if (r.length > 0) {
-      /* leave new subscription pending */
-      await promisePool.execute(
-        'UPDATE account_subscriptions set pending_reason = ? WHERE account_subscription_sid = ?',
-        [reason, r[0].account_subscription_sid]);
-      logger.debug('deactivateSubscription - leave pending subscription in pending state');
-    }
-    else {
-      /* deactivate their current active subscription */
-      const [r] = await promisePool.execute(deactivateSubscriptionSql, [reason, account_sid]);
-      logger.debug('deactivateSubscription - deactivated subscription; customer will not have service');
-      return 1 == r.affectedRows;
-    }
-  }
-
-  static async activateSubscription(logger, account_sid, subscription_id, reason) {
-    logger.debug('activateSubscription');
-
-    const [r] = await promisePool.query(queryPendingSubscriptionSql, account_sid);
-    if (0 === r.length) return false;
-
-    const [r2] = await promisePool.execute(activateSubscriptionSql,
-      [subscription_id, r[0].account_subscription_sid]);
-    if (0 === r2.affectedRows) return false;
-
-    /* disable the old subscription, if any */
-    const [r3] = await promisePool.execute(replaceOldSubscriptionSql, [
-      reason, account_sid, r[0].account_subscription_sid]);
-    debug(r3, 'Account.activateSubscription - replaced old subscription');
-
-    /* update account.plan to paid, if it isnt already */
-    await promisePool.execute(
-      'UPDATE accounts SET plan_type = \'paid\' WHERE account_sid = ?',
-      [account_sid]);
-    return true;
-  }
-
-  static async updatePaymentInfo(logger, account_sid, pm) {
-    const {card} = pm;
-    const last4_encrypted = encrypt(card.last4);
-    await promisePool.execute(updatePaymentInfoSql,
-      [last4_encrypted, card.exp_month, card.exp_year, card.brand, account_sid]);
-  }
-
-  static async provisionPendingSubscription(logger, account_sid, products, payment_method, subscription_id) {
-    logger.debug('provisionPendingSubscription');
-    const account_subscription_sid = uuid();
-    const {id, card} = payment_method;
-
-    /* add a row to account_subscription */
-    let last4_encrypted = null;
-    if (card) {
-      last4_encrypted = encrypt(card.last4);
-    }
-    const [r] = await promisePool.execute(insertPendingAccountSubscriptionSql, [
-      account_subscription_sid,
-      account_sid,
-      subscription_id || null,
-      id,
-      last4_encrypted,
-      card ? card.exp_month : null,
-      card ? card.exp_year : null,
-      card ? card.brand : null
-    ]);
-    debug(r, 'Account.activateSubscription - insert account_subscriptions');
-    if (r.affectedRows !== 1) {
-      throw new Error(`failed inserting account_subscriptions for accunt_sid ${account_sid}`);
-    }
-
-    /* add a row for each product to account_products */
-    await Promise.all(products.map((product) => {
-      const {product_sid, quantity} = product;
-      const account_products_sid = uuid();
-      return promisePool.execute(insertAccountProductsSql, [
-        account_products_sid, account_subscription_sid, product_sid, quantity
-      ]);
-    }));
-    return account_subscription_sid;
-  }
-
 }
 
 Account.table = 'accounts';
@@ -262,10 +96,6 @@ Account.fields = [
     name: 'sip_realm',
     type: 'string',
   },
-  {
-    name: 'queue_event_hook_sid',
-    type: 'string',
-  },
   {
     name: 'registration_hook_sid',
     type: 'string',
@@ -273,51 +103,7 @@ Account.fields = [
   {
     name: 'device_calling_application_sid',
     type: 'string',
-  },
-  {
-    name: 'is_active',
-    type: 'number',
-  },
-  {
-    name: 'created_at',
-    type: 'date',
-  },
-  {
-    name: 'plan_type',
-    type: 'string',
-  },
-  {
-    name: 'stripe_customer_id',
-    type: 'string',
-  },
-  {
-    name: 'webhook_secret',
-    type: 'string',
-  },
-  {
-    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',
-  },
+  }
 ];
 
 module.exports = Account;

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/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');

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,38 +1,9 @@
 const Model = require('./model');
-const {promisePool} = require('../db');
-const sql = 'SELECT * from phone_numbers WHERE account_sid = ?';
-const sqlSP = `SELECT * 
-FROM phone_numbers 
-WHERE account_sid IN 
-(
-  SELECT account_sid 
-  FROM accounts 
-  WHERE service_provider_sid = ?
-)`;
 
 class PhoneNumber extends Model {
   constructor() {
     super();
   }
-
-  static async retrieveAll(account_sid) {
-    if (!account_sid) return super.retrieveAll();
-    const [rows] = await promisePool.query(sql, account_sid);
-    return rows;
-  }
-  static async retrieveAllForSP(service_provider_sid) {
-    const [rows] = await promisePool.query(sqlSP, service_provider_sid);
-    return rows;
-  }
-
-  /**
-   * retrieve a phone number
-   */
-  static async retrieve(sid, account_sid) {
-    if (!account_sid) return super.retrieve(sid);
-    const [rows] = await promisePool.query(`${sql} AND phone_number_sid = ?`, [account_sid, sid]);
-    return rows;
-  }
 }
 
 PhoneNumber.table = 'phone_numbers';
@@ -49,7 +20,8 @@ PhoneNumber.fields = [
   },
   {
     name: 'voip_carrier_sid',
-    type: 'string'
+    type: 'string',
+    required: true
   },
   {
     name: 'account_sid',

lib/models/predefined-carrier.js

@@ -1,63 +0,0 @@
-const Model = require('./model');
-
-class PredefinedCarrier extends Model {
-  constructor() {
-    super();
-  }
-}
-
-PredefinedCarrier.table = 'predefined_carriers';
-PredefinedCarrier.fields = [
-  {
-    name: 'predefined_carrier_sid',
-    type: 'string',
-    primaryKey: true
-  },
-  {
-    name: 'name',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'requires_static_ip',
-    type: 'number'
-  },
-  {
-    name: 'e164_leading_plus',
-    type: 'number'
-  },
-  {
-    name: 'requires_register',
-    type: 'number'
-  },
-  {
-    name: 'register_username',
-    type: 'string'
-  },
-  {
-    name: 'register_sip_realm',
-    type: 'string'
-  },
-  {
-    name: 'register_password',
-    type: 'string'
-  },
-  {
-    name: 'tech_prefix',
-    type: 'string'
-  },
-  {
-    name: 'inbound_auth_username',
-    type: 'string'
-  },
-  {
-    name: 'inbound_auth_password',
-    type: 'string'
-  },
-  {
-    name: 'diversion',
-    type: 'string'
-  },
-];
-
-module.exports = PredefinedCarrier;

lib/models/product.js

@@ -1,28 +0,0 @@
-const Model = require('./model');
-
-class Product extends Model {
-  constructor() {
-    super();
-  }
-}
-
-Product.table = 'products';
-Product.fields = [
-  {
-    name: 'product_sid',
-    type: 'string',
-    primaryKey: true
-  },
-  {
-    name: 'name',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'category',
-    type: 'string',
-    required: true
-  },
-];
-
-module.exports = Product;

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/sip-gateway.js

@@ -1,18 +1,9 @@
 const Model = require('./model');
-const {promisePool} = require('../db');
-const retrieveSql = 'SELECT * from sip_gateways WHERE voip_carrier_sid = ?';
 
 class SipGateway extends Model {
   constructor() {
     super();
   }
-  /**
-   * list all sip gateways for a voip_carrier
-   */
-  static async retrieveForVoipCarrier(voip_carrier_sid) {
-    const [rows] = await promisePool.query(retrieveSql, voip_carrier_sid);
-    return rows;
-  }
 }
 
 SipGateway.table = 'sip_gateways';
@@ -35,10 +26,6 @@ SipGateway.fields = [
     name: 'port',
     type: 'number'
   },
-  {
-    name: 'netmask',
-    type: 'number'
-  },
   {
     name: 'inbound',
     type: 'number'

lib/models/smpp-gateway.js

@@ -1,60 +0,0 @@
-const Model = require('./model');
-const {promisePool} = require('../db');
-const retrieveSql = 'SELECT * from smpp_gateways WHERE voip_carrier_sid = ?';
-
-class SmppGateway extends Model {
-  constructor() {
-    super();
-  }
-  /**
-   * list all sip gateways for a voip_carrier
-   */
-  static async retrieveForVoipCarrier(voip_carrier_sid) {
-    const [rows] = await promisePool.query(retrieveSql, voip_carrier_sid);
-    return rows;
-  }
-}
-
-SmppGateway.table = 'smpp_gateways';
-SmppGateway.fields = [
-  {
-    name: 'smpp_gateway_sid',
-    type: 'string',
-    primaryKey: true
-  },
-  {
-    name: 'voip_carrier_sid',
-    type: 'string'
-  },
-  {
-    name: 'ipv4',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'port',
-    type: 'number'
-  },
-  {
-    name: 'netmask',
-    type: 'number'
-  },
-  {
-    name: 'inbound',
-    type: 'number'
-  },
-  {
-    name: 'outbound',
-    type: 'number'
-  },
-  {
-    name: 'is_primary',
-    type: 'number'
-  },
-  {
-    name: 'use_tls',
-    type: 'number'
-  }
-];
-
-module.exports = SmppGateway;

lib/models/smpp.js

@@ -1,55 +0,0 @@
-const Model = require('./model');
-const {getMysqlConnection} = require('../db');
-
-class Smpp extends Model {
-  constructor() {
-    super();
-  }
-
-  /**
-  * list all SBCs either for a given service provider, or those not associated with a
-  * service provider (i.e. community SBCs)
-  */
-  static retrieveAll(service_provider_sid) {
-    const sql = service_provider_sid ?
-      'SELECT * from smpp_addresses WHERE service_provider_sid = ?' :
-      'SELECT * from smpp_addresses WHERE service_provider_sid IS NULL';
-    const args = service_provider_sid ? [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);
-        });
-      });
-    });
-  }
-
-}
-
-Smpp.table = 'smpp_addresses';
-Smpp.fields = [
-  {
-    name: 'smpp_address_sid',
-    type: 'string',
-    primaryKey: true
-  },
-  {
-    name: 'ipv4',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'port',
-    type: 'number'
-  },
-  {
-    name: 'service_provider_sid',
-    type: 'string'
-  }
-];
-
-module.exports = Smpp;

lib/models/speech-credential.js

@@ -1,92 +0,0 @@
-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 = ?';
-
-class SpeechCredential extends Model {
-  constructor() {
-    super();
-  }
-
-  /**
-   * list all credentials for an account
-   */
-  static async retrieveAll(account_sid) {
-    const [rows] = await promisePool.query(retrieveSql, account_sid);
-    return rows;
-  }
-  static async retrieveAllForSP(service_provider_sid) {
-    const [rows] = await promisePool.query(retrieveSqlForSP, service_provider_sid);
-    return rows;
-  }
-
-  static async disableStt(account_sid) {
-    await promisePool.execute('UPDATE speech_credentials SET use_for_stt = 0 WHERE account_sid = ?', [account_sid]);
-  }
-  static async disableTts(account_sid) {
-    await promisePool.execute('UPDATE speech_credentials SET use_for_tts = 0 WHERE account_sid = ?', [account_sid]);
-  }
-
-  static async ttsTestResult(sid, success) {
-    await promisePool.execute(
-      'UPDATE speech_credentials SET last_tested = NOW(), tts_tested_ok = ? WHERE speech_credential_sid = ?',
-      [success, sid]);
-  }
-  static async sttTestResult(sid, success) {
-    await promisePool.execute(
-      'UPDATE speech_credentials SET last_tested = NOW(), stt_tested_ok = ? WHERE speech_credential_sid = ?',
-      [success, sid]);
-  }
-}
-
-SpeechCredential.table = 'speech_credentials';
-SpeechCredential.fields = [
-  {
-    name: 'speech_credential_sid',
-    type: 'string',
-    primaryKey: true
-  },
-  {
-    name: 'account_sid',
-    type: 'string',
-  },
-  {
-    name: 'service_provider_sid',
-    type: 'string',
-  },
-  {
-    name: 'vendor',
-    type: 'string',
-    required: true,
-  },
-  {
-    name: 'credential',
-    type: 'string',
-  },
-  {
-    name: 'use_for_tts',
-    type: 'number'
-  },
-  {
-    name: 'use_for_stt',
-    type: 'number'
-  },
-  {
-    name: 'tts_tested_ok',
-    type: 'number'
-  },
-  {
-    name: 'stt_tested_ok',
-    type: 'number'
-  },
-  {
-    name: 'last_used',
-    type: 'date'
-  },
-  {
-    name: 'last_tested',
-    type: 'date'
-  }
-];
-
-module.exports = SpeechCredential;

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

@@ -1,22 +1,9 @@
 const Model = require('./model');
-const {promisePool} = require('../db');
-const retrieveSql = 'SELECT * from voip_carriers vc WHERE vc.account_sid = ?';
-const retrieveSqlForSP = 'SELECT * from voip_carriers vc WHERE vc.service_provider_sid = ?';
-
 
 class VoipCarrier extends Model {
   constructor() {
     super();
   }
-  static async retrieveAll(account_sid) {
-    if (!account_sid) return super.retrieveAll();
-    const [rows] = await promisePool.query(retrieveSql, account_sid);
-    return rows;
-  }
-  static async retrieveAllForSP(service_provider_sid) {
-    const [rows] = await promisePool.query(retrieveSqlForSP, service_provider_sid);
-    return rows;
-  }
 }
 
 VoipCarrier.table = 'voip_carriers';
@@ -39,10 +26,6 @@ VoipCarrier.fields = [
     name: 'account_sid',
     type: 'string',
   },
-  {
-    name: 'service_provider_sid',
-    type: 'string',
-  },
   {
     name: 'application_sid',
     type: 'string'
@@ -50,78 +33,6 @@ VoipCarrier.fields = [
   {
     name: 'e164_leading_plus',
     type: 'number'
-  },
-  {
-    name: 'requires_register',
-    type: 'number'
-  },
-  {
-    name: 'register_username',
-    type: 'string'
-  },
-  {
-    name: 'register_sip_realm',
-    type: 'string'
-  },
-  {
-    name: 'register_password',
-    type: 'string'
-  },
-  {
-    name: 'tech_prefix',
-    type: 'string'
-  },
-  {
-    name: 'inbound_auth_username',
-    type: 'string'
-  },
-  {
-    name: 'inbound_auth_password',
-    type: 'string'
-  },
-  {
-    name: 'diversion',
-    type: 'string'
-  },
-  {
-    name: 'is_active',
-    type: 'number'
-  },
-  {
-    name: 'smpp_system_id',
-    type: 'string'
-  },
-  {
-    name: 'smpp_password',
-    type: 'string'
-  },
-  {
-    name: 'smpp_inbound_system_id',
-    type: 'string'
-  },
-  {
-    name: 'smpp_inbound_password',
-    type: 'string'
-  },
-  {
-    name: 'smpp_enquire_link_interval',
-    type: 'number'
-  },
-  {
-    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'
   }
 ];
 

lib/routes/api/account-test.js

@@ -1,57 +0,0 @@
-const router = require('express').Router();
-const {promisePool} = require('../../db');
-const sysError = require('../error');
-const retrieveApplicationsSql = `SELECT * from applications app
-LEFT JOIN webhooks AS ch
-ON app.call_hook_sid = ch.webhook_sid
-LEFT JOIN webhooks AS sh
-ON app.call_status_hook_sid = sh.webhook_sid 
-LEFT JOIN webhooks AS mh
-ON app.messaging_hook_sid = mh.webhook_sid
-WHERE service_provider_sid = ?`;
-
-const transmogrifyResults = (results) => {
-  return results.map((row) => {
-    const obj = row.app;
-    if (row.ch && Object.keys(row.ch).length && row.ch.url !== null) {
-      Object.assign(obj, {call_hook: row.ch});
-    }
-    else obj.call_hook = null;
-    if (row.sh && Object.keys(row.sh).length && row.sh.url !== null) {
-      Object.assign(obj, {call_status_hook: row.sh});
-    }
-    else obj.call_status_hook = null;
-    if (row.mh && Object.keys(row.mh).length && row.mh.url !== null) {
-      Object.assign(obj, {messaging_hook: row.mh});
-    }
-    else obj.messaging_hook = null;
-    delete obj.call_hook_sid;
-    delete obj.call_status_hook_sid;
-    delete obj.messaging_hook_sid;
-    return obj;
-  });
-};
-
-router.get('/:service_provider_sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const {service_provider_sid} = req.params;
-
-  try {
-    const [r] = await promisePool.query('SELECT * from service_providers where service_provider_sid = ?',
-      service_provider_sid);
-    if (r.length === 0) {
-      logger.info(`/AccountTest invalid service_provider_sid ${service_provider_sid}`);
-      return res.sendStatus(404);
-    }
-
-    const [numbers] = await promisePool.query('SELECT number FROM phone_numbers WHERE service_provider_sid = ?',
-      service_provider_sid);
-    const [results] = await promisePool.query({sql: retrieveApplicationsSql, nestTables: true}, service_provider_sid);
-
-    res.json({phonenumbers: numbers.map((n) => n.number), applications: transmogrifyResults(results)});
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/accounts.js

@@ -1,122 +1,21 @@
 const router = require('express').Router();
 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');
 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 decorate = require('./decorate');
 const snakeCase = require('../../utils/snake-case');
-const sysError = require('../error');
-const {promisePool} = require('../../db');
-const {hasAccountPermissions, parseAccountSid, enableSubspace, disableSubspace} = require('./utils');
-const short = require('short-uuid');
-const VoipCarrier = require('../../models/voip-carrier');
-const translator = short();
-
+const sysError = require('./error');
+const preconditions = {
+  'add': validateAdd,
+  'update': validateUpdate,
+  'delete': validateDelete
+};
 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 ip = stripPort(fs[idx++ % fs.length]);
-    logger.info({fs}, `feature servers available for createCall API request, selecting ${ip}`);
-    return `http://${ip}:3000/v1/createCall`;
-  } catch (err) {
-    logger.error({err}, 'getFsUrl: error retreving feature servers from redis');
-  }
-};
-
-const stripPort = (hostport) => {
-  const arr = /^(.*):(.*)$/.exec(hostport);
-  if (arr) return arr[1];
-  return hostport;
-};
-
-const validateUpdateForCarrier = async(req) => {
-  const account_sid = parseAccountSid(req);
-  if (req.user.hasScope('admin')) return ;
-  if (req.user.hasScope('account')) {
-    if (account_sid === req.user.account_sid) return ;
-    throw new DbErrorForbidden('insufficient permissions to update account');
-  }
-  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 to update account');
-  }
-};
-
-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.get('/:sid/Applications', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const account_sid = parseAccountSid(req);
-    const results = await Application.retrieveAll(null, account_sid);
-    res.status(200).json(results);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-router.get('/:sid/VoipCarriers', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const account_sid = parseAccountSid(req);
-    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 {
-    await validateUpdateForCarrier(req);
-    const rowsAffected = await VoipCarrier.update(req.params.voip_carrier_sid, req.body);
-    if (rowsAffected === 0) {
-      return res.sendStatus(404);
-    }
-    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);
-    logger.debug({payload}, 'POST /:sid/VoipCarriers');
-    const uuid = await VoipCarrier.make({
-      account_sid,
-      ...payload
-    });
-    res.status(201).json({sid: uuid});
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
 function coerceNumbers(callInfo) {
   if (Array.isArray(callInfo)) {
     return callInfo.map((ci) => {
@@ -144,15 +43,9 @@ function validateUpdateCall(opts) {
   const hasWhisper = opts.whisper;
   const count = [
     'call_hook',
-    'child_call_hook',
     'call_status',
     'listen_status',
-    'conf_hold_status',
-    'conf_mute_status',
-    'mute_status',
-    'sip_request',
-    'record'
-  ]
+    'mute_status']
     .reduce((acc, prop) => (opts[prop] ? ++acc : acc), 0);
 
   switch (count) {
@@ -163,14 +56,11 @@ function validateUpdateCall(opts) {
     case 1:
       // good
       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');
   }
 
+  if (opts.call_hook && !opts.call_hook.url) throw new DbErrorBadRequest('missing call_hook.url');
   if (opts.call_status && !['completed', 'no-answer'].includes(opts.call_status)) {
     throw new DbErrorBadRequest('invalid call_status');
   }
@@ -180,22 +70,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_type)) {
-    throw new DbErrorBadRequest('sip_request requires content_type and content properties');
-  }
-  if (opts.record && !opts.record.action) {
-    throw new DbErrorBadRequest('record requires action property');
-  }
-  if ('startCallRecording' === opts.record?.action && !opts.record.siprecServerURL) {
-    throw new DbErrorBadRequest('record requires siprecServerURL property when starting recording');
-  }
 }
 
 function validateTo(to) {
@@ -246,57 +120,31 @@ 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) {
-    throw new DbErrorBadRequest('either call_hook or application_sid required');
-  }
-  if (typeof obj.call_hook === 'string') {
-    const url = obj.call_hook;
-    obj.call_hook = {
-      url,
-      method: 'POST'
-    };
-  }
-  if (typeof obj.call_status_hook === 'string') {
-    const url = obj.call_status_hook;
-    obj.call_status_hook = {
-      url,
-      method: 'POST'
-    };
-  }
-  if (typeof obj.call_hook === 'object' && typeof obj.call_hook.url != 'string') {
-    throw new DbErrorBadRequest('call_hook must be string or an object containing a url property');
-  }
-  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)) {
-    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)) {
-    throw new DbErrorBadRequest('call_status_hook url be an absolute url');
+  if (!obj.call_hook || (obj.call_hook && !obj.call_hook.url)) {
+    throw new DbErrorBadRequest('either url or application_sid required');
   }
 }
 
 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}`);
   }
 
   if (!obj.from) throw new DbErrorBadRequest('missing from property');
-  /*
   else {
     const regex = /^\+(\d+)$/;
     const arr = regex.exec(obj.from);
@@ -304,7 +152,7 @@ async function validateCreateMessage(logger, sid, req) {
     const account = await lookupAccountByPhoneNumber(from);
     if (!account) throw new DbErrorBadRequest(`accountSid ${sid} does not own phone number ${from}`);
   }
-  */
+
   if (!obj.to) throw new DbErrorBadRequest('missing to property');
 
   if (!obj.text && !obj.media) {
@@ -317,7 +165,7 @@ async function validateAdd(req) {
   if (req.user.hasAccountAuth) {
     throw new DbErrorUnprocessableRequest('insufficient permissions to create accounts');
   }
-  if (req.user.hasServiceProviderAuth && req.user.service_provider_sid) {
+  if (req.user.hasServiceProviderAuth) {
     /* service providers can only create accounts under themselves */
     req.body.service_provider_sid = req.user.service_provider_sid;
   }
@@ -330,17 +178,11 @@ 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 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');
-  }
 
   if (req.user.service_provider_sid && !req.user.hasScope('admin')) {
     const result = await Account.retrieve(sid);
@@ -354,6 +196,8 @@ async function validateDelete(req, sid) {
   if (req.user.hasAccountAuth && req.user.account_sid !== sid) {
     throw new DbErrorUnprocessableRequest('insufficient privileges to update this account');
   }
+  const assignedPhoneNumbers = await Account.getForeignKeyReferences('phone_numbers.account_sid', sid);
+  if (assignedPhoneNumbers > 0) throw new DbErrorUnprocessableRequest('cannot delete account with phone numbers');
   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) {
@@ -362,24 +206,24 @@ async function validateDelete(req, sid) {
   }
 }
 
+decorate(router, Account, ['delete'], preconditions);
 
 /* add */
 router.post('/', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    const secret = `wh_secret_${translator.generate()}`;
     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({}, 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)}`);
+    //logger.debug(`Attempting to add account ${JSON.stringify(obj)}`);
     const uuid = await Account.make(obj);
     res.status(201).json({sid: uuid});
   } catch (err) {
@@ -414,132 +258,36 @@ router.get('/:sid', async(req, res) => {
   }
 });
 
-router.get('/:sid/WebhookSecret', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const service_provider_sid = req.user.hasServiceProviderAuth ? req.user.service_provider_sid : null;
-    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(req.params.sid, {webhook_secret: secret});
-      webhook_secret = secret;
-    }
-    return res.status(200).json({webhook_secret});
-  }
-  catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.post('/:sid/SubspaceTeleport', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const service_provider_sid = req.user.hasServiceProviderAuth ? req.user.service_provider_sid : null;
-    const results = await Account.retrieve(req.params.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(req.params.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 service_provider_sid = req.user.hasServiceProviderAuth ? req.user.service_provider_sid : null;
-    const results = await Account.retrieve(req.params.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(req.params.sid, {
-      subspace_sip_teleport_id: null,
-      subspace_sip_teleport_destinations: null
-    });
-    return res.sendStatus(204);
-  }
-  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 {
-
     // 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;
+    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 if (typeof obj[prop] === 'object') {
-          if ('webhook_sid' in obj[prop]) {
-            const sid = obj[prop]['webhook_sid'];
-            await Webhook.update(sid, obj[prop]);
-          }
-          else {
-            const sid = await Webhook.make(obj[prop]);
-            obj[`${prop}_sid`] = sid;
-          }
+        else {
+          const sid = await Webhook.make(obj[prop]);
+          obj[`${prop}_sid`] = sid;
         }
       }
+      else {
+        obj[`${prop}_sid`] = null;
+      }
+      delete obj[prop];
     }
 
     await validateUpdate(req, sid);
-
-    if (Object.keys(obj).length) {
-      let orphanedRegHook, orphanedQueueHook;
-      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;
-        obj.registration_hook_sid = null;
-      }
-      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;
-
-      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);
-      }
+    const rowsAffected = await Account.update(sid, obj);
+    if (rowsAffected === 0) {
+      return res.status(404).end();
     }
-
     res.status(204).end();
     updateLastUsed(logger, sid, req).catch((err) => {});
   } catch (err) {
@@ -547,77 +295,6 @@ 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 {
-    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];
-    /* remove dns records */
-    if (process.env.NODE_ENV !== 'test' || process.env.DME_API_KEY) {
-
-      /* retrieve existing dns records */
-      const [recs] = await promisePool.query('SELECT record_id from dns_records WHERE account_sid = ?', sid);
-
-      if (recs.length > 0) {
-        /* remove existing records from the database and dns provider */
-        const arr = /(.*)\.(.*\..*)$/.exec(sip_realm);
-        if (!arr) throw new DbErrorBadRequest(`invalid sip_realm: ${sip_realm}`);
-        const domain = arr[2];
-
-        await promisePool.query('DELETE from dns_records WHERE account_sid = ?', sid);
-        const deleted = await deleteDnsRecords(logger, domain, recs.map((r) => r.record_id));
-        if (!deleted) {
-          logger.error({recs, sip_realm, sid},
-            'Failed to remove old dns records when changing sip_realm for account');
-        }
-      }
-    }
-
-    await promisePool.execute('DELETE from api_keys where account_sid = ?', [sid]);
-    await promisePool.execute(
-    // eslint-disable-next-line indent
-`DELETE from account_products 
-WHERE account_subscription_sid IN 
-(SELECT account_subscription_sid FROM 
-account_subscriptions WHERE account_sid = ?)
-`, [sid]);
-    await promisePool.execute('DELETE from account_subscriptions WHERE account_sid = ?', [sid]);
-    await promisePool.execute('DELETE from speech_credentials where account_sid = ?', [sid]);
-    await promisePool.execute('DELETE from users where account_sid = ?', [sid]);
-    await promisePool.execute('DELETE from phone_numbers where account_sid = ?', [sid]);
-    await promisePool.execute('DELETE from call_routes where account_sid = ?', [sid]);
-    await promisePool.execute('DELETE from ms_teams_tenants where account_sid = ?', [sid]);
-    await promisePool.execute(sqlDeleteGateways, [sid]);
-    await promisePool.execute('DELETE from voip_carriers where account_sid = ?', [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}`);
-    }
-    res.status(204).end();
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
 /* retrieve account level api keys */
 router.get('/:sid/ApiKeys', async(req, res) => {
   const logger = req.app.locals.logger;
@@ -638,32 +315,37 @@ router.post('/:sid/Calls', async(req, res) => {
   const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
   const {retrieveSet, logger} = req.app.locals;
 
-  const serviceUrl = await getFsUrl(logger, retrieveSet, setName);
-  if (!serviceUrl) {
-    res.status(480).json({msg: 'no available feature servers at this time'});
-  } else {
-    try {
-      await validateCreateCall(logger, sid, req);
-      updateLastUsed(logger, sid, req).catch((err) => {});
-      request({
-        url: serviceUrl,
-        method: 'POST',
-        json: true,
-        body: Object.assign(req.body, {account_sid: sid})
-      }, (err, response, body) => {
-        if (err) {
-          logger.error(err, `Error sending createCall POST to ${serviceUrl}`);
-          return res.sendStatus(500);
-        }
-        if (response.statusCode !== 201) {
-          logger.error({statusCode: response.statusCode}, `Non-success response returned by createCall ${serviceUrl}`);
-          return res.sendStatus(500);
-        }
-        res.status(201).json(body);
-      });
-    } catch (err) {
-      sysError(logger, res, err);
+  try {
+    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,
+      method: 'POST',
+      json: true,
+      body: req.body
+    }, (err, response, body) => {
+      if (err) {
+        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 ${ip}`);
+        return res.sendStatus(500);
+      }
+      res.status(201).json(body);
+    });
+  } catch (err) {
+    sysError(logger, res, err);
   }
 });
 
@@ -735,7 +417,7 @@ router.delete('/:sid/Calls/:callSid', async(req, res) => {
 /**
  * update a call
  */
-const updateCall = async(req, res) => {
+router.post('/:sid/Calls/:callSid', async(req, res) => {
   const accountSid = req.params.sid;
   const callSid = req.params.callSid;
   const {logger, retrieveCall} = req.app.locals;
@@ -761,36 +443,30 @@ const updateCall = async(req, res) => {
   } catch (err) {
     sysError(logger, res, err);
   }
-};
-
-/** leaving for legacy purposes, this should have been (and now is) a PUT */
-router.post('/:sid/Calls/:callSid', async(req, res) => {
-  await updateCall(req, res);
-});
-router.put('/:sid/Calls/:callSid', async(req, res) => {
-  await updateCall(req, res);
 });
 
 /**
  * create a new Message
  */
 router.post('/:sid/Messages', async(req, res) => {
-  const account_sid = parseAccountSid(req);
+  const sid = req.params.sid;
   const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
   const {retrieveSet, logger} = req.app.locals;
 
   try {
-    const serviceUrl = await getFsUrl(logger, retrieveSet, setName);
-    if (!serviceUrl) res.json({msg: 'no available feature servers at this time'}).status(480);
-    await validateCreateMessage(logger, account_sid, req);
+    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/${sid}`;
+    await validateCreateMessage(logger, sid, req);
 
-    const payload = {
-      message_sid: uuidv4(),
-      account_sid,
-      ...req.body
-    };
-    logger.debug({payload}, `sending createMessage API request to to ${serviceUrl}`);
-    updateLastUsed(logger, account_sid, req).catch(() => {});
+    const payload = Object.assign({messageSid: uuidv4()}, req.body);
+    logger.debug({payload}, `sending createMessage API request to to ${ip}`);
+    updateLastUsed(logger, sid, req).catch((err) => {});
     request({
       url: serviceUrl,
       method: 'POST',
@@ -798,12 +474,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(500);
       }
       res.status(201).json(body);
     });

lib/routes/api/activation-code.js

@@ -1,117 +0,0 @@
-const router = require('express').Router();
-const debug = require('debug')('jambonz:api-server');
-const {DbErrorBadRequest} = require('../../utils/errors');
-const {promisePool} = require('../../db');
-const {validateEmail, emailSimpleText} = require('../../utils/email-utils');
-const sysError = require('../error');
-const sqlRetrieveUser = `SELECT * from users user
-LEFT JOIN accounts AS account
-ON user.account_sid = account.account_sid
-WHERE user.user_sid = ?`;
-
-const validateRequest = async(req, res) => {
-  const payload = req.body || {};
-
-  /* valid type */
-  if (!['email', 'phone'].includes(payload.type)) {
-    throw new DbErrorBadRequest(`invalid activation type: ${payload.type}`);
-  }
-
-  /* valid user? */
-  const [rows] = await promisePool.query('SELECT * from users WHERE user_sid = ?',
-    payload.user_sid);
-  if (0 === rows.length) throw new DbErrorBadRequest('invalid user_sid');
-
-  /* valid email? */
-  if (payload.type === 'email' && !validateEmail(payload.value)) throw new DbErrorBadRequest('invalid email');
-
-};
-
-router.post('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const {user_sid, type, code, value} = req.body;
-
-  try {
-    await validateRequest(req, res);
-
-    const fields = type === 'email' ?
-      ['email', 'email_validated', 'email_activation_code'] :
-      ['phone', 'phone_validated', 'phone_activation_code'];
-    const sql =
-    `UPDATE users set ${fields[0]} = ?, ${fields[1]} = 0,  ${fields[2]} = ? WHERE user_sid = ?`;
-    const [r] = await promisePool.execute(sql, [value, code, user_sid]);
-    logger.debug({r}, 'Result from adding activation code');
-    debug({r}, 'Result from adding activation code');
-
-    if (process.env.NODE_ENV !== 'test') {
-      if (type === 'email') {
-        /* send code via email */
-        const text = '';
-        const subject = '';
-        await emailSimpleText(logger, value, subject, text);
-      }
-      else {
-        /* send code via SMS */
-      }
-    }
-    res.sendStatus(204);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.put('/:code', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const code = req.params.code;
-  const {user_sid, type} = req.body;
-
-  try {
-    let activateAccount = false;
-    let deactivateOldUsers = false;
-    let account_sid;
-    if (type === 'email') {
-      /* check whether this is first-time activation of account during sign-up/register */
-      const [r] = await promisePool.query({sql: sqlRetrieveUser, nestTables: true}, user_sid);
-      logger.debug({r}, 'activationcode - selected user');
-      if (r.length) {
-        const {user, account} = r[0];
-        account_sid = account.account_sid;
-        const [otherUsers] = await promisePool.query('SELECT * from users WHERE account_sid = ? AND user_sid <> ?',
-          [account_sid, user_sid]);
-        logger.debug({otherUsers}, `activationcode - users other than ${user_sid}`);
-        if (0 === otherUsers.length && user.provider === 'local' && !user.email_validated) {
-          logger.debug('activationcode - activating account');
-          activateAccount = true;
-        }
-        else if (otherUsers.length) {
-          logger.debug('activationcode - adding new user for existing account');
-          deactivateOldUsers = true;
-        }
-      }
-    }
-    const fields = type === 'email' ?
-      ['email_validated', 'email_activation_code'] :
-      ['phone_validated', 'phone_activation_code'];
-    const sql = `UPDATE users set ${fields[0]} = 1, ${fields[1]} = NULL WHERE ${fields[1]} = ? AND user_sid = ?`;
-    const [r] = await promisePool.execute(sql, [code, user_sid]);
-    logger.debug({r}, 'Result from validating code');
-    debug({r}, 'Result from validating code');
-
-    if (activateAccount) {
-      await promisePool.execute('UPDATE accounts SET is_active=1 WHERE account_sid = ?', [account_sid]);
-    }
-    else if (deactivateOldUsers) {
-      const [r] = await promisePool.execute('DELETE FROM users WHERE account_sid = ? AND user_sid <> ?',
-        [account_sid, user_sid]);
-      logger.debug({r}, 'Result from deleting old/replaced users');
-    }
-
-    if (1 === r.affectedRows) return res.sendStatus(204);
-    throw new DbErrorBadRequest('invalid user or activation code');
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-
-module.exports = router;

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

@@ -1,82 +0,0 @@
-const router = require('express').Router();
-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 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 
-WHERE predefined_carrier_sid = ?`;
-
-
-router.post('/:sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const {sid } = req.params;
-  let service_provider_sid;
-  const {account_sid} = req.user;
-
-  if (!account_sid) {
-    service_provider_sid = parseServiceProviderSid(req);
-  } else {
-    service_provider_sid = req.user.service_provider_sid;
-  }
-
-  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]);
-
-    if (r2.length > 0) {
-      template.name =  `${template.name}-${short.generate()}`;
-    }
-
-    /* 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}`);
-
-    /* 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 */
-    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');
-      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) {
-    logger.error({err}, 'Error adding voip_carrier from template');
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/alerts.js

@@ -1,56 +0,0 @@
-const router = require('express').Router();
-const sysError = require('../error');
-const {DbErrorBadRequest} = require('../../utils/errors');
-
-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, queryAlerts, queryAlertsSP} = 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,
-      });
-
-      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);
-    }
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/api-keys.js

@@ -3,8 +3,9 @@ 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 sysError = require('../error');
+const uuidv4 = require('uuid/v4');
+const assert = require('assert');
+const sysError = require('./error');
 const preconditions = {
   'add': validateAddToken,
   'delete': validateDeleteToken
@@ -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

@@ -3,13 +3,12 @@ const {DbErrorBadRequest, DbErrorUnprocessableRequest} = require('../../utils/er
 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('verb-specifications');
+const sysError = require('./error');
 const preconditions = {
   'add': validateAdd,
-  'update': validateUpdate
+  'update': validateUpdate,
+  'delete': validateDelete
 };
 
 /* only user-level tokens can add applications */
@@ -34,11 +33,8 @@ async function validateAdd(req) {
 }
 
 async function validateUpdate(req, sid) {
-  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.account_sid && sid !== req.user.account_sid) {
+    throw new DbErrorBadRequest('you may not update or delete an application associated with a different account');
   }
   if (req.body.call_hook && typeof req.body.call_hook !== 'object') {
     throw new DbErrorBadRequest('\'call_hook\' must be an object when updating an application');
@@ -49,18 +45,14 @@ async function validateUpdate(req, sid) {
 }
 
 async function validateDelete(req, 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('cannot delete application owned by a different account');
-    }
+  if (req.user.account_sid && sid !== req.user.account_sid) {
+    throw new DbErrorBadRequest('you may not update or delete an application associated with a different account');
   }
   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) => {
@@ -77,16 +69,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) {
@@ -115,54 +97,13 @@ router.get('/:sid', async(req, res) => {
     const account_sid = req.user.hasAccountAuth ? req.user.account_sid : null;
     const results = await Application.retrieve(req.params.sid, service_provider_sid, account_sid);
     if (results.length === 0) return res.status(404).end();
-    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 sid = req.params.sid;
-  const logger = req.app.locals.logger;
-  try {
-    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;
@@ -190,16 +131,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/availability.js

@@ -1,31 +0,0 @@
-const router = require('express').Router();
-const {DbErrorBadRequest} = require('../../utils/errors');
-const {promisePool} = require('../../db');
-const sysError = require('../error');
-
-
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const {type, value} = req.query;
-
-  try {
-
-    if (['email', 'phone'].includes(type)) {
-      const field = type === 'email' ? 'email' : 'phone';
-      const sql = `SELECT * from users WHERE ${field} = ?`;
-      const [r] = await promisePool.execute(sql, [value]);
-      res.json({available: 0 === r.length});
-    }
-    else if (type === 'subdomain') {
-      const sql = 'SELECT * from accounts WHERE sip_realm = ?';
-      const [r] = await promisePool.execute(sql, [value]);
-      res.json({available: 0 === r.length});
-    }
-    else throw new DbErrorBadRequest(`invalid type: ${type}`);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-
-module.exports = router;

lib/routes/api/beta-invite-codes.js

@@ -1,32 +0,0 @@
-const router = require('express').Router();
-const sysError = require('../error');
-const {promisePool} = require('../../db');
-const short = require('short-uuid');
-const translator = short('0123456789ABCXZ');
-
-router.post('/', async(req, res) => {
-  const {logger} = req.app.locals;
-  logger.debug({payload: req.body}, 'POST /BetaInviteCodes');
-  try {
-    const {count} = req.body || {};
-    const total = Math.max(count || 1, 1);
-    const codes = [];
-    let added = 0;
-    while (added < total) {
-      const code = translator.new().substring(0, 6);
-      if (!codes.find((c) => c === code)) {
-        codes.push(code);
-        added++;
-      }
-    }
-
-    const values = codes.map((c) => `('${c}')`).join(',');
-    const sql = `INSERT INTO beta_invite_codes (invite_code) VALUES ${values}`;
-    const [r] = await promisePool.query(sql);
-    res.status(200).json({status: 'ok', added: r.affectedRows, codes});
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/change-password.js

@@ -1,47 +0,0 @@
-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 sysError = require('../error');
-const sqlUpdatePassword = `UPDATE users 
-SET hashed_password= ? 
-WHERE user_sid = ?`;
-
-router.post('/', async(req, res) => {
-  const {logger, retrieveKey, deleteKey} = req.app.locals;
-  const {user_sid} = req.user;
-  const {old_password, new_password} = req.body;
-  try {
-    if (!old_password || !new_password) throw new DbErrorBadRequest('missing old_password or new_password');
-
-    /* validate existing password */
-    {
-      const [r] = await promisePool.query('SELECT * from users where user_sid = ?', user_sid);
-      logger.debug({user: [r[0]]}, 'change password for user');
-
-      if (r[0].provider !== 'local') {
-        throw new DbErrorBadRequest('user is using oauth authentication');
-      }
-
-      const isCorrect = await verifyPassword(r[0].hashed_password, old_password);
-      if (!isCorrect) {
-        const key = `reset-link:${old_password}`;
-        const user_sid = await retrieveKey(key);
-        if (!user_sid) throw new DbErrorBadRequest('old_password is incorrect');
-        await deleteKey(key);
-      }
-    }
-
-    /* store new password */
-    const passwordHash = await generateHashedPassword(new_password);
-    const [r] = await promisePool.execute(sqlUpdatePassword, [passwordHash, user_sid]);
-    if (r.affectedRows !== 1) throw new Error('failed to update user with new password');
-    res.sendStatus(204);
-  } catch (err) {
-    sysError(logger, res, err);
-    return;
-  }
-});
-
-module.exports = router;

lib/routes/api/charges.js

@@ -1,46 +0,0 @@
-const router = require('express').Router();
-const sysError = require('../error');
-//const {DbErrorUnprocessableRequest, DbErrorBadRequest} = require('../../utils/errors');
-
-
-/**
- * retrieve charges for an account and/or call
- */
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    res.status(200).json([
-      {
-        charge_sid: 'f8d2a604-ed29-4eac-9efc-8f58b0e438ca',
-        account_sid: req.user.account_sid,
-        call_billing_record_sid: 'e4be80a4-6597-49cf-8605-6b94493fada1',
-        billed_at: '2020-01-01 15:10:10',
-        billed_activity: 'outbound-call',
-        call_secs_billed: 392,
-        amount_charged: 0.0200
-      },
-      {
-        charge_sid: 'd9659f3f-3a94-455c-9e8e-3b36f250ffc8',
-        account_sid: req.user.account_sid,
-        call_billing_record_sid: 'e4be80a4-6597-49cf-8605-6b94493fada1',
-        billed_at: '2020-01-01 15:10:10',
-        billed_activity: 'tts',
-        tts_chars_billed: 100,
-        amount_charged: 0.0130
-      },
-      {
-        charge_sid: 'adcc1e79-eb79-4370-ab74-4c2e9a41339a',
-        account_sid: req.user.account_sid,
-        call_billing_record_sid: 'e4be80a4-6597-49cf-8605-6b94493fada1',
-        billed_at: '2020-01-01 15:10:10',
-        billed_activity:  'stt',
-        stt_secs_billed: 30,
-        amount_charged: 0.0015
-      }
-    ]);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/decorate.js

@@ -1,5 +1,5 @@
 const assert = require('assert');
-const sysError = require('../error');
+const sysError = require('./error');
 
 module.exports = decorate;
 
@@ -58,7 +58,7 @@ function retrieve(router, klass) {
     const logger = req.app.locals.logger;
     try {
       const results = await klass.retrieve(req.params.sid);
-      if (results.length === 0) return res.sendStatus(404);
+      if (results.length === 0) return res.status(404).end();
       return res.status(200).json(results[0]);
     }
     catch (err) {
@@ -78,7 +78,7 @@ function update(router, klass, preconditions) {
       }
       const rowsAffected = await klass.update(sid, req.body);
       if (rowsAffected === 0) {
-        return res.sendStatus(404);
+        return res.status(404).end();
       }
       res.status(204).end();
     } catch (err) {
@@ -99,9 +99,9 @@ function remove(router, klass, preconditions) {
       const rowsAffected = await klass.remove(sid);
       if (rowsAffected === 0) {
         logger.info(`unable to delete ${klass.name} with sid ${sid}: not found`);
-        return res.sendStatus(404);
+        return res.status(404).end();
       }
-      res.sendStatus(204);
+      res.status(204).end();
     } catch (err) {
       sysError(logger, res, err);
     }

lib/routes/api/forgot-password.js

@@ -1,82 +0,0 @@
-const router = require('express').Router();
-//const debug = require('debug')('jambonz:api-server');
-const short = require('short-uuid');
-const translator = short();
-const {validateEmail, emailSimpleText} = require('../../utils/email-utils');
-const {promisePool} = require('../../db');
-const sysError = require('../error');
-const sql = `SELECT * from users user 
-LEFT JOIN accounts AS acc 
-ON acc.account_sid = user.account_sid 
-WHERE user.email = ?`;
-
-function createOauthEmailText(provider) {
-  return `Hi there!
-
-  Someone (presumably you!) requested to reset their password.
-  However, the account associated with this email is using oauth identification via ${provider},
-  Please change your password through that provider, if you wish to.
-  
-  If you did not make this request, please delete this email.  No further action is required.
-  
-  Best,
-  
-  Jambonz support team`;
-}
-
-function createResetEmailText(link) {
-  const baseUrl = 'http://localhost:3001';
-
-  return `Hi there!
-
-  Someone (presumably you!) requested to reset their password.
-  Please follow the link below to reset your password:
-  
-  ${baseUrl}/reset-password/${link}
-  
-  This link is valid for 1 hour only.
-  If you did not make this request, please delete this email.  No further action is required.
-  
-  Best,
-  
-  Jambonz support team`;
-}
-
-router.post('/', async(req, res) => {
-  const {logger, addKey} = req.app.locals;
-  const {email} = req.body;
-  let obj;
-  try {
-    if (!email || !validateEmail(email)) {
-      return res.status(400).json({error: 'invalid or missing email'});
-    }
-
-    const [r] = await promisePool.query({sql, nestTables: true}, email);
-    if (0 === r.length) {
-      return res.status(400).json({error: 'email does not exist'});
-    }
-    obj = r[0];
-    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) {
-    sysError(logger, res, err);
-    return;
-  }
-
-  if (obj.user.provider !== 'local') {
-    /* send email indicating they need to change via their oauth provider */
-    emailSimpleText(logger, email, 'Reset password request', createOauthEmailText(obj.user.provider));
-
-  }
-  else {
-    /* generate a link for this user to reset, send email */
-    const link = translator.generate();
-    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));
-  }
-});
-
-module.exports = router;

lib/routes/api/index.js

@@ -1,53 +1,26 @@
 const api = require('express').Router();
 
-const isAdminScope = (req, res, next) => {
+function isAdminScope(req, res, next) {
   if (req.user.hasScope('admin')) return next();
   res.status(403).json({
     status: 'fail',
     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('/ServiceProviders', require('./service-providers'));
-api.use('/VoipCarriers', require('./voip-carriers'));
-api.use('/Webhooks', require('./webhooks'));
-api.use('/SipGateways', require('./sip-gateways'));
-api.use('/SmppGateways', require('./smpp-gateways'));
-api.use('/PhoneNumbers', require('./phone-numbers'));
+api.use('/ServiceProviders', isAdminScope, require('./service-providers'));
+api.use('/VoipCarriers', isAdminScope, require('./voip-carriers'));
+api.use('/SipGateways', isAdminScope, require('./sip-gateways'));
+api.use('/PhoneNumbers', isAdminScope, require('./phone-numbers'));
 api.use('/ApiKeys', require('./api-keys'));
 api.use('/Accounts', require('./accounts'));
 api.use('/Applications', require('./applications'));
 api.use('/MicrosoftTeamsTenants', require('./tenants'));
-api.use('/Sbcs', require('./sbcs'));
+api.use('/Sbcs', isAdminScope, require('./sbcs'));
 api.use('/Users', require('./users'));
-api.use('/register', require('./register'));
-api.use('/signin', require('./signin'));
 api.use('/login', require('./login'));
-api.use('/logout', require('./logout'));
-api.use('/forgot-password', require('./forgot-password'));
-api.use('/change-password', require('./change-password'));
-api.use('/ActivationCode', require('./activation-code'));
-api.use('/Availability', require('./availability'));
-api.use('/AccountTest', require('./account-test'));
-//api.use('/Products', require('./products'));
-api.use('/Prices', require('./prices'));
-api.use('/StripeCustomerId', require('./stripe-customer-id'));
-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'));
 
 // messaging
-api.use('/Smpps', require('./smpps'));   // our smpp server info
 api.use('/messaging', require('./sms-inbound'));      // inbound SMS from carrier
 api.use('/outboundSMS', require('./sms-outbound'));   // outbound SMS from feature server
 

lib/routes/api/invite-codes.js

@@ -1,34 +0,0 @@
-const router = require('express').Router();
-const sysError = require('../error');
-const {promisePool} = require('../../db');
-const sqlClaim = `UPDATE beta_invite_codes 
-SET in_use = 1 
-WHERE invite_code = ? 
-AND in_use = 0`;
-const sqlTest = `SELECT * FROM beta_invite_codes 
-WHERE invite_code = ? 
-AND in_use = 0`;
-router.post('/', async(req, res) => {
-  const {logger} = req.app.locals;
-  try {
-    const {code, test} = req.body;
-    logger.debug({code}, 'POST /InviteCodes');
-    if ('test' === process.env.NODE_ENV) {
-      if (code.endsWith('0')) return res.sendStatus(404);
-      res.sendStatus(204);
-      return;
-    }
-    if (test) {
-      const [r] = await promisePool.execute(sqlTest, [code]);
-      res.sendStatus(1 === r.length ? 204 : 404);
-    }
-    else {
-      const [r] = await promisePool.execute(sqlClaim, [code]);
-      res.sendStatus(1 === r.affectedRows ? 204 : 404);
-    }
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/invoices.js

@@ -1,26 +0,0 @@
-const router = require('express').Router();
-const assert = require('assert');
-const Account = require('../../models/account');
-const {
-  retrieveUpcomingInvoice
-} = require('../../utils/stripe-utils');
-const sysError = require('../error');
-
-/* retrieve */
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const {account_sid} = req.user;
-  try {
-    const results = await Account.retrieve(account_sid);
-    assert.ok(1 === results.length, `account ${account_sid} not found`);
-    const {stripe_customer_id} = results[0];
-    if (!stripe_customer_id) return res.sendStatus(404);
-    const invoice = await retrieveUpcomingInvoice(logger, stripe_customer_id);
-    res.status(200).json(invoice);
-  } catch (err) {
-    if (err.statusCode) return res.sendStatus(err.statusCode);
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/limits.js

@@ -1,128 +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;
-  const account_sid = parseAccountSid(req);
-  let service_provider_sid;
-  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);
-  }
-  try {
-    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 account_sid = parseAccountSid(req);
-  if (!account_sid) service_provider_sid = parseServiceProviderSid(req);
-  const logger = req.app.locals.logger;
-  try {
-    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;
-  const account_sid = parseAccountSid(req);
-  const {category} = req.query;
-  const service_provider_sid = parseServiceProviderSid(req);
-  try {
-    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,21 +1,21 @@
 const router = require('express').Router();
-const jwt = require('jsonwebtoken');
-const {verifyPassword} = require('../../utils/password-utils');
-const {promisePool} = require('../../db');
-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 crypto = require('crypto');
+const {getMysqlConnection} = require('../../db');
+
 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';
 
+const sha512 = function(password, salt) {
+  const hash = crypto.createHmac('sha512', salt); /** Hashing algorithm sha512 */
+  hash.update(password);
+  var value = hash.digest('hex');
+  return {
+    salt:salt,
+    passwordHash:value
+  };
+};
 
-router.post('/', async(req, res) => {
+router.post('/', (req, res) => {
   const logger = req.app.locals.logger;
   const {username, password} = req.body;
   if (!username || !password) {
@@ -23,63 +23,52 @@ router.post('/', async(req, res) => {
     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);
-    }
-    logger.info({r}, 'successfully retrieved user account');
-    const isCorrect = await verifyPassword(r[0].hashed_password, password);
-    if (!isCorrect) return res.sendStatus(403);
-    const force_change = !!r[0].force_change;
-    const [t] = await promisePool.query(tokenSql);
-    if (t.length === 0) {
-      logger.error('Database has no admin token provisioned...run reset_admin_password');
+  getMysqlConnection((err, conn) => {
+    if (err) {
+      logger.error({err}, 'Error getting db connection');
       return res.sendStatus(500);
     }
+    conn.query(retrieveSql, [username], (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);
+      }
 
-    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
-    };
-    const token = jwt.sign(
-      payload,
-      process.env.JWT_SECRET,
-      { expiresIn: parseInt(process.env.JWT_EXPIRES_IN || 60) * 60 }
-    );
-    res.json({token, ...obj});
-  } catch (err) {
-    sysError(logger, res, err);
-  }
+      logger.info({results}, 'successfully retrieved account');
+      const salt = results[0].salt;
+      const trueHash = results[0].hashed_password;
+      const forceChange = results[0].force_change;
+
+      const {passwordHash} = sha512(password, salt);
+      if (trueHash !== passwordHash) return res.sendStatus(403);
+
+      if (forceChange) return res.json({user_sid: results[0].user_sid, force_change: true});
+
+      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, token: tokenResults[0].token});
+        });
+      });
+    });
+  });
 });
 
 

lib/routes/api/logout.js

@@ -1,23 +0,0 @@
-const router = require('express').Router();
-const debug = require('debug')('jambonz:api-server');
-const {hashString} = require('../../utils/password-utils');
-const sysError = require('../error');
-
-router.post('/', async(req, res) => {
-  const {logger, addKey} = req.app.locals;
-  const {jwt} = req.user;
-
-  debug(`adding jwt to blacklist: ${jwt}`);
-
-  try {
-    /* 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);
-  }
-});
-
-module.exports = router;

lib/routes/api/password-settings.js

@@ -1,42 +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 {
-    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

@@ -3,64 +3,44 @@ const {DbErrorUnprocessableRequest, DbErrorBadRequest} = require('../../utils/er
 const PhoneNumber = require('../../models/phone-number');
 const VoipCarrier = require('../../models/voip-carrier');
 const decorate = require('./decorate');
-const {e164} = require('../../utils/phone-number-utils');
+const validateNumber = require('../../utils/phone-number-syntax');
 const preconditions = {
   'add': validateAdd,
   'delete': checkInUse,
   'update': validateUpdate
 };
-const sysError = require('../error');
-
 
 /* check for required fields when adding */
 async function validateAdd(req) {
   try {
-    /* account level user can only act on carriers associated to his/her account */
-    if (req.user.hasAccountAuth) {
-      req.body.account_sid = req.user.account_sid;
-    }
-
+    if (!req.body.voip_carrier_sid) throw new DbErrorBadRequest('voip_carrier_sid is required');
     if (!req.body.number) throw new DbErrorBadRequest('number is required');
-    const formattedNumber = e164(req.body.number);
-    req.body.number = formattedNumber;
+    validateNumber(req.body.number);
   } catch (err) {
     throw new DbErrorBadRequest(err.message);
   }
 
   /* check that voip carrier exists */
-  if (req.body.voip_carrier_sid) {
-    const result = await VoipCarrier.retrieve(req.body.voip_carrier_sid);
-    if (!result || result.length === 0) {
-      throw new DbErrorBadRequest(`voip_carrier not found for sid ${req.body.voip_carrier_sid}`);
-    }
+  const result = await VoipCarrier.retrieve(req.body.voip_carrier_sid);
+  if (!result || result.length === 0) {
+    throw new DbErrorBadRequest(`voip_carrier not found for sid ${req.body.voip_carrier_sid}`);
   }
 }
 
 /* can not delete a phone number if it in use */
 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 DbErrorUnprocessableRequest('cannot delete a phone number that belongs to another account');
-    }
-  }
-  if (!req.user.hasAccountAuth && phoneNumber.account_sid) {
+  if (phoneNumber.account_sid) {
     throw new DbErrorUnprocessableRequest('cannot delete phone number that is assigned to an account');
   }
 }
 
 /* can not change number or voip carrier */
 async function validateUpdate(req, sid) {
+  //const result = await PhoneNumber.retrieve(sid);
   if (req.body.voip_carrier_sid) throw new DbErrorBadRequest('voip_carrier_sid may not be modified');
   if (req.body.number) throw new DbErrorBadRequest('number may not be modified');
 
-  const phoneNumber = await PhoneNumber.retrieve(sid);
-  if (req.user.hasAccountAuth) {
-    if (phoneNumber && phoneNumber.length && phoneNumber[0].account_sid !== req.user.account_sid) {
-      throw new DbErrorUnprocessableRequest('cannot operate on a phone number that belongs to another account');
-    }
-  }
-
   // 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
@@ -68,31 +48,6 @@ async function validateUpdate(req, sid) {
   // TODO: if we are removing from an account, verify we are also removing from application.
 }
 
-decorate(router, PhoneNumber, ['add', 'update', 'delete'], preconditions);
-
-/* list */
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const results = await PhoneNumber.retrieveAll(req.user.hasAccountAuth ? req.user.account_sid : null);
-    res.status(200).json(results);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-/* retrieve */
-router.get('/:sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const account_sid = req.user.hasAccountAuth ? req.user.account_sid : null;
-    const results = await PhoneNumber.retrieve(req.params.sid, account_sid);
-    if (results.length === 0) return res.status(404).end();
-    return res.status(200).json(results[0]);
-  }
-  catch (err) {
-    sysError(logger, res, err);
-  }
-});
+decorate(router, PhoneNumber, ['*'], preconditions);
 
 module.exports = router;

lib/routes/api/predefined-carriers.js

@@ -1,7 +0,0 @@
-const router = require('express').Router();
-const PredefinedCarrier = require('../../models/predefined-carrier');
-const decorate = require('./decorate');
-
-decorate(router, PredefinedCarrier, ['list']);
-
-module.exports = router;

lib/routes/api/prices.js

@@ -1,108 +0,0 @@
-const router = require('express').Router();
-const Product = require('../../models/product');
-const {promisePool} = require('../../db');
-const sysError = require('../error');
-const sqlRetrieveSpecialOffers = `SELECT *
-FROM account_offers offer
-LEFT JOIN products AS product ON product.product_sid = offer.product_sid 
-WHERE offer.account_sid = ?`;
-
-const combineProductAndPrice = (localProducts, product, prices) => {
-  const lp = localProducts.find((lp) => lp.category === product.metadata.jambonz_category);
-  return {
-    product_sid: lp.product_sid,
-    name: lp.name,
-    category: lp.category,
-    stripe_product_id: product.id,
-    description: product.description,
-    unit_label: product.unit_label,
-    prices: prices.map((price) => {
-      return {
-        stripe_price_id: price.id,
-        billing_scheme: price.billing_scheme,
-        currency: price.currency,
-        recurring: price.recurring,
-        tiers_mode: price.tiers_mode,
-        tiers: price.tiers,
-        type: price.type,
-        unit_amount: price.unit_amount,
-        unit_amount_decimal: price.unit_amount_decimal
-      };
-    })
-  };
-};
-
-
-/* list */
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const {account_sid} = req.user || {};
-  const {listProducts, retrieveProduct, retrievePricesForProduct} = require('../../utils/stripe-utils');
-  try {
-    const localProducts = await Product.retrieveAll();
-
-    /**
-     * If this request is for a specific account (we have an account_sid)
-     * then check to see if we have any special offers for this account
-     */
-    const selectedProducts = [];
-    if (account_sid) {
-      const [r] = await promisePool.query({sql: sqlRetrieveSpecialOffers, nestTables: true}, account_sid);
-      logger.debug({r}, `retrieved special offer ids for account_sid ${account_sid}`);
-
-      if (r.length > 0) {
-        /* retrieve all the offers for this account */
-        const products = await Promise.all(r.map((row) => retrieveProduct(logger, row.offer.stripe_product_id)));
-        logger.debug({products}, `retrieved special offer products for account_sid ${account_sid}`);
-        const prices = await Promise.all(products.map((prod) => retrievePricesForProduct(logger, prod.id)));
-        logger.debug({prices}, `retrieved special offer prices for account_sid ${account_sid}`);
-
-        for (let i = 0; i < products.length; i++) {
-          selectedProducts.push(combineProductAndPrice(localProducts, products[i], prices[i].data));
-        }
-      }
-    }
-
-    /**
-     * we must return at least pricing for sessions and devices, so find and use
-     * the general pricing if no account-specific product was specified for these
-     */
-    const haveSessionPricing = selectedProducts.find((prod) => prod.category === 'voice_call_session');
-    const haveDevicePricing = selectedProducts.find((prod) => prod.category === 'device');
-
-    if (haveSessionPricing && haveDevicePricing) {
-      logger.debug({selectedProducts}, 'found account level offers for sessions and devices');
-      return res.status(200).json(selectedProducts);
-    }
-
-    /* need to get default pricing */
-    const allProducts = await listProducts(logger);
-    logger.debug({allProducts}, 'retrieved all products');
-    const defaultProducts = allProducts.data.filter((prod) =>
-      ['voice_call_session', 'device'].includes(prod.metadata.jambonz_category) &&
-      'general' === prod.metadata.availability);
-    logger.debug({defaultProducts}, 'default products');
-
-    if (!haveSessionPricing) {
-      const product = defaultProducts.find((prod) => 'voice_call_session' === prod.metadata.jambonz_category);
-      if (product) {
-        logger.debug(`retrieving prices for product id ${product.id}`);
-        const prices = await retrievePricesForProduct(logger, product.id);
-        selectedProducts.push(combineProductAndPrice(localProducts, product, prices.data));
-      }
-    }
-    if (!haveDevicePricing) {
-      const product = defaultProducts.find((prod) => 'device' === prod.metadata.jambonz_category);
-      if (product) {
-        logger.debug(`retrieving prices for product id ${product.id}`);
-        const prices = await retrievePricesForProduct(logger, product.id);
-        selectedProducts.push(combineProductAndPrice(localProducts, product, prices.data));
-      }
-    }
-    res.status(200).json(selectedProducts);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/products.js

@@ -1,78 +0,0 @@
-const assert = require('assert');
-const router = require('express').Router();
-const Product = require('../../models/product');
-const {listProducts, listPrices} = require('../../utils/stripe-utils');
-const sysError = require('./error');
-
-/* list */
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const [stripeProducts, localProducts] = await Promise.all([listProducts(), Product.retrieveAll()]);
-    console.log(stripeProducts);
-    console.log(localProducts);
-    const arr = localProducts.map((p) => {
-      const stripe = stripeProducts.data
-        .find((s) => s.metadata.jambonz_category === p.category);
-      assert.ok(stripe, `No stripe product found for category ${p.category}`);
-      Object.assign(p, {
-        stripe_product_id: stripe.id,
-        statement_descriptor: stripe.statement_descriptor,
-        description: stripe.description,
-        unit_label: stripe.unit_label
-      });
-      return p;
-    });
-    res.status(200).json(arr);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-/* get */
-router.get('/:sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const [allPrices, results] = await Promise.all([listPrices(), Product.retrieve(req.params.sid)]);
-    if (results.length === 0) return res.sendStatus(404);
-    const product = results[0];
-    const prices = allPrices.data
-      .filter((p) => p.active && p.product.active)
-      .filter((p) => p.product.metadata.jambonz_category === product.category);
-    assert(prices.length > 0, `No pricing data found for product ${req.params.sid}`);
-    const stripe = prices[0].product;
-    Object.assign(product, {
-      stripe_product_id: stripe.id,
-      statement_descriptor: stripe.statement_descriptor,
-      description: stripe.description,
-      unit_label: stripe.unit_label
-    });
-
-    // get pricing
-    Object.assign(product, {
-      pricing: {
-        billing_scheme: stripe.billing_scheme,
-        type: prices[0].type
-      }
-    });
-
-    product.pricing.fees = prices.map((price) => {
-      const obj = {
-        stripe_price_id: price.id,
-        currency: price.currency,
-        unit_amount: price.unit_amount,
-        unit_amount_decimal: price.unit_amount_decimal
-      };
-      if (price.tiers) {
-        obj.tiers = price.tiers;
-        obj.tiers_mode = price.tiers_mode;
-      }
-      return obj;
-    });
-    res.status(200).json(product);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/recent-calls.js

@@ -1,96 +0,0 @@
-const router = require('express').Router();
-const sysError = require('../error');
-const {DbErrorBadRequest} = require('../../utils/errors');
-const {getHomerApiKey, getHomerSipTrace, getHomerPcap} = require('../../utils/homer-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;
-  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} = 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,
-      });
-      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,
-      });
-      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/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]);
-    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);
-  }
-});
-
-module.exports = router;

lib/routes/api/register.js

@@ -1,367 +0,0 @@
-const router = require('express').Router();
-const debug = require('debug')('jambonz:api-server');
-const {DbErrorBadRequest, DbErrorUnprocessableRequest} = require('../../utils/errors');
-const {promisePool} = require('../../db');
-const {doGithubAuth, doGoogleAuth, doLocalAuth} = require('../../utils/oauth-utils');
-const {validateEmail} = require('../../utils/email-utils');
-const { v4: uuid } = require('uuid');
-const short = require('short-uuid');
-const translator = short();
-const jwt = require('jsonwebtoken');
-const {setupFreeTrial, createTestCdrs, createTestAlerts} = require('./utils');
-const {generateHashedPassword} = require('../../utils/password-utils');
-const sysError = require('../error');
-const insertUserSql = `INSERT into users 
-(user_sid, account_sid, name, email, provider, provider_userid, email_validated) 
-values (?, ?, ?, ?, ?, ?, 1)`;
-const insertUserLocalSql = `INSERT into users 
-(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 = ?`;
-const insertSignupHistorySql = `INSERT into signup_history
-(email, name) 
-values (?, ?)`;
-
-const addLocalUser = async(logger, user_sid, account_sid,
-  name, email, email_activation_code, passwordHash) => {
-  const [r] = await promisePool.execute(insertUserLocalSql,
-    [
-      user_sid,
-      account_sid,
-      name,
-      email,
-      email_activation_code,
-      passwordHash
-    ]);
-  debug({r}, 'Result from adding user');
-};
-const addOauthUser = async(logger, user_sid, account_sid,
-  name, email, provider, provider_userid) => {
-  const [r] = await promisePool.execute(insertUserSql,
-    [
-      user_sid,
-      account_sid,
-      name,
-      email,
-      provider,
-      provider_userid
-    ]);
-  logger.debug({r}, 'Result from adding user');
-};
-
-const validateRequest = async(req, user_sid) => {
-  const payload = req.body || {};
-
-  /* check required properties are there */
-  ['provider', 'service_provider_sid'].forEach((prop) => {
-    if (!payload[prop]) throw new DbErrorBadRequest(`missing ${prop}`);
-  });
-
-  /* valid service provider? */
-  const [rows] = await promisePool.query('SELECT * from service_providers WHERE service_provider_sid = ?',
-    payload.service_provider_sid);
-  if (0 === rows.length) throw new DbErrorUnprocessableRequest('invalid service_provider_sid');
-
-  /* valid provider? */
-  if (!['local', 'github', 'google', 'twitter'].includes(payload.provider)) {
-    throw new DbErrorUnprocessableRequest(`invalid provider: ${payload.provider}`);
-  }
-
-  /* if local provider then email/password */
-  if ('local' === payload.provider) {
-    if (!payload.email || !payload.password) throw new DbErrorBadRequest('missing email or password');
-
-    /* valid email? */
-    if (!validateEmail(payload.email)) throw new DbErrorBadRequest('invalid email');
-
-    /* valid password? */
-    if (payload.password.length < 6) throw new DbErrorBadRequest('password must be at least 6 characters');
-
-    /* is this email available? */
-    if (user_sid) {
-      const [rows] = await promisePool.query('SELECT * from users WHERE email = ? AND user_sid <> ?',
-        [payload.email, user_sid]);
-      if (rows.length > 0) throw new DbErrorUnprocessableRequest('account already exists for this email');
-    }
-    else {
-      const [rows] = await promisePool.query('SELECT * from users WHERE email = ?', payload.email);
-      if (rows.length > 0) throw new DbErrorUnprocessableRequest('account already exists for this email');
-    }
-
-    /* verify that we have a code to email them */
-    if (!payload.email_activation_code) throw new DbErrorBadRequest('email activation code required');
-  }
-  else {
-    ['oauth2_code', 'oauth2_state', 'oauth2_client_id', 'oauth2_redirect_uri'].forEach((prop) => {
-      if (!payload[prop]) throw new DbErrorBadRequest(`missing ${prop} for provider ${payload.provider}`);
-    });
-  }
-};
-
-const parseAuthorizationToken = (logger, req) => {
-  const notfound = {};
-  const authHeader = req.get('Authorization');
-  if (!authHeader) return Promise.resolve(notfound);
-
-  return new Promise((resolve) => {
-    const arr = /^Bearer (.*)$/.exec(req.get('Authorization'));
-    if (!arr) return resolve(notfound);
-    jwt.verify(arr[1], process.env.JWT_SECRET, async(err, decoded) => {
-      if (err) return resolve(notfound);
-      logger.debug({jwt: decoded}, 'register - create new user for existing account');
-      resolve(decoded);
-    });
-  });
-};
-
-/**
- * called to create a new user and account
- * or new user with existing account, in case of "change auth mechanism"
- */
-router.post('/', async(req, res) => {
-  const {logger, writeCdrs, writeAlerts, AlertType} = req.app.locals;
-  const userProfile = {};
-
-  try {
-    const {user_sid, account_sid} = await parseAuthorizationToken(logger, req);
-    await validateRequest(req, user_sid);
-
-    logger.debug({payload: req.body}, 'POST /register');
-
-    if (req.body.provider === 'github') {
-      const user = await doGithubAuth(logger, req.body);
-      logger.info({user}, 'retrieved user details from github');
-      Object.assign(userProfile, {
-        name: user.name,
-        email: user.email,
-        email_validated: user.email_validated,
-        avatar_url: user.avatar_url,
-        provider: 'github',
-        provider_userid: user.login
-      });
-    }
-    else if (req.body.provider === 'google') {
-      const user = await doGoogleAuth(logger, req.body);
-      logger.info({user}, 'retrieved user details from google');
-      Object.assign(userProfile, {
-        name: user.name || user.email,
-        email: user.email,
-        email_validated: user.verified_email,
-        picture: user.picture,
-        provider: 'google',
-        provider_userid: user.id
-      });
-    }
-    else if (req.body.provider === 'local') {
-      const user = await doLocalAuth(logger, req.body);
-      logger.info({user}, 'retrieved user details for local provider');
-      debug({user}, 'retrieved user details for local provider');
-      Object.assign(userProfile, {
-        name: user.name,
-        email: user.email,
-        provider: 'local',
-        email_activation_code: user.email_activation_code
-      });
-    }
-
-    if (req.body.provider !== 'local') {
-      /* when using oauth2, check to see if user already exists */
-      const [users] = await promisePool.query(
-        'SELECT * from users WHERE provider = ? AND provider_userid = ?',
-        [userProfile.provider, userProfile.provider_userid]);
-      logger.debug({users}, `Result from retrieving user for ${userProfile.provider}:${userProfile.provider_userid}`);
-      if (1 === users.length) {
-
-        /* if changing existing account to oauth, no other user with that provider/userid must exist */
-        if (user_sid) {
-          throw new DbErrorUnprocessableRequest('account already exists for this oauth user/provider');
-        }
-        Object.assign(userProfile, {
-          user_sid: users[0].user_sid,
-          account_sid: users[0].account_sid,
-          name: users[0].name,
-          email: users[0].email,
-          phone: users[0].phone,
-          pristine: false,
-          email_validated: users[0].email_validated ? true : false,
-          phone_validated: users[0].phone_validated ? true : false,
-          scope: users[0].scope
-        });
-
-        const [accounts] =  await promisePool.query('SELECT * from accounts WHERE account_sid = ?',
-          userProfile.account_sid);
-        if (accounts.length === 0) throw new DbErrorUnprocessableRequest('user exists with no associated account');
-        Object.assign(userProfile, {
-          is_active: accounts[0].is_active == 1,
-          tutorial_completion: accounts[0].tutorial_completion
-        });
-      }
-      else {
-        /* you can not register from the sign-in page */
-        if (req.body.locationBeforeAuth === '/sign-in') {
-          logger.debug('redirecting user to /register so they accept Ts & Cs');
-          return res.status(404).json({msg: 'registering a new account not allowed from the sign-in page'});
-        }
-        /* new user, but check if we already have an account with that email */
-        let sql = 'SELECT * from users WHERE email = ?';
-        const args = [userProfile.email];
-        if (user_sid) {
-          sql += ' AND user_sid <> ?';
-          args.push(user_sid);
-        }
-        logger.debug(`sql is ${sql}`);
-        const [accounts] = await promisePool.execute(sql, args);
-        if (accounts.length > 0) {
-          throw new DbErrorBadRequest(`user already exists with email ${userProfile.email}`);
-        }
-      }
-    }
-    if (userProfile.pristine !== false && !user_sid) {
-      /* add a new user and account */
-      /* get root domain */
-      const [sp] = await promisePool.query(queryRootDomainSql, req.body.service_provider_sid);
-      if (0 === sp.length) throw new Error(`service_provider not found for sid ${req.body.service_provider_sid}`);
-      if (!sp[0].root_domain) {
-        throw new Error(`root_domain missing for service provider ${req.body.service_provider_sid}`);
-      }
-
-      userProfile.root_domain = sp[0].root_domain;
-      userProfile.account_sid = uuid();
-      userProfile.user_sid = uuid();
-
-      const [r1] = await promisePool.execute(insertAccountSql,
-        [
-          userProfile.account_sid,
-          req.body.service_provider_sid,
-          userProfile.name || userProfile.email,
-          req.body.provider !== 'local',
-          `wh_secret_${translator.generate()}`
-        ]);
-      logger.debug({r1}, 'Result from adding account');
-
-      /* add to signup history */
-      let isReturningUser = false;
-      try {
-        await promisePool.execute(insertSignupHistorySql,
-          [userProfile.email, userProfile.name || userProfile.email]);
-      } catch (err) {
-        if (err.code === 'ER_DUP_ENTRY') {
-          logger.info(`register: user is signing up for a second trial: ${userProfile.email}`);
-          isReturningUser = true;
-        }
-      }
-
-      /* write sample cdrs and alerts in test environment */
-      if ('test' === process.env.NODE_ENV) {
-        await createTestCdrs(writeCdrs, userProfile.account_sid);
-        await createTestAlerts(writeAlerts, AlertType, userProfile.account_sid);
-        logger.debug('added test data for cdrs and alerts');
-      }
-      /* assign starter set of products */
-      await setupFreeTrial(logger, userProfile.account_sid, isReturningUser);
-
-      /* add a user for the account */
-      if (req.body.provider === 'local') {
-        /* hash password */
-        debug(`salting password: ${req.body.password}`);
-        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);
-        debug('added local user');
-      }
-      else {
-        await addOauthUser(logger, userProfile.user_sid, userProfile.account_sid,
-          userProfile.name, userProfile.email, userProfile.provider,
-          userProfile.provider_userid);
-      }
-
-      /* add hello-world and dial-time as starter applications */
-      const callStatusSid = uuid();
-      const helloWordSid = uuid();
-      const dialTimeSid = uuid();
-
-      /* 3 webhooks */
-      await promisePool.execute(insertWebookSql, [callStatusSid, 'https://public-apps.jambonz.us/call-status', 'POST']);
-      await promisePool.execute(insertWebookSql, [helloWordSid, 'https://public-apps.jambonz.us/hello-world', 'POST']);
-      await promisePool.execute(insertWebookSql, [dialTimeSid, 'https://public-apps.jambonz.us/dial-time', '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']);
-
-      Object.assign(userProfile, {
-        pristine: true,
-        is_active: req.body.provider !== 'local',
-        email_validated: userProfile.provider !== 'local',
-        phone_validated: false,
-        tutorial_completion: 0,
-        scope: 'read-write'
-      });
-    }
-    else if (user_sid) {
-      /* add a new user for existing account */
-      userProfile.user_sid = uuid();
-      userProfile.account_sid = account_sid;
-
-      /* changing auth mechanism, add user for existing account */
-      logger.debug(`register - creating new user for existing account ${account_sid}`);
-      if (req.body.provider === 'local') {
-        /* hash password */
-        const passwordHash = await generateHashedPassword(req.body.password);
-
-        await addLocalUser(logger, userProfile.user_sid, userProfile.account_sid,
-          userProfile.name, userProfile.email, userProfile.email_activation_code,
-          passwordHash);
-
-        /* note: we deactivate the old user once the new email is validated */
-      }
-      else {
-        await addOauthUser(logger, userProfile.user_sid, userProfile.account_sid,
-          userProfile.name, userProfile.email, userProfile.provider,
-          userProfile.provider_userid);
-
-        /* 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');
-      }
-    }
-
-    // generate a json web token for this user
-    const token = jwt.sign({
-      user_sid: userProfile.user_sid,
-      account_sid: userProfile.account_sid,
-      email: userProfile.email,
-      name: userProfile.name
-    }, process.env.JWT_SECRET, { expiresIn: parseInt(process.env.JWT_EXPIRES_IN || 60) * 60 });
-
-    logger.debug({
-      user_sid: userProfile.user_sid,
-      account_sid: userProfile.account_sid
-    }, 'generated jwt');
-
-    res.json({jwt: token, ...userProfile});
-
-  } catch (err) {
-    debug(err, 'Error');
-    sysError(logger, res, err);
-  }
-
-});
-
-
-module.exports = router;

lib/routes/api/sbcs.js

@@ -1,9 +1,7 @@
 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 sysError = require('./error');
 
 decorate(router, Sbc, ['add', 'delete']);
 
@@ -11,16 +9,7 @@ decorate(router, Sbc, ['add', 'delete']);
 router.get('/', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    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 Error('invalid account_sid');
-      service_provider_sid = r[0].service_provider_sid;
-    }
-    if (!service_provider_sid) throw new DbErrorBadRequest('missing service_provider_sid in query');
-    */
-    const results = await Sbc.retrieveAll(service_provider_sid);
+    const results = await Sbc.retrieveAll(req.query.service_provider_sid);
     res.status(200).json(results);
   } catch (err) {
     sysError(logger, res, err);

lib/routes/api/service-providers.js

@@ -1,196 +1,25 @@
 const router = require('express').Router();
-const {promisePool} = require('../../db');
-const {DbErrorUnprocessableRequest, 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} = require('./utils');
-const sysError = require('../error');
+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) {
-  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 ;
-  }
-  if (req.user.hasScope('account')) {
-    /* allow account users to retrieve service provider data from parent SP */
-    const sid = req.user.account_sid;
-    const [r] = await promisePool.execute('SELECT service_provider_sid from accounts WHERE account_sid = ?', [sid]);
-    if (r.length === 1 && r[0].service_provider_sid === req.user.service_provider_sid) return;
-  }
-  throw new DbErrorForbidden('insufficient permissions to update service provider');
-}
-
-function validateUpdate(req) {
-  if (req.user.hasScope('admin')) return ;
-  if (req.user.hasScope('service_provider')) {
-    const service_provider_sid = parseServiceProviderSid(req);
-    if (service_provider_sid === req.user.service_provider_sid) return ;
-  }
-  throw new DbErrorForbidden('insufficient permissions to update service provider');
-}
 
 /* can not delete a service provider if it has any active accounts */
-async function noActiveAccountsOrUsers(req, sid) {
-  if (!req.user.hasAdminAuth) {
-    throw new DbErrorForbidden('only admin users can delete a service provider');
-  }
+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 DbErrorUnprocessableRequest(
-    'cannot delete service provider with active accounts or users'
-  );
-
   if (activeAccounts > 0) throw new DbErrorUnprocessableRequest('cannot delete service provider with active accounts');
-  if (activeUsers > 0) throw new DbErrorUnprocessableRequest(
-    'cannot delete service provider with active service provider level users'
-  );
-
-  /* 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]);
 }
 
 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/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);
-    }
-    res.status(200).json(results);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-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);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-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});
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-router.put('/:sid/VoipCarriers/:voip_carrier_sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    validateUpdate(req);
-    const rowsAffected = await VoipCarrier.update(req.params.voip_carrier_sid, req.body);
-    if (rowsAffected === 0) {
-      return res.sendStatus(404);
-    }
-    res.status(204).end();
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-router.get('/:sid/ApiKeys', 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);
-    }
-    res.status(200).json(results);
-    await ApiKey.updateLastUsed(sid);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
 /* add */
 router.post('/', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
-    validateAdd(req);
 
     // create webhooks if provided
     const obj = Object.assign({}, req.body);
@@ -212,15 +41,8 @@ router.post('/', async(req, res) => {
 /* list */
 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);
@@ -245,8 +67,6 @@ router.put('/:sid', async(req, res) => {
   const sid = req.params.sid;
   const logger = req.app.locals.logger;
   try {
-    validateUpdate(req);
-
     // create webhooks if provided
     const obj = Object.assign({}, req.body);
     for (const prop of ['registration_hook']) {

lib/routes/api/signin.js

@@ -1,85 +0,0 @@
-const router = require('express').Router();
-//const debug = require('debug')('jambonz:api-server');
-const {DbErrorBadRequest} = require('../../utils/errors');
-const {promisePool} = require('../../db');
-const {verifyPassword} = require('../../utils/password-utils');
-const jwt = require('jsonwebtoken');
-const sysError = require('../error');
-
-const validateRequest = async(req) => {
-  const {email, password} = req.body || {};
-
-  /* check required properties are there */
-  if (!email || !password) throw new DbErrorBadRequest('missing email or password');
-};
-
-router.post('/', async(req, res) => {
-  const {logger, retrieveKey} = req.app.locals;
-  const {email, password, link} = req.body;
-  let user;
-
-  try {
-    if (link) {
-      const key = `reset-link:${link}`;
-      const user_sid = await retrieveKey(key);
-      logger.debug({user_sid}, 'retrieved user from link');
-      if (!user_sid) {
-        return res.sendStatus(403);
-      }
-      const [r] = await promisePool.query('SELECT * from users WHERE user_sid = ?', user_sid);
-      if (0 === r.length) return res.sendStatus(404);
-      user = r[0];
-    }
-    else {
-      validateRequest(req);
-      const [r] = await promisePool.query(
-        'SELECT * from users WHERE email = ? AND provider=\'local\' AND email_validated=1', email);
-      if (0 === r.length) return res.sendStatus(404);
-      user = r[0];
-
-      //debug(`password presented is ${password} and hashed_password in db is ${user.hashed_password}`);
-      const isCorrect = await verifyPassword(user.hashed_password, password);
-      if (!isCorrect) return res.sendStatus(403);
-    }
-    logger.debug({user}, 'signin: retrieved user');
-
-    const [a] = await promisePool.query('SELECT * from accounts WHERE account_sid = ?', user.account_sid);
-    if (a.length !== 1) throw new Error('database error - account not found for user');
-
-    const userProfile = Object.assign({}, {
-      user_sid: user.user_sid,
-      name: user.name,
-      email: user.email,
-      phone: user.phone,
-      account_sid: user.account_sid,
-      force_change: !!user.force_change,
-      provider: user.provider,
-      provider_userid: user.provider_userid,
-      scope: user.scope,
-      phone_validated: !!user.phone_validated,
-      email_validated: !!user.email_validated
-    }, {
-      is_active: !!a[0].is_active,
-      tutorial_completion: a[0].tutorial_completion,
-      pristine: false
-    });
-
-    // generate a json web token for this session
-    const token = jwt.sign({
-      user_sid: userProfile.user_sid,
-      account_sid: userProfile.account_sid
-    }, process.env.JWT_SECRET, { expiresIn: parseInt(process.env.JWT_EXPIRES_IN || 60) * 60 });
-
-    logger.debug({
-      user_sid: userProfile.user_sid,
-      account_sid: userProfile.account_sid
-    }, 'generated jwt');
-
-    res.json({jwt: token, ...userProfile});
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-
-module.exports = router;

lib/routes/api/sip-gateways.js

@@ -1,53 +1,8 @@
 const router = require('express').Router();
 const SipGateway = require('../../models/sip-gateway');
-const {DbErrorBadRequest, DbErrorUnprocessableRequest} = require('../../utils/errors');
 const decorate = require('./decorate');
-const sysError = require('../error');
+const preconditions = {};
 
-const validate = async(req, sid) => {
-  const {lookupCarrierBySid, lookupSipGatewayBySid} = req.app.locals;
-  let voip_carrier_sid;
-
-  if (sid) {
-    const gateway = await lookupSipGatewayBySid(sid);
-    if (!gateway) throw new DbErrorBadRequest('invalid sip_gateway_sid');
-    voip_carrier_sid = gateway.voip_carrier_sid;
-  }
-  else {
-    voip_carrier_sid = req.body.voip_carrier_sid;
-    if (!voip_carrier_sid) throw new DbErrorBadRequest('missing 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 = {
-  'add': validate,
-  'update': validate,
-  'delete': validate
-};
-
-decorate(router, SipGateway, ['add', 'retrieve', 'update', 'delete'], preconditions);
-
-/* list */
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const voip_carrier_sid = req.query.voip_carrier_sid;
-  try {
-    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'});
-    }
-    const results = await SipGateway.retrieveForVoipCarrier(voip_carrier_sid);
-    res.status(200).json(results);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
+decorate(router, SipGateway, ['*'], preconditions);
 
 module.exports = router;

lib/routes/api/sip-realm.js

@@ -1,67 +0,0 @@
-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 sysError = require('../error');
-const insertDnsRecords = `INSERT INTO dns_records 
-(dns_record_sid, account_sid, record_type, record_id) 
-VALUES  `;
-
-
-router.post('/:sip_realm', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const account_sid = req.user.account_sid;
-  const sip_realm = req.params.sip_realm;
-  try {
-    const arr = /(.*)\.(.*\..*)$/.exec(sip_realm);
-    if (!arr) throw new DbErrorBadRequest(`invalid sip_realm: ${sip_realm}`);
-    const subdomain = arr[1];
-    const domain = arr[2];
-
-    /* update the account */
-    const [r] = await promisePool.execute('UPDATE accounts set sip_realm = ? WHERE account_sid = ?',
-      [sip_realm, account_sid]);
-    if (r.affectedRows !== 1) throw new Error('failure updating accounts table with sip_realm value');
-
-    if (process.env.NODE_ENV !== 'test' || process.env.DME_API_KEY) {
-      /* update DNS provider */
-
-      /* retrieve sbc addresses */
-      const [sbcs] = await promisePool.query('SELECT ipv4 from sbc_addresses');
-      if (sbcs.length === 0) throw new Error('no SBC addresses provisioned in the database!');
-      const ips = sbcs.map((s) => s.ipv4);
-
-      /* retrieve existing dns records */
-      const [old_recs] = await promisePool.query('SELECT record_id from dns_records WHERE account_sid = ?',
-        account_sid);
-
-      if (old_recs.length > 0) {
-        /* remove existing records from the database and dns provider */
-        await promisePool.query('DELETE from dns_records WHERE account_sid = ?', account_sid);
-
-        const deleted = await deleteDnsRecords(logger, domain, old_recs.map((r) => r.record_id));
-        if (!deleted) {
-          logger.error({old_recs, sip_realm, account_sid},
-            'Failed to remove old dns records when changing sip_realm for account');
-        }
-      }
-
-      /* add the dns records */
-      const records = await createDnsRecords(logger, domain, subdomain, ips);
-      if (!records) throw new Error(`failure updating dns records for ${sip_realm}`);
-      const values = records.map((r) => {
-        return `('${uuid()}', '${account_sid}', '${r.type}', ${r.id})`;
-      }).join(',');
-      const sql = `${insertDnsRecords}${values};`;
-      const [result] = await promisePool.execute(sql);
-      if (result.affectedRows != records.length) throw new Error('failed inserting dns records');
-    }
-    res.sendStatus(204);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-
-module.exports = router;

lib/routes/api/smpp-gateways.js

@@ -1,53 +0,0 @@
-const router = require('express').Router();
-const SmppGateway = require('../../models/smpp-gateway');
-const {DbErrorBadRequest, DbErrorUnprocessableRequest} = require('../../utils/errors');
-const decorate = require('./decorate');
-const sysError = require('../error');
-
-const validate = async(req, sid) => {
-  const {lookupCarrierBySid, lookupSmppGatewayBySid} = req.app.locals;
-  let voip_carrier_sid;
-
-  if (sid) {
-    const gateway = await lookupSmppGatewayBySid(sid);
-    if (!gateway) throw new DbErrorBadRequest('invalid smpp_gateway_sid');
-    voip_carrier_sid = gateway.voip_carrier_sid;
-  }
-  else {
-    voip_carrier_sid = req.body.voip_carrier_sid;
-    if (!voip_carrier_sid) throw new DbErrorBadRequest('missing 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 = {
-  'add': validate,
-  'update': validate,
-  'delete': validate
-};
-
-decorate(router, SmppGateway, ['add', 'retrieve', 'update', 'delete'], preconditions);
-
-/* list */
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const voip_carrier_sid = req.query.voip_carrier_sid;
-  try {
-    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'});
-    }
-    const results = await SmppGateway.retrieveForVoipCarrier(voip_carrier_sid);
-    res.status(200).json(results);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/smpps.js

@@ -1,30 +0,0 @@
-const router = require('express').Router();
-const Smpp = require('../../models/smpp');
-const decorate = require('./decorate');
-const sysError = require('../error');
-//const {DbErrorBadRequest} = require('../../utils/errors');
-//const {promisePool} = require('../../db');
-
-decorate(router, Smpp, ['add', 'delete']);
-
-/* list */
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    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 Error('invalid account_sid');
-      service_provider_sid = r[0].service_provider_sid;
-    }
-    if (!service_provider_sid) throw new DbErrorBadRequest('missing service_provider_sid in query');
-    */
-    const results = await Smpp.retrieveAll(service_provider_sid);
-    res.status(200).json(results);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/sms-inbound.js

@@ -1,41 +1,19 @@
 const router = require('express').Router();
 const request = require('request');
 const getProvider = require('../../utils/sms-provider');
-const { v4: uuidv4 } = require('uuid');
-const sysError = require('../error');
+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 ip = stripPort(fs[idx++ % fs.length]);
-    logger.info({fs}, `feature servers available for createCall API request, selecting ${ip}`);
-    return `http://${ip}:3000/v1/messaging/${provider}`;
-  } catch (err) {
-    logger.error({err}, 'getFsUrl: error retreving feature servers from redis');
-  }
-};
-
-const stripPort = (hostport) => {
-  const arr = /^(.*):(.*)$/.exec(hostport);
-  if (arr) return arr[1];
-  return hostport;
-};
-
-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;
@@ -89,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));
 
@@ -126,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,
@@ -136,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) {
@@ -144,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/sms-outbound.js

@@ -1,6 +1,6 @@
 const router = require('express').Router();
 const getProvider = require('../../utils/sms-provider');
-const sysError = require('../error');
+const sysError = require('./error');
 
 router.post('/', async(req, res) => {
   const { logger } = req.app.locals;

lib/routes/api/speech-credentials.js

@@ -1,593 +0,0 @@
-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} = require('./utils');
-const {DbErrorUnprocessableRequest} = require('../../utils/errors');
-const {
-  testGoogleTts,
-  testGoogleStt,
-  testAwsTts,
-  testAwsStt,
-  testMicrosoftStt,
-  testMicrosoftTts,
-  testWellSaidTts,
-  testNuanceStt,
-  testNuanceTts,
-  testDeepgramStt,
-  testIbmTts,
-  testIbmStt
-} = require('../../utils/speech-utils');
-
-const obscureKey = (key) => {
-  const key_spoiler_length = 6;
-  const key_spoiler_char = 'X';
-
-  if (key.length <= key_spoiler_length) {
-    return key;
-  }
-
-  return `${key.slice(0, key_spoiler_length)}${key_spoiler_char.repeat(key.length - key_spoiler_length)}`;
-};
-
-const encryptCredential = (obj) => {
-  const {
-    vendor,
-    service_key,
-    access_key_id,
-    secret_access_key,
-    aws_region,
-    api_key,
-    region,
-    client_id,
-    secret,
-    use_custom_tts,
-    custom_tts_endpoint,
-    use_custom_stt,
-    custom_stt_endpoint,
-    tts_api_key,
-    tts_region,
-    stt_api_key,
-    stt_region,
-    riva_server_uri,
-    instance_id
-  } = 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':
-      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,
-        api_key,
-        use_custom_tts,
-        custom_tts_endpoint,
-        use_custom_stt,
-        custom_stt_endpoint
-      });
-      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':
-      assert(client_id, 'invalid nuance speech credential: client_id is required');
-      assert(secret, 'invalid nuance speech credential: secret is required');
-      const nuanceData = JSON.stringify({client_id, secret});
-      return encrypt(nuanceData);
-
-    case 'deepgram':
-      assert(api_key, 'invalid deepgram speech credential: api_key is required');
-      const deepgramData = JSON.stringify({api_key});
-      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);
-
-    default:
-      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,
-  } = 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);
-  if (!account_sid) {
-    if (!req.user.hasServiceProviderAuth && !req.user.hasAdminAuth) {
-      logger.error('POST /SpeechCredentials invalid credentials');
-      return res.sendStatus(403);
-    }
-  }
-  try {
-    const encrypted_credential = encryptCredential(req.body);
-    const uuid = await SpeechCredential.make({
-      account_sid,
-      service_provider_sid,
-      vendor,
-      use_for_tts,
-      use_for_stt,
-      credential: encrypted_credential
-    });
-    res.status(201).json({sid: uuid});
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-/**
- * retrieve all speech credentials for an account
- */
-router.get('/', async(req, res) => {
-  const account_sid = parseAccountSid(req) || req.user.account_sid;
-  const service_provider_sid = parseServiceProviderSid(req) || req.user.service_provider_sid;
-  const logger = req.app.locals.logger;
-  try {
-    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);
-    }
-
-    res.status(200).json(creds.map((c) => {
-      const {credential, ...obj} = c;
-      if ('google' === obj.vendor) {
-        const o = JSON.parse(decrypt(credential));
-        const key_header = '-----BEGIN PRIVATE KEY-----\n';
-        const obscured = {
-          ...o,
-          private_key: `${key_header}${obscureKey(o.private_key.slice(key_header.length, o.private_key.length))}`
-        };
-        obj.service_key = obscured;
-      }
-      else if ('aws' === obj.vendor) {
-        const o = JSON.parse(decrypt(credential));
-        obj.access_key_id = o.access_key_id;
-        obj.secret_access_key = obscureKey(o.secret_access_key);
-        obj.aws_region = o.aws_region;
-        logger.info({obj, o}, 'retrieving aws speech credential');
-      }
-      else if ('microsoft' === obj.vendor) {
-        const o = JSON.parse(decrypt(credential));
-        obj.api_key = obscureKey(o.api_key);
-        obj.region = o.region;
-        obj.use_custom_tts = o.use_custom_tts;
-        obj.custom_tts_endpoint = o.custom_tts_endpoint;
-        obj.use_custom_stt = o.use_custom_stt;
-        obj.custom_stt_endpoint = o.custom_stt_endpoint;
-        logger.info({obj, o}, 'retrieving azure speech credential');
-      }
-      else if ('wellsaid' === obj.vendor) {
-        const o = JSON.parse(decrypt(credential));
-        obj.api_key = obscureKey(o.api_key);
-      }
-      else if ('nuance' === obj.vendor) {
-        const o = JSON.parse(decrypt(credential));
-        obj.client_id = o.client_id;
-        obj.secret = obscureKey(o.secret);
-      }
-      else if ('deepgram' === obj.vendor) {
-        const o = JSON.parse(decrypt(credential));
-        obj.api_key = obscureKey(o.api_key);
-      }
-      else if ('ibm' === obj.vendor) {
-        const o = JSON.parse(decrypt(credential));
-        obj.tts_api_key = obscureKey(o.tts_api_key);
-        obj.tts_region = o.tts_region;
-        obj.stt_api_key = obscureKey(o.stt_api_key);
-        obj.stt_region = o.stt_region;
-        obj.instance_id = o.instance_id;
-      } else if ('nvidia' == obj.vendor) {
-        const o = JSON.parse(decrypt(credential));
-        obj.riva_server_uri = o.riva_server_uri;
-      }
-      return obj;
-    }));
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-/**
- * retrieve a specific speech credential
- */
-router.get('/:sid', async(req, res) => {
-  const sid = req.params.sid;
-  const logger = req.app.locals.logger;
-  try {
-    const cred = await SpeechCredential.retrieve(sid);
-    if (0 === cred.length) return res.sendStatus(404);
-    const {credential, ...obj} = cred[0];
-    if ('google' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      const key_header = '-----BEGIN PRIVATE KEY-----\n';
-      const obscured = {
-        ...o,
-        private_key: `${key_header}${obscureKey(o.private_key.slice(key_header.length, o.private_key.length))}`
-      };
-      obj.service_key = JSON.stringify(obscured);
-    }
-    else if ('aws' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.access_key_id = o.access_key_id;
-      obj.secret_access_key = obscureKey(o.secret_access_key);
-      obj.aws_region = o.aws_region;
-    }
-    else if ('microsoft' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.api_key = obscureKey(o.api_key);
-      obj.region = o.region;
-      obj.use_custom_tts = o.use_custom_tts;
-      obj.custom_tts_endpoint = o.custom_tts_endpoint;
-      obj.use_custom_stt = o.use_custom_stt;
-      obj.custom_stt_endpoint = o.custom_stt_endpoint;
-    }
-    else if ('wellsaid' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.api_key = obscureKey(o.api_key);
-    }
-    else if ('nuance' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.client_id = o.client_id;
-      obj.secret = obscureKey(o.secret);
-    }
-    else if ('deepgram' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.api_key = obscureKey(o.api_key);
-    }
-    else if ('ibm' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.tts_api_key = obscureKey(o.tts_api_key);
-      obj.tts_region = o.tts_region;
-      obj.stt_api_key = obscureKey(o.stt_api_key);
-      obj.stt_region = o.stt_region;
-      obj.instance_id = o.instance_id;
-    } else if ('nvidia' == obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.riva_server_uri = o.riva_server_uri;
-    }
-    res.status(200).json(obj);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-/**
- * delete a speech credential
- */
-router.delete('/:sid', async(req, res) => {
-  const sid = req.params.sid;
-  const logger = req.app.locals.logger;
-  try {
-    const count = await SpeechCredential.remove(sid);
-    if (0 === count) return res.sendStatus(404);
-    res.sendStatus(204);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-
-/**
- * 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 {use_for_tts, use_for_stt, region, aws_region, stt_region, tts_region, riva_server_uri} = 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');
-    }
-    const obj = {};
-    if (typeof use_for_tts !== 'undefined') {
-      obj.use_for_tts = use_for_tts;
-    }
-    if (typeof use_for_stt !== 'undefined') {
-      obj.use_for_stt = use_for_stt;
-    }
-
-    /* update the credential if provided */
-    try {
-      const cred = await SpeechCredential.retrieve(sid);
-      if (1 === cred.length) {
-        const {credential, vendor} = cred[0];
-        const o = JSON.parse(decrypt(credential));
-        const {
-          use_custom_tts,
-          custom_tts_endpoint,
-          use_custom_stt,
-          custom_stt_endpoint
-        } = req.body;
-
-        const newCred = {
-          ...o,
-          region,
-          vendor,
-          aws_region,
-          use_custom_tts,
-          custom_tts_endpoint,
-          use_custom_stt,
-          custom_stt_endpoint,
-          stt_region,
-          tts_region,
-          riva_server_uri
-        };
-        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);
-    }
-    res.status(204).end();
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-
-/**
- * Test a credential
- */
-router.get('/:sid/test', async(req, res) => {
-  const sid = req.params.sid;
-  const logger = req.app.locals.logger;
-  try {
-    const creds = await SpeechCredential.retrieve(sid);
-    if (!creds || 0 === creds.length) return res.sendStatus(404);
-
-    const cred = creds[0];
-    const credential = JSON.parse(decrypt(cred.credential));
-    const results = {
-      tts: {
-        status: 'not tested'
-      },
-      stt: {
-        status: 'not tested'
-      }
-    };
-    if (cred.vendor === 'google') {
-      if (!credential.client_email || !credential.private_key) {
-        throw new DbErrorUnprocessableRequest('uploaded file is not a google service key');
-      }
-
-      if (cred.use_for_tts) {
-        try {
-          await testGoogleTts(logger, credential);
-          results.tts.status = 'ok';
-          SpeechCredential.ttsTestResult(sid, true);
-        } catch (err) {
-          results.tts = {status: 'fail', reason: err.message};
-          SpeechCredential.ttsTestResult(sid, false);
-        }
-      }
-
-      if (cred.use_for_stt) {
-        try {
-          await testGoogleStt(logger, credential);
-          results.stt.status = 'ok';
-          SpeechCredential.sttTestResult(sid, true);
-        } catch (err) {
-          results.stt = {status: 'fail', reason: err.message};
-          SpeechCredential.sttTestResult(sid, false);
-        }
-      }
-    }
-    else if (cred.vendor === 'aws') {
-      if (cred.use_for_tts) {
-        try {
-          await testAwsTts(logger, {
-            accessKeyId: credential.access_key_id,
-            secretAccessKey: credential.secret_access_key,
-            region: credential.aws_region || process.env.AWS_REGION
-          });
-          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 testAwsStt(logger, {
-            accessKeyId: credential.access_key_id,
-            secretAccessKey: credential.secret_access_key,
-            region: credential.aws_region || process.env.AWS_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 === 'microsoft') {
-      const {
-        api_key,
-        region,
-        use_custom_tts,
-        custom_tts_endpoint,
-        use_custom_stt,
-        custom_stt_endpoint
-      } = credential;
-      if (cred.use_for_tts) {
-        try {
-          await testMicrosoftTts(logger, {
-            api_key,
-            region,
-            use_custom_tts,
-            custom_tts_endpoint,
-            use_custom_stt,
-            custom_stt_endpoint
-          });
-          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
-      } = credential;
-      if (cred.use_for_tts) {
-        try {
-          await testNuanceTts(logger, getTtsVoices, {
-            client_id,
-            secret
-          });
-          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});
-          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_stt) {
-        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);
-        }
-      }
-    }
-
-    res.status(200).json(results);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/stripe-customer-id.js

@@ -1,48 +0,0 @@
-const router = require('express').Router();
-const Account = require('../../models/account');
-const sysError = require('../error');
-
-/* list */
-router.get('/', async(req, res) => {
-  const {createCustomer} = require('../../utils/stripe-utils');
-  const logger = req.app.locals.logger;
-  try {
-    const {account_sid, email, name} = req.user;
-    logger.debug({account_sid, email, name}, 'GET /StripeCustomerId');
-    const results = await Account.retrieve(account_sid);
-    if (results.length === 0) return res.sendStatus(404);
-    const account = results[0];
-
-    /* is account already provisioned in Stripe ? */
-    if (account.stripe_customer_id) return res.status(200).json({stripe_customer_id: account.stripe_customer_id});
-
-    /* no - provision it now */
-    const customer = await createCustomer(logger, account_sid, email, name);
-    account.stripe_customer_id = customer.id;
-    await Account.updateStripeCustomerId(account_sid, customer.id);
-    res.status(200).json({stripe_customer_id: customer.id});
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-/* delete */
-router.delete('/', async(req, res) => {
-  const {deleteCustomer} = require('../../utils/stripe-utils');
-  const logger = req.app.locals.logger;
-  const {account_sid} = req.user;
-  try {
-    const acc = await Account.retrieve(account_sid);
-    logger.debug({acc}, 'retrieved account');
-    if (!acc || 0 === acc.length || !acc[0].stripe_customer_id) return res.sendStatus(404);
-    const {stripe_customer_id} = acc[0];
-    logger.info(`deleting stripe customer id ${stripe_customer_id}`);
-    await deleteCustomer(logger, stripe_customer_id);
-    await Account.updateStripeCustomerId(account_sid, null);
-    res.sendStatus(204);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/subscriptions.js

@@ -1,334 +0,0 @@
-const router = require('express').Router();
-const {DbErrorBadRequest} = require('../../utils/errors');
-const Account = require('../../models/account');
-const {
-  createCustomer,
-  retrieveCustomer,
-  updateCustomer,
-  createSubscription,
-  retrieveSubscription,
-  updateSubscription,
-  retrieveInvoice,
-  payOutstandingInvoicesForCustomer,
-  attachPaymentMethod,
-  detachPaymentMethod,
-  retrievePaymentMethod,
-  retrieveUpcomingInvoice
-} = require('../../utils/stripe-utils');
-const {setupFreeTrial} = require('./utils');
-const sysError = require('../error');
-const actions = [
-  'upgrade-to-paid',
-  'downgrade-to-free',
-  'update-payment-method',
-  'update-quantities'
-];
-
-const handleError = async(logger, method, res, err) => {
-  if ('StatusError' === err.name) {
-    const text = await err.text();
-    let details;
-    if (text) {
-      details = JSON.parse(text);
-      logger.info({details}, `${method} failed`);
-    }
-    if (402 === err.statusCode && details) {
-      return res.status(err.statusCode).json(details);
-    }
-    return res.sendStatus(err.statusCode);
-  }
-  sysError(logger, res, err);
-};
-
-/**
- * We handle 3 possible outcomes
- * - the initial payment was successful
- * - there was a card error on the initial payment (i.e. decline)
- * - there is a requirement for additional authentication (e.g. SCA)
- * see: https://stripe.com/docs/billing/migration/strong-customer-authentication
- * @param {*} req
- * @param {*} res
- * @param {*} subscription
- */
-const handleSubscriptionOutcome = async(req, res, subscription) => {
-  const logger = req.app.locals.logger;
-  const {account_sid} = subscription.metadata;
-  const {status, latest_invoice} = subscription;
-  const {payment_intent} = latest_invoice;
-
-  /* success case */
-  if ('active' == status && 'paid' === latest_invoice.status && 'succeeded' === payment_intent.status) {
-    await Account.activateSubscription(logger, account_sid, subscription.id, 'upgrade to paid plan');
-    return res.status(201).json({
-      status: 'success',
-      chargedAmount: latest_invoice.amount_paid,
-      currency: payment_intent.currency,
-      statementDescriptor: payment_intent.statement_descriptor
-    });
-  }
-
-  /* card error */
-  if ('incomplete' == status && 'open' === latest_invoice.status &&
-    'requires_payment_method' === payment_intent.status) {
-    return res.status(201).json({
-      status: 'card error',
-      subscription: subscription.id,
-      client_secret: payment_intent.client_secret,
-      reason: payment_intent.last_payment_error.message
-    });
-  }
-
-  /* more authentication required */
-  if ('incomplete' == status && 'open' === latest_invoice.status && 'requires_action' === payment_intent.status) {
-    return res.status(201).json({
-      status: 'action required',
-      subscription: subscription.id,
-      client_secret: payment_intent.client_secret
-    });
-  }
-
-  throw new Error(
-    `handleSubscriptionOutcome unexpected status ${status}:${latest_invoice.status}:${payment_intent.status}`);
-};
-
-/**
- * Transition from free --> paid
- * Create customer in Stripe, if needed
- * Set the default payment method
- * Create a subscription
- * @param {*} req
- * @param {*} res
- */
-const upgradeToPaidPlan = async(req, res) => {
-  const logger = req.app.locals.logger;
-  const {account_sid, name, email} = req.user;
-  const {payment_method_id, products} = req.body;
-  const arr = await Account.retrieve(req.user.account_sid);
-  const account = arr[0];
-
-  /* retrieve stripe customer id locally, provision on Stripe if needed */
-  logger.debug({account}, 'upgradeToPaidPlan retrieved account');
-  let stripe_customer_id = account.stripe_customer_id;
-  if (!stripe_customer_id) {
-    logger.debug('upgradeToPaidPlan provisioning customer');
-    const customer = await createCustomer(logger, account_sid, email, name);
-    logger.debug(`upgradeToPaidPlan provisioned customer_id ${customer.id}`);
-    await Account.updateStripeCustomerId(account_sid, customer.id);
-    stripe_customer_id = customer.id;
-  }
-
-  /* attach the payment method to the customer and make it their default */
-  const pm = await attachPaymentMethod(logger, payment_method_id, stripe_customer_id);
-  const customer = await updateCustomer(logger, stripe_customer_id, {
-    invoice_settings: {
-      default_payment_method: req.body.payment_method_id,
-    }
-  });
-  logger.debug({customer}, 'successfully updated customer');
-
-  /* create a pending subscription -- will be activated on invoice.paid */
-  const account_subscription_sid = await Account.provisionPendingSubscription(logger, account_sid, products, pm);
-
-  /* create the subscription in Stripe */
-  const items = products.map((product) => {
-    return {
-      price: product.price_id,
-      quantity: product.quantity,
-      metadata: {
-        product_sid: product.product_sid
-      }
-    };
-  });
-  logger.debug({items}, 'creating subscription');
-  const subscription = await createSubscription(logger, stripe_customer_id,
-    {account_sid, account_subscription_sid}, items);
-  logger.debug({subscription}, 'created subscription');
-
-  await handleSubscriptionOutcome(req, res, subscription);
-};
-const downgradeToFreePlan = async(req, res) => {
-  const logger = req.app.locals.logger;
-  const {account_sid} = req.user;
-  try {
-    await setupFreeTrial(logger, account_sid);
-    return res.status(200).json({status: 'success'});
-  } catch (err) {
-    handleError(logger, 'downgradeToFreePlan', res, err);
-  }
-};
-const updatePaymentMethod = async(req, res) => {
-  const logger = req.app.locals.logger;
-  const {account_sid} = req.user;
-  try {
-    const {payment_method_id} = req.body;
-    const arr = await Account.retrieve(req.user.account_sid);
-    const account = arr[0];
-    if (!account.stripe_customer_id) {
-      throw new DbErrorBadRequest(`Account ${account_sid} is not provisioned in Stripe`);
-    }
-    const customer = await retrieveCustomer(logger, account.stripe_customer_id);
-    //logger.debug({customer}, 'retrieved customer');
-
-    /* attach the payment method to the customer */
-    const pm = await attachPaymentMethod(logger, payment_method_id, account.stripe_customer_id);
-    logger.debug({pm}, 'attached payment method to customer');
-
-    /* update last4 etc in our db */
-    await Account.updatePaymentInfo(logger, account_sid, pm);
-
-    /* make it the customer's default payment method */
-    await updateCustomer(logger, account.stripe_customer_id, {
-      invoice_settings: {
-        default_payment_method: req.body.payment_method_id,
-      }
-    });
-
-    /* detach the customer's old payment method */
-    const old_pm = customer.default_source || customer.invoice_settings.default_payment_method;
-    if (old_pm) await detachPaymentMethod(logger, old_pm);
-
-    /* if the customer has an unpaid invoice, try to pay it */
-    const success = await payOutstandingInvoicesForCustomer(logger, account.stripe_customer_id);
-    res.status(200).json({
-      status: success ? 'success' : 'failed to pay outstanding invoices'
-    });
-  } catch (err) {
-    handleError(logger, 'updatePaymentMethod', res, err);
-  }
-};
-const updateQuantities = async(req, res) => {
-  /**
-   * see https://stripe.com/docs/billing/subscriptions/upgrade-downgrade#immediate-payment
-   * and https://stripe.com/docs/billing/subscriptions/pending-updates
-   */
-  const logger = req.app.locals.logger;
-  const {account_sid} = req.user;
-  const {products, dry_run} = req.body;
-
-  if (!products || !Array.isArray(products) ||
-    0 === products.length ||
-    products.find((p) => !p.price_id || !p.product_sid)) {
-    logger.info({products}, 'Subscription:updateQuantities invalid products');
-    return res.sendStatus(400);
-  }
-
-  try {
-    const account_subscription = await Account.getSubscription(req.user.account_sid);
-    if (!account_subscription || !account_subscription.stripe_subscription_id) {
-      logger.info(`Subscription:updateQuantities No active subscription found for account_sid ${account_sid}`);
-      return res.sendStatus(400);
-    }
-    const subscription_id = account_subscription.stripe_subscription_id;
-
-    const subscription = await retrieveSubscription(logger, subscription_id);
-    logger.debug({subscription}, 'retrieved existing subscription');
-    const pm = await retrievePaymentMethod(logger, account_subscription.stripe_payment_method_id);
-    logger.debug({pm}, 'retrieved existing payment method');
-    const items = products.map((product) => {
-      const existingItem = subscription.items.data.find((i) => i.price.id === product.price_id);
-      const obj = {
-        quantity: product.quantity,
-      };
-      return Object.assign(obj, existingItem ? {id: existingItem.id} : {price_id: product.price_id});
-    });
-
-    if (dry_run) {
-      const invoice = await retrieveUpcomingInvoice(logger, subscription.customer, subscription.id, items);
-      logger.debug({invoice}, 'dry run - upcoming invoice');
-      const dt = new Date(invoice.next_payment_attempt * 1000);
-      const sum = (acc, current) => acc + current.amount;
-      const prorated_cost = invoice.lines.data
-        .filter((l) => l.proration === true)
-        .reduce(sum, 0);
-      const monthly_cost = invoice.lines.data
-        .filter((l) => l.proration === false)
-        .reduce(sum, 0);
-      return res.status(201).json({
-        currency: invoice.currency,
-        prorated_cost,
-        monthly_cost,
-        next_invoice_date: dt.toDateString()
-      });
-    }
-
-    /* create a pending subscription */
-    await Account.provisionPendingSubscription(logger, account_sid, products,
-      pm, subscription_id);
-
-    /* update the subscription in Stripe */
-    const updated = await updateSubscription(logger, subscription_id, items);
-    logger.debug({updated}, 'updated subscription');
-
-    /* get latest invoice, to see if payment is needed */
-    const invoice = await retrieveInvoice(logger, updated.latest_invoice);
-    logger.debug({invoice}, 'latest invoice');
-
-    if ('paid' === invoice.status) {
-      logger.debug('activating pending subscription to new quantities since no invoice outstanding');
-      await Account.activateSubscription(logger, account_sid, subscription_id, 'selected new capacities');
-      return res.status(201).json({
-        status: 'success'
-      });
-    }
-    else {
-      return res.status(201).json({
-        status: 'failed',
-        reason: 'payment required'
-      });
-    }
-  } catch (err) {
-    handleError(logger, 'updatePaymentMethod', res, err);
-  }
-};
-
-/* create */
-router.post('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const {action, payment_method_id, products} = req.body;
-
-    if (!actions.includes(action)) throw new DbErrorBadRequest('invalid or missing action');
-    if ('update-payment-method' === action && typeof payment_method_id !== 'string') {
-      throw new DbErrorBadRequest('missing payment_method_id');
-    }
-    if ('upgrade-to-paid' === action && (!Array.isArray(products) || 0 === products.length)) {
-      throw new DbErrorBadRequest('missing products');
-    }
-    if ('update-quantities' === action && (!Array.isArray(products) || 0 === products.length)) {
-      throw new DbErrorBadRequest('missing products');
-    }
-
-    switch (action) {
-      case 'upgrade-to-paid':
-        await upgradeToPaidPlan(req, res);
-        break;
-      case 'downgrade-to-free':
-        await downgradeToFreePlan(req, res);
-        break;
-      case 'update-payment-method':
-        await updatePaymentMethod(req, res);
-        break;
-      case 'update-quantities':
-        await updateQuantities(req, res);
-        break;
-    }
-  } catch (err) {
-    handleError(logger, 'POST /Subscription', res, err);
-  }
-});
-
-/* get */
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const {account_sid} = req.user;
-  try {
-    const subscription = await Account.getSubscription(account_sid);
-    if (!subscription || !subscription.stripe_subscription_id) return res.sendStatus(404);
-    const sub = await retrieveSubscription(logger, subscription.stripe_subscription_id);
-    res.status(200).json(sub);
-  } catch (err) {
-    handleError(logger, 'GET /Subscription', res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/users.js

@@ -1,458 +1,95 @@
 const router = require('express').Router();
-const User = require('../../models/user');
-const jwt = require('jsonwebtoken');
-const request = require('request');
-const {DbErrorBadRequest} = require('../../utils/errors');
-const {generateHashedPassword, verifyPassword} = require('../../utils/password-utils');
-const {promisePool} = require('../../db');
-const {decrypt} = require('../../utils/encrypt-decrypt');
-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 crypto = require('crypto');
+const {getMysqlConnection} = require('../../db');
+
 const retrieveSql = 'SELECT * from users where user_sid = ?';
-const retrieveProducts = `SELECT * 
-FROM account_products 
-JOIN products ON account_products.product_sid = products.product_sid
-JOIN account_subscriptions ON account_products.account_subscription_sid = account_subscriptions.account_subscription_sid
-WHERE account_subscriptions.account_sid = ?
-AND account_subscriptions.effective_end_date IS NULL 
-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 updateSql = 'UPDATE users set hashed_password = ?, salt = ?, force_change = false WHERE user_sid = ?';
+const tokenSql = 'SELECT token from api_keys where account_sid IS NULL AND service_provider_sid IS NULL';
 
-const validateRequest = async(user_sid, payload) => {
-  const {
-    old_password,
-    new_password,
-    initial_password,
-    name,
-    email,
-    email_activation_code,
-    force_change,
-    is_active} = payload;
-
-  const [r] = await promisePool.query(retrieveSql, user_sid);
-  if (r.length === 0) return null;
-  const user = r[0];
-
-  if ((old_password && !new_password) || (new_password && !old_password)) {
-    throw new DbErrorBadRequest('new_password and old_password both required');
-  }
-  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) {
-    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');
-
-  return user;
+const genRandomString = (len) => {
+  return crypto.randomBytes(Math.ceil(len / 2))
+    .toString('hex') /** convert to hexadecimal format */
+    .slice(0, len);   /** return required number of characters */
 };
 
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  const token = req.user.jwt;
-  const decodedJwt = jwt.verify(token, process.env.JWT_SECRET);
-
-  let usersList;
-  try {
-    let results;
-    if (decodedJwt.scope === 'admin') {
-      results = await User.retrieveAll();
-    }
-    else if (decodedJwt.scope === 'account') {
-      results = await User.retrieveAllForAccount(decodedJwt.account_sid, true);
-    }
-    else if (decodedJwt.scope === 'service_provider') {
-      results = await User.retrieveAllForServiceProvider(decodedJwt.service_provider_sid, true);
-    }
-    else {
-      throw new DbErrorBadRequest(`invalid scope: ${decodedJwt.scope}`);
-    }
-
-    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;
-
-      /* 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
-          };
-        })
-      };
-      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,
-          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];
-      });
-      ['email_validated', 'phone_validated', 'force_change'].forEach((prop) => user[prop] = !!user[prop]);
-    }
-    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;
-  const token = req.user.jwt;
-  const decodedJwt = jwt.verify(token, process.env.JWT_SECRET);
-  const {user_sid} = req.params;
-
-  try {
-    const [user] = await User.retrieve(user_sid);
-    // eslint-disable-next-line no-unused-vars
-    const {hashed_password, ...rest} = user;
-    if (!user) throw new Error('failure retrieving user');
-
-    if (decodedJwt.scope === 'admin' ||
-    decodedJwt.scope === 'account' && decodedJwt.account_sid === user.account_sid ||
-    decodedJwt.scope === 'service_provider' && decodedJwt.service_provider_sid === user.service_provider_sid) {
-      res.status(200).json(rest);
-    } else {
-      res.sendStatus(403);
-    }
-
-  } 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 token = req.user.jwt;
-  const decodedJwt = jwt.verify(token, process.env.JWT_SECRET);
-  const {
-    old_password,
-    new_password,
-    initial_password,
-    email_activation_code,
-    email,
-    name,
-    is_active,
-    force_change,
-    account_sid,
-    service_provider_sid
-  } = req.body;
-
-  //if (req.user.user_sid && req.user.user_sid !== user_sid) return res.sendStatus(403);
-
-  if (decodedJwt.scope !== 'admin' &&
-  !(decodedJwt.scope === 'account' && decodedJwt.account_sid === user[0].account_sid) &&
-  !(decodedJwt.scope === 'service_provider' && decodedJwt.service_provider_sid === user[0].service_provider_sid) &&
-  (req.user.user_sid && req.user.user_sid !== user_sid)) {
-    return res.sendStatus(403);
-  }
-
-  try {
-    const user = await validateRequest(user_sid, req.body);
-    if (!user) return res.sendStatus(404);
-
-    if (new_password) {
-      const old_hashed_password = user.hashed_password;
-
-      const isCorrect = await verifyPassword(old_hashed_password, old_password);
-      if (!isCorrect) {
-        //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]);
-      if (0 === r.changedRows) throw new Error('database update failed');
-    }
-
-    if (name) {
-      const r = await promisePool.execute('UPDATE users SET name = ? WHERE user_sid = ?', [name, user_sid]);
-      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');
-    }
-
-    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');
-    }
-
-    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]);
-      if (0 === r.changedRows) throw new Error('database update failed');
-
-      if (process.env.NODE_ENV !== 'test') {
-        //TODO: send email with activation code
-      }
-    }
-    res.sendStatus(204);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-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 sha512 = function(password, salt) {
+  const hash = crypto.createHmac('sha512', salt); /** Hashing algorithm sha512 */
+  hash.update(password);
+  var value = hash.digest('hex');
+  return {
+    salt:salt,
+    passwordHash:value
   };
-  const allUsers = await User.retrieveAll();
-  const token = req.user.jwt;
-  const decodedJwt = jwt.verify(token, process.env.JWT_SECRET);
-  delete payload.initial_password;
+};
 
-  try {
-    const email = allUsers.find((e) => e.email === payload.email);
-    const name = allUsers.find((e) => e.name === payload.name);
+const saltHashPassword = (userpassword) => {
+  var salt = genRandomString(16); /** Gives us salt of length 16 */
+  return sha512(userpassword, salt);
+};
 
-    if (name) {
-      logger.debug({payload}, 'user with this username already exists');
-      return res.status(422).json({msg: 'user with this username already exists'});
-    }
-
-    if (email) {
-      logger.debug({payload}, 'user with this email already exists');
-      return res.status(422).json({msg: 'user with this email already exists'});
-    }
-
-    if (decodedJwt.scope === 'admin') {
-      logger.debug({payload}, 'POST /users');
-      const uuid = await User.make(payload);
-      res.status(201).json({user_sid: uuid});
-    }
-    else if (decodedJwt.scope === 'account') {
-      logger.debug({payload}, 'POST /users');
-      const uuid = await User.make({
-        ...payload,
-        account_sid: decodedJwt.account_sid,
-      });
-      res.status(201).json({user_sid: uuid});
-    }
-    else if (decodedJwt.scope === 'service_provider') {
-      logger.debug({payload}, 'POST /users');
-      const uuid = await User.make({
-        ...payload,
-        service_provider_sid: decodedJwt.service_provider_sid,
-      });
-      res.status(201).json({user_sid: uuid});
-    }
-    else {
-      throw new DbErrorBadRequest(`invalid scope: ${decodedJwt.scope}`);
-    }
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.delete('/:user_sid', async(req, res) => {
+router.put('/:user_sid', (req, res) => {
   const logger = req.app.locals.logger;
-  const {user_sid} = req.params;
-  const token = req.user.jwt;
-  const decodedJwt = jwt.verify(token, process.env.JWT_SECRET);
-  const allUsers = await User.retrieveAll();
-  const activeAdminUsers = allUsers.filter((e) => !e.account_sid && !e.service_provider_sid && e.is_active);
-  const user = await User.retrieve(user_sid);
+  const {old_password, new_password} = req.body;
+  if (!old_password || !new_password) {
+    logger.info('Bad PUT to /Users is missing old_password or new password');
+    return res.sendStatus(400);
+  }
 
-  try {
-    if (decodedJwt.scope === 'admin' && !user.account_sid && !user.service_provider_sid &&
-     activeAdminUsers.length === 1) {
-      throw new Error('cannot delete this admin user - there are no other active admin users');
+  getMysqlConnection((err, conn) => {
+    if (err) {
+      logger.error({err}, 'Error getting db connection');
+      return res.sendStatus(500);
     }
+    conn.query(retrieveSql, [req.params.user_sid], (err, results) => {
+      conn.release();
+      if (err) {
+        logger.error({err}, 'Error getting db connection');
+        return res.sendStatus(500);
+      }
+      if (0 === results.length) {
+        logger.info(`Failed to find user with sid ${req.params.user_sid}`);
+        return res.sendStatus(404);
+      }
 
-    if (decodedJwt.scope === 'admin' ||
-    (decodedJwt.scope === 'account' && decodedJwt.account_sid === user[0].account_sid) ||
-    (decodedJwt.scope === 'service_provider' && decodedJwt.service_provider_sid === user[0].service_provider_sid)) {
-      await User.remove(user_sid);
-      //logout user after self-delete
-      if (decodedJwt.user_sid === user_sid) {
-        request({
-          url:'http://localhost:3000/v1/logout',
-          method: 'POST',
-        }, (err) => {
+      logger.info({results}, 'successfully retrieved user');
+      const old_salt = results[0].salt;
+      const old_hashed_password = results[0].hashed_password;
+
+      const {passwordHash} = sha512(old_password, old_salt);
+      if (old_hashed_password !== passwordHash) return res.sendStatus(403);
+
+      getMysqlConnection((err, conn) => {
+        if (err) {
+          logger.error({err}, 'Error getting db connection');
+          return res.sendStatus(500);
+        }
+        const {salt, passwordHash} = saltHashPassword(new_password);
+        conn.query(updateSql, [passwordHash, salt, req.params.user_sid], (err, r) => {
+          conn.release();
           if (err) {
-            logger.error(err, 'could not log out user');
+            logger.error({err}, 'Error getting db connection');
             return res.sendStatus(500);
           }
-          logger.debug({user}, 'user deleted and logged out');
+          if (0 === r.changedRows) {
+            logger.error('Failed updating database with new password');
+            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, token: tokenResults[0].token});
+          });
         });
-      }
-      return res.sendStatus(204);
-    } else {
-      throw new DbErrorBadRequest(`invalid scope: ${decodedJwt.scope}`);
-    }
-  } catch (err) {
-    sysError(logger, res, err);
-  }
+      });
+    });
+  });
 });
 
 

lib/routes/api/utils.js

@@ -1,288 +0,0 @@
-const { v4: uuid } = require('uuid');
-const bent = require('bent');
-const Account = require('../../models/account');
-const {promisePool} = require('../../db');
-const {cancelSubscription, detachPaymentMethod} = require('../../utils/stripe-utils');
-const freePlans = require('../../utils/free_plans');
-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();
-
-  /* see if we have an existing subscription */
-  const account_subscription = await Account.getSubscription(account_sid);
-  const planType = account_subscription || isReturningUser ? 'free' : 'trial';
-  logger.debug({account_subscription}, `setupFreeTrial: assigning ${account_sid} to ${planType} plan`);
-
-  /* create a subscription */
-  await promisePool.execute(insertAccountSubscriptionSql, [sid, account_sid]);
-
-  /* add products to it */
-  const [products] = await promisePool.query('SELECT * from products');
-  const name2Product = new Map();
-  products.forEach((p) => name2Product.set(p.category, p.product_sid));
-
-  await Promise.all(freePlans[planType].map((p) => {
-    const data = {
-      account_product_sid: uuid(),
-      account_subscription_sid: sid,
-      product_sid: name2Product.get(p.category),
-      quantity: p.quantity
-    };
-    return promisePool.query('INSERT INTO account_products SET ?', data);
-  }));
-  logger.debug({products}, 'setupFreeTrial: added products');
-
-  /* disable the old subscription, if any */
-  if (account_subscription) {
-    const {
-      account_subscription_sid,
-      stripe_subscription_id,
-      stripe_payment_method_id
-    } = account_subscription;
-    await promisePool.execute(replaceOldSubscriptionSql, [
-      'downgraded to free plan', account_subscription_sid]);
-    logger.debug('setupFreeTrial: deactivated previous plan');
-
-    const promises = [];
-    if (stripe_subscription_id) {
-      logger.debug(`setupFreeTrial: deactivating subscription ${stripe_subscription_id}`);
-      promises.push(cancelSubscription(logger, stripe_subscription_id));
-    }
-    if (stripe_payment_method_id) {
-      promises.push(detachPaymentMethod(logger, stripe_payment_method_id));
-    }
-    if (promises.length) await Promise.all(promises);
-  }
-
-  /* update account.plan */
-  await promisePool.execute(
-    'UPDATE accounts SET plan_type = ? WHERE account_sid = ?',
-    [planType, account_sid]);
-};
-
-const createTestCdrs = async(writeCdrs,  account_sid) => {
-  const points = 2000;
-  const data = [];
-  const start = new Date(Date.now() - (30 * 24 * 60 * 60 * 1000));
-  const now = new Date();
-  const increment = (now.getTime() - start.getTime()) / points;
-  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_status: 200,
-      duration: failed ? 0 : 45,
-      attempted_at: attempted_at.getTime(),
-      answered_at: attempted_at.getTime() + 3000,
-      terminated_at: attempted_at.getTime() + 45000,
-      termination_reason: 'caller hungup',
-      host: '192.168.1.100',
-      remote_host: '3.55.24.34',
-      account_sid,
-      direction: 0 === i % 2 ? 'inbound' : 'outbound',
-      trunk:  0 === i % 2 ? 'twilio' : 'user'
-    });
-  }
-
-  await writeCdrs(data);
-
-};
-
-const createTestAlerts = async(writeAlerts, AlertType, account_sid) => {
-  const points = 100;
-  const data = [];
-  const start = new Date(Date.now() - (30 * 24 * 60 * 60 * 1000));
-  const now = new Date();
-  const increment = (now.getTime() - start.getTime()) / points;
-  for (let i = 0 ; i < points; i++) {
-    const timestamp = new Date(start.getTime() + (i * increment));
-    const scenario = i % 5;
-    switch (scenario) {
-      case 0:
-        data.push({timestamp, account_sid,
-          alert_type: AlertType.WEBHOOK_STATUS_FAILURE, url: 'http://foo.bar', status: 404});
-        break;
-      case 1:
-        data.push({timestamp, account_sid, alert_type: AlertType.WEBHOOK_CONNECTION_FAILURE, url: 'http://foo.bar'});
-        break;
-      case 2:
-        data.push({timestamp, account_sid, alert_type: AlertType.TTS_NOT_PROVISIONED, vendor: 'google'});
-        break;
-      case 3:
-        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});
-        break;
-      default:
-        break;
-    }
-  }
-
-  await writeAlerts(data);
-
-};
-
-const parseServiceProviderSid = (req) => {
-  const arr = /ServiceProviders\/([^\/]*)/.exec(req.originalUrl);
-  if (arr) return arr[1];
-};
-
-const parseAccountSid = (req) => {
-  const arr = /Accounts\/([^\/]*)/.exec(req.originalUrl);
-  if (arr) return arr[1];
-};
-
-const hasAccountPermissions = (req, res, next) => {
-  if (req.user.hasScope('admin')) return next();
-  if (req.user.hasScope('service_provider')) 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) => {
-  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'
-  });
-};
-
-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;
-};
-
-module.exports = {
-  setupFreeTrial,
-  createTestCdrs,
-  createTestAlerts,
-  parseAccountSid,
-  parseServiceProviderSid,
-  hasAccountPermissions,
-  hasServiceProviderPermissions,
-  checkLimits,
-  enableSubspace,
-  disableSubspace
-};

lib/routes/api/voip-carriers.js

@@ -1,18 +1,15 @@
 const router = require('express').Router();
 const {DbErrorBadRequest, DbErrorUnprocessableRequest} = require('../../utils/errors');
 const VoipCarrier = require('../../models/voip-carrier');
-const {promisePool} = require('../../db');
 const decorate = require('./decorate');
-const sysError = require('../error');
+const preconditions = {
+  'add': validate,
+  'update': validate,
+  'delete': noActiveAccounts
+};
 
-const validate = async(req) => {
+async function validate(req) {
   const {lookupAppBySid, lookupAccountBySid} = req.app.locals;
-
-  /* account level user can only act on carriers associated to his/her account */
-  if (req.user.hasAccountAuth) {
-    req.body.account_sid = req.user.account_sid;
-  }
-
   if (req.body.application_sid && !req.body.account_sid) {
     throw new DbErrorBadRequest('account_sid missing');
   }
@@ -27,71 +24,14 @@ const validate = async(req) => {
     const account = await lookupAccountBySid(req.body.account_sid);
     if (!account) throw new DbErrorBadRequest('unknown account_sid');
   }
-};
+}
 
-const validateUpdate = async(req, sid) => {
-  const {lookupCarrierBySid} = req.app.locals;
-  await validate(req);
-
-  if (req.user.hasAccountAuth) {
-    /* can only update carriers for the user's account */
-    const carrier = await lookupCarrierBySid(sid);
-    if (carrier.account_sid != req.user.account_sid) {
-      throw new DbErrorUnprocessableRequest('carrier belongs to a different user');
-    }
-  }
-};
-
-const validateDelete = async(req, sid) => {
-  const {lookupCarrierBySid} = req.app.locals;
-  if (req.user.hasAccountAuth) {
-    /* can only update carriers for the user's account */
-    const carrier = await lookupCarrierBySid(sid);
-    if (carrier.account_sid != req.user.account_sid) {
-      throw new DbErrorUnprocessableRequest('carrier belongs to a different user');
-    }
-  }
-
-  /* can not delete a voip provider if it has any active phone numbers */
+/* can not delete a voip provider if it has any active phone numbers */
+async function noActiveAccounts(req, sid) {
   const activeAccounts = await VoipCarrier.getForeignKeyReferences('phone_numbers.voip_carrier_sid', sid);
   if (activeAccounts > 0) throw new DbErrorUnprocessableRequest('cannot delete voip carrier with active phone numbers');
+}
 
-  /* remove all the sip and smpp gateways from the carrier first */
-  await promisePool.execute('DELETE FROM sip_gateways WHERE voip_carrier_sid = ?', [sid]);
-  await promisePool.execute('DELETE FROM smpp_gateways WHERE voip_carrier_sid = ?', [sid]);
-};
-
-const preconditions = {
-  'add': validate,
-  'update': validateUpdate,
-  'delete': validateDelete
-};
-
-decorate(router, VoipCarrier, ['add', 'update', 'delete'], preconditions);
-
-/* list */
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const results = await VoipCarrier.retrieveAll(req.user.hasAccountAuth ? req.user.account_sid : null);
-    res.status(200).json(results);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-/* retrieve */
-router.get('/:sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const account_sid = req.user.hasAccountAuth ? req.user.account_sid : null;
-    const results = await VoipCarrier.retrieve(req.params.sid, account_sid);
-    if (results.length === 0) return res.status(404).end();
-    return res.status(200).json(results[0]);
-  }
-  catch (err) {
-    sysError(logger, res, err);
-  }
-});
+decorate(router, VoipCarrier, ['*'], preconditions);
 
 module.exports = router;

lib/routes/api/webhooks.js

@@ -1,21 +0,0 @@
-const router = require('express').Router();
-const Webhook = require('../../models/webhook');
-const decorate = require('./decorate');
-const sysError = require('../error');
-
-decorate(router, Webhook, ['add']);
-
-/* retrieve */
-router.get('/:sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const results = await Webhook.retrieve(req.params.sid);
-    if (results.length === 0) return res.status(404).end();
-    return res.status(200).json(results[0]);
-  }
-  catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/error.js

@@ -1,24 +0,0 @@
-const {DbErrorBadRequest, DbErrorUnprocessableRequest, DbErrorForbidden} = require('../utils/errors');
-
-function sysError(logger, res, err) {
-  if (err instanceof DbErrorBadRequest) {
-    logger.info(err, 'invalid client request');
-    return res.status(400).json({msg: err.message});
-  }
-  if (err instanceof DbErrorUnprocessableRequest) {
-    logger.info(err, 'unprocessable request');
-    return res.status(422).json({msg: err.message});
-  }
-  if (err instanceof DbErrorForbidden) {
-    logger.info(err, 'forbidden');
-    return res.status(403).json({msg: err.message});
-  }
-  if (err.code === 'ER_DUP_ENTRY') {
-    logger.info(err, 'duplicate entry on insert');
-    return res.status(422).json({msg: err.message});
-  }
-  logger.error(err, 'Database error');
-  res.status(500).json({msg: err.message});
-}
-
-module.exports = sysError;

lib/routes/index.js

@@ -4,20 +4,10 @@ const YAML = require('yamljs');
 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);
 routes.get('/swagger', swaggerUi.setup(swaggerDocument));
 

lib/routes/stripe/index.js

@@ -1,5 +0,0 @@
-const router = require('express').Router();
-
-router.use('/webhook', require('./webhook'));
-
-module.exports = router;

lib/routes/stripe/webhook.js

@@ -1,71 +0,0 @@
-const router = require('express').Router();
-//const debug = require('debug')('jambonz:api-server');
-const Account = require('../../models/account');
-const {retrieveSubscription} = require('../../utils/stripe-utils');
-const stripeFactory = require('stripe');
-const express = require('express');
-const sysError = require('../error');
-
-/** Invoice events */
-const handleInvoicePaymentSucceeded = async(logger, obj) => {
-  const {subscription} = obj;
-  logger.debug({obj}, `payment for ${obj.billing_reason} succeeded`);
-  const sub = await retrieveSubscription(logger, subscription);
-  if ('active' === sub.status) {
-    const {account_sid} = sub.metadata;
-    if (await Account.activateSubscription(logger, account_sid, sub.id,
-      'subscription_create' === obj.billing_reason ? 'upgrade to paid plan' : 'change plan details')) {
-      logger.info(`handleInvoicePaymentSucceeded: activated subscription for account ${account_sid}`);
-    }
-  }
-};
-
-/**
- * Two cases:
- * (1) A subscription renewal fails.  In this case we deactivate subscription
- * and the customer is down until they provide payment.
- * (2) A customer adds capacity during the month, and the pro-rated amount fails.
- * In this case, we leave the new subscription in a pending state
- * The customer continues (for the rest of the month at least) at
- * previous capacity levels.
- */
-
-const handleInvoicePaymentFailed = async(logger, obj) => {
-  const {subscription} = obj;
-  const sub = await retrieveSubscription(logger, subscription);
-  logger.debug({obj}, `payment for ${obj.billing_reason} failed, subscription status is ${sub.status}`);
-  const {account_sid} = sub.metadata;
-  if (await Account.deactivateSubscription(logger, account_sid, 'payment failed')) {
-    logger.info(`handleInvoicePaymentFailed: deactivated subscription for account ${account_sid}`);
-  }
-};
-
-const handleInvoiceEvents = async(logger, evt) => {
-  if (evt.type === 'invoice.payment_succeeded') handleInvoicePaymentSucceeded(logger, evt.data.object);
-  else if (evt.type === 'invoice.payment_failed') handleInvoicePaymentFailed(logger, evt.data.object);
-};
-
-
-router.post('/', express.raw({type: 'application/json'}), async(req, res) => {
-  const {logger} = req.app.locals;
-  const sig = req.get('stripe-signature');
-
-  let evt;
-  try {
-    if (!process.env.STRIPE_WEBHOOK_SECRET) throw new Error('missing webhook secret');
-    const stripe = stripeFactory(process.env.STRIPE_API_KEY);
-    evt = stripe.webhooks.constructEvent(req.body, sig, process.env.STRIPE_WEBHOOK_SECRET);
-    res.sendStatus(204);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-
-  /* process event */
-  logger.info(`received webhook: ${evt.type}`);
-  if (evt.type.startsWith('invoice.')) handleInvoiceEvents(logger, evt);
-  else {
-    logger.debug(evt, 'unhandled stripe webook');
-  }
-});
-
-module.exports = router;

lib/utils/dns-utils.js

@@ -1,123 +0,0 @@
-if (!process.env.JAMBONES_HOSTING) return;
-
-const bent = require('bent');
-const crypto = require('crypto');
-const assert = require('assert');
-const domains = new Map();
-const debug = require('debug')('jambonz:api-server');
-
-const checkAsserts = () => {
-  assert.ok(process.env.DME_API_KEY, 'missing env DME_API_KEY for dns operations');
-  assert.ok(process.env.DME_API_SECRET, 'missing env DME_API_SECRET for dns operations');
-  assert.ok(process.env.DME_BASE_URL, 'missing env DME_BASE_URL for dns operations');
-};
-
-const createAuthHeaders = () => {
-  const now = (new Date()).toUTCString();
-  const hash = crypto.createHmac('SHA1', process.env.DME_API_SECRET);
-  hash.update(now);
-  return {
-    'x-dnsme-apiKey': process.env.DME_API_KEY,
-    'x-dnsme-requestDate': now,
-    'x-dnsme-hmac': hash.digest('hex')
-  };
-};
-
-const getDnsDomainId = async(logger, name) => {
-  checkAsserts();
-  const headers = createAuthHeaders();
-  const get = bent(process.env.DME_BASE_URL, 'GET', 'json', headers);
-  try {
-    const result = await get('/dns/managed');
-    debug(result, 'getDnsDomainId: all domains');
-    if (Array.isArray(result.data)) {
-      const domain = result.data.find((o) => o.name === name);
-      if (domain) return domain.id;
-      debug(`getDnsDomainId: failed to find domain ${name}`);
-    }
-  } catch (err) {
-    logger.error({err}, 'Error retrieving domains');
-  }
-};
-
-/**
- * Add the DNS records for a given subdomain
- * We will add an A record and an SRV record for each SBC public IP address
- * Note: this assumes we have manually added DNS A records:
- *    sbc01.root.domain, sbc0.root.domain, etc to dnsmadeeasy
- */
-const createDnsRecords = async(logger, domain, name, value, ttl = 3600) => {
-  checkAsserts();
-  try {
-    if (!domains.has(domain)) {
-      const domainId = await getDnsDomainId(logger, domain);
-      if (!domainId) return false;
-      domains.set(domain, domainId);
-    }
-    const domainId = domains.get(domain);
-
-    value = Array.isArray(value) ? value : [value];
-    const a_records = value.map((v) => {
-      return {
-        type: 'A',
-        gtdLocation: 'DEFAULT',
-        name,
-        value: v,
-        ttl
-      };
-    });
-    const srv_records = [
-      {
-        type: 'SRV',
-        gtdLocation: 'DEFAULT',
-        name: `_sip._udp.${name}`,
-        value: `${name}`,
-        port: 5060,
-        priority: 10,
-        weight: 100,
-        ttl
-      }
-    ];
-    const headers = createAuthHeaders();
-    const records = [...a_records, ...srv_records];
-    const post = bent(process.env.DME_BASE_URL, 'POST', 201, 400, headers);
-    logger.debug({records}, 'Attemting to create dns records');
-    const res = await post(`/dns/managed/${domainId}/records/createMulti`,
-      [...a_records, ...srv_records]);
-
-    if (201 === res.statusCode) {
-      const str = await res.text();
-      return JSON.parse(str);
-    }
-    logger.error({res}, 'Error creating records');
-  } catch (err) {
-    logger.error({err}, 'Error retrieving domains');
-  }
-};
-
-const deleteDnsRecords = async(logger, domain, recIds) => {
-  checkAsserts();
-  const headers = createAuthHeaders();
-  const del = bent(process.env.DME_BASE_URL, 'DELETE', 200, headers);
-  try {
-    if (!domains.has(domain)) {
-      const domainId = await getDnsDomainId(logger, domain);
-      if (!domainId) return false;
-      domains.set(domain, domainId);
-    }
-    const domainId = domains.get(domain);
-    const url = `/dns/managed/${domainId}/records?${recIds.map((r) => `ids=${r}`).join('&')}`;
-    await del(url);
-    return true;
-  } catch (err) {
-    console.error(err);
-    logger.error({err}, 'Error deleting records');
-  }
-};
-
-
-module.exports = {
-  getDnsDomainId,
-  createDnsRecords,
-  deleteDnsRecords
-};

lib/utils/email-utils.js

@@ -1,34 +0,0 @@
-const formData = require('form-data');
-const Mailgun = require('mailgun.js');
-const mailgun = new Mailgun(formData);
-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,}))$/;
-  return re.test(email);
-};
-
-const emailSimpleText = async(logger, 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!');
-
-  try {
-    const res = await mg.messages.create(process.env.MAILGUN_DOMAIN, {
-      from: 'jambonz Support <support@jambonz.org>',
-      to,
-      subject,
-      text
-    });
-    logger.debug({res}, 'sent email');
-  } catch (err) {
-    logger.info({err}, 'Error sending email');
-  }
-};
-
-module.exports = {
-  validateEmail,
-  emailSimpleText
-};

lib/utils/encrypt-decrypt.js

@@ -1,29 +0,0 @@
-const crypto = require('crypto');
-const algorithm = process.env.LEGACY_CRYPTO ? 'aes-256-ctr' : 'aes-256-cbc';
-const iv = crypto.randomBytes(16);
-const secretKey = crypto.createHash('sha256')
-  .update(String(process.env.JWT_SECRET))
-  .digest('base64')
-  .substr(0, 32);
-
-const encrypt = (text) => {
-  const cipher = crypto.createCipheriv(algorithm, secretKey, iv);
-  const encrypted = Buffer.concat([cipher.update(text), cipher.final()]);
-  const data = {
-    iv: iv.toString('hex'),
-    content: encrypted.toString('hex')
-  };
-  return JSON.stringify(data);
-};
-
-const decrypt = (data) => {
-  const hash = JSON.parse(data);
-  const decipher = crypto.createDecipheriv(algorithm, secretKey, Buffer.from(hash.iv, 'hex'));
-  const decrpyted = Buffer.concat([decipher.update(Buffer.from(hash.content, 'hex')), decipher.final()]);
-  return decrpyted.toString();
-};
-
-module.exports = {
-  encrypt,
-  decrypt
-};

lib/utils/errors.js

@@ -16,15 +16,8 @@ class DbErrorUnprocessableRequest extends DbError {
   }
 }
 
-class DbErrorForbidden extends DbError {
-  constructor(msg) {
-    super(msg);
-  }
-}
-
 module.exports = {
   DbError,
   DbErrorBadRequest,
-  DbErrorUnprocessableRequest,
-  DbErrorForbidden
+  DbErrorUnprocessableRequest
 };

lib/utils/free_plans.json

@@ -1,22 +0,0 @@
-{
-  "trial": [
-    {
-      "category": "voice_call_session",
-      "quantity": 20
-    },
-    {
-      "category": "device",
-      "quantity": 0
-    }
-  ],
-  "free": [
-    {
-      "category": "voice_call_session",
-      "quantity": 1
-    },
-    {
-      "category": "device",
-      "quantity": 1
-    }
-  ]
-}

lib/utils/homer-utils.js

@@ -1,93 +0,0 @@
-const debug = require('debug')('jambonz:api-server');
-const bent = require('bent');
-const basicAuth = (apiKey) => {
-  const header = `Bearer ${apiKey}`;
-  return {Authorization: header};
-};
-const postJSON = bent(process.env.HOMER_BASE_URL || 'http://127.0.0.1', 'POST', 'json', 200, 201);
-const postPcap = bent(process.env.HOMER_BASE_URL || 'http://127.0.0.1', 'POST', 200, {
-  'Content-Type': 'application/json',
-  'Accept': 'application/json, text/plain, */*',
-});
-const SEVEN_DAYS_IN_MS = (1000 * 3600 * 24 * 7);
-
-const getHomerApiKey = async(logger) => {
-  if (!process.env.HOMER_BASE_URL || !process.env.HOMER_USERNAME || !process.env.HOMER_PASSWORD) {
-    logger.debug('getHomerApiKey: Homer integration not installed');
-  }
-
-  try {
-    const obj = await postJSON('/api/v3/auth', {
-      username: process.env.HOMER_USERNAME,
-      password: process.env.HOMER_PASSWORD
-    });
-    debug(obj);
-    logger.debug({obj}, `getHomerApiKey for user ${process.env.HOMER_USERNAME}`);
-    return obj.token;
-  } catch (err) {
-    debug(err);
-    logger.info({err}, `getHomerApiKey: Error retrieving apikey for user ${process.env.HOMER_USERNAME}`);
-  }
-};
-
-const getHomerSipTrace = async(logger, apiKey, callId) => {
-  if (!process.env.HOMER_BASE_URL || !process.env.HOMER_USERNAME || !process.env.HOMER_PASSWORD) {
-    logger.debug('getHomerSipTrace: Homer integration not installed');
-  }
-  try {
-    const now = Date.now();
-    const obj = await postJSON('/api/v3/call/transaction', {
-      param: {
-        transaction: {
-          call: true
-        },
-        search: {
-          '1_call': {
-            callid: [callId]
-          }
-        },
-      },
-      timestamp: {
-        from: now - SEVEN_DAYS_IN_MS,
-        to: now
-      }
-    }, basicAuth(apiKey));
-    return obj;
-  } catch (err) {
-    logger.info({err}, `getHomerSipTrace: Error retrieving messages for callid ${callId}`);
-  }
-};
-
-const getHomerPcap = async(logger, apiKey, callIds) => {
-  if (!process.env.HOMER_BASE_URL || !process.env.HOMER_USERNAME || !process.env.HOMER_PASSWORD) {
-    logger.debug('getHomerPcap: Homer integration not installed');
-  }
-  try {
-    const now = Date.now();
-    const stream = await postPcap('/api/v3/export/call/messages/pcap', {
-      param: {
-        transaction: {
-          call: true
-        },
-        search: {
-          '1_call': {
-            callid: callIds
-          }
-        },
-      },
-      timestamp: {
-        from: now - SEVEN_DAYS_IN_MS,
-        to: now
-      }
-    }, basicAuth(apiKey));
-    return stream;
-  } catch (err) {
-    logger.info({err}, `getHomerPcap: Error retrieving messages for callid ${callIds}`);
-  }
-};
-
-module.exports = {
-  getHomerApiKey,
-  getHomerSipTrace,
-  getHomerPcap
-};

lib/utils/oauth-utils.js

@@ -1,112 +0,0 @@
-const assert = require('assert');
-const bent = require('bent');
-const postJSON = bent('POST', 'json', 200);
-const getJSON = bent('GET', 'json', 200);
-const {emailSimpleText} = require('./email-utils');
-const {DbErrorForbidden} = require('../utils/errors');
-
-const doGithubAuth = async(logger, payload) => {
-  assert.ok(process.env.GITHUB_CLIENT_SECRET, 'env var GITHUB_CLIENT_SECRET is required');
-
-  try {
-    /* exchange the code for an access token */
-    const obj = await postJSON('https://github.com/login/oauth/access_token', {
-      client_id: payload.oauth2_client_id,
-      client_secret: process.env.GITHUB_CLIENT_SECRET,
-      code: payload.oauth2_code,
-      state: payload.oauth2_state,
-      redirect_uri: payload.oauth2_redirect_uri
-    });
-    if (!obj.access_token) {
-      logger.error({obj}, 'Error retrieving access_token from github');
-      if (obj.error === 'bad_verification_code') throw new Error('bad verification code');
-      throw new Error(obj.error || 'error retrieving access_token');
-    }
-    logger.debug({obj}, 'got response from github for access_token');
-
-    /* use the access token to get basic public info as well as primary email */
-    const userDetails = await getJSON('https://api.github.com/user', null, {
-      Authorization: `Bearer ${obj.access_token}`,
-      Accept: 'application/json',
-      'User-Agent': 'jambonz 1.0'
-    });
-
-    const emails = await getJSON('https://api.github.com/user/emails', null, {
-      Authorization: `Bearer ${obj.access_token}`,
-      Accept: 'application/json',
-      'User-Agent': 'jambonz 1.0'
-    });
-    const primary = emails.find((e) => e.primary);
-    if (primary) Object.assign(userDetails, {
-      email: primary.email,
-      email_validated: primary.validated
-    });
-
-    logger.info({userDetails}, 'retrieved user details from github');
-    return userDetails;
-  } catch (err) {
-    logger.info({err}, 'Error authenticating via github');
-    throw new DbErrorForbidden(err.message);
-  }
-};
-
-const doGoogleAuth = async(logger, payload) => {
-  assert.ok(process.env.GOOGLE_OAUTH_CLIENT_SECRET, 'env var GOOGLE_OAUTH_CLIENT_SECRET is required');
-
-  try {
-    /* exchange the code for an access token */
-    const obj = await postJSON('https://oauth2.googleapis.com/token', {
-      client_id: payload.oauth2_client_id,
-      client_secret: process.env.GOOGLE_OAUTH_CLIENT_SECRET,
-      code: payload.oauth2_code,
-      state: payload.oauth2_state,
-      redirect_uri: payload.oauth2_redirect_uri,
-      grant_type: 'authorization_code'
-    });
-    if (!obj.access_token) {
-      logger.error({obj}, 'Error retrieving access_token from github');
-      if (obj.error === 'bad_verification_code') throw new Error('bad verification code');
-      throw new Error(obj.error || 'error retrieving access_token');
-    }
-    logger.debug({obj}, 'got response from google for access_token');
-
-    /* use the access token to get basic public info as well as primary email */
-    const userDetails = await getJSON('https://www.googleapis.com/oauth2/v2/userinfo', null, {
-      Authorization: `Bearer ${obj.access_token}`,
-      Accept: 'application/json',
-      'User-Agent': 'jambonz 1.0'
-    });
-
-    logger.info({userDetails}, 'retrieved user details from google');
-    return userDetails;
-  } catch (err) {
-    logger.info({err}, 'Error authenticating via google');
-    throw new DbErrorForbidden(err.message);
-  }
-};
-const doLocalAuth = async(logger, payload) => {
-  const {name, email, password, email_activation_code} = payload;
-  const text = `Hi there
-
-  Welcome to jambonz!  Your account activation code is ${email_activation_code}
-  
-  Best,
-  
-  The jambonz team`;
-
-  if ('test' !== process.env.NODE_ENV || process.env.MAILGUN_API_KEY) {
-    await emailSimpleText(logger, email, 'Account activation code', text);
-  }
-  return {
-    name,
-    email,
-    password,
-    email_activation_code
-  };
-};
-
-module.exports = {
-  doGithubAuth,
-  doGoogleAuth,
-  doLocalAuth
-};

lib/utils/password-utils.js

@@ -1,24 +0,0 @@
-const crypto = require('crypto');
-const { argon2i } = require('argon2-ffi');
-const util = require('util');
-
-const getRandomBytes = util.promisify(crypto.randomBytes);
-
-const generateHashedPassword = async(password) => {
-  const salt = await getRandomBytes(32);
-  const passwordHash =  await argon2i.hash(password, salt);
-  return passwordHash;
-};
-
-const verifyPassword = async(passwordHash, password) => {
-  const isCorrect = await argon2i.verify(passwordHash, password);
-  return isCorrect;
-};
-
-const hashString = (s) => crypto.createHash('md5').update(s).digest('hex');
-
-module.exports = {
-  generateHashedPassword,
-  verifyPassword,
-  hashString
-};