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

Make login part dynamic

Browse source
This commit is contained in:
manzerbredes 2016-02-05 17:47:53 +01:00
parent 31f3a9d77f
commit a16df328c0
4 changed files with 43 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/index.html
View file

@ -73,7 +73,6 @@
<!-- Include resquest dependencies --> <!-- Include resquest dependencies -->
<script src="./js/requests/identity.js"></script> <script src="./js/requests/identity.js"></script>
<script src="./js/requests/errors.js"></script>
<!-- Include controller --> <!-- Include controller -->
<script src="./js/controllers/login.js"></script> <script src="./js/controllers/login.js"></script>

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

@ -3,7 +3,7 @@
* Represents a book. * Represents a book.
* @constructor * @constructor
*/ */
mainApp.controller('loginCtrl', function ($scope,$interval,$sce) mainApp.controller('loginCtrl', function ($scope,$interval,$sce, $http)
{ {
// Define default states // Define default states
$('#loginModal').modal({backdrop: 'static', keyboard: false}); $('#loginModal').modal({backdrop: 'static', keyboard: false});
@ -12,30 +12,40 @@ mainApp.controller('loginCtrl', function ($scope,$interval,$sce)
$('#loginButton').click(function(){ $('#loginButton').click(function(){
$('#loginButton').hide(); $('#loginButton').hide();
$('#loadingLoginButton').show(); $('#loadingLoginButton').show();
$('#failedToLoginAlert').hide(); $('#failedToLoginAlert').hide();
var result=identity.login($("#loginFormUsername").val(), $("#loginFormProjectname").val(), $("#loginFormPassword").val()); var result=identity.request.login($http,$("#loginFormUsername").val(), $("#loginFormProjectname").val(), $("#loginFormPassword").val());
$interval( result.then(function (response){
function()
{ // Parser result
var requestResultObject=identity.requestParser.parseLoginAnswer(response);
// Check for error // Check for error
if(!errors.checkForLogin(result)){ if(requestResultObject.status!==0){
//alert(result.data)
$('#failedToLoginAlert').show(); $('#failedToLoginAlert').show();
} }
else { else {
$('#loginModal').modal('hide'); $('#loginModal').modal('hide');
} }
// Reset button state // Reset button state
$('#loginButton').show(); $('#loginButton').show();
$('#loadingLoginButton').hide(); $('#loadingLoginButton').hide();
}, 2000,1); },function(response){
$('#failedToLoginAlert').show();
// Reset button state
$('#loginButton').show();
$('#loadingLoginButton').hide();
});
}); });
}); });

14
client/js/requests/errors.js
View file

@ -1,14 +0,0 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
var errors={};
errors.checkForLogin=function(result){
// TODO
return true;
};

54
client/js/requests/identity.js
View file

@ -1,47 +1,31 @@
// Make Namespace // Make Namespace
var identity = {}; var identity = {};
identity.request = {}; // Request part
identity.requestParser = {}; // Parser part
identity.login=function(username, projectname, password){
identity.request.login=function($http,username, projectname, password){
var requestResultObject={};
// Todo return $http.post('http://localhost.istic-openstack/server/index.php',
$.param({"task" : "Authenticate", "user" : username, "password" : password, "project" : projectname}),
return "tokens"; {headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}});
}; };
/* identity.requestParser.parseLoginAnswer=function(response){
mainApp.controller('identityCtrl', function($scope, $http) { var requestParserResult={};
$scope.identityFormData = {};
$scope.processForm = function() {
$http({
method : 'POST',
url : 'http://148.60.11.31/',
data : $.param($scope.identityFormData),
headers : { 'Content-Type': 'application/x-www-form-urlencoded' }
})
.success(function(data) {
console.log(data);
if (!data.success) {
// if not successful, bind errors to error variables
//$scope.errorName = data.errors.name;
//$scope.errorSuperhero = data.errors.superheroAlias;
} else {
// if successful, bind success message to message
//$scope.message = data.message;
}
});
};
});*/
requestParserResult.status=0;
requestParserResult.data=response.data;
// TODO
return requestParserResult;
};