mirror of
https://github.com/jambonz/jambonz-api-server.git
synced 2025-12-19 05:47:46 +00:00
fixed API server crash when admin query voip-carrier (#442)
This commit is contained in:
@@ -74,11 +74,15 @@ decorate(router, VoipCarrier, ['add', 'update', 'delete'], preconditions);
|
||||
router.get('/', async(req, res) => {
|
||||
const logger = req.app.locals.logger;
|
||||
const {lookupAccountBySid} = req.app.locals;
|
||||
const account = req.user.service_provider_sid ? req.user : await lookupAccountBySid(req.user.account_sid);
|
||||
|
||||
try {
|
||||
const results = req.user.hasAdminAuth ?
|
||||
await VoipCarrier.retrieveAll(req.user.hasAccountAuth ? req.user.account_sid : null) :
|
||||
await VoipCarrier.retrieveAllForSP(account.service_provider_sid);
|
||||
let results = [];
|
||||
if (req.user.hasAdminAuth) {
|
||||
results = await VoipCarrier.retrieveAll(req.user.hasAccountAuth ? req.user.account_sid : null);
|
||||
} else {
|
||||
const account = req.user.service_provider_sid ? req.user : await lookupAccountBySid(req.user.account_sid);
|
||||
results = await VoipCarrier.retrieveAllForSP(account.service_provider_sid);
|
||||
}
|
||||
|
||||
if (req.user.hasScope('account')) {
|
||||
return res.status(200).json(results.filter((c) => c.account_sid === req.user.account_sid || !c.account_sid));
|
||||
|
||||
Reference in New Issue
Block a user