DHFPROD-10455: Consume ML Cloud Headers in HubCentral

Author: rahulvudutala

marklogic-data-hub-central/src/main/java/com/marklogic/hub/central/CloudParameters.java

@@ -16,14 +16,14 @@ public class CloudParameters {
     public static String ADMIN_BASE_PATH = "";
 
     public static void updateCloudParameters(Map<String, String> cloudProperties) {
-        ML_HOST = cloudProperties.get("mlHost");
-        AUTHENTICATION_TYPE = cloudProperties.get("mlAuthentication");
-        HC_BASE_PATH = cloudProperties.get("mlHcBasePath");
-        STAGING_BASE_PATH = cloudProperties.get("mlStagingBasePath");
-        FINAL_BASE_PATH = cloudProperties.get("mlFinalBasePath");
-        JOB_BASE_PATH = cloudProperties.get("mlJobBasePath");
-        MANAGE_BASE_PATH = cloudProperties.get("mlManageBasePath");
-        APP_SERVICES_BASE_PATH = cloudProperties.get("mlAppServicesBasePath");
-        ADMIN_BASE_PATH = cloudProperties.get("mlAdminBasePath");
+        ML_HOST = cloudProperties.get("mlHost".toLowerCase());
+        AUTHENTICATION_TYPE = cloudProperties.get("mlAuthentication".toLowerCase());
+        HC_BASE_PATH = cloudProperties.get("mlHcBasePath".toLowerCase());
+        STAGING_BASE_PATH = cloudProperties.get("mlStagingBasePath".toLowerCase());
+        FINAL_BASE_PATH = cloudProperties.get("mlFinalBasePath".toLowerCase());
+        JOB_BASE_PATH = cloudProperties.get("mlJobBasePath".toLowerCase());
+        MANAGE_BASE_PATH = cloudProperties.get("mlManageBasePath".toLowerCase());
+        APP_SERVICES_BASE_PATH = cloudProperties.get("mlAppServicesBasePath".toLowerCase());
+        ADMIN_BASE_PATH = cloudProperties.get("mlAdminBasePath".toLowerCase());
     }
 }

marklogic-data-hub-central/src/main/java/com/marklogic/hub/central/HubCentral.java

@@ -111,7 +111,7 @@ protected PropertySource buildPropertySource(String username, String password, P
     protected PropertySource buildPropertySource(Properties primaryProperties) {
         return propertyName -> {
             String value = primaryProperties.getProperty(propertyName);
-            if (!propertyName.equals("mlUsername") && !propertyName.equals("mlPassword") && environment.getProperty(propertyName) != null) {
+            if (!propertyName.equals("mlUsername") && !propertyName.equals("mlPassword") && !propertyName.equals("mlAuthentication") && environment.getProperty(propertyName) != null) {
                 value = environment.getProperty(propertyName);
             }
             return value;

marklogic-data-hub-central/src/main/java/com/marklogic/hub/central/controllers/SinglePageAppController.java

@@ -19,7 +19,7 @@
 import java.util.stream.Collectors;
 
 @Controller
-public class SinglePageAppController implements ErrorController {
+public class SinglePageAppController extends BaseController implements ErrorController {
 
     @Autowired
     HubCentral hubCentral;
@@ -40,9 +40,11 @@ public class SinglePageAppController implements ErrorController {
     @RequestMapping(value = {"/"})
     public String index(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
         if(environment.getProperty("mlAuthentication").equalsIgnoreCase("cloud")) {
-            Map<String, String> headers = getHeadersMap(httpServletRequest);
+            Map<String, String> headers = Collections.list(httpServletRequest.getHeaderNames()).stream()
+                .collect(Collectors.toMap(h -> h, httpServletRequest::getHeader));
+            logger.info("Headers Map: " + headers);
             CloudParameters.updateCloudParameters(headers);
-            createHubConfigurations(headers.getOrDefault("mlCloudApiKey", ""));
+            createHubConfigurations(headers.getOrDefault("mlCloudApiKey".toLowerCase(), ""));
             addCookiesToResponse(httpServletResponse);
         }
         return "forward:index.html";
@@ -55,8 +57,7 @@ private void createHubConfigurations(String cloudApikey) {
     }
 
     private Map<String, String> getHeadersMap(HttpServletRequest httpServletRequest) {
-        Map<String, String> headers = new HashMap<>();
-        Collections.list(httpServletRequest.getHeaderNames()).stream()
+        Map<String, String> headers = Collections.list(httpServletRequest.getHeaderNames()).stream()
             .collect(Collectors.toMap(h -> h, httpServletRequest::getHeader));
         // These values are for testing
         addHeadersFromCloudForTesting(headers);
@@ -78,7 +79,7 @@ private void addHeadersFromCloudForTesting(Map<String, String> headers) {
     }
 
     private void addCookiesToResponse(HttpServletResponse response) {
-        response.addCookie(new Cookie("mlHcBasePath", "/hc"));
-        response.addCookie(new Cookie("mlAuthentication", "cloud"));
+        response.addCookie(new Cookie("mlHcBasePath", CloudParameters.HC_BASE_PATH));
+        response.addCookie(new Cookie("mlAuthentication", CloudParameters.AUTHENTICATION_TYPE));
     }
 }

marklogic-data-hub-central/src/main/resources/application.properties

@@ -39,3 +39,4 @@ log.path=./logs
 #management.endpoint.health.show-details=always
 spring.mvc.pathmatch.matching-strategy=ant_path_matcher
 hubCentralVersion=6.0-SNAPSHOT
+mlAuthentication=local