Merge branch 'develop' into dependabot/npm_and_yarn/eslint-plugin-pre…

…ttier-5.2.1
rudderlabs · Sep 3, 2024 · 653a6e4 · 653a6e4
2 parents 9018165 + 6ba16f6
commit 653a6e4
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/v0/destinations/google_adwords_offline_conversions/utils.js b/src/v0/destinations/google_adwords_offline_conversions/utils.js
@@ -1,5 +1,6 @@
 const sha256 = require('sha256');
 const SqlString = require('sqlstring');
+const isString = require('lodash/isString');
 const { get, set, cloneDeep } = require('lodash');
 const {
   AbortedError,
@@ -271,7 +272,9 @@ const getAddConversionPayload = (message, Config) => {
 
   const userIdentifierInfo = {
     email:
-      hashUserIdentifier && isDefinedAndNotNull(email) ? sha256(email.trim()).toString() : email,
+      hashUserIdentifier && isString(email) && isDefinedAndNotNull(email)
+        ? sha256(email.trim()).toString()
+        : email,
     phone:
       hashUserIdentifier && isDefinedAndNotNull(phone) ? sha256(phone.trim()).toString() : phone,
     address: buildAndGetAddress(message, hashUserIdentifier),
@@ -367,7 +370,9 @@ const getClickConversionPayloadAndEndpoint = (
 
   const userIdentifierInfo = {
     email:
-      hashUserIdentifier && isDefinedAndNotNull(email) ? sha256(email.trim()).toString() : email,
+      hashUserIdentifier && isString(email) && isDefinedAndNotNull(email)
+        ? sha256(email.trim()).toString()
+        : email,
     phone:
       hashUserIdentifier && isDefinedAndNotNull(phone) ? sha256(phone.trim()).toString() : phone,
   };