From be4dbe3441de0f63bc6471af569b4b9166c82cf7 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 12 Jan 2022 11:08:34 -0500
Subject: [PATCH] chore: org; merge consecutive await calls into one
 Promise.all

---
 src/user/reset.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/user/reset.js b/src/user/reset.js
index 3f83e3812c..6d9e99dc58 100644
--- a/src/user/reset.js
+++ b/src/user/reset.js
@@ -95,15 +95,18 @@ UserReset.commit = async function (code, password) {
 		await groups.join('verified-users', uid);
 		await groups.leave('unverified-users', uid);
 	}
-	await user.setUserFields(uid, data);
-	await db.deleteObjectField('reset:uid', code);
-	await db.sortedSetRemoveBulk([
-		['reset:issueDate', code],
-		['reset:issueDate:uid', uid],
+
+	await Promise.all([
+		user.setUserFields(uid, data),
+		db.deleteObjectField('reset:uid', code),
+		db.sortedSetRemoveBulk([
+			['reset:issueDate', code],
+			['reset:issueDate:uid', uid],
+		]),
+		user.reset.updateExpiry(uid),
+		user.auth.resetLockout(uid),
+		user.email.expireValidation(uid),
 	]);
-	await user.reset.updateExpiry(uid);
-	await user.auth.resetLockout(uid);
-	await user.email.expireValidation(uid);
 };
 
 UserReset.updateExpiry = async function (uid) {