Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #2628 from justinr1234/fix-mismatched-queries

Browse source 
Fix mismatched queries
This commit is contained in:
Lauri Ojansivu 2019-08-16 00:39:16 +03:00 • committed by GitHub
commit a1582c3e65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
server/publications/boards.js
View file

@ -3,13 +3,14 @@
// 1. that the user is a member of // 1. that the user is a member of
// 2. the user has starred // 2. the user has starred
Meteor.publish('boards', function() { Meteor.publish('boards', function() {
const userId = this.userId;
// Ensure that the user is connected. If it is not, we need to return an empty // Ensure that the user is connected. If it is not, we need to return an empty
// array to tell the client to remove the previously published docs. // array to tell the client to remove the previously published docs.
if (!Match.test(this.userId, String)) return []; if (!Match.test(userId, String) || !userId) return [];
// Defensive programming to verify that starredBoards has the expected // Defensive programming to verify that starredBoards has the expected
// format -- since the field is in the `profile` a user can modify it. // format -- since the field is in the `profile` a user can modify it.
const { starredBoards = [] } = Users.findOne(this.userId).profile || []; const { starredBoards = [] } = (Users.findOne(userId) || {}).profile || {};
check(starredBoards, [String]); check(starredBoards, [String]);
return Boards.find( return Boards.find(
@ -20,7 +21,7 @@ Meteor.publish('boards', function() {
_id: { $in: starredBoards }, _id: { $in: starredBoards },
permission: 'public', permission: 'public',
}, },
{ members: { $elemMatch: { userId: this.userId, isActive: true } } }, { members: { $elemMatch: { userId, isActive: true } } },
], ],
}, },
{ {
@ -40,14 +41,15 @@ Meteor.publish('boards', function() {
}); });
Meteor.publish('archivedBoards', function() { Meteor.publish('archivedBoards', function() {
if (!Match.test(this.userId, String)) return []; const userId = this.userId;
if (!Match.test(userId, String)) return [];
return Boards.find( return Boards.find(
{ {
archived: true, archived: true,
members: { members: {
$elemMatch: { $elemMatch: {
userId: this.userId, userId,
isAdmin: true, isAdmin: true,
}, },
}, },
@ -70,6 +72,13 @@ Meteor.publishRelations('board', function(boardId, isArchived) {
check(boardId, String); check(boardId, String);
check(isArchived, Boolean); check(isArchived, Boolean);
const thisUserId = this.userId; const thisUserId = this.userId;
const $or = [{ permission: 'public' }];
if (thisUserId) {
$or.push({
members: { $elemMatch: { userId: thisUserId, isActive: true } },
});
}
this.cursor( this.cursor(
Boards.find( Boards.find(
@ -78,10 +87,7 @@ Meteor.publishRelations('board', function(boardId, isArchived) {
archived: false, archived: false,
// If the board is not public the user has to be a member of it to see // If the board is not public the user has to be a member of it to see
// it. // it.
$or: [ $or,
{ permission: 'public' },
{ members: { $elemMatch: { userId: this.userId, isActive: true } } },
],
// Sort required to ensure oplog usage // Sort required to ensure oplog usage
}, },
{ limit: 1, sort: { _id: 1 } }, { limit: 1, sort: { _id: 1 } },