github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor(auth): remove empty $q.deffered

pull/2749/head
Chaim Lev Ari 2019-01-02 15:59:38 +02:00
parent 7494101a4d
commit 38f24683a6
1 changed files with 53 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/portainer/services/authentication.js
View File

@ -1,5 +1,7 @@
angular.module('portainer.app') angular.module('portainer.app')
.factory('Authentication', ['$q', 'Auth', 'OAuth', 'jwtHelper', 'LocalStorage', 'StateManager', 'EndpointProvider', function AuthenticationFactory($q, Auth, OAuth, jwtHelper, LocalStorage, StateManager, EndpointProvider) { .factory('Authentication', [
'Auth', 'OAuth', 'jwtHelper', 'LocalStorage', 'StateManager', 'EndpointProvider',
function AuthenticationFactory(Auth, OAuth, jwtHelper, LocalStorage, StateManager, EndpointProvider) {
'use strict'; 'use strict';
var service = {}; var service = {};
@ -24,40 +26,25 @@ angular.module('portainer.app')
} }
function oAuthLogin(code) { function oAuthLogin(code) {
var deferred = $q.defer(); return OAuth.login({code: code}).$promise
OAuth.login({code: code}).$promise
.then(function success(data) { .then(function success(data) {
LocalStorage.storeJWT(data.jwt); LocalStorage.storeJWT(data.jwt);
var tokenPayload = jwtHelper.decodeToken(data.jwt); var tokenPayload = jwtHelper.decodeToken(data.jwt);
user.username = tokenPayload.username; user.username = tokenPayload.username;
user.ID = tokenPayload.id; user.ID = tokenPayload.id;
user.role = tokenPayload.role; user.role = tokenPayload.role;
deferred.resolve();
})
.catch(function error() {
deferred.reject();
}); });
return deferred.promise;
} }
function login(username, password) { function login(username, password) {
var deferred = $q.defer(); return Auth.login({username: username, password: password}).$promise
Auth.login({username: username, password: password}).$promise
.then(function success(data) { .then(function success(data) {
LocalStorage.storeJWT(data.jwt); LocalStorage.storeJWT(data.jwt);
var tokenPayload = jwtHelper.decodeToken(data.jwt); var tokenPayload = jwtHelper.decodeToken(data.jwt);
user.username = username; user.username = username;
user.ID = tokenPayload.id; user.ID = tokenPayload.id;
user.role = tokenPayload.role; user.role = tokenPayload.role;
deferred.resolve();
})
.catch(function error() {
deferred.reject();
}); });
return deferred.promise;
} }
function logout() { function logout() {