Merge in upstream Prebid master branch

integrationExamples/gpt/userId_example.html

@@ -134,6 +134,30 @@
                 // },
                 userSync: {
                     userIds: [{
+                        name: "pubProvidedId",
+                        params: {
+                            eids: [{
+                                source: "domain.com",
+                                uids:[{
+                                    id: "value read from cookie or local storage",
+                                    atype: 1,
+                                    ext: {
+                                        stype: "ppuid" // allowable options are sha256email, DMP, ppuid for now
+                                    }
+                                }]
+                            },{
+                                source: "3rdpartyprovided.com",
+                                uids:[{
+                                    id: "value read from cookie or local storage",
+                                    atype: 3,
+                                    ext: {
+                                        stype: "sha256email"
+                                    }
+                                }]
+                            }],
+                            eidsFunction: getHashedEmail  // any user defined function that exists in the page
+                        }
+                    },{
                         name: "unifiedId",
                         params: {
                             partner: "prebid",

modules/.submodules.json

@@ -15,7 +15,9 @@
     "intentIqIdSystem",
     "zeotapIdPlusIdSystem",
     "haloIdSystem",
-    "quantcastIdSystem"
+    "quantcastIdSystem",
+    "idxIdSystem",
+    "fabrickIdSystem"
   ],
   "adpod": [
     "freeWheelAdserverVideo",

modules/ablidaBidAdapter.js

@@ -1,14 +1,14 @@
 import * as utils from '../src/utils.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'ablida';
 const ENDPOINT_URL = 'https://bidder.ablida.net/prebid';
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, NATIVE],
+  supportedMediaTypes: [BANNER, NATIVE, VIDEO],
 
   /**
    * Determines whether or not the given bid request is valid.
@@ -35,6 +35,8 @@ export const spec = {
       let sizes = []
       if (bidRequest.mediaTypes && bidRequest.mediaTypes[BANNER] && bidRequest.mediaTypes[BANNER].sizes) {
         sizes = bidRequest.mediaTypes[BANNER].sizes;
+      } else if (bidRequest.mediaTypes[VIDEO] && bidRequest.mediaTypes[VIDEO].playerSize) {
+        sizes = bidRequest.mediaTypes[VIDEO].playerSize
       }
       const jaySupported = 'atob' in window && 'currentScript' in document;
       const device = getDevice();
@@ -46,7 +48,7 @@ export const spec = {
         referer: bidderRequest.refererInfo.referer,
         jaySupported: jaySupported,
         device: device,
-        adapterVersion: 4,
+        adapterVersion: 5,
         mediaTypes: bidRequest.mediaTypes,
         gdprConsent: bidderRequest.gdprConsent
       };

modules/ablidaBidAdapter.md

@@ -51,6 +51,22 @@ Module that connects to Ablida's bidder for bids.
                        }
                    }
                ]
+           }, {
+               code: 'video-ad',
+               mediaTypes: {
+                   video: {
+                       playerSize: [[640, 360]],
+                       context: 'instream'
+                  }
+               },
+               bids: [
+                   {
+                       bidder: 'ablida',
+                       params: {
+                           placementId: 'instream-demo'
+                       }
+                   }
+               ]
            }
     ];
 ```

modules/adagioBidAdapter.js

@@ -1,5 +1,6 @@
 import find from 'core-js-pure/features/array/find.js';
 import * as utils from '../src/utils.js';
+import { config } from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { loadExternalScript } from '../src/adloader.js'
 import JSEncrypt from 'jsencrypt/bin/jsencrypt.js';
@@ -9,7 +10,7 @@ import { getRefererInfo } from '../src/refererDetection.js';
 
 export const BIDDER_CODE = 'adagio';
 export const LOG_PREFIX = 'Adagio:';
-export const VERSION = '2.3.0';
+export const VERSION = '2.4.0';
 export const FEATURES_VERSION = '1';
 export const ENDPOINT = 'https://mp.4dex.io/prebid';
 export const SUPPORTED_MEDIA_TYPES = ['banner'];
@@ -555,6 +556,16 @@ function _getGdprConsent(bidderRequest) {
   return consent;
 }
 
+function _getCoppa() {
+  return {
+    required: config.getConfig('coppa') === true ? 1 : 0
+  };
+}
+
+function _getUspConsent(bidderRequest) {
+  return (utils.deepAccess(bidderRequest, 'uspConsent')) ? { uspConsent: bidderRequest.uspConsent } : false;
+}
+
 function _getSchain(bidRequest) {
   if (utils.deepAccess(bidRequest, 'schain')) {
     return bidRequest.schain;
@@ -643,6 +654,8 @@ export const spec = {
     const site = internal.getSite(bidderRequest);
     const pageviewId = internal.getPageviewId();
     const gdprConsent = _getGdprConsent(bidderRequest) || {};
+    const uspConsent = _getUspConsent(bidderRequest) || {};
+    const coppa = _getCoppa();
     const schain = _getSchain(validBidRequests[0]);
     const adUnits = utils._map(validBidRequests, (bidRequest) => {
       bidRequest.features = internal.getFeatures(bidRequest, bidderRequest);
@@ -672,7 +685,11 @@ export const spec = {
           site: site,
           pageviewId: pageviewId,
           adUnits: groupedAdUnits[organizationId],
-          gdpr: gdprConsent,
+          regs: {
+            gdpr: gdprConsent,
+            coppa: coppa,
+            ccpa: uspConsent
+          },
           schain: schain,
           prebidVersion: '$prebid.version$',
           adapterVersion: VERSION,

modules/adheseBidAdapter.js

@@ -150,8 +150,8 @@ function getAccount(validBidRequests) {
 }
 
 function getId5Id(validBidRequests) {
-  if (validBidRequests[0] && validBidRequests[0].userId && validBidRequests[0].userId.id5id) {
-    return validBidRequests[0].userId.id5id;
+  if (validBidRequests[0] && validBidRequests[0].userId && validBidRequests[0].userId.id5id && validBidRequests[0].userId.id5id.uid) {
+    return validBidRequests[0].userId.id5id.uid;
   }
 }
 

modules/adnowBidAdapter.js

@@ -0,0 +1,178 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { NATIVE, BANNER } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+import includes from 'core-js-pure/features/array/includes.js';
+
+const BIDDER_CODE = 'adnow';
+const ENDPOINT = 'https://n.ads3-adnow.com/a';
+
+/**
+ * @typedef {object} CommonBidData
+ *
+ * @property {string} requestId The specific BidRequest which this bid is aimed at.
+ *   This should match the BidRequest.bidId which this Bid targets.
+ * @property {string} currency The currency code for the cpm value
+ * @property {number} cpm The bid price, in US cents per thousand impressions.
+ * @property {string} creativeId The id of ad content
+ * @property {number} ttl Time-to-live - how long (in seconds) Prebid can use this bid.
+ * @property {boolean} netRevenue Boolean defining whether the bid is Net or Gross.  The default is true (Net).
+ * @property {object} [meta] Object for storing bid meta data
+ * @property {string} [meta.mediaType] banner or native
+ */
+
+/** @type {BidderSpec} */
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [ NATIVE, BANNER ],
+
+  /**
+   * @param {object} bid
+   * @return {boolean}
+   */
+  isBidRequestValid(bid) {
+    if (!bid || !bid.params) return false;
+
+    const codeId = parseInt(bid.params.codeId, 10);
+    if (!codeId) {
+      return false;
+    }
+
+    const mediaType = bid.params.mediaType || NATIVE;
+
+    return includes(this.supportedMediaTypes, mediaType);
+  },
+
+  /**
+   * @param {BidRequest[]} validBidRequests
+   * @param {*} bidderRequest
+   * @return {ServerRequest}
+   */
+  buildRequests(validBidRequests, bidderRequest) {
+    return validBidRequests.map(req => {
+      const mediaType = this._isBannerRequest(req) ? BANNER : NATIVE;
+      const codeId = parseInt(req.params.codeId, 10);
+
+      const data = {
+        Id: codeId,
+        mediaType: mediaType,
+        out: 'prebid',
+        d_user_agent: navigator.userAgent,
+        requestid: req.bidId
+      };
+
+      if (mediaType === BANNER) {
+        data.sizes = utils.parseSizesInput(
+          req.mediaTypes && req.mediaTypes.banner && req.mediaTypes.banner.sizes
+        ).join('|')
+      } else {
+        data.width = data.height = 200;
+
+        let sizes = utils.deepAccess(req, 'mediaTypes.native.image.sizes', []);
+
+        if (sizes.length > 0) {
+          const size = Array.isArray(sizes[0]) ? sizes[0] : sizes;
+
+          data.width = size[0] || data.width;
+          data.height = size[1] || data.height;
+        }
+      }
+
+      /** @type {ServerRequest} */
+      return {
+        method: 'GET',
+        url: ENDPOINT,
+        data: utils.parseQueryStringParameters(data),
+        options: {
+          withCredentials: false,
+          crossOrigin: true
+        },
+        bidRequest: req
+      };
+    });
+  },
+
+  /**
+   * @param {*} response
+   * @param {ServerRequest} request
+   * @return {Bid[]}
+   */
+  interpretResponse(response, request) {
+    const bidObj = request.bidRequest;
+    let bid = response.body;
+
+    if (!bid || !bid.currency || !bid.cpm) {
+      return [];
+    }
+
+    const mediaType = bid.meta.mediaType || NATIVE;
+    if (!includes(this.supportedMediaTypes, mediaType)) {
+      return [];
+    }
+
+    bid.requestId = bidObj.bidId;
+
+    if (mediaType === BANNER) {
+      return [ this._getBannerBid(bid) ];
+    }
+
+    if (mediaType === NATIVE) {
+      return [ this._getNativeBid(bid) ];
+    }
+
+    return [];
+  },
+
+  /**
+   * @private
+   * @param {object} bid
+   * @return {CommonBidData}
+   */
+  _commonBidData(bid) {
+    return {
+      requestId: bid.requestId,
+      currency: bid.currency || 'USD',
+      cpm: bid.cpm || 0.00,
+      creativeId: bid.creativeId || 'undefined-creative',
+      netRevenue: bid.netRevenue || true,
+      ttl: bid.ttl || 360,
+      meta: bid.meta || {}
+    };
+  },
+
+  /**
+   * @param {BidRequest} req
+   * @return {boolean}
+   * @private
+   */
+  _isBannerRequest(req) {
+    return !!(req.mediaTypes && req.mediaTypes.banner);
+  },
+
+  /**
+   * @private
+   * @param {object} bid
+   * @return {Bid}
+   */
+  _getBannerBid(bid) {
+    return {
+      ...this._commonBidData(bid),
+      width: bid.width || 300,
+      height: bid.height || 250,
+      ad: bid.ad || '<div>Empty Ad</div>'
+    };
+  },
+
+  /**
+   * @private
+   * @param {object} bid
+   * @return {Bid}
+   */
+  _getNativeBid(bid) {
+    return {
+      ...this._commonBidData(bid),
+      native: bid.native || {}
+    };
+  }
+}
+
+registerBidder(spec);

modules/adnowBidAdapter.md

@@ -0,0 +1,46 @@
+# Overview
+
+```
+Module Name: AdNow Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: support@adnow.com
+```
+
+# Description
+
+AdNow Bidder Adapter for Prebid.js. 
+Banner and Native format are supported.
+Please use ```adnow``` as the bidder code.
+
+# Test Parameters
+```javascript
+    const adUnits = [{
+      code: 'test',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      bids: [{
+        bidder: 'adnow',
+        params: {
+          codeId: 794934
+        }
+      }]
+    }, {
+      code: 'test',
+      mediaTypes: {
+        native: {
+          image: {
+            sizes: [200, 200]
+          }
+        }
+      },
+      bids: [{
+        bidder: 'adnow',
+        params: {
+          codeId: 794934
+        }
+      }]
+    }];
+```