safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 21:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #313 from glyptodon/GUAC-1407

Browse Source 
GUAC-1407: Add support for cloning existing users
This commit is contained in:
Mike Jumper
2015-12-29 10:49:11 -08:00
parent 790452d411 2bee2eab49
commit aa097cb880
9 changed files with 127 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole/src/main/webapp/app/manage/controllers/manageConnectionController.js
View File

@@ -350,7 +350,7 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
* Cancels all pending edits, returning to the management page.
*/
$scope.cancel = function cancel() {
$location.path('/settings/' + encodeURIComponent($scope.selectedDataSource) + '/connections');
$location.url('/settings/' + encodeURIComponent($scope.selectedDataSource) + '/connections');
};
/**
@@ -372,7 +372,7 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
// Save the connection
connectionService.saveConnection($scope.selectedDataSource, $scope.connection)
.success(function savedConnection() {
$location.path('/settings/' + encodeURIComponent($scope.selectedDataSource) + '/connections');
$location.url('/settings/' + encodeURIComponent($scope.selectedDataSource) + '/connections');
})
// Notify of any errors

118
guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
View File

@@ -80,6 +80,14 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
*/
var selectedDataSource = $routeParams.dataSource;
/**
* The username of the original user from which this user is
* being cloned. Only valid if this is a new user.
*
* @type String
*/
var cloneSourceUsername = $location.search().clone;
/**
* The username of the user being edited. If a new user is
* being created, this will not be defined.
@@ -88,6 +96,18 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
*/
var username = $routeParams.id;
/**
* The string value representing the user currently being edited within the
* permission flag set. Note that his may not match the user's actual
* username - it is a marker that is (1) guaranteed to be associated with
* the current user's permissions in the permission set and (2) guaranteed
* not to collide with any user that does not represent the current user
* within the permission set.
*
* @type String
*/
$scope.selfUsername = '';
/**
* All user accounts associated with the same username as the account being
* created or edited, as a map of data source identifier to the User object
@@ -362,6 +382,42 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
};
/**
* Returns whether the current user can clone the user being edited within
* the given data source.
*
* @param {String} [dataSource]
* The identifier of the data source to check. If omitted, this will
* default to the currently-selected data source.
*
* @returns {Boolean}
* true if the current user can clone the user being edited, false
* otherwise.
*/
$scope.canCloneUser = function canCloneUser(dataSource) {
// Do not check if permissions are not yet loaded
if (!$scope.permissions)
return false;
// Use currently-selected data source if unspecified
dataSource = dataSource || selectedDataSource;
// If we are not editing an existing user, we cannot clone
if (!username)
return false;
// The administrator can always clone users
if (PermissionSet.hasSystemPermission($scope.permissions[dataSource],
PermissionSet.SystemPermissionType.ADMINISTER))
return true;
// Otherwise we need explicit CREATE_USER permission
return PermissionSet.hasSystemPermission($scope.permissions[dataSource],
PermissionSet.SystemPermissionType.CREATE_USER);
};
/**
* Returns whether the current user can delete the user being edited from
* the given data source.
@@ -477,6 +533,10 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
});
// The current user will be associated with username of the existing
// user in the retrieved permission set
$scope.selfUsername = username;
// Pull user permissions
permissionService.getPermissions(selectedDataSource, username).success(function gotPermissions(permissions) {
$scope.permissionFlags = PermissionFlagSet.fromPermissionSet(permissions);
@@ -488,6 +548,35 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
});
}
// If we are cloning an existing user, pull his/her data instead
else if (cloneSourceUsername) {
dataSourceService.apply(userService.getUser, dataSources, cloneSourceUsername)
.then(function usersReceived(users) {
// Get user for currently-selected data source
$scope.users = {};
$scope.user = users[selectedDataSource];
});
// The current user will be associated with cloneSourceUsername in the
// retrieved permission set
$scope.selfUsername = cloneSourceUsername;
// Pull user permissions
permissionService.getPermissions(selectedDataSource, cloneSourceUsername)
.success(function gotPermissions(permissions) {
$scope.permissionFlags = PermissionFlagSet.fromPermissionSet(permissions);
permissionsAdded = permissions;
})
// If permissions cannot be retrieved, use empty permissions
.error(function permissionRetrievalFailed() {
$scope.permissionFlags = new PermissionFlagSet();
});
}
// Use skeleton data if we are creating a new user
else {
@@ -836,7 +925,15 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
* Cancels all pending edits, returning to the management page.
*/
$scope.cancel = function cancel() {
$location.path('/settings/users');
$location.url('/settings/users');
};
/**
* Cancels all pending edits, opening an edit page for a new user
* which is prepopulated with the data from the user currently being edited.
*/
$scope.cloneUser = function cloneUser() {
$location.path('/manage/' + encodeURIComponent(selectedDataSource) + '/users').search('clone', username);
};
/**
@@ -864,10 +961,27 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
saveUserPromise.success(function savedUser() {
// Move permission flags if username differs from marker
if ($scope.selfUsername !== $scope.user.username) {
// Rename added permission
if (permissionsAdded.userPermissions[$scope.selfUsername]) {
permissionsAdded.userPermissions[$scope.user.username] = permissionsAdded.userPermissions[$scope.selfUsername];
delete permissionsAdded.userPermissions[$scope.selfUsername];
}
// Rename removed permission
if (permissionsRemoved.userPermissions[$scope.selfUsername]) {
permissionsRemoved.userPermissions[$scope.user.username] = permissionsRemoved.userPermissions[$scope.selfUsername];
delete permissionsRemoved.userPermissions[$scope.selfUsername];
}
}
// Upon success, save any changed permissions
permissionService.patchPermissions(selectedDataSource, $scope.user.username, permissionsAdded, permissionsRemoved)
.success(function patchedUserPermissions() {
$location.path('/settings/users');
$location.url('/settings/users');
})
// Notify of any errors

5
guacamole/src/main/webapp/app/manage/templates/manageUser.html
View File

@@ -78,8 +78,8 @@ THE SOFTWARE.
</tr>
<tr>
<th>{{'MANAGE_USER.FIELD_HEADER_CHANGE_OWN_PASSWORD' | translate}}</th>
<td><input type="checkbox" ng-model="permissionFlags.userPermissions.UPDATE[user.username]"
ng-change="userPermissionChanged('UPDATE', user.username)"/></td>
<td><input type="checkbox" ng-model="permissionFlags.userPermissions.UPDATE[selfUsername]"
ng-change="userPermissionChanged('UPDATE', selfUsername)"/></td>
</tr>
</table>
</div>
@@ -108,6 +108,7 @@ THE SOFTWARE.
<!-- Form action buttons -->
<div class="action-buttons">
<button ng-show="canSaveUser()" ng-click="saveUser()">{{'MANAGE_USER.ACTION_SAVE' | translate}}</button>
<button ng-show="canCloneUser()" ng-click="cloneUser()">{{'MANAGE_USER.ACTION_CLONE' | translate}}</button>
<button ng-click="cancel()">{{'MANAGE_USER.ACTION_CANCEL' | translate}}</button>
<button ng-show="canDeleteUser()" ng-click="deleteUser()" class="danger">{{'MANAGE_USER.ACTION_DELETE' | translate}}</button>
</div>

1
guacamole/src/main/webapp/translations/de.json
View File

@@ -237,6 +237,7 @@
"ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE",
"ACTION_CANCEL" : "@:APP.ACTION_CANCEL",
"ACTION_CLONE" : "@:APP.ACTION_CLONE",
"ACTION_DELETE" : "@:APP.ACTION_DELETE",
"ACTION_SAVE" : "@:APP.ACTION_SAVE",

1
guacamole/src/main/webapp/translations/en.json
View File

@@ -237,6 +237,7 @@
"ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE",
"ACTION_CANCEL" : "@:APP.ACTION_CANCEL",
"ACTION_CLONE" : "@:APP.ACTION_CLONE",
"ACTION_DELETE" : "@:APP.ACTION_DELETE",
"ACTION_SAVE" : "@:APP.ACTION_SAVE",

1
guacamole/src/main/webapp/translations/fr.json
View File

@@ -228,6 +228,7 @@
"ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE",
"ACTION_CANCEL" : "@:APP.ACTION_CANCEL",
"ACTION_CLONE" : "@:APP.ACTION_CLONE",
"ACTION_DELETE" : "@:APP.ACTION_DELETE",
"ACTION_SAVE" : "@:APP.ACTION_SAVE",

1
guacamole/src/main/webapp/translations/it.json
View File

@@ -225,6 +225,7 @@
"ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE",
"ACTION_CANCEL" : "@:APP.ACTION_CANCEL",
"ACTION_CLONE" : "@:APP.ACTION_CLONE",
"ACTION_DELETE" : "@:APP.ACTION_DELETE",
"ACTION_SAVE" : "@:APP.ACTION_SAVE",

1
guacamole/src/main/webapp/translations/nl.json
View File

@@ -237,6 +237,7 @@
"ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE",
"ACTION_CANCEL" : "@:APP.ACTION_CANCEL",
"ACTION_CLONE" : "@:APP.ACTION_CLONE",
"ACTION_DELETE" : "@:APP.ACTION_DELETE",
"ACTION_SAVE" : "@:APP.ACTION_SAVE",

1
guacamole/src/main/webapp/translations/ru.json
View File

@@ -225,6 +225,7 @@
"ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE",
"ACTION_CANCEL" : "@:APP.ACTION_CANCEL",
"ACTION_CLONE" : "@:APP.ACTION_CLONE",
"ACTION_DELETE" : "@:APP.ACTION_DELETE",
"ACTION_SAVE" : "@:APP.ACTION_SAVE",