chore(release): pull hotfix-release/v1.50.1 into main (#2874)

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.50.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.50.0...v1.50.1) (2023-12-05)
+
+
+### Bug Fixes
+
+* salesforce transformer proxy response handling issue for authorization flow ([#2873](https://github.com/rudderlabs/rudder-transformer/issues/2873)) ([4cec65e](https://github.com/rudderlabs/rudder-transformer/commit/4cec65e4103e99021f5108fcc7c557b952f1c5eb))
+
 ## [1.50.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.49.1...v1.50.0) (2023-11-13)
 
 

package.json

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

src/v0/destinations/salesforce/networkHandler.js

@@ -1,5 +1,6 @@
 const { proxyRequest, prepareProxyRequest } = require('../../../adapters/network');
 const { processAxiosResponse } = require('../../../adapters/utils/networkUtils');
+const { LEGACY } = require('./config');
 const { salesforceResponseHandler } = require('./utils');
 
 const responseHandler = (destinationResponse, destType) => {
@@ -9,6 +10,7 @@ const responseHandler = (destinationResponse, destType) => {
     destinationResponse,
     'during Salesforce Response Handling',
     destinationResponse?.rudderJobMetadata?.destInfo?.authKey,
+    LEGACY
   );
 
   // else successfully return status as 200, message and original destination response

src/v0/destinations/salesforce/utils.js

@@ -33,16 +33,21 @@ const salesforceResponseHandler = (destResponse, sourceMessage, authKey, authori
     const matchErrorCode = (errorCode) =>
       response && Array.isArray(response) && response.some((resp) => resp?.errorCode === errorCode);
     if (status === 401 && authKey && matchErrorCode('INVALID_SESSION_ID')) {
-      if (authorizationFlow === LEGACY) {
-        // checking for invalid/expired token errors and evicting cache in that case
-        // rudderJobMetadata contains some destination info which is being used to evict the cache
-        ACCESS_TOKEN_CACHE.del(authKey);
+      if (authorizationFlow === OAUTH) {
+        throw new RetryableError(
+          `${DESTINATION} Request Failed - due to "INVALID_SESSION_ID", (Retryable) ${sourceMessage}`,
+          500,
+          destResponse,
+          getAuthErrCategoryFromStCode(status),
+        );
       }
+      // checking for invalid/expired token errors and evicting cache in that case
+      // rudderJobMetadata contains some destination info which is being used to evict the cache
+      ACCESS_TOKEN_CACHE.del(authKey);
       throw new RetryableError(
         `${DESTINATION} Request Failed - due to "INVALID_SESSION_ID", (Retryable) ${sourceMessage}`,
         500,
         destResponse,
-        authorizationFlow === LEGACY ? '' : getAuthErrCategoryFromStCode(status),
       );
     } else if (status === 403 && matchErrorCode('REQUEST_LIMIT_EXCEEDED')) {
       // If the error code is REQUEST_LIMIT_EXCEEDED, you’ve exceeded API request limits in your org.

src/v0/destinations/salesforce_oauth/networkHandler.js

@@ -0,0 +1,33 @@
+const { proxyRequest, prepareProxyRequest } = require('../../../adapters/network');
+const { processAxiosResponse } = require('../../../adapters/utils/networkUtils');
+const { OAUTH } = require('../salesforce/config');
+const { salesforceResponseHandler } = require('../salesforce/utils');
+
+const responseHandler = (destinationResponse, destType) => {
+  const message = `Request for destination: ${destType} Processed Successfully`;
+
+  salesforceResponseHandler(
+    destinationResponse,
+    'during Salesforce Response Handling',
+    destinationResponse?.rudderJobMetadata?.destInfo?.authKey,
+    OAUTH
+  );
+
+  // else successfully return status as 200, message and original destination response
+  return {
+    status: 200,
+    message,
+    destinationResponse,
+  };
+};
+
+function networkHandler() {
+  this.responseHandler = responseHandler;
+  this.proxy = proxyRequest;
+  this.prepareProxy = prepareProxyRequest;
+  this.processAxiosResponse = processAxiosResponse;
+}
+
+module.exports = {
+  networkHandler,
+};

test/__tests__/facebook_conversions.test.js

@@ -23,6 +23,8 @@ const outputRouterDataFile = fs.readFileSync(
 const inputRouterData = JSON.parse(inputRouterDataFile);
 const expectedRouterData = JSON.parse(outputRouterDataFile);
 
+Date.now = jest.fn(() => new Date("2023-11-12T15:46:51.000Z")); // 2023-11-12T15:46:51.693229+05:30
+
 describe(`${name} Tests`, () => {
   describe("Processor", () => {
     testData.forEach((dataPoint, index) => {

test/integrations/destinations/salesforce/dataDelivery/data.ts

@@ -119,7 +119,6 @@ export const data = [
         body: {
           output: {
             status: 500,
-            authErrorCategory: 'REFRESH_TOKEN',
             message:
               'Salesforce Request Failed - due to "INVALID_SESSION_ID", (Retryable) during Salesforce Response Handling',
             destinationResponse: {