Page MenuHomeDevCentral
Files F12239547

No OneTemporary
Actions

View Options

diff --git a/app.js b/app.js
index 54ab147..a8d57fd 100644
--- a/app.js
+++ b/app.js
@@ -1,23 +1,24 @@
/* -------------------------------------------------------------
Nasqueron API - datasources
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Author: Sébastien Santoro aka Dereckson
Licence: BSD-2-Clause
------------------------------------------------------------- */
"use strict";
const express = require('express');
const logger = require('morgan');
const app = express();
app.use(logger('dev', {
skip: function (req, res) {
return res.statusCode < 400;
},
}));
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/routes.js b/routes.js
index 936272a..7bb2db4 100644
--- a/routes.js
+++ b/routes.js
@@ -1,70 +1,69 @@
/* -------------------------------------------------------------
Nasqueron API - datasources
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Author: Sébastien Santoro aka Dereckson
Licence: BSD-2-Clause
------------------------------------------------------------- */
"use strict";
const express = require('express');
const router = express.Router();
const app = require('./app');
/* -------------------------------------------------------------
Datasources
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
const datasources = [
{
- url: "dev/openfire/changelog",
+ url: "/dev/openfire/changelog",
controller: "/dev/openfire/changelog.js",
description: "Openfire changelog",
},
];
function formatDatasources(base_url) {
return datasources.map(function (item) {
return {
"description": item.description,
"URL": base_url + item.url,
};
});
}
/* -------------------------------------------------------------
Routes
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
function isPortRequired(protocol, port) {
return (protocol === "http" && port !== 80) ||
(protocol === "https" && port !== 443);
}
-function getUrl(req) {
+function getServerUrl(req) {
const port = app.get("port");
let url = req.protocol + "://" + req.hostname;
if (isPortRequired(req.protocol, port)) {
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);
});
});
module.exports = router;

File Metadata

Mime Type
text/x-diff
Expires
Sat, Oct 11, 22:28 (1 d, 10 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3064179
Default Alt Text
(3 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator