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

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
Julian Lam
2019-04-10 13:59:47 -04:00
parent b716977237 808c4909a4
commit d8978fb142
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/user/data.js
View File

@@ -3,7 +3,6 @@
var async = require('async');
var validator = require('validator');
var nconf = require('nconf');
var winston = require('winston');
var _ = require('lodash');
var db = require('../database');
@@ -85,17 +84,11 @@ module.exports = function (User) {
plugins.fireHook('filter:user.whitelistFields', { uids: uids, whitelist: fieldWhitelist.slice() }, next);
},
function (results, next) {
if (fields.length) {
const whitelistSet = new Set(results.whitelist);
fields = fields.filter(function (field) {
var isFieldWhitelisted = field && whitelistSet.has(field);
if (!isFieldWhitelisted) {
winston.verbose('[user/getUsersFields] ' + field + ' removed because it is not whitelisted, see `filter:user.whitelistFields`');
}
return isFieldWhitelisted;
});
} else {
if (!fields.length) {
fields = results.whitelist;
} else {
// Never allow password retrieval via this method
fields = fields.filter(value => value !== 'password');
}
db.getObjectsFields(uidsToUserKeys(uniqueUids), fields, next);