From 6cae8148dacbda89bf52704bf405a753562ba9ad Mon Sep 17 00:00:00 2001
From: batthp <povel.batth@pointclickcare.com>
Date: Wed, 15 Jul 2020 14:02:42 -0400
Subject: [PATCH] Fixing headers

---
 .../admin/service/HttpClientServiceImpl.java  |  2 +-
 .../engine/MockedRestServerEngineUtils.java   | 30 +++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/smockin/admin/service/HttpClientServiceImpl.java b/src/main/java/com/smockin/admin/service/HttpClientServiceImpl.java
index 02772375..25d7da5f 100644
--- a/src/main/java/com/smockin/admin/service/HttpClientServiceImpl.java
+++ b/src/main/java/com/smockin/admin/service/HttpClientServiceImpl.java
@@ -55,7 +55,7 @@ public HttpClientResponseDTO handleCall(final HttpClientCallDTO dto, boolean jus
               return new HttpClientResponseDTO(HttpStatus.NOT_FOUND.value());
           }
           String url = dto.getUrl();
-          dto.setUrl(redirectUrl  + url);
+          dto.setUrl((redirectUrl  + url).replaceAll("(?<!(http:|https:))//", "/"));
           switch (dto.getMethod()) {
               case GET:
                   httpClientResponseDTO = get(dto);
diff --git a/src/main/java/com/smockin/mockserver/engine/MockedRestServerEngineUtils.java b/src/main/java/com/smockin/mockserver/engine/MockedRestServerEngineUtils.java
index 78dd3d7f..22a20137 100644
--- a/src/main/java/com/smockin/mockserver/engine/MockedRestServerEngineUtils.java
+++ b/src/main/java/com/smockin/mockserver/engine/MockedRestServerEngineUtils.java
@@ -2,9 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Optional;
+import java.util.*;
 
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -40,6 +38,8 @@
 import spark.Request;
 import spark.Response;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * Created by mgallina.
  */
@@ -76,6 +76,23 @@ public class MockedRestServerEngineUtils {
     @Autowired
     private HttpClientService httpClientService;
 
+    private Map<String, String> getHeadersInfo(HttpServletRequest request) {
+        Map<String, String> map = new HashMap<String, String>();
+
+        Enumeration headerNames = request.getHeaderNames();
+        while (headerNames.hasMoreElements()) {
+
+            String key = (String) headerNames.nextElement();
+            String value = request.getHeader(key);
+            System.out.println(key + ": " + value);
+
+            if(!(key.equalsIgnoreCase("Content-Length") || key.equalsIgnoreCase("Host")))
+                map.put(key, value);
+        }
+
+        return map;
+    }
+
     public Optional<String> loadMockedResponse(final Request request,
                                                final Response response,
                                                final boolean isMultiUserMode) {
@@ -86,7 +103,9 @@ public Optional<String> loadMockedResponse(final Request request,
         HttpClientCallDTO http = new HttpClientCallDTO();
         http.setUrl(request.pathInfo());
         http.setMethod(RestMethodEnum.findByName(request.requestMethod()));
-        http.setHeaders(request.params());
+        http.setHeaders(getHeadersInfo(request.raw()));
+//        http.setHeaders(request.params());
+
         http.setBody(request.body());
         HttpClientResponseDTO responseDto = null;
         try
@@ -99,7 +118,8 @@ public Optional<String> loadMockedResponse(final Request request,
         }
         
         if(responseDto != null && responseDto.getStatus() != 404) {
-          return  Optional.of(new ResponseEntity<HttpClientResponseDTO>(responseDto, HttpStatus.OK).getBody().getBody());
+            response.status(responseDto.getStatus());
+          return  Optional.of(new ResponseEntity<HttpClientResponseDTO>(responseDto, HttpStatus.resolve(responseDto.getStatus())).getBody().getBody());
         }
         
         try {