Targeting updates (#1689)

* Cherry pick alias bidder

* Cherry pick alias bidder

* Cherry pick alias bidder

* Updated test case to not import adapter

* targeting updates

* targeting functions refactoring

* Refactored functions

* more refactor of function

* added jsdoc and some more refactor

* check bid expiry and filtering used bids

Author: jaiminpanchal27

src/auction.js

@@ -364,7 +364,6 @@ export function getKeyValueTargetingPairs(bidderCode, custBidObj) {
   // 2) set keys from specific bidder setting override if they exist
   if (bidderCode && custBidObj && bidder_settings && bidder_settings[bidderCode] && bidder_settings[bidderCode][CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING]) {
     setKeys(keyValues, bidder_settings[bidderCode], custBidObj);
-    custBidObj.alwaysUseBid = bidder_settings[bidderCode].alwaysUseBid;
     custBidObj.sendStandardTargeting = bidder_settings[bidderCode].sendStandardTargeting;
   }
 

src/auctionManager.js

@@ -31,9 +31,6 @@ export function newAuctionManager() {
   let _auctions = [];
   let auctionManager = {};
 
-  // return bids whose status is not set. Winning bid can have status `targetingSet` or `rendered`.
-  const isUnusedBid = (bid) => bid && !bid.status;
-
   auctionManager.addWinningBid = function(bid) {
     const auction = _auctions.find(auction => auction.getAuctionId() === bid.auctionId);
     if (auction) {
@@ -62,7 +59,7 @@ export function newAuctionManager() {
         return auction.getBidsReceived();
       }
     }).reduce(flatten, [])
-      .filter(isUnusedBid);
+      .filter(bid => bid);
   };
 
   auctionManager.getAdUnits = function() {

src/config.js

@@ -14,7 +14,7 @@ const DEFAULT_DEBUG = false;
 const DEFAULT_BIDDER_TIMEOUT = 3000;
 const DEFAULT_PUBLISHER_DOMAIN = window.location.origin;
 const DEFAULT_COOKIESYNC_DELAY = 100;
-const DEFAULT_ENABLE_SEND_ALL_BIDS = false;
+const DEFAULT_ENABLE_SEND_ALL_BIDS = true;
 const DEFAULT_USERSYNC = {
   syncEnabled: true,
   pixelEnabled: true,

src/prebid.js

@@ -113,22 +113,7 @@ $$PREBID_GLOBAL$$.getAdserverTargetingForAdUnitCode = function(adUnitCode) {
 
 $$PREBID_GLOBAL$$.getAdserverTargeting = function (adUnitCode) {
   utils.logInfo('Invoking $$PREBID_GLOBAL$$.getAdserverTargeting', arguments);
-  return targeting.getAllTargeting(adUnitCode)
-    .map(targeting => {
-      return {
-        [Object.keys(targeting)[0]]: targeting[Object.keys(targeting)[0]]
-          .map(target => {
-            return {
-              [Object.keys(target)[0]]: target[Object.keys(target)[0]].join(', ')
-            };
-          }).reduce((p, c) => Object.assign(c, p), {})
-      };
-    })
-    .reduce(function (accumulator, targeting) {
-      var key = Object.keys(targeting)[0];
-      accumulator[key] = Object.assign({}, accumulator[key], targeting[key]);
-      return accumulator;
-    }, {});
+  return targeting.getAllTargeting(adUnitCode);
 };
 
 /**
@@ -190,7 +175,7 @@ $$PREBID_GLOBAL$$.setTargetingForGPTAsync = function (adUnit) {
   targeting.resetPresetTargeting(adUnit);
 
   // now set new targeting keys
-  targeting.setTargeting(targetingSet);
+  targeting.setTargetingForGPT(targetingSet);
 
   // emit event
   events.emit(SET_TARGETING);

src/secureCreatives.js

@@ -6,6 +6,7 @@
 import events from './events';
 import { fireNativeTrackers } from './native';
 import { EVENTS } from './constants';
+import { isSlotMatchingAdUnitCode } from './utils';
 import { auctionManager } from './auctionManager';
 
 const BID_WON = EVENTS.BID_WON;
@@ -67,11 +68,11 @@ function sendAdToCreative(adObject, remoteDomain, source) {
 }
 
 function resizeRemoteCreative({ adUnitCode, width, height }) {
-  const iframe = document.getElementById(window.googletag.pubads()
-    .getSlots().find(slot => {
-      return slot.getAdUnitPath() === adUnitCode ||
-        slot.getSlotElementId() === adUnitCode;
-    }).getSlotElementId()).querySelector('iframe');
+  const iframe = document.getElementById(
+    window.googletag.pubads().getSlots()
+      .filter(isSlotMatchingAdUnitCode(adUnitCode))
+      .find(slot => slot)
+      .getSlotElementId()).querySelector('iframe');
 
   iframe.width = '' + width;
   iframe.height = '' + height;