EPUserUtils class fix

Sonar errors EPUserUtils class fix

Issue-ID: PORTAL-667
Change-Id: I7a8a39ac52ee2da5d2c2ab0016a8bbea0acb4d21
Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>

3 files changed, 4 insertions, 6 deletions

diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/authentication/OpenIdConnectLoginStrategy.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/authentication/OpenIdConnectLoginStrategy.java
index 456f0011..f4b8445d 100644
--- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/authentication/OpenIdConnectLoginStrategy.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/authentication/OpenIdConnectLoginStrategy.java
@@ -78,7 +78,7 @@ public class OpenIdConnectLoginStrategy extends org.onap.portalsdk.core.auth.Log
 			user.setLastName(userInfo.getFamilyName());
 			
 			//store the currently logged in user's information in the session
-			EPUserUtils.setUserSession(request, user,  new HashSet(), new HashSet(), SystemProperties.getProperty(SystemProperties.AUTHENTICATION_MECHANISM),null);
+			EPUserUtils.setUserSession(request, user,  new HashSet(), new HashSet(),null);
 
 			logger.info(EELFLoggerDelegate.errorLogger, request.getContextPath());
 			SessionCookieUtil.preSetUp(request, response);	
diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/authentication/SimpleLoginStrategy.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/authentication/SimpleLoginStrategy.java
index a5f87908..79ae20fa 100644
--- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/authentication/SimpleLoginStrategy.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/authentication/SimpleLoginStrategy.java
@@ -85,7 +85,7 @@ public class SimpleLoginStrategy extends org.onap.portalsdk.core.auth.LoginStrat
 			 // in case authentication has passed but user is not in the ONAP data base, return a Guest User to the home page.
 			if (commandBean.getUser() != null) {
 				// store the currently logged in user's information in the session
-				EPUserUtils.setUserSession(request, commandBean.getUser(), commandBean.getMenu(), commandBean.getBusinessDirectMenu(), "", ePRoleFunctionService);
+				EPUserUtils.setUserSession(request, commandBean.getUser(), commandBean.getMenu(), commandBean.getBusinessDirectMenu(), ePRoleFunctionService);
 				logger.info(EELFLoggerDelegate.debugLogger, commandBean.getUser().getOrgUserId() + " exists in the the system.");
 			}
 			
diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/LoginController.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/LoginController.java
index 56064b99..3b0281fb 100644
--- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/LoginController.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/LoginController.java
@@ -149,8 +149,7 @@ public class LoginController extends EPUnRestrictedBaseController implements Log
 		} else {
 			// store the currently logged in user's information in the session
 			EPUserUtils.setUserSession(request, commandBean.getUser(), commandBean.getMenu(),
-					commandBean.getBusinessDirectMenu(),
-					SystemProperties.getProperty(SystemProperties.AUTHENTICATION_MECHANISM), ePRoleFunctionService);
+					commandBean.getBusinessDirectMenu(), ePRoleFunctionService);
 
 			try {
 				logger.info(EELFLoggerDelegate.debugLogger, "loginValidate: store user info into share context begins");
@@ -265,8 +264,7 @@ public class LoginController extends EPUnRestrictedBaseController implements Log
 						orgUserId);
 
 				EPUserUtils.setUserSession(request, commandBean.getUser(), commandBean.getMenu(),
-						commandBean.getBusinessDirectMenu(),
-						SystemProperties.getProperty(SystemProperties.AUTHENTICATION_MECHANISM), ePRoleFunctionService);
+						commandBean.getBusinessDirectMenu(), ePRoleFunctionService);
 				logger.info(EELFLoggerDelegate.debugLogger,
 						"processSingleSignOn: now set up user session for {} finished", orgUserId);