diff options
| author |   Hima Elisetty <hbindu@research.att.com> | 2018-01-12 10:36:42 -0500 |
|---|---|---|
| committer | Hima Elisetty <hbindu@research.att.com> | 2018-01-17 12:08:18 -0500 |
| commit | 1298fd26f37cd451cbf1adbea68b98151662e796 (patch) | |
| tree | ca09e0586c1d0d401841fc6e12228e4dbc7f2f6f /ecomp-sdk/epsdk-app-overlay/src/main/webapp | |
| parent | 304033445a8333cd088910fc3e43ca9222237816 (diff) | |
Introduce JUNIT Plumbing
Issue-ID: PORTAL-161, PORTAL-160, PORTAL-159
Includes Change in encryption and decryption algorithm
Change-Id: I5f379d6d9ac25536744152ac1d61223a52f1ce7f
Signed-off-by: Hima Elisetty <hbindu@research.att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp')
| -rw-r--r-- | ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp | 7 | ||||
| -rw-r--r-- | ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/directives/header.js | 24 |
2 files changed, 16 insertions, 15 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp index a1128ede..0b986555 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp @@ -341,7 +341,10 @@ UserInfoService.getFunctionalMenuStaticDetailSession() .then(function (res) { $scope.userProfile.firstName = res.firstName; - $scope.redirectUrl = res.portalUrl; + $scope.userProfile.lastName = res.lastName; + $scope.userProfile.email = res.email; + $scope.userProfile.fullName = res.userName; + $scope.redirectUrl = res.portalUrl; }); } $scope.getTopMenuStaticInfo=function() { @@ -431,7 +434,7 @@ console.log('getAppName failed', error); }); - $scope.getTopMenuStaticInfo(); + $scope.getUserNameFromSession(); $scope.getMenu=function() { $http({ diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/directives/header.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/directives/header.js index ef0a8fd2..32024aaf 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/directives/header.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/directives/header.js @@ -74,19 +74,17 @@ app.directive('qHeader', function () { }); } $scope.getTopMenuStaticInfo=function() { - var promise = UserInfoService.getFunctionalMenuStaticDetailShareContext(); + var promise = UserInfoService.getFunctionalMenuStaticDetailSession(); promise.then( - function(res) { - if(res==null || res==''){ - $log.error('failed to get static User information'); - $scope.getUserNameFromSession(); - }else{ - // $log.info('Received static User information'); - var resData = res; - // console.log(resData); - $scope.inputUserInfo(resData); - $scope.userName = $scope.firstName+ ' '+ $scope.lastName; - } + function(res) { + $scope.contactUsUrl=res.contactUsLink; + $scope.userName = res.userName; + $scope.userId = res.userid; + $scope.userEmail = res.email; + $scope.userFirstName = res.firstName; + $scope.redirectUrl = res.portalUrl; + $scope.getAccessUrl = res.getAccessUrl; + $scope.isAppCentralized = res.isAppCentralized; }, function(err) { $log.error('getFunctionalMenuStaticDetailShareContext failed', err); @@ -114,7 +112,7 @@ app.directive('qHeader', function () { } $scope.getMenu=function() { - $scope.getTopMenuStaticInfo(); + $scope.getUserNameFromSession(); $http({ method: "GET", url: 'get_functional_menu', |