From 6cfdf85c1d4938b8a45fa49dae5c10dedcc409c2 Mon Sep 17 00:00:00 2001
From: vigneshan <vigneshan@entgra.io>
Date: Wed, 12 May 2021 21:53:43 +0530
Subject: [PATCH] Update invoker handler to append tenant-id for reporting
 backend get api calls

---
 .../io/entgra/ui/request/interceptor/InvokerHandler.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/InvokerHandler.java b/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/InvokerHandler.java
index 51a6c06674..d56202d8e2 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/InvokerHandler.java
+++ b/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/InvokerHandler.java
@@ -48,6 +48,7 @@ import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.entity.mime.content.InputStreamBody;
 import io.entgra.ui.request.interceptor.beans.ProxyResponse;
+import org.wso2.carbon.context.CarbonContext;
 
 import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.annotation.WebServlet;
@@ -110,6 +111,11 @@ public class InvokerHandler extends HttpServlet {
                 HttpGet getRequest = new HttpGet(generateBackendRequestURL(req));
                 copyRequestHeaders(req, getRequest, false);
                 getRequest.setHeader(HttpHeaders.AUTHORIZATION, HandlerConstants.BEARER + authData.getAccessToken());
+                if (apiEndpoint.equals(System.getProperty("iot.reporting.webapp.host"))) {
+                    getRequest.setHeader("Tenant-Id", String.valueOf(
+                            CarbonContext.getThreadLocalCarbonContext().getTenantId()
+                    ));
+                }
                 ProxyResponse proxyResponse = HandlerUtil.execute(getRequest);
                 if (HandlerConstants.TOKEN_IS_EXPIRED.equals(proxyResponse.getExecutorResponse())) {
                     proxyResponse = retryRequestWithRefreshedToken(req, resp, getRequest);