From 1ec02637eda3551641b753b176a95ce4251d6e27 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 1 Sep 2022 19:41:55 +0200
Subject: [PATCH] npm: Update passport

Using promisification since the logout function is async now:
https://github.com/jaredhanson/passport/issues/929
---
 index.js          |  5 +++--
 package-lock.json | 41 ++++++++++++++++++++++++++++++++---------
 package.json      |  3 ++-
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/index.js b/index.js
index 34fa7c7..eacaf75 100644
--- a/index.js
+++ b/index.js
@@ -2,6 +2,7 @@ import express from 'express';
 import path from 'path';
 import url from 'url';
 import * as db from './db.js';
+import pify from 'pify';
 
 import passport from 'passport';
 import PassportLocal from 'passport-local';
@@ -585,8 +586,8 @@ router.post('/login', passport.authenticate('local', {successRedirect: '/', fail
 	return res.render('login', {identity: req.user, values: req.body});
 });
 
-router.get('/logout', function(req, res) {
-	req.logout();
+router.get('/logout', async function(req, res) {
+	await pify(req.logout.bind(req))();
 	res.redirect('/');
 });
 
diff --git a/package-lock.json b/package-lock.json
index 818364b..988d5c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,9 +26,10 @@
 				"moment": "^2.24.0",
 				"morgan": "^1.9.1",
 				"neat-csv": "^7.0.0",
-				"passport": "^0.4.0",
+				"passport": "^0.6.0",
 				"passport-local": "^1.0.0",
 				"pg": "^8.4.0",
+				"pify": "^6.0.0",
 				"sanitizer": "^0.1.3",
 				"serve-favicon": "^2.5.0",
 				"serve-static": "^1.14.1",
@@ -974,15 +975,20 @@
 			}
 		},
 		"node_modules/passport": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/passport/-/passport-0.4.1.tgz",
-			"integrity": "sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==",
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz",
+			"integrity": "sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==",
 			"dependencies": {
 				"passport-strategy": "1.x.x",
-				"pause": "0.0.1"
+				"pause": "0.0.1",
+				"utils-merge": "^1.0.1"
 			},
 			"engines": {
 				"node": ">= 0.4.0"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/jaredhanson"
 			}
 		},
 		"node_modules/passport-local": {
@@ -1096,6 +1102,17 @@
 				"split2": "^4.1.0"
 			}
 		},
+		"node_modules/pify": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-6.0.0.tgz",
+			"integrity": "sha512-eDlMwqmYtd+rZMU6rCL05NT47Desr/jjfPkBPyqCg8PAyqbt+wxFLz1EQ5XvsfLFNlUEFmBj2FkNUvGF9BJLkQ==",
+			"engines": {
+				"node": ">=14.16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/postgres-array": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
@@ -2183,12 +2200,13 @@
 			"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
 		},
 		"passport": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/passport/-/passport-0.4.1.tgz",
-			"integrity": "sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==",
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz",
+			"integrity": "sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==",
 			"requires": {
 				"passport-strategy": "1.x.x",
-				"pause": "0.0.1"
+				"pause": "0.0.1",
+				"utils-merge": "^1.0.1"
 			}
 		},
 		"passport-local": {
@@ -2274,6 +2292,11 @@
 				"split2": "^4.1.0"
 			}
 		},
+		"pify": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-6.0.0.tgz",
+			"integrity": "sha512-eDlMwqmYtd+rZMU6rCL05NT47Desr/jjfPkBPyqCg8PAyqbt+wxFLz1EQ5XvsfLFNlUEFmBj2FkNUvGF9BJLkQ=="
+		},
 		"postgres-array": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
diff --git a/package.json b/package.json
index 54beb47..d545761 100644
--- a/package.json
+++ b/package.json
@@ -20,9 +20,10 @@
 		"moment": "^2.24.0",
 		"morgan": "^1.9.1",
 		"neat-csv": "^7.0.0",
-		"passport": "^0.4.0",
+		"passport": "^0.6.0",
 		"passport-local": "^1.0.0",
 		"pg": "^8.4.0",
+		"pify": "^6.0.0",
 		"sanitizer": "^0.1.3",
 		"serve-favicon": "^2.5.0",
 		"serve-static": "^1.14.1",