1 files changed, 17 insertions, 2 deletions
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileSearchController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileSearchController.java
index f5d37e2b..a94c3b46 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileSearchController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileSearchController.java
@@ -50,10 +50,12 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.json.JSONObject;
+import org.onap.portalsdk.core.auth.LoginStrategy;
 import org.onap.portalsdk.core.controller.RestrictedBaseController;
 import org.onap.portalsdk.core.domain.MenuData;
 import org.onap.portalsdk.core.domain.User;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;
 import org.onap.portalsdk.core.service.FnMenuService;
 import org.onap.portalsdk.core.service.UserProfileService;
 import org.onap.portalsdk.core.service.UserService;
@@ -83,6 +85,9 @@ public class ProfileSearchController extends RestrictedBaseController {
 	
 	@Autowired
 	private FnMenuService fnMenuService;
+	
+	@Autowired
+	private LoginStrategy loginStrategy;
 
 	@RequestMapping(value = { "/profile_search" }, method = RequestMethod.GET)
 	public ModelAndView profileSearch(HttpServletRequest request) {
@@ -103,11 +108,21 @@ public class ProfileSearchController extends RestrictedBaseController {
 	@RequestMapping(value = { "/get_user" }, method = RequestMethod.GET)
 	public void getUser(HttpServletRequest request, HttpServletResponse response) {
 		logger.info(EELFLoggerDelegate.applicationLogger, "Initiating get_user in ProfileSearchController");
+		String  userId = "";
+		try {
+			 userId =  loginStrategy.getUserId(request);
+		} catch (PortalAPIException e1) {
+			logger.error(EELFLoggerDelegate.applicationLogger, "No User found in request", e1);
+		}
+		
+		final String requestedUserId = userId;
 		ObjectMapper mapper = new ObjectMapper();
 		List<User> profileList = null;
 		try {
 			profileList = service.findAll();
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(profileList));
+            User user = profileList.stream()
+					.filter(x -> x.getOrgUserId().equals(requestedUserId)).findAny().orElse(null);
+            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(user));
 			JSONObject j = new JSONObject(msg);
 			response.setContentType(APPLICATION_JSON);
 			response.getWriter().write(j.toString());
@@ -180,4 +195,4 @@ public class ProfileSearchController extends RestrictedBaseController {
 			logger.error(EELFLoggerDelegate.applicationLogger, "toggleProfileActive failed", e);
 		}
 	}
-}
+}
+\ No newline at end of file