External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-16 18:50:04 -03:30
Code Issues Packages Projects Releases Wiki Activity

rejecting promise on requestError REST interceptor

Browse Source
This commit is contained in:
Jared Tabor
2015-10-06 12:10:51 -04:00
parent 6883d70805
commit 4ea2e10f1c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/login/loginModal/loginModal.controller.js
View File

@@ -184,14 +184,14 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope', '$l
} else { } else {
Wait('start'); Wait('start');
Authorization.retrieveToken(username, password) Authorization.retrieveToken(username, password)
.success(function (data) { .then(function (data) {
$('#login-modal').modal('hide'); $('#login-modal').modal('hide');
Authorization.setToken(data.token, data.expires); Authorization.setToken(data.token, data.expires);
$rootScope.sessionTimer = Timer.init(); $rootScope.sessionTimer = Timer.init();
scope.$emit('AuthorizationGetUser'); scope.$emit('AuthorizationGetUser');
}) },
.error(function (data) { function (data) {
var hdr, msg, key; var key;
Wait('stop'); Wait('stop');
if (data.non_field_errors && data.non_field_errors.length === 0) { if (data.non_field_errors && data.non_field_errors.length === 0) {
// show field specific errors returned by the API // show field specific errors returned by the API

8
awx/ui/client/src/rest/interceptors.service.js
View File

@@ -11,8 +11,8 @@
*************************************************/ *************************************************/
export default export default
[ '$rootScope', [ '$rootScope', '$q',
function ($rootScope) { function ($rootScope, $q) {
return { return {
response: function(config) { response: function(config) {
if(config.headers('auth-token-timeout') !== null){ if(config.headers('auth-token-timeout') !== null){
@@ -23,9 +23,9 @@
responseError: function(rejection){ responseError: function(rejection){
if( !_.isEmpty(rejection.data.detail) && rejection.data.detail === "Maximum per-user sessions reached"){ if( !_.isEmpty(rejection.data.detail) && rejection.data.detail === "Maximum per-user sessions reached"){
$rootScope.sessionTimer.expireSession('session_limit'); $rootScope.sessionTimer.expireSession('session_limit');
return rejection; return $q.reject(rejection);
} }
return rejection; return $q.reject(rejection);
} }
}; };
}]; }];