You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/07/13 05:10:01 UTC
[23/24] incubator-guacamole-client git commit: GUACAMOLE-5: Update
tunnelService to match REST changes.
GUACAMOLE-5: Update tunnelService to match REST changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/b66925c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/b66925c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/b66925c3
Branch: refs/heads/master
Commit: b66925c3d000c1ddc660a36ab8ccb4427669a1f8
Parents: abef36e
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Jul 12 22:02:41 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Jul 12 22:02:41 2016 -0700
----------------------------------------------------------------------
guacamole/src/main/webapp/app/rest/services/tunnelService.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/b66925c3/guacamole/src/main/webapp/app/rest/services/tunnelService.js
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/rest/services/tunnelService.js b/guacamole/src/main/webapp/app/rest/services/tunnelService.js
index 35c42a8..e93c50f 100644
--- a/guacamole/src/main/webapp/app/rest/services/tunnelService.js
+++ b/guacamole/src/main/webapp/app/rest/services/tunnelService.js
@@ -62,7 +62,7 @@ angular.module('rest').factory('tunnelService', ['$injector',
// Retrieve tunnels
return $http({
method : 'GET',
- url : 'api/tunnels',
+ url : 'api/session/tunnels',
params : httpParameters
});
@@ -100,7 +100,7 @@ angular.module('rest').factory('tunnelService', ['$injector',
// Build download URL
var url = $window.location.origin
+ $window.location.pathname
- + 'api/tunnels/' + encodeURIComponent(tunnel)
+ + 'api/session/tunnels/' + encodeURIComponent(tunnel)
+ '/streams/' + encodeURIComponent(stream.index)
+ '/' + encodeURIComponent(filename)
+ '?token=' + encodeURIComponent(authenticationService.getCurrentToken());
@@ -163,7 +163,7 @@ angular.module('rest').factory('tunnelService', ['$injector',
// Build upload URL
var url = $window.location.origin
+ $window.location.pathname
- + 'api/tunnels/' + encodeURIComponent(tunnel)
+ + 'api/session/tunnels/' + encodeURIComponent(tunnel)
+ '/streams/' + encodeURIComponent(stream.index)
+ '/' + encodeURIComponent(file.name)
+ '?token=' + encodeURIComponent(authenticationService.getCurrentToken());