update package-lock.json

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/routes/api/index.js

@@ -44,7 +44,6 @@ api.use('/Subscriptions', require('./subscriptions'));
 api.use('/Invoices', require('./invoices'));
 api.use('/InviteCodes', require('./invite-codes'));
 api.use('/PredefinedCarriers', require('./predefined-carriers'));
-api.use('/PasswordSettings', isAdminScope, require('./password-settings'));
 
 // messaging
 api.use('/Smpps', require('./smpps'));   // our smpp server info

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/swagger/swagger.yaml

@@ -3419,10 +3419,6 @@ paths:
                   type: string
                   description: The calling party number
                   example: "16172375089"
-                fromHost:
-                  type: string
-                  description: The hostname to put in the SIP From header of the INVITE
-                  example: "blf.finotel.com"
                 timeout:
                   type: integer
                   description: the number of seconds to wait for call to be answered.  Defaults to 60.

package.json

@@ -18,10 +18,10 @@
     "url": "https://github.com/jambonz/jambonz-api-server.git"
   },
   "dependencies": {
-    "@google-cloud/speech": "^5.1.0",
-    "@google-cloud/text-to-speech": "^4.0.3",
-    "@jambonz/db-helpers": "^0.6.19",
-    "@jambonz/realtimedb-helpers": "^0.4.35",
+    "@google-cloud/speech": "^4.10.2",
+    "@google-cloud/text-to-speech": "^3.4.0",
+    "@jambonz/db-helpers": "^0.6.18",
+    "@jambonz/realtimedb-helpers": "^0.4.29",
     "@jambonz/time-series": "^0.2.5",
     "argon2-ffi": "^2.0.0",
     "aws-sdk": "^2.1152.0",

test/accounts.js

@@ -232,7 +232,7 @@ test('account tests', async(t) => {
       auth: authAdmin,
       json: true,
     });
-    // console.log(result);
+    //console.log(result);
     t.ok(result.length === 1  && result[0].quantity === 205, 'successfully queried account limits by category');
 
     /* delete call session limits for a service provider */

test/index.js

@@ -15,5 +15,4 @@ require('./recent-calls');
 require('./webapp_tests');
 // require('./homer');
 require('./call-test');
-require('./password-settings');
 require('./docker_stop');

test/password-settings.js

@@ -1,71 +0,0 @@
-const test = require('tape') ;
-const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
-const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
-  baseUrl: 'http://127.0.0.1:3000/v1'
-});
-
-
-process.on('unhandledRejection', (reason, p) => {
-  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-});
-
-test('password settings tests', async(t) => {
-
-  /* Check Default Password Settings */
-  result = await request.get('/PasswordSettings', {
-    auth: authAdmin,
-    json: true,
-  });
-  t.ok(result.min_password_length == 8 && 
-    !result.require_digit &&
-    !result.require_special_character, "default password settings is correct!")
-
-  /* Post New Password settings*/
-
-  result = await request.post('/PasswordSettings', {
-    auth: authAdmin,
-    json: true,
-    resolveWithFullResponse: true,
-    body: {
-      min_password_length: 15,
-      require_digit: 1,
-      require_special_character: 1
-    }
-  });
-
-  t.ok(result.statusCode === 201, 'successfully added a password settings');
-
-  /* Check Password Settings*/
-  result = await request.get('/PasswordSettings', {
-    auth: authAdmin,
-    json: true,
-  });
-
-  t.ok(result.min_password_length === 15 && 
-    result.require_digit === 1 &&
-    result.require_special_character === 1, 'successfully queried password settings');
-
-  /* Update Password settings*/
-  result = await request.post('/PasswordSettings', {
-    auth: authAdmin,
-    json: true,
-    resolveWithFullResponse: true,
-    body: {
-      min_password_length: 10,
-      require_special_character: 0
-    }
-  });
-
-  t.ok(result.statusCode === 201, 'successfully updated a password settings');
-
-  /* Check Password Settings After update*/
-  result = await request.get('/PasswordSettings', {
-    auth: authAdmin,
-    json: true,
-  });
-
-  t.ok(result.min_password_length === 10 && 
-    result.require_digit === 1 &&
-    result.require_special_character === 0, 'successfully queried password settings after updated');
-});