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

GUAC-932: Remove use of localStorageUtility where possible. Use cookies for auth data.

Browse Source
This commit is contained in:
Michael Jumper
2014-11-30 03:31:46 -08:00
parent 4d1e604759
commit fee75204bd
12 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
guacamole/src/main/webapp/app/connection/service/connectionDAO.js
View File

@@ -23,8 +23,8 @@
/**
* The DAO for connection operations agains the REST API.
*/
angular.module('connection').factory('connectionDAO', ['$http', 'localStorageUtility',
function connectionDAO($http, localStorageUtility) {
angular.module('connection').factory('connectionDAO', ['$http', 'authenticationService',
function connectionDAO($http, authenticationService) {
var service = {};
@@ -36,7 +36,7 @@ angular.module('connection').factory('connectionDAO', ['$http', 'localStorageUti
* @returns {promise} A promise for the HTTP call.
*/
service.getConnection = function getConnection(id) {
return $http.get("api/connection/" + id + "?token=" + localStorageUtility.get('authToken'));
return $http.get("api/connection/" + id + "?token=" + authenticationService.getCurrentToken());
};
/**
@@ -55,7 +55,7 @@ angular.module('connection').factory('connectionDAO', ['$http', 'localStorageUti
if(parentID !== undefined)
parentIDParam = "&parentID=" + parentID;
return $http.get("api/connection?token=" + localStorageUtility.get('authToken') + parentIDParam);
return $http.get("api/connection?token=" + authenticationService.getCurrentToken() + parentIDParam);
};
/**
@@ -74,7 +74,7 @@ angular.module('connection').factory('connectionDAO', ['$http', 'localStorageUti
// This is a new connection
if(!connectionToSave.identifier) {
return $http.post("api/connection/?token=" + localStorageUtility.get('authToken'), connectionToSave).success(
return $http.post("api/connection/?token=" + authenticationService.getCurrentToken(), connectionToSave).success(
function setConnectionID(connectionID){
// Set the identifier on the new connection
connection.identifier = connectionID;
@@ -83,7 +83,7 @@ angular.module('connection').factory('connectionDAO', ['$http', 'localStorageUti
} else {
return $http.post(
"api/connection/" + connectionToSave.identifier +
"?token=" + localStorageUtility.get('authToken'),
"?token=" + authenticationService.getCurrentToken(),
connectionToSave);
}
};
@@ -100,7 +100,7 @@ angular.module('connection').factory('connectionDAO', ['$http', 'localStorageUti
return $http.put(
"api/connection/" + connection.identifier +
"?token=" + localStorageUtility.get('authToken') +
"?token=" + authenticationService.getCurrentToken() +
"&parentID=" + connection.parentIdentifier,
connection);
@@ -117,7 +117,7 @@ angular.module('connection').factory('connectionDAO', ['$http', 'localStorageUti
service.deleteConnection = function deleteConnection(connection) {
return $http['delete'](
"api/connection/" + connection.identifier +
"?token=" + localStorageUtility.get('authToken'));
"?token=" + authenticationService.getCurrentToken());
};
return service;