Merge pull request #416 from FAIMS/upgrade-passport

Upgrade passport to 0.7.0

package.json

@@ -40,7 +40,7 @@
     "nodemailer": "^6.9.9",
     "nyc": "^15.1.0",
     "oauth": "0.10.0",
-    "passport": "0.5.3",
+    "passport": "^0.7.0",
     "passport-google-oauth20": "2.0.0",
     "passport-local": "^1.0.0",
     "passport-oauth2": "1.7.0",
@@ -67,7 +67,7 @@
     "@types/multer": "^1.4.7",
     "@types/node": "20.11.19",
     "@types/nodemailer": "^6.4.13",
-    "@types/passport": "1.0.7",
+    "@types/passport": "^1.0.16",
     "@types/passport-google-oauth20": "2.0.13",
     "@types/passport-local": "^1.0.35",
     "@types/passport-oauth2": "1.4.15",

src/core.ts

@@ -71,6 +71,25 @@ app.use(
     maxAge: 24 * 60 * 60 * 1000 * 365, // BBS 20220831 changed to 1 year
   })
 );
+// https://github.com/jaredhanson/passport/issues/904
+// register regenerate & save after the cookieSession middleware initialization
+// fix for bug in passport 0.7.0 and compatibility with cookie-session
+app.use((request, response, next) => {
+  if (request.session && !request.session.regenerate) {
+    request.session.regenerate = cb => {
+      if (cb) cb('');
+      return request.session;
+    };
+  }
+  if (request.session && !request.session.save) {
+    request.session.save = cb => {
+      if (cb) cb('');
+      return request.session;
+    };
+  }
+  next();
+});
+
 app.use(express.urlencoded({extended: true}));
 // allow large JSON objects to be posted
 app.use(express.json({limit: '200mb'}));

src/couchdb/notebooks.ts

@@ -846,7 +846,6 @@ export const streamNotebookFilesAsZip = async (
               }
               const stream = Stream.Readable.from(chunks);
               const filename = generateFilename(file, key, hrid, fileNames);
-              console.log('adding to zip: ', filename);
               fileNames.push(filename);
               await archive.append(stream, {
                 name: filename,

src/routes.ts

@@ -233,9 +233,13 @@ app.get('/', async (req, res) => {
   }
 });
 
-app.get('/logout/', (req, res) => {
+app.get('/logout/', (req, res, next) => {
   if (req.user) {
-    req.logout();
+    req.logout(err => {
+      if (err) {
+        return next(err);
+      }
+    });
   }
   res.redirect('/');
 });