bug 1315335: JSON parse errors should be exposed in New Release UI (#177

). r=bhearsum
mozilla-releng · Nov 21, 2016 · 5a76e64 · 5a76e64
1 parent 1d97cda
commit 5a76e64
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/ui/app/js/controllers/release_edit_controller.js b/ui/app/js/controllers/release_edit_controller.js
@@ -21,12 +21,16 @@ function ($scope, $modalInstance, CSRF, Releases, release) {
     reader.onloadend = function(evt) {
       var blob = evt.target.result;
       $scope.$apply( function() {
-         var name = JSON.parse(blob).name;
-         if(!name) {
-           $scope.errors.data = ["Form submission error", "Name missing in blob.\n"];
-         }
-         else if (name !== $scope.release.name) {
-          $scope.errors.data = ["Form submission error", "Name differs compared to name in blob.\n"];
+        try {
+          var name = JSON.parse(blob).name;
+          if(!name) {
+            $scope.errors.data = ["Form submission error", "Name missing in blob.\n"];
+          }
+          else if (name !== $scope.release.name) {
+            $scope.errors.data = ["Form submission error", "Name differs compared to name in blob.\n"];
+          }
+        }catch(err) {
+          $scope.errors.data = ["Form submission error", "Malformed JSON file.\n"];
         }
       });
     };

diff --git a/ui/app/js/controllers/release_new_controller.js b/ui/app/js/controllers/release_new_controller.js
@@ -27,12 +27,16 @@ function($scope, $http, $modalInstance, CSRF, Releases, releases) {
     reader.onloadend = function(evt) {
       var blob = evt.target.result;
       $scope.$apply( function() {
-        var name = JSON.parse(blob).name;
-        if (name) {
-           $scope.release.name = name;
-        }
-        else {
-          $scope.errors.data = ["Form submission error", "Missing name field in JSON blob.\n"];
+        try{
+          var name = JSON.parse(blob).name;
+          if (name) {
+            $scope.release.name = name;
+          }
+          else {
+            $scope.errors.data = ["Form submission error", "Missing name field in JSON blob.\n"];
+          }
+        }catch(err) {
+           $scope.errors.data = ["Form submission error", "Malformed JSON file.\n"];
         }
       });
     };