tidy up users resource supporting better updates. useraccounts resources has been removed along with change password template convenience api.

mifosng-data/src/main/java/org/mifosng/data/AppUserData.java

@@ -17,7 +17,7 @@ public class AppUserData {
 	private String lastname;
 	private String email;
 	
-	private List<OfficeData> allowedOffices = new ArrayList<OfficeData>();
+	private List<OfficeLookup> allowedOffices = new ArrayList<OfficeLookup>();
 	
 	private List<RoleData> availableRoles = new ArrayList<RoleData>();
 	private List<RoleData> selectedRoles = new ArrayList<RoleData>();
@@ -85,11 +85,11 @@ public class AppUserData {
 		this.officeName = officeName;
 	}
 
-	public List<OfficeData> getAllowedOffices() {
+	public List<OfficeLookup> getAllowedOffices() {
 		return allowedOffices;
 	}
 
-	public void setAllowedOffices(List<OfficeData> allowedOffices) {
+	public void setAllowedOffices(List<OfficeLookup> allowedOffices) {
 		this.allowedOffices = allowedOffices;
 	}
 

mifosng-data/src/main/java/org/mifosng/data/AuthenticatedUserData.java

@@ -9,6 +9,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class AuthenticatedUserData {
 
 	private String username;
+	private Long userId;
 	private String base64EncodedAuthenticationKey;
 	private boolean authenticated = false;
 	private Collection<String> permissions = new ArrayList<String>();
@@ -53,4 +54,12 @@ public class AuthenticatedUserData {
 			String base64EncodedAuthenticationKey) {
 		this.base64EncodedAuthenticationKey = base64EncodedAuthenticationKey;
 	}
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
 }

mifosng-data/src/main/java/org/mifosng/data/OfficeLookup.java

@@ -4,7 +4,7 @@ import java.io.Serializable;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
-@XmlRootElement(name = "office lookup")
+@XmlRootElement(name = "officeLookup")
 public class OfficeLookup implements Serializable {
 
 	private Long id;

mifosng-data/src/main/java/org/mifosng/data/command/ChangePasswordCommand.java

@@ -1,30 +0,0 @@
-package org.mifosng.data.command;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class ChangePasswordCommand {
-
-	private String password;
-	private String passwordrepeat;
-
-	public ChangePasswordCommand() {
-		//
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getPasswordrepeat() {
-		return passwordrepeat;
-	}
-
-	public void setPasswordrepeat(String passwordrepeat) {
-		this.passwordrepeat = passwordrepeat;
-	}
-}

mifosng-data/src/main/java/org/mifosng/data/command/UserCommand.java

@@ -15,6 +15,7 @@ public class UserCommand implements Serializable {
 	private String firstname;
 	private String lastname;
 	private String password;
+	private String repeatPassword;
 	private String email;
 	private Long officeId;
 	
@@ -100,4 +101,12 @@ public class UserCommand implements Serializable {
 	public void setRoles(String... roles) {
 		this.roles = roles;
 	}
+
+	public String getRepeatPassword() {
+		return repeatPassword;
+	}
+
+	public void setRepeatPassword(String repeatPassword) {
+		this.repeatPassword = repeatPassword;
+	}
 }