Added reverse proxy configuration

pull/60/head v0.2.6
ShahanaFarooqui 5 years ago
parent 7d75f8e26e
commit e782b13cee

@ -8,5 +8,5 @@
<link rel="stylesheet" href="styles.7e944f30e4357f41ed14.css"></head> <link rel="stylesheet" href="styles.7e944f30e4357f41ed14.css"></head>
<body> <body>
<rtl-app></rtl-app> <rtl-app></rtl-app>
<script type="text/javascript" src="runtime.ec2944dd8b20ec099bf3.js"></script><script type="text/javascript" src="polyfills.418928a701f2040ada02.js"></script><script type="text/javascript" src="main.b42b628ca80a5ffd43ce.js"></script></body> <script type="text/javascript" src="runtime.ec2944dd8b20ec099bf3.js"></script><script type="text/javascript" src="polyfills.418928a701f2040ada02.js"></script><script type="text/javascript" src="main.42dcb4b10e822b3edf67.js"></script></body>
</html> </html>

File diff suppressed because one or more lines are too long

@ -2,6 +2,7 @@ const path = require("path");
const express = require("express"); const express = require("express");
const bodyParser = require("body-parser"); const bodyParser = require("body-parser");
const app = express(); const app = express();
const common = require("./common");
//Declare all Routes here //Declare all Routes here
const authenticateRoutes = require("./routes/authenticate"); const authenticateRoutes = require("./routes/authenticate");
@ -22,7 +23,7 @@ const switchRoutes = require("./routes/switch");
app.use(bodyParser.json()); app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ extended: false })); app.use(bodyParser.urlencoded({ extended: false }));
app.use("/", express.static(path.join(__dirname, "angular"))); app.use(common.ng_api_root, express.static(path.join(__dirname, "angular")));
// CORS fix, Only required for developement due to separate backend and frontend servers // CORS fix, Only required for developement due to separate backend and frontend servers
app.use((req, res, next) => { app.use((req, res, next) => {

@ -14,6 +14,8 @@ common.rtl_sso = 0;
common.rtl_cookie_path = ''; common.rtl_cookie_path = '';
common.logout_redirect_link = '/login'; common.logout_redirect_link = '/login';
common.cookie = ''; common.cookie = '';
common.reverse_proxy = 0;
common.ng_api_root = '/rtl/';
common.convertToBTC = (num) => { common.convertToBTC = (num) => {
return (num / 100000000).toFixed(6); return (num / 100000000).toFixed(6);

@ -24,7 +24,8 @@ var defaultConfig = {
lndServerUrl: 'https://localhost:8080/v1', lndServerUrl: 'https://localhost:8080/v1',
bitcoindConfigPath: '', bitcoindConfigPath: '',
enableLogging: false, enableLogging: false,
port: 3000 port: 3000,
reverseProxy: 0
}, },
SSO: { SSO: {
rtlSSO: 0, rtlSSO: 0,
@ -144,12 +145,22 @@ const validateConfigFile = (config) => {
} }
} }
} }
if (undefined !== process.env.PORT) {
if (undefined !== process.env.PORT) {
common.port = normalizePort(process.env.PORT); common.port = normalizePort(process.env.PORT);
} else if (undefined !== config.Settings.port) { } else if (undefined !== config.Settings.port) {
common.port = normalizePort(config.Settings.port); common.port = normalizePort(config.Settings.port);
} }
setSSOParams(config);
if (undefined !== process.env.REVERSE_PROXY) {
common.reverse_proxy = process.env.REVERSE_PROXY;
common.ng_api_root = (common.reverse_proxy == 1) ? '/' : '/rtl/';
} else if (undefined !== config.Settings.reverseProxy) {
common.reverse_proxy = config.Settings.reverseProxy;
common.ng_api_root = (common.reverse_proxy == 1) ? '/' : '/rtl/';
}
setSSOParams(config);
if (errMsg !== '') { if (errMsg !== '') {
throw new Error(errMsg); throw new Error(errMsg);
} }

2
package-lock.json generated

@ -1,6 +1,6 @@
{ {
"name": "rtl", "name": "rtl",
"version": "0.2.5-beta", "version": "0.2.6-beta",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

@ -1,6 +1,6 @@
{ {
"name": "rtl", "name": "rtl",
"version": "0.2.5-beta", "version": "0.2.6-beta",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",

Loading…
Cancel
Save