mirror of
https://github.com/gyurix1968/guacamole-client.git
synced 2025-09-06 21:27:40 +00:00
GUACAMOLE-36: Provide access to object within beforeCreate().
This commit is contained in:
@@ -172,9 +172,9 @@ public abstract class ModeledChildDirectoryObjectService<InternalType extends Mo
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void beforeCreate(ModeledAuthenticatedUser user,
|
protected void beforeCreate(ModeledAuthenticatedUser user,
|
||||||
ModelType model) throws GuacamoleException {
|
ExternalType object, ModelType model) throws GuacamoleException {
|
||||||
|
|
||||||
super.beforeCreate(user, model);
|
super.beforeCreate(user, object, model);
|
||||||
|
|
||||||
// Validate that we can update all applicable parents
|
// Validate that we can update all applicable parents
|
||||||
if (!canUpdateModifiedParents(user, null, model))
|
if (!canUpdateModifiedParents(user, null, model))
|
||||||
|
@@ -222,6 +222,9 @@ public abstract class ModeledDirectoryObjectService<InternalType extends Modeled
|
|||||||
* @param user
|
* @param user
|
||||||
* The user creating the object.
|
* The user creating the object.
|
||||||
*
|
*
|
||||||
|
* @param object
|
||||||
|
* The object being created.
|
||||||
|
*
|
||||||
* @param model
|
* @param model
|
||||||
* The model of the object being created.
|
* The model of the object being created.
|
||||||
*
|
*
|
||||||
@@ -230,7 +233,7 @@ public abstract class ModeledDirectoryObjectService<InternalType extends Modeled
|
|||||||
* object.
|
* object.
|
||||||
*/
|
*/
|
||||||
protected void beforeCreate(ModeledAuthenticatedUser user,
|
protected void beforeCreate(ModeledAuthenticatedUser user,
|
||||||
ModelType model ) throws GuacamoleException {
|
ExternalType object, ModelType model) throws GuacamoleException {
|
||||||
|
|
||||||
// Verify permission to create objects
|
// Verify permission to create objects
|
||||||
if (!user.getUser().isAdministrator() && !hasCreatePermission(user))
|
if (!user.getUser().isAdministrator() && !hasCreatePermission(user))
|
||||||
@@ -436,7 +439,7 @@ public abstract class ModeledDirectoryObjectService<InternalType extends Modeled
|
|||||||
throws GuacamoleException {
|
throws GuacamoleException {
|
||||||
|
|
||||||
ModelType model = getModelInstance(user, object);
|
ModelType model = getModelInstance(user, object);
|
||||||
beforeCreate(user, model);
|
beforeCreate(user, object, model);
|
||||||
|
|
||||||
// Create object
|
// Create object
|
||||||
getObjectMapper().insert(model);
|
getObjectMapper().insert(model);
|
||||||
|
@@ -156,9 +156,10 @@ public class ConnectionService extends ModeledChildDirectoryObjectService<Modele
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void beforeCreate(ModeledAuthenticatedUser user,
|
protected void beforeCreate(ModeledAuthenticatedUser user,
|
||||||
ConnectionModel model) throws GuacamoleException {
|
Connection object, ConnectionModel model)
|
||||||
|
throws GuacamoleException {
|
||||||
|
|
||||||
super.beforeCreate(user, model);
|
super.beforeCreate(user, object, model);
|
||||||
|
|
||||||
// Name must not be blank
|
// Name must not be blank
|
||||||
if (model.getName() == null || model.getName().trim().isEmpty())
|
if (model.getName() == null || model.getName().trim().isEmpty())
|
||||||
|
@@ -139,9 +139,10 @@ public class ConnectionGroupService extends ModeledChildDirectoryObjectService<M
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void beforeCreate(ModeledAuthenticatedUser user,
|
protected void beforeCreate(ModeledAuthenticatedUser user,
|
||||||
ConnectionGroupModel model) throws GuacamoleException {
|
ConnectionGroup object, ConnectionGroupModel model)
|
||||||
|
throws GuacamoleException {
|
||||||
|
|
||||||
super.beforeCreate(user, model);
|
super.beforeCreate(user, object, model);
|
||||||
|
|
||||||
// Name must not be blank
|
// Name must not be blank
|
||||||
if (model.getName() == null || model.getName().trim().isEmpty())
|
if (model.getName() == null || model.getName().trim().isEmpty())
|
||||||
|
@@ -139,9 +139,10 @@ public class SharingProfileService
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void beforeCreate(ModeledAuthenticatedUser user,
|
protected void beforeCreate(ModeledAuthenticatedUser user,
|
||||||
SharingProfileModel model) throws GuacamoleException {
|
SharingProfile object, SharingProfileModel model)
|
||||||
|
throws GuacamoleException {
|
||||||
|
|
||||||
super.beforeCreate(user, model);
|
super.beforeCreate(user, object, model);
|
||||||
|
|
||||||
// Name must not be blank
|
// Name must not be blank
|
||||||
if (model.getName() == null || model.getName().trim().isEmpty())
|
if (model.getName() == null || model.getName().trim().isEmpty())
|
||||||
|
@@ -185,10 +185,10 @@ public class UserService extends ModeledDirectoryObjectService<ModeledUser, User
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void beforeCreate(ModeledAuthenticatedUser user, UserModel model)
|
protected void beforeCreate(ModeledAuthenticatedUser user, User object,
|
||||||
throws GuacamoleException {
|
UserModel model) throws GuacamoleException {
|
||||||
|
|
||||||
super.beforeCreate(user, model);
|
super.beforeCreate(user, object, model);
|
||||||
|
|
||||||
// Username must not be blank
|
// Username must not be blank
|
||||||
if (model.getIdentifier() == null || model.getIdentifier().trim().isEmpty())
|
if (model.getIdentifier() == null || model.getIdentifier().trim().isEmpty())
|
||||||
|
Reference in New Issue
Block a user