Merge pull request #2267 from coreos-inc/FIX-frontend-errors

fix(js): ensure method calls safe

static/js/directives/ui/set-repo-permissions.js

@@ -39,6 +39,9 @@ angular.module('quay').directive('setRepoPermissions', function () {
 
       var checkForChanges = function() {
         var hasChanges = false;
+        if (!$scope.repositories) {
+          return;
+        }
 
         $scope.repositories.forEach(function(repo) {
           if (repo['permission'] != repo['original_permission']) {
@@ -51,6 +54,9 @@ angular.module('quay').directive('setRepoPermissions', function () {
       };
 
       var handleRepoCheckChange = function() {
+        if (!$scope.repositories) {
+          return;
+        }
         $scope.repositories.forEach(function(repo) {
           if ($scope.checkedRepos.isChecked(repo)) {
             if (repo['permission'] == 'none') {
@@ -121,6 +127,11 @@ angular.module('quay').directive('setRepoPermissions', function () {
           $scope.currentNamespace = $scope.namespace;
 
           var repos = [];
+          if (!resp || !resp['repositories'] || resp['repositories'].length == 0) {
+            $scope.repositoriesLoaded({'repositories': []});
+            return;
+          }
+
           resp['repositories'].forEach(function(repo) {
             var existingPermission = existingPermissionsMap[repo.name] || 'none';
 
@@ -134,11 +145,6 @@ angular.module('quay').directive('setRepoPermissions', function () {
             });
           });
 
-          if (repos.length == 0) {
-            $scope.repositoriesLoaded({'repositories': repos});
-            return;
-          }
-
           $scope.repositories = repos;
           $scope.checkedRepos = UIService.createCheckStateController($scope.repositories, 'name');
 

static/js/directives/ui/signin-form.js

@@ -110,6 +110,10 @@ angular.module('quay').directive('signinForm', function () {
         }, function(result) {
           $scope.signingIn = false;
 
+          if (!result || !result.status /* malformed response */) {
+            return bootbox.alert(ApiService.getErrorMessage(result));
+          }
+
           if (result.status == 429 /* try again later */) {
             $scope.needsEmailVerification = false;
             $scope.invalidCredentials = false;
@@ -124,13 +128,18 @@ angular.module('quay').directive('signinForm', function () {
                 $scope.cancelInterval();
               }
             }, 1000, $scope.tryAgainSoon);
-          } else if (result.status == 400) {
+
-            bootbox.alert(ApiService.getErrorMessage(result));
+            return;
-          } else {
+          }
+
+          if (!result.data || result.status == 400 /* bad request */) {
+            return bootbox.alert(ApiService.getErrorMessage(result));
+          }
+
+          /* success - set scope values to response */
           $scope.needsEmailVerification = result.data.needsEmailVerification;
           $scope.invalidCredentials = result.data.invalidCredentials;
           $scope.invalidCredentialsMessage = result.data.message;
-          }
         });
       };
     }

static/js/services/api-service.js

@@ -290,7 +290,7 @@ angular.module('quay').factory('ApiService', ['Restangular', '$q', 'UtilService'
 
   apiService.getErrorMessage = function(resp, defaultMessage) {
     var message = defaultMessage;
-    if (resp['data']) {
+    if (resp && resp['data']) {
       //TODO: remove error_message and error_description (old style error)
       message = resp['data']['detail'] || resp['data']['error_message'] || resp['data']['message'] || resp['data']['error_description'] || message;
     }