reactioncommerce · kieckhafer · Oct 2, 2019 · Oct 2, 2019 · Oct 2, 2019 · Oct 2, 2019
diff --git a/...d/email-smtp/server/no-meteor/register.js → imports/node-app/plugins/email-smtp/index.js b/...d/email-smtp/server/no-meteor/register.js → imports/node-app/plugins/email-smtp/index.js
@@ -1,7 +1,7 @@
-import mutations from "./mutations";
-import resolvers from "./resolvers";
-import schemas from "./schemas";
-import startup from "./startup";
+import mutations from "./mutations/index.js";
+import resolvers from "./resolvers/index.js";
+import schemas from "./schemas/index.js";
+import startup from "./startup.js";
 
 /**
  * @summary Import and call this function to add this plugin to your API.
@@ -12,7 +12,6 @@ export default async function register(app) {
   await app.registerPlugin({
     label: "SMTP Email",
     name: "reaction-email-smtp",
-    icon: "fa fa-envelope-o",
     functionsByType: {
       startup: [startup]
     },

diff --git a/...ts__/verifySMTPEmailSettings.test.js.snap → ...ts__/verifySMTPEmailSettings.test.js.snap b/...ts__/verifySMTPEmailSettings.test.js.snap → ...ts__/verifySMTPEmailSettings.test.js.snap
diff --git a/imports/node-app/plugins/email-smtp/mutations/index.js b/imports/node-app/plugins/email-smtp/mutations/index.js
@@ -0,0 +1,5 @@
+import verifySMTPEmailSettings from "./verifySMTPEmailSettings.js";
+
+export default {
+  verifySMTPEmailSettings
+};
diff --git a/...teor/mutations/verifySMTPEmailSettings.js → ...smtp/mutations/verifySMTPEmailSettings.js b/...teor/mutations/verifySMTPEmailSettings.js → ...smtp/mutations/verifySMTPEmailSettings.js
@@ -3,7 +3,7 @@ import Logger from "@reactioncommerce/logger";
 import nodemailer from "@reactioncommerce/nodemailer";
 import getServiceConfig from "nodemailer-wellknown";
 import ReactionError from "@reactioncommerce/reaction-error";
-import getMailConfig from "../util/getMailConfig";
+import getMailConfig from "../util/getMailConfig.js";
 
 const inputSchema = new SimpleSchema({
   host: {

diff --git a/...mutations/verifySMTPEmailSettings.test.js → ...mutations/verifySMTPEmailSettings.test.js b/...mutations/verifySMTPEmailSettings.test.js → ...mutations/verifySMTPEmailSettings.test.js
@@ -1,5 +1,5 @@
-import verifySMTPEmailSettings from "./verifySMTPEmailSettings";
-import mockContext from "/imports/test-utils/helpers/mockContext";
+import mockContext from "@reactioncommerce/api-utils/tests/mockContext.js";
+import verifySMTPEmailSettings from "./verifySMTPEmailSettings.js";
 
 beforeEach(() => {
   jest.resetAllMocks();

diff --git a/imports/node-app/plugins/email-smtp/resolvers/Mutation/index.js b/imports/node-app/plugins/email-smtp/resolvers/Mutation/index.js
@@ -0,0 +1,5 @@
+import verifySMTPEmailSettings from "./verifySMTPEmailSettings.js";
+
+export default {
+  verifySMTPEmailSettings
+};
diff --git a/...lvers/Mutation/verifySMTPEmailSettings.js → ...lvers/Mutation/verifySMTPEmailSettings.js b/...lvers/Mutation/verifySMTPEmailSettings.js → ...lvers/Mutation/verifySMTPEmailSettings.js
diff --git a/imports/node-app/plugins/email-smtp/resolvers/index.js b/imports/node-app/plugins/email-smtp/resolvers/index.js
@@ -0,0 +1,5 @@
+import Mutation from "./Mutation/index.js";
+
+export default {
+  Mutation
+};
diff --git a/...il-smtp/server/no-meteor/schemas/index.js → ...e-app/plugins/email-smtp/schemas/index.js b/...il-smtp/server/no-meteor/schemas/index.js → ...e-app/plugins/email-smtp/schemas/index.js
diff --git a/...p/server/no-meteor/schemas/schema.graphql → ...plugins/email-smtp/schemas/schema.graphql b/...p/server/no-meteor/schemas/schema.graphql → ...plugins/email-smtp/schemas/schema.graphql
diff --git a/...ed/email-smtp/server/no-meteor/startup.js → ...ts/node-app/plugins/email-smtp/startup.js b/...ed/email-smtp/server/no-meteor/startup.js → ...ts/node-app/plugins/email-smtp/startup.js
@@ -1,4 +1,4 @@
-import sendSMTPEmail from "./util/sendSMTPEmail";
+import sendSMTPEmail from "./util/sendSMTPEmail.js";
 
 /**
  * @name startup

diff --git a/...tp/server/no-meteor/util/getMailConfig.js → .../plugins/email-smtp/util/getMailConfig.js b/...tp/server/no-meteor/util/getMailConfig.js → .../plugins/email-smtp/util/getMailConfig.js
diff --git a/...tp/server/no-meteor/util/sendSMTPEmail.js → .../plugins/email-smtp/util/sendSMTPEmail.js b/...tp/server/no-meteor/util/sendSMTPEmail.js → .../plugins/email-smtp/util/sendSMTPEmail.js
@@ -1,6 +1,6 @@
 import Logger from "@reactioncommerce/logger";
 import nodemailer from "@reactioncommerce/nodemailer";
-import getMailConfig from "./getMailConfig";
+import getMailConfig from "./getMailConfig.js";
 
 /**
  * @name sendSMTPEmail

diff --git a/imports/node-app/plugins/no-meteor/i18n/index.js b/imports/node-app/plugins/no-meteor/i18n/index.js
diff --git a/imports/node-app/registerPlugins.js b/imports/node-app/registerPlugins.js
@@ -5,6 +5,7 @@ import registerShippingPlugin from "./core-services/shipping/index.js";
 
 /* plugins */
 import registerAddressPlugin from "./plugins/address/index.js";
