From b6534c4150c0c229f5f7250550d19fb14bd11466 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Wed, 11 Oct 2017 17:07:31 +0200
Subject: [PATCH 01/37] Convert Criteo adapter to bidderFactory

---
 modules/criteoBidAdapter.js | 143 ++++++++++++++++++++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100755 modules/criteoBidAdapter.js

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
new file mode 100755
index 00000000000..4a2ab274804
--- /dev/null
+++ b/modules/criteoBidAdapter.js
@@ -0,0 +1,143 @@
+import { registerBidder } from 'src/adapters/bidderFactory';
+import { parse } from 'src/url';
+import * as utils from 'src/utils';
+
+const BIDDER_CODE = 'criteo';
+const CDB_ENDPOINT = '//bidder.criteo.com/cdb';
+const PROFILE_ID = 207;
+const ADAPTER_VERSION = 2;
+const INTEGRATION_MODES = {
+  'amp': 1,
+};
+
+/** @type {BidderSpec} */
+export const spec = {
+  code: BIDDER_CODE,
+
+  /**
+   * @param {object} bid
+   * @return {boolean}
+   */
+  isBidRequestValid: bid => (
+    !!(bid && bid.params && bid.params.zoneId)
+  ),
+
+  /**
+   * @param {BidRequest[]} bidRequests
+   * @return {ServerRequest}
+   */
+  buildRequests: bidRequests => {
+    const context = buildContext(bidRequests);
+    return {
+      method: 'POST',
+      url: buildCdbUrl(context),
+      data: buildCdbRequest(context, bidRequests),
+    };
+  },
+
+  /**
+   * @param {*} response
+   * @param {ServerRequest} request
+   * @return {Bid[]}
+   */
+  interpretResponse: (response, request) => {
+    const bids = [];
+
+    if (response.slots && utils.isArray(response.slots)) {
+      response.slots.forEach(slot => {
+        const bid = {
+          requestId: slot.impid,
+          cpm: slot.cpm,
+          // currency: 'USD', // FIXME: should return currency from CDB
+          // netRevenue: true, // FIXME: are bids net or gross?
+          ad: slot.creative,
+          width: slot.width,
+          height: slot.height,
+        }
+        bids.push(bid);
+      });
+    }
+
+    return bids;
+  },
+};
+
+/**
+ * @param {BidRequest[]} bidRequests
+ * @return {CriteoContext}
+ */
+function buildContext(bidRequests) {
+  const url = utils.getTopWindowUrl();
+  const queryString = parse(url).search;
+
+  const context = {
+    url: url,
+    debug: queryString['pbt_debug'] === '1',
+    noLog: queryString['pbt_nolog'] === '1',
+    integrationMode: undefined,
+  };
+
+  bidRequests.forEach(bidRequest => {
+    if (bidRequest.params.integrationMode) {
+      context.integrationMode = bidRequest.params.integrationMode;
+    }
+  })
+
+  return context;
+}
+
+/**
+ * @param {CriteoContext} context
+ * @return {string}
+ */
+function buildCdbUrl(context) {
+  let url = CDB_ENDPOINT;
+  url += '?profileId=' + PROFILE_ID;
+  url += '&av=' + String(ADAPTER_VERSION);
+  url += '&cb=' + String(Math.floor(Math.random() * 99999999999));
+
+  if (context.integrationMode in INTEGRATION_MODES) {
+    url += '&im=' + INTEGRATION_MODES[context.integrationMode];
+  }
+  if (context.debug) {
+    url += '&debug=1';
+  }
+  if (context.noLog) {
+    url += '&nolog=1';
+  }
+
+  return url;
+}
+
+/**
+ * @param {CriteoContext} context
+ * @param {BidRequest[]} bidRequests
+ * @return {*}
+ */
+function buildCdbRequest(context, bidRequests) {
+  let networkId;
+  const request = {
+    publisher: {
+      url: context.url,
+    },
+    slots: bidRequests.map(bidRequest => {
+      networkId = bidRequest.params.networkId || networkId;
+      const slot = {
+        impid: bidRequest.bidId,
+        zoneid: bidRequest.params.zoneId,
+        transactionid: bidRequest.transactionId,
+        sizes: bidRequest.sizes.map(size => size[0] + 'x' + size[1]),
+      };
+      if (bidRequest.params.publisherSubId) {
+        slot.publishersubid = bidRequest.params.publisherSubId;
+      }
+      return slot;
+    }),
+  };
+  if (networkId) {
+    request.publisher.networkid = networkId;
+  }
+  return request;
+}
+
+registerBidder(spec);

From 1f7d0fab51639e7630e3635062210cfa101d3cc6 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Wed, 11 Oct 2017 17:29:02 +0200
Subject: [PATCH 02/37] Add documentation for Prebid 1.0 Criteo adapter

---
 modules/criteoBidAdapter.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100755 modules/criteoBidAdapter.md

