diff options
Diffstat (limited to 'ecomp-sdk/epsdk-app-os/src')
| -rw-r--r-- | ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java | 2 | ||||
| -rw-r--r-- | ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java index 729cfd1f..b0826f68 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java +++ b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java @@ -103,7 +103,7 @@ public class LoginStrategyImpl extends LoginStrategy { if (!SystemProperties.containsProperty(SystemProperties.Decryption_Key)) throw new IllegalStateException("Failed to find property " + SystemProperties.Decryption_Key); final String decryptionKey = SystemProperties.getProperty(SystemProperties.Decryption_Key); - userId = CipherUtil.decrypt(cookieValue, decryptionKey); + userId = CipherUtil.decryptPKC(cookieValue, decryptionKey); logger.debug(EELFLoggerDelegate.debugLogger, "getUserIdFromCookie: decrypted as {}", userId); } return userId; diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp index c0e1b6e3..5cafe15c 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp +++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp @@ -298,8 +298,11 @@ $scope.getUserNameFromSession = function(){ UserInfoService.getFunctionalMenuStaticDetailSession() .then(function (res) { - $scope.userProfile.firstName = res.firstName; - $scope.redirectUrl = res.portalUrl; + $scope.userProfile.firstName = res.firstName; + $scope.userProfile.lastName = res.lastName; + $scope.userProfile.email = res.email; + $scope.userProfile.fullName = res.userName; + $scope.redirectUrl = res.portalUrl; }); } $scope.getTopMenuStaticInfo=function() { @@ -389,7 +392,7 @@ console.log('getAppName failed', error); }); - $scope.getTopMenuStaticInfo(); + $scope.getUserNameFromSession(); $scope.getMenu=function() { $http({ |