RESTWS-925: Session endpoint user.person.display should respect the n…

…ame template.

omod-1.10/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/PersonResource1_10Test.java

@@ -35,7 +35,7 @@ public void validateFullRepresentation() throws Exception {
 
 	@Override
 	public String getDisplayProperty() {
-		return "Mr. Horatio Test Hornblower Esq.";
+		return "Horatio Test Hornblower";
 	}
 
 	@Override

omod-1.11/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/PersonResource1_11Test.java

@@ -37,7 +37,7 @@ public void validateFullRepresentation() throws Exception {
 
 	@Override
 	public String getDisplayProperty() {
-		return "Mr. Horatio Test Hornblower";
+		return "Horatio Test Hornblower";
 	}
 
 	@Override

omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonResource1_8.java

@@ -9,6 +9,7 @@
  */
 package org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_8;
 
+import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -28,6 +29,8 @@
 import org.openmrs.PersonAttribute;
 import org.openmrs.PersonName;
 import org.openmrs.api.context.Context;
+import org.openmrs.layout.web.name.NameSupport;
+import org.openmrs.layout.web.name.NameTemplate;
 import org.openmrs.module.webservices.rest.SimpleObject;
 import org.openmrs.module.webservices.rest.web.ConversionUtil;
 import org.openmrs.module.webservices.rest.web.RequestContext;
@@ -465,8 +468,22 @@ public String getDisplayString(Person person) {
 		// TODO copy what is done in PatientResource to use configured name layout
 		if (person.getPersonName() == null)
 			return "";
-
-		return person.getPersonName().getFullName();
+
+		PersonName personName = person.getPersonName();
+		try {
+			NameTemplate nameTemplate = NameSupport.getInstance().getDefaultLayoutTemplate();
+
+			if (nameTemplate != null) {
+				// need to use reflection since the format method was not added until later versions of openmrs
+				Method format = NameTemplate.class.getDeclaredMethod("format", PersonName.class);
+				return (String) format.invoke(nameTemplate, personName);
+			}
+		}
+		catch (Exception e) {
+			// fall through to just returning full name if no format method found or format fails
+		}
+
+		return personName.getFullName();
 	}
 
 	private static void copyNameFields(PersonName existingName, PersonName personName) {

omod-1.8/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientResource1_8Test.java

@@ -61,7 +61,7 @@ public void validateFullRepresentation() throws Exception {
 
 	@Override
 	public String getDisplayProperty() {
-		return "Mr. Horatio Test Hornblower Esq.";
+		return "Horatio Test Hornblower";
 	}
 
 	@Override

omod-1.8/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonResource1_8Test.java

@@ -70,7 +70,7 @@ public void validateFullRepresentation() throws Exception {
 
 	@Override
 	public String getDisplayProperty() {
-		return "Mr. Horatio Test Hornblower Esq.";
+		return "Horatio Test Hornblower";
 	}
 
 	@Override

omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/SessionController1_9.java

@@ -0,0 +1,157 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+ *
+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+ * graphic logo is a trademark of OpenMRS Inc.
+ */
+package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs1_9;
+
+import org.apache.commons.lang3.LocaleUtils;
+import org.openmrs.Location;
+import org.openmrs.Provider;
+import org.openmrs.User;
+import org.openmrs.api.APIException;
+import org.openmrs.api.context.Context;
+import org.openmrs.module.webservices.rest.SimpleObject;
+import org.openmrs.module.webservices.rest.web.ConversionUtil;
+import org.openmrs.module.webservices.rest.web.RestConstants;
+import org.openmrs.module.webservices.rest.web.api.RestService;
+import org.openmrs.module.webservices.rest.web.representation.CustomRepresentation;
+import org.openmrs.module.webservices.rest.web.representation.Representation;
+import org.openmrs.module.webservices.rest.web.v1_0.controller.BaseRestController;
+import org.openmrs.util.PrivilegeConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Controller that lets a client check the status of their session, and log out. (Authenticating is
+ * handled through a filter, and may happen through this or any other resource.
+ */
+@Controller
+@RequestMapping(value = "/rest/" + RestConstants.VERSION_1 + "/session")
+public class SessionController1_9 extends BaseRestController {
+
+	private static final Logger log = LoggerFactory.getLogger(SessionController1_9.class);
+
+	public static final String USER_CUSTOM_REP = "(uuid,display,username,systemId,userProperties,person:(uuid,display),privileges:(uuid,display,name),roles:(uuid,display,name),links)";
+
+	@Autowired
+	RestService restService;
+
+	/**
+	 * Tells the user whether they are authenticated and provides details on the logged-in user
+	 */
+	@RequestMapping(method = RequestMethod.GET)
+	@ResponseBody
+	public Object get() {
+		boolean authenticated = Context.isAuthenticated();
+		SimpleObject session = new SimpleObject();
+		session.add("authenticated", authenticated);
+		if (authenticated) {
+			session.add("user", ConversionUtil.convertToRepresentation(Context.getAuthenticatedUser(),
+			    new CustomRepresentation(USER_CUSTOM_REP)));
+			session.add("locale", Context.getLocale());
+			session.add("allowedLocales", Context.getAdministrationService().getAllowedLocales());
+			session.add("sessionLocation", ConversionUtil.convertToRepresentation(Context.getUserContext().getLocation(), Representation.REF));
+			session.add("currentProvider", ConversionUtil.convertToRepresentation(getCurrentProvider(), Representation.REF));
+		}
+		return session;
+	}
+
+	@RequestMapping(method = RequestMethod.POST)
+	@ResponseBody
+	@ResponseStatus(value = HttpStatus.OK)
+	public Object post(HttpServletRequest request, @RequestBody Map<String, String> body) {
+		String localeStr = body.get("locale");
+		if (localeStr != null) {
+			Locale locale = null;
+			try {
+				locale = LocaleUtils.toLocale(localeStr);
+			}
+			catch (IllegalArgumentException e) {
+				throw new APIException(" '" + localeStr + "' does not represent a valid locale.");
+			}
+			Set<Locale> allowedLocales = new HashSet<Locale>(Context.getAdministrationService().getAllowedLocales());
+			if (allowedLocales.contains(locale)) {
+				Context.setLocale(locale);
+			} else {
+				throw new APIException(" '" + localeStr + "' is not in the list of allowed locales.");
+			}
+		}
+		String locationUuid = body.get("sessionLocation");
+		if (locationUuid != null) {
+			Location location = Context.getLocationService().getLocationByUuid(locationUuid);
+			if (location == null) {
+				throw new APIException(" '" + locationUuid + "' is not the UUID of any location.");
+			}
+			Context.getUserContext().setLocation(location);
+			{ // for compatability with AppUi session location
+				request.getSession().setAttribute("emrContext.sessionLocationId", location.getId());
+			}
+		}
+		return get();
+	}
+
+	/**
+	 * Logs the client out
+	 *
+	 * <strong>Should</strong> log the client out
+	 */
+	@RequestMapping(method = RequestMethod.DELETE)
+	@ResponseBody
+	@ResponseStatus(value = HttpStatus.NO_CONTENT)
+	public void delete(HttpServletRequest request) {
+		Context.logout();
+		HttpSession session = request.getSession(false);
+		if (session != null && request.isRequestedSessionIdValid()) {
+			session.invalidate();
+		}
+	}
+
+	/**
+	 * Get current provider
+	 *
+	 * @return Provider if the user is authenticated
+	 */
+	private Provider getCurrentProvider() {
+		Provider currentProvider = null;
+		User currentUser = Context.getAuthenticatedUser();
+		if (currentUser != null) {
+			Collection<Provider> providers = new HashSet<Provider>();
+			try {
+				Context.addProxyPrivilege(PrivilegeConstants.VIEW_PROVIDERS);
+				if (currentUser.getPerson() != null) {
+					providers = Context.getProviderService().getProvidersByPerson(currentUser.getPerson(), false);
+				}
+			}
+			finally {
+				Context.removeProxyPrivilege(PrivilegeConstants.VIEW_PROVIDERS);
+			}
+			if (providers.size() > 1) {
+				log.warn("Can't handle users with multiple provider accounts");
+			} else if (providers.size() == 1) {
+				currentProvider = providers.iterator().next();
+			}
+		}
+		return currentProvider;
+	}
+}