diff --git a/modules/criteoBidAdapter.md b/modules/criteoBidAdapter.md
new file mode 100755
index 00000000000..796c70a980f
--- /dev/null
+++ b/modules/criteoBidAdapter.md
@@ -0,0 +1,27 @@
+# Overview
+
+Module Name: Criteo Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: pi-direct@criteo.com
+
+# Description
+
+Module that connects to Criteo's demand sources.
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'banner-ad-div',
+            sizes: [[300, 250], [728, 90]],
+            bids: [
+                {
+                    bidder: 'criteo',
+                    params: {
+                        zoneId: 497747
+                    }
+                }
+            ]
+        }
+    ];
+```

From dc36bd39cb64d1e5d70e45950e1425bd4db27b40 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Wed, 11 Oct 2017 17:56:18 +0200
Subject: [PATCH 03/37] Add support for zone-matching bids on Prebid 1.0 Criteo
 adapter

---
 modules/criteoBidAdapter.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 4a2ab274804..36289d8282c 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -19,7 +19,7 @@ export const spec = {
    * @return {boolean}
    */
   isBidRequestValid: bid => (
-    !!(bid && bid.params && bid.params.zoneId)
+    !!(bid && bid.params && (bid.params.zoneId || bid.params.networkId))
   ),
 
   /**
@@ -124,10 +124,12 @@ function buildCdbRequest(context, bidRequests) {
       networkId = bidRequest.params.networkId || networkId;
       const slot = {
         impid: bidRequest.bidId,
-        zoneid: bidRequest.params.zoneId,
         transactionid: bidRequest.transactionId,
         sizes: bidRequest.sizes.map(size => size[0] + 'x' + size[1]),
       };
+      if (bidRequest.params.zoneId) {
+        slot.zoneid = bidRequest.params.zoneId;
+      }
       if (bidRequest.params.publisherSubId) {
         slot.publishersubid = bidRequest.params.publisherSubId;
       }

From f780bc521df2b8dffb6fa1717f35fe535b981b76 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Wed, 11 Oct 2017 18:09:24 +0200
Subject: [PATCH 04/37] Add unit tests to the Prebid 1.0 Criteo adapter

---
 test/spec/modules/criteoBidAdapter_spec.js | 164 +++++++++++++++++++++
 1 file changed, 164 insertions(+)
 create mode 100755 test/spec/modules/criteoBidAdapter_spec.js

diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
new file mode 100755
index 00000000000..d17efe9fe2b
--- /dev/null
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -0,0 +1,164 @@
+import { expect } from 'chai';
+import { spec } from 'modules/criteoBidAdapter';
+import * as utils from 'src/utils';
+
+describe('The Criteo bidding adapter', () => {
+  describe('isBidRequestValid', () => {
+    it('should return false when given an invalid bid', () => {
+      const bid = {
+        bidder: 'criteo',
+      };
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equal(false);
+    });
+
+    it('should return true when given a zoneId bid', () => {
+      const bid = {
+        bidder: 'criteo',
+        params: {
+          zoneId: 123,
+        },
+      };
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equal(true);
+    });
+
+    it('should return true when given a networkId bid', () => {
+      const bid = {
+        bidder: 'criteo',
+        params: {
+          networkId: 456,
+        },
+      };
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equal(true);
+    });
+
+    it('should return true when given a mixed bid with both a zoneId and a networkId', () => {
+      const bid = {
+        bidder: 'criteo',
+        params: {
+          zoneId: 123,
+          networkId: 456,
+        },
+      };
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', () => {
+    it('should properly build a zoneId request', () => {
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          bidId: 'bid-123',
+          transactionId: 'transaction-123',
+          sizes: [[728, 90]],
+          params: {
+            zoneId: 123,
+          },
+        },
+      ];
+      const request = spec.buildRequests(bidRequests);
+      expect(request.url).to.equal('//bidder.criteo.com/cdb');
+      expect(request.method).to.equal('POST');
+      expect(ortbRequest.publisher.url).to.equal(utils.getTopWindowUrl());
+      expect(ortbRequest.slots).to.have.lengthOf(2);
+      expect(ortbRequest.slots[0].impid).to.equal('bid-123');
+      expect(ortbRequest.slots[0].transactionid).to.equal('transaction-123');
+      expect(ortbRequest.slots[0].sizes).to.have.lengthOf(1);
+      expect(ortbRequest.slots[0].sizes[0]).to.equal('728x90');
+      expect(ortbRequest.slots[0].zoneid).to.equal(123);
+    });
+
+    it('should properly build a networkId request', () => {
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          bidId: 'bid-123',
+          transactionId: 'transaction-123',
+          sizes: [[300, 250], [728, 90]],
+          params: {
+            networkId: 456,
+          },
+        },
+      ];
+      const request = spec.buildRequests(bidRequests);
+      expect(request.url).to.equal('//bidder.criteo.com/cdb');
+      expect(request.method).to.equal('POST');
+      expect(ortbRequest.publisher.url).to.equal(utils.getTopWindowUrl());
+      expect(ortbRequest.publisher.networkid).to.equal(456);
+      expect(ortbRequest.slots).to.have.lengthOf(1);
+      expect(ortbRequest.slots[0].impid).to.equal('bid-123');
+      expect(ortbRequest.slots[0].transactionid).to.equal('transaction-123');
+      expect(ortbRequest.slots[0].sizes).to.have.lengthOf(2);
+      expect(ortbRequest.slots[0].sizes[0]).to.equal('300x250');
+      expect(ortbRequest.slots[0].sizes[1]).to.equal('728x90');
+    });
+
+    it('should properly build a mixed request', () => {
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          bidId: 'bid-123',
+          transactionId: 'transaction-123',
+          sizes: [[728, 90]],
+          params: {
+            zoneId: 123,
+          },
+        },
+        {
+          bidder: 'criteo',
+          bidId: 'bid-234',
+          transactionId: 'transaction-234',
+          sizes: [[300, 250], [728, 90]],
+          params: {
+            networkId: 456,
+          },
+        },
+      ];
+      const request = spec.buildRequests(bidRequests);
+      expect(request.url).to.equal('//bidder.criteo.com/cdb');
+      expect(request.method).to.equal('POST');
+      expect(ortbRequest.publisher.url).to.equal(utils.getTopWindowUrl());
+      expect(ortbRequest.publisher.networkid).to.equal(456);
+      expect(ortbRequest.slots).to.have.lengthOf(2);
+      expect(ortbRequest.slots[0].impid).to.equal('bid-123');
+      expect(ortbRequest.slots[0].transactionid).to.equal('transaction-123');
+      expect(ortbRequest.slots[0].sizes).to.have.lengthOf(1);
+      expect(ortbRequest.slots[0].sizes[0]).to.equal('728x90');
+      expect(ortbRequest.slots[1].impid).to.equal('bid-234');
+      expect(ortbRequest.slots[1].transactionid).to.equal('transaction-234');
+      expect(ortbRequest.slots[1].sizes).to.have.lengthOf(2);
+      expect(ortbRequest.slots[1].sizes[0]).to.equal('300x250');
+      expect(ortbRequest.slots[1].sizes[1]).to.equal('728x90');
+    });
+  });
+
+  describe('interpretResponse', () => {
+    it('should return an empty array when parsing a no bid response', () => {
+      const response = {};
+      const bids = spec.interpretResponse(response, null);
+      expect(bids).to.have.lengthOf(0);
+    });
+
+    it('should properly parse a bid response', () => {
+      const response = {
+        slots: [{
+          impid: 'test-requestId',
+          cpm: 1.23,
+          ad: 'test-ad',
+          width: 728,
+          height: 90,
+        }],
+      };
+      const bids = spec.interpretResponse(response, null);
+      expect(bids).to.have.lengthOf(1);
+      expect(bids[0].cpm).to.equal(1.23);
+      expect(bids[0].ad).to.equal('test-ad');
+      expect(bids[0].width).to.equal(728);
+      expect(bids[0].height).to.equal(90);
+    });
+  });
+});

From dd664a7589f1cdb0d9becc8a7c130b1d204c1d03 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Thu, 12 Oct 2017 11:17:19 +0200
Subject: [PATCH 05/37] Explicit the fact that Criteo bids are net revenue

---
 modules/criteoBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 36289d8282c..5f91f35cd4b 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -49,7 +49,7 @@ export const spec = {
           requestId: slot.impid,
           cpm: slot.cpm,
           // currency: 'USD', // FIXME: should return currency from CDB
-          // netRevenue: true, // FIXME: are bids net or gross?
+          netRevenue: true,
           ad: slot.creative,
           width: slot.width,
           height: slot.height,

From 85b65eda4ece7db9691fcb04392a0c98f61a24f5 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Tue, 28 Nov 2017 18:05:51 +0100
Subject: [PATCH 06/37] Pass currency in Criteo 1.0 adapter

---
 modules/criteoBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 5f91f35cd4b..7d3b5b2921c 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -48,7 +48,7 @@ export const spec = {
         const bid = {
           requestId: slot.impid,
           cpm: slot.cpm,
-          // currency: 'USD', // FIXME: should return currency from CDB
+          currency: slot.currency,
           netRevenue: true,
           ad: slot.creative,
           width: slot.width,

From ae7b2caf643578da15f399ef87c526d5f4e5de97 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Tue, 28 Nov 2017 18:05:58 +0100
Subject: [PATCH 07/37] Update Criteo adapter to use PublisherTag if present

---
 modules/criteoBidAdapter.js | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 7d3b5b2921c..12d37be8a72 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -24,15 +24,24 @@ export const spec = {
 
   /**
    * @param {BidRequest[]} bidRequests
+   * @param {*} bidderRequest
    * @return {ServerRequest}
    */
-  buildRequests: bidRequests => {
-    const context = buildContext(bidRequests);
-    return {
-      method: 'POST',
-      url: buildCdbUrl(context),
-      data: buildCdbRequest(context, bidRequests),
-    };
+  buildRequests: (bidRequests, bidderRequest) => {
+    let url;
+    let data;
+
+    if (typeof Criteo !== 'undefined') {
+      const adapter = new Criteo.PubTag.Adapters.Prebid(PROFILE_ID, ADAPTER_VERSION, bidRequests, bidderRequest);
+      url = adapter.buildCdbUrl();
+      data = adapter.buildCdbRequest();
+    } else {
+      const context = buildContext(bidRequests);
+      url = buildCdbUrl(context);
+      data = buildCdbRequest(context, bidRequests);
+    }
+
+    return { method: 'POST', url, data };
   },
 
   /**
@@ -41,10 +50,15 @@ export const spec = {
    * @return {Bid[]}
    */
   interpretResponse: (response, request) => {
+    if (typeof Criteo !== 'undefined') {
+      const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(request.data);
+      return adapter.interpretResponse(response.body);
+    }
+
     const bids = [];
 
-    if (response.slots && utils.isArray(response.slots)) {
-      response.slots.forEach(slot => {
+    if (response.body.slots && utils.isArray(response.body.slots)) {
+      response.body.slots.forEach(slot => {
         const bid = {
           requestId: slot.impid,
           cpm: slot.cpm,
@@ -125,6 +139,7 @@ function buildCdbRequest(context, bidRequests) {
       const slot = {
         impid: bidRequest.bidId,
         transactionid: bidRequest.transactionId,
+        auctionId: bidRequest.auctionId,
         sizes: bidRequest.sizes.map(size => size[0] + 'x' + size[1]),
       };
       if (bidRequest.params.zoneId) {

From fa076c894c9a0ddcc96c3c769432dbc0da5a3a87 Mon Sep 17 00:00:00 2001
From: "a.hubert" <a.hubert@criteo.com>
Date: Fri, 1 Dec 2017 11:52:19 +0100
Subject: [PATCH 08/37] Implement fastbid in prebid 1.0 criteo adapter

---
 modules/criteoBidAdapter.js                | 30 +++++++++++++++++++---
 test/spec/modules/criteoBidAdapter_spec.js | 27 +++++++++++--------
 2 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 12d37be8a72..2b8c38275bf 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -1,14 +1,16 @@
+import { loadScript } from 'src/adloader';
 import { registerBidder } from 'src/adapters/bidderFactory';
 import { parse } from 'src/url';
 import * as utils from 'src/utils';
 
+const ADAPTER_VERSION = 2;
 const BIDDER_CODE = 'criteo';
 const CDB_ENDPOINT = '//bidder.criteo.com/cdb';
-const PROFILE_ID = 207;
-const ADAPTER_VERSION = 2;
 const INTEGRATION_MODES = {
   'amp': 1,
 };
+const PROFILE_ID = 207;
+const PUBLISHER_TAG_URL = '//static.criteo.net/js/ld/publishertag.prebid.js';
 
 /** @type {BidderSpec} */
 export const spec = {
@@ -31,6 +33,11 @@ export const spec = {
     let url;
     let data;
 
+    // If publisher tag not already loaded try to get it from fast bid else load it
+    if (typeof Criteo === 'undefined' && !tryGetCriteoFastBid()) {
+      loadScript(PUBLISHER_TAG_URL);
+    }
+
     if (typeof Criteo !== 'undefined') {
       const adapter = new Criteo.PubTag.Adapters.Prebid(PROFILE_ID, ADAPTER_VERSION, bidRequests, bidderRequest);
       url = adapter.buildCdbUrl();
@@ -57,7 +64,7 @@ export const spec = {
 
     const bids = [];
 
-    if (response.body.slots && utils.isArray(response.body.slots)) {
+    if (response.body && response.body.slots && utils.isArray(response.body.slots)) {
       response.body.slots.forEach(slot => {
         const bid = {
           requestId: slot.impid,
@@ -157,4 +164,21 @@ function buildCdbRequest(context, bidRequests) {
   return request;
 }
 
+/**
+ * @return {boolean}
+ */
+function tryGetCriteoFastBid() {
+  let success = false;
+  try {
+    const fastBid = localStorage.getItem('criteo_fast_bid');
+    if (fastBid !== null) {
+      eval(fastBid); // eslint-disable-line no-eval
+      success = true;
+    }
+  } catch (e) {
+    // Unable to get fast bid
+  }
+  return success;
+}
+
 registerBidder(spec);
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index d17efe9fe2b..6fce3f16be3 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -61,10 +61,11 @@ describe('The Criteo bidding adapter', () => {
         },
       ];
       const request = spec.buildRequests(bidRequests);
-      expect(request.url).to.equal('//bidder.criteo.com/cdb');
+      expect(request.url).to.match(/^\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=2&cb=\d/);
       expect(request.method).to.equal('POST');
+      const ortbRequest = request.data;
       expect(ortbRequest.publisher.url).to.equal(utils.getTopWindowUrl());
-      expect(ortbRequest.slots).to.have.lengthOf(2);
+      expect(ortbRequest.slots).to.have.lengthOf(1);
       expect(ortbRequest.slots[0].impid).to.equal('bid-123');
       expect(ortbRequest.slots[0].transactionid).to.equal('transaction-123');
       expect(ortbRequest.slots[0].sizes).to.have.lengthOf(1);
@@ -85,8 +86,9 @@ describe('The Criteo bidding adapter', () => {
         },
       ];
       const request = spec.buildRequests(bidRequests);
-      expect(request.url).to.equal('//bidder.criteo.com/cdb');
+      expect(request.url).to.match(/^\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=2&cb=\d/);
       expect(request.method).to.equal('POST');
+      const ortbRequest = request.data;
       expect(ortbRequest.publisher.url).to.equal(utils.getTopWindowUrl());
       expect(ortbRequest.publisher.networkid).to.equal(456);
       expect(ortbRequest.slots).to.have.lengthOf(1);
@@ -119,8 +121,9 @@ describe('The Criteo bidding adapter', () => {
         },
       ];
       const request = spec.buildRequests(bidRequests);
-      expect(request.url).to.equal('//bidder.criteo.com/cdb');
+      expect(request.url).to.match(/^\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=2&cb=\d/);
       expect(request.method).to.equal('POST');
+      const ortbRequest = request.data;
       expect(ortbRequest.publisher.url).to.equal(utils.getTopWindowUrl());
       expect(ortbRequest.publisher.networkid).to.equal(456);
       expect(ortbRequest.slots).to.have.lengthOf(2);
@@ -145,13 +148,15 @@ describe('The Criteo bidding adapter', () => {
 
     it('should properly parse a bid response', () => {
       const response = {
-        slots: [{
-          impid: 'test-requestId',
-          cpm: 1.23,
-          ad: 'test-ad',
-          width: 728,
-          height: 90,
-        }],
+        body: {
+          slots: [{
+            impid: 'test-requestId',
+            cpm: 1.23,
+            creative: 'test-ad',
+            width: 728,
+            height: 90,
+          }],
+        },
       };
       const bids = spec.interpretResponse(response, null);
       expect(bids).to.have.lengthOf(1);

From 761a2031ff2b101297978aa5f9e1143bd7d6becf Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Thu, 7 Dec 2017 11:37:18 +0100
Subject: [PATCH 09/37] Pass the bid requests to the Criteo interpret method

---
 modules/criteoBidAdapter.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 2b8c38275bf..e5713074c9a 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -48,7 +48,7 @@ export const spec = {
       data = buildCdbRequest(context, bidRequests);
     }
 
-    return { method: 'POST', url, data };
+    return { method: 'POST', url, data, bidRequests };
   },
 
   /**
@@ -58,8 +58,8 @@ export const spec = {
    */
   interpretResponse: (response, request) => {
     if (typeof Criteo !== 'undefined') {
-      const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(request.data);
-      return adapter.interpretResponse(response.body);
+      const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(request);
+      return adapter.interpretResponse(response.body, request);
     }
 
     const bids = [];

From 6a8ea52f94c9f562932a31cf1f499fa2a739eb49 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Thu, 7 Dec 2017 11:38:56 +0100
Subject: [PATCH 10/37] Add missing ttl and creativeId fields to Criteo bids

---
 modules/criteoBidAdapter.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index e5713074c9a..7750a789aa6 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -72,6 +72,8 @@ export const spec = {
           currency: slot.currency,
           netRevenue: true,
           ad: slot.creative,
+          ttl: slot.ttl || 60,
+          creativeId: slot.impid,
           width: slot.width,
           height: slot.height,
         }

From d4ff98e2053e13ed489d9182380223bb74239aaf Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Thu, 7 Dec 2017 11:54:39 +0100
Subject: [PATCH 11/37] Add 'native' support to the Criteo adapter

---
 modules/criteoBidAdapter.js | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 7750a789aa6..c873dea3d98 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -71,12 +71,17 @@ export const spec = {
           cpm: slot.cpm,
           currency: slot.currency,
           netRevenue: true,
-          ad: slot.creative,
           ttl: slot.ttl || 60,
           creativeId: slot.impid,
           width: slot.width,
           height: slot.height,
         }
+        if (slot.native) {
+          const bidRequest = request.bidRequests.find(b => b.bidId === slot.impid);
+          bid.ad = createNativeAd(slot.impid, slot.native, bidRequest.params.nativeCallback);
+        } else {
+          bid.ad = slot.creative;
+        }
         bids.push(bid);
       });
     }
@@ -157,6 +162,9 @@ function buildCdbRequest(context, bidRequests) {
       if (bidRequest.params.publisherSubId) {
         slot.publishersubid = bidRequest.params.publisherSubId;
       }
+      if (bidRequest.params.nativeCallback) {
+        slot.native = true;
+      }
       return slot;
     }),
   };
@@ -166,6 +174,32 @@ function buildCdbRequest(context, bidRequests) {
   return request;
 }
 
+/**
+ * @param {string} id
+ * @param {*} payload
+ * @param {*} callback
+ * @return {string}
+ */
+function createNativeAd(id, payload, callback) {
+  // Store the callback and payload in a global object to be later accessed from the creative
+  window.criteo_prebid_native_slots = window.criteo_prebid_native_slots || {};
+  window.criteo_prebid_native_slots[id] = { callback, payload };
+
+  // The creative is in an iframe so we have to get the callback and payload
+  // from the parent window (doesn't work with safeframes)
+  return `<script type="text/javascript">
+    var win = window;
+    for (const i = 0; i < 10; ++i) {
+      win = win.parent;
+      if (win.criteo_prebid_native_slots) {
+        var responseSlot = win.criteo_prebid_native_slots["${id}"];
+        responseSlot.callback(responseSlot.payload);
+        break;
+      }
+    }
+  </script>`;
+}
+
 /**
  * @return {boolean}
  */

From b7d85e7dfe97199ff5aa54c53d944e9746150dcc Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Mon, 11 Dec 2017 14:18:40 +0100
Subject: [PATCH 12/37] Check that the Criteo adapter returned by PublisherTag
 is not empty

---
 modules/criteoBidAdapter.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index c873dea3d98..215957692ed 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -59,7 +59,9 @@ export const spec = {
   interpretResponse: (response, request) => {
     if (typeof Criteo !== 'undefined') {
       const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(request);
-      return adapter.interpretResponse(response.body, request);
+      if (adapter) {
+        return adapter.interpretResponse(response.body, request);
+      }
     }
 
     const bids = [];

From 675d3eab15711a19d12602a2f8eecb8ea30660ec Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Tue, 12 Dec 2017 17:43:12 +0100
Subject: [PATCH 13/37] Fix 'assign to const' IE errors in Criteo native
 adapter

---
 modules/criteoBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 215957692ed..1bd9a6cd2a9 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -191,7 +191,7 @@ function createNativeAd(id, payload, callback) {
   // from the parent window (doesn't work with safeframes)
   return `<script type="text/javascript">
     var win = window;
