Merge pull request #2 from prebid/master

merge from prebid master to fork
pm-harshad-mane · Dec 26, 2018 · 8082b2e · 8082b2e
2 parents 7a10d02 + e476021
commit 8082b2e
Show file tree

Hide file tree

Showing 6 changed files with 197 additions and 1,498 deletions.
diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
@@ -6,7 +6,7 @@ import find from 'core-js/library/fn/array/find';
 import JSEncrypt from 'jsencrypt/bin/jsencrypt';
 import sha256 from 'crypto-js/sha256';
 
-const ADAPTER_VERSION = 15;
+const ADAPTER_VERSION = 16;
 const BIDDER_CODE = 'criteo';
 const CDB_ENDPOINT = '//bidder.criteo.com/cdb';
 const CRITEO_VENDOR_ID = 91;
@@ -98,6 +98,7 @@ export const spec = {
         const bidId = bidRequest.bidId;
         const bid = {
           requestId: bidId,
+          adId: slot.bidId || utils.getUniqueIdentifierStr(),
           cpm: slot.cpm,
           currency: slot.currency,
           netRevenue: true,