Fix indent.
This commit is contained in:
Alexis Lahouze
@ -37,123 +37,122 @@ var loginModule = angular.module('accountant.login', [
|
||||
ngUiBootstrap
|
||||
])
|
||||
|
||||
.factory('LoginService', function($uibModal, $storage, $document, $log, authService) {
|
||||
var login = function () {
|
||||
$storage.session.clear();
|
||||
.factory('LoginService', function($uibModal, $storage, $document, $log, authService) {
|
||||
var login = function () {
|
||||
$storage.session.clear();
|
||||
|
||||
var modalInstance = $uibModal.open({
|
||||
ariaLabelledBy: 'modal-title',
|
||||
ariaDescribedBy: 'modal-body',
|
||||
templateUrl: loginTmpl,
|
||||
controller: 'LoginModalController',
|
||||
controllerAs: '$ctrl'
|
||||
});
|
||||
var modalInstance = $uibModal.open({
|
||||
ariaLabelledBy: 'modal-title',
|
||||
ariaDescribedBy: 'modal-body',
|
||||
templateUrl: loginTmpl,
|
||||
controller: 'LoginModalController',
|
||||
controllerAs: '$ctrl'
|
||||
});
|
||||
|
||||
modalInstance.result.then(function (data) {
|
||||
$log.log(data);
|
||||
modalInstance.result.then(function (data) {
|
||||
$log.log(data);
|
||||
|
||||
$storage.session.set('refresh_token', data.refresh_token);
|
||||
$storage.session.set('access_token', data.access_token);
|
||||
$storage.session.set('refresh_token', data.refresh_token);
|
||||
$storage.session.set('access_token', data.access_token);
|
||||
|
||||
authService.loginConfirmed();
|
||||
}, function () {
|
||||
$log.info('Modal dismissed at: ' + new Date());
|
||||
authService.loginConfirmed();
|
||||
}, function () {
|
||||
$log.info('Modal dismissed at: ' + new Date());
|
||||
|
||||
// FIXME Alexis Lahouze 2017-06-11 Redirect to error page.
|
||||
authService.loginCancelled(null, 'Login cancelled by user action.');
|
||||
});
|
||||
};
|
||||
|
||||
var cancelLogin = function () {
|
||||
// FIXME Alexis Lahouze 2017-06-11 Redirect to error page.
|
||||
authService.loginCancelled(null, 'Login cancelled by user action.');
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
var cancelLogin = function () {
|
||||
// FIXME Alexis Lahouze 2017-06-11 Redirect to error page.
|
||||
};
|
||||
return {
|
||||
'login': login,
|
||||
'cancelLogin': cancelLogin
|
||||
};
|
||||
})
|
||||
|
||||
return {
|
||||
'login': login,
|
||||
'cancelLogin': cancelLogin
|
||||
};
|
||||
})
|
||||
.factory('sessionInjector', function($storage) {
|
||||
var sessionInjector = {
|
||||
request: function(config) {
|
||||
var access_token = $storage.session.get('access_token');
|
||||
|
||||
.factory('sessionInjector', function($storage) {
|
||||
var sessionInjector = {
|
||||
request: function(config) {
|
||||
var access_token = $storage.session.get('access_token');
|
||||
if (access_token) {
|
||||
//var tokenType = $storage.get('token_type');
|
||||
var tokenType = 'Bearer';
|
||||
var authorization = tokenType + ' ' + access_token;
|
||||
config.headers.authorization = authorization;
|
||||
}
|
||||
|
||||
if (access_token) {
|
||||
//var tokenType = $storage.get('token_type');
|
||||
var tokenType = 'Bearer';
|
||||
var authorization = tokenType + ' ' + access_token;
|
||||
config.headers.authorization = authorization;
|
||||
return config;
|
||||
}
|
||||
};
|
||||
|
||||
return config;
|
||||
}
|
||||
};
|
||||
return sessionInjector;
|
||||
})
|
||||
|
||||
return sessionInjector;
|
||||
})
|
||||
.config(function($httpProvider, $storageProvider) {
|
||||
// Define interceptors.
|
||||
$httpProvider.interceptors.push('sessionInjector');
|
||||
|
||||
.config(function($httpProvider, $storageProvider) {
|
||||
// Define interceptors.
|
||||
$httpProvider.interceptors.push('sessionInjector');
|
||||
// Configure storage
|
||||
// Set global prefix for stored keys
|
||||
$storageProvider.setPrefix('accountant');
|
||||
|
||||
// Configure storage
|
||||
// Set global prefix for stored keys
|
||||
$storageProvider.setPrefix('accountant');
|
||||
// Change the default storage engine
|
||||
// Defaults to 'local'
|
||||
$storageProvider.setDefaultStorageEngine('session');
|
||||
|
||||
// Change the default storage engine
|
||||
// Defaults to 'local'
|
||||
$storageProvider.setDefaultStorageEngine('session');
|
||||
// Change the enabled storage engines
|
||||
// Defaults to ['memory', 'cookie', 'session', 'local']
|
||||
$storageProvider.setEnabledStorageEngines(['local', 'session']);
|
||||
})
|
||||
|
||||
// Change the enabled storage engines
|
||||
// Defaults to ['memory', 'cookie', 'session', 'local']
|
||||
$storageProvider.setEnabledStorageEngines(['local', 'session']);
|
||||
})
|
||||
.controller('LoginModalController', function($scope, $uibModalInstance, $http, $log) {
|
||||
var vm = this;
|
||||
|
||||
.controller('LoginModalController', function($scope, $uibModalInstance, $http, $log) {
|
||||
var vm = this;
|
||||
vm.data = {
|
||||
email: null,
|
||||
password: null
|
||||
};
|
||||
|
||||
vm.data = {
|
||||
email: null,
|
||||
password: null
|
||||
};
|
||||
vm.ok = function() {
|
||||
var email = vm.data.email;
|
||||
var password = vm.data.password;
|
||||
|
||||
vm.ok = function() {
|
||||
var email = vm.data.email;
|
||||
var password = vm.data.password;
|
||||
// Encode authentication data.
|
||||
var authdata = base64.encode(email + ':' + password);
|
||||
|
||||
// Encode authentication data.
|
||||
var authdata = base64.encode(email + ':' + password);
|
||||
return $http.post('/api/user/login', {}, {
|
||||
ignoreAuthModule: true,
|
||||
headers: {
|
||||
'authorization': 'Basic ' + authdata
|
||||
}
|
||||
}).then(function(result) {
|
||||
$log.log(result);
|
||||
|
||||
return $http.post('/api/user/login', {}, {
|
||||
ignoreAuthModule: true,
|
||||
headers: {
|
||||
'authorization': 'Basic ' + authdata
|
||||
}
|
||||
}).then(function(result) {
|
||||
$log.log(result);
|
||||
$uibModalInstance.close(result.data);
|
||||
}, function(response) {
|
||||
// FIXME Alexis Lahouze 2017-06-11 Handle error.
|
||||
$log.log("Error on login", response);
|
||||
});
|
||||
};
|
||||
|
||||
$uibModalInstance.close(result.data);
|
||||
}, function(response) {
|
||||
// FIXME Alexis Lahouze 2017-06-11 Handle error.
|
||||
$log.log("Error on login", response);
|
||||
vm.cancel = function() {
|
||||
$uibModalInstance.dismiss('cancel');
|
||||
};
|
||||
})
|
||||
|
||||
.run(function($rootScope, LoginService) {
|
||||
var onAuthLoginRequired = $rootScope.$on('event:auth-loginRequired', LoginService.login);
|
||||
|
||||
var onAuthLoginCancelled = $rootScope.$on('event:auth-loginCancelled', LoginService.cancelLogin);
|
||||
|
||||
$rootScope.$on('$destroy', function() {
|
||||
onAuthLoginRequired = angular.noop();
|
||||
});
|
||||
};
|
||||
|
||||
vm.cancel = function() {
|
||||
$uibModalInstance.dismiss('cancel');
|
||||
};
|
||||
})
|
||||
|
||||
.run(function($rootScope, LoginService) {
|
||||
var onAuthLoginRequired = $rootScope.$on('event:auth-loginRequired', LoginService.login);
|
||||
|
||||
var onAuthLoginCancelled = $rootScope.$on('event:auth-loginCancelled', LoginService.cancelLogin);
|
||||
|
||||
$rootScope.$on('$destroy', function() {
|
||||
onAuthLoginRequired = angular.noop();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
module.exports = loginModule;
|
||||
|
||||
Reference in New Issue
Block a user