mirror of
https://github.com/jambonz/jambonz-api-server.git
synced 2026-11-02 01:24:52 +00:00
Feat/app env vars (#430)
* initial changes for env var support
* WIP
* Update applications.js
* JSON stringify before encrypting
* use call_hook.url
* env vars working
GET /v1/AppEnv?url=[URL] to trigger options request to URL and return app-schema
POST /v1/Applications with {env_vars: [OBJECT} to create app with env vars
PUT /v1/Applications/[SID] with {env_vars: [OBJECT} to change env vars
GET returns env vars
POST and PUT will also trigger an OPTIONS request to the call_hook url to get schema and then validate the env_vars against it
* update appenv cannot finish request.
* wip
* wip
* wip
* wip
---------
Co-authored-by: Dave Horton <daveh@beachdognet.com>
Co-authored-by: Quan HL <quan.luuhoang8@gmail.com>
Co-authored-by: Hoan Luu Huu <110280845+xquanluu@users.noreply.github.com>
This commit is contained in:
11 files changed
+3750
-4624
No files matched your search
@@ -0,0 +1,47 @@
|
||||
const router = require('express').Router();
|
||||
const sysError = require('../error');
|
||||
const { fetchAppEnvSchema, validateAppEnvSchema } = require('../../utils/appenv_utils');
|
||||
|
||||
const URL = require('url').URL;
|
||||
|
||||
const isValidUrl = (s) => {
|
||||
const protocols = ['https:', 'http:', 'ws:', 'wss:'];
|
||||
try {
|
||||
const url = new URL(s);
|
||||
if (protocols.includes(url.protocol)) {
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
return false;
|
||||
}
|
||||
} catch (err) {
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
/* get appenv schema for endpoint */
|
||||
router.get('/', async(req, res) => {
|
||||
const logger = req.app.locals.logger;
|
||||
const url = req.query.url;
|
||||
if (!isValidUrl(url)) {
|
||||
sysError(logger, res, 'Invalid URL');
|
||||
} else {
|
||||
try {
|
||||
const appenv = await fetchAppEnvSchema(logger, url);
|
||||
if (appenv && validateAppEnvSchema(appenv)) {
|
||||
return res.status(200).json(appenv);
|
||||
} else if (appenv) {
|
||||
return res.status(400).json({
|
||||
msg: 'Invalid appenv schema',
|
||||
});
|
||||
} else {
|
||||
return res.status(204).end(); //No appenv returned from url, normal scenario
|
||||
}
|
||||
}
|
||||
catch (err) {
|
||||
sysError(logger, res, err);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
@@ -12,7 +12,8 @@ const preconditions = {
|
||||
'add': validateAdd,
|
||||
'update': validateUpdate
|
||||
};
|
||||
|
||||
const { fetchAppEnvSchema, validateAppEnvData } = require('../../utils/appenv_utils');
|
||||
const {decrypt, encrypt} = require('../../utils/encrypt-decrypt');
|
||||
|
||||
const validateRequest = async(req, account_sid) => {
|
||||
try {
|
||||
@@ -151,6 +152,16 @@ router.post('/', async(req, res) => {
|
||||
throw new DbErrorBadRequest(err);
|
||||
}
|
||||
}
|
||||
// validate env_vars data if required
|
||||
if (obj['env_vars']) {
|
||||
const appenvschema = await fetchAppEnvSchema(logger, req.body.call_hook.url);
|
||||
const errors = await validateAppEnvData(appenvschema, obj['env_vars']);
|
||||
if (errors) {
|
||||
throw new DbErrorBadRequest(errors);
|
||||
} else {
|
||||
obj['env_vars'] = encrypt(JSON.stringify(obj['env_vars']));
|
||||
}
|
||||
}
|
||||
|
||||
const uuid = await Application.make(obj);
|
||||
res.status(201).json({sid: uuid});
|
||||
@@ -167,7 +178,15 @@ router.get('/', async(req, res) => {
|
||||
const account_sid = req.user.hasAccountAuth ? req.user.account_sid : null;
|
||||
const name = req.query.name;
|
||||
const results = await Application.retrieveAll(service_provider_sid, account_sid, name);
|
||||
res.status(200).json(results);
|
||||
const ret = results.map((a) => {
|
||||
if (a.env_vars) {
|
||||
a.env_vars = JSON.parse(decrypt(a.env_vars));
|
||||
return a;
|
||||
} else {
|
||||
return a;
|
||||
}
|
||||
});
|
||||
res.status(200).json(ret);
|
||||
} catch (err) {
|
||||
sysError(logger, res, err);
|
||||
}
|
||||
@@ -183,6 +202,9 @@ router.get('/:sid', async(req, res) => {
|
||||
const results = await Application.retrieve(application_sid, service_provider_sid, account_sid);
|
||||
if (results.length === 0) return res.status(404).end();
|
||||
await validateRequest(req, results[0].account_sid);
|
||||
if (results[0].env_vars) {
|
||||
results[0].env_vars = JSON.parse(decrypt(results[0].env_vars));
|
||||
}
|
||||
return res.status(200).json(results[0]);
|
||||
}
|
||||
catch (err) {
|
||||
@@ -237,6 +259,8 @@ router.put('/:sid', async(req, res) => {
|
||||
try {
|
||||
const sid = parseApplicationSid(req);
|
||||
await validateUpdate(req, sid);
|
||||
const service_provider_sid = req.user.hasServiceProviderAuth ? req.user.service_provider_sid : null;
|
||||
const account_sid = req.user.hasAccountAuth ? req.user.account_sid : null;
|
||||
|
||||
// create webhooks if provided
|
||||
const obj = Object.assign({}, req.body);
|
||||
@@ -268,6 +292,19 @@ router.put('/:sid', async(req, res) => {
|
||||
}
|
||||
}
|
||||
|
||||
// validate env_vars data if required
|
||||
if (obj['env_vars']) {
|
||||
const applications = await Application.retrieve(sid, service_provider_sid, account_sid);
|
||||
const call_hook_url = req.body.call_hook ? req.body.call_hook : applications[0].call_hook.url;
|
||||
const appenvschema = await fetchAppEnvSchema(logger, call_hook_url);
|
||||
const errors = await validateAppEnvData(appenvschema, obj['env_vars']);
|
||||
if (errors) {
|
||||
throw new DbErrorBadRequest(errors);
|
||||
} else {
|
||||
obj['env_vars'] = encrypt(JSON.stringify(obj['env_vars']));
|
||||
}
|
||||
}
|
||||
|
||||
const rowsAffected = await Application.update(sid, obj);
|
||||
if (rowsAffected === 0) {
|
||||
return res.status(404).end();
|
||||
|
||||
@@ -39,6 +39,7 @@ 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('/AppEnv', require('./appenv'));
|
||||
//api.use('/Products', require('./products'));
|
||||
api.use('/Prices', require('./prices'));
|
||||
api.use('/StripeCustomerId', require('./stripe-customer-id'));
|
||||
|
||||
@@ -821,7 +821,6 @@ router.get('/:sid/test', async(req, res) => {
|
||||
SpeechCredential.ttsTestResult(sid, true);
|
||||
} catch (err) {
|
||||
let reason = err.message;
|
||||
// if error is from bent, let get the body
|
||||
try {
|
||||
reason = await err.text();
|
||||
} catch {}
|
||||
@@ -837,7 +836,6 @@ router.get('/:sid/test', async(req, res) => {
|
||||
SpeechCredential.ttsTestResult(sid, true);
|
||||
} catch (err) {
|
||||
let reason = err.message;
|
||||
// if error is from bent, let get the body
|
||||
try {
|
||||
reason = await err.text();
|
||||
} catch {}
|
||||
|
||||
Reference in new issue
Block a user