CADI Integration

Issue-ID: PORTAL-474

System to system authorization using CADI

Change-Id: I76487f8155a36fca8283669fe5e28ec7d5aec91d
Signed-off-by: st782s <statta@research.att.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/controller/FusionBaseController.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/controller/FusionBaseController.java
index da731b89..bad77424 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/controller/FusionBaseController.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/controller/FusionBaseController.java
@@ -88,10 +88,15 @@ public abstract class FusionBaseController implements SecurityInterface {
 			String appName = appService.getDefaultAppName();
 			if (appName == null || appName == "")
 				appName = SystemProperties.SDK_NAME;
-			logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, appName);
-
-			session = request.getSession();
+			String requestId = UserUtils.getRequestId(request);
+			String loginId = "";
 			User user = UserUtils.getUserSession(request);
+			if (user != null) {
+				loginId = user.getLoginId();
+			}
+			logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, appName,requestId,loginId);
+			
+			session = request.getSession();
 			if (session != null && user != null) {
 				Set<MenuData> menuResult = (Set<MenuData>) session
 						.getAttribute(SystemProperties.getProperty(SystemProperties.APPLICATION_MENU_ATTRIBUTE_NAME));