ben.carrasco/jambonz-api-server
1
0 Fork 0
mirror of https://github.com/jambonz/jambonz-api-server.git synced 2026-11-08 20:43:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge of features from hosted branch (#7)

Browse Source 
major merge of features from the hosted branch that was created temporarily during the initial launch of jambonz.org
This commit is contained in:
Dave Horton authored and GitHub committed 2021-06-17 15:56:21 -04:00
1 parent ab7c69c0e8
commit ed51d8b13f
105 files changed
+10330 -1601
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/routes/api/applications.js
+12 -5
View File
@@ -4,7 +4,7 @@ const Application = require('../../models/application');
const Account = require('../../models/account');
const Webhook = require('../../models/webhook');
const decorate = require('./decorate');
const sysError = require('./error');
const sysError = require('../error');
const preconditions = {
'add': validateAdd,
'update': validateUpdate,
@@ -33,8 +33,11 @@ async function validateAdd(req) {
}
async function validateUpdate(req, sid) {
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.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.body.call_hook && typeof req.body.call_hook !== 'object') {
throw new DbErrorBadRequest('\'call_hook\' must be an object when updating an application');
@@ -45,8 +48,12 @@ async function validateUpdate(req, sid) {
}
async function validateDelete(req, sid) {
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.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');
}
}
const assignedPhoneNumbers = await Application.getForeignKeyReferences('phone_numbers.application_sid', sid);
if (assignedPhoneNumbers > 0) throw new DbErrorUnprocessableRequest('cannot delete application with phone numbers');