Merge #246

246: Revert "Update passport to 0.6.0" r=aragilar a=aragilar

This reverts commit 13ced8b. This is needed as 0.6.0 is broken, and needs a fix to how session handling works. This is covered in
jaredhanson/passport#904

Co-authored-by: James Tocknell <aragilar@gmail.com>

package.json

@@ -24,7 +24,7 @@
     "@types/jsonwebtoken": "8.5.9",
     "@types/node": "18.7.23",
     "@types/nodemailer": "6.4.5",
-    "@types/passport": "1.0.11",
+    "@types/passport": "1.0.7",
     "@types/passport-google-oauth20": "2.0.11",
     "@types/passport-oauth2": "1.4.11",
     "@types/pouchdb": "6.4.0",
@@ -45,7 +45,7 @@
     "jsonwebtoken": "8.5.1",
     "nodemailer": "6.7.8",
     "oauth": "0.10.0",
-    "passport": "0.6.0",
+    "passport": "0.5.3",
     "passport-google-oauth20": "2.0.0",
     "passport-oauth2": "1.6.1",
     "pouchdb": "7.3.0",
@@ -57,6 +57,7 @@
     "uuid": "9.0.0"
   },
   "devDependencies": {
+    "@types/expect": "^24.3.0",
     "@types/mocha": "^10.0.0",
     "dotenv": "^16.0.2",
     "env-cmd": "^10.1.0",

src/routes.ts

@@ -227,12 +227,9 @@ app.get('/', async (req, res) => {
 
 app.get('/logout/', (req, res) => {
   if (req.user) {
-    req.logout(() => {
-      res.redirect('/');
-    });
-  } else {
-    res.redirect('/');
+    req.logout();
   }
+  res.redirect('/');
 });
 
 app.get('/send-token/', (req, res) => {