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

Skip to content

fix: pass correct userId when creating a shop #5694

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

Merged
aldeed merged 1 commit into from
Oct 8, 2019
Merged

fix: pass correct userId when creating a shop #5694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions imports/plugins/core/accounts/server/no-meteor/startup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default async function startup(context) {
});

appEvents.on("afterShopCreate", async (payload) => {
const { shop } = payload;
const { shop, shopAdminUserId } = payload;
let { createdBy: userId } = payload;
const { _id: newShopId, shopType } = shop;

Expand Down Expand Up @@ -64,10 +64,10 @@ export default async function startup(context) {
}

// If a user created the shop, give the user owner access to it
if (userId) {
if (shopAdminUserId) {
// Add users to roles
await users.updateOne({
_id: userId
_id: shopAdminUserId
}, {
$addToSet: {
[`roles.${newShopId}`]: {
Expand All @@ -77,7 +77,7 @@ export default async function startup(context) {
});

// Set the active shopId for this user
await Accounts.updateOne({ userId }, {
await Accounts.updateOne({ shopAdminUserId }, {
$set: {
"profile.preferences.reaction.activeShopId": newShopId,
"shopId": newShopId
Expand All @@ -87,7 +87,7 @@ export default async function startup(context) {
}
});

const updatedAccount = await Accounts.findOne({ userId });
const updatedAccount = await Accounts.findOne({ shopAdminUserId });
Promise.await(appEvents.emit("afterAccountUpdate", {
account: updatedAccount,
updatedBy: userId,
Expand Down
2 changes: 1 addition & 1 deletion imports/plugins/core/core/server/methods/shop/createShop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export default function createShop(shopAdminUserId, partialShopData) {
// we should have created new shop, or erred
Logger.info("Created shop: ", newShopId);

Promise.await(appEvents.emit("afterShopCreate", { createdBy: userId, shop: newShop }));
Promise.await(appEvents.emit("afterShopCreate", { createdBy: userId, shop: newShop, shopAdminUserId: shopAdminUserId || userId }));

// Add this shop to the merchant
Shops.update({ _id: primaryShopId }, {
Expand Down