D2189.id5505.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2189.id5505.diff
View Options

	diff --git a/app.js b/app.js
	--- a/app.js
	+++ b/app.js
	@@ -20,4 +20,5 @@

	module.exports = app;

	-app.use('/', require('./routes'));
	+const api_entry_point = process.env.API_ENTRY_POINT \|\| '/datasources';
	+app.use(api_entry_point, require('./routes'));
	diff --git a/bin/www b/bin/www
	old mode 100755
	new mode 100644
	diff --git a/routes.js b/routes.js
	--- a/routes.js
	+++ b/routes.js
	@@ -27,7 +27,7 @@
	return datasources.map(function (item) {
	return {
	"description": item.description,
	- "URL": base_url + item.url,
	+ "URL": base_url + "/" + item.url,
	};
	});
	}
	@@ -41,7 +41,7 @@
	(protocol === "https" && port !== 443);
	}

	-function getUrl(req) {
	+function getServerUrl(req) {
	const port = app.get("port");
	let url = req.protocol + "://" + req.hostname;

	@@ -49,19 +49,18 @@
	url += ":" + port;
	}

	- url += req.url;
	-
	return url;
	}

	-router.get('/', function(req, res) {
	- let url = getUrl(req);
	+router.get("/", function(req, res) {
	+ const api_entry_point = process.env.API_ENTRY_POINT \|\| '/datasources';
	+ const url = getServerUrl(req) + api_entry_point;

	res.send(JSON.stringify(formatDatasources(url)));
	});

	datasources.forEach(function (datasource) {
	- router.get('/' + datasource.url, function (req, res) {
	+ router.get("/" + datasource.url, function (req, res) {
	require("./controllers/" + datasource.controller)
	.get(req, res);
	});