add HTTPS redirect and remove unused deps

3 files changed, 23 insertions, 34 deletions

diff --git a/package-lock.json b/package-lock.json
index 8c633c4..3280246 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,9 +14,7 @@
         "dotenv": "^16.0.0",
         "ejs": "^3.1.6",
         "express": "^4.17.3",
-        "firebase-admin": "^10.0.2",
-        "fs": "^0.0.1-security",
-        "https": "^1.0.0"
+        "firebase-admin": "^10.0.2"
       },
       "devDependencies": {
         "nodemon": "^2.0.15"
@@ -1341,11 +1339,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/fs": {
-      "version": "0.0.1-security",
-      "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
-      "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ="
-    },
     "node_modules/fsevents": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
@@ -1633,11 +1626,6 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "optional": true
     },
-    "node_modules/https": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https/-/https-1.0.0.tgz",
-      "integrity": "sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q="
-    },
     "node_modules/https-proxy-agent": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
@@ -4412,11 +4400,6 @@
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
     },
-    "fs": {
-      "version": "0.0.1-security",
-      "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
-      "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ="
-    },
     "fsevents": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
@@ -4637,11 +4620,6 @@
         }
       }
     },
-    "https": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https/-/https-1.0.0.tgz",
-      "integrity": "sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q="
-    },
     "https-proxy-agent": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
diff --git a/package.json b/package.json
index d3033c1..1cf3b0c 100644
--- a/package.json
+++ b/package.json
@@ -23,9 +23,7 @@
     "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "express": "^4.17.3",
-    "firebase-admin": "^10.0.2",
-    "fs": "^0.0.1-security",
-    "https": "^1.0.0"
+    "firebase-admin": "^10.0.2"
   },
   "devDependencies": {
     "nodemon": "^2.0.15"
diff --git a/server.js b/server.js
index cb0896f..de34fce 100644
--- a/server.js
+++ b/server.js
@@ -8,22 +8,35 @@ const routes = require("./routes");
 
 // Create the server
 const app = express();
-
+app.use(function (req, res, next) {
+  if (
+    req.get("X-Forwarded-Proto") === "http" &&
+    !["localhost", "127.0.0.1"].includes(
+      req.get("X-Forwarded-Host")?.split(":")[0] ?? ""
+    )
+  ) {
+    res.redirect("https://" + req.headers.host + req.url);
+  } else {
+    next();
+  }
+});
 // Set the port
 const port = process.env.PORT || 3000;
 // Set the middleware
 app.use(cors({ origin: true }));
 app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({
-  extended: true
-}));
+app.use(
+  bodyParser.urlencoded({
+    extended: true,
+  })
+);
 app.use("/static", express.static(__dirname + "/static"));
-app.use(express.static(__dirname + '/public'));
+app.use(express.static(__dirname + "/public"));
 app.use(routes);
 
-app.set('views', __dirname + '/public/views');
-app.engine('html', require('ejs').renderFile);
-app.set('view engine', 'html');
+app.set("views", __dirname + "/public/views");
+app.engine("html", require("ejs").renderFile);
+app.set("view engine", "html");
 
 // Start the server
 app.listen(port, () => {