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

GUAC-1429: Return whole objects instead of identifiers to fix text/plain conversion error.

Browse Source
This commit is contained in:
James Muehlner
2015-12-09 22:22:34 -08:00
parent 8cf4b61720
commit 86841ebfe3
3 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java
View File

@@ -249,8 +249,8 @@ public class ConnectionRESTService {
}
/**
* Creates a new connection and returns the identifier of the new
* connection.
* Creates a new connection and returns the new connection, with identifier
* field populated.
*
* @param authToken
* The authentication token that is used to authenticate the user
@@ -264,14 +264,13 @@ public class ConnectionRESTService {
* The connection to create.
*
* @return
* The identifier of the new connection.
* The new connection.
*
* @throws GuacamoleException
* If an error occurs while creating the connection.
*/
@POST
@Produces(MediaType.TEXT_PLAIN)
public String createConnection(@QueryParam("token") String authToken,
public APIConnection createConnection(@QueryParam("token") String authToken,
@PathParam("dataSource") String authProviderIdentifier,
APIConnection connection) throws GuacamoleException {
@@ -286,8 +285,8 @@ public class ConnectionRESTService {
Directory<Connection> connectionDirectory = userContext.getConnectionDirectory();
connectionDirectory.add(new APIConnectionWrapper(connection));
// Return the new connection identifier
return connection.getIdentifier();
// Return the new connection
return connection;
}

16
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java
View File

@@ -190,10 +190,8 @@ public class ConnectionGroupRESTService {
}
/**
* Creates a new connection group and returns the identifier of the new connection group.
* If a parentID is provided, the connection group will be created in the
* connection group with the parentID. Otherwise, the root connection group
* will be used.
* Creates a new connection group and returns the new connection group,
* with identifier field populated.
*
* @param authToken
* The authentication token that is used to authenticate the user
@@ -207,14 +205,14 @@ public class ConnectionGroupRESTService {
* The connection group to create.
*
* @return
* The identifier of the new connection group.
* The new connection group.
*
* @throws GuacamoleException
* If an error occurs while creating the connection group.
*/
@POST
@Produces(MediaType.TEXT_PLAIN)
public String createConnectionGroup(@QueryParam("token") String authToken,
public APIConnectionGroup createConnectionGroup(
@QueryParam("token") String authToken,
@PathParam("dataSource") String authProviderIdentifier,
APIConnectionGroup connectionGroup) throws GuacamoleException {
@@ -229,8 +227,8 @@ public class ConnectionGroupRESTService {
Directory<ConnectionGroup> connectionGroupDirectory = userContext.getConnectionGroupDirectory();
connectionGroupDirectory.add(new APIConnectionGroupWrapper(connectionGroup));
// Return the new connection group identifier
return connectionGroup.getIdentifier();
// Return the new connection group
return connectionGroup;
}

9
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/user/UserRESTService.java
View File

@@ -217,7 +217,7 @@ public class UserRESTService {
}
/**
* Creates a new user and returns the username.
* Creates a new user and returns the user that was created.
*
* @param authToken
* The authentication token that is used to authenticate the user
@@ -234,11 +234,10 @@ public class UserRESTService {
* If a problem is encountered while creating the user.
*
* @return
* The username of the newly created user.
* The newly created user.
*/
@POST
@Produces(MediaType.TEXT_PLAIN)
public String createUser(@QueryParam("token") String authToken,
public APIUser createUser(@QueryParam("token") String authToken,
@PathParam("dataSource") String authProviderIdentifier, APIUser user)
throws GuacamoleException {
@@ -255,7 +254,7 @@ public class UserRESTService {
// Create the user
userDirectory.add(new APIUserWrapper(user));
return user.getUsername();
return user;
}