X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FUserController.java;h=fc76a0e6b4fa00e662eca4c1fe91d73667fb327e;hb=f9a1944a4b3cda8d9708087902a52baa40c0e2ea;hp=f4fab562ff6f713b0f76b457c6942b62dedc8e36;hpb=24608a9e1450c409dc3870440d29e91cc3a26bb9;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/UserController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/UserController.java
index f4fab562..fc76a0e6 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/UserController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/UserController.java
@@ -69,6 +69,8 @@ public class UserController extends EPRestrictedBaseController {
 	@Autowired
 	private UserService userService;
 
+	private static final String HIDDEN_DEFAULT_PASSWORD = "*****";
+
 	/**
 	 * RESTful service method to get ONAP Logged in User details.
 	 * 
@@ -83,7 +85,7 @@ public class UserController extends EPRestrictedBaseController {
 		try {
 			EPUser user = EPUserUtils.getUserSession(request);
 			ProfileDetail profileDetail = new ProfileDetail(user.getFirstName(), user.getLastName(),
-					user.getMiddleInitial(), user.getEmail(), user.getLoginId(),  CipherUtil.decryptPKC(user.getLoginPwd()));
+					user.getMiddleInitial(), user.getEmail(), user.getLoginId(),  HIDDEN_DEFAULT_PASSWORD);
 			portalRestResponse = new PortalRestResponse<ProfileDetail>(PortalRestStatusEnum.OK, "success",
 					profileDetail);
 			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/loggedinUser", "result =", profileDetail);
@@ -124,7 +126,9 @@ public class UserController extends EPRestrictedBaseController {
 				user.setEmail(profileDetail.getEmail());
 				user.setMiddleInitial(profileDetail.getMiddleName());
 				user.setLoginId(profileDetail.getLoginId());
-				user.setLoginPwd(CipherUtil.encryptPKC(profileDetail.getLoginPassword()));
+				if (!HIDDEN_DEFAULT_PASSWORD.equals(profileDetail.getLoginPassword())){
+					user.setLoginPwd(CipherUtil.encryptPKC(profileDetail.getLoginPassword()));
+				}
 				userService.saveUser(user);
 				// Update user info in the session
 				request.getSession().setAttribute(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME),