loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'loic' into develop

Browse source
This commit is contained in:
manzerbredes 2016-02-10 19:28:31 +01:00
commit e026ce21b4
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/js/controllers/login.js
View file

@ -29,10 +29,10 @@ mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$s
result.then(function (response){ result.then(function (response){
// Parser result // Parser result
var requestResultObject=Identity.parseLoginAnswer(response); var response=Identity.getResponse();
// Check for error // Check for error
if(requestResultObject.status!==0){ if(response.status!==0){
$('#failedToLoginAlert').show(); $('#failedToLoginAlert').show();
} }

11
client/js/services/Identity.js
View file

@ -7,6 +7,8 @@ mainApp.factory('Identity',[ '$http', function($http){
profile.projectname="Undefined"; profile.projectname="Undefined";
profile.token=""; profile.token="";
/* Will contain the result of the $http request */
var $httpResponse;
/** /**
* Function to connect to OpenStack * Function to connect to OpenStack
@ -21,8 +23,9 @@ mainApp.factory('Identity',[ '$http', function($http){
profile.username=username; profile.username=username;
profile.projectname=projectname; profile.projectname=projectname;
return $http.post('../server/index.php', $httpResponse=$http.post('../server/index.php',
$.param({"task" : "Authenticate", "user" : username, "password" : password, "project" : projectname})); $.param({"task" : "Authenticate", "user" : username, "password" : password, "project" : projectname}));
return $httpResponse;
}; };
@ -45,11 +48,15 @@ mainApp.factory('Identity',[ '$http', function($http){
}; };
var getResponse=function(){
return parseLoginAnswer($httpResponse);
}
// Return services objects // Return services objects
return { return {
login: login, login: login,
parseLoginAnswer: parseLoginAnswer, getResponse: getResponse,
profile: profile profile: profile
}; };