ChangePassword

maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java

@@ -38,6 +38,7 @@ public class ChangePassword extends JpaBaseEntity{
 	private String password;
 	private String confirmpassword;
 	private String decipherable;
+	private String instId;
 	
 	/**
 	 * 
@@ -208,6 +209,13 @@ public class ChangePassword extends JpaBaseEntity{
 		this.employeeNumber = employeeNumber;
 	}
 
+	public String getInstId() {
+		return instId;
+	}
+
+	public void setInstId(String instId) {
+		this.instId = instId;
+	}
 
 	@Override
     public String toString() {

maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java

@@ -313,7 +313,7 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
 	}
 	
 	public void changePasswordProvisioning(UserInfo userInfo) {
-	    if(userInfo.getPassword()!=null && !userInfo.getPassword().equals("")) {
+	    if(StringUtils.isNotBlank(userInfo.getPassword())) {
 	    	UserInfo loadUserInfo = findByUsername(userInfo.getUsername());
     	    ChangePassword changePassword=new ChangePassword();
             changePassword.setId(loadUserInfo.getId());
@@ -325,7 +325,7 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
             changePassword.setEmployeeNumber(loadUserInfo.getEmployeeNumber());
             changePassword.setDecipherable(loadUserInfo.getDecipherable());
             changePassword.setPassword(loadUserInfo.getPassword());
-            
+            changePassword.setInstId(loadUserInfo.getInstId());
             kafkaPersistService.send(
                     KafkaIdentityTopic.PASSWORD_TOPIC, 
                     changePassword,