Skip to content

Commit efe56c2

Browse files
committed
remove unneeded actions on nova:subscribe
1 parent 611fec4 commit efe56c2

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

packages/nova-subscribe/lib/mutations.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const performSubscriptionAction = (action, collection, itemId, user) => {
8383
// - the action is subscribe but the user has already subscribed to this item
8484
// - the action is unsubscribe but the user hasn't subscribed to this item
8585
if (!subscription || (action === 'subscribe' && subscription.hasSubscribedItem) || (action === 'unsubscribe' && !subscription.hasSubscribedItem)) {
86-
throw Error({id: 'app.mutation_not_allowed', value: 'Already subscribed'})
86+
throw Error(Utils.encodeIntlError({id: 'app.mutation_not_allowed', value: 'Already subscribed'}))
8787
}
8888

8989
// shorthand for useful variables
@@ -146,7 +146,7 @@ const performSubscriptionAction = (action, collection, itemId, user) => {
146146
const { currentUser, [Utils.capitalize(collectionName)]: collection } = context;
147147

148148
// permission check
149-
if (!Users.canDo(context.currentUser, `${collectionName}.${action}`) || !Users.canDo(currentUser, `${collectionName}.${action}.all`)) {
149+
if (!Users.canDo(context.currentUser, `${collectionName}.${action}`)) {
150150
throw new Error(Utils.encodeIntlError({id: "app.noPermission"}));
151151
}
152152

packages/nova-subscribe/lib/permissions.js

-11
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,3 @@ const membersActions = [
1010
];
1111

1212
Users.groups.members.can(membersActions);
13-
14-
const adminActions = [
15-
"posts.subscribe.all",
16-
"posts.unsubscribe.all",
17-
"users.subscribe.all",
18-
"users.unsubscribe.all",
19-
"categories.subscribe.all",
20-
"categories.unsubscribe.all",
21-
];
22-
23-
Users.groups.admins.can(adminActions);

0 commit comments

Comments
 (0)