Revert "fix two issues related to hb_uuid and hb_cache_id targeting keys (#3568)" (#3595)

This reverts commit 54b4188.

Author: jsnellbaker

modules/dfpAdServerVideo.js

@@ -160,6 +160,9 @@ function getCustParams(bid, options) {
   let customParams = Object.assign({},
     allTargetingData,
     adserverTargeting,
+    { hb_uuid: bid && bid.videoCacheKey },
+    // hb_uuid will be deprecated and replaced by hb_cache_id
+    { hb_cache_id: bid && bid.videoCacheKey },
     optCustParams,
   );
   return encodeURIComponent(formatQS(customParams));

src/auction.js

@@ -386,8 +386,6 @@ export function doCallbacksIfTimedout(auctionInstance, bidResponse) {
 
 // Add a bid to the auction.
 export function addBidToAuction(auctionInstance, bidResponse) {
-  setupBidTargeting(bidResponse);
-
   events.emit(CONSTANTS.EVENTS.BID_RESPONSE, bidResponse);
   auctionInstance.addBidReceived(bidResponse);
 
@@ -431,7 +429,6 @@ export const callPrebidCache = hook('async', function(auctionInstance, bidRespon
         doCallbacksIfTimedout(auctionInstance, bidResponse);
       } else {
         bidResponse.videoCacheKey = cacheIds[0].uuid;
-
         if (!bidResponse.vastUrl) {
           bidResponse.vastUrl = getCacheUrl(bidResponse.videoCacheKey);
         }
@@ -488,23 +485,16 @@ function getPreparedBidForAuction({adUnitCode, bid, bidderRequest, auctionId}) {
   bidObject.pbDg = priceStringsObj.dense;
   bidObject.pbCg = priceStringsObj.custom;
 
-  return bidObject;
-}
-
-function setupBidTargeting(bidObject) {
-  let keyValues;
+  // if there is any key value pairs to map do here
+  var keyValues;
   if (bidObject.bidderCode && (bidObject.cpm > 0 || bidObject.dealId)) {
     keyValues = getKeyValueTargetingPairs(bidObject.bidderCode, bidObject, bidReq);
   }
 
-  let cacheTargetKeys = {};
-  if (bidObject.videoCacheKey) {
-    cacheTargetKeys.hb_uuid = bidObject.videoCacheKey;
-    cacheTargetKeys.hb_cache_id = bidObject.videoCacheKey;
-  }
-
   // use any targeting provided as defaults, otherwise just set from getKeyValueTargetingPairs
-  bidObject.adserverTargeting = Object.assign(bidObject.adserverTargeting || {}, cacheTargetKeys, keyValues);
+  bidObject.adserverTargeting = Object.assign(bidObject.adserverTargeting || {}, keyValues);
+
+  return bidObject;
 }
 
 export function getStandardBidderSettings(mediaType) {

test/spec/modules/dfpAdServerVideo_spec.js

@@ -10,10 +10,7 @@ import { targeting } from 'src/targeting';
 
 const bid = {
   videoCacheKey: 'abc',
-  adserverTargeting: {
-    hb_uuid: 'abc',
-    hb_cache_id: 'abc',
-  },
+  adserverTargeting: { },
 };
 
 describe('The DFP video support module', function () {
@@ -43,7 +40,7 @@ describe('The DFP video support module', function () {
   });
 
   it('can take an adserver url as a parameter', function () {
-    const bidCopy = utils.deepClone(bid);
+    const bidCopy = Object.assign({ }, bid);
     bidCopy.vastUrl = 'vastUrl.example';
 
     const url = parse(buildDfpVideoUrl({
@@ -93,10 +90,10 @@ describe('The DFP video support module', function () {
   });
 
   it('should include the cache key and adserver targeting in cust_params', function () {
-    const bidCopy = utils.deepClone(bid);
-    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
+    const bidCopy = Object.assign({ }, bid);
+    bidCopy.adserverTargeting = {
       hb_adid: 'ad_id',
-    });
+    };
 
     const url = parse(buildDfpVideoUrl({
       adUnit: adUnit,
@@ -163,10 +160,10 @@ describe('The DFP video support module', function () {
         }
       });
 
-      const bidCopy = utils.deepClone(bid);
-      bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
+      const bidCopy = Object.assign({ }, bid);
+      bidCopy.adserverTargeting = {
         hb_adid: 'ad_id',
-      });
+      };
 
       const url = parse(buildDfpVideoUrl({
         adUnit: adUnitsCopy,
@@ -187,10 +184,10 @@ describe('The DFP video support module', function () {
   });
 
   it('should merge the user-provided cust_params with the default ones', function () {
-    const bidCopy = utils.deepClone(bid);
-    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
+    const bidCopy = Object.assign({ }, bid);
+    bidCopy.adserverTargeting = {
       hb_adid: 'ad_id',
-    });
+    };
 
     const url = parse(buildDfpVideoUrl({
       adUnit: adUnit,
@@ -210,10 +207,10 @@ describe('The DFP video support module', function () {
   });
 
   it('should merge the user-provided cust-params with the default ones when using url object', function () {
-    const bidCopy = utils.deepClone(bid);
-    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
+    const bidCopy = Object.assign({ }, bid);
+    bidCopy.adserverTargeting = {
       hb_adid: 'ad_id',
-    });
+    };
 
     const url = parse(buildDfpVideoUrl({
       adUnit: adUnit,
@@ -232,7 +229,7 @@ describe('The DFP video support module', function () {
   });
 
   it('should not overwrite an existing description_url for object input and cache disabled', function () {
-    const bidCopy = utils.deepClone(bid);
+    const bidCopy = Object.assign({}, bid);
     bidCopy.vastUrl = 'vastUrl.example';
 
     const url = parse(buildDfpVideoUrl({