diff --git a/packages/telescope-comments/lib/server/publications.js b/packages/telescope-comments/lib/server/publications.js index 5bc9717fc..3cd374d62 100644 --- a/packages/telescope-comments/lib/server/publications.js +++ b/packages/telescope-comments/lib/server/publications.js @@ -37,7 +37,7 @@ Meteor.publish('commentUsers', function(commentId) { var post = Posts.findOne(comment.postId); userIds.push(post.userId); - return Meteor.users.find({_id: {$in: userIds}}, {fields: Users.pubsub.privacyOptions}); + return Meteor.users.find({_id: {$in: userIds}}, {fields: Users.pubsub.publicProperties}); } diff --git a/packages/telescope-posts/lib/server/publications.js b/packages/telescope-posts/lib/server/publications.js index bf7fa8a37..396351798 100644 --- a/packages/telescope-posts/lib/server/publications.js +++ b/packages/telescope-posts/lib/server/publications.js @@ -29,7 +29,7 @@ Meteor.publish('postsListUsers', function(terms) { userIds = _.unique(userIds); - return Meteor.users.find({_id: {$in: userIds}}, {fields: Users.pubsub.avatarOptions, multi: true}); + return Meteor.users.find({_id: {$in: userIds}}, {fields: Users.pubsub.avatarProperties, multi: true}); } return []; }); @@ -74,7 +74,7 @@ Meteor.publish('postUsers', function(postId) { // remove any duplicate IDs users = _.unique(users); - return Meteor.users.find({_id: {$in: users}}, {fields: Users.pubsub.privacyOptions}); + return Meteor.users.find({_id: {$in: users}}, {fields: Users.pubsub.publicProperties}); } return []; }); diff --git a/packages/telescope-settings/lib/server/publications.js b/packages/telescope-settings/lib/server/publications.js index fffe28f24..1260cd29d 100644 --- a/packages/telescope-settings/lib/server/publications.js +++ b/packages/telescope-settings/lib/server/publications.js @@ -2,8 +2,8 @@ Meteor.publish('settings', function() { var options = {}; var privateFields = {}; - // look at Settings.schema to see which fields should be kept private - _.each(Settings.schema._schema, function (property, key) { + // look at Settings.simpleSchema._schema to see which fields should be kept private + _.each(Settings.simpleSchema._schema, function (property, key) { if (property.private) privateFields[key] = false; }); diff --git a/packages/telescope-users/lib/pubsub.js b/packages/telescope-users/lib/pubsub.js index 91bb1bc78..447fc9633 100644 --- a/packages/telescope-users/lib/pubsub.js +++ b/packages/telescope-users/lib/pubsub.js @@ -12,7 +12,7 @@ Users.pubsub = {}; * Default user object fields in publication * @type {Object} */ -Users.pubsub.privacyOptions = { // true means exposed +Users.pubsub.publicProperties = { // true means exposed _id: true, commentCount: true, createdAt: true, @@ -43,7 +43,7 @@ Users.pubsub.privacyOptions = { // true means exposed * Options for your own user account (for security reasons, block certain properties) * @type {Object} */ -Users.pubsub.ownUserOptions = { +Users.pubsub.privateProperties = { 'services.password.bcrypt': false } @@ -51,7 +51,7 @@ Users.pubsub.ownUserOptions = { * Minimum required properties to display avatars * @type {Object} */ -Users.pubsub.avatarOptions = { +Users.pubsub.avatarProperties = { _id: true, email_hash: true, slug: true, diff --git a/packages/telescope-users/lib/server/publications.js b/packages/telescope-users/lib/server/publications.js index 4e8dd8c4f..dbc80dc1a 100644 --- a/packages/telescope-users/lib/server/publications.js +++ b/packages/telescope-users/lib/server/publications.js @@ -3,7 +3,7 @@ Meteor.publish('singleUser', function(idOrSlug) { var findById = Meteor.users.findOne(idOrSlug); var findBySlug = Meteor.users.findOne({slug: idOrSlug}); var user = typeof findById !== 'undefined' ? findById : findBySlug; - var options = Users.isAdminById(this.userId) ? {} : {fields: Users.pubsub.privacyOptions}; + var options = Users.isAdminById(this.userId) ? {} : {fields: Users.pubsub.publicProperties}; if (user) { return Meteor.users.find({_id: user._id}, options); } @@ -42,7 +42,7 @@ Meteor.publish('userComments', function(userId, limit) { // Publish the current user Meteor.publish('currentUser', function() { - var user = Meteor.users.find({_id: this.userId}, {fields: Users.pubsub.ownUserOptions}); + var user = Meteor.users.find({_id: this.userId}, {fields: Users.pubsub.privateProperties}); return user; });