From a70761c096192e38800bf38d6c7f61f52bf72007 Mon Sep 17 00:00:00 2001 From: hb123f Date: Wed, 20 Mar 2019 12:20:44 -0400 Subject: CADI AAF Integration and merging the code Issue-ID: PORTAL-319 CADI AAF Integration and code merge Change-Id: I6e44f3b2741858d8d403b77a49ec9a0153084801 Signed-off-by: hb123f --- .../client/app/services/applications/applications.service.js | 4 ++-- ecomp-portal-FE-common/client/app/services/users/users.service.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ecomp-portal-FE-common/client/app/services') diff --git a/ecomp-portal-FE-common/client/app/services/applications/applications.service.js b/ecomp-portal-FE-common/client/app/services/applications/applications.service.js index 75fc7fec..c595c71a 100644 --- a/ecomp-portal-FE-common/client/app/services/applications/applications.service.js +++ b/ecomp-portal-FE-common/client/app/services/applications/applications.service.js @@ -639,8 +639,8 @@ }).then( res => { // If response comes back as a redirected HTML page which IS NOT a success // But don't declare an empty list to be an error. - if (res == null || res.data == null || _this13.utilsService.isValidJSON(res.data) == false) { - deferred.reject("ApplicationsService::syncRolesEcompFromExtAuthSystem Failed"); + if (res == null || res.data == null || _this13.utilsService.isValidJSON(res.data) == false || res.data.status == 'ERROR') { + deferred.reject("ApplicationsService::syncRolesEcompFromExtAuthSystem Failed" + res.data.message); } else { deferred.resolve(res); } diff --git a/ecomp-portal-FE-common/client/app/services/users/users.service.js b/ecomp-portal-FE-common/client/app/services/users/users.service.js index dc415c43..9e062713 100644 --- a/ecomp-portal-FE-common/client/app/services/users/users.service.js +++ b/ecomp-portal-FE-common/client/app/services/users/users.service.js @@ -200,8 +200,8 @@ }).then( res => { // this.$log.debug('getUserAppRoles response: ', JSON.stringify(res)) // If response comes back as a redirected HTML page which IS NOT a success - if (this.utilsService.isValidJSON(res)== false) { - deferred.reject('UsersService::updateUserAppRoles: Failed'); + if (this.utilsService.isValidJSON(res)== false || res.data.httpStatusCode == '500' || res.data.status == 'ERROR') { + deferred.reject('UsersService::updateUserAppRoles: Failed' + res.data.message); } else { // this.$log.info('UsersService::updateUserAppRoles: Succeeded'); deferred.resolve(res.data); -- cgit 1.2.3-korg