fix: #8284, parse ToS on register

rewrite intersitials to async/await

src/user/index.js

@@ -231,14 +231,21 @@ User.addInterstitials = function (callback) {
 		hook: 'filter:register.interstitial',
 		method: [
 			// GDPR information collection/processing consent + email consent
-			function (data, callback) {
+			async function (data) {
-				if (!meta.config.gdpr_enabled) {
+				if (!meta.config.gdpr_enabled || (data.userData && data.userData.gdpr_consent)) {
-					return setImmediate(callback, null, data);
+					return data;
 				}
 				if (!data.userData) {
-					return setImmediate(callback, new Error('[[error:invalid-data]]'));
+					throw new Error('[[error:invalid-data]]');
 				}
-				const add = function () {
+
+				if (data.userData.uid) {
+					const consented = await db.getObjectField('user:' + data.userData.uid, 'gdpr_consent');
+					if (parseInt(consented, 10)) {
+						return data;
+					}
+				}
+
 				data.interstitials.push({
 					template: 'partials/gdpr_consent',
 					data: {
@@ -253,40 +260,36 @@ User.addInterstitials = function (callback) {
 						next(userData.gdpr_consent ? null : new Error('[[register:gdpr_consent_denied]]'));
 					},
 				});
-				};
+				return data;
+			},
 
-				if (!data.userData.gdpr_consent) {
+			// Forum Terms of Use
-					if (data.userData.uid) {
+			async function (data) {
-						db.getObjectField('user:' + data.userData.uid, 'gdpr_consent', function (err, consented) {
+				if (!data.userData) {
-							if (err) {
+					throw new Error('[[error:invalid-data]]');
-								return callback(err);
+				}
-							} else if (!parseInt(consented, 10)) {
+				if (!meta.config.termsOfUse || data.userData.acceptTos) {
-								add();
+					// no ToS or ToS accepted, nothing to do
+					return data;
 				}
 
-							callback(null, data);
+				if (data.userData.uid) {
-						});
+					const accepted = await db.getObjectField('user:' + data.userData.uid, 'acceptTos');
-					} else {
+					if (parseInt(accepted, 10)) {
-						add();
+						return data;
-						setImmediate(callback, null, data);
 					}
-				} else {
-					// GDPR consent signed
-					setImmediate(callback, null, data);
 				}
-			},
 
-			// Forum Terms of Use
+				const termsOfUse = await plugins.fireHook('filter:parse.post', {
-			function (data, callback) {
+					postData: {
-				if (!data.userData) {
+						content: meta.config.termsOfUse || '',
-					return setImmediate(callback, new Error('[[error:invalid-data]]'));
+					},
-				}
+				});
 
-				const add = function () {
 				data.interstitials.push({
 					template: 'partials/acceptTos',
 					data: {
-							termsOfUse: meta.config.termsOfUse,
+						termsOfUse: termsOfUse.postData.content,
 					},
 					callback: function (userData, formData, next) {
 						if (formData['agree-terms'] === 'on') {
@@ -296,27 +299,7 @@ User.addInterstitials = function (callback) {
 						next(userData.acceptTos ? null : new Error('[[register:terms_of_use_error]]'));
 					},
 				});
-				};
+				return data;
-
-				if (meta.config.termsOfUse && !data.userData.acceptTos) {
-					if (data.userData.uid) {
-						db.getObjectField('user:' + data.userData.uid, 'acceptTos', function (err, accepted) {
-							if (err) {
-								return callback(err);
-							} else if (!parseInt(accepted, 10)) {
-								add();
-							}
-
-							callback(null, data);
-						});
-					} else {
-						add();
-						setImmediate(callback, null, data);
-					}
-				} else {
-					// TOS accepted
-					setImmediate(callback, null, data);
-				}
 			},
 		],
 	});