Merge branch 'develop' into feat.pinterest_tag

package.json

@@ -92,7 +92,7 @@
     "json-size": "^1.0.0",
     "jsontoxml": "^1.0.1",
     "jstoxml": "^5.0.2",
-    "koa": "^2.14.1",
+    "koa": "^2.15.3",
     "koa-bodyparser": "^4.4.0",
     "koa2-swagger-ui": "^5.7.0",
     "libphonenumber-js": "^1.11.1",
@@ -128,7 +128,7 @@
     "@types/fast-json-stable-stringify": "^2.1.0",
     "@types/jest": "^29.5.1",
     "@types/jsonpath": "^0.2.4",
-    "@types/koa": "^2.13.6",
+    "@types/koa": "^2.15.0",
     "@types/koa-bodyparser": "^4.3.10",
     "@types/lodash": "^4.14.197",
     "@types/node": "^20.2.5",

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

@@ -257,7 +257,7 @@ const filterCustomAttributes = (payload, type, destination, message) => {
   let customAttributes = { ...get(payload, 'custom_attributes') };
   if (customAttributes) {
     ReservedAttributesList.forEach((trait) => {
-      if (customAttributes[trait]) delete customAttributes[trait];
+      if (trait in customAttributes) delete customAttributes[trait];
     });
     if (isDefinedAndNotNull(customAttributes) && Object.keys(customAttributes).length > 0) {
       customAttributes =

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

@@ -318,6 +318,18 @@ describe('filterCustomAttributes utility test', () => {
     expect(result).toBeUndefined();
   });
 
+  it('Should filter out custom attributes that are reserved attributes and that are false', () => {
+    const payload = { custom_attributes: { unsubscribedFromEmails: false } };
+    const result = filterCustomAttributes(payload, 'user', { Config: { apiVersion: 'v2' } });
+    expect(result).toBeUndefined();
+  });
+
+  it('Should filter out custom attributes that are reserved attributes and that are null', () => {
+    const payload = { custom_attributes: { unsubscribedFromEmails: null } };
+    const result = filterCustomAttributes(payload, 'user', { Config: { apiVersion: 'v2' } });
+    expect(result).toBeUndefined();
+  });
+
   it('Should return a flattened object when custom attributes are not null, not reserved attributes and nested', () => {
     const payload = {
       custom_attributes: { source: 'rudder-js-sdk', data: { nestedAttribute: 'nestedValue' } },

src/warehouse/index.js

@@ -30,7 +30,7 @@ const whExtractEventTableColumnMappingRules = require('./config/WHExtractEventTa
 const maxColumnsInEvent = parseInt(process.env.WH_MAX_COLUMNS_IN_EVENT || '200', 10);
 
 const WH_POPULATE_SRC_DEST_INFO_IN_CONTEXT =
-  process.env.WH_POPULATE_SRC_DEST_INFO_IN_CONTEXT || true;
+  process.env.WH_POPULATE_SRC_DEST_INFO_IN_CONTEXT !== 'false';
 
 const getDataType = (key, val, options, jsonKey = false) => {
   const type = typeof val;