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

GUAC-932: Change user service path to /api/users.

Browse Source
This commit is contained in:
Michael Jumper
2014-12-18 01:12:33 -08:00
parent dc9d9da8d2
commit b7eaccf60b
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
* *
* @author James Muehlner * @author James Muehlner
*/ */
@Path("/user") @Path("/users")
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
public class UserRESTService { public class UserRESTService {

4
guacamole/src/main/webapp/app/rest/services/permissionService.js
View File

@@ -50,7 +50,7 @@ angular.module('rest').factory('permissionService', ['$http', 'authenticationSer
// Retrieve user permissions // Retrieve user permissions
return $http({ return $http({
method : 'GET', method : 'GET',
url : 'api/user/' + encodeURIComponent(userID) + '/permissions', url : 'api/users/' + encodeURIComponent(userID) + '/permissions',
params : httpParameters params : httpParameters
}); });
@@ -198,7 +198,7 @@ angular.module('rest').factory('permissionService', ['$http', 'authenticationSer
// Patch user permissions // Patch user permissions
return $http({ return $http({
method : 'PATCH', method : 'PATCH',
url : 'api/user/' + encodeURIComponent(userID) + '/permissions', url : 'api/users/' + encodeURIComponent(userID) + '/permissions',
params : httpParameters, params : httpParameters,
data : permissionPatch data : permissionPatch
}); });

10
guacamole/src/main/webapp/app/rest/services/userService.js
View File

@@ -56,7 +56,7 @@ angular.module('rest').factory('userService', ['$http', 'authenticationService',
// Retrieve users // Retrieve users
return $http({ return $http({
method : 'GET', method : 'GET',
url : 'api/user', url : 'api/users',
params : httpParameters params : httpParameters
}); });
@@ -73,7 +73,7 @@ angular.module('rest').factory('userService', ['$http', 'authenticationService',
* A promise which will resolve with a @link{User} upon success. * A promise which will resolve with a @link{User} upon success.
*/ */
service.getUser = function getUser(userID) { service.getUser = function getUser(userID) {
return $http.get("api/user/" + userID + "/?token=" + authenticationService.getCurrentToken()); return $http.get("api/users/" + userID + "/?token=" + authenticationService.getCurrentToken());
}; };
/** /**
@@ -88,7 +88,7 @@ angular.module('rest').factory('userService', ['$http', 'authenticationService',
*/ */
service.deleteUser = function deleteUser(user) { service.deleteUser = function deleteUser(user) {
return $http['delete']( return $http['delete'](
"api/user/" + user.username + "api/users/" + user.username +
"?token=" + authenticationService.getCurrentToken()); "?token=" + authenticationService.getCurrentToken());
}; };
@@ -105,7 +105,7 @@ angular.module('rest').factory('userService', ['$http', 'authenticationService',
*/ */
service.createUser = function createUser(user) { service.createUser = function createUser(user) {
return $http.post( return $http.post(
"api/user/" "api/users/"
+ "?token=" + authenticationService.getCurrentToken(), + "?token=" + authenticationService.getCurrentToken(),
user user
); );
@@ -123,7 +123,7 @@ angular.module('rest').factory('userService', ['$http', 'authenticationService',
*/ */
service.saveUser = function saveUser(user) { service.saveUser = function saveUser(user) {
return $http.post( return $http.post(
"api/user/" + user.username + "api/users/" + user.username +
"?token=" + authenticationService.getCurrentToken(), "?token=" + authenticationService.getCurrentToken(),
user); user);
}; };