DHFPROD-10455: Consume basepath in HC UI and navigate

Author: rahulvudutala

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

@@ -14,7 +14,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -42,7 +41,6 @@ public String index(HttpServletRequest httpServletRequest, HttpServletResponse h
         if(environment.getProperty("mlAuthentication").equalsIgnoreCase("cloud")) {
             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".toLowerCase(), ""));
             addCookiesToResponse(httpServletResponse);
@@ -56,28 +54,6 @@ private void createHubConfigurations(String cloudApikey) {
         hubClientProvider.setHubClientDelegate(hubClientConfig.newHubClient());
     }
 
-    private Map<String, String> getHeadersMap(HttpServletRequest httpServletRequest) {
-        Map<String, String> headers = Collections.list(httpServletRequest.getHeaderNames()).stream()
-            .collect(Collectors.toMap(h -> h, httpServletRequest::getHeader));
-        // These values are for testing
-        addHeadersFromCloudForTesting(headers);
-        return headers;
-    }
-
-    private void addHeadersFromCloudForTesting(Map<String, String> headers) {
-        headers.put("mlCloudApiKey", "hub-developer:password");
-        headers.put("mlHost", "localhost");
-        headers.put("mlAuthentication", "cloud");
-        headers.put("mlManageAuthentication", "cloud");
-        headers.put("mlHcBasePath", "/hc");
-        headers.put("mlStagingBasePath", "/data-hub/staging");
-        headers.put("mlFinalBasePath", "/data-hub/final");
-        headers.put("mlJobBasePath", "/data-hub/jobs");
-        headers.put("mlManageBasePath", "/local/manage");
-        headers.put("mlAppServicesBasePath", "/local/app-services");
-        headers.put("mlAdminBasePath", "/local/admin");
-    }
-
     private void addCookiesToResponse(HttpServletResponse response) {
         response.addCookie(new Cookie("mlHcBasePath", CloudParameters.HC_BASE_PATH));
         response.addCookie(new Cookie("mlAuthentication", CloudParameters.AUTHENTICATION_TYPE));

marklogic-data-hub-central/ui/e2e/package.json

@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
+  "homepage": "./",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "cy:open": "cypress open",

marklogic-data-hub-central/ui/src/App.tsx

@@ -1,4 +1,4 @@
-import React, {useEffect, useContext} from "react";
+import React, {useEffect, useContext, useState} from "react";
 import axios from "@config/axios";
 import {Switch} from "react-router";
 import {Route, Redirect, RouteComponentProps, withRouter} from "react-router-dom";
@@ -29,6 +29,7 @@ interface Props extends RouteComponentProps<any> {}
 
 const App: React.FC<Props> = ({history, location}) => {
   const {user, handleError} = useContext(UserContext);
+  const [loginPath, setLoginPath] = useState("/");
 
   const PrivateRoute = ({children, ...rest}) => (
     <Route
@@ -97,6 +98,20 @@ const App: React.FC<Props> = ({history, location}) => {
     }
   }, [location.pathname]);
 
+  useEffect(() => {
+    let mlAuthenticationFlag = document.cookie.split("; ").filter(row => row.startsWith("mlAuthentication=")).map(c => c.split("=")[1])[0];
+    let basePathURL = document.cookie.split("; ").filter(row => row.startsWith("mlHcBasePath=")).map(c => c.split("=")[1])[0];
+    if (basePathURL) {
+      window.localStorage.setItem("dataHubBasePath", basePathURL);
+      setLoginPath(basePathURL);
+    } else {
+      window.localStorage.setItem("dataHubBasePath", "");
+    }
+    if (mlAuthenticationFlag && mlAuthenticationFlag === "cloud") {
+      window.localStorage.setItem("dataHubEnvironmentSettings", mlAuthenticationFlag);
+    }
+  }, []);
+
   const path = location["pathname"];
   const pageTheme = themeMap[path] ? themes[themeMap[path]] : themes["default"];
   document.body.classList.add(pageTheme["bodyBg"]);
@@ -119,7 +134,7 @@ const App: React.FC<Props> = ({history, location}) => {
                         <ErrorBoundary>
                           <div className="contentContainer">
                             <Switch>
-                              <Route path="/" exact component={Login} />
+                              <Route path={loginPath} exact component={Login} />
                               <Route path="/noresponse" exact component={NoResponse} />
                               <PrivateRoute path="/tiles" exact>
                                 <TilesView />

marklogic-data-hub-central/ui/src/components/login-form/login-form.tsx

@@ -18,20 +18,9 @@ const LoginForm: React.FC = () => {
   const formRef = useRef<any>();
 
   useEffect(() => {
-    let mlAuthenticationFlag = document.cookie.split("; ").filter(row => row.startsWith("mlAuthentication=")).map(c => c.split("=")[1])[0];
-    let basePathURL = document.cookie.split("; ").filter(row => row.startsWith("mlHcBasePath=")).map(c => c.split("=")[1])[0];
-    if (basePathURL) {
-      window.localStorage.setItem("dataHubBasePath", basePathURL);
-    } else {
-      window.localStorage.setItem("dataHubBasePath", "");
-    }
-    if (mlAuthenticationFlag && mlAuthenticationFlag === "cloud") {
-      window.localStorage.setItem("dataHubEnvironmentSettings", mlAuthenticationFlag);
-
-      //automatically submit empty username and password if environment is cloud
-      if (formRef && formRef.current) {
-        formRef.current.dispatchEvent(new Event("submit", {cancelable: true}));
-      }
+    //automatically submit empty username and password if environment is cloud
+    if (window.localStorage.getItem("dataHubEnvironmentSettings") === "cloud" && formRef && formRef.current) {
+      formRef.current.dispatchEvent(new Event("submit", {cancelable: true}));
     } else {
       window.localStorage.setItem("dataHubEnvironmentSettings", "");
     }

marklogic-data-hub/src/main/java/com/marklogic/hub/deploy/commands/ConfigureAppServerBasePaths.java

@@ -81,7 +81,6 @@ private String getAccessToken() {
                 byte[] returnedData = IOUtils.toByteArray(entity.getContent());
 
                 JsonNode tokenMap = mapper.readTree(returnedData);
-                logger.info("Access Token Map: " + tokenMap);
                 return tokenMap.get("access_token").asText();
             }
         } catch (IOException e) {