Compare commits

...

8 Commits

Author SHA1 Message Date
Dave Horton
cd935999a6 bump version 2022-02-09 15:42:52 -05:00
Dave Horton
863d7a02c8 update to latest @jambonz/realtimedb-helpers with support for redis username / password auth 2022-02-09 15:30:18 -05:00
Dave Horton
45c023e374 add helmet middleware 2022-02-03 07:26:41 -05:00
Snyk bot
f634ca4076 fix: upgrade stripe from 8.195.0 to 8.196.0 (#32)
Snyk has created this PR to upgrade stripe from 8.195.0 to 8.196.0.

See this package in npm:
https://www.npmjs.com/package/stripe

See this project in Snyk:
https://app.snyk.io/org/davehorton/project/b7e09765-19b2-4aa5-90ba-10432e250041?utm_source=github&utm_medium=referral&page=upgrade-pr
2022-02-02 22:57:08 -05:00
Dave Horton
654f93b30c update deps 2022-02-01 21:03:49 -05:00
Snyk bot
280aaef120 fix: upgrade express from 4.17.1 to 4.17.2 (#31)
Snyk has created this PR to upgrade express from 4.17.1 to 4.17.2.

See this package in npm:
https://www.npmjs.com/package/express

See this project in Snyk:
https://app.snyk.io/org/davehorton/project/b7e09765-19b2-4aa5-90ba-10432e250041?utm_source=github&utm_medium=referral&page=upgrade-pr
2022-02-01 20:51:26 -05:00
Dave Horton
e6931574e3 fix bug from prev commit 2022-02-01 20:46:41 -05:00
Dave Horton
1bd21cb39d update to uuid@8.3.2 2022-02-01 20:42:10 -05:00
13 changed files with 1888 additions and 286 deletions

4
app.js
View File

@@ -9,7 +9,7 @@ const opts = Object.assign({
const logger = require('pino')(opts);
const express = require('express');
const app = express();
app.disable('x-powered-by');
const helmet = require('helmet');
const cors = require('cors');
const passport = require('passport');
const routes = require('./lib/routes');
@@ -89,6 +89,8 @@ const unless = (paths, middleware) => {
return middleware(req, res, next);
};
};
app.use(helmet());
app.use(helmet.hidePoweredBy());
app.use(passport.initialize());
app.use(cors());
app.use(express.urlencoded({extended: true}));

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env node
const {promisePool} = require('../lib/db');
const uuidv4 = require('uuid/v4');
const { v4: uuidv4 } = require('uuid');
const {generateHashedPassword} = require('../lib/utils/password-utils');
const sqlInsert = `INSERT into users
(user_sid, name, email, hashed_password, force_change, provider, email_validated)

View File

@@ -2,7 +2,8 @@ const debug = require('debug')('jambonz:api-server');
const Model = require('./model');
const {getMysqlConnection} = require('../db');
const {promisePool} = require('../db');
const uuid = require('uuid').v4;
const { v4: uuid } = require('uuid');
const {encrypt} = require('../utils/encrypt-decrypt');
const retrieveSql = `SELECT * from accounts acc

View File

@@ -1,5 +1,5 @@
const Emitter = require('events');
const uuidv4 = require('uuid/v4');
const { v4: uuidv4 } = require('uuid');
const assert = require('assert');
const {getMysqlConnection} = require('../db');
const {DbErrorBadRequest} = require('../utils/errors');

View File

@@ -8,7 +8,7 @@ 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 uuidv4 = require('uuid/v4');
const { v4: uuidv4 } = require('uuid');
const snakeCase = require('../../utils/snake-case');
const sysError = require('../error');
const {promisePool} = require('../../db');

View File

@@ -3,7 +3,7 @@ const {DbErrorBadRequest} = require('../../utils/errors');
const ApiKey = require('../../models/api-key');
const Account = require('../../models/account');
const decorate = require('./decorate');
const uuidv4 = require('uuid/v4');
const { v4: uuidv4 } = require('uuid');
const sysError = require('../error');
const preconditions = {
'add': validateAddToken,

View File

@@ -4,7 +4,7 @@ const {DbErrorBadRequest, DbErrorUnprocessableRequest} = require('../../utils/er
const {promisePool} = require('../../db');
const {doGithubAuth, doGoogleAuth, doLocalAuth} = require('../../utils/oauth-utils');
const {validateEmail} = require('../../utils/email-utils');
const uuid = require('uuid').v4;
const { v4: uuid } = require('uuid');
const short = require('short-uuid');
const translator = short();
const jwt = require('jsonwebtoken');

View File

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

View File

@@ -1,7 +1,7 @@
const router = require('express').Router();
const request = require('request');
const getProvider = require('../../utils/sms-provider');
const uuidv4 = require('uuid/v4');
const { v4: uuidv4 } = require('uuid');
const sysError = require('../error');
let idx = 0;

View File

@@ -1,4 +1,4 @@
const uuid = require('uuid').v4;
const { v4: uuid } = require('uuid');
const bent = require('bent');
const Account = require('../../models/account');
const {promisePool} = require('../../db');

2133
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "jambonz-api-server",
"version": "v0.7.2",
"version": "v0.7.3",
"description": "",
"main": "app.js",
"scripts": {
@@ -17,19 +17,20 @@
"url": "https://github.com/jambonz/jambonz-api-server.git"
},
"dependencies": {
"@google-cloud/speech": "^4.9.0",
"@google-cloud/speech": "^4.10.0",
"@google-cloud/text-to-speech": "^3.4.0",
"@jambonz/db-helpers": "^0.6.16",
"@jambonz/realtimedb-helpers": "^0.4.17",
"@jambonz/realtimedb-helpers": "^0.4.24",
"@jambonz/time-series": "^0.1.6",
"argon2-ffi": "^2.0.0",
"aws-sdk": "^2.1049.0",
"aws-sdk": "^2.1066.0",
"bent": "^7.3.12",
"cors": "^2.8.5",
"debug": "^4.3.3",
"express": "^4.17.1",
"express": "^4.17.2",
"form-data": "^2.5.1",
"form-urlencoded": "^6.0.5",
"helmet": "^5.0.2",
"jsonwebtoken": "^8.5.1",
"mailgun.js": "^3.7.3",
"microsoft-cognitiveservices-speech-sdk": "^1.19.0",
@@ -39,9 +40,9 @@
"pino": "^5.17.0",
"request-debug": "^0.2.0",
"short-uuid": "^4.1.0",
"stripe": "^8.195.0",
"stripe": "^8.196.0",
"swagger-ui-express": "^4.3.0",
"uuid": "^3.4.0",
"uuid": "^8.3.2",
"yamljs": "^0.3.0"
},
"devDependencies": {

View File

@@ -1,5 +1,4 @@
const bytesToUuid = require("uuid/lib/bytesToUuid");
const uuid = require('uuid').v4;
const { v4: uuid } = require('uuid');
const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
const authAdmin = {bearer: ADMIN_TOKEN};