diff --git a/src/fireedge/src/server/routes/api/2fa/index.js b/src/fireedge/src/server/routes/api/2fa/index.js index 40e55a7e82..9a10cab113 100644 --- a/src/fireedge/src/server/routes/api/2fa/index.js +++ b/src/fireedge/src/server/routes/api/2fa/index.js @@ -14,48 +14,13 @@ * limitations under the License. * * ------------------------------------------------------------------------- */ -const { addFunctionAsRoute, setFunctionRoute } = require('server/utils/server') +const { setApiRoutes } = require('server/utils/server') const { routes: tfaRoutes } = require('./tfa') const { TFA } = require('./string-routes') -const { defaultEmptyFunction } = require('server/utils/constants/defaults') - -const privateRoutes = [] -const publicRoutes = [] - -/** - * Set private routes. - * - * @param {object} routes - object of routes - * @param {string} path - principal route - * @param {Function} action - function of route - */ -const setPrivateRoutes = (routes = {}, path = '', action = defaultEmptyFunction) => { - if (Object.keys(routes).length > 0 && routes.constructor === Object) { - Object.keys(routes).forEach((route) => { - privateRoutes.push( - setFunctionRoute(route, path, - (req, res, next, connection, userId, user) => { - action(req, res, next, routes[route], user, connection) - }) - ) - }) - } -} - -/** - * Add routes. - * - * @returns {Array} routes - */ -const generatePrivateRoutes = () => { - setPrivateRoutes(tfaRoutes, TFA, addFunctionAsRoute) - return privateRoutes -} - const functionRoutes = { - private: generatePrivateRoutes(), - public: publicRoutes + private: setApiRoutes(tfaRoutes, TFA), + public: [] } module.exports = functionRoutes diff --git a/src/fireedge/src/server/routes/api/auth/index.js b/src/fireedge/src/server/routes/api/auth/index.js index b1723da303..21dabcf297 100644 --- a/src/fireedge/src/server/routes/api/auth/index.js +++ b/src/fireedge/src/server/routes/api/auth/index.js @@ -14,46 +14,13 @@ * limitations under the License. * * ------------------------------------------------------------------------- */ -const { addFunctionAsRoute, setFunctionRoute } = require('server/utils/server') +const { setApiRoutes } = require('server/utils/server') const { routes: authRoutes } = require('./auth') const { AUTH } = require('./string-routes') -const privateRoutes = [] -const publicRoutes = [] - -/** - * Set private routes. - * - * @param {object} routes - object of routes - * @param {string} path - principal route - * @param {Function} action - function of route - */ -const setPublicRoutes = (routes = {}, path = '', action = () => undefined) => { - if (Object.keys(routes).length > 0 && routes.constructor === Object) { - Object.keys(routes).forEach((route) => { - publicRoutes.push( - setFunctionRoute(route, path, - (req, res, next, connection, userId, user) => { - action(req, res, next, routes[route], user, connection) - }) - ) - }) - } -} - -/** - * Add routes. - * - * @returns {Array} routes - */ -const generatePublicRoutes = () => { - setPublicRoutes(authRoutes, AUTH, addFunctionAsRoute) - return publicRoutes -} - const functionRoutes = { - private: privateRoutes, - public: generatePublicRoutes() + private: [], + public: setApiRoutes(authRoutes, AUTH) } module.exports = functionRoutes diff --git a/src/fireedge/src/server/routes/api/files/index.js b/src/fireedge/src/server/routes/api/files/index.js index 84edacfa45..c3e31ebc5e 100644 --- a/src/fireedge/src/server/routes/api/files/index.js +++ b/src/fireedge/src/server/routes/api/files/index.js @@ -14,78 +14,13 @@ * limitations under the License. * * ------------------------------------------------------------------------- */ -const { addFunctionAsRoute, setFunctionRoute } = require('server/utils/server') +const { setApiRoutes } = require('server/utils/server') const { privateRoutes: filePrivateRoutes, publicRoutes: filePublicRoutes } = require('./files') const { FILES } = require('./string-routes') -const privateRoutes = [] -const publicRoutes = [] - -/** - * Set private routes. - * - * @param {object} routes - object of routes - * @param {string} path - principal route - * @param {Function} action - function of route - */ -const setPrivateRoutes = (routes = {}, path = '', action = () => undefined) => { - if (Object.keys(routes).length > 0 && routes.constructor === Object) { - Object.keys(routes).forEach((route) => { - privateRoutes.push( - setFunctionRoute(route, path, - (req, res, next, connection, userId, user) => { - action(req, res, next, routes[route], user, connection) - } - ) - ) - }) - } -} - -/** - * Set public routes. - * - * @param {object} routes - object of routes - * @param {string} path - principal route - * @param {Function} action - function of route - */ -const setPublicRoutes = (routes = {}, path = '', action = () => undefined) => { - if (Object.keys(routes).length > 0 && routes.constructor === Object) { - Object.keys(routes).forEach((route) => { - publicRoutes.push( - setFunctionRoute(route, path, - (req, res, next, connection, userId, user) => { - action(req, res, next, routes[route], user, connection) - } - ) - ) - }) - } -} - -/** - * Add routes. - * - * @returns {Array} routes - */ -const generatePrivateRoutes = () => { - setPrivateRoutes(filePrivateRoutes, FILES, addFunctionAsRoute) - return privateRoutes -} - -/** - * Add routes. - * - * @returns {Array} routes - */ -const generatePublicRoutes = () => { - setPublicRoutes(filePublicRoutes, FILES, addFunctionAsRoute) - return publicRoutes -} - const functionRoutes = { - private: generatePrivateRoutes(), - public: generatePublicRoutes() + private: setApiRoutes(filePrivateRoutes, FILES), + public: setApiRoutes(filePublicRoutes, FILES) } module.exports = functionRoutes diff --git a/src/fireedge/src/server/routes/api/marketapp/index.js b/src/fireedge/src/server/routes/api/marketapp/index.js index 9ed3e8bf38..6f767beed4 100644 --- a/src/fireedge/src/server/routes/api/marketapp/index.js +++ b/src/fireedge/src/server/routes/api/marketapp/index.js @@ -14,21 +14,12 @@ * limitations under the License. * * ------------------------------------------------------------------------- */ -const { addFunctionAsRoute, setApiRoutes } = require('server/utils/server') +const { setApiRoutes } = require('server/utils/server') const { routes: marketappRoutes } = require('./marketapp') const { MARKETAPP } = require('./string-routes') -/** - * Add routes. - * - * @returns {Array} routes - */ -const generatePrivateRoutes = () => { - return setApiRoutes(marketappRoutes, MARKETAPP, addFunctionAsRoute) -} - const functionRoutes = { - private: generatePrivateRoutes(), + private: setApiRoutes(marketappRoutes, MARKETAPP), public: [] } diff --git a/src/fireedge/src/server/routes/api/oneflow/index.js b/src/fireedge/src/server/routes/api/oneflow/index.js index 631e4fd77f..b7b314eee6 100644 --- a/src/fireedge/src/server/routes/api/oneflow/index.js +++ b/src/fireedge/src/server/routes/api/oneflow/index.js @@ -14,49 +14,25 @@ * limitations under the License. * * ------------------------------------------------------------------------- */ -const { addFunctionAsRoute, setFunctionRoute } = require('server/utils/server') +const { setApiRoutes } = require('server/utils/server') const { routes: serviceRoutes } = require('./service') const { routes: serviceTemplateRoutes } = require('./service_template') const { SERVICE, SERVICE_TEMPLATE } = require('./string-routes') -const privateRoutes = [] -const publicRoutes = [] - -/** - * Set private routes. - * - * @param {object} methods - object of routes - * @param {string} path - principal route - * @param {Function} action - function of route - */ -const setPrivateRoutes = (methods = {}, path = '', action = () => undefined) => { - if (Object.keys(methods).length > 0 && methods.constructor === Object) { - Object.keys(methods).forEach((method) => { - privateRoutes.push( - setFunctionRoute(method, path, - (req, res, next, connection, userId, user) => { - action(req, res, next, methods[method], user, connection) - }) - ) - }) - } -} - /** * Add routes. * * @returns {Array} routes */ -const generatePrivateRoutes = () => { - setPrivateRoutes(serviceRoutes, SERVICE, addFunctionAsRoute) - setPrivateRoutes(serviceTemplateRoutes, SERVICE_TEMPLATE, addFunctionAsRoute) - return privateRoutes -} +const generatePrivateRoutes = () => [ + ...setApiRoutes(serviceRoutes, SERVICE), + ...setApiRoutes(serviceTemplateRoutes, SERVICE_TEMPLATE) +] const functionRoutes = { private: generatePrivateRoutes(), - public: publicRoutes + public: [] } module.exports = functionRoutes diff --git a/src/fireedge/src/server/routes/api/provision/index.js b/src/fireedge/src/server/routes/api/provision/index.js index c3b6d2cdb2..7773e0d944 100644 --- a/src/fireedge/src/server/routes/api/provision/index.js +++ b/src/fireedge/src/server/routes/api/provision/index.js @@ -14,52 +14,27 @@ * limitations under the License. * * ------------------------------------------------------------------------- */ -const { addFunctionAsRoute, setFunctionRoute } = require('server/utils/server') +const { setApiRoutes } = require('server/utils/server') const { routes: provisionRoutes } = require('./provision') const { routes: provisionTemplateRoutes } = require('./provision_template') const { routes: providerRoutes } = require('./provider') const { PROVIDER, PROVISION, PROVISION_TEMPLATE } = require('./string-routes') -const privateRoutes = [] -const publicRoutes = [] - -/** - * Set private routes. - * - * @param {object} routes - object of routes - * @param {string} path - principal route - * @param {Function} action - function of route - */ -const setPrivateRoutes = (routes = {}, path = '', action = () => undefined) => { - if (Object.keys(routes).length > 0 && routes.constructor === Object) { - Object.keys(routes).forEach((route) => { - privateRoutes.push( - setFunctionRoute(route, path, - (req, res, next, connection, userId, user) => { - action(req, res, next, routes[route], user, connection) - } - ) - ) - }) - } -} - /** * Add routes. * * @returns {Array} routes */ -const generatePrivateRoutes = () => { - setPrivateRoutes(provisionRoutes, PROVISION, addFunctionAsRoute) - setPrivateRoutes(provisionTemplateRoutes, PROVISION_TEMPLATE, addFunctionAsRoute) - setPrivateRoutes(providerRoutes, PROVIDER, addFunctionAsRoute) - return privateRoutes -} +const generatePrivateRoutes = () => [ + ...setApiRoutes(provisionRoutes, PROVISION), + ...setApiRoutes(provisionTemplateRoutes, PROVISION_TEMPLATE), + ...setApiRoutes(providerRoutes, PROVIDER) +] const functionRoutes = { private: generatePrivateRoutes(), - public: publicRoutes + public: [] } module.exports = functionRoutes diff --git a/src/fireedge/src/server/routes/api/sunstone/index.js b/src/fireedge/src/server/routes/api/sunstone/index.js index 6aa2d06e3a..56e39fc5d9 100644 --- a/src/fireedge/src/server/routes/api/sunstone/index.js +++ b/src/fireedge/src/server/routes/api/sunstone/index.js @@ -14,47 +14,14 @@ * limitations under the License. * * ------------------------------------------------------------------------- */ -const { addFunctionAsRoute, setFunctionRoute } = require('server/utils/server') +const { setApiRoutes } = require('server/utils/server') const { routes: sunstoneRoutes } = require('./sunstone') const { SUNSTONE } = require('./string-routes') -const privateRoutes = [] -const publicRoutes = [] - -/** - * Set private routes. - * - * @param {object} methods - object of routes - * @param {string} path - principal route - * @param {Function} action - function of route - */ -const setPrivateRoutes = (methods = {}, path = '', action = () => undefined) => { - if (Object.keys(methods).length > 0 && methods.constructor === Object) { - Object.keys(methods).forEach((method) => { - privateRoutes.push( - setFunctionRoute(method, path, - (req, res, next, connection, userId, user) => { - action(req, res, next, methods[method], user, connection) - }) - ) - }) - } -} - -/** - * Add routes. - * - * @returns {Array} routes - */ -const generatePrivateRoutes = () => { - setPrivateRoutes(sunstoneRoutes, SUNSTONE, addFunctionAsRoute) - return privateRoutes -} - const functionRoutes = { - private: generatePrivateRoutes(), - public: publicRoutes + private: setApiRoutes(sunstoneRoutes, SUNSTONE), + public: [] } module.exports = functionRoutes diff --git a/src/fireedge/src/server/routes/api/vcenter/index.js b/src/fireedge/src/server/routes/api/vcenter/index.js index 6b4c17b2f0..85e2371429 100644 --- a/src/fireedge/src/server/routes/api/vcenter/index.js +++ b/src/fireedge/src/server/routes/api/vcenter/index.js @@ -14,47 +14,13 @@ * limitations under the License. * * ------------------------------------------------------------------------- */ -const { addFunctionAsRoute, setFunctionRoute } = require('server/utils/server') +const { setApiRoutes } = require('server/utils/server') const { routes: vcenterRoutes } = require('./vcenter') const { VCENTER } = require('./string-routes') -const privateRoutes = [] -const publicRoutes = [] - -/** - * Set private routes. - * - * @param {object} routes - object of routes - * @param {string} path - principal route - * @param {Function} action - function of route - */ -const setPrivateRoutes = (routes = {}, path = '', action = () => undefined) => { - if (Object.keys(routes).length > 0 && routes.constructor === Object) { - Object.keys(routes).forEach((route) => { - privateRoutes.push( - setFunctionRoute(route, path, - (req, res, next, connection, userId, user) => { - action(req, res, next, routes[route], user, connection) - } - ) - ) - }) - } -} - -/** - * Add routes. - * - * @returns {Array} routes - */ -const generatePrivateRoutes = () => { - setPrivateRoutes(vcenterRoutes, VCENTER, addFunctionAsRoute) - return privateRoutes -} - const functionRoutes = { - private: generatePrivateRoutes(), - public: publicRoutes + private: setApiRoutes(vcenterRoutes, VCENTER), + public: [] } module.exports = functionRoutes diff --git a/src/fireedge/src/server/routes/api/vm/index.js b/src/fireedge/src/server/routes/api/vm/index.js index 7171d7df8f..c9d936650f 100644 --- a/src/fireedge/src/server/routes/api/vm/index.js +++ b/src/fireedge/src/server/routes/api/vm/index.js @@ -14,47 +14,13 @@ * limitations under the License. * * ------------------------------------------------------------------------- */ -const { addFunctionAsRoute, setFunctionRoute } = require('server/utils/server') +const { setApiRoutes } = require('server/utils/server') const { routes: vmRoutes } = require('./vm') const { VM } = require('./string-routes') -const privateRoutes = [] -const publicRoutes = [] - -/** - * Set private routes. - * - * @param {object} routes - object of routes - * @param {string} path - principal route - * @param {Function} action - function of route - */ -const setPrivateRoutes = (routes = {}, path = '', action = () => undefined) => { - if (Object.keys(routes).length > 0 && routes.constructor === Object) { - Object.keys(routes).forEach((route) => { - privateRoutes.push( - setFunctionRoute(route, path, - (req, res, next, connection, userId, user) => { - action(req, res, next, routes[route], user, connection) - } - ) - ) - }) - } -} - -/** - * Add routes. - * - * @returns {Array} routes - */ -const generatePrivateRoutes = () => { - setPrivateRoutes(vmRoutes, VM, addFunctionAsRoute) - return privateRoutes -} - const functionRoutes = { - private: generatePrivateRoutes(), - public: publicRoutes + private: setApiRoutes(vmRoutes, VM), + public: [] } module.exports = functionRoutes diff --git a/src/fireedge/src/server/routes/api/zendesk/index.js b/src/fireedge/src/server/routes/api/zendesk/index.js index 474bb2df28..42bf66adfd 100644 --- a/src/fireedge/src/server/routes/api/zendesk/index.js +++ b/src/fireedge/src/server/routes/api/zendesk/index.js @@ -14,47 +14,13 @@ * limitations under the License. * * ------------------------------------------------------------------------- */ -const { addFunctionAsRoute, setFunctionRoute } = require('server/utils/server') +const { setApiRoutes } = require('server/utils/server') const { routes: zendeskRoutes } = require('./zendesk') const { ZENDESK } = require('./string-routes') -const privateRoutes = [] -const publicRoutes = [] - -/** - * Set private routes. - * - * @param {object} routes - object of routes - * @param {string} path - principal route - * @param {Function} action - function of route - */ -const setPrivateRoutes = (routes = {}, path = '', action = () => undefined) => { - if (Object.keys(routes).length > 0 && routes.constructor === Object) { - Object.keys(routes).forEach((route) => { - privateRoutes.push( - setFunctionRoute(route, path, - (req, res, next, connection, userId, user) => { - action(req, res, next, routes[route], user, connection) - } - ) - ) - }) - } -} - -/** - * Add routes. - * - * @returns {Array} routes - */ -const generatePrivateRoutes = () => { - setPrivateRoutes(zendeskRoutes, ZENDESK, addFunctionAsRoute) - return privateRoutes -} - const functionRoutes = { - private: generatePrivateRoutes(), - public: publicRoutes + private: setApiRoutes(zendeskRoutes, ZENDESK), + public: [] } module.exports = functionRoutes diff --git a/src/fireedge/src/server/utils/server.js b/src/fireedge/src/server/utils/server.js index 75476b17f2..b93267ecc0 100644 --- a/src/fireedge/src/server/utils/server.js +++ b/src/fireedge/src/server/utils/server.js @@ -78,17 +78,16 @@ const setFunctionRoute = (method, endpoint, action) => ({ * * @param {object} routes - object of routes * @param {string} path - principal route - * @param {Function} action - function of route * @returns {Array} parsed routes */ -const setApiRoutes = (routes = {}, path = '', action = () => undefined) => { +const setApiRoutes = (routes = {}, path = '') => { const rtn = [] if (Object.keys(routes).length > 0 && routes.constructor === Object) { Object.keys(routes).forEach((route) => { rtn.push( setFunctionRoute(route, path, (req, res, next, connection, userId, user) => { - action(req, res, next, routes[route], user, connection) + addFunctionAsRoute(req, res, next, routes[route], user, connection) } ) )