-    for (const i = 0; i < 10; ++i) {
+    for (var i = 0; i < 10; ++i) {
       win = win.parent;
       if (win.criteo_prebid_native_slots) {
         var responseSlot = win.criteo_prebid_native_slots["${id}"];

From ac7334434b0147096d310881d4c31788efa5cc6d Mon Sep 17 00:00:00 2001
From: "a.hubert" <a.hubert@criteo.com>
Date: Tue, 12 Dec 2017 15:20:38 +0100
Subject: [PATCH 14/37] Update criteo prebid adapter to reload publisher tag
 once auction is finished

---
 modules/criteoBidAdapter.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 1bd9a6cd2a9..e14151c0eae 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -33,9 +33,14 @@ export const spec = {
     let url;
     let data;
 
-    // If publisher tag not already loaded try to get it from fast bid else load it
-    if (typeof Criteo === 'undefined' && !tryGetCriteoFastBid()) {
-      loadScript(PUBLISHER_TAG_URL);
+    // If publisher tag not already loaded try to get it from fast bid
+    if (typeof Criteo === 'undefined') {
+      tryGetCriteoFastBid();
+
+      // Reload publisher tag after prebid timeout to ensure fast bid is up to date
+      setTimeout(() => {
+        loadScript(PUBLISHER_TAG_URL);
+      }, bidderRequest.timeout);
     }
 
     if (typeof Criteo !== 'undefined') {

From 78b01ec858c48e02d0ff38219cd1726cf5f99b02 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Thu, 25 Jan 2018 17:29:33 +0100
Subject: [PATCH 15/37] Disable the PublisherTag event queue

---
 modules/criteoBidAdapter.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index e14151c0eae..ca81a485784 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -3,7 +3,7 @@ import { registerBidder } from 'src/adapters/bidderFactory';
 import { parse } from 'src/url';
 import * as utils from 'src/utils';
 
-const ADAPTER_VERSION = 2;
+const ADAPTER_VERSION = 3;
 const BIDDER_CODE = 'criteo';
 const CDB_ENDPOINT = '//bidder.criteo.com/cdb';
 const INTEGRATION_MODES = {
@@ -34,7 +34,9 @@ export const spec = {
     let data;
 
     // If publisher tag not already loaded try to get it from fast bid
-    if (typeof Criteo === 'undefined') {
+    if (typeof Criteo === 'undefined' || !Criteo.PubTag) {
+      window.Criteo = { usePrebidEvents: false };
+
       tryGetCriteoFastBid();
 
       // Reload publisher tag after prebid timeout to ensure fast bid is up to date
@@ -43,7 +45,7 @@ export const spec = {
       }, bidderRequest.timeout);
     }
 
-    if (typeof Criteo !== 'undefined') {
+    if (typeof Criteo !== 'undefined' && Criteo.PubTag) {
       const adapter = new Criteo.PubTag.Adapters.Prebid(PROFILE_ID, ADAPTER_VERSION, bidRequests, bidderRequest);
       url = adapter.buildCdbUrl();
       data = adapter.buildCdbRequest();
@@ -62,7 +64,7 @@ export const spec = {
    * @return {Bid[]}
    */
   interpretResponse: (response, request) => {
-    if (typeof Criteo !== 'undefined') {
+    if (typeof Criteo !== 'undefined' && Criteo.PubTag) {
       const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(request);
       if (adapter) {
         return adapter.interpretResponse(response.body, request);

From 4bfa905954cbe4fa6ed6ada7bf086db5dbcbd10c Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Fri, 26 Jan 2018 11:49:13 +0100
Subject: [PATCH 16/37] Fix Criteo adapter on older Prebid versions not using
 response.body

---
 modules/criteoBidAdapter.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index ca81a485784..c8714333389 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -64,17 +64,19 @@ export const spec = {
    * @return {Bid[]}
    */
   interpretResponse: (response, request) => {
+    const body = response.body || response;
+
     if (typeof Criteo !== 'undefined' && Criteo.PubTag) {
       const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(request);
       if (adapter) {
-        return adapter.interpretResponse(response.body, request);
+        return adapter.interpretResponse(body, request);
       }
     }
 
     const bids = [];
 
-    if (response.body && response.body.slots && utils.isArray(response.body.slots)) {
-      response.body.slots.forEach(slot => {
+    if (body && body.slots && utils.isArray(body.slots)) {
+      body.slots.forEach(slot => {
         const bid = {
           requestId: slot.impid,
           cpm: slot.cpm,

From fa787bac2001866607d043725e6dfa0e1c3e778f Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Mon, 29 Jan 2018 15:43:07 +0100
Subject: [PATCH 17/37] Fix TypeError if FastBid is outdated

---
 modules/criteoBidAdapter.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index c8714333389..a3cccb442ff 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -34,7 +34,7 @@ export const spec = {
     let data;
 
     // If publisher tag not already loaded try to get it from fast bid
-    if (typeof Criteo === 'undefined' || !Criteo.PubTag) {
+    if (!publisherTagAvailable()) {
       window.Criteo = { usePrebidEvents: false };
 
       tryGetCriteoFastBid();
@@ -45,7 +45,7 @@ export const spec = {
       }, bidderRequest.timeout);
     }
 
-    if (typeof Criteo !== 'undefined' && Criteo.PubTag) {
+    if (publisherTagAvailable()) {
       const adapter = new Criteo.PubTag.Adapters.Prebid(PROFILE_ID, ADAPTER_VERSION, bidRequests, bidderRequest);
       url = adapter.buildCdbUrl();
       data = adapter.buildCdbRequest();
@@ -66,7 +66,7 @@ export const spec = {
   interpretResponse: (response, request) => {
     const body = response.body || response;
 
-    if (typeof Criteo !== 'undefined' && Criteo.PubTag) {
+    if (publisherTagAvailable()) {
       const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(request);
       if (adapter) {
         return adapter.interpretResponse(body, request);
@@ -101,6 +101,13 @@ export const spec = {
   },
 };
 
+/**
+ * @return {boolean}
+ */
+function publisherTagAvailable() {
+  return typeof Criteo !== 'undefined' && Criteo.PubTag && Criteo.PubTag.Adapters && Criteo.PubTag.Adapters.Prebid;
+}
+
 /**
  * @param {BidRequest[]} bidRequests
  * @return {CriteoContext}

From 1b1a191d48368a2cc46e56e921ca2a9fcf9fe519 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Mon, 29 Jan 2018 15:46:48 +0100
Subject: [PATCH 18/37] Remove the success variable in tryGetCriteoFastBid

---
 modules/criteoBidAdapter.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index a3cccb442ff..66fabff7f9e 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -222,17 +222,16 @@ function createNativeAd(id, payload, callback) {
  * @return {boolean}
  */
 function tryGetCriteoFastBid() {
-  let success = false;
   try {
     const fastBid = localStorage.getItem('criteo_fast_bid');
     if (fastBid !== null) {
       eval(fastBid); // eslint-disable-line no-eval
-      success = true;
+      return true;
     }
   } catch (e) {
     // Unable to get fast bid
   }
-  return success;
+  return false;
 }
 
 registerBidder(spec);

From 6e34a4c6f035a8febd5abf50be6a164e6c509381 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Mon, 29 Jan 2018 18:05:09 +0100
Subject: [PATCH 19/37] Fix events being overwritten with FastBid

---
 modules/criteoBidAdapter.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 66fabff7f9e..86b10ffcb45 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -35,7 +35,8 @@ export const spec = {
 
     // If publisher tag not already loaded try to get it from fast bid
     if (!publisherTagAvailable()) {
-      window.Criteo = { usePrebidEvents: false };
+      window.Criteo = window.Criteo || {};
+      window.Criteo.usePrebidEvents = false;
 
       tryGetCriteoFastBid();
 

From 36dec3ba5914aef14f980a4c80b05cd426d19ffd Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Thu, 1 Feb 2018 10:53:00 +0100
Subject: [PATCH 20/37] Update PublisherTag loading comment

---
 modules/criteoBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 86b10ffcb45..04cb5502ee7 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -40,7 +40,7 @@ export const spec = {
 
       tryGetCriteoFastBid();
 
-      // Reload publisher tag after prebid timeout to ensure fast bid is up to date
+      // Reload the PublisherTag after the timeout to ensure FastBid is up-to-date and tracking done properly
       setTimeout(() => {
         loadScript(PUBLISHER_TAG_URL);
       }, bidderRequest.timeout);

From 14090c80d3444c890025dc721cc66418caee59a9 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Fri, 2 Feb 2018 15:22:31 +0100
Subject: [PATCH 21/37] Use adUnitCode as impid

---
 modules/criteoBidAdapter.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 04cb5502ee7..9999221485b 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -78,19 +78,20 @@ export const spec = {
 
     if (body && body.slots && utils.isArray(body.slots)) {
       body.slots.forEach(slot => {
+        const bidRequest = request.bidRequests.find(b => b.adUnitCode === slot.impid);
+        const bidId = bidRequest.bidId;
         const bid = {
-          requestId: slot.impid,
+          requestId: bidId,
           cpm: slot.cpm,
           currency: slot.currency,
           netRevenue: true,
           ttl: slot.ttl || 60,
-          creativeId: slot.impid,
+          creativeId: bidId,
           width: slot.width,
           height: slot.height,
         }
         if (slot.native) {
-          const bidRequest = request.bidRequests.find(b => b.bidId === slot.impid);
-          bid.ad = createNativeAd(slot.impid, slot.native, bidRequest.params.nativeCallback);
+          bid.ad = createNativeAd(bidId, slot.native, bidRequest.params.nativeCallback);
         } else {
           bid.ad = slot.creative;
         }
@@ -170,7 +171,7 @@ function buildCdbRequest(context, bidRequests) {
     slots: bidRequests.map(bidRequest => {
       networkId = bidRequest.params.networkId || networkId;
       const slot = {
-        impid: bidRequest.bidId,
+        impid: bidRequest.adUnitCode,
         transactionid: bidRequest.transactionId,
         auctionId: bidRequest.auctionId,
         sizes: bidRequest.sizes.map(size => size[0] + 'x' + size[1]),

From fc2f2ac5d0ce9fe62caf408bcc99f48b1fcd4eb5 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Mon, 19 Mar 2018 13:57:11 +0100
Subject: [PATCH 22/37] Add events handlers in Criteo adapter to fix timeouts
 not treated as such

---
 modules/criteoBidAdapter.js | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 9999221485b..29a328efb34 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -1,9 +1,12 @@
 import { loadScript } from 'src/adloader';
 import { registerBidder } from 'src/adapters/bidderFactory';
+import { EVENTS } from 'src/constants';
 import { parse } from 'src/url';
 import * as utils from 'src/utils';
 
-const ADAPTER_VERSION = 3;
+var events = require('src/events');
+
+const ADAPTER_VERSION = 4;
 const BIDDER_CODE = 'criteo';
 const CDB_ENDPOINT = '//bidder.criteo.com/cdb';
 const INTEGRATION_MODES = {
@@ -50,6 +53,8 @@ export const spec = {
       const adapter = new Criteo.PubTag.Adapters.Prebid(PROFILE_ID, ADAPTER_VERSION, bidRequests, bidderRequest);
       url = adapter.buildCdbUrl();
       data = adapter.buildCdbRequest();
+
+      registerEventHandlers();
     } else {
       const context = buildContext(bidRequests);
       url = buildCdbUrl(context);
@@ -236,4 +241,30 @@ function tryGetCriteoFastBid() {
   return false;
 }
 
+// Register events to know when Criteo won the bid or timeouted
+let registeredEvents = false;
+function registerEventHandlers() {
+  if (registeredEvents) {
+    return;
+  }
+
+  events.on(EVENTS.BID_WON, (bid) => {
+    if (bid.bidderCode === 'criteo') {
+      const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(bid.auctionId);
+      adapter.handleBidWon(bid);
+    }
+  });
+
+  events.on(EVENTS.BID_TIMEOUT, (timedOutBidders) => {
+    timedOutBidders
+      .filter(bidder => bidder.bidder === 'criteo')
+      .map(bidder => {
+        const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(bidder.auctionId);
+        adapter.handleBidTimeout();
+      });
+  });
+
+  registeredEvents = true;
+}
+
 registerBidder(spec);

From de434bd959424ed893c23126da3f1e613f027924 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Thu, 29 Mar 2018 12:02:19 +0200
Subject: [PATCH 23/37] Add handler for setTargeting event

---
 modules/criteoBidAdapter.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 29a328efb34..3c319c76b51 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -264,6 +264,13 @@ function registerEventHandlers() {
       });
   });
 
+  events.on(EVENTS.SET_TARGETING, () => {
+    const adapters = Criteo.PubTag.Adapters.Prebid.GetAllAdapters();
+    for (const k in adapters) {
+      adapters[k].handleSetTargeting();
+    }
+  });
+
   registeredEvents = true;
 }
 

From d62e9a53eb346549b1324160f8ff1883aba9b3e6 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Thu, 29 Mar 2018 12:02:41 +0200
Subject: [PATCH 24/37] Move the registeredEvents set higher up to reduce the
 chances of race conditions

---
 modules/criteoBidAdapter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 3c319c76b51..2e43daf5dfa 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -248,6 +248,8 @@ function registerEventHandlers() {
     return;
   }
 
+  registeredEvents = true;
+
   events.on(EVENTS.BID_WON, (bid) => {
     if (bid.bidderCode === 'criteo') {
       const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(bid.auctionId);
@@ -270,8 +272,6 @@ function registerEventHandlers() {
       adapters[k].handleSetTargeting();
     }
   });
-
-  registeredEvents = true;
 }
 
 registerBidder(spec);

From 5e3534f24dfff74197d2640fed8ebd0c99ebd227 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Mon, 9 Apr 2018 15:34:55 +0200
Subject: [PATCH 25/37] Fix UTests following recent Criteo adapter changes

---
 test/spec/modules/criteoBidAdapter_spec.js | 34 ++++++++++++++--------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index 6fce3f16be3..c8a0b235fac 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -48,11 +48,13 @@ describe('The Criteo bidding adapter', () => {
   });
 
   describe('buildRequests', () => {
+    const bidderRequest = { timeout: 3000 };
+
     it('should properly build a zoneId request', () => {
       const bidRequests = [
         {
           bidder: 'criteo',
-          bidId: 'bid-123',
+          adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
           sizes: [[728, 90]],
           params: {
@@ -60,8 +62,8 @@ describe('The Criteo bidding adapter', () => {
           },
         },
       ];
-      const request = spec.buildRequests(bidRequests);
-      expect(request.url).to.match(/^\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=2&cb=\d/);
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.match(/^\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=\d+&cb=\d/);
       expect(request.method).to.equal('POST');
       const ortbRequest = request.data;
       expect(ortbRequest.publisher.url).to.equal(utils.getTopWindowUrl());
@@ -77,7 +79,7 @@ describe('The Criteo bidding adapter', () => {
       const bidRequests = [
         {
           bidder: 'criteo',
-          bidId: 'bid-123',
+          adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
           sizes: [[300, 250], [728, 90]],
           params: {
@@ -85,8 +87,8 @@ describe('The Criteo bidding adapter', () => {
           },
         },
       ];
-      const request = spec.buildRequests(bidRequests);
-      expect(request.url).to.match(/^\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=2&cb=\d/);
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.match(/^\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=\d+&cb=\d/);
       expect(request.method).to.equal('POST');
       const ortbRequest = request.data;
       expect(ortbRequest.publisher.url).to.equal(utils.getTopWindowUrl());
@@ -103,7 +105,7 @@ describe('The Criteo bidding adapter', () => {
       const bidRequests = [
         {
           bidder: 'criteo',
-          bidId: 'bid-123',
+          adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
           sizes: [[728, 90]],
           params: {
@@ -112,7 +114,7 @@ describe('The Criteo bidding adapter', () => {
         },
         {
           bidder: 'criteo',
-          bidId: 'bid-234',
+          adUnitCode: 'bid-234',
           transactionId: 'transaction-234',
           sizes: [[300, 250], [728, 90]],
           params: {
@@ -120,8 +122,8 @@ describe('The Criteo bidding adapter', () => {
           },
         },
       ];
-      const request = spec.buildRequests(bidRequests);
-      expect(request.url).to.match(/^\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=2&cb=\d/);
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.match(/^\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=\d+&cb=\d/);
       expect(request.method).to.equal('POST');
       const ortbRequest = request.data;
       expect(ortbRequest.publisher.url).to.equal(utils.getTopWindowUrl());
@@ -142,7 +144,8 @@ describe('The Criteo bidding adapter', () => {
   describe('interpretResponse', () => {
     it('should return an empty array when parsing a no bid response', () => {
       const response = {};
-      const bids = spec.interpretResponse(response, null);
+      const request = { bidRequests: [] };
+      const bids = spec.interpretResponse(response, request);
       expect(bids).to.have.lengthOf(0);
     });
 
@@ -158,8 +161,15 @@ describe('The Criteo bidding adapter', () => {
           }],
         },
       };
-      const bids = spec.interpretResponse(response, null);
+      const request = {
+        bidRequests: [{
+          adUnitCode: 'test-requestId',
+          bidId: 'test-bidId',
+        }]
+      };
+      const bids = spec.interpretResponse(response, request);
       expect(bids).to.have.lengthOf(1);
+      expect(bids[0].requestId).to.equal('test-bidId');
       expect(bids[0].cpm).to.equal(1.23);
       expect(bids[0].ad).to.equal('test-ad');
       expect(bids[0].width).to.equal(728);

From c64ac128725dae6ff78abae30abaac780e3c77b9 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Tue, 10 Apr 2018 10:50:28 +0200
Subject: [PATCH 26/37] Add comment linking to the PublisherTag unminified
 source

---
 modules/criteoBidAdapter.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 2e43daf5dfa..055155878c8 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -13,6 +13,8 @@ const INTEGRATION_MODES = {
   'amp': 1,
 };
 const PROFILE_ID = 207;
+
+// Unminified source code can be found in: https://github.com/Prebid-org/prebid-js-external-js-criteo/blob/master/dist/prod.js
 const PUBLISHER_TAG_URL = '//static.criteo.net/js/ld/publishertag.prebid.js';
 
 /** @type {BidderSpec} */

From e2df580bd809d1aa891a1e3712af3ef7909fbac7 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Thu, 19 Apr 2018 17:25:25 +0200
Subject: [PATCH 27/37] Do not return a request in buildRequests on error

In some cases, the buildCdbRequest function might return a falsy value,
in case of error in creating the request or if we know in advance that
this request will return a no-bid.

In this case, the buildRequests() method should not return a request,
causing a no-bid.
---
 modules/criteoBidAdapter.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 055155878c8..85cd91b8cc7 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -63,7 +63,9 @@ export const spec = {
       data = buildCdbRequest(context, bidRequests);
     }
 
-    return { method: 'POST', url, data, bidRequests };
+    if (data) {
+      return { method: 'POST', url, data, bidRequests };
+    }
   },
 
   /**

From 6d81ed43ef570418b1f0813ffe4d21b21f9ffe95 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Thu, 26 Apr 2018 15:50:36 +0200
Subject: [PATCH 28/37] Use loadExternalScript instead of loadScript

---
 modules/criteoBidAdapter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 85cd91b8cc7..5f6da034e92 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -1,4 +1,4 @@
-import { loadScript } from 'src/adloader';
+import { loadExternalScript } from 'src/adloader';
 import { registerBidder } from 'src/adapters/bidderFactory';
 import { EVENTS } from 'src/constants';
 import { parse } from 'src/url';
@@ -47,7 +47,7 @@ export const spec = {
 
       // Reload the PublisherTag after the timeout to ensure FastBid is up-to-date and tracking done properly
       setTimeout(() => {
-        loadScript(PUBLISHER_TAG_URL);
+        loadExternalScript(PUBLISHER_TAG_URL, BIDDER_CODE);
       }, bidderRequest.timeout);
     }
 

From ebf7dbccad143cdc02fcf4d7e8ddba18672fc964 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Thu, 26 Apr 2018 15:57:00 +0200
Subject: [PATCH 29/37] Use spec.onTimeout instead of registering an event
 handler

---
 modules/criteoBidAdapter.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 5f6da034e92..a391af8e9ff 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -110,6 +110,16 @@ export const spec = {
 
     return bids;
   },
+
+  /**
+   * @param {TimedOutBid} timeoutData
+   */
+  onTimeout: (timeoutData) => {
+    if (publisherTagAvailable()) {
+      const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(timeoutData.auctionId);
+      adapter.handleBidTimeout();
+    }
+  },
 };
 
 /**
@@ -261,15 +271,6 @@ function registerEventHandlers() {
     }
   });
 
-  events.on(EVENTS.BID_TIMEOUT, (timedOutBidders) => {
-    timedOutBidders
-      .filter(bidder => bidder.bidder === 'criteo')
-      .map(bidder => {
-        const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(bidder.auctionId);
-        adapter.handleBidTimeout();
-      });
-  });
-
   events.on(EVENTS.SET_TARGETING, () => {
     const adapters = Criteo.PubTag.Adapters.Prebid.GetAllAdapters();
     for (const k in adapters) {

From 5d7fdc4f67431a3786cd163d8ed331d6a7d94e63 Mon Sep 17 00:00:00 2001
From: ahubertcriteo <31441781+ahubertcriteo@users.noreply.github.com>
Date: Wed, 2 May 2018 15:04:48 +0200
Subject: [PATCH 30/37] GDPR support in Criteo adapter (#4)

GDPR support in Criteo adapter
---
 modules/criteoBidAdapter.js                | 13 +++++++--
 test/spec/modules/criteoBidAdapter_spec.js | 32 +++++++++++++++++++++-
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index a391af8e9ff..d713b5263f8 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -9,6 +9,7 @@ var events = require('src/events');
 const ADAPTER_VERSION = 4;
 const BIDDER_CODE = 'criteo';
 const CDB_ENDPOINT = '//bidder.criteo.com/cdb';
+const CRITEO_VENDOR_ID = 91;
 const INTEGRATION_MODES = {
   'amp': 1,
 };
@@ -60,7 +61,7 @@ export const spec = {
     } else {
       const context = buildContext(bidRequests);
       url = buildCdbUrl(context);
-      data = buildCdbRequest(context, bidRequests);
+      data = buildCdbRequest(context, bidRequests, bidderRequest);
     }
 
     if (data) {
@@ -181,7 +182,7 @@ function buildCdbUrl(context) {
  * @param {BidRequest[]} bidRequests
  * @return {*}
  */
-function buildCdbRequest(context, bidRequests) {
+function buildCdbRequest(context, bidRequests, bidderRequest) {
   let networkId;
   const request = {
     publisher: {
@@ -210,6 +211,14 @@ function buildCdbRequest(context, bidRequests) {
   if (networkId) {
     request.publisher.networkid = networkId;
   }
+  if (bidderRequest && bidderRequest.gdprConsent) {
+    request.gdprConsent = {
+      gdprApplies: !!(bidderRequest.gdprConsent.gdprApplies),
+      consentData: bidderRequest.gdprConsent.consentString,
+      consentGiven: !!(bidderRequest.gdprConsent.vendorData && bidderRequest.gdprConsent.vendorData.vendorConsents &&
+        bidderRequest.gdprConsent.vendorData.vendorConsents[ CRITEO_VENDOR_ID.toString(10) ]),
+    };
+  }
   return request;
 }
 
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index c8a0b235fac..a253dc93404 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -48,7 +48,17 @@ describe('The Criteo bidding adapter', () => {
   });
 
   describe('buildRequests', () => {
-    const bidderRequest = { timeout: 3000 };
+    const bidderRequest = { timeout: 3000,
+      gdprConsent: {
+        gdprApplies: 1,
+        consentString: 'concentDataString',
+        vendorData: {
+          vendorConsents: {
+            '1': 1
+          },
+        },
+      },
+    };
 
     it('should properly build a zoneId request', () => {
       const bidRequests = [
@@ -73,9 +83,24 @@ describe('The Criteo bidding adapter', () => {
       expect(ortbRequest.slots[0].sizes).to.have.lengthOf(1);
       expect(ortbRequest.slots[0].sizes[0]).to.equal('728x90');
       expect(ortbRequest.slots[0].zoneid).to.equal(123);
+      expect(ortbRequest.gdprConsent.consentData).to.equal('concentDataString');
+      expect(ortbRequest.gdprConsent.gdprApplies).to.equal(true);
+      expect(ortbRequest.gdprConsent.consentGiven).to.equal(true);
     });
 
     it('should properly build a networkId request', () => {
+      const bidderRequest = {
+        timeout: 3000,
+        gdprConsent: {
+          gdprApplies: 0,
+          consentString: undefined,
+          vendorData: {
+            vendorConsents: {
+              '1': 0
+            },
+          },
+        },
+      };
       const bidRequests = [
         {
           bidder: 'criteo',
@@ -99,9 +124,13 @@ describe('The Criteo bidding adapter', () => {
       expect(ortbRequest.slots[0].sizes).to.have.lengthOf(2);
       expect(ortbRequest.slots[0].sizes[0]).to.equal('300x250');
       expect(ortbRequest.slots[0].sizes[1]).to.equal('728x90');
+      expect(ortbRequest.gdprConsent.consentData).to.equal(undefined);
+      expect(ortbRequest.gdprConsent.gdprApplies).to.equal(false);
+      expect(ortbRequest.gdprConsent.consentGiven).to.equal(false);
     });
 
     it('should properly build a mixed request', () => {
+      const bidderRequest = { timeout: 3000 };
       const bidRequests = [
         {
           bidder: 'criteo',
@@ -138,6 +167,7 @@ describe('The Criteo bidding adapter', () => {
       expect(ortbRequest.slots[1].sizes).to.have.lengthOf(2);
       expect(ortbRequest.slots[1].sizes[0]).to.equal('300x250');
       expect(ortbRequest.slots[1].sizes[1]).to.equal('728x90');
+      expect(ortbRequest.gdprConsent).to.equal(undefined);
     });
   });
 

From 167f09a83ad2c08f7e12c5cb4f25b70dc194ae20 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Thu, 3 May 2018 15:05:07 +0200
Subject: [PATCH 31/37] Remove BID_WON and SET_TARGETING events from Criteo
 adapter

---
 modules/criteoBidAdapter.js                | 29 ----------------------
 test/spec/modules/criteoBidAdapter_spec.js |  2 +-
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index d713b5263f8..7e0b5abe125 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -1,11 +1,8 @@
 import { loadExternalScript } from 'src/adloader';
 import { registerBidder } from 'src/adapters/bidderFactory';
-import { EVENTS } from 'src/constants';
 import { parse } from 'src/url';
 import * as utils from 'src/utils';
 
-var events = require('src/events');
-
 const ADAPTER_VERSION = 4;
 const BIDDER_CODE = 'criteo';
 const CDB_ENDPOINT = '//bidder.criteo.com/cdb';
@@ -56,8 +53,6 @@ export const spec = {
       const adapter = new Criteo.PubTag.Adapters.Prebid(PROFILE_ID, ADAPTER_VERSION, bidRequests, bidderRequest);
       url = adapter.buildCdbUrl();
       data = adapter.buildCdbRequest();
-
-      registerEventHandlers();
     } else {
       const context = buildContext(bidRequests);
       url = buildCdbUrl(context);
@@ -264,28 +259,4 @@ function tryGetCriteoFastBid() {
   return false;
 }
 
-// Register events to know when Criteo won the bid or timeouted
-let registeredEvents = false;
-function registerEventHandlers() {
-  if (registeredEvents) {
-    return;
-  }
-
-  registeredEvents = true;
-
-  events.on(EVENTS.BID_WON, (bid) => {
-    if (bid.bidderCode === 'criteo') {
-      const adapter = Criteo.PubTag.Adapters.Prebid.GetAdapter(bid.auctionId);
-      adapter.handleBidWon(bid);
-    }
-  });
-
-  events.on(EVENTS.SET_TARGETING, () => {
-    const adapters = Criteo.PubTag.Adapters.Prebid.GetAllAdapters();
-    for (const k in adapters) {
-      adapters[k].handleSetTargeting();
-    }
-  });
-}
-
 registerBidder(spec);
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index a253dc93404..45542f1a415 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -54,7 +54,7 @@ describe('The Criteo bidding adapter', () => {
         consentString: 'concentDataString',
         vendorData: {
           vendorConsents: {
-            '1': 1
+            '91': 1
           },
         },
       },

From 5b9c1cd06c912c6ac787afd373d9898ad7c5c437 Mon Sep 17 00:00:00 2001
From: "js.faure" <js.faure@criteo.com>
Date: Wed, 16 May 2018 11:39:47 +0200
Subject: [PATCH 32/37] Update adapter version

---
 modules/criteoBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 7e0b5abe125..0c1616198e3 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -3,7 +3,7 @@ import { registerBidder } from 'src/adapters/bidderFactory';
 import { parse } from 'src/url';
 import * as utils from 'src/utils';
 
-const ADAPTER_VERSION = 4;
+const ADAPTER_VERSION = 5;
 const BIDDER_CODE = 'criteo';
 const CDB_ENDPOINT = '//bidder.criteo.com/cdb';
 const CRITEO_VENDOR_ID = 91;

From 47654b71ef203121163158205d86136894e2ac03 Mon Sep 17 00:00:00 2001
From: Nicolas Faure <n.faure@criteo.com>
Date: Mon, 21 May 2018 15:57:06 +0200
Subject: [PATCH 33/37] Add support for multi-size in Criteo adapter

---
 modules/criteoBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 0c1616198e3..cdb957e5f42 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -83,7 +83,7 @@ export const spec = {
 
     if (body && body.slots && utils.isArray(body.slots)) {
       body.slots.forEach(slot => {
-        const bidRequest = request.bidRequests.find(b => b.adUnitCode === slot.impid);
+        const bidRequest = request.bidRequests.find(b => b.adUnitCode === slot.impid && b.params.zoneId === slot.zoneid);
         const bidId = bidRequest.bidId;
         const bid = {
           requestId: bidId,

From dcea2488d1623f39ba6ecfd7a271de288abb1fea Mon Sep 17 00:00:00 2001
From: "js.faure" <js.faure@criteo.com>
Date: Wed, 23 May 2018 22:31:35 +0200
Subject: [PATCH 34/37] Fix support for multi size in Criteo adapter

---
 modules/criteoBidAdapter.js                |  2 +-
 test/spec/modules/criteoBidAdapter_spec.js | 67 +++++++++++++++++++++-
 2 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index cdb957e5f42..2fb6bd187f7 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -83,7 +83,7 @@ export const spec = {
 
     if (body && body.slots && utils.isArray(body.slots)) {
       body.slots.forEach(slot => {
-        const bidRequest = request.bidRequests.find(b => b.adUnitCode === slot.impid && b.params.zoneId === slot.zoneid);
+        const bidRequest = request.bidRequests.find(b => b.adUnitCode === slot.impid && (!b.params.zoneId || parseInt(b.params.zoneId) === slot.zoneid));
         const bidId = bidRequest.bidId;
         const bid = {
           requestId: bidId,
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index 45542f1a415..ccf683dc4ca 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -179,7 +179,7 @@ describe('The Criteo bidding adapter', () => {
       expect(bids).to.have.lengthOf(0);
     });
 
-    it('should properly parse a bid response', () => {
+    it('should properly parse a bid response with a networkId', () => {
       const response = {
         body: {
           slots: [{
@@ -195,6 +195,71 @@ describe('The Criteo bidding adapter', () => {
         bidRequests: [{
           adUnitCode: 'test-requestId',
           bidId: 'test-bidId',
+          params: {
+            networkId: 456,
+          }
+        }]
+      };
+      const bids = spec.interpretResponse(response, request);
+      expect(bids).to.have.lengthOf(1);
+      expect(bids[0].requestId).to.equal('test-bidId');
+      expect(bids[0].cpm).to.equal(1.23);
+      expect(bids[0].ad).to.equal('test-ad');
+      expect(bids[0].width).to.equal(728);
+      expect(bids[0].height).to.equal(90);
+    });
+
+    it('should properly parse a bid responsewith with a zoneId', () => {
+      const response = {
+        body: {
+          slots: [{
+            impid: 'test-requestId',
+            cpm: 1.23,
+            creative: 'test-ad',
+            width: 728,
+            height: 90,
+            zoneid: 123,
+          }],
+        },
+      };
+      const request = {
+        bidRequests: [{
+          adUnitCode: 'test-requestId',
+          bidId: 'test-bidId',
+          params: {
+            zoneId: 123,
+          },
+        }]
+      };
+      const bids = spec.interpretResponse(response, request);
+      expect(bids).to.have.lengthOf(1);
+      expect(bids[0].requestId).to.equal('test-bidId');
+      expect(bids[0].cpm).to.equal(1.23);
+      expect(bids[0].ad).to.equal('test-ad');
+      expect(bids[0].width).to.equal(728);
+      expect(bids[0].height).to.equal(90);
+    });
+
+    it('should properly parse a bid responsewith with a zoneId passed as a string', () => {
+      const response = {
+        body: {
+          slots: [{
+            impid: 'test-requestId',
+            cpm: 1.23,
+            creative: 'test-ad',
+            width: 728,
+            height: 90,
+            zoneid: 123,
+          }],
+        },
+      };
+      const request = {
+        bidRequests: [{
+          adUnitCode: 'test-requestId',
+          bidId: 'test-bidId',
+          params: {
+            zoneId: '123',
+          },
         }]
       };
       const bids = spec.interpretResponse(response, request);

From 597d8f76e696bb9549eceab3bc8cf92106db46c5 Mon Sep 17 00:00:00 2001
From: "js.faure" <js.faure@criteo.com>
Date: Thu, 24 May 2018 15:04:12 +0200
Subject: [PATCH 35/37] Update adapterVersion to 7

---
 modules/criteoBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 2fb6bd187f7..ee74141f0bc 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -3,7 +3,7 @@ import { registerBidder } from 'src/adapters/bidderFactory';
 import { parse } from 'src/url';
 import * as utils from 'src/utils';
 
-const ADAPTER_VERSION = 5;
+const ADAPTER_VERSION = 7;
 const BIDDER_CODE = 'criteo';
 const CDB_ENDPOINT = '//bidder.criteo.com/cdb';
 const CRITEO_VENDOR_ID = 91;

From 0a1843d60e279fbf5c6b73fbef2aa6a486cb0f85 Mon Sep 17 00:00:00 2001
From: "a.hubert" <a.hubert@criteo.com>
Date: Fri, 25 May 2018 18:06:11 +0200
Subject: [PATCH 36/37] GDPR support criteo: send undefined gdpr consent fields
 instead of false when not defined

---
 modules/criteoBidAdapter.js                | 17 +++++++++------
 test/spec/modules/criteoBidAdapter_spec.js | 25 +++++++++++++++++++++-
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index ee74141f0bc..e0ab0a138c6 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -207,12 +207,17 @@ function buildCdbRequest(context, bidRequests, bidderRequest) {
     request.publisher.networkid = networkId;
   }
   if (bidderRequest && bidderRequest.gdprConsent) {
-    request.gdprConsent = {
-      gdprApplies: !!(bidderRequest.gdprConsent.gdprApplies),
-      consentData: bidderRequest.gdprConsent.consentString,
-      consentGiven: !!(bidderRequest.gdprConsent.vendorData && bidderRequest.gdprConsent.vendorData.vendorConsents &&
-        bidderRequest.gdprConsent.vendorData.vendorConsents[ CRITEO_VENDOR_ID.toString(10) ]),
-    };
+    request.gdprConsent = {};
+    if (typeof bidderRequest.gdprConsent.gdprApplies !== 'undefined') {
+      request.gdprConsent.gdprApplies = !!(bidderRequest.gdprConsent.gdprApplies);
+    }
+    if (bidderRequest.gdprConsent.vendorData && bidderRequest.gdprConsent.vendorData.vendorConsents &&
+      typeof bidderRequest.gdprConsent.vendorData.vendorConsents[ CRITEO_VENDOR_ID.toString(10) ] !== 'undefined') {
+      request.gdprConsent.consentGiven = !!(bidderRequest.gdprConsent.vendorData.vendorConsents[ CRITEO_VENDOR_ID.toString(10) ]);
+    }
+    if (typeof bidderRequest.gdprConsent.consentString !== 'undefined') {
+      request.gdprConsent.consentData = bidderRequest.gdprConsent.consentString;
+    }
   }
   return request;
 }
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index ccf683dc4ca..e855c828b1f 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -126,7 +126,7 @@ describe('The Criteo bidding adapter', () => {
       expect(ortbRequest.slots[0].sizes[1]).to.equal('728x90');
       expect(ortbRequest.gdprConsent.consentData).to.equal(undefined);
       expect(ortbRequest.gdprConsent.gdprApplies).to.equal(false);
-      expect(ortbRequest.gdprConsent.consentGiven).to.equal(false);
+      expect(ortbRequest.gdprConsent.consentGiven).to.equal(undefined);
     });
 
     it('should properly build a mixed request', () => {
@@ -169,6 +169,29 @@ describe('The Criteo bidding adapter', () => {
       expect(ortbRequest.slots[1].sizes[1]).to.equal('728x90');
       expect(ortbRequest.gdprConsent).to.equal(undefined);
     });
+
+    it('should properly build request with undefined gdpr consent fields when they are not provided', () => {
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-123',
+          transactionId: 'transaction-123',
+          sizes: [[728, 90]],
+          params: {
+            zoneId: 123,
+          },
+        },
+      ];
+      const bidderRequest = { timeout: 3000,
+        gdprConsent: {
+        },
+      };
+
+      const ortbRequest = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(ortbRequest.gdprConsent.consentData).to.equal(undefined);
+      expect(ortbRequest.gdprConsent.gdprApplies).to.equal(undefined);
+      expect(ortbRequest.gdprConsent.consentGiven).to.equal(undefined);
+    });
   });
 
   describe('interpretResponse', () => {

From b68f8241beaf41aff289f39a6c259deb58b391b5 Mon Sep 17 00:00:00 2001
From: "js.faure" <js.faure@criteo.com>
Date: Fri, 25 May 2018 19:39:34 +0200
Subject: [PATCH 37/37] Update adapterVersion to 8

---
 modules/criteoBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index acedf67a81c..81da55ebf67 100755
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -4,7 +4,7 @@ import { parse } from 'src/url';
 import * as utils from 'src/utils';
 import find from 'core-js/library/fn/array/find';
 
-const ADAPTER_VERSION = 7;
+const ADAPTER_VERSION = 8;
 const BIDDER_CODE = 'criteo';
 const CDB_ENDPOINT = '//bidder.criteo.com/cdb';
 const CRITEO_VENDOR_ID = 91;