Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[WIP] Fix no products and logout #5925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mikemurray wants to merge 2 commits into from
Closed

[WIP] Fix no products and logout #5925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f9cd43
fix: set default email
mikemurray Dec 16, 2019
1746763
fix: simplify permission check
mikemurray Dec 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions imports/plugins/core/accounts/server/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ Meteor.startup(() => {
emailIsVerified = true;
}

if (user.emails[0]) {
user.emails[0].provides = "default";
}

// create a tokenObj and send a welcome email to new users,
// but skip the first default admin user and anonymous users
// (default admins already get a verification email)
Expand Down
13 changes: 1 addition & 12 deletions imports/plugins/core/core/server/publications/collections/products.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,18 +389,7 @@ Meteor.publish("ProductsAdminList", function (page = 0, limit = 24, productFilte
return this.ready();
}

// Get a list of shopIds that this user has "createProduct" permissions for (owner permission is checked by default)
const userAdminShopIds = Reaction.getShopsWithRoles(["createProduct"], this.userId) || [];

// If the user isn't an admin of any shop, then don't show them any products
if (userAdminShopIds.length === 0) {
return this.ready();
}

// We publish an admin version of this publication to admins of products who are in "Edit Mode"
// Limit to only shops we have "createProduct" role for
selector.shopId.$in = _.intersection(selector.shopId.$in, userAdminShopIds);
if (selector.shopId.$in.length === 0) {
if (!Reaction.hasPermission(["createProduct"])) {
return this.ready();
}

Expand Down