LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(js) Fix promise of $http in Resource service

pull/186/head
Francis Lachapelle 2015-12-14 13:16:11 -05:00
parent bb102e07e1
commit 5499746b3a
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
UI/WebServerResources/js/Common/Authentication.service.js
View File

@ -122,7 +122,8 @@
language: language,
rememberLogin: rememberLogin
}
}).then(function(data, status) {
}).then(function(response) {
var data = response.data;
// Make sure browser's cookies are enabled
var loginCookie = readLoginCookie();
if (!loginCookie) {
@ -146,8 +147,8 @@
d.resolve(redirectUrl(username, domain));
}
}
}, function(data, status) {
var msg, perr;
}, function(response) {
var msg, perr, data = response.data;
if (data && data.LDAPPasswordPolicyError) {
perr = data.LDAPPasswordPolicyError;
if (perr == passwordPolicyConfig.PolicyNoError) {
@ -179,8 +180,9 @@
userName: loginCookie[0],
password: loginCookie[1],
newPassword: newPassword }
}).then(d.resolve, function(data, status) {
}).then(d.resolve, function(response) {
var error,
data = response.data,
perr = data.LDAPPasswordPolicyError;
if (!perr) {

27
UI/WebServerResources/js/Common/Resource.service.js
View File

@ -75,11 +75,12 @@
url: path,
params: params
})
.then(deferred.resolve,
function(data, status) {
if (status == 404)
return deferred.reject();
});
.then(function(response) {
return deferred.resolve(response.data);
}, function(response) {
if (response.status == 404)
return deferred.reject();
});
return deferred.promise;
};
@ -96,7 +97,9 @@
this._http
.get(path)
.then(deferred.resolve, deferred.reject);
.then(function(response) {
return deferred.resolve(response.data);
}, deferred.reject);
return deferred.promise;
};
@ -115,7 +118,9 @@
this._http
.post(path, { name: name })
.then(deferred.resolve, deferred.reject);
.then(function(response) {
return deferred.resolve(response.data);
}, deferred.reject);
return deferred.promise;
};
@ -135,7 +140,9 @@
this._http
.post(path, data)
.then(deferred.resolve, deferred.reject);
.then(function(response) {
return deferred.resolve(response.data);
}, deferred.reject);
return deferred.promise;
};
@ -165,7 +172,9 @@
this._http
.get(path)
.then(deferred.resolve, deferred.reject);
.then(function(response) {
return deferred.resolve(response.data);
}, deferred.reject);
return deferred.promise;
};