Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-28 01:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #8284, parse ToS on register

Browse Source 
rewrite intersitials to async/await
This commit is contained in:
Barış Soner Uşaklı
2020-04-30 15:13:14 -04:00
parent 17d664e098
commit 0ca84bd9f4
1 changed files with 55 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/user/index.js
View File

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