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

mifosng-individual-lending-app/src/main/java/org/mifosng/ui/ApplicationPagesRoutesController.java

@@ -79,6 +79,7 @@ public class ApplicationPagesRoutesController {
 		BasicAuthUserDetails userDetails = (BasicAuthUserDetails) authentication.getPrincipal();
     	model.addAttribute("basicAuthKey", userDetails.getBasicAuthenticationKey());
     	model.addAttribute("baseApiUrl", userDetails.getFullApiUrl());
+    	model.addAttribute("userId", userDetails.getUserId());
 		return "admin/accountsettings";
 	}
 	

mifosng-individual-lending-app/src/main/java/org/mifosng/ui/infrastructure/ApiDelegatingAuthenticationProvider.java

@@ -65,7 +65,7 @@ public class ApiDelegatingAuthenticationProvider extends AbstractUserDetailsAuth
 					authorities.add(new SimpleGrantedAuthority(permission));
 				}
 				User user = new User(authenticatedUserData.getUsername(), "[not needed]", authorities);
-				userDetails = new BasicAuthUserDetails(user, authenticatedUserData.getBase64EncodedAuthenticationKey(), platformApiUrl);
+				userDetails = new BasicAuthUserDetails(user, authenticatedUserData.getBase64EncodedAuthenticationKey(), platformApiUrl, authenticatedUserData.getUserId());
 			}
 			
 			return userDetails;
@@ -80,8 +80,8 @@ public class ApiDelegatingAuthenticationProvider extends AbstractUserDetailsAuth
 	
 	private HttpEntity<Object> authRequest() {
 		HttpHeaders requestHeaders = new HttpHeaders();
-		requestHeaders.set("Accept", "application/xml");
-		requestHeaders.set("Content-Type", "application/xml");
+		requestHeaders.set("Accept", "application/json");
+		requestHeaders.set("Content-Type", "application/json");
 
 		HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestHeaders);
 		return requestEntity;

mifosng-individual-lending-app/src/main/java/org/mifosng/ui/infrastructure/BasicAuthUserDetails.java

@@ -11,11 +11,13 @@ public class BasicAuthUserDetails implements UserDetails {
 	private final User user;
 	private final String basicAuthenticationKey;
 	private final String fullApiUrl;
+	private final Long userId;
 
-	public BasicAuthUserDetails(User user, String basicAuthenticationKey, String fullApiUrl) {
+	public BasicAuthUserDetails(User user, String basicAuthenticationKey, String fullApiUrl, Long userId) {
 		this.user = user;
 		this.basicAuthenticationKey = basicAuthenticationKey;
 		this.fullApiUrl = fullApiUrl;
+		this.userId = userId;
 	}
 
 	@Override
@@ -60,4 +62,8 @@ public class BasicAuthUserDetails implements UserDetails {
 	public String getFullApiUrl() {
 		return this.fullApiUrl;
 	}
+
+	public Long getUserId() {
+		return userId;
+	}
 }