From 35a7904f92f97875e447aa70ad4b9a2a3f636d55 Mon Sep 17 00:00:00 2001 From: SachaG Date: Wed, 7 Jun 2017 05:04:05 -0700 Subject: [PATCH] performCheck fix --- .../example-instagram/lib/modules/comments/mutations.js | 6 +++--- packages/example-instagram/lib/modules/pics/mutations.js | 6 +++--- packages/example-movies/lib/modules/movies/mutations.js | 6 +++--- packages/vulcan-core/lib/modules/components/App.jsx | 2 +- packages/vulcan-lib/lib/modules/utils.js | 2 +- packages/vulcan-posts/lib/mutations.js | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/example-instagram/lib/modules/comments/mutations.js b/packages/example-instagram/lib/modules/comments/mutations.js index 90d062aa3..19736904a 100644 --- a/packages/example-instagram/lib/modules/comments/mutations.js +++ b/packages/example-instagram/lib/modules/comments/mutations.js @@ -30,7 +30,7 @@ const mutations = { mutation(root, {document}, context) { - Utils.performCheck(this, context.currentUser, document); + Utils.performCheck(this.check, context.currentUser, document); return newMutation({ collection: context.Comments, @@ -55,7 +55,7 @@ const mutations = { mutation(root, {documentId, set, unset}, context) { const document = context.Comments.findOne(documentId); - Utils.performCheck(this, context.currentUser, document); + Utils.performCheck(this.check, context.currentUser, document); return editMutation({ collection: context.Comments, @@ -82,7 +82,7 @@ const mutations = { mutation(root, {documentId}, context) { const document = context.Comments.findOne(documentId); - Utils.performCheck(this, context.currentUser, document); + Utils.performCheck(this.check, context.currentUser, document); return removeMutation({ collection: context.Comments, diff --git a/packages/example-instagram/lib/modules/pics/mutations.js b/packages/example-instagram/lib/modules/pics/mutations.js index 151751ffd..ab7de337b 100644 --- a/packages/example-instagram/lib/modules/pics/mutations.js +++ b/packages/example-instagram/lib/modules/pics/mutations.js @@ -30,7 +30,7 @@ const mutations = { mutation(root, {document}, context) { - Utils.performCheck(this, context.currentUser, document); + Utils.performCheck(this.check, context.currentUser, document); return newMutation({ collection: context.Pics, @@ -55,7 +55,7 @@ const mutations = { mutation(root, {documentId, set, unset}, context) { const document = context.Pics.findOne(documentId); - Utils.performCheck(this, context.currentUser, document); + Utils.performCheck(this.check, context.currentUser, document); return editMutation({ collection: context.Pics, @@ -82,7 +82,7 @@ const mutations = { mutation(root, {documentId}, context) { const document = context.Pics.findOne(documentId); - Utils.performCheck(this, context.currentUser, document); + Utils.performCheck(this.check, context.currentUser, document); return removeMutation({ collection: context.Pics, diff --git a/packages/example-movies/lib/modules/movies/mutations.js b/packages/example-movies/lib/modules/movies/mutations.js index 0c12e6abc..b6084bf6c 100644 --- a/packages/example-movies/lib/modules/movies/mutations.js +++ b/packages/example-movies/lib/modules/movies/mutations.js @@ -30,7 +30,7 @@ const mutations = { mutation(root, {document}, context) { - Utils.performCheck(this, context.currentUser, document); + Utils.performCheck(this.check, context.currentUser, document); return newMutation({ collection: context.Movies, @@ -55,7 +55,7 @@ const mutations = { mutation(root, {documentId, set, unset}, context) { const document = context.Movies.findOne(documentId); - Utils.performCheck(this, context.currentUser, document); + Utils.performCheck(this.check, context.currentUser, document); return editMutation({ collection: context.Movies, @@ -82,7 +82,7 @@ const mutations = { mutation(root, {documentId}, context) { const document = context.Movies.findOne(documentId); - Utils.performCheck(this, context.currentUser, document); + Utils.performCheck(this.check, context.currentUser, document); return removeMutation({ collection: context.Movies, diff --git a/packages/vulcan-core/lib/modules/components/App.jsx b/packages/vulcan-core/lib/modules/components/App.jsx index a6f3ac24c..8c2fbf936 100644 --- a/packages/vulcan-core/lib/modules/components/App.jsx +++ b/packages/vulcan-core/lib/modules/components/App.jsx @@ -23,7 +23,7 @@ class App extends PureComponent { render() { return ( - + { this.props.currentUserLoading ? : this.props.children } diff --git a/packages/vulcan-lib/lib/modules/utils.js b/packages/vulcan-lib/lib/modules/utils.js index d3c03a9b3..1f8c4c0e9 100644 --- a/packages/vulcan-lib/lib/modules/utils.js +++ b/packages/vulcan-lib/lib/modules/utils.js @@ -459,7 +459,7 @@ Utils.performCheck = (operation, user, checkedObject, context, documentId) => { throw new Error(Utils.encodeIntlError({id: `app.document_not_found`, value: documentId})) } - if (!operation.check(user, checkedObject, context)) { + if (!operation(user, checkedObject, context)) { throw new Error(Utils.encodeIntlError({id: `app.operation_not_allowed`, value: operation.name})); } diff --git a/packages/vulcan-posts/lib/mutations.js b/packages/vulcan-posts/lib/mutations.js index 3ee48f2b4..3a6c702d1 100644 --- a/packages/vulcan-posts/lib/mutations.js +++ b/packages/vulcan-posts/lib/mutations.js @@ -15,7 +15,7 @@ const mutations = { mutation(root, {document}, context) { - Utils.performCheck(this, context.currentUser, document); + Utils.performCheck(this.check, context.currentUser, document); return newMutation({ collection: context.Posts, @@ -40,7 +40,7 @@ const mutations = { mutation(root, {documentId, set, unset}, context) { const document = context.Posts.findOne(documentId); - Utils.performCheck(this, context.currentUser, document); + Utils.performCheck(this.check, context.currentUser, document); return editMutation({ collection: context.Posts, @@ -67,7 +67,7 @@ const mutations = { mutation(root, {documentId}, context) { const document = context.Posts.findOne(documentId); - Utils.performCheck(this, context.currentUser, document); + Utils.performCheck(this.check, context.currentUser, document); return removeMutation({ collection: context.Posts,