Better email

.dockerignore

@@ -5,7 +5,7 @@
 .git
 .build.log
 Dockerfile
-docker/reaction.*
+.reaction/docker/reaction.*
 docs
 node_modules
 packages/*/.npm

.eslintrc

@@ -87,19 +87,19 @@
     "react/no-deprecated": 1,
     "react/display-name": 1,
     "react/forbid-prop-types": 1,
-    "react/jsx-boolean-value": [1, "always"],
-    "react/jsx-closing-bracket-location": 1,
+    "react/jsx-boolean-value": 0,
+    "react/jsx-closing-bracket-location": [1, "after-props"],
     "react/jsx-curly-spacing": 1,
     "react/jsx-indent-props": [1, 2],
     "react/jsx-max-props-per-line": [1, {
       "maximum": 4
     }],
-    "react/jsx-no-bind": 1,
+    "react/jsx-no-bind": 0,
     "react/jsx-no-duplicate-props": 1,
-    "react/jsx-no-literals": 1,
+    "react/jsx-no-literals": 0,
     "react/jsx-no-undef": 1,
     "react/sort-prop-types": 1,
-    "react/jsx-sort-props": 1,
+    "react/jsx-sort-props": 0,
     "react/jsx-uses-react": 1,
     "react/jsx-uses-vars": 1,
     "react/no-danger": 1,

.meteor/packages

@@ -30,7 +30,6 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
 [email protected]
 amplify
 mdg:validated-method

client/modules/accounts/templates/forgot/forgot.js

@@ -1,6 +1,7 @@
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 import { i18next } from "/client/api";
 import { LoginFormSharedHelpers } from "/client/modules/accounts/helpers";
-import { Template } from "meteor/templating";
 
 Template.loginFormResetPasswordView.events({
 
@@ -32,7 +33,7 @@ Template.loginFormResetPasswordView.events({
       // return;
     }
 
-    Accounts.forgotPassword({ email: emailAddress}, (error) => {
+    Meteor.call("accounts/sendResetPasswordEmail", { email: emailAddress }, (error) => {
       // Show some message confirming result
       if (error) {
         templateInstance.formMessages.set({

client/modules/accounts/templates/updatePassword/updatePassword.js

@@ -1,12 +1,7 @@
+import { Accounts } from "meteor/accounts-base";
+import { Template } from "meteor/templating";
 import { i18next } from "/client/api";
 import { LoginFormSharedHelpers } from "/client/modules/accounts/helpers";
-import { Template } from "meteor/templating";
-
-ModalHelper = {
-  closeModal: function (template) {
-    Blaze.remove(template.view);
-  }
-};
 
 /**
  * Accounts Event: onResetPasswordLink When a user uses a password reset link

client/modules/core/main.js

@@ -193,17 +193,24 @@ export default {
     return this.shopName;
   },
 
-  allowGuestCheckout() {
-    let allowGuest = false;
-    const packageRegistry = Packages.findOne({
+  getShopSettings() {
+    const settings = Packages.findOne({
       name: "core",
       shopId: this.shopId
-    });
+    }) || {};
+    return settings.settings || {};
+  },
+
+  getPackageSettings(name) {
+    return Packages.findOne({ name, shopId: this.getShopId() });
+  },
+
+  allowGuestCheckout() {
+    let allowGuest = false;
+    const settings = this.getShopSettings();
     // we can disable in admin, let's check.
-    if (typeof packageRegistry === "object" &&
-      typeof packageRegistry.settings === "object" &&
-      packageRegistry.settings.public.allowGuestCheckout) {
-      allowGuest = packageRegistry.settings.public.allowGuestCheckout;
+    if (settings.public && settings.public.allowGuestCheckout) {
+      allowGuest = settings.public.allowGuestCheckout;
     }
     return allowGuest;
   },

client/modules/core/startup.js

@@ -1,7 +1,7 @@
+import { Meteor } from "meteor/meteor";
 import { Tracker } from "meteor/tracker";
 import Logger from "/client/modules/logger";
 import Reaction from "./main";
-import { Meteor } from "meteor/meteor";
 
 // @see https://developer.mozilla.org/en-US/docs/Web/API/Page_Visibility_API
 let hidden;

imports/plugins/core/dashboard/client/templates/shop/settings/settings.html

@@ -82,32 +82,6 @@
       </div>
     </div>
 
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <div class="panel-title">
-          <a
-            href="#mail"
-            aria-controls="mail"
-            role="button"
-            data-toggle="collapse"
-            data-parent="#shopSettingsAccordian"
-            data-i18n="shopSettings.mail">Mail</a>
-        </div>
-      </div>
-      <div id="mail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="mail">
-        <div class="panel-body">
-          {{#autoForm collection=Collections.Packages schema=Schemas.CorePackageConfig
-          doc=packageData id="shopEditEmailForm" type="update"}}
-            {{> afQuickField name='settings.mail.user'}}
-            {{> afQuickField name='settings.mail.password'}}
-            {{> afQuickField name='settings.mail.host'}}
-            {{> afQuickField name='settings.mail.port'}}
-            {{> shopSettingsSubmitButton}}
-          {{/autoForm}}
-        </div>
-      </div>
-    </div>
-
     <div class="panel panel-default">
       <div class="panel-heading">
         <div class="panel-title">

imports/plugins/core/dashboard/client/templates/shop/settings/settings.js

@@ -185,19 +185,6 @@ AutoForm.hooks({
   }
 });
 
-AutoForm.hooks({
-  shopEditEmailForm: {
-    onSuccess: function () {
-      return Alerts.toast(i18next.t("shopSettings.shopMailSettingsSaved"),
-        "success");
-    },
-    onError: function (operation, error) {
-      return Alerts.toast(`${i18next.t("shopSettings.shopMailSettingsFailed")
-        } ${error}`, "error");
-    }
-  }
-});
-
 AutoForm.hooks({
   shopEditExternalServicesForm: {
     onSuccess: function () {

imports/plugins/core/email/client/actions/index.js

@@ -0,0 +1,2 @@
+export { default as logs } from "./logs";
+export { default as settings } from "./settings";

imports/plugins/core/email/client/actions/logs.js

@@ -0,0 +1,35 @@
+import { Router, i18next } from "/client/api";
+
+export default {
+
+  /**
+   * Update the limit query param in the URL
+   * @param {Object} event - sythetic React event
+   * @return {String} returns the updated limit
+   */
+  updateLimit(event) {
+    return _.debounce(() => {
+      const limit = event.target.value;
+      if (!limit) {
+        Router.setQueryParams({ limit: null });
+      } else {
+        Router.setQueryParams({ limit });
+      }
+    }, 300, { maxWait: 1000 })();
+  },
+
+
+  /**
+   * Restart a failed or cancelled email job
+   * @param {Object} email - the email job object
+   * @return {null} triggers an alert
+   */
+  resend(email) {
+    Meteor.call("emails/retryFailed", email._id, (err) => {
+      if (err) {
+        return Alerts.toast(i18next.t("app.error", { error: err.reason }), "error");
+      }
+      return Alerts.toast(i18next.t("mail.alerts.resendSuccess", { email: email.data.to }), "success");
+    });
+  }
+};

