Merge pull request #564 from apinf/revert-527-feature/api-backend-error-handling

Revert "Add error treatment to apiUmbrellaWeb[...].createApiBackend -…

Author: mauriciovieira

client/views/api_backends/autoform.js

@@ -1,61 +1,10 @@
 AutoForm.hooks({
   apiBackends: {
-    beginSubmit: function () {
-      // Disable form elements while submitting form
-      $('[data-schema-key], button').attr("disabled", "disabled");
-    },
-    endSubmit: function () {
-      // Enable form elements after form submission
-      $('[data-schema-key], button').removeAttr("disabled");
-    },
-    before: {
-      // Replace `formType` with the form `type` attribute to which this hook applies
-      insert: function (apiBackendForm) {
-        // Keep the context to use inside the callback function
-        context = this;
-
-        // Send the API Backend to API Umbrella
-        response = Meteor.call('createApiBackendOnApiUmbrella', apiBackendForm, function(error, apiUmbrellaWebResponse) {
-
-          //apiUmbrellaWebResponse contents
-          // apiUmbrellaWebResponse = {
-          //   result: {},
-          //   http_status: 200,
-          //   errors: {}
-          // };
-
-          if (apiUmbrellaWebResponse.http_status === 200) {
-            //Return asynchronously
-            context.result(apiBackendForm);
-          } else {
-            // ex 1:
-            // {"default":'{"backend_protocol":["is not included in the list"]}}'
-            // ex 2:
-            // {"errors":{"frontend_host":["must be in the format of \"example.com\""],
-            //            "backend_host":["must be in the format of \"example.com\""],
-            //            "base":["must have at least one url_matches"],
-            //            "servers[0].host":["must be in the format of \"example.com\"","Could not resolve host: no address for http://api.example.com"],
-            //            "servers[0].port":["can't be blank","is not included in the list"]}
-            // }
-
-            var errors = _.values(apiUmbrellaWebResponse.errors);
-            errors = _.flatten(errors);
-            _.each(errors, function(error) {
-              console.log(error);
-              //Display error to the user, keep the sAlert box visible.
-              sAlert.error(error, {timeout: 'none'});
-              // Figure out a way to send the errors back to the autoform fields, as if it were client validation.
-            });
-
-            //Return error asynchronously
-            context.result(false);
-         }
-        });
-      }
-    },
-    onSuccess: function (formType, apiBackendId) {
-      //Redirect to the just created API Backend page
-      Router.go('viewApiBackend', {_id: apiBackendId});
+    onSuccess: function (formType, backendId) {
+      // Send the API Backend to API Umbrella
+      Meteor.call('createApiBackendOnApiUmbrella', backendId);
+      // Redirect to the just created API Backend page
+      Router.go('viewApiBackend', {_id: backendId});
     }
   }
 });

server/methods/apiBackends.js

@@ -1,5 +1,5 @@
 Meteor.methods({
-  syncApiBackends: function () {
+  "syncApiBackends":function () {
     // Check if API Umbrella settings are available
     if (Meteor.settings.api_umbrella) {
       // Get API Backends from API Umbrella instance
@@ -17,45 +17,19 @@ Meteor.methods({
       });
     };
   },
-  createApiBackendOnApiUmbrella: function (apiBackendForm) {
-    console.log('Submitting Backend to API Umbrella.');
+  'createApiBackendOnApiUmbrella': function (apiBackendId) {
+    console.log('Submitting Backend to API Umbrella.')
+    // Get the API Backend object
+    var apiBackend = ApiBackends.findOne(apiBackendId);
 
     // Construct an API Backend object for API Umbrella with one 'api' key
     var constructedBackend = {
-      "api": apiBackendForm
-    };
-
-    var apiUmbrellaWebResponse = {
-      result: {},
-      http_status: 200,
-      errors: {}
+      "api": apiBackend
     };
 
     // Send the API Backend to API Umbrella
-    try {
-      apiUmbrellaWebResponse.result = apiUmbrellaWeb.adminApi.v1.apiBackends.createApiBackend(constructedBackend);
-    } catch (apiUmbrellaError) {
-
-      //apiUmbrellaError.message now is a string like
-      // example 1:
-      // '{"default":'{"backend_protocol":["is not included in the list"]}}'
-      // ex 2:
-      // '{"errors":{"frontend_host":["must be in the format of \"example.com\""],
-      //            "backend_host":["must be in the format of \"example.com\""],
-      //            "base":["must have at least one url_matches"],
-      //            "servers[0].host":["must be in the format of \"example.com\"","Could not resolve host: no address for http://api.example.com"],
-      //            "servers[0].port":["can't be blank","is not included in the list"]}'
-      // }
-      //after https://github.com/brylie/meteor-api-umbrella/issues/1 is closed, this code must be changed to something like:
-      // apiUmbrellaWebResponse.errors = error.errors
-      // apiUmbrellaWebResponse.status = error.http_status
-      // or http://docs.meteor.com/#/full/meteor_error should be considered
-
-      //set the errors object
-      apiUmbrellaWebResponse.errors = {'default': [apiUmbrellaError.message]};
-      apiUmbrellaWebResponse.http_status = 422;
-    }
+    var response = apiUmbrellaWeb.adminApi.v1.apiBackends.createApiBackend(constructedBackend);
 
-    return apiUmbrellaWebResponse;
+    // TODO: Add error checking to ensure backend successfully inserted in API Umbrella
   }
 });