Merge pull request #71 from chrescobar/test

test -> main (v0.2.11 upstream)

Author: chrescobar

app.js

@@ -36,6 +36,20 @@ app.use(favicon(path.join(__dirname, '/public/favicon.ico')));
 app.use(logger('dev'));
 app.use(cookieParser(config.get('cookieSecret')));
 
+const proxyConfig = config.get('proxyConfig');
+if (proxyConfig) {
+  const proxy = require("express-http-proxy");
+  var prox;
+
+  for (const prox of proxyConfig) {
+    console.log(prox);
+    app.use(prox.local, proxy(prox.site, {
+      proxyReqPathResolver: req => req.originalUrl.replace(prox.local, ""),
+      https: true
+    }));
+  }
+}
+
 app.use(function (req, res, next) {
   // console.log("Config.production: ", config.production);
   // console.log("Session Data: ", req.session);
@@ -52,6 +66,7 @@ app.use(function (req, res, next) {
     probModelSeedServiceURL: config.get('probModelSeedServiceURL'), // for dashboard
     shockServiceURL: config.get('shockServiceURL'), // for dashboard
     workspaceServiceURL: config.get('workspaceServiceURL'),
+    workspaceDownloadServiceURL: config.get('workspaceDownloadServiceURL'),
     appBaseURL: config.get('appBaseURL'),
     appServiceURL: config.get('appServiceURL'),
     dataServiceURL: config.get('dataServiceURL'),
@@ -66,6 +81,8 @@ app.use(function (req, res, next) {
     jiraLabel: config.get('jiraLabel'),
     appVersion: packageJSON.version,
     userServiceURL: config.get('userServiceURL'),
+    copilotApiURL: config.get('copilotApiURL'),
+    copilotDbURL: config.get('copilotDbURL'),
     localStorageCheckInterval: config.get('localStorageCheckInterval')
   };
   // console.log("Application Options: ", req.applicationOptions);

bin/p3-web

@@ -1,13 +1,31 @@
 #!/usr/bin/env node
+
+const https = require('https');
+const fs = require('fs');
+
 var debug = require('debug')('p3-web');
 var app = require('../app');
 var conf = require('../config');
 
 debug('Launching p3-web...');
 
-app.set('port', conf.get('http_port') || 7032);
+app.set('port', conf.get('http_port') || 3000);
 
-var server = app.listen(app.get('port'), function () {
-  debug('Express server listening on port ' + server.address().port);
-});
+const sslConfig = conf.get('sslConfig');
+var server;
 
+if (sslConfig) {
+  // Read SSL cert and key
+  const sslOptions = {
+    key: fs.readFileSync(sslConfig.ssl_key),
+    cert: fs.readFileSync(sslConfig.ssl_cert)
+  };
+  server = https.createServer(sslOptions, app).listen(app.get('port'), function () {
+    debug('Express server listening on SSL port ' + server.address().port);
+  });
+}
+else {
+  server = app.listen(app.get('port'), function () {
+    debug('Express server listening on port ' + server.address().port);
+  });
+}

config-dev.js

@@ -19,7 +19,7 @@ const defaults = {
   'shockServiceURL': 'https://p3.theseed.org/services/shock_api', // only for status dashboard
   dataServiceURL: 'https://p3.theseed.org/services/data_api',
   accountURL: 'http://user.patric.local:3002/',
-  docsServiceURL: 'https://bv-brc.org/docs/',
+  docsServiceURL: 'https://www.dxkb.org/docs/',
   userServiceURL: '',
   localStorageCheckInterval: 86400,
   enableDevTools: false,

config-test.js

@@ -19,7 +19,7 @@ const defaults = {
   'shockServiceURL': 'https://p3.theseed.org/services/shock_api', // only for status dashboard
   dataServiceURL: 'https://p3.theseed.org/services/data_api',
   accountURL: 'http://user.patric.local:3002/',
-  docsServiceURL: 'https://bv-brc.org/docs/',
+  docsServiceURL: 'https://www.dxkb.org/docs/',
   userServiceURL: '',
   localStorageCheckInterval: 86400,
   enableDevTools: false,

config.js

@@ -19,8 +19,10 @@ const defaults = {
   'shockServiceURL': 'https://p3.theseed.org/services/shock_api', // only for status dashboard
   dataServiceURL: 'https://p3.theseed.org/services/data_api',
   accountURL: 'http://user.patric.local:3002/',
-  docsServiceURL: 'https://dxkb.org/docs/',
-  userServiceURL: 'https://user.patricbrc.org',
+  docsServiceURL: 'https://www.dxkb.org/docs/',
+  userServiceURL: '',
+  'copilotApiURL': 'https://www.bv-brc.org/services/copilot-api/copilot-api/chatbrc',
+  'copilotDbURL': 'https://www.bv-brc.org/services/copilot-api/copilot-api/db',
   localStorageCheckInterval: 86400,
   enableDevTools: false,
   reportProblemEmailAddress: 'help@bv-brc.org',