diff --git a/UI/WebServerResources/js/Common/Authentication.service.js b/UI/WebServerResources/js/Common/Authentication.service.js index 600784092..05a321c58 100644 --- a/UI/WebServerResources/js/Common/Authentication.service.js +++ b/UI/WebServerResources/js/Common/Authentication.service.js @@ -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) { diff --git a/UI/WebServerResources/js/Common/Resource.service.js b/UI/WebServerResources/js/Common/Resource.service.js index 539c7e517..d2bfa3a38 100644 --- a/UI/WebServerResources/js/Common/Resource.service.js +++ b/UI/WebServerResources/js/Common/Resource.service.js @@ -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; };