Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

Removed restangular from AuthService.js #3601

Merged
mitchell852 merged 2 commits into from
Jul 26, 2019
Merged

Removed restangular from AuthService.js #3601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3475b4
Removed restangular from ./AuthService.js
ocket8888 May 28, 2019
7a701e6
fixed login button being permanently un-click-able after bad login
ocket8888 Jun 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 38 additions & 42 deletions traffic_portal/app/src/common/api/AuthService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,64 +17,60 @@
* under the License.
*/

var AuthService = function($rootScope, $http, $state, $location, $q, $state, httpService, userModel, messageModel, ENV) {
var AuthService = function($rootScope, $http, $state, $location, userModel, messageModel, ENV) {

this.login = function(username, password) {
userModel.resetUser();
return httpService.post(ENV.api['root'] + 'user/login', { u: username, p: password })
.then(
function(result) {
$rootScope.$broadcast('authService::login');
var redirect = decodeURIComponent($location.search().redirect);
if (redirect !== 'undefined') {
$location.search('redirect', null); // remove the redirect query param
$location.url(redirect);
} else {
$location.url('/');
}
},
function(fault) {
// do nothing
return $http.post(ENV.api['root'] + 'user/login', { u: username, p: password }).then(
function(result) {
$rootScope.$broadcast('authService::login');
const redirect = decodeURIComponent($location.search().redirect);
if (redirect !== 'undefined') {
$location.search('redirect', null); // remove the redirect query param
$location.url(redirect);
} else {
$location.url('/');
}
);
return result;
},
function(err) {
throw err;
Comment thread
ocket8888 marked this conversation as resolved.
Outdated
}
);
};

this.tokenLogin = function(token) {
var deferred = $q.defer();

userModel.resetUser();

$http.post(ENV.api['root'] + "user/login/token", { t: token })
.then(
function() {
deferred.resolve();
},
function() {
deferred.reject();
}
);

return deferred.promise;
return $http.post(ENV.api['root'] + "user/login/token", { t: token }).then(
function(result) {
return result;
},
function(err) {
throw err;
}
);
};

this.logout = function() {
userModel.resetUser();
httpService.post(ENV.api['root'] + 'user/logout').
then(
function(result) {
$rootScope.$broadcast('trafficPortal::exit');
if ($state.current.name == 'trafficPortal.public.login') {
messageModel.setMessages(result.alerts, false);
} else {
messageModel.setMessages(result.alerts, true);
$state.go('trafficPortal.public.login');
}
return result;
return $http.post(ENV.api['root'] + 'user/logout').then(
function(result) {
$rootScope.$broadcast('trafficPortal::exit');
if ($state.current.name == 'trafficPortal.public.login') {
messageModel.setMessages(result.alerts, false);
} else {
messageModel.setMessages(result.alerts, true);
$state.go('trafficPortal.public.login');
}
return result;
},
function(err) {
throw err;
}
);
};

};

AuthService.$inject = ['$rootScope', '$http', '$state', '$location', '$q', '$state', 'httpService', 'userModel', 'messageModel', 'ENV'];
AuthService.$inject = ['$rootScope', '$http', '$state', '$location', 'userModel', 'messageModel', 'ENV'];
module.exports = AuthService;
18 changes: 9 additions & 9 deletions traffic_portal/app/src/modules/public/login/LoginController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ var LoginController = function($scope, $log, $uibModal, authService, userService
password: ''
};

$scope.login = function($event, credentials) {
var $btn = $($event.target);
$btn.prop('disabled', true); // disable the login button to prevent multiple clicks
authService.login(credentials.username, credentials.password)
.then(
function() {
$btn.prop('disabled', false); // re-enable it
}
);
$scope.login = function(event, credentials) {
event.stopImmediatePropagation();
const btn = event.currentTarget;
btn.disabled = true; // disable the login button to prevent multiple clicks
authService.login(credentials.username, credentials.password).finally(
function() {
btn.disabled = false; // re-enable it
}
);
};

$scope.resetPassword = function() {
Expand Down