Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix server

master
Håvar Aambø Fosstveit 2018-10-22 10:38:08 +02:00
parent 44c6a55608
commit c56928b184
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/server.js
View File

@ -7,6 +7,7 @@ process.title = 'multiparty-meeting-server';
const config = require('./config'); const config = require('./config');
const fs = require('fs'); const fs = require('fs');
const https = require('https'); const https = require('https');
const http = require('http');
const express = require('express'); const express = require('express');
const url = require('url'); const url = require('url');
const Logger = require('./lib/Logger'); const Logger = require('./lib/Logger');
@ -40,6 +41,18 @@ const app = express();
const dataporten = new Dataporten.Setup(config.oauth2); const dataporten = new Dataporten.Setup(config.oauth2);
app.all('*', (req, res, next) =>
{
if(req.headers['x-forwarded-proto'] == 'http')
{
res.redirect('https://' + req.hostname + req.url);
}
else
{
return next();
}
});
app.use(dataporten.passport.initialize()); app.use(dataporten.passport.initialize());
app.use(dataporten.passport.session()); app.use(dataporten.passport.session());
@ -97,13 +110,7 @@ httpsServer.listen(config.listeningPort, '0.0.0.0', () =>
logger.info('Server running on port: ', config.listeningPort); logger.info('Server running on port: ', config.listeningPort);
}); });
const httpServer = express.createServer(); const httpServer = http.createServer(app);
// set up a route to redirect http to https
http.get('*', (req, res) =>
{
res.redirect('https://' + req.headers.host + req.url);
})
httpServer.listen(config.listeningRedirectPort, '0.0.0.0', () => httpServer.listen(config.listeningRedirectPort, '0.0.0.0', () =>
{ {