From 028a14fbe08f052cec2685a78a921fe95127cac3 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Jul 2021 23:05:27 -0600
Subject: [PATCH] Added cors to the server & urls

---
 .gitignore      | 6 +++---
 package.json    | 4 +++-
 src/config.json | 4 ++--
 src/server.js   | 7 ++++++-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6b74ef2..5e97c0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 # For Deploy
-src/node_modules/
+package-lock.json
+nodemon.json
+node_modules/
 src/desert/
-src/package-lock.json
-src/nodemon.json
 src/zips/
 src/uploads/
diff --git a/package.json b/package.json
index 3c8e4be..a9c7895 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,10 @@
     "axios": "^0.21.1",
     "bcrypt": "^5.0.1",
     "body-parser": "^1.19.0",
+    "cors": "^2.8.5",
     "express": "^4.17.1",
-    "express-session": "^1.17.1",
+    "express-session": "^1.17.2",
+    "install": "^0.13.0",
     "lodash": "^4.17.21",
     "multer": "^1.4.2",
     "path": "^0.12.7",
diff --git a/src/config.json b/src/config.json
index 2df670c..015c465 100644
--- a/src/config.json
+++ b/src/config.json
@@ -1,7 +1,7 @@
 {
   "Storage": {
-    "DesertPath": "desert/",
-    "UploadPath": "uploads/",
+    "DesertPath": "src/desert/",
+    "UploadPath": "src/uploads/",
     "ZipPath": "zips/",
     "UserStorageSize": 2048,
     "UserStorageUnit": 1048576,
diff --git a/src/server.js b/src/server.js
index db95860..c37779a 100644
--- a/src/server.js
+++ b/src/server.js
@@ -1,6 +1,7 @@
 //Imports
 const express = require("express");
 const session = require("express-session");
+const cors = require("cors");
 const bodyParser = require("body-parser");
 const secret = require("uuid-with-v6").v6;
 //Local Imports
@@ -13,8 +14,12 @@ const app = express();
 const port = Server.Port;
 const debuggingMode = Server.Debug;
 const viewOptions = { beautify: false };
-
+const corsOptions = {
+  origin: "*",
+  optionsSuccessStatus: 200,
+};
 //Set Up Express session and View engine
+app.use(cors(corsOptions));
 app.use(session({ secret: secret(), saveUninitialized: false, resave: false }));
 app.use(bodyParser.json({ limit: Server.BodyLimit })); // parse application/json
 app.use(bodyParser.urlencoded({ limit: Server.BodyLimit, extended: false })); // parse application/x-www-form-urlencoded