Fix Exception in delivering result of invoking 'email/verifySettings'

imports/plugins/core/email/client/containers/emailConfig.js

@@ -1,38 +1,75 @@
+import React, { Component } from "react";
 import { useDeps } from "react-simple-di";
 import getServiceConfig from "nodemailer-wellknown";
 import { Meteor } from "meteor/meteor";
+import PropTypes from "prop-types";
 import { Reaction } from "/client/api";
 import { Loading } from "/imports/plugins/core/ui/client/components";
 import actions from "../actions";
 import EmailConfig from "../components/emailConfig";
 import { composeWithTracker, merge } from "/lib/api/compose";
 
-const composer = ({}, onData) => {
-  if (Meteor.subscribe("Packages").ready()) {
-    const shopSettings = Reaction.getShopSettings();
-    const settings = shopSettings.mail || {};
+class EmailConfigContainer extends Component {
 
-    if (settings.service && settings.service !== "custom") {
-      const config = getServiceConfig(settings.service);
+  constructor(props) {
+    super(props);
 
-      // show localhost for test providers like Maildev that have no host
-      settings.host = config.host || "localhost";
-      settings.port = config.port;
-    }
+    this.state = {
+      status: null,
+      error: null
+    };
+  }
 
+  componentWillMount() {
+    const { settings } = this.props;
     const { service, host, port, user, password } = settings;
 
-    // if all settings exist, check if they work
     if (service && host && port && user && password) {
       Meteor.call("email/verifySettings", (error) => {
         if (error) {
-          return onData(null, { settings, status: "error", error: error.reason });
+          this.setState({ status: "error" });
         }
-        return onData(null, { settings, status: "valid", error: null });
+        this.setState({ status: "valid" });
       });
     } else {
-      onData(null, { settings, status: "error", error: null });
+      this.setState({ status: "error" });
+    }
+  }
+
+  render() {
+    const { status } = this.state;
+    return (
+      <EmailConfig {...this.props} status={status} />
+    );
+  }
+}
+
+EmailConfigContainer.propTypes = {
+  settings: PropTypes.shape({
+    host: PropTypes.string,
+    password: PropTypes.string,
+    port: PropTypes.oneOfType([
+      PropTypes.number,
+      PropTypes.string
+    ]),
+    service: PropTypes.string,
+    user: PropTypes.string
+  })
+};
+
+const composer = ({}, onData) => {
+  if (Meteor.subscribe("Packages").ready()) {
+    const shopSettings = Reaction.getShopSettings();
+    const settings = shopSettings.mail || {};
+
+    if (settings.service && settings.service !== "custom") {
+      const config = getServiceConfig(settings.service);
+
+      // show localhost for test providers like Maildev that have no host
+      settings.host = config.host || "localhost";
+      settings.port = config.port;
     }
+    return onData(null, { settings });
   }
 };
 
@@ -43,4 +80,4 @@ const depsMapper = () => ({
 export default merge(
   composeWithTracker(composer, Loading),
   useDeps(depsMapper)
-)(EmailConfig);
+)(EmailConfigContainer);