chore(release): pull hotfix-release/v1.71.2 into main (#3561)

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.71.2](https://github.com/rudderlabs/rudder-transformer/compare/v1.71.1...v1.71.2) (2024-07-15)
+
+
+### Bug Fixes
+
+* add user-agent header in api calls ([53710f9](https://github.com/rudderlabs/rudder-transformer/commit/53710f91a94a631861512093a46acf97534eb607))
+
 ### [1.71.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.71.0...v1.71.1) (2024-07-10)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rudder-transformer",
-  "version": "1.71.1",
+  "version": "1.71.2",
   "description": "",
   "homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
   "bugs": {

src/cdk/v2/destinations/intercom/utils.js

@@ -78,6 +78,7 @@ const getHeaders = (destination, apiVersion) => ({
   Authorization: `Bearer ${destination.Config.apiKey}`,
   Accept: JSON_MIME_TYPE,
   'Intercom-Version': apiVersion === 'v1' ? '1.4' : '2.10',
+  'User-Agent': process.env.INTERCOM_USER_AGENT_HEADER ?? 'RudderStack',
 });
 
 /**
@@ -218,6 +219,7 @@ const attachUserAndCompany = (message, Config) => {
     Authorization: `Bearer ${Config.apiKey}`,
     Accept: JSON_MIME_TYPE,
     'Intercom-Version': '1.4',
+    'User-Agent': process.env.INTERCOM_USER_AGENT_HEADER ?? 'RudderStack',
   };
   response.body.JSON = requestBody;
   response.userId = anonymousId;

src/cdk/v2/destinations/intercom/utils.test.js

@@ -255,6 +255,7 @@ describe('getHeaders utility test', () => {
       Authorization: `Bearer ${destination.Config.apiKey}`,
       Accept: 'application/json',
       'Intercom-Version': '2.10',
+      'User-Agent': 'RudderStack',
     };
     const headers = getHeaders(destination, 'v2');
     expect(headers).toEqual(expectedHeaders);

src/v0/destinations/intercom/networkHandler.js

@@ -1,5 +1,5 @@
 const { RetryableError } = require('@rudderstack/integrations-lib');
-const { proxyRequest, prepareProxyRequest } = require('../../../adapters/network');
+const { prepareProxyRequest, httpSend } = require('../../../adapters/network');
 const { processAxiosResponse } = require('../../../adapters/utils/networkUtils');
 
 const errorResponseHandler = (destinationResponse, dest) => {
@@ -23,12 +23,47 @@ const destResponseHandler = (responseParams) => {
   };
 };
 
+const prepareIntercomProxyRequest = (request) => {
+  const { metadata } = request;
+  const preparedRequest = prepareProxyRequest(request);
+  preparedRequest.headers['User-Agent'] = process.env.INTERCOM_USER_AGENT_HEADER ?? 'RudderStack';
+  return { ...preparedRequest, metadata };
+};
+
+/**
+ * depricating: handles proxying requests to destinations from server, expects requsts in "defaultRequestConfig"
+ * note: needed for test api
+ * @param {*} request
+ * @returns
+ */
+const intercomProxyRequest = async (request) => {
+  const { endpoint, data, method, params, headers, metadata } =
+    prepareIntercomProxyRequest(request);
+
+  const requestOptions = {
+    url: endpoint,
+    data,
+    params,
+    headers,
+    method,
+  };
+  const response = await httpSend(requestOptions, {
+    destType: 'intercom',
+    feature: 'proxy',
+    endpointPath: '/proxy',
+    requestMethod: 'POST',
+    module: 'router',
+    metadata,
+  });
+  return response;
+};
+
 // eslint-disable-next-line @typescript-eslint/naming-convention
 class networkHandler {
   constructor() {
     this.responseHandler = destResponseHandler;
-    this.proxy = proxyRequest;
-    this.prepareProxy = prepareProxyRequest;
+    this.proxy = intercomProxyRequest;
+    this.prepareProxy = prepareIntercomProxyRequest;
     this.processAxiosResponse = processAxiosResponse;
   }
 }

test/integrations/destinations/intercom/dataDelivery/business.ts

@@ -9,13 +9,15 @@ const commonHeaders = {
   Authorization: 'Bearer testApiKey',
   Accept: 'application/json',
   'Intercom-Version': '1.4',
+  'User-Agent': 'RudderStack',
 };
 
 const unauthorizedResponseHeaders = {
   'Content-Type': 'application/json',
   Authorization: 'Bearer invalidApiKey',
   Accept: 'application/json',
   'Intercom-Version': '1.4',
+  'User-Agent': 'RudderStack',
 };
 
 const createUserPayload = {

test/integrations/destinations/intercom/dataDelivery/other.ts

@@ -10,6 +10,7 @@ const commonHeaders = {
   Authorization: 'Bearer testApiKey',
   Accept: 'application/json',
   'Intercom-Version': '1.4',
+  'User-Agent': 'RudderStack',
 };
 
 const createUserPayload = {

test/integrations/destinations/intercom/network.ts

@@ -9,15 +9,15 @@ const v0VersionHeaders = {
   Authorization: 'Bearer testApiKey',
   Accept: 'application/json',
   'Intercom-Version': '1.4',
-  'User-Agent': 'RudderLabs',
+  'User-Agent': 'RudderStack',
 };
 
 const v1VersionHeaders = {
   'Content-Type': 'application/json',
   Authorization: 'Bearer testApiKey',
   Accept: 'application/json',
   'Intercom-Version': '2.10',
-  'User-Agent': 'RudderLabs',
+  'User-Agent': 'RudderStack',
 };
 
 const userPayload = {
@@ -532,7 +532,7 @@ const deliveryCallsData = [
         Authorization: 'Bearer invalidApiKey',
         Accept: 'application/json',
         'Intercom-Version': '1.4',
-        'User-Agent': 'RudderLabs',
+        'User-Agent': 'RudderStack',
       },
       method: 'POST',
     },

test/integrations/destinations/intercom/processor/groupTestData.ts

@@ -24,13 +24,15 @@ const v1Headers = {
   Authorization: 'Bearer abcd=',
   Accept: 'application/json',
   'Intercom-Version': '1.4',
+  'User-Agent': 'RudderStack',
 };
 
 const v2Headers = {
   Accept: 'application/json',
   Authorization: 'Bearer testApiKey',
   'Content-Type': 'application/json',
   'Intercom-Version': '2.10',
+  'User-Agent': 'RudderStack',
 };
 
 const destination: Destination = {

test/integrations/destinations/intercom/processor/identifyTestData.ts

@@ -24,13 +24,15 @@ const v2Headers = {
   Authorization: 'Bearer testApiKey',
   'Content-Type': 'application/json',
   'Intercom-Version': '2.10',
+  'User-Agent': 'RudderStack',
 };
 
 const v1Headers = {
   'Content-Type': 'application/json',
   Authorization: 'Bearer intercomApiKey',
   Accept: 'application/json',
   'Intercom-Version': '1.4',
+  'User-Agent': 'RudderStack',
 };
 
 const destination: Destination = {

test/integrations/destinations/intercom/processor/trackTestData.ts

@@ -24,13 +24,15 @@ const v1Headers = {
   Authorization: 'Bearer intercomApiKey',
   Accept: 'application/json',
   'Intercom-Version': '1.4',
+  'User-Agent': 'RudderStack',
 };
 
 const v2Headers = {
   Accept: 'application/json',
   Authorization: 'Bearer testApiKey',
   'Content-Type': 'application/json',
   'Intercom-Version': '2.10',
+  'User-Agent': 'RudderStack',
 };
 
 const destination: Destination = {