feat: allow interstitial callbacks to be async functions [breaking]

This change is breaking in the sense that if you have written
interstitial callbacks before that are async functions _with_ a
callback, those are no longer allowed. You will not need to call
next() as that argument will no longer be passed in to async
functions.

src/controllers/authentication.js

@@ -140,7 +140,7 @@ authenticationController.registerComplete = function (req, res, next) {
 	plugins.hooks.fire('filter:register.interstitial', {
 		userData: req.session.registration,
 		interstitials: [],
-	}, function (err, data) {
+	}, async (err, data) => {
 		if (err) {
 			return next(err);
 		}
@@ -148,12 +148,7 @@ authenticationController.registerComplete = function (req, res, next) {
 		var callbacks = data.interstitials.reduce(function (memo, cur) {
 			if (cur.hasOwnProperty('callback') && typeof cur.callback === 'function') {
 				req.body.files = req.files;
-				memo.push(function (next) {
+				memo.push(cur.callback && cur.callback.constructor && cur.callback.constructor.name === 'AsyncFunction' ? cur.callback : util.promisify(cur.callback));
-					cur.callback(req.session.registration, req.body, function (err) {
-						// Pass error as second argument so all callbacks are executed
-						next(null, err);
-					});
-				});
 			}
 
 			return memo;
@@ -168,6 +163,7 @@ authenticationController.registerComplete = function (req, res, next) {
 			if (!err && data && data.message) {
 				return res.redirect(nconf.get('relative_path') + '/?register=' + encodeURIComponent(data.message));
 			}
+
 			if (req.session.returnTo) {
 				res.redirect(nconf.get('relative_path') + req.session.returnTo);
 			} else {
@@ -175,36 +171,34 @@ authenticationController.registerComplete = function (req, res, next) {
 			}
 		};
 
-		async.parallel(callbacks, async function (_blank, err) {
+		const results = await Promise.allSettled(callbacks.map(async (cb) => {
-			if (err.length) {
+			await cb(req.session.registration, req.body);
-				err = err.filter(Boolean).map(err => err.message);
+		}));
-			}
+		const errors = results.map(result => result.reason && result.reason.message).filter(Boolean);
-
+		if (errors.length) {
-			if (err.length) {
+			req.flash('errors', errors);
-				req.flash('errors', err);
+			return res.redirect(nconf.get('relative_path') + '/register/complete');
-				return res.redirect(nconf.get('relative_path') + '/register/complete');
+		}
-			}
 
-			if (req.session.registration.register === true) {
+		if (req.session.registration.register === true) {
-				res.locals.processLogin = true;
+			res.locals.processLogin = true;
-				registerAndLoginUserCallback(req, res, req.session.registration, done);
+			registerAndLoginUserCallback(req, res, req.session.registration, done);
-			} else {
+		} else {
-				// Update user hash, clear registration data in session
+			// Update user hash, clear registration data in session
-				const payload = req.session.registration;
+			const payload = req.session.registration;
-				const uid = payload.uid;
+			const uid = payload.uid;
-				delete payload.uid;
+			delete payload.uid;
-				delete payload.returnTo;
+			delete payload.returnTo;
-
+
-				Object.keys(payload).forEach((prop) => {
+			Object.keys(payload).forEach((prop) => {
-					if (typeof payload[prop] === 'boolean') {
+				if (typeof payload[prop] === 'boolean') {
-						payload[prop] = payload[prop] ? 1 : 0;
+					payload[prop] = payload[prop] ? 1 : 0;
-					}
+				}
-				});
+			});
 
-				await user.setUserFields(uid, payload);
+			await user.setUserFields(uid, payload);
-				done();
+			done();
-			}
+		}
-		});
 	});
 };