Add user identification improvement

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/UIConfiguration.java

@@ -34,6 +34,7 @@ public class UIConfiguration {
     private int sessionTimeOut;
     private int loginCacheCapacity;
     private Billing billing;
+    private String chatConfig;
 
     @XmlElement(name = "AppRegistration", required=true)
     public AppRegistration getAppRegistration() {
@@ -63,6 +64,15 @@ public class UIConfiguration {
         isSsoEnable = ssoEnable;
     }
 
+    @XmlElement(name = "ChatConfig", required = true)
+    public String getChatConfig() {
+        return chatConfig;
+    }
+
+    public void setChatConfig(String chatConfig) {
+        this.chatConfig = chatConfig;
+    }
+
     @XmlElement(name = "Billing", required=true)
     public Billing getBilling() {
         return billing;

components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/HubspotHandler.java

@@ -0,0 +1,108 @@
+package io.entgra.ui.request.interceptor;
+
+import com.google.gson.JsonObject;
+import io.entgra.ui.request.interceptor.beans.ProxyResponse;
+import io.entgra.ui.request.interceptor.util.HandlerConstants;
+import io.entgra.ui.request.interceptor.util.HandlerUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.http.HttpHeaders;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+
+import javax.servlet.annotation.MultipartConfig;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+
+@MultipartConfig
+@WebServlet(
+        name = "HubspotRequestHandlerServlet",
+        description = "",
+        urlPatterns = {
+                "/hubspot/*"
+        }
+)
+public class HubspotHandler extends HttpServlet {
+
+        private static final Log log = LogFactory.getLog(HubspotHandler.class);
+        private HttpSession httpSession;
+        private static String hubspotEndpoint;
+        private static String chatConfig;
+        private JsonObject uiConfigJsonObject;
+        private static String gatewayUrl;
+        private static String iotsCoreUrl;
+
+        @Override
+        protected void doPost(HttpServletRequest req, HttpServletResponse resp) {
+                try {
+                    if (validateRequest(req, resp)) {
+                        HttpPost postRequest = new HttpPost(HandlerUtil.generateBackendRequestURL(req, hubspotEndpoint));
+                        HandlerUtil.generateChatRequestEntity(req, postRequest);
+                        postRequest.setHeader(HttpHeaders.CONTENT_TYPE, "application/json");
+                        postRequest.setHeader(HttpHeaders.AUTHORIZATION, HandlerConstants.BEARER + chatConfig);
+                        ProxyResponse proxyResponse = HandlerUtil.execute(postRequest);
+                        HandlerUtil.handleSuccess(resp, proxyResponse);
+                    }
+                } catch (IOException e) {
+                        log.error("Error occurred when processing POST request.", e);
+                }
+
+        }
+
+        @Override
+        protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
+
+                try {
+                    if (validateRequest(req, resp)) {
+                        HttpGet getRequest = new HttpGet(HandlerUtil.generateBackendRequestURL(req,hubspotEndpoint));
+                        getRequest.setHeader(HttpHeaders.CONTENT_TYPE, "application/json");
+                        getRequest.setHeader(HttpHeaders.AUTHORIZATION, HandlerConstants.BEARER + chatConfig);
+                        ProxyResponse proxyResponse = HandlerUtil.execute(getRequest);
+                        HandlerUtil.handleSuccess(resp, proxyResponse);
+                    }
+                } catch (IOException e) {
+                        log.error("Error occurred when processing GET request.", e);
+                }
+        }
+
+        /***
+         * Validates the hubspot's incoming request.
+         *
+         * @param req {@link HttpServletRequest}
+         * @param resp {@link HttpServletResponse}
+         * @return If request is a valid one, returns TRUE, otherwise return FALSE
+         * @throws IOException If and error occurs while witting error response to client side
+         */
+        private boolean validateRequest(HttpServletRequest req, HttpServletResponse resp)
+                throws IOException {
+
+                httpSession = req.getSession(false);
+                gatewayUrl = req.getScheme() + HandlerConstants.SCHEME_SEPARATOR + System.getProperty(HandlerConstants.IOT_GW_HOST_ENV_VAR)
+                        + HandlerConstants.COLON + HandlerUtil.getGatewayPort(req.getScheme());
+                iotsCoreUrl = req.getScheme() + HandlerConstants.SCHEME_SEPARATOR + System.getProperty(HandlerConstants.IOT_CORE_HOST_ENV_VAR)
+                        + HandlerConstants.COLON + HandlerUtil.getCorePort(req.getScheme());
+                String uiConfigUrl = iotsCoreUrl + HandlerConstants.UI_CONFIG_ENDPOINT;
+                uiConfigJsonObject = HandlerUtil.getUIConfigAndPersistInSession(uiConfigUrl, gatewayUrl, httpSession, resp);
+                chatConfig = uiConfigJsonObject.get("chatConfig").getAsString();
+                hubspotEndpoint = HandlerConstants.HTTPS_PROTOCOL + HandlerConstants.SCHEME_SEPARATOR + HandlerConstants.HUBSPOT_CHAT_URL;
+
+                if (httpSession == null) {
+                        log.error("Unauthorized, You are not logged in. Please log in to the portal");
+                        HandlerUtil.handleError(resp, HttpStatus.SC_UNAUTHORIZED);
+                        return false;
+                }
+
+                if (req.getMethod() == null) {
+                        log.error("Bad Request, Request method is empty");
+                        HandlerUtil.handleError(resp, HttpStatus.SC_BAD_REQUEST);
+                        return false;
+                }
+
+                return true;
+        }
+}

components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/util/HandlerConstants.java

@@ -105,4 +105,5 @@ public class HandlerConstants {
     public static final String IOT_GW_HTTPS_PORT_ENV_VAR = "iot.gateway.https.port";
     public static final String IOT_REPORTING_WEBAPP_HOST_ENV_VAR = "iot.reporting.webapp.host";
     public static final String USER_SCOPES = "userScopes";
+    public static final String HUBSPOT_CHAT_URL = "api.hubapi.com";
 }

components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/util/HandlerUtil.java

@@ -435,6 +435,23 @@ public class HandlerUtil {
         }
     }
 
+    /**
+     * Generate te request entity for POST requests from the hubspot's incoming request.
+     *
+     * @param req          incoming {@link HttpServletRequest}.
+     * @param proxyRequest proxy request instance.
+     * @throws IOException         If error occurred while generating the request body.
+     */
+    public static void generateChatRequestEntity(HttpServletRequest req, HttpEntityEnclosingRequestBase proxyRequest)
+            throws  IOException {
+        if (StringUtils.isNotEmpty(req.getHeader(HttpHeaders.CONTENT_LENGTH)) ||
+                StringUtils.isNotEmpty(req.getHeader(HttpHeaders.TRANSFER_ENCODING))) {
+            InputStreamEntity entity = new InputStreamEntity(req.getInputStream(),
+                    Long.parseLong(req.getHeader(HttpHeaders.CONTENT_LENGTH)));
+            proxyRequest.setEntity(new BufferedHttpEntity(entity));
+        }
+    }
+
     /***
      * Constructs the application registration payload for DCR.
      *

features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml

@@ -24,6 +24,7 @@
     <SessionTimeOut>3600</SessionTimeOut>
     <!--  maximum number of login cache entries  -->
     <LoginCacheCapacity>10000</LoginCacheCapacity>
+    <ChatConfig>pat-na1-33bc59e0-3526-45b0-b9cf-f353d0ae0ced</ChatConfig>
     <Billing>
         <HideBillGenerationInSuperTenant>false</HideBillGenerationInSuperTenant>
         <HideBillGenerationInSubTenant>true</HideBillGenerationInSubTenant>