Replace all Hooks with appEvents

imports/node-app/mockmeteor/meteor.js

@@ -2,8 +2,10 @@ import ReactionError from "@reactioncommerce/reaction-error";
 
 export const Meteor = {
   Error: ReactionError,
+  isAppTest: false,
   isClient: false,
   isServer: true,
+  isTest: false,
   settings: {
     public: {}
   }

imports/plugins/core/accounts/register.js

@@ -1,8 +1,10 @@
 import Reaction from "/imports/plugins/core/core/server/Reaction";
 import mutations from "./server/no-meteor/mutations";
 import queries from "./server/no-meteor/queries";
+import { registerPluginHandler } from "./server/no-meteor/registration";
 import resolvers from "./server/no-meteor/resolvers";
 import schemas from "./server/no-meteor/schemas";
+import startup from "./server/no-meteor/startup";
 import { ENROLL_URI_BASE } from "./server/util/getDataForEmail";
 
 /**
@@ -16,6 +18,15 @@ Reaction.registerPackage({
   name: "reaction-accounts",
   icon: "fa fa-users",
   autoEnable: true,
+  addRolesToGroups: [{
+    allShops: true,
+    groups: ["guest", "customer"],
+    roles: ["account/verify", "reset-password", ENROLL_URI_BASE]
+  }],
+  functionsByType: {
+    registerPluginHandler: [registerPluginHandler],
+    startup: [startup]
+  },
   graphQL: {
     resolvers,
     schemas

imports/plugins/core/accounts/server/init.js

@@ -1,22 +1,6 @@
-import Hooks from "@reactioncommerce/hooks";
-import Reaction from "/imports/plugins/core/core/server/Reaction";
-import { Accounts, Groups } from "/lib/collections";
-import { ENROLL_URI_BASE } from "./util/getDataForEmail";
+import appEvents from "/imports/node-app/core/util/appEvents";
+import sendVerificationEmail from "./util/sendVerificationEmail";
 
-// set default admin user's account as "owner"
-Hooks.Events.add("afterCreateDefaultAdminUser", (user) => {
-  const group = Groups.findOne({ slug: "owner", shopId: Reaction.getShopId() });
-  Accounts.update({ _id: user._id }, { $set: { groups: [group._id] } });
-  Hooks.Events.run("afterAccountsUpdate", null, {
-    accountId: user._id,
-    updatedFields: ["groups"]
-  });
-});
-
-Hooks.Events.add("afterCoreInit", () => {
-  Reaction.addRolesToGroups({
-    allShops: true,
-    groups: ["guest", "customer"],
-    roles: ["account/verify", "reset-password", ENROLL_URI_BASE]
-  });
+appEvents.on("afterAddUnverifiedEmailToUser", ({ email, userId }) => {
+  sendVerificationEmail(userId, email);
 });

imports/plugins/core/accounts/server/methods/addressBookRemove.js

@@ -1,6 +1,6 @@
-import Hooks from "@reactioncommerce/hooks";
 import { check, Match } from "meteor/check";
 import { Accounts } from "/lib/collections";
+import appEvents from "/imports/node-app/core/util/appEvents";
 import Reaction from "/imports/plugins/core/core/server/Reaction";
 import ReactionError from "@reactioncommerce/reaction-error";
 
@@ -27,6 +27,10 @@ export default function addressBookRemove(addressId, accountUserId) {
     throw new ReactionError("access-denied", "Access denied");
   }
 
+  const addressBeingRemoved = account.profile && Array.isArray(account.profile.addressBook) &&
+    account.profile.addressBook.find((addressBookItem) => addressId === addressBookItem._id);
+  if (!addressBeingRemoved) throw new ReactionError("not-found", "Address Not Found");
+
   const updatedAccountResult = Accounts.update({
     userId,
     "profile.addressBook._id": addressId
@@ -38,17 +42,16 @@ export default function addressBookRemove(addressId, accountUserId) {
     }
   }, { bypassCollection2: true });
 
-  // forceIndex when removing an address
-  Hooks.Events.run("afterAccountsUpdate", userId, {
-    accountId: account._id,
-    updatedFields: ["forceIndex"]
-  });
-
-  // If the address remove was successful, then return the removed address
-  if (updatedAccountResult === 1) {
-    // Pull the address from the account before it was updated and return it
-    return account.profile.addressBook.find((removedAddress) => addressId === removedAddress._id);
+  if (updatedAccountResult !== 1) {
+    throw new ReactionError("server-error", "Unable to remove address from account");
   }
 
-  throw new ReactionError("server-error", "Unable to remove address from account");
+  const updatedAccount = Accounts.findOne({ userId });
+  Promise.await(appEvents.emit("afterAccountUpdate", {
+    account: updatedAccount,
+    updatedBy: authUserId
+  }));
+
+  // If the address remove was successful, then return the removed address
+  return addressBeingRemoved;
 }

imports/plugins/core/accounts/server/methods/addressBookUpdate.js

@@ -1,9 +1,9 @@
 import _ from "lodash";
-import Hooks from "@reactioncommerce/hooks";
 import { Meteor } from "meteor/meteor";
 import { check, Match } from "meteor/check";
 import { Accounts } from "/lib/collections";
 import * as Schemas from "/lib/collections/schemas";
+import appEvents from "/imports/node-app/core/util/appEvents";
 import Reaction from "/imports/plugins/core/core/server/Reaction";
 import ReactionError from "@reactioncommerce/reaction-error";
 
@@ -77,6 +77,10 @@ export default function addressBookUpdate(address, accountUserId, type) {
     userId
   }, accountsUpdateQuery);
 
+  if (updatedAccountResult !== 1) {
+    throw new ReactionError("server-error", "Unable to update account address");
+  }
+
   // Create an array which contains all fields that have changed
   // This is used for search, to determine if we need to re-index
   const updatedFields = [];
@@ -86,22 +90,14 @@ export default function addressBookUpdate(address, accountUserId, type) {
     }
   });
 
-  // Run afterAccountsUpdate hook to update Accounts Search
-  Hooks.Events.run("afterAccountsUpdate", userId, {
-    accountId: account._id,
+  const updatedAccount = Accounts.findOne({ userId });
+  Promise.await(appEvents.emit("afterAccountUpdate", {
+    account: updatedAccount,
+    updatedBy: authUserId,
     updatedFields
-  });
-
-  // If the address update was successful, then return the full updated address
-  if (updatedAccountResult === 1) {
-    // Find the account
-    const updatedAccount = Accounts.findOne({
-      userId
-    });
-
-    // Pull the updated address and return it
-    return updatedAccount.profile.addressBook.find((updatedAddress) => address._id === updatedAddress._id);
-  }
+  }));
 
-  throw new ReactionError("server-error", "Unable to update account address");
+  // If the address update was successful, then return the full updated address.
+  // Since we just pushed into `profile.addressBook`, we know it will exist.
+  return updatedAccount.profile.addressBook.find((updatedAddress) => address._id === updatedAddress._id);
 }

imports/plugins/core/accounts/server/methods/group/addUser.js

@@ -1,8 +1,8 @@
-import Hooks from "@reactioncommerce/hooks";
 import Logger from "@reactioncommerce/logger";
 import { Roles } from "meteor/alanning:roles";
 import { check } from "meteor/check";
 import { Meteor } from "meteor/meteor";
+import appEvents from "/imports/node-app/core/util/appEvents";
 import Reaction from "/imports/plugins/core/core/server/Reaction";
 import ReactionError from "@reactioncommerce/reaction-error";
 import { Accounts, Groups } from "/lib/collections";
@@ -81,10 +81,14 @@ export default function addUser(userId, groupId) {
   try {
     setUserPermissions({ _id: userId }, permissions, shopId);
     Accounts.update({ userId }, { $set: { groups: newGroups } });
-    Hooks.Events.run("afterAccountsUpdate", loggedInUserId, {
-      accountId: account._id,
+
+    const updatedAccount = Accounts.findOne({ userId });
+    Promise.await(appEvents.emit("afterAccountUpdate", {
+      account: updatedAccount,
+      updatedBy: loggedInUserId,
       updatedFields: ["groups"]
-    });
+    }));
+
     if (slug === "owner") {
       if (shopId === Reaction.getPrimaryShopId()) {
         changeMarketplaceOwner({ userId, permissions });

imports/plugins/core/accounts/server/methods/group/removeUser.js

@@ -1,6 +1,6 @@
-import Hooks from "@reactioncommerce/hooks";
 import Logger from "@reactioncommerce/logger";
 import { check } from "meteor/check";
+import appEvents from "/imports/node-app/core/util/appEvents";
 import Reaction from "/imports/plugins/core/core/server/Reaction";
 import ReactionError from "@reactioncommerce/reaction-error";
 import { Accounts, Groups } from "/lib/collections";
@@ -37,11 +37,15 @@ export default function removeUser(userId, groupId) {
 
   try {
     setUserPermissions(user, defaultCustomerGroupForShop.permissions, shopId);
-    Accounts.update({ _id: userId, groups: groupId }, { $set: { "groups.$": defaultCustomerGroupForShop._id } }); // replace the old id with new id
-    Hooks.Events.run("afterAccountsUpdate", Reaction.getUserId(), {
-      accountId: userId,
+    Accounts.update({ userId, groups: groupId }, { $set: { "groups.$": defaultCustomerGroupForShop._id } }); // replace the old id with new id
+
+    const updatedAccount = Accounts.findOne({ userId });
+    Promise.await(appEvents.emit("afterAccountUpdate", {
+      account: updatedAccount,
+      updatedBy: Reaction.getUserId(),
       updatedFields: ["groups"]
-    });
+    }));
+
     return defaultCustomerGroupForShop;
   } catch (error) {
     Logger.error(error);

imports/plugins/core/accounts/server/methods/markAddressValidationBypassed.js

@@ -19,7 +19,10 @@ export default function markAddressValidationBypassed(value = true) {
 
   const updatedCart = Cart.findOne({ accountId: account._id });
   if (updatedCart) {
-    Promise.await(appEvents.emit("afterCartUpdate", updatedCart));
+    Promise.await(appEvents.emit("afterCartUpdate", {
+      cart: updatedCart,
+      updatedBy: userId
+    }));
   }
 
   return updateResult;