Add express-http-to-https

Website/app.js

@@ -1,13 +1,15 @@
 // Dependencies
-const  compression = require('compression')
+const compression = require('compression');
+const redirectToHTTPS = require('express-http-to-https').redirectToHTTPS;
 const fs = require('fs');
 const http = require('http');
 const https = require('https');
 const express = require('express');
 var content = require("./content");
 const app = express();
 
-app.use(compression())
+app.use(redirectToHTTPS());
+app.use(compression());
 
 // Certificate
 const privateKey = fs.readFileSync('/etc/letsencrypt/live/www.bepaysmart.org/privkey.pem', 'utf8');
@@ -32,16 +34,10 @@ app.get("/pagesJSON", function(req, res) {
 
 app.use(express.static("static"));
 
-// Starting both http & https servers
-//const httpServer = http.createServer(app);
-const httpServer = express.createServer();
+// Starting both http & https server
+const httpServer = http.createServer(app);
 const httpsServer = https.createServer(credentials, app);
 
-// redirect everything coming in on port 80 (http) to port 443 (https)
-httpServer.get("*", function (req, res){
-	res.redirect('https://' + req.headers.host + req.url);
-});
-
 httpServer.listen(80, () => {
 	console.log('HTTP Server running on port 80');
 });

package.json

@@ -17,6 +17,7 @@
   },
   "homepage": "https://github.com/BePaySmart/BePaySmart.org/#readme",
   "dependencies": {
-    "express": "^4.17.1"
+    "express": "^4.17.1",
+    "express-http-to-https": "^1.1.4"
   }
 }