Merge pull request #329 from hackmcgill/develop

Merge into Master
hackmcgill · Feb 2, 2019 · 6982db6 · 6982db6
2 parents 1a4c43b + 85972bb
commit 6982db6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/app.js b/app.js
@@ -61,7 +61,7 @@ app.use(cookieSession({
     name: "session",
     keys: [process.env.COOKIE_SECRET],
     // Cookie Options
-    maxAge: 60 * 60 * 1000 //Logged in for 1 hour
+    maxAge: 48 * 60 * 60 * 1000 //Logged in for 48 hours
 }));
 app.use(passport.initialize());
 app.use(passport.session()); //persistent login session

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
         "handlebars": "^4.0.12",
         "jsonwebtoken": "^8.1.0",
         "memory-cache": "^0.2.0",
-        "mongoose": "^5.4.8",
+        "mongoose": "^5.4.9",
         "multer": "^1.3.1",
         "passport": "^0.4.0",
         "passport-local": "^1.0.0",
@@ -39,7 +39,7 @@
         "@types/express": "^4.16.1",
         "@types/google-cloud__storage": "^1.7.2",
         "@types/mongodb": "^3.1.19",
-        "@types/mongoose": "^5.3.10",
+        "@types/mongoose": "^5.3.12",
         "@types/multer": "^1.3.7",
         "apidoc": "^0.17.7",
         "chai-http": "^4.2.1",