Merge 1.0.0 changes back to master.

guacamole/src/main/webapp/app/manage/controllers/manageUserController.js

@@ -248,20 +248,27 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
     var loadExistingUser = function loadExistingUser(dataSource, username) {
         return $q.all({
             users : dataSourceService.apply(userService.getUser, dataSources, username),
-            permissions : permissionService.getPermissions(dataSource, username),
-            parentGroups : membershipService.getUserGroups(dataSource, username)
+
+            // Use empty permission set if user cannot be found
+            permissions:
+                    permissionService.getPermissions(dataSource, username)
+                    ['catch'](requestService.defaultValue(new PermissionSet())),
+
+            // Assume no parent groups if user cannot be found
+            parentGroups:
+                    membershipService.getUserGroups(dataSource, username)
+                    ['catch'](requestService.defaultValue([]))
+
         })
         .then(function userDataRetrieved(values) {
 
             $scope.users = values.users;
-            $scope.user  = values.users[dataSource];
             $scope.parentGroups = values.parentGroups;
 
             // Create skeleton user if user does not exist
-            if (!$scope.user)
-                $scope.user = new User({
-                    'username' : username
-                });
+            $scope.user = values.users[dataSource] || new User({
+                'username' : username
+            });
 
             // The current user will be associated with username of the existing
             // user in the retrieved permission set

guacamole/src/main/webapp/app/manage/controllers/manageUserGroupController.js

@@ -303,24 +303,39 @@ angular.module('manage').controller('manageUserGroupController', ['$scope', '$in
     var loadExistingUserGroup = function loadExistingGroup(dataSource, identifier) {
         return $q.all({
             userGroups   : dataSourceService.apply(userGroupService.getUserGroup, dataSources, identifier),
-            permissions  : permissionService.getPermissions(dataSource, identifier, true),
-            parentGroups : membershipService.getUserGroups(dataSource, identifier, true),
-            memberGroups : membershipService.getMemberUserGroups(dataSource, identifier),
-            memberUsers  : membershipService.getMemberUsers(dataSource, identifier)
+
+            // Use empty permission set if group cannot be found
+            permissions:
+                    permissionService.getPermissions(dataSource, identifier, true)
+                    ['catch'](requestService.defaultValue(new PermissionSet())),
+
+            // Assume no parent groups if group cannot be found
+            parentGroups:
+                    membershipService.getUserGroups(dataSource, identifier, true)
+                    ['catch'](requestService.defaultValue([])),
+
+            // Assume no member groups if group cannot be found
+            memberGroups:
+                    membershipService.getMemberUserGroups(dataSource, identifier)
+                    ['catch'](requestService.defaultValue([])),
+
+            // Assume no member users if group cannot be found
+            memberUsers:
+                    membershipService.getMemberUsers(dataSource, identifier)
+                    ['catch'](requestService.defaultValue([]))
+
         })
         .then(function userGroupDataRetrieved(values) {
 
             $scope.userGroups = values.userGroups;
-            $scope.userGroup  = values.userGroups[dataSource];
             $scope.parentGroups = values.parentGroups;
             $scope.memberGroups = values.memberGroups;
             $scope.memberUsers = values.memberUsers;
 
             // Create skeleton user group if user group does not exist
-            if (!$scope.userGroup)
-                $scope.userGroup = new UserGroup({
-                    'identifier' : identifier
-                });
+            $scope.userGroup  = values.userGroups[dataSource] || new UserGroup({
+                'identifier' : identifier
+            });
 
             $scope.permissionFlags = PermissionFlagSet.fromPermissionSet(values.permissions);