Merge pull request #3 from prebid/master

merge master
Qwarry · Oct 12, 2020 · 66988c2 · 66988c2
2 parents 5416b19 + e39a812
commit 66988c2
Show file tree

Hide file tree

Showing 194 changed files with 10,727 additions and 1,771 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,7 +8,7 @@ aliases:
       docker:
         # specify the version you desire here
         - image: circleci/node:12.16.1
-        
+      resource_class: xlarge
         # Specify service dependencies here if necessary
         # CircleCI maintains a library of pre-built images
         # documented at https://circleci.com/docs/2.0/circleci-images/
@@ -94,4 +94,4 @@ workflows:
       - e2etest
 
 experimental:
-  pipelines: true
+  pipelines: true
diff --git a/PR_REVIEW.md b/PR_REVIEW.md
@@ -24,6 +24,7 @@ For modules and core platform updates, the initial reviewer should request an ad
     - If they support SChain, add `schain_supported: true`
     - If their bidder doesn't work well with safeframed creatives, add `safeframes_ok: false`. This will alert publishers to not use safeframed creatives when creating the ad server entries for their bidder.
     - If they're setting a deal ID in some scenarios, add `bidder_supports_deals: true`
+    - If they have an IAB Global Vendor List ID, add `gvl_id: ID`. There's no default.
 - If all above is good, add a `LGTM` comment and request 1 additional core member to review.
 - Once there is 2 `LGTM` on the PR, merge to master
 - Ask the submitter to add a PR for documentation if applicable.

diff --git a/integrationExamples/gpt/userId_example.html b/integrationExamples/gpt/userId_example.html
@@ -83,9 +83,10 @@
         var adUnits = [
             {
                 code: 'test-div',
-                sizes: [[300,250],[300,600],[728,90]],
                 mediaTypes: {
-                    banner: {}
+                    banner: {
+                        sizes: [[300,250],[300,600],[728,90]]
+                    }
                 },
                 bids: [
                     {
@@ -133,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",
@@ -216,10 +241,10 @@
                         name: "sharedid",
                         expires: 28
                       }
-                    },  
+                    },
                     {
                       name: 'lotamePanoramaId'
-                    }, 
+                    },
                     {
                       name: "liveIntentId",
                       params: {
@@ -230,7 +255,22 @@
                         name: "_li_pbid",
                         expires: 28
                       }
-                    }],
+                    },
+                    {
+                        name: "zeotapIdPlus"
+                    },
+                    {
+                        name: 'haloId',
+                        storage: {
+                            type: "cookie",
+                            name: "haloId",
+                            expires: 28
+                        }
+                    },
+                    {
+                        name: "quantcastId"
+                    }
+                    ],
                     syncDelay: 5000,
                     auctionDelay: 1000
                 }

diff --git a/modules/.submodules.json b/modules/.submodules.json
@@ -12,14 +12,20 @@
     "netIdSystem",
     "identityLinkIdSystem",
     "sharedIdSystem",
-    "intentIqIdSystem"
+    "intentIqIdSystem",
+    "zeotapIdPlusIdSystem",
+    "haloIdSystem",
+    "quantcastIdSystem",
+    "idxIdSystem",
+    "fabrickIdSystem"
   ],
   "adpod": [
     "freeWheelAdserverVideo",
     "dfpAdServerVideo"
   ],
   "rtdModule": [
     "browsiRtdProvider",
+    "audigentRtdProvider",
     "jwplayerRtdProvider"
   ]
 }
diff --git a/modules/ablidaBidAdapter.js b/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,8 +48,9 @@ export const spec = {
         referer: bidderRequest.refererInfo.referer,
         jaySupported: jaySupported,
         device: device,
-        adapterVersion: 3,
-        mediaTypes: bidRequest.mediaTypes
+        adapterVersion: 5,
+        mediaTypes: bidRequest.mediaTypes,
+        gdprConsent: bidderRequest.gdprConsent
       };
       return {
         method: 'POST',

diff --git a/modules/ablidaBidAdapter.md b/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'
+                       }
+                   }
+               ]
            }
     ];
 ```
diff --git a/modules/adagioBidAdapter.js b/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,

diff --git a/modules/adheseBidAdapter.js b/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;
   }
 }