RESTWS-649 - Update (openmrs#307)

oslynn · Oct 19, 2017 · 762cc0f · 762cc0f
1 parent 8545932
commit 762cc0f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/...va/org/openmrs/module/webservices/rest/web/controller/SwaggerSpecificationController.java b/...va/org/openmrs/module/webservices/rest/web/controller/SwaggerSpecificationController.java
@@ -27,10 +27,17 @@ public class SwaggerSpecificationController {
 	public @ResponseBody
 	String getSwaggerSpecification(HttpServletRequest request) throws Exception {
 
+		String host = request.getHeader(HttpHeaders.HOST);
+
+		String scheme = request.getHeader(HttpHeaders.X_FORWARDED_PROTO);
+		if (scheme == null) {
+			scheme = request.getScheme();
+		}
+
 		return new SwaggerSpecificationCreator()
-		        .host(request.getHeader(HttpHeaders.HOST))
+		        .host(host)
 		        .basePath(request.getContextPath() + "/ws/rest/v1")
-		        .scheme(Scheme.forValue(request.getScheme()))
+		        .scheme(Scheme.forValue(scheme))
 
 		        .getJSON();
 	}