imports/plugins/core/email/client/actions/settings.js

@@ -0,0 +1,87 @@
+import Alert from "sweetalert2";
+import { Reaction, i18next } from "/client/api";
+
+export default {
+
+  /**
+   * Open the email settings menu
+   * @return {Boolean} returns true if action view toggled
+   */
+  toggleSettings() {
+    Reaction.showActionView({
+      label: i18next.t("mail.headers.emailSettings"),
+      template: "emailSettings"
+    });
+    return true;
+  },
+
+  /**
+   * Save email settings
+   * @param {Object} settings - object of mail provider settings
+   * @param {Function} callback - optional callback
+   * @return {Boolean} returns true if all fields provided and update method called
+   */
+  saveSettings(settings, callback) {
+    const { service, host, port, user, password } = settings;
+
+    if (!service) {
+      Alert(i18next.t("app.error"), i18next.t("mail.alerts.missingService"), "error");
+      return callback();
+    }
+
+    if (service !== "custom" && (!user || !password)) {
+      Alert(i18next.t("app.error"), i18next.t("mail.alerts.userPassRequired", { service }), "error");
+      return callback();
+    }
+
+    if (service === "custom" && (!host || !port || !user || !password)) {
+      Alert(i18next.t("app.error"), i18next.t("mail.alerts.allFieldsRequired"), "error");
+      return callback();
+    }
+
+    // make sure port is a Number
+    settings.port = Number(settings.port);
+
+    if (isNaN(settings.port)) {
+      Alert(i18next.t("app.error"), i18next.t("mail.alerts.portNaN"), "error");
+      return callback();
+    }
+
+    const save = () => {
+      Meteor.call("email/saveSettings", settings, (err) => {
+        if (err) {
+          return Alert(i18next.t("app.error"),
+            i18next.t("mail.alerts.saveFailed", { error: err.reason }),
+            "error");
+        }
+        return Alert({
+          title: i18next.t("app.success"),
+          text: i18next.t("mail.alerts.saveSuccess"),
+          type: "success",
+          timer: 1700
+        }).catch(() => null);
+      });
+    };
+
+    // check if the settings work first
+    Meteor.call("email/verifySettings", settings, (error) => {
+      callback();
+      // if the connection fails
+      if (error) {
+        Alert({
+          title: i18next.t("mail.alerts.connectionFailed"),
+          text: i18next.t("mail.alerts.saveAnyway"),
+          type: "warning",
+          showCancelButton: true,
+          cancelButtonText: i18next.t("app.cancel"),
+          confirmButtonColor: "#DD6B55",
+          confirmButtonText: i18next.t("app.save")
+        }).then(() => save()).catch(() => true);
+      } else {
+        save();
+      }
+    });
+
+    return true;
+  }
+};

imports/plugins/core/email/client/components/email_config.css

@@ -0,0 +1,30 @@
+.email-config-header {
+  display: flex;
+  justify-content: space-between;
+}
+
+.email-config-title {
+  font-size: 2rem;
+  font-weight: 200;
+}
+
+.email-config-status {
+  margin-top: .4rem;
+}
+
+.email-status-error {
+  padding-top: 1rem;
+  color: #b94628;
+}
+
+.email-config-status i {
+  margin-left: .3rem;
+}
+
+.email-config-status i.valid {
+  color: #2dc378;
+}
+
+.email-config-status i.error {
+  color: #b94628;
+}