+import registerSMTPEmailPlugin from "./plugins/email-smtp/index.js";
 import registerSurchargesPlugin from "./plugins/surcharges/index.js";
 import registerSystemInfoPlugin from "./plugins/system-info/index.js";
 import registerTemplatesPlugin from "./plugins/templates/index.js";
@@ -39,7 +40,6 @@ import registerShopPlugin from "/imports/plugins/core/shop/server/register";
 import registerSimpleInventoryPlugin from "/imports/plugins/included/simple-inventory/server/no-meteor/register";
 import registerSimplePricingPlugin from "/imports/plugins/included/simple-pricing/server/no-meteor/register";
 import registerSitemapGeneratorPlugin from "/imports/plugins/included/sitemap-generator/server/no-meteor/register";
-import registerSMTPEmailPlugin from "/imports/plugins/included/email-smtp/server/no-meteor/register";
 import registerStripePaymentsPlugin from "/imports/plugins/included/payments-stripe/server/no-meteor/register";
 import registerTagsPlugin from "/imports/plugins/core/tags/server/no-meteor/register";
 import registerTaxesPlugin from "/imports/plugins/core/taxes/server/no-meteor/register";

diff --git a/imports/plugins/core/accounts/server/init.js b/imports/plugins/core/accounts/server/init.js
@@ -178,11 +178,18 @@ Meteor.startup(() => {
     // but skip the first default admin user and anonymous users
     // (default admins already get a verification email)
     if (shopId && !emailIsVerified && user.emails[0]) {
-      const tokenObj = generateVerificationTokenObject({ address: user.emails[0].address });
+      try {
+        const tokenObj = generateVerificationTokenObject({ address: user.emails[0].address });
 
-      sendWelcomeEmail(shopId, user._id, tokenObj.token);
+        sendWelcomeEmail(shopId, user._id, tokenObj.token);
 
-      _.set(user, "services.email.verificationTokens", [tokenObj]);
+        _.set(user, "services.email.verificationTokens", [tokenObj]);
+      } catch (error) {
+        // If there is an error here, we want to be sure to not throw because
+        // throwing will prevent the user from being created, and we've already
+        // created the matching account.
+        Logger.error(error);
+      }
     }
 
     // assign default user roles

diff --git a/imports/plugins/core/accounts/server/no-meteor/util/generateVerificationTokenObject.js b/imports/plugins/core/accounts/server/no-meteor/util/generateVerificationTokenObject.js
@@ -6,9 +6,9 @@ import ReactionError from "@reactioncommerce/reaction-error";
  * accounts / users collections for account verification purposes
  * @param {Object} [address] email address to create token for
  * @param {String} [email] email address to create token for
- * @returns {undefined}
+ * @returns {Object} Token object
  */
-export default async function generateVerificationTokenObject({ address, email }) {
+export default function generateVerificationTokenObject({ address, email }) {
   if (!address && !email) throw new ReactionError("error-occurred", "Address or email required");
 
   const tokenObj = {

diff --git a/imports/plugins/included/email-smtp/register.js b/imports/plugins/included/email-smtp/register.js
@@ -6,6 +6,6 @@
  * temporary bridge.
  */
 import Reaction from "/imports/plugins/core/core/server/Reaction";
-import register from "./server/no-meteor/register";
+import register from "/imports/node-app/plugins/email-smtp/index.js";
 
 Reaction.whenAppInstanceReady(register);
diff --git a/imports/plugins/included/email-smtp/server/methods/index.js b/imports/plugins/included/email-smtp/server/methods/index.js
@@ -1,5 +1,4 @@
 import saveSettings from "./saveSettings";
-import verifySettings from "./verifySettings";
 
 /**
  * @file Methods for sending emails, retrying failed emails and verifying email configuration.
@@ -10,6 +9,5 @@ import verifySettings from "./verifySettings";
 */
 
 export default {
-  "email/saveSettings": saveSettings,
-  "email/verifySettings": verifySettings
+  "email/saveSettings": saveSettings
 };
diff --git a/imports/plugins/included/email-smtp/server/methods/verifySettings.js b/imports/plugins/included/email-smtp/server/methods/verifySettings.js
diff --git a/imports/plugins/included/email-smtp/server/no-meteor/mutations/index.js b/imports/plugins/included/email-smtp/server/no-meteor/mutations/index.js
diff --git a/imports/plugins/included/email-smtp/server/no-meteor/resolvers/Mutation/index.js b/imports/plugins/included/email-smtp/server/no-meteor/resolvers/Mutation/index.js
diff --git a/imports/plugins/included/email-smtp/server/no-meteor/resolvers/index.js b/imports/plugins/included/email-smtp/server/no-meteor/resolvers/index.js