krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(usernames): don't supply username in public fields if unverified

Browse Source
This commit is contained in:
Sabe Jones
2018-11-01 15:32:40 -05:00
parent dc46127fc7
commit 6ab08a7d52
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/server/controllers/api-v3/members.js
View File

@@ -109,6 +109,8 @@ api.getMember = {
if (!member) throw new NotFound(res.t('userWithIDNotFound', {userId: memberId})); if (!member) throw new NotFound(res.t('userWithIDNotFound', {userId: memberId}));
if (!member.flags.verifiedUsername) delete member.auth.local.username;
// manually call toJSON with minimize: true so empty paths aren't returned // manually call toJSON with minimize: true so empty paths aren't returned
let memberToJSON = member.toJSON({minimize: true}); let memberToJSON = member.toJSON({minimize: true});
User.addComputedStatsToJSONObj(memberToJSON.stats, member); User.addComputedStatsToJSONObj(memberToJSON.stats, member);

3
website/server/models/user/index.js
View File

@@ -8,7 +8,8 @@ require('./methods');
// A list of publicly accessible fields (not everything from preferences because there are also a lot of settings tha should remain private) // A list of publicly accessible fields (not everything from preferences because there are also a lot of settings tha should remain private)
export let publicFields = `preferences.size preferences.hair preferences.skin preferences.shirt export let publicFields = `preferences.size preferences.hair preferences.skin preferences.shirt
preferences.chair preferences.costume preferences.sleep preferences.background preferences.tasks preferences.disableClasses profile stats preferences.chair preferences.costume preferences.sleep preferences.background preferences.tasks preferences.disableClasses profile stats
achievements party backer contributor auth.timestamps items inbox.optOut loginIncentives flags.classSelected auth.local.username`; achievements party backer contributor auth.timestamps items inbox.optOut loginIncentives flags.classSelected
flags.verifiedUsername auth.local.username`;
// The minimum amount of data needed when populating multiple users // The minimum amount of data needed when populating multiple users
export let nameFields = 'profile.name'; export let nameFields = 'profile.name';

3
website/server/models/user/methods.js
View File

@@ -219,6 +219,9 @@ schema.statics.transformJSONUser = function transformJSONUser (jsonUser, addComp
// Add id property // Add id property
jsonUser.id = jsonUser._id; jsonUser.id = jsonUser._id;
// Remove username if not verified
if (!jsonUser.flags.verifiedUsername) delete jsonUser.auth.local.username;
if (addComputedStats) this.addComputedStatsToJSONObj(jsonUser.stats, jsonUser); if (addComputedStats) this.addComputedStatsToJSONObj(jsonUser.stats, jsonUser);
}; };