Handle adding bids in core response handler

prebid · Feb 8, 2018 · d207b48 · d207b48
1 parent f20b0c0
commit d207b48
Showing 1 changed file with 23 additions and 16 deletions.
diff --git a/modules/prebidServerBidAdapter.js b/modules/prebidServerBidAdapter.js
@@ -212,8 +212,6 @@ function _getDigiTrustQueryParams() {
 const legacy = {
   // build payload for endpoint
   buildRequest(s2sBidRequest, ad_units) {
-    const isDebug = !!getConfig('debug');
-
     const request = {
       account_id: _s2sConfig.accountId,
       tid: s2sBidRequest.tid,
@@ -224,19 +222,18 @@ const legacy = {
       url: utils.getTopWindowUrl(),
       prebid_version: '$prebid.version$',
       ad_units: ad_units,
-      is_debug: isDebug,
+      is_debug: !!getConfig('debug'),
     };
 
-    let digiTrust = _getDigiTrustQueryParams();
-
     // grab some global config and pass it along
     ['app', 'device'].forEach(setting => {
       let value = getConfig(setting);
       if (typeof value === 'object') {
-        requestJson[setting] = value;
+        request[setting] = value;
       }
     });
 
+    let digiTrust = _getDigiTrustQueryParams();
     if (digiTrust) {
       request.digiTrust = digiTrust;
     }
@@ -245,7 +242,9 @@ const legacy = {
   },
 
   // handler for endpoint response
-  interpretResponse(result, addBidResponse, bidRequests, requestedBidders) {
+  interpretResponse(result, bidRequests, requestedBidders) {
+    const bids = [];
+
     if (result.status === 'OK' || result.status === 'no_cookie') {
       if (result.bidder_status) {
         result.bidder_status.forEach(bidder => {
@@ -319,9 +318,7 @@ const legacy = {
           bidObject.currency = (bidObj.currency) ? bidObj.currency : DEFAULT_S2S_CURRENCY;
           bidObject.netRevenue = (bidObj.netRevenue) ? bidObj.netRevenue : DEFAULT_S2S_NETREVENUE;
 
-          if (isValid(bidObj.code, bidObject, bidRequests)) {
-            addBidResponse(bidObj.code, bidObject);
-          }
+          bids.push({ adUnit: bidObj.code, bid: bidObject })
         });
       }
     }
@@ -330,6 +327,8 @@ const legacy = {
       // cookie sync
       cookieSet(_s2sConfig.cookieSetUrl);
     }
+
+    return bids;
   }
 };
 
@@ -378,7 +377,9 @@ const openRtb = {
   },
 
   // handler for endpoint response
-  interpretResponse(response, addBidResponse, bidRequests, requestedBidders) {
+  interpretResponse(response, bidRequests, requestedBidders) {
+    const bids = [];
+
     if (response.seatbid) {
       response.seatbid.forEach(bidObj => {
         let cpm = bidObj.bid[0].price;
@@ -407,11 +408,11 @@ const openRtb = {
         bidObject.currency = (bidObj.currency) ? bidObj.currency : DEFAULT_S2S_CURRENCY;
         bidObject.netRevenue = (bidObj.netRevenue) ? bidObj.netRevenue : DEFAULT_S2S_NETREVENUE;
 
-        if (isValid(bidObj.bid[0].impid, bidObject, bidRequests)) {
-          addBidResponse(bidObj.bid[0].impid, bidObject);
-        }
+        bids.push({ adUnit: bidObj.bid[0].impid, bid: bidObject });
       });
     }
+
+    return bids;
   }
 };
 
@@ -425,7 +426,7 @@ const openRtb = {
  *   const request = protocol().buildRequest(s2sBidRequest, ad_units);
  *
  *   // handle server response with using given parameters, e.g. in `handleResponse`
- *   protocol().interpretResponse(response, addBidResponse, bidRequests, requestedBidders);
+ *   protocol().interpretResponse(response, bidRequests, requestedBidders);
  */
 const protocol = () => {
   const isOpenRtb = _s2sConfig.endpoint.includes(OPEN_RTB_PATH);
@@ -478,7 +479,13 @@ export function PrebidServer() {
 
     try {
       result = JSON.parse(response);
-      protocol().interpretResponse(result, addBidResponse, bidRequests, requestedBidders);
+
+      const bids = protocol().interpretResponse(result, bidRequests, requestedBidders);
+      (bids || []).forEach(({adUnit, bid}) => {
+        if (isValid(adUnit, bid, bidRequests)) {
+          addBidResponse(adUnit, bid);
+        }
+      });
     } catch (error) {
       utils.logError(error);
     }