From ac686e5c0e65cc9a8babf90cb8fabc9694064a94 Mon Sep 17 00:00:00 2001
From: r-schweitzer <50628828+r-schweitzer@users.noreply.github.com>
Date: Mon, 16 Nov 2020 18:43:14 +0100
Subject: [PATCH 001/304] added feature/getNoBidsForAdUnitCode function (#5932)

* added feature/getNoBidsForAdUnitCode function

* added unit test
---
 src/prebid.js         | 12 ++++++++++++
 test/spec/api_spec.js |  6 +++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/prebid.js b/src/prebid.js
index 8bfb6024d7a..0f72ca878e5 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -258,6 +258,18 @@ $$PREBID_GLOBAL$$.getNoBids = function () {
   return getBids('getNoBids');
 };
 
+/**
+ * This function returns the bids requests involved in an auction but not bid on or the specified adUnitCode
+ * @param  {string} adUnitCode adUnitCode
+ * @alias module:pbjs.getNoBidsForAdUnitCode
+ * @return {Object}           bidResponse object
+ */
+
+$$PREBID_GLOBAL$$.getNoBidsForAdUnitCode = function (adUnitCode) {
+  const bids = auctionManager.getNoBids().filter(bid => bid.adUnitCode === adUnitCode);
+  return { bids };
+};
+
 /**
  * This function returns the bid responses at the given moment.
  * @alias module:pbjs.getBidResponses
diff --git a/test/spec/api_spec.js b/test/spec/api_spec.js
index 6f21eba7aaf..6d67565056f 100755
--- a/test/spec/api_spec.js
+++ b/test/spec/api_spec.js
@@ -43,10 +43,14 @@ describe('Publisher API', function () {
       assert.isFunction($$PREBID_GLOBAL$$.getBidResponses);
     });
 
-    it('should have function $$PREBID_GLOBAL$$.getBidResponses', function () {
+    it('should have function $$PREBID_GLOBAL$$.getNoBids', function () {
       assert.isFunction($$PREBID_GLOBAL$$.getNoBids);
     });
 
+    it('should have function $$PREBID_GLOBAL$$.getNoBidsForAdUnitCode', function () {
+      assert.isFunction($$PREBID_GLOBAL$$.getNoBidsForAdUnitCode);
+    });
+
     it('should have function $$PREBID_GLOBAL$$.getBidResponsesForAdUnitCode', function () {
       assert.isFunction($$PREBID_GLOBAL$$.getBidResponsesForAdUnitCode);
     });

From a4a194c0086ed3ea3a13315798fc7f05abef1442 Mon Sep 17 00:00:00 2001
From: Mehmet Can Kurt <mcankurt@quantcast.com>
Date: Mon, 16 Nov 2020 13:51:29 -0800
Subject: [PATCH 002/304] update quantcastBidAdapter to make user sync flag
 non-constant (#5949)

---
 modules/quantcastBidAdapter.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/quantcastBidAdapter.js b/modules/quantcastBidAdapter.js
index 894bb991a71..347ebc2ff55 100644
--- a/modules/quantcastBidAdapter.js
+++ b/modules/quantcastBidAdapter.js
@@ -101,6 +101,8 @@ function checkTCFv2(tcData) {
   return !!(vendorConsent && purposeConsent);
 }
 
+let hasUserSynced = false;
+
 /**
  * The documentation for Prebid.js Adapter 1.0 can be found at link below,
  * http://prebid.org/dev-docs/bidder-adapter-1.html
@@ -109,7 +111,6 @@ export const spec = {
   code: BIDDER_CODE,
   GVLID: 11,
   supportedMediaTypes: ['banner', 'video'],
-  hasUserSynced: false,
 
   /**
    * Verify the `AdUnits.bids` response with `true` for valid request and `false`
@@ -271,7 +272,7 @@ export const spec = {
   },
   getUserSyncs(syncOptions, serverResponses) {
     const syncs = []
-    if (!this.hasUserSynced && syncOptions.pixelEnabled) {
+    if (!hasUserSynced && syncOptions.pixelEnabled) {
       const responseWithUrl = find(serverResponses, serverResponse =>
         utils.deepAccess(serverResponse.body, 'userSync.url')
       );
@@ -283,12 +284,12 @@ export const spec = {
           url: url
         });
       }
-      this.hasUserSynced = true;
+      hasUserSynced = true;
     }
     return syncs;
   },
   resetUserSync() {
-    this.hasUserSynced = false;
+    hasUserSynced = false;
   }
 };
 

From a126dcf06fc320f180e97a8ffef87c5b1d0744fb Mon Sep 17 00:00:00 2001
From: pro-nsk <32703851+pro-nsk@users.noreply.github.com>
Date: Tue, 17 Nov 2020 04:52:26 +0700
Subject: [PATCH 003/304] Update for Qwarry bid adapter: onBidWon hotfix
 (#5955)

* qwarry bid adapter

* formatting fixes

* fix tests for qwarry

* qwarry bid adapter

* add header for qwarry bid adapter

* bid requests fix

* fix tests

* response fix

* fix tests for Qwarry bid adapter

* add pos parameter to qwarry bid adapter

* qwarryBidAdapter onBidWon hotfix

Co-authored-by: Artem Kostritsa <akostritsa@akostritsa.com>
Co-authored-by: Alexander Kascheev <akascheev@asteriosoft.com>
---
 modules/qwarryBidAdapter.js                |  4 +-
 test/spec/modules/qwarryBidAdapter_spec.js | 67 +++++++++++++---------
 2 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/modules/qwarryBidAdapter.js b/modules/qwarryBidAdapter.js
index 0c6dee9be69..7c2ec0f085b 100644
--- a/modules/qwarryBidAdapter.js
+++ b/modules/qwarryBidAdapter.js
@@ -66,7 +66,9 @@ export const spec = {
 
   onBidWon: function (bid) {
     if (bid.winUrl) {
-      ajax(bid.winUrl, null);
+      const cpm = bid.cpm;
+      const winUrl = bid.winUrl.replace(/\$\{AUCTION_PRICE\}/, cpm);
+      ajax(winUrl, null);
       return true;
     }
     return false;
diff --git a/test/spec/modules/qwarryBidAdapter_spec.js b/test/spec/modules/qwarryBidAdapter_spec.js
index 02fe9c4538b..91e3cf4bfdf 100644
--- a/test/spec/modules/qwarryBidAdapter_spec.js
+++ b/test/spec/modules/qwarryBidAdapter_spec.js
@@ -11,33 +11,37 @@ const REQUEST = {
   }
 }
 
-const BIDDER_BANNER_RESPONSE = {'prebidResponse': [{
-  'ad': '<div>test</div>',
-  'requestId': 'e64782a4-8e68-4c38-965b-80ccf115d46d',
-  'cpm': 900.5,
-  'currency': 'USD',
-  'width': 640,
-  'height': 480,
-  'ttl': 300,
-  'creativeId': 1,
-  'netRevenue': true,
-  'winUrl': 'http://test.com',
-  'format': 'banner'
-}]}
-
-const BIDDER_VIDEO_RESPONSE = {'prebidResponse': [{
-  'ad': '<xml>vast</xml>',
-  'requestId': 'e64782a4-8e68-4c38-965b-80ccf115d46z',
-  'cpm': 800.4,
-  'currency': 'USD',
-  'width': 1024,
-  'height': 768,
-  'ttl': 200,
-  'creativeId': 2,
-  'netRevenue': true,
-  'winUrl': 'http://test.com',
-  'format': 'video'
-}]}
+const BIDDER_BANNER_RESPONSE = {
+  'prebidResponse': [{
+    'ad': '<div>test</div>',
+    'requestId': 'e64782a4-8e68-4c38-965b-80ccf115d46d',
+    'cpm': 900.5,
+    'currency': 'USD',
+    'width': 640,
+    'height': 480,
+    'ttl': 300,
+    'creativeId': 1,
+    'netRevenue': true,
+    'winUrl': 'http://test.com',
+    'format': 'banner'
+  }]
+}
+
+const BIDDER_VIDEO_RESPONSE = {
+  'prebidResponse': [{
+    'ad': '<xml>vast</xml>',
+    'requestId': 'e64782a4-8e68-4c38-965b-80ccf115d46z',
+    'cpm': 800.4,
+    'currency': 'USD',
+    'width': 1024,
+    'height': 768,
+    'ttl': 200,
+    'creativeId': 2,
+    'netRevenue': true,
+    'winUrl': 'http://test.com',
+    'format': 'video'
+  }]
+}
 
 const BIDDER_NO_BID_RESPONSE = ''
 
@@ -120,4 +124,13 @@ describe('qwarryBidAdapter', function () {
       expect(result).to.deep.equal([])
     })
   })
+
+  describe('onBidWon', function () {
+    it('handles banner win: should get true', function () {
+      const win = BIDDER_BANNER_RESPONSE.prebidResponse[0]
+      const bidWonResult = spec.onBidWon(win)
+
+      expect(bidWonResult).to.equal(true)
+    })
+  })
 })

From 1664f4e2648ea90a93b25c76510858c0de30fa69 Mon Sep 17 00:00:00 2001
From: jsut <adam.prime@wattpad.com>
Date: Mon, 16 Nov 2020 16:53:02 -0500
Subject: [PATCH 004/304] FIX typo's in CONTRIBUTING (#5956)

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 962e057fbc5..606d26cd25a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,7 +3,7 @@ Contributions are always welcome. To contribute, [fork](https://help.github.com/
 commit your changes, and [open a pull request](https://help.github.com/articles/using-pull-requests/) against the
 master branch.
 
-Pull requests must have 80% code coverage before beign considered for merge.
+Pull requests must have 80% code coverage before being considered for merge.
 Additional details about the process can be found [here](./PR_REVIEW.md).
 
 There are more details available if you'd like to contribute a [bid adapter](https://docs.prebid.org/dev-docs/bidder-adaptor.html) or [analytics adapter](https://docs.prebid.org/dev-docs/integrate-with-the-prebid-analytics-api.html).
@@ -59,7 +59,7 @@ When you are adding code to Prebid.js, or modifying code that isn't covered by a
 Prebid.js already has many tests. Read them to see how Prebid.js is tested, and for inspiration:
 
 - Look in `test/spec` and its subdirectories
-- Tests for bidder adaptors are located in `test/spec/modules`
+- Tests for bidder adapters are located in `test/spec/modules`
 
 A test module might have the following general structure:
 

From 5aa0fe65061578446c59d6659e799c5c3df5b3bc Mon Sep 17 00:00:00 2001
From: jsut <adam.prime@wattpad.com>
Date: Mon, 16 Nov 2020 16:54:03 -0500
Subject: [PATCH 005/304] Add a note to the readme about adapter aliases
 (#5968)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 44882570d89..40df62ccee4 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,7 @@ This runs some code quality checks, starts a web server at `http://localhost:999
 
 ### Build Optimization
 
-The standard build output contains all the available modules from within the `modules` folder.
+The standard build output contains all the available modules from within the `modules` folder.  Note, however that there are bid adapters which support multiple bidders through aliases, so if you don't see a file in modules for a bid adapter, you may need to grep the repository to find the name of the module you need to include.
 
 You might want to exclude some/most of them from the final bundle.  To make sure the build only includes the modules you want, you can specify the modules to be included with the `--modules` CLI argument.
 

From c04bd6d70c1107ebfd69f7c838e94485408e454f Mon Sep 17 00:00:00 2001
From: Mehmet Can Kurt <mcankurt@quantcast.com>
Date: Mon, 16 Nov 2020 17:07:08 -0800
Subject: [PATCH 006/304] update quantcastBidAdapter to pass quantcast fpa in
 the bid request (#5947)

* update quantcastBidAdapter to pass quantcast fpa in the bid request

* remove empty line from lunamediahBidAdapter

* pass quantcast vendor id when obtaining storage manager
---
 modules/quantcastBidAdapter.js                | 14 ++++++++--
 test/spec/modules/quantcastBidAdapter_spec.js | 27 ++++++++++++++-----
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/modules/quantcastBidAdapter.js b/modules/quantcastBidAdapter.js
index 347ebc2ff55..e9541edb534 100644
--- a/modules/quantcastBidAdapter.js
+++ b/modules/quantcastBidAdapter.js
@@ -1,6 +1,7 @@
 import * as utils from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 import { config } from '../src/config.js';
+import { getStorageManager } from '../src/storageManager.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import find from 'core-js-pure/features/array/find.js';
 
@@ -18,6 +19,9 @@ export const QUANTCAST_TEST_PUBLISHER = 'test-publisher';
 export const QUANTCAST_TTL = 4;
 export const QUANTCAST_PROTOCOL = 'https';
 export const QUANTCAST_PORT = '8443';
+export const QUANTCAST_FPA = '__qca';
+
+export const storage = getStorageManager(QUANTCAST_VENDOR_ID, BIDDER_CODE);
 
 function makeVideoImp(bid) {
   const video = {};
@@ -101,6 +105,11 @@ function checkTCFv2(tcData) {
   return !!(vendorConsent && purposeConsent);
 }
 
+function getQuantcastFPA() {
+  let fpa = storage.getCookie(QUANTCAST_FPA)
+  return fpa || ''
+}
+
 let hasUserSynced = false;
 
 /**
@@ -109,7 +118,7 @@ let hasUserSynced = false;
  */
 export const spec = {
   code: BIDDER_CODE,
-  GVLID: 11,
+  GVLID: QUANTCAST_VENDOR_ID,
   supportedMediaTypes: ['banner', 'video'],
 
   /**
@@ -189,7 +198,8 @@ export const spec = {
         uspSignal: uspConsent ? 1 : 0,
         uspConsent,
         coppa: config.getConfig('coppa') === true ? 1 : 0,
-        prebidJsVersion: '$prebid.version$'
+        prebidJsVersion: '$prebid.version$',
+        fpa: getQuantcastFPA()
       };
 
       const data = JSON.stringify(requestData);
diff --git a/test/spec/modules/quantcastBidAdapter_spec.js b/test/spec/modules/quantcastBidAdapter_spec.js
index caa554c8cd8..5b4e7963e60 100644
--- a/test/spec/modules/quantcastBidAdapter_spec.js
+++ b/test/spec/modules/quantcastBidAdapter_spec.js
@@ -7,7 +7,8 @@ import {
   QUANTCAST_TEST_PUBLISHER,
   QUANTCAST_PROTOCOL,
   QUANTCAST_PORT,
-  spec as qcSpec
+  spec as qcSpec,
+  storage
 } from '../../../modules/quantcastBidAdapter.js';
 import { newBidder } from '../../../src/adapters/bidderFactory.js';
 import { parseUrl } from 'src/utils.js';
@@ -42,6 +43,8 @@ describe('Quantcast adapter', function () {
         canonicalUrl: 'http://example.com/hello.html'
       }
     };
+
+    storage.setCookie('__qca', '', 'Thu, 01 Jan 1970 00:00:00 GMT');
   });
 
   function setupVideoBidRequest(videoParams) {
@@ -140,7 +143,8 @@ describe('Quantcast adapter', function () {
       gdprSignal: 0,
       uspSignal: 0,
       coppa: 0,
-      prebidJsVersion: '$prebid.version$'
+      prebidJsVersion: '$prebid.version$',
+      fpa: ''
     };
 
     it('sends banner bid requests contains all the required parameters', function () {
@@ -208,7 +212,8 @@ describe('Quantcast adapter', function () {
         gdprSignal: 0,
         uspSignal: 0,
         coppa: 0,
-        prebidJsVersion: '$prebid.version$'
+        prebidJsVersion: '$prebid.version$',
+        fpa: ''
       };
 
       expect(requests[0].data).to.equal(JSON.stringify(expectedVideoBidRequest));
@@ -244,7 +249,8 @@ describe('Quantcast adapter', function () {
         gdprSignal: 0,
         uspSignal: 0,
         coppa: 0,
-        prebidJsVersion: '$prebid.version$'
+        prebidJsVersion: '$prebid.version$',
+        fpa: ''
       };
 
       expect(requests[0].data).to.equal(JSON.stringify(expectedVideoBidRequest));
@@ -276,7 +282,8 @@ describe('Quantcast adapter', function () {
         gdprSignal: 0,
         uspSignal: 0,
         coppa: 0,
-        prebidJsVersion: '$prebid.version$'
+        prebidJsVersion: '$prebid.version$',
+        fpa: ''
       };
 
       expect(requests[0].data).to.equal(JSON.stringify(expectedVideoBidRequest));
@@ -340,7 +347,8 @@ describe('Quantcast adapter', function () {
         gdprSignal: 0,
         uspSignal: 0,
         coppa: 0,
-        prebidJsVersion: '$prebid.version$'
+        prebidJsVersion: '$prebid.version$',
+        fpa: ''
       };
 
       expect(requests[0].data).to.equal(JSON.stringify(expectedBidRequest));
@@ -584,6 +592,13 @@ describe('Quantcast adapter', function () {
     expect(parsed.uspConsent).to.equal('consentString');
   });
 
+  it('propagates Quantcast first-party cookie (fpa)', function() {
+    storage.setCookie('__qca', 'P0-TestFPA');
+    const requests = qcSpec.buildRequests([bidRequest], bidderRequest);
+    const parsed = JSON.parse(requests[0].data);
+    expect(parsed.fpa).to.equal('P0-TestFPA');
+  });
+
   describe('propagates coppa', function() {
     let sandbox;
     beforeEach(() => {

From fe7acf8a62e9f253c66a23358e4f5bc7906a1536 Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Tue, 17 Nov 2020 06:33:57 +0100
Subject: [PATCH 007/304] improve console ogging of user id module by listing
 all user id modules that have been enabled (#5975)

---
 modules/userId/index.js          | 2 +-
 test/spec/modules/userId_spec.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/userId/index.js b/modules/userId/index.js
index 9ef4da0f96f..0923a92f516 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -667,7 +667,7 @@ function updateSubmodules() {
   if (!addedUserIdHook && submodules.length) {
     // priority value 40 will load after consentManagement with a priority of 50
     getGlobal().requestBids.before(requestBidsHook, 40);
-    utils.logInfo(`${MODULE_NAME} - usersync config updated for ${submodules.length} submodules`);
+    utils.logInfo(`${MODULE_NAME} - usersync config updated for ${submodules.length} submodules: `, submodules.map(a => a.submodule.name));
     addedUserIdHook = true;
   }
 }
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index d5ed96a5bc1..887e1f45640 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -443,7 +443,7 @@ describe('User ID', function () {
       setSubmoduleRegistry([pubCommonIdSubmodule]);
       init(config);
       config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie']));
-      expect(utils.logInfo.args[0][0]).to.exist.and.to.equal('User ID - usersync config updated for 1 submodules');
+      expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 1 submodules');
     });
   });
 
@@ -506,7 +506,7 @@ describe('User ID', function () {
       init(config);
       config.setConfig(getConfigMock(['unifiedId', 'unifiedid', 'cookie']));
 
-      expect(utils.logInfo.args[0][0]).to.exist.and.to.equal('User ID - usersync config updated for 1 submodules');
+      expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 1 submodules');
     });
 
     it('config with 13 configurations should result in 13 submodules add', function () {
@@ -553,7 +553,7 @@ describe('User ID', function () {
           }]
         }
       });
-      expect(utils.logInfo.args[0][0]).to.exist.and.to.equal('User ID - usersync config updated for 13 submodules');
+      expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 13 submodules');
     });
 
     it('config syncDelay updates module correctly', function () {

From f6e34657e2b1347677b87afbdadd73a6195b1cb3 Mon Sep 17 00:00:00 2001
From: John Salis <jsalis531@gmail.com>
Date: Tue, 17 Nov 2020 01:00:18 -0500
Subject: [PATCH 008/304] Add IdentityLink support to Beachfront adapter
 (#5977)

* add IdentityLink support to beachfront adapter

* bump adapter version

Co-authored-by: John Salis <johnsalis@beachfrontmedia.com>
---
 modules/beachfrontBidAdapter.js               | 52 ++++++++++++++-----
 .../spec/modules/beachfrontBidAdapter_spec.js | 28 ++++++++++
 2 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/modules/beachfrontBidAdapter.js b/modules/beachfrontBidAdapter.js
index f0e28956e5d..5f0a4b03a04 100644
--- a/modules/beachfrontBidAdapter.js
+++ b/modules/beachfrontBidAdapter.js
@@ -6,7 +6,7 @@ import { VIDEO, BANNER } from '../src/mediaTypes.js';
 import find from 'core-js-pure/features/array/find.js';
 import includes from 'core-js-pure/features/array/includes.js';
 
-const ADAPTER_VERSION = '1.12';
+const ADAPTER_VERSION = '1.13';
 const ADAPTER_NAME = 'BFIO_PREBID';
 const OUTSTREAM = 'outstream';
 
@@ -17,6 +17,11 @@ export const OUTSTREAM_SRC = 'https://player-cdn.beachfrontmedia.com/playerapi/l
 export const VIDEO_TARGETING = ['mimes', 'playbackmethod', 'maxduration', 'placement', 'skip', 'skipmin', 'skipafter'];
 export const DEFAULT_MIMES = ['video/mp4', 'application/javascript'];
 
+export const SUPPORTED_USER_IDS = [
+  { key: 'tdid', source: 'adserver.org', rtiPartner: 'TDID', queryParam: 'tdid' },
+  { key: 'idl_env', source: 'liveramp.com', rtiPartner: 'idl', queryParam: 'idl' }
+];
+
 let appId = '';
 
 export const spec = {
@@ -257,6 +262,29 @@ function getTopWindowReferrer() {
   }
 }
 
+function getEids(bid) {
+  return SUPPORTED_USER_IDS
+    .map(getUserId(bid))
+    .filter(x => x);
+}
+
+function getUserId(bid) {
+  return ({ key, source, rtiPartner }) => {
+    let id = bid.userId && bid.userId[key];
+    return id ? formatEid(id, source, rtiPartner) : null;
+  };
+}
+
+function formatEid(id, source, rtiPartner) {
+  return {
+    source,
+    uids: [{
+      id,
+      ext: { rtiPartner }
+    }]
+  };
+}
+
 function getVideoTargetingParams(bid) {
   const result = {};
   const excludeProps = ['playerSize', 'context', 'w', 'h'];
@@ -281,6 +309,7 @@ function createVideoRequestData(bid, bidderRequest) {
   let bidfloor = getVideoBidParam(bid, 'bidfloor');
   let tagid = getVideoBidParam(bid, 'tagid');
   let topLocation = getTopWindowLocation(bidderRequest);
+  let eids = getEids(bid);
   let payload = {
     isPrebid: true,
     appId: appId,
@@ -329,16 +358,8 @@ function createVideoRequestData(bid, bidderRequest) {
     payload.user.ext.consent = consentString;
   }
 
-  if (bid.userId && bid.userId.tdid) {
-    payload.user.ext.eids = [{
-      source: 'adserver.org',
-      uids: [{
-        id: bid.userId.tdid,
-        ext: {
-          rtiPartner: 'TDID'
-        }
-      }]
-    }];
+  if (eids.length > 0) {
+    payload.user.ext.eids = eids;
   }
 
   let connection = navigator.connection || navigator.webkitConnection;
@@ -385,9 +406,12 @@ function createBannerRequestData(bids, bidderRequest) {
     payload.gdprConsent = consentString;
   }
 
-  if (bids[0] && bids[0].userId && bids[0].userId.tdid) {
-    payload.tdid = bids[0].userId.tdid;
-  }
+  SUPPORTED_USER_IDS.forEach(({ key, queryParam }) => {
+    let id = bids[0] && bids[0].userId && bids[0].userId[key];
+    if (id) {
+      payload[queryParam] = id;
+    }
+  });
 
   return payload;
 }
diff --git a/test/spec/modules/beachfrontBidAdapter_spec.js b/test/spec/modules/beachfrontBidAdapter_spec.js
index 587596eaa5c..aa952d088a7 100644
--- a/test/spec/modules/beachfrontBidAdapter_spec.js
+++ b/test/spec/modules/beachfrontBidAdapter_spec.js
@@ -295,6 +295,24 @@ describe('BeachfrontAdapter', function () {
           }]
         });
       });
+
+      it('must add the IdentityLink ID to the request', () => {
+        const idl_env = '4321';
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { video: {} };
+        bidRequest.userId = { idl_env };
+        const requests = spec.buildRequests([ bidRequest ]);
+        const data = requests[0].data;
+        expect(data.user.ext.eids[0]).to.deep.equal({
+          source: 'liveramp.com',
+          uids: [{
+            id: idl_env,
+            ext: {
+              rtiPartner: 'idl'
+            }
+          }]
+        });
+      });
     });
 
     describe('for banner bids', function () {
@@ -435,6 +453,16 @@ describe('BeachfrontAdapter', function () {
         const data = requests[0].data;
         expect(data.tdid).to.equal(tdid);
       });
+
+      it('must add the IdentityLink ID to the request', () => {
+        const idl_env = '4321';
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { banner: {} };
+        bidRequest.userId = { idl_env };
+        const requests = spec.buildRequests([ bidRequest ]);
+        const data = requests[0].data;
+        expect(data.idl).to.equal(idl_env);
+      });
     });
 
     describe('for multi-format bids', function () {

From f47287eef645c9c20b62aeaedf96a7893c602036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Udi=20Talias=20=E2=9A=9B=EF=B8=8F?= <udi.talias@gmail.com>
Date: Tue, 17 Nov 2020 08:18:40 +0200
Subject: [PATCH 009/304] Vidazoo Adapter: Feature/spec-gvlid (#5980)

* feat(module): multi size request

* fix getUserSyncs
added tests

* update(module): package-lock.json from master

* feat(module): expose spec gvlid

Co-authored-by: roman <shmoop207@gmail.com>
---
 modules/vidazooBidAdapter.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/vidazooBidAdapter.js b/modules/vidazooBidAdapter.js
index 4b3b1767cec..7fc6e3a5395 100644
--- a/modules/vidazooBidAdapter.js
+++ b/modules/vidazooBidAdapter.js
@@ -3,7 +3,7 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
 
-const GLVID = 744;
+const GVLID = 744;
 const DEFAULT_SUB_DOMAIN = 'prebid';
 const BIDDER_CODE = 'vidazoo';
 const BIDDER_VERSION = '1.0.0';
@@ -24,7 +24,7 @@ export const SUPPORTED_ID_SYSTEMS = {
   'pubcid': 1,
   'tdid': 1,
 };
-const storage = getStorageManager(GLVID);
+const storage = getStorageManager(GVLID);
 
 export function createDomain(subDomain = DEFAULT_SUB_DOMAIN) {
   return `https://${subDomain}.cootlogix.com`;
@@ -266,6 +266,7 @@ export function tryParseJSON(value) {
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   version: BIDDER_VERSION,
   supportedMediaTypes: [BANNER],
   isBidRequestValid,

From 842f21c86fc3d7dba5bf5707140621c91243f3f6 Mon Sep 17 00:00:00 2001
From: jdwieland8282 <wieland.jeff@gmail.com>
Date: Tue, 17 Nov 2020 03:26:16 -0700
Subject: [PATCH 010/304] Update sharedIdSystem.js with GVLID (#5988)

adding GVLID variable and spec definition, will come back and add it to getStorageManager once if I find that function referenced in the sharedid module.
---
 modules/sharedIdSystem.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/sharedIdSystem.js b/modules/sharedIdSystem.js
index cdd840c4f54..49cac46f1df 100644
--- a/modules/sharedIdSystem.js
+++ b/modules/sharedIdSystem.js
@@ -21,6 +21,7 @@ const TIME_MAX = Math.pow(2, 48) - 1;
 const TIME_LEN = 10;
 const RANDOM_LEN = 16;
 const id = factory();
+const GVLID = 887;
 /**
  * Constructs cookie value
  * @param value
@@ -283,6 +284,11 @@ export const sharedIdSubmodule = {
    */
   name: MODULE_NAME,
 
+  /**
+   * Vendor id of Prebid
+   * @type {Number}
+   */
+  gvlid: GVLID,
   /**
    * decode the stored id value for passing to bid requests
    * @function

From 18afadd0ed90cf16f4989f300ae9468623f56176 Mon Sep 17 00:00:00 2001
From: Elijah Valenciano <elijah_valenciano@comcast.com>
Date: Tue, 17 Nov 2020 06:51:07 -0500
Subject: [PATCH 011/304] FreeWheel SSP - Added GDPR to userSync (#5969)

---
 modules/freewheel-sspBidAdapter.js            | 13 ++++++++--
 .../modules/freewheel-sspBidAdapter_spec.js   | 26 +++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/modules/freewheel-sspBidAdapter.js b/modules/freewheel-sspBidAdapter.js
index dce678362cb..53f490a0a3c 100644
--- a/modules/freewheel-sspBidAdapter.js
+++ b/modules/freewheel-sspBidAdapter.js
@@ -407,11 +407,20 @@ export const spec = {
     return bidResponses;
   },
 
-  getUserSyncs: function(syncOptions) {
+  getUserSyncs: function(syncOptions, responses, gdprConsent, usPrivacy) {
+    var gdprParams = '';
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        gdprParams = `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        gdprParams = `?gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+
     if (syncOptions && syncOptions.pixelEnabled) {
       return [{
         type: 'image',
-        url: USER_SYNC_URL
+        url: USER_SYNC_URL + gdprParams
       }];
     } else {
       return [];
diff --git a/test/spec/modules/freewheel-sspBidAdapter_spec.js b/test/spec/modules/freewheel-sspBidAdapter_spec.js
index 3047b635d13..c44d7908ba8 100644
--- a/test/spec/modules/freewheel-sspBidAdapter_spec.js
+++ b/test/spec/modules/freewheel-sspBidAdapter_spec.js
@@ -152,6 +152,19 @@ describe('freewheelSSP BidAdapter Test', () => {
       expect(payload.playerSize).to.equal('300x600');
       expect(payload._fw_gdpr_consent).to.exist.and.to.be.a('string');
       expect(payload._fw_gdpr_consent).to.equal(gdprConsentString);
+
+      let gdprConsent = {
+        'gdprApplies': true,
+        'consentString': gdprConsentString
+      }
+      let syncOptions = {
+        'pixelEnabled': true
+      }
+      const userSyncs = spec.getUserSyncs(syncOptions, null, gdprConsent, null);
+      expect(userSyncs).to.deep.equal([{
+        type: 'image',
+        url: 'https://ads.stickyadstv.com/auto-user-sync?gdpr=1&gdpr_consent=1FW-SSP-gdprConsent-'
+      }]);
     });
   })
 
@@ -226,6 +239,19 @@ describe('freewheelSSP BidAdapter Test', () => {
       expect(payload.playerSize).to.equal('300x600');
       expect(payload._fw_gdpr_consent).to.exist.and.to.be.a('string');
       expect(payload._fw_gdpr_consent).to.equal(gdprConsentString);
+
+      let gdprConsent = {
+        'gdprApplies': true,
+        'consentString': gdprConsentString
+      }
+      let syncOptions = {
+        'pixelEnabled': true
+      }
+      const userSyncs = spec.getUserSyncs(syncOptions, null, gdprConsent, null);
+      expect(userSyncs).to.deep.equal([{
+        type: 'image',
+        url: 'https://ads.stickyadstv.com/auto-user-sync?gdpr=1&gdpr_consent=1FW-SSP-gdprConsent-'
+      }]);
     });
   })
 

From b73ab25d9a5d1d33a6a377bf2413b07fa1fca5bf Mon Sep 17 00:00:00 2001
From: relaido <63339139+relaido@users.noreply.github.com>
Date: Tue, 17 Nov 2020 21:03:31 +0900
Subject: [PATCH 012/304] Fix request size validate (#5951)

* add relaido adapter

* remove event listener

* fixed UserSyncs and e.data

* fix conflicts

* fixed request flow

use cookie instead of local storage

validate video size

Co-authored-by: ishigami_shingo <s.ishigami@relaido.co.jp>
Co-authored-by: cmertv-sishigami <s.ishigami@cmertv.com>
Co-authored-by: t_bun <t.bun@cmertv.com>
---
 modules/relaidoBidAdapter.js                | 38 +++++----------------
 test/spec/modules/relaidoBidAdapter_spec.js | 14 ++++----
 2 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/modules/relaidoBidAdapter.js b/modules/relaidoBidAdapter.js
index bc2854de40b..c77afbe6ec5 100644
--- a/modules/relaidoBidAdapter.js
+++ b/modules/relaidoBidAdapter.js
@@ -6,17 +6,13 @@ import { getStorageManager } from '../src/storageManager.js';
 
 const BIDDER_CODE = 'relaido';
 const BIDDER_DOMAIN = 'api.relaido.jp';
-const ADAPTER_VERSION = '1.0.1';
+const ADAPTER_VERSION = '1.0.2';
 const DEFAULT_TTL = 300;
 const UUID_KEY = 'relaido_uuid';
 
 const storage = getStorageManager();
 
 function isBidRequestValid(bid) {
-  if (!utils.isSafariBrowser() && !hasUuid()) {
-    utils.logWarn('uuid is not found.');
-    return false;
-  }
   if (!utils.deepAccess(bid, 'params.placementId')) {
     utils.logWarn('placementId param is reqeuired.');
     return false;
@@ -64,7 +60,7 @@ function buildRequests(validBidRequests, bidderRequest) {
     };
 
     if (hasVideoMediaType(bidRequest)) {
-      const playerSize = utils.deepAccess(bidRequest, 'mediaTypes.video.playerSize');
+      const playerSize = getValidSizes(utils.deepAccess(bidRequest, 'mediaTypes.video.playerSize'));
       payload.width = playerSize[0][0];
       payload.height = playerSize[0][1];
     } else if (hasBannerMediaType(bidRequest)) {
@@ -101,10 +97,6 @@ function interpretResponse(serverResponse, bidRequest) {
     return [];
   }
 
-  if (body.uuid) {
-    storage.setDataInLocalStorage(UUID_KEY, body.uuid);
-  }
-
   const playerUrl = bidRequest.player || body.playerUrl;
   const mediaType = bidRequest.mediaType || VIDEO;
 
@@ -141,7 +133,6 @@ function getUserSyncs(syncOptions, serverResponses) {
   if (serverResponses.length > 0) {
     syncUrl = utils.deepAccess(serverResponses, '0.body.syncUrl') || syncUrl;
   }
-  receiveMessage();
   return [{
     type: 'iframe',
     url: syncUrl
@@ -219,17 +210,6 @@ function outstreamRender(bid) {
   });
 }
 
-function receiveMessage() {
-  window.addEventListener('message', setUuid);
-}
-
-function setUuid(e) {
-  if (utils.isPlainObject(e.data) && e.data.relaido_uuid) {
-    storage.setDataInLocalStorage(UUID_KEY, e.data.relaido_uuid);
-    window.removeEventListener('message', setUuid);
-  }
-}
-
 function isBannerValid(bid) {
   if (!isMobile()) {
     return false;
@@ -242,8 +222,8 @@ function isBannerValid(bid) {
 }
 
 function isVideoValid(bid) {
-  const playerSize = utils.deepAccess(bid, 'mediaTypes.video.playerSize');
-  if (playerSize && utils.isArray(playerSize) && playerSize.length > 0) {
+  const playerSize = getValidSizes(utils.deepAccess(bid, 'mediaTypes.video.playerSize'));
+  if (playerSize.length > 0) {
     const context = utils.deepAccess(bid, 'mediaTypes.video.context');
     if (context && context === 'outstream') {
       return true;
@@ -252,12 +232,12 @@ function isVideoValid(bid) {
   return false;
 }
 
-function hasUuid() {
-  return !!storage.getDataFromLocalStorage(UUID_KEY);
-}
-
 function getUuid() {
-  return storage.getDataFromLocalStorage(UUID_KEY) || '';
+  const id = storage.getCookie(UUID_KEY)
+  if (id) return id;
+  const newId = utils.generateUUID();
+  storage.setCookie(UUID_KEY, newId);
+  return newId;
 }
 
 export function isMobile() {
diff --git a/test/spec/modules/relaidoBidAdapter_spec.js b/test/spec/modules/relaidoBidAdapter_spec.js
index 42818232cda..65dcd9b7db7 100644
--- a/test/spec/modules/relaidoBidAdapter_spec.js
+++ b/test/spec/modules/relaidoBidAdapter_spec.js
@@ -1,16 +1,21 @@
 import { expect } from 'chai';
 import { spec } from 'modules/relaidoBidAdapter.js';
 import * as utils from 'src/utils.js';
+import { getStorageManager } from '../../../src/storageManager.js';
 
 const UUID_KEY = 'relaido_uuid';
 const DEFAULT_USER_AGENT = window.navigator.userAgent;
 const MOBILE_USER_AGENT = 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.5 Mobile/15E148 Safari/604.1';
+const relaido_uuid = 'hogehoge';
 
 const setUADefault = () => { window.navigator.__defineGetter__('userAgent', function () { return DEFAULT_USER_AGENT }) };
 const setUAMobile = () => { window.navigator.__defineGetter__('userAgent', function () { return MOBILE_USER_AGENT }) };
 
+const storage = getStorageManager();
+storage.setCookie(UUID_KEY, relaido_uuid);
+
 describe('RelaidoAdapter', function () {
-  const relaido_uuid = 'hogehoge';
+  window.document.cookie = `${UUID_KEY}=${relaido_uuid}`
   let bidRequest;
   let bidderRequest;
   let serverResponse;
@@ -65,7 +70,6 @@ describe('RelaidoAdapter', function () {
       height: bidRequest.mediaTypes.video.playerSize[0][1],
       mediaType: 'video',
     };
-    localStorage.setItem(UUID_KEY, relaido_uuid);
   });
 
   describe('spec.isBidRequestValid', function () {
@@ -140,12 +144,6 @@ describe('RelaidoAdapter', function () {
       setUADefault();
     });
 
-    it('should return false when the uuid are missing', function () {
-      localStorage.removeItem(UUID_KEY);
-      const result = !!(utils.isSafariBrowser());
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(result);
-    });
-
     it('should return false when the placementId params are missing', function () {
       bidRequest.params.placementId = undefined;
       expect(spec.isBidRequestValid(bidRequest)).to.equal(false);

From 96989ca4b8d36917e87caec1208dbf0a92e87537 Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Tue, 17 Nov 2020 06:29:42 -0800
Subject: [PATCH 013/304] Prebid Server Bid Adapter: Expose errors and server
 response times always (#5866)

* Expose pbs reported errors
Expose serverLatencyMillis always

* clean up logic for other weird edge case

* review comment for make function

* not sure how parenthesis got there
---
 modules/prebidServerBidAdapter/index.js       | 17 ++++++++++
 modules/rubiconAnalyticsAdapter.js            | 32 ++++++++++++++++---
 .../modules/rubiconAnalyticsAdapter_spec.js   |  1 +
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index b153d0bf8db..7c7962781d2 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -369,6 +369,18 @@ function addWurl(auctionId, adId, wurl) {
   }
 }
 
+function getPbsResponseData(bidderRequests, response, pbsName, pbjsName) {
+  const bidderValues = utils.deepAccess(response, `ext.${pbsName}`);
+  if (bidderValues) {
+    Object.keys(bidderValues).forEach(bidder => {
+      let biddersReq = find(bidderRequests, bidderReq => bidderReq.bidderCode === bidder);
+      if (biddersReq) {
+        biddersReq[pbjsName] = bidderValues[bidder];
+      }
+    });
+  }
+}
+
 /**
  * @param {string} auctionId
  * @param {string} adId generated value set to bidObject.adId by bidderFactory Bid()
@@ -676,6 +688,9 @@ const OPEN_RTB_PROTOCOL = {
   interpretResponse(response, bidderRequests) {
     const bids = [];
 
+    [['errors', 'serverErrors'], ['responsetimemillis', 'serverResponseTimeMs']]
+      .forEach(info => getPbsResponseData(bidderRequests, response, info[0], info[1]))
+
     if (response.seatbid) {
       // a seatbid object contains a `bid` array and a `seat` string
       response.seatbid.forEach(seatbid => {
@@ -698,6 +713,8 @@ const OPEN_RTB_PROTOCOL = {
 
           bidObject.cpm = cpm;
 
+          // temporarily leaving attaching it to each bidResponse so no breaking change
+          // BUT: this is a flat map, so it should be only attached to bidderRequest, a the change above does
           let serverResponseTimeMs = utils.deepAccess(response, ['ext', 'responsetimemillis', seatbid.seat].join('.'));
           if (bidRequest && serverResponseTimeMs) {
             bidRequest.serverResponseTimeMs = serverResponseTimeMs;
diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index 4011232ae3b..6f00e9536d9 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -13,6 +13,14 @@ const COOKIE_NAME = 'rpaSession';
 const LAST_SEEN_EXPIRE_TIME = 1800000; // 30 mins
 const END_EXPIRE_TIME = 21600000; // 6 hours
 
+const pbsErrorMap = {
+  1: 'timeout-error',
+  2: 'input-error',
+  3: 'connect-error',
+  4: 'request-error',
+  999: 'generic-error'
+}
+
 let prebidGlobal = getGlobal();
 const {
   EVENTS: {
@@ -631,10 +639,22 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
         bid.bidResponse = parseBidResponse(args, bid.bidResponse);
         break;
       case BIDDER_DONE:
+        const serverError = utils.deepAccess(args, 'serverErrors.0');
+        const serverResponseTimeMs = args.serverResponseTimeMs;
         args.bids.forEach(bid => {
           let cachedBid = cache.auctions[bid.auctionId].bids[bid.bidId || bid.requestId];
           if (typeof bid.serverResponseTimeMs !== 'undefined') {
             cachedBid.serverLatencyMillis = bid.serverResponseTimeMs;
+          } else if (serverResponseTimeMs && bid.source === 's2s') {
+            cachedBid.serverLatencyMillis = serverResponseTimeMs;
+          }
+          // if PBS said we had an error, and this bid has not been processed by BID_RESPONSE YET
+          if (serverError && (!cachedBid.status || ['no-bid', 'error'].indexOf(cachedBid.status) !== -1)) {
+            cachedBid.status = 'error';
+            cachedBid.error = {
+              code: pbsErrorMap[serverError.code] || pbsErrorMap[999],
+              description: serverError.message
+            }
           }
           if (!cachedBid.status) {
             cachedBid.status = 'no-bid';
@@ -675,10 +695,14 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
         args.forEach(badBid => {
           let auctionCache = cache.auctions[badBid.auctionId];
           let bid = auctionCache.bids[badBid.bidId || badBid.requestId];
-          bid.status = 'error';
-          bid.error = {
-            code: 'timeout-error'
-          };
+          // might be set already by bidder-done, so do not overwrite
+          if (bid.status !== 'error') {
+            bid.status = 'error';
+            bid.error = {
+              code: 'timeout-error',
+              message: 'marked by prebid.js as timeout' // will help us diff if timeout was set by PBS or PBJS
+            };
+          }
         });
         break;
     }
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index 7c552570da6..d65083ce480 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -310,6 +310,7 @@ const MOCK = {
   ],
   BIDDER_DONE: {
     'bidderCode': 'rubicon',
+    'serverResponseTimeMs': 42,
     'bids': [
       BID,
       Object.assign({}, BID2, {

From 71e9cc7b48b736ab6671acf6a5ad7c17ac4460e5 Mon Sep 17 00:00:00 2001
From: Ignat Khaylov <ignat@ignat.one>
Date: Wed, 18 Nov 2020 09:29:05 +0300
Subject: [PATCH 014/304] Between: schain support was added (#5982)

Co-authored-by: Ignat Khaylov <khaylov@betweenx.com>
---
 modules/betweenBidAdapter.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/betweenBidAdapter.js b/modules/betweenBidAdapter.js
index fb3fcdb8d89..0ed05717391 100644
--- a/modules/betweenBidAdapter.js
+++ b/modules/betweenBidAdapter.js
@@ -59,6 +59,10 @@ export const spec = {
         }
       }
 
+      if (i.schain) {
+        params.schain = encodeToBase64WebSafe(JSON.stringify(i.schain));
+      }
+
       if (refInfo && refInfo.referer) params.ref = refInfo.referer;
 
       if (gdprConsent) {
@@ -166,6 +170,10 @@ function getTz() {
   return new Date().getTimezoneOffset();
 }
 
+function encodeToBase64WebSafe(string) {
+  return btoa(string).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
+}
+
 /*
 function get_pubdata(adds) {
   if (adds !== undefined && adds.pubdata !== undefined) {

From efbc9d308b6e6451d234c7548e6eb1821044e413 Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Tue, 17 Nov 2020 22:38:58 -0800
Subject: [PATCH 015/304] fix source lowercase bug (#5989)

---
 modules/rubiconAnalyticsAdapter.js                | 4 ++--
 test/spec/modules/rubiconAnalyticsAdapter_spec.js | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index 6f00e9536d9..85b6596ba12 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -125,7 +125,7 @@ function sendMessage(auctionId, bidWonId) {
         if (source) {
           return source;
         }
-        return serverConfig && Array.isArray(serverConfig.bidders) && serverConfig.bidders.indexOf(bid.bidder) !== -1
+        return serverConfig && Array.isArray(serverConfig.bidders) && serverConfig.bidders.some(s2sBidder => s2sBidder.toLowerCase() === bid.bidder) !== -1
           ? 'server' : 'client'
       },
       'clientLatencyMillis',
@@ -533,7 +533,7 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
             'bidder', bidder => bidder.toLowerCase(),
             'bidId',
             'status', () => 'no-bid', // default a bid to no-bid until response is recieved or bid is timed out
-            'finalSource as source',
+            'source', () => formatSource(bid.src),
             'params', (params, bid) => {
               switch (bid.bidder) {
                 // specify bidder params we want here
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index d65083ce480..9e343d07dd5 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -255,7 +255,8 @@ const MOCK = {
         'sizes': [[640, 480]],
         'bidId': '2ecff0db240757',
         'bidderRequestId': '1be65d7958826a',
-        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa'
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'src': 'client'
       },
       {
         'bidder': 'rubicon',
@@ -279,7 +280,8 @@ const MOCK = {
         'sizes': [[1000, 300], [970, 250], [728, 90]],
         'bidId': '3bd4ebb1c900e2',
         'bidderRequestId': '1be65d7958826a',
-        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa'
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'src': 's2s'
       }
     ],
     'auctionStart': 1519149536560,

From da87e57527ea3c26c6678f1a223794555706b4fd Mon Sep 17 00:00:00 2001
From: SmartyAdman <59048845+SmartyAdman@users.noreply.github.com>
Date: Wed, 18 Nov 2020 08:44:49 +0200
Subject: [PATCH 016/304] Add consent to sync url (#5981)

* Add Adman bid adapter

* Add supportedMediaTypes property

* Update ADman Media bidder adapter

* Remove console.log

* Fix typo

* revert package-json.lock

* Delete package-lock.json

* back to original package-lock.json

* catch pbjs error

* catch pbjs error

* catch pbjs error

* log

* remove eu url

* remove eu url

* remove eu url

* remove eu url

* remove eu url

* Update admanBidAdapter.js

add consnet to sync url

* Update admanBidAdapter.js

fix import

* Update admanBidAdapter.js

lint fix

* Update admanBidAdapter.js

lint fix

* Update admanBidAdapter.js

check consent object data availability

Co-authored-by: minoru katogi <mkatogi@gmail.com>
Co-authored-by: minoru katogi <m_katogi@hotmail.com>
Co-authored-by: ADman Media <admanmedia@users.noreply.github.com>
Co-authored-by: SmartyAdman <adman@localhost.localdomain>
---
 modules/admanBidAdapter.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/admanBidAdapter.js b/modules/admanBidAdapter.js
index 5dc3412ee66..2e4091e7a24 100644
--- a/modules/admanBidAdapter.js
+++ b/modules/admanBidAdapter.js
@@ -95,10 +95,21 @@ export const spec = {
     return response;
   },
 
-  getUserSyncs: (syncOptions, serverResponses) => {
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncUrl = URL_SYNC
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr==0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
     return [{
       type: 'image',
-      url: URL_SYNC
+      url: syncUrl
     }];
   }
 

From c308898cddc80d7669c3d2d318e13ef5cb366780 Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Wed, 18 Nov 2020 07:58:56 +0100
Subject: [PATCH 017/304] add provider as an option in id5 config params to
 identity prebid identity wrappers (#5983)

---
 modules/id5IdSystem.js                | 1 +
 modules/id5IdSystem.md                | 3 ++-
 test/spec/modules/id5IdSystem_spec.js | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/id5IdSystem.js b/modules/id5IdSystem.js
index 5a1fc69a758..a1596e96fcd 100644
--- a/modules/id5IdSystem.js
+++ b/modules/id5IdSystem.js
@@ -89,6 +89,7 @@ export const id5IdSubmodule = {
       'nbPage': incrementNb(config.params.partner),
       'o': 'pbjs',
       'pd': config.params.pd || '',
+      'provider': config.params.provider || '',
       'rf': referer.referer,
       's': signature,
       'top': referer.reachedTop ? 1 : 0,
diff --git a/modules/id5IdSystem.md b/modules/id5IdSystem.md
index 80ba451b235..e5e3969c19c 100644
--- a/modules/id5IdSystem.md
+++ b/modules/id5IdSystem.md
@@ -45,10 +45,11 @@ pbjs.setConfig({
 | params | Required | Object | Details for the ID5 Universal ID. | |
 | params.partner | Required | Number | This is the ID5 Partner Number obtained from registering with ID5. | `173` |
 | params.pd | Optional | String | Publisher-supplied data used for linking ID5 IDs across domains. See [our documentation](https://wiki.id5.io/x/BIAZ) for details on generating the string. Omit the parameter or leave as an empty string if no data to supply | `"MT1iNTBjY..."` |
+| params.provider | Optional | String | An identifier provided by ID5 to technology partners who manage Prebid setups on behalf of publishers. Reach out to [ID5](mailto:prebid@id5.io) if you have questions about this parameter  | `pubmatic-identity-hub` |
 | storage | Required | Object | Storage settings for how the User ID module will cache the ID5 ID locally | |
 | storage.type | Required | String | This is where the results of the user ID will be stored. ID5 **requires** `"html5"`. | `"html5"` |
 | storage.name | Required | String | The name of the local storage where the user ID will be stored. ID5 **requires** `"id5id"`. | `"id5id"` |
 | storage.expires | Optional | Integer | How long (in days) the user ID information will be stored. ID5 recommends `90`. | `90` |
 | storage.refreshInSeconds | Optional | Integer | How many seconds until the ID5 ID will be refreshed. ID5 strongly recommends 8 hours between refreshes | `8*3600` |
 
-**ATTENTION:** As of Prebid.js v4.14.0, ID5 requires `storage.type` to be `"html5"` and `storage.name` to be `"id5id"`. Using other values will display a warning today, but in an upcoming release, it will prevent the ID5 module from loading. This change is to ensure the ID5 module in Prebid.js interoperates properly with the [ID5 API](https://github.com/id5io/id5-api.js) and to reduce the size of publishers' first-party cookies that are sent to their web servers. If you have any questions, please reach out to us at [prebid@id5.io](mailto:prebid@id5.io).
\ No newline at end of file
+**ATTENTION:** As of Prebid.js v4.14.0, ID5 requires `storage.type` to be `"html5"` and `storage.name` to be `"id5id"`. Using other values will display a warning today, but in an upcoming release, it will prevent the ID5 module from loading. This change is to ensure the ID5 module in Prebid.js interoperates properly with the [ID5 API](https://github.com/id5io/id5-api.js) and to reduce the size of publishers' first-party cookies that are sent to their web servers. If you have any questions, please reach out to us at [prebid@id5.io](mailto:prebid@id5.io).
diff --git a/test/spec/modules/id5IdSystem_spec.js b/test/spec/modules/id5IdSystem_spec.js
index bfc41e5f5e8..adffca6dbe5 100644
--- a/test/spec/modules/id5IdSystem_spec.js
+++ b/test/spec/modules/id5IdSystem_spec.js
@@ -141,6 +141,7 @@ describe('ID5 ID System', function() {
       expect(requestBody.o).to.eq('pbjs');
       expect(requestBody.pd).to.eq('');
       expect(requestBody.s).to.eq('');
+      expect(requestBody.provider).to.eq('');
       expect(requestBody.v).to.eq('$prebid.version$');
 
       request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));

From 8340be830911e904b457950861945d6a34bbeed7 Mon Sep 17 00:00:00 2001
From: Eric Harper <eharper@rubiconproject.com>
Date: Wed, 18 Nov 2020 15:14:06 -0500
Subject: [PATCH 018/304] Prebid 4.17.0 Release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4b62de09e1f..d957c0901c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.17.0-pre",
+  "version": "4.17.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From a84b4e994c7c64c4adabba4fa2215df8e64f23b8 Mon Sep 17 00:00:00 2001
From: Eric Harper <eharper@rubiconproject.com>
Date: Wed, 18 Nov 2020 15:42:30 -0500
Subject: [PATCH 019/304] Increment pre version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d957c0901c3..48963f36c76 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.17.0",
+  "version": "4.18.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 57fb14ccc2d0f3cf9113d820f75a9f59645e66db Mon Sep 17 00:00:00 2001
From: Dmitriy Labuzov <arconamagi@gmail.com>
Date: Thu, 19 Nov 2020 11:16:55 +0300
Subject: [PATCH 020/304] Instream video support for Yieldmo adapter (#5973)

Co-authored-by: Dmitriy Labuzov <dlabuzov@yieldmo.com>
---
 modules/yieldmoBidAdapter.js                | 399 +++++++++++++++---
 modules/yieldmoBidAdapter.md                |  75 +++-
 test/spec/modules/yieldmoBidAdapter_spec.js | 438 ++++++++++----------
 3 files changed, 614 insertions(+), 298 deletions(-)

diff --git a/modules/yieldmoBidAdapter.js b/modules/yieldmoBidAdapter.js
index 08dc3189eda..05af0bf0d66 100644
--- a/modules/yieldmoBidAdapter.js
+++ b/modules/yieldmoBidAdapter.js
@@ -1,103 +1,133 @@
 import * as utils from '../src/utils.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import includes from 'core-js-pure/features/array/includes';
 
 const BIDDER_CODE = 'yieldmo';
 const CURRENCY = 'USD';
 const TIME_TO_LIVE = 300;
 const NET_REVENUE = true;
-const SERVER_ENDPOINT = 'https://ads.yieldmo.com/exchange/prebid';
+const BANNER_SERVER_ENDPOINT = 'https://ads.yieldmo.com/exchange/prebid';
+const VIDEO_SERVER_ENDPOINT = 'https://ads.yieldmo.com/exchange/prebidvideo';
+const OPENRTB_VIDEO_BIDPARAMS = ['placement', 'startdelay', 'skipafter',
+  'protocols', 'api', 'playbackmethod', 'maxduration', 'minduration', 'pos'];
+const OPENRTB_VIDEO_SITEPARAMS = ['name', 'domain', 'cat', 'keywords'];
 const localWindow = utils.getWindowTop();
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: ['banner'],
+  supportedMediaTypes: [BANNER, VIDEO],
+
   /**
    * Determines whether or not the given bid request is valid.
    * @param {object} bid, bid to validate
    * @return boolean, true if valid, otherwise false
    */
   isBidRequestValid: function (bid) {
-    return !!(bid && bid.adUnitCode && bid.bidId);
+    return !!(bid && bid.adUnitCode && bid.bidId && (hasBannerMediaType(bid) || hasVideoMediaType(bid)) &&
+      validateVideoParams(bid));
   },
+
   /**
    * Make a server request from the list of BidRequests.
    *
    * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
+   * @param {BidderRequest} bidderRequest bidder request object.
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (bidRequests, bidderRequest) {
-    let serverRequest = {
-      pbav: '$prebid.version$',
-      p: [],
-      page_url: bidderRequest.refererInfo.referer,
-      bust: new Date().getTime().toString(),
-      pr: bidderRequest.refererInfo.referer,
-      scrd: localWindow.devicePixelRatio || 0,
-      dnt: getDNT(),
-      description: getPageDescription(),
-      title: localWindow.document.title || '',
-      w: localWindow.innerWidth,
-      h: localWindow.innerHeight,
-      userConsent: JSON.stringify({
-        // case of undefined, stringify will remove param
-        gdprApplies: utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies') || '',
-        cmp: utils.deepAccess(bidderRequest, 'gdprConsent.consentString') || ''
-      }),
-      us_privacy: utils.deepAccess(bidderRequest, 'uspConsent') || ''
-    };
-
-    const mtp = window.navigator.maxTouchPoints;
-    if (mtp) {
-      serverRequest.mtp = mtp;
-    }
+    const bannerBidRequests = bidRequests.filter(request => hasBannerMediaType(request));
+    const videoBidRequests = bidRequests.filter(request => hasVideoMediaType(request));
+
+    let serverRequests = [];
+    if (bannerBidRequests.length > 0) {
+      let serverRequest = {
+        pbav: '$prebid.version$',
+        p: [],
+        page_url: bidderRequest.refererInfo.referer,
+        bust: new Date().getTime().toString(),
+        pr: bidderRequest.refererInfo.referer,
+        scrd: localWindow.devicePixelRatio || 0,
+        dnt: getDNT(),
+        description: getPageDescription(),
+        title: localWindow.document.title || '',
+        w: localWindow.innerWidth,
+        h: localWindow.innerHeight,
+        userConsent: JSON.stringify({
+          // case of undefined, stringify will remove param
+          gdprApplies: utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies') || '',
+          cmp: utils.deepAccess(bidderRequest, 'gdprConsent.consentString') || ''
+        }),
+        us_privacy: utils.deepAccess(bidderRequest, 'uspConsent') || ''
+      };
 
-    bidRequests.forEach(request => {
-      serverRequest.p.push(addPlacement(request));
-      const pubcid = getId(request, 'pubcid');
-      if (pubcid) {
-        serverRequest.pubcid = pubcid;
-      } else if (request.crumbs) {
-        if (request.crumbs.pubcid) {
+      const mtp = window.navigator.maxTouchPoints;
+      if (mtp) {
+        serverRequest.mtp = mtp;
+      }
+
+      bannerBidRequests.forEach(request => {
+        serverRequest.p.push(addPlacement(request));
+        const pubcid = getId(request, 'pubcid');
+        if (pubcid) {
+          serverRequest.pubcid = pubcid;
+        } else if (request.crumbs && request.crumbs.pubcid) {
           serverRequest.pubcid = request.crumbs.pubcid;
         }
-      }
-      const tdid = getId(request, 'tdid');
-      if (tdid) {
-        serverRequest.tdid = tdid;
-      }
-      const criteoId = getId(request, 'criteoId');
-      if (criteoId) {
-        serverRequest.cri_prebid = criteoId;
-      }
-      if (request.schain) {
-        serverRequest.schain =
-          JSON.stringify(request.schain);
-      }
-    });
-    serverRequest.p = '[' + serverRequest.p.toString() + ']';
-    return {
-      method: 'GET',
-      url: SERVER_ENDPOINT,
-      data: serverRequest
-    };
+        const tdid = getId(request, 'tdid');
+        if (tdid) {
+          serverRequest.tdid = tdid;
+        }
+        const criteoId = getId(request, 'criteoId');
+        if (criteoId) {
+          serverRequest.cri_prebid = criteoId;
+        }
+        if (request.schain) {
+          serverRequest.schain = JSON.stringify(request.schain);
+        }
+      });
+      serverRequest.p = '[' + serverRequest.p.toString() + ']';
+      serverRequests.push({
+        method: 'GET',
+        url: BANNER_SERVER_ENDPOINT,
+        data: serverRequest
+      });
+    }
+
+    if (videoBidRequests.length > 0) {
+      const serverRequest = openRtbRequest(videoBidRequests, bidderRequest);
+      serverRequests.push({
+        method: 'POST',
+        url: VIDEO_SERVER_ENDPOINT,
+        data: serverRequest
+      });
+    }
+    return serverRequests;
   },
+
   /**
    * Makes Yieldmo Ad Server response compatible to Prebid specs
-   * @param serverResponse successful response from Ad Server
+   * @param {ServerResponse} serverResponse successful response from Ad Server
+   * @param {ServerRequest} bidRequest
    * @return {Bid[]} an array of bids
    */
-  interpretResponse: function (serverResponse) {
+  interpretResponse: function (serverResponse, bidRequest) {
     let bids = [];
-    let data = serverResponse.body;
+    const data = serverResponse.body;
     if (data.length > 0) {
       data.forEach(response => {
-        if (response.cpm && response.cpm > 0) {
-          bids.push(createNewBid(response));
+        if (response.cpm > 0) {
+          bids.push(createNewBannerBid(response));
         }
       });
     }
+    if (data.seatbid) {
+      const seatbids = data.seatbid.reduce((acc, seatBid) => acc.concat(seatBid.bid), []);
+      seatbids.forEach(bid => bids.push(createNewVideoBid(bid, bidRequest)));
+    }
     return bids;
   },
+
   getUserSyncs: function () {
     return [];
   }
@@ -108,6 +138,20 @@ registerBidder(spec);
  * Helper Functions
  ***************************************/
 
+/**
+ * @param {BidRequest} bidRequest bid request
+ */
+function hasBannerMediaType(bidRequest) {
+  return !!utils.deepAccess(bidRequest, 'mediaTypes.banner');
+}
+
+/**
+ * @param {BidRequest} bidRequest bid request
+ */
+function hasVideoMediaType(bidRequest) {
+  return !!utils.deepAccess(bidRequest, 'mediaTypes.video');
+}
+
 /**
  * Adds placement information to array
  * @param request bid request
@@ -130,10 +174,10 @@ function addPlacement(request) {
 }
 
 /**
- * creates a new bid with response information
+ * creates a new banner bid with response information
  * @param response server response
  */
-function createNewBid(response) {
+function createNewBannerBid(response) {
   return {
     requestId: response['callback_id'],
     cpm: response.cpm,
@@ -147,6 +191,27 @@ function createNewBid(response) {
   };
 }
 
+/**
+ * creates a new video bid with response information
+ * @param response openRTB server response
+ * @param bidRequest server request
+ */
+function createNewVideoBid(response, bidRequest) {
+  const imp = (utils.deepAccess(bidRequest, 'data.imp') || []).find(imp => imp.id === response.impid);
+  return {
+    requestId: imp.id,
+    cpm: response.price,
+    width: imp.video.w,
+    height: imp.video.h,
+    creativeId: response.crid || response.adid,
+    currency: CURRENCY,
+    netRevenue: NET_REVENUE,
+    mediaType: VIDEO,
+    ttl: TIME_TO_LIVE,
+    vastXml: response.adm
+  };
+}
+
 /**
  * Detects whether dnt is true
  * @returns true if user enabled dnt
@@ -179,3 +244,215 @@ function getPageDescription() {
 function getId(request, idType) {
   return (typeof utils.deepAccess(request, 'userId') === 'object') ? request.userId[idType] : undefined;
 }
+
+/**
+ * @param {BidRequest[]} bidRequests bid request object
+ * @param {BidderRequest} bidderRequest bidder request object
+ * @return Object OpenRTB request object
+ */
+function openRtbRequest(bidRequests, bidderRequest) {
+  let openRtbRequest = {
+    id: bidRequests[0].bidderRequestId,
+    at: 1,
+    imp: bidRequests.map(bidRequest => openRtbImpression(bidRequest)),
+    site: openRtbSite(bidRequests[0], bidderRequest),
+    device: openRtbDevice(),
+    badv: bidRequests[0].params.badv || [],
+    bcat: bidRequests[0].params.bcat || [],
+    ext: {
+      prebid: '$prebid.version$',
+    }
+  };
+
+  populateOpenRtbGdpr(openRtbRequest, bidderRequest);
+
+  return openRtbRequest;
+}
+
+/**
+ * @param {BidRequest} bidRequest bidder request object.
+ * @return Object OpenRTB's 'imp' (impression) object
+ */
+function openRtbImpression(bidRequest) {
+  const videoReq = utils.deepAccess(bidRequest, 'mediaTypes.video');
+  const size = extractPlayerSize(bidRequest);
+  const imp = {
+    id: bidRequest.bidId,
+    tagid: bidRequest.adUnitCode,
+    bidfloor: bidRequest.params.bidfloor || 0,
+    ext: {
+      placement_id: bidRequest.params.placementId
+    },
+    video: {
+      w: size[0],
+      h: size[1],
+      mimes: videoReq.mimes,
+      linearity: 1
+    }
+  };
+
+  const videoParams = utils.deepAccess(bidRequest, 'params.video');
+  Object.keys(videoParams)
+    .filter(param => includes(OPENRTB_VIDEO_BIDPARAMS, param))
+    .forEach(param => imp.video[param] = videoParams[param]);
+
+  if (videoParams.skippable) {
+    imp.video.skip = 1;
+  }
+
+  return imp;
+}
+
+/**
+ * @param {BidRequest} bidRequest bidder request object.
+ * @return [number, number] || null Player's width and height, or undefined otherwise.
+ */
+function extractPlayerSize(bidRequest) {
+  const sizeArr = utils.deepAccess(bidRequest, 'mediaTypes.video.playerSize');
+  if (utils.isArrayOfNums(sizeArr, 2)) {
+    return sizeArr;
+  } else if (utils.isArray(sizeArr) && utils.isArrayOfNums(sizeArr[0], 2)) {
+    return sizeArr[0];
+  }
+  return null;
+}
+
+/**
+ * @param {BidRequest} bidRequest bid request object
+ * @param {BidderRequest} bidderRequest bidder request object
+ * @return Object OpenRTB's 'site' object
+ */
+function openRtbSite(bidRequest, bidderRequest) {
+  let result = {};
+
+  const loc = utils.parseUrl(utils.deepAccess(bidderRequest, 'refererInfo.referer'));
+  if (!utils.isEmpty(loc)) {
+    result.page = `${loc.protocol}://${loc.hostname}${loc.pathname}`;
+  }
+
+  if (self === top && document.referrer) {
+    result.ref = document.referrer;
+  }
+
+  const keywords = document.getElementsByTagName('meta')['keywords'];
+  if (keywords && keywords.content) {
+    result.keywords = keywords.content;
+  }
+
+  const siteParams = utils.deepAccess(bidRequest, 'params.site');
+  if (siteParams) {
+    Object.keys(siteParams)
+      .filter(param => includes(OPENRTB_VIDEO_SITEPARAMS, param))
+      .forEach(param => result[param] = siteParams[param]);
+  }
+  return result;
+}
+
+/**
+ * @return Object OpenRTB's 'device' object
+ */
+function openRtbDevice() {
+  return {
+    ua: navigator.userAgent,
+    language: (navigator.language || navigator.browserLanguage || navigator.userLanguage || navigator.systemLanguage),
+  };
+}
+
+/**
+ * Updates openRtbRequest with GDPR info from bidderRequest, if present.
+ * @param {Object} openRtbRequest OpenRTB's request to update.
+ * @param {BidderRequest} bidderRequest bidder request object.
+ */
+function populateOpenRtbGdpr(openRtbRequest, bidderRequest) {
+  const gdpr = bidderRequest.gdprConsent;
+  if (gdpr && 'gdprApplies' in gdpr) {
+    utils.deepSetValue(openRtbRequest, 'regs.ext.gdpr', gdpr.gdprApplies ? 1 : 0);
+    utils.deepSetValue(openRtbRequest, 'user.ext.consent', gdpr.consentString);
+  }
+  const uspConsent = utils.deepAccess(bidderRequest, 'uspConsent');
+  if (uspConsent) {
+    utils.deepSetValue(openRtbRequest, 'regs.ext.us_privacy', uspConsent);
+  }
+}
+
+/**
+ * Determines whether or not the given video bid request is valid. If it's not a video bid, returns true.
+ * @param {object} bid, bid to validate
+ * @return boolean, true if valid, otherwise false
+ */
+function validateVideoParams(bid) {
+  if (!hasVideoMediaType(bid)) {
+    return true;
+  }
+
+  const paramRequired = (paramStr, value, conditionStr) => {
+    let error = `"${paramStr}" is required`;
+    if (conditionStr) {
+      error += ' when ' + conditionStr;
+    }
+    throw new Error(error);
+  }
+
+  const paramInvalid = (paramStr, value, expectedStr) => {
+    expectedStr = expectedStr ? ', expected: ' + expectedStr : '';
+    value = JSON.stringify(value);
+    throw new Error(`"${paramStr}"=${value} is invalid${expectedStr}`);
+  }
+
+  const isDefined = val => typeof val !== 'undefined';
+  const validate = (fieldPath, validateCb, errorCb, errorCbParam) => {
+    const value = utils.deepAccess(bid, fieldPath);
+    if (!validateCb(value)) {
+      errorCb(fieldPath, value, errorCbParam);
+    }
+    return value;
+  }
+
+  try {
+    validate('params.placementId', val => !utils.isEmpty(val), paramRequired);
+
+    validate('mediaTypes.video.playerSize', val => utils.isArrayOfNums(val, 2) ||
+      (utils.isArray(val) && val.every(v => utils.isArrayOfNums(v, 2))),
+    paramInvalid, 'array of 2 integers, ex: [640,480] or [[640,480]]');
+
+    validate('mediaTypes.video.mimes', val => isDefined(val), paramRequired);
+    validate('mediaTypes.video.mimes', val => utils.isArray(val) && val.every(v => utils.isStr(v)), paramInvalid,
+      'array of strings, ex: ["video/mp4"]');
+
+    validate('params.video', val => !utils.isEmpty(val), paramRequired);
+
+    const placement = validate('params.video.placement', val => isDefined(val), paramRequired);
+    validate('params.video.placement', val => val >= 1 && val <= 5, paramInvalid);
+    if (placement === 1) {
+      validate('params.video.startdelay', val => isDefined(val),
+        (field, v) => paramRequired(field, v, 'placement == 1'));
+      validate('params.video.startdelay', val => utils.isNumber(val), paramInvalid, 'number, ex: 5');
+    }
+
+    validate('params.video.protocols', val => isDefined(val), paramRequired);
+    validate('params.video.protocols', val => utils.isArrayOfNums(val) && val.every(v => (v >= 1 && v <= 6)),
+      paramInvalid, 'array of numbers, ex: [2,3]');
+
+    validate('params.video.api', val => isDefined(val), paramRequired);
+    validate('params.video.api', val => utils.isArrayOfNums(val) && val.every(v => (v >= 1 && v <= 6)),
+      paramInvalid, 'array of numbers, ex: [2,3]');
+
+    validate('params.video.playbackmethod', val => !isDefined(val) || utils.isArrayOfNums(val), paramInvalid,
+      'array of integers, ex: [2,6]');
+
+    validate('params.video.maxduration', val => isDefined(val), paramRequired);
+    validate('params.video.maxduration', val => utils.isInteger(val), paramInvalid);
+    validate('params.video.minduration', val => !isDefined(val) || utils.isNumber(val), paramInvalid);
+    validate('params.video.skippable', val => !isDefined(val) || utils.isBoolean(val), paramInvalid);
+    validate('params.video.skipafter', val => !isDefined(val) || utils.isNumber(val), paramInvalid);
+    validate('params.video.pos', val => !isDefined(val) || utils.isNumber(val), paramInvalid);
+    validate('params.badv', val => !isDefined(val) || utils.isArray(val), paramInvalid,
+      'array of strings, ex: ["ford.com","pepsi.com"]');
+    validate('params.bcat', val => !isDefined(val) || utils.isArray(val), paramInvalid,
+      'array of strings, ex: ["IAB1-5","IAB1-6"]');
+    return true;
+  } catch (e) {
+    utils.logError(e.message);
+    return false;
+  }
+}
diff --git a/modules/yieldmoBidAdapter.md b/modules/yieldmoBidAdapter.md
index 0f86d2507d1..1b8b7b1b741 100644
--- a/modules/yieldmoBidAdapter.md
+++ b/modules/yieldmoBidAdapter.md
@@ -11,26 +11,61 @@ Note: Our ads will only render in mobile
 
 Connects to Yieldmo Ad Server for bids.
 
-Yieldmo bid adapter supports Banner.
+Yieldmo bid adapter supports Banner and Video.
 
 # Test Parameters
+
+## Banner
+
+Sample banner ad unit config:
+```javascript
+var adUnits = [{ // Banner adUnit
+  code: 'div-gpt-ad-1460505748561-0',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250], [300, 600]],
+    }
+  },
+  bids: [{
+    bidder: 'yieldmo',
+    params: {
+      placementId: '1779781193098233305', // string with at most 19 characters (may include numbers only) 
+      bidFloor: .28 // optional param
+    }
+  }]
+}];
+```
+
+## Video
+
+Sample instream video ad unit config:
+```javascript
+var adUnits = [{ // Video adUnit
+  code: 'div-video-ad-1234567890',
+  mediaTypes: {
+    video: {
+      playerSize: [640, 480], // required
+      context: 'instream',
+      mimes: ['video/mp4']    // required, array of strings
+    }
+  },
+  bids: [{
+    bidder: 'yieldmo',
+    params: {
+      placementId: '1524592390382976659', // required
+      video: {
+        placement: 1,       // required, integer
+        maxduration: 30,    // required, integer
+        minduration: 15,    // optional, integer
+        pos: 1,             // optional, integer
+        startdelay: 10,     // required if placement == 1
+        protocols: [2, 3],  // required, array of integers
+        api: [2, 3],        // required, array of integers
+        playbackmethod: [2,6], // required, array of integers
+        skippable: true,    // optional, boolean
+        skipafter: 10       // optional, integer
+      }
+    }
+  }]
+}];
 ```
-var adUnits = [
-   // Banner adUnit
-   {
-       code: 'div-gpt-ad-1460505748561-0', 
-       mediaTypes: {
-         banner: {
-            sizes: [[300, 250], [300,600]],
-         }
-       }
-       bids: [{
-         bidder: 'yieldmo',
-         params: {
-           placementId: '1779781193098233305', // string with at most 19 characters (may include numbers only) 
-           bidFloor: .28 // optional param
-         }
-       }]
-   }
-];
-```
\ No newline at end of file
diff --git a/test/spec/modules/yieldmoBidAdapter_spec.js b/test/spec/modules/yieldmoBidAdapter_spec.js
index caeb26266fe..deabef69093 100644
--- a/test/spec/modules/yieldmoBidAdapter_spec.js
+++ b/test/spec/modules/yieldmoBidAdapter_spec.js
@@ -1,19 +1,16 @@
 import { expect } from 'chai';
 import { spec } from 'modules/yieldmoBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
 import * as utils from 'src/utils.js';
 
 describe('YieldmoAdapter', function () {
-  const adapter = newBidder(spec);
-  const ENDPOINT = 'https://ads.yieldmo.com/exchange/prebid';
+  const BANNER_ENDPOINT = 'https://ads.yieldmo.com/exchange/prebid';
+  const VIDEO_ENDPOINT = 'https://ads.yieldmo.com/exchange/prebidvideo';
 
-  let tdid = '8d146286-91d4-4958-aff4-7e489dd1abd6';
-  let criteoId = 'aff4';
-
-  let bid = {
+  const mockBannerBid = (rootParams = {}, params = {}) => ({
     bidder: 'yieldmo',
     params: {
       bidFloor: 0.1,
+      ...params,
     },
     adUnitCode: 'adunit-code',
     mediaTypes: {
@@ -31,15 +28,44 @@ describe('YieldmoAdapter', function () {
       pubcid: 'c604130c-0144-4b63-9bf2-c2bd8c8d86da',
     },
     userId: {
-      tdid,
+      tdid: '8d146286-91d4-4958-aff4-7e489dd1abd6'
+    },
+    ...rootParams
+  });
+
+  const mockVideoBid = (rootParams = {}, params = {}, videoParams = {}) => ({
+    bidder: 'yieldmo',
+    adUnitCode: 'adunit-code-video',
+    bidId: '321video123',
+    mediaTypes: {
+      video: {
+        playerSize: [640, 480],
+        context: 'instream',
+        mimes: ['video/mp4']
+      },
     },
-  };
-  let bidArray = [bid];
-  let bidderRequest = {
+    params: {
+      placementId: '123',
+      ...params,
+      video: {
+        placement: 1,
+        maxduration: 30,
+        startdelay: 10,
+        protocols: [2, 3],
+        api: [2, 3],
+        skipppable: true,
+        playbackmethod: [1, 2],
+        ...videoParams
+      }
+    },
+    ...rootParams
+  });
+
+  const mockBidderRequest = (params = {}, bids = [mockBannerBid()]) => ({
     bidderCode: 'yieldmo',
     auctionId: 'e3a336ad-2761-4a1c-b421-ecc7c5294a34',
     bidderRequestId: '14c4ede8c693f',
-    bids: bidArray,
+    bids,
     auctionStart: 1520001292880,
     timeout: 3000,
     start: 1520001292884,
@@ -49,236 +75,215 @@ describe('YieldmoAdapter', function () {
       reachedTop: true,
       referer: 'yieldmo.com',
     },
-  };
+    ...params
+  });
 
   describe('isBidRequestValid', function () {
-    it('should return true when necessary information is found', function () {
-      expect(spec.isBidRequestValid(bid)).to.be.true;
+    describe('Banner:', function () {
+      it('should return true when necessary information is found', function () {
+        expect(spec.isBidRequestValid(mockBannerBid())).to.be.true;
+      });
+
+      it('should return false when necessary information is not found', function () {
+        // empty bid
+        expect(spec.isBidRequestValid({})).to.be.false;
+
+        // empty bidId
+        expect(spec.isBidRequestValid(mockBannerBid({bidId: ''}))).to.be.false;
+
+        // empty adUnitCode
+        expect(spec.isBidRequestValid(mockBannerBid({adUnitCode: ''}))).to.be.false;
+
+        let invalidBid = mockBannerBid();
+        delete invalidBid.mediaTypes.banner;
+        expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+      });
     });
 
-    it('should return false when necessary information is not found', function () {
-      // empty bid
-      expect(spec.isBidRequestValid({})).to.be.false;
+    describe('Instream video:', function () {
+      const getVideoBidWithoutParam = (key, paramToRemove) => {
+        let bid = mockVideoBid();
+        delete utils.deepAccess(bid, key)[paramToRemove];
+        return bid;
+      }
+
+      it('should return true when necessary information is found', function () {
+        expect(spec.isBidRequestValid(mockVideoBid())).to.be.true;
+      });
+
+      it('should return false when necessary information is not found', function () {
+        // empty bidId
+        expect(spec.isBidRequestValid(mockVideoBid({bidId: ''}))).to.be.false;
 
-      // empty bidId
-      bid.bidId = '';
-      expect(spec.isBidRequestValid(bid)).to.be.false;
+        // empty adUnitCode
+        expect(spec.isBidRequestValid(mockVideoBid({adUnitCode: ''}))).to.be.false;
+      });
+
+      it('should return false when required mediaTypes.video.* param is not found', function () {
+        const getBidAndExclude = paramToRemove => getVideoBidWithoutParam('mediaTypes.video', paramToRemove);
+
+        expect(spec.isBidRequestValid(getBidAndExclude('playerSize'))).to.be.false;
+        expect(spec.isBidRequestValid(getBidAndExclude('mimes'))).to.be.false;
+      });
+
+      it('should return false when required bid.params.* is not found', function () {
+        const getBidAndExclude = paramToRemove => getVideoBidWithoutParam('params', paramToRemove);
+
+        expect(spec.isBidRequestValid(getBidAndExclude('placementId'))).to.be.false;
+        expect(spec.isBidRequestValid(getBidAndExclude('video'))).to.be.false;
+      });
 
-      // empty adUnitCode
-      bid.bidId = '30b31c1838de1e';
-      bid.adUnitCode = '';
-      expect(spec.isBidRequestValid(bid)).to.be.false;
+      it('should return false when required bid.params.video.* is not found', function () {
+        const getBidAndExclude = paramToRemove => getVideoBidWithoutParam('params.video', paramToRemove);
 
-      bid.adUnitCode = 'adunit-code';
+        expect(spec.isBidRequestValid(getBidAndExclude('placement'))).to.be.false;
+        expect(spec.isBidRequestValid(getBidAndExclude('maxduration'))).to.be.false;
+        expect(spec.isBidRequestValid(getBidAndExclude('startdelay'))).to.be.false;
+        expect(spec.isBidRequestValid(getBidAndExclude('protocols'))).to.be.false;
+        expect(spec.isBidRequestValid(getBidAndExclude('api'))).to.be.false;
+      });
     });
   });
 
   describe('buildRequests', function () {
-    it('should attempt to send bid requests to the endpoint via GET', function () {
-      const request = spec.buildRequests(bidArray, bidderRequest);
-      expect(request.method).to.equal('GET');
-      expect(request.url).to.be.equal(ENDPOINT);
-    });
+    const build = (bidRequests, bidderReq = mockBidderRequest()) => spec.buildRequests(bidRequests, bidderReq);
+    const buildAndGetPlacementInfo = (bidRequests, index = 0, bidderReq = mockBidderRequest()) =>
+      utils.deepAccess(build(bidRequests, bidderReq), `${index}.data.p`);
+    const buildAndGetData = (bidRequests, index = 0, bidderReq = mockBidderRequest()) =>
+      utils.deepAccess(build(bidRequests, bidderReq), `${index}.data`) || {};
 
-    it('should not blow up if crumbs is undefined', function () {
-      let bidArray = [{ ...bid, crumbs: undefined }];
-      expect(function () {
-        spec.buildRequests(bidArray, bidderRequest);
-      }).not.to.throw();
-    });
+    describe('Banner:', function () {
+      it('should attempt to send banner bid requests to the endpoint via GET', function () {
+        const requests = build([mockBannerBid()]);
+        expect(requests.length).to.equal(1);
+        expect(requests[0].method).to.equal('GET');
+        expect(requests[0].url).to.be.equal(BANNER_ENDPOINT);
+      });
 
-    it('should place bid information into the p parameter of data', function () {
-      let placementInfo = spec.buildRequests(bidArray, bidderRequest).data.p;
-      expect(placementInfo).to.equal(
-        '[{"placement_id":"adunit-code","callback_id":"30b31c1838de1e","sizes":[[300,250],[300,600]],"bidFloor":0.1}]'
-      );
-      bidArray.push({
-        bidder: 'yieldmo',
-        params: {
-          bidFloor: 0.2,
-        },
-        adUnitCode: 'adunit-code-1',
-        mediaTypes: {
-          banner: {
-            sizes: [
-              [300, 250],
-              [300, 600],
-            ],
-          },
-        },
-        bidId: '123456789',
-        bidderRequestId: '987654321',
-        auctionId: '0246810',
-        crumbs: {
-          pubcid: 'c604130c-0144-4b63-9bf2-c2bd8c8d86da',
-        },
+      it('should not blow up if crumbs is undefined', function () {
+        expect(function () {
+          build([mockBannerBid({crumbs: undefined})]);
+        }).not.to.throw();
       });
 
-      // multiple placements
-      placementInfo = spec.buildRequests(bidArray, bidderRequest).data.p;
-      expect(placementInfo).to.equal(
-        '[{"placement_id":"adunit-code","callback_id":"30b31c1838de1e","sizes":[[300,250],[300,600]],"bidFloor":0.1},{"placement_id":"adunit-code-1","callback_id":"123456789","sizes":[[300,250],[300,600]],"bidFloor":0.2}]'
-      );
-    });
+      it('should place bid information into the p parameter of data', function () {
+        let bidArray = [mockBannerBid()];
+        expect(buildAndGetPlacementInfo(bidArray)).to.equal(
+          '[{"placement_id":"adunit-code","callback_id":"30b31c1838de1e","sizes":[[300,250],[300,600]],"bidFloor":0.1}]'
+        );
 
-    it('should add placement id if given', function () {
-      bidArray[0].params.placementId = 'ym_1293871298';
-      let placementInfo = spec.buildRequests(bidArray, bidderRequest).data.p;
-      expect(placementInfo).to.include('"ym_placement_id":"ym_1293871298"');
-      expect(placementInfo).not.to.include('"ym_placement_id":"ym_0987654321"');
+        // multiple placements
+        bidArray.push(mockBannerBid(
+          {adUnitCode: 'adunit-2', bidId: '123a', bidderRequestId: '321', auctionId: '222'}, {bidFloor: 0.2}));
+        expect(buildAndGetPlacementInfo(bidArray)).to.equal(
+          '[{"placement_id":"adunit-code","callback_id":"30b31c1838de1e","sizes":[[300,250],[300,600]],"bidFloor":0.1},' +
+        '{"placement_id":"adunit-2","callback_id":"123a","sizes":[[300,250],[300,600]],"bidFloor":0.2}]'
+        );
+      });
 
-      bidArray[1].params.placementId = 'ym_0987654321';
-      placementInfo = spec.buildRequests(bidArray, bidderRequest).data.p;
-      expect(placementInfo).to.include('"ym_placement_id":"ym_1293871298"');
-      expect(placementInfo).to.include('"ym_placement_id":"ym_0987654321"');
-    });
+      it('should add placement id if given', function () {
+        let bidArray = [mockBannerBid({}, {placementId: 'ym_1293871298'})];
+        let placementInfo = buildAndGetPlacementInfo(bidArray);
+        expect(placementInfo).to.include('"ym_placement_id":"ym_1293871298"');
+        expect(placementInfo).not.to.include('"ym_placement_id":"ym_0987654321"');
 
-    it('should add additional information to data parameter of request', function () {
-      const data = spec.buildRequests(bidArray, bidderRequest).data;
-      expect(data.hasOwnProperty('page_url')).to.be.true;
-      expect(data.hasOwnProperty('bust')).to.be.true;
-      expect(data.hasOwnProperty('pr')).to.be.true;
-      expect(data.hasOwnProperty('scrd')).to.be.true;
-      expect(data.dnt).to.be.false;
-      expect(data.hasOwnProperty('description')).to.be.true;
-      expect(data.hasOwnProperty('title')).to.be.true;
-      expect(data.hasOwnProperty('h')).to.be.true;
-      expect(data.hasOwnProperty('w')).to.be.true;
-      expect(data.hasOwnProperty('pubcid')).to.be.true;
-      expect(data.userConsent).to.equal('{"gdprApplies":"","cmp":""}');
-      expect(data.us_privacy).to.equal('');
-    });
+        bidArray.push(mockBannerBid({}, {placementId: 'ym_0987654321'}));
+        placementInfo = buildAndGetPlacementInfo(bidArray);
+        expect(placementInfo).to.include('"ym_placement_id":"ym_1293871298"');
+        expect(placementInfo).to.include('"ym_placement_id":"ym_0987654321"');
+      });
 
-    it('should add pubcid as parameter of request', function () {
-      const pubcidBid = {
-        bidder: 'yieldmo',
-        params: {},
-        adUnitCode: 'adunit-code',
-        mediaTypes: {
-          banner: {
-            sizes: [
-              [300, 250],
-              [300, 600],
-            ],
-          },
-        },
-        bidId: '30b31c1838de1e',
-        bidderRequestId: '22edbae2733bf6',
-        auctionId: '1d1a030790a475',
-        userId: {
-          pubcid: 'c604130c-0144-4b63-9bf2-c2bd8c8d86da2',
-        },
-      };
-      const data = spec.buildRequests([pubcidBid], bidderRequest).data;
-      expect(data.pubcid).to.deep.equal(
-        'c604130c-0144-4b63-9bf2-c2bd8c8d86da2'
-      );
-    });
+      it('should add additional information to data parameter of request', function () {
+        const data = buildAndGetData([mockBannerBid()]);
+        expect(data.hasOwnProperty('page_url')).to.be.true;
+        expect(data.hasOwnProperty('bust')).to.be.true;
+        expect(data.hasOwnProperty('pr')).to.be.true;
+        expect(data.hasOwnProperty('scrd')).to.be.true;
+        expect(data.dnt).to.be.false;
+        expect(data.hasOwnProperty('description')).to.be.true;
+        expect(data.hasOwnProperty('title')).to.be.true;
+        expect(data.hasOwnProperty('h')).to.be.true;
+        expect(data.hasOwnProperty('w')).to.be.true;
+        expect(data.hasOwnProperty('pubcid')).to.be.true;
+        expect(data.userConsent).to.equal('{"gdprApplies":"","cmp":""}');
+        expect(data.us_privacy).to.equal('');
+      });
 
-    it('should add unified id as parameter of request', function () {
-      const unifiedIdBid = {
-        bidder: 'yieldmo',
-        params: {},
-        adUnitCode: 'adunit-code',
-        mediaTypes: {
-          banner: {
-            sizes: [
-              [300, 250],
-              [300, 600],
-            ],
-          },
-        },
-        bidId: '30b31c1838de1e',
-        bidderRequestId: '22edbae2733bf6',
-        auctionId: '1d1a030790a475',
-        userId: {
-          tdid,
-        },
-      };
-      const data = spec.buildRequests([unifiedIdBid], bidderRequest).data;
-      expect(data.tdid).to.deep.equal(tdid);
-    });
+      it('should add pubcid as parameter of request', function () {
+        const pubcid = 'c604130c-0144-4b63-9bf2-c2bd8c8d86da2';
+        const pubcidBid = mockBannerBid({crumbs: undefined, userId: {pubcid}});
+        expect(buildAndGetData([pubcidBid]).pubcid).to.deep.equal(pubcid);
+      });
 
-    it('should add CRITEO RTUS id as parameter of request', function () {
-      const criteoIdBid = {
-        bidder: 'yieldmo',
-        params: {},
-        adUnitCode: 'adunit-code',
-        mediaTypes: {
-          banner: {
-            sizes: [
-              [300, 250],
-              [300, 600],
-            ],
-          },
-        },
-        bidId: '30b31c1838de1e',
-        bidderRequestId: '22edbae2733bf6',
-        auctionId: '1d1a030790a475',
-        userId: {
-          criteoId,
-        },
-      };
-      const data = spec.buildRequests([criteoIdBid], bidderRequest).data;
-      expect(data.cri_prebid).to.deep.equal(criteoId);
-    });
+      it('should add unified id as parameter of request', function () {
+        const unifiedIdBid = mockBannerBid({crumbs: undefined});
+        expect(buildAndGetData([unifiedIdBid]).tdid).to.deep.equal(mockBannerBid().userId.tdid);
+      });
+
+      it('should add CRITEO RTUS id as parameter of request', function () {
+        const criteoId = 'aff4';
+        const criteoIdBid = mockBannerBid({crumbs: undefined, userId: { criteoId }});
+        expect(buildAndGetData([criteoIdBid]).cri_prebid).to.deep.equal(criteoId);
+      });
 
-    it('should add gdpr information to request if available', () => {
-      bidderRequest.gdprConsent = {
-        consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
-        vendorData: { blerp: 1 },
-        gdprApplies: true,
-      };
-      const data = spec.buildRequests(bidArray, bidderRequest).data;
-      expect(data.userConsent).equal(
-        JSON.stringify({
+      it('should add gdpr information to request if available', () => {
+        const gdprConsent = {
+          consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
+          vendorData: {blerp: 1},
           gdprApplies: true,
-          cmp: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
-        })
-      );
-    });
+        };
+        const data = buildAndGetData([mockBannerBid()], 0, mockBidderRequest({gdprConsent}));
+        expect(data.userConsent).equal(
+          JSON.stringify({
+            gdprApplies: true,
+            cmp: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
+          })
+        );
+      });
+
+      it('should add ccpa information to request if available', () => {
+        const uspConsent = '1YNY';
+        const data = buildAndGetData([mockBannerBid()], 0, mockBidderRequest({uspConsent}));
+        expect(data.us_privacy).equal(uspConsent);
+      });
 
-    it('should add ccpa information to request if available', () => {
-      const privacy = '1YNY';
-      bidderRequest.uspConsent = privacy;
-      const data = spec.buildRequests(bidArray, bidderRequest).data;
-      expect(data.us_privacy).equal(privacy);
+      it('should add schain if it is in the bidRequest', () => {
+        const schain = {
+          ver: '1.0',
+          complete: 1,
+          nodes: [{asi: 'indirectseller.com', sid: '00001', hp: 1}],
+        };
+        const data = buildAndGetData([mockBannerBid({schain})]);
+        expect(data.schain).equal(JSON.stringify(schain));
+      });
     });
 
-    it('should add schain if it is in the bidRequest', () => {
-      const schain = {
-        ver: '1.0',
-        complete: 1,
-        nodes: [{ asi: 'indirectseller.com', sid: '00001', hp: 1 }],
-      };
-      bidArray[0].schain = schain;
-      const request = spec.buildRequests([bidArray[0]], bidderRequest);
-      expect(request.data.schain).equal(JSON.stringify(schain));
+    describe('Instream video:', function () {
+      it('should attempt to send banner bid requests to the endpoint via POST', function () {
+        const requests = build([mockVideoBid()]);
+        expect(requests.length).to.equal(1);
+        expect(requests[0].method).to.equal('POST');
+        expect(requests[0].url).to.be.equal(VIDEO_ENDPOINT);
+      });
     });
   });
 
   describe('interpretResponse', function () {
-    let serverResponse;
-
-    beforeEach(function () {
-      serverResponse = {
-        body: [
-          {
-            callback_id: '21989fdbef550a',
-            cpm: 3.45455,
-            width: 300,
-            height: 250,
-            ad:
-              '<html><head></head><body><script>//GEX ad object</script><div id="ym_123" class="ym"></div><script>//js code</script></body></html>',
-            creative_id: '9874652394875',
-          },
-        ],
-        header: 'header?',
-      };
+    const mockServerResponse = () => ({
+      body: [{
+        callback_id: '21989fdbef550a',
+        cpm: 3.45455,
+        width: 300,
+        height: 250,
+        ad: '<html><head></head><body><script>//GEX ad object</script>' +
+          '<div id="ym_123" class="ym"></div><script>//js code</script></body></html>',
+        creative_id: '9874652394875',
+      }],
+      header: 'header?',
     });
 
     it('should correctly reorder the server response', function () {
-      const newResponse = spec.interpretResponse(serverResponse);
+      const newResponse = spec.interpretResponse(mockServerResponse());
       expect(newResponse.length).to.be.equal(1);
       expect(newResponse[0]).to.deep.equal({
         requestId: '21989fdbef550a',
@@ -289,19 +294,18 @@ describe('YieldmoAdapter', function () {
         currency: 'USD',
         netRevenue: true,
         ttl: 300,
-        ad:
-          '<html><head></head><body><script>//GEX ad object</script><div id="ym_123" class="ym"></div><script>//js code</script></body></html>',
+        ad: '<html><head></head><body><script>//GEX ad object</script>' +
+          '<div id="ym_123" class="ym"></div><script>//js code</script></body></html>',
       });
     });
 
     it('should not add responses if the cpm is 0 or null', function () {
-      serverResponse.body[0].cpm = 0;
-      let response = spec.interpretResponse(serverResponse);
-      expect(response).to.deep.equal([]);
+      let response = mockServerResponse();
+      response.body[0].cpm = 0;
+      expect(spec.interpretResponse(response)).to.deep.equal([]);
 
-      serverResponse.body[0].cpm = null;
-      response = spec.interpretResponse(serverResponse);
-      expect(response).to.deep.equal([]);
+      response.body[0].cpm = null;
+      expect(spec.interpretResponse(response)).to.deep.equal([]);
     });
   });
 

From d5a08ce227b94f79d98c25a0adf0c10e4436fc17 Mon Sep 17 00:00:00 2001
From: pnh-pubx <73683023+pnh-pubx@users.noreply.github.com>
Date: Thu, 19 Nov 2020 14:03:00 +0530
Subject: [PATCH 021/304] PubxAi analytics adapter (#5915)

* Added PubxAi analytics adapter

* Updated Pubxai Analytics Adapter documentation

* Updated test cases

* Fixed issues with test cases

* Updated deviceType and platform in the specs to fix browserstack errors

* Updated documentation with description of each property

* Updated hostname in the documentation

Co-authored-by: Phaneendra Hegde <phaneendra.hegde@gmail.com>
---
 modules/pubxaiAnalyticsAdapter.js             | 168 ++++
 modules/pubxaiAnalyticsAdapter.md             |  27 +
 .../modules/pubxaiAnalyticsAdapter_spec.js    | 734 ++++++++++++++++++
 3 files changed, 929 insertions(+)
 create mode 100644 modules/pubxaiAnalyticsAdapter.js
 create mode 100644 modules/pubxaiAnalyticsAdapter.md
 create mode 100644 test/spec/modules/pubxaiAnalyticsAdapter_spec.js

diff --git a/modules/pubxaiAnalyticsAdapter.js b/modules/pubxaiAnalyticsAdapter.js
new file mode 100644
index 00000000000..7e2f5061621
--- /dev/null
+++ b/modules/pubxaiAnalyticsAdapter.js
@@ -0,0 +1,168 @@
+import { ajax } from '../src/ajax.js';
+import adapter from '../src/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+import CONSTANTS from '../src/constants.json';
+import * as utils from '../src/utils.js';
+
+const emptyUrl = '';
+const analyticsType = 'endpoint';
+const pubxaiAnalyticsVersion = 'v1.0.0';
+const defaultHost = 'api.pbxai.com';
+const auctionPath = '/analytics/auction';
+const winningBidPath = '/analytics/bidwon';
+
+let initOptions;
+let auctionTimestamp;
+let events = {
+  bids: []
+};
+
+var pubxaiAnalyticsAdapter = Object.assign(adapter(
+  {
+    emptyUrl,
+    analyticsType
+  }), {
+  track({ eventType, args }) {
+    if (typeof args !== 'undefined') {
+      if (eventType === CONSTANTS.EVENTS.BID_TIMEOUT) {
+        args.forEach(item => { mapBidResponse(item, 'timeout'); });
+      } else if (eventType === CONSTANTS.EVENTS.AUCTION_INIT) {
+        events.auctionInit = args;
+        auctionTimestamp = args.timestamp;
+      } else if (eventType === CONSTANTS.EVENTS.BID_REQUESTED) {
+        mapBidRequests(args).forEach(item => { events.bids.push(item) });
+      } else if (eventType === CONSTANTS.EVENTS.BID_RESPONSE) {
+        mapBidResponse(args, 'response');
+      } else if (eventType === CONSTANTS.EVENTS.BID_WON) {
+        send({
+          winningBid: mapBidResponse(args, 'bidwon')
+        }, 'bidwon');
+      }
+    }
+
+    if (eventType === CONSTANTS.EVENTS.AUCTION_END) {
+      send(events, 'auctionEnd');
+    }
+  }
+});
+
+function mapBidRequests(params) {
+  let arr = [];
+  if (typeof params.bids !== 'undefined' && params.bids.length) {
+    params.bids.forEach(function (bid) {
+      arr.push({
+        bidderCode: bid.bidder,
+        bidId: bid.bidId,
+        adUnitCode: bid.adUnitCode,
+        requestId: bid.bidderRequestId,
+        auctionId: bid.auctionId,
+        transactionId: bid.transactionId,
+        sizes: utils.parseSizesInput(bid.mediaTypes.banner.sizes).toString(),
+        renderStatus: 1,
+        requestTimestamp: params.auctionStart
+      });
+    });
+  }
+  return arr;
+}
+
+function mapBidResponse(bidResponse, status) {
+  if (status !== 'bidwon') {
+    let bid = events.bids.filter(o => o.bidId === bidResponse.bidId || o.bidId === bidResponse.requestId)[0];
+    Object.assign(bid, {
+      bidderCode: bidResponse.bidder,
+      bidId: status === 'timeout' ? bidResponse.bidId : bidResponse.requestId,
+      adUnitCode: bidResponse.adUnitCode,
+      auctionId: bidResponse.auctionId,
+      creativeId: bidResponse.creativeId,
+      transactionId: bidResponse.transactionId,
+      currency: bidResponse.currency,
+      cpm: bidResponse.cpm,
+      netRevenue: bidResponse.netRevenue,
+      mediaType: bidResponse.mediaType,
+      statusMessage: bidResponse.statusMessage,
+      floorData: bidResponse.floorData,
+      status: bidResponse.status,
+      renderStatus: status === 'timeout' ? 3 : 2,
+      timeToRespond: bidResponse.timeToRespond,
+      requestTimestamp: bidResponse.requestTimestamp,
+      responseTimestamp: bidResponse.responseTimestamp,
+      platform: navigator.platform,
+      deviceType: getDeviceType()
+    });
+  } else {
+    return {
+      bidderCode: bidResponse.bidder,
+      bidId: bidResponse.requestId,
+      adUnitCode: bidResponse.adUnitCode,
+      auctionId: bidResponse.auctionId,
+      creativeId: bidResponse.creativeId,
+      transactionId: bidResponse.transactionId,
+      currency: bidResponse.currency,
+      cpm: bidResponse.cpm,
+      netRevenue: bidResponse.netRevenue,
+      floorData: bidResponse.floorData,
+      renderedSize: bidResponse.size,
+      mediaType: bidResponse.mediaType,
+      statusMessage: bidResponse.statusMessage,
+      status: bidResponse.status,
+      renderStatus: 4,
+      timeToRespond: bidResponse.timeToRespond,
+      requestTimestamp: bidResponse.requestTimestamp,
+      responseTimestamp: bidResponse.responseTimestamp,
+      platform: navigator.platform,
+      deviceType: getDeviceType()
+    }
+  }
+}
+
+export function getDeviceType() {
+  if ((/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i.test(navigator.userAgent.toLowerCase()))) {
+    return 'tablet';
+  }
+  if ((/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i.test(navigator.userAgent.toLowerCase()))) {
+    return 'mobile';
+  }
+  return 'desktop';
+}
+
+// add sampling rate
+pubxaiAnalyticsAdapter.shouldFireEventRequest = function (samplingRate = 1) {
+  return (Math.floor((Math.random() * samplingRate + 1)) === parseInt(samplingRate));
+}
+
+function send(data, status) {
+  if (pubxaiAnalyticsAdapter.shouldFireEventRequest(initOptions.samplingRate)) {
+    let location = utils.getWindowLocation();
+    if (typeof data !== 'undefined' && typeof data.auctionInit !== 'undefined') {
+      Object.assign(data.auctionInit, { host: location.host, path: location.pathname, search: location.search });
+    }
+    data.initOptions = initOptions;
+
+    let pubxaiAnalyticsRequestUrl = utils.buildUrl({
+      protocol: 'https',
+      hostname: (initOptions && initOptions.hostName) || defaultHost,
+      pathname: status == 'bidwon' ? winningBidPath : auctionPath,
+      search: {
+        auctionTimestamp: auctionTimestamp,
+        pubxaiAnalyticsVersion: pubxaiAnalyticsVersion,
+        prebidVersion: $$PREBID_GLOBAL$$.version
+      }
+    });
+
+    ajax(pubxaiAnalyticsRequestUrl, undefined, JSON.stringify(data), { method: 'POST', contentType: 'text/plain' });
+  }
+}
+
+pubxaiAnalyticsAdapter.originEnableAnalytics = pubxaiAnalyticsAdapter.enableAnalytics;
+pubxaiAnalyticsAdapter.enableAnalytics = function (config) {
+  initOptions = config.options;
+  pubxaiAnalyticsAdapter.originEnableAnalytics(config);
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: pubxaiAnalyticsAdapter,
+  code: 'pubxai'
+});
+
+export default pubxaiAnalyticsAdapter;
diff --git a/modules/pubxaiAnalyticsAdapter.md b/modules/pubxaiAnalyticsAdapter.md
new file mode 100644
index 00000000000..112329fc171
--- /dev/null
+++ b/modules/pubxaiAnalyticsAdapter.md
@@ -0,0 +1,27 @@
+# Overview
+Module Name: PubX.io Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer: phaneendra@pubx.ai
+
+# Description
+
+Analytics adapter for prebid provided by Pubx.ai. Contact alex@pubx.ai for information.
+
+# Test Parameters
+
+```
+{
+  provider: 'pubxai',
+    options : {
+      pubxId: 'xxx',
+      hostName: 'example.com',
+      samplingRate: 1
+    }
+}
+```
+Property | Data Type | Is required? | Description |Example
+:-----:|:-----:|:-----:|:-----:|:-----:
+pubxId|string|Yes | A unique identifier provided by PubX.ai to indetify publishers.  |`"a9d48e2f-24ec-4ec1-b3e2-04e32c3aeb03"`
+hostName|string|No|hostName is provided by Pubx.ai. |`"https://example.com"`
+samplingRate |number |No|How often the sampling must be taken. |`2` -  (sample one in two cases) \  `3` - (sample one in three cases)
+ | | | |
\ No newline at end of file
diff --git a/test/spec/modules/pubxaiAnalyticsAdapter_spec.js b/test/spec/modules/pubxaiAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..91c81dcae8d
--- /dev/null
+++ b/test/spec/modules/pubxaiAnalyticsAdapter_spec.js
@@ -0,0 +1,734 @@
+import pubxaiAnalyticsAdapter from 'modules/pubxaiAnalyticsAdapter.js';
+import { getDeviceType } from 'modules/pubxaiAnalyticsAdapter.js';
+import {
+  expect
+} from 'chai';
+import adapterManager from 'src/adapterManager.js';
+import * as utils from 'src/utils.js';
+import {
+  server
+} from 'test/mocks/xhr.js';
+
+let events = require('src/events');
+let constants = require('src/constants.json');
+
+describe('pubxai analytics adapter', function() {
+  beforeEach(function() {
+    sinon.stub(events, 'getEvents').returns([]);
+  });
+
+  afterEach(function() {
+    events.getEvents.restore();
+  });
+
+  describe('track', function() {
+    let initOptions = {
+      samplingRate: '1',
+      pubxId: '6c415fc0-8b0e-4cf5-be73-01526a4db625'
+    };
+
+    let prebidEvent = {
+      'auctionInit': {
+        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        'timestamp': 1603865707180,
+        'auctionStatus': 'inProgress',
+        'adUnits': [{
+          'code': '/19968336/header-bid-tag-1',
+          'mediaTypes': {
+            'banner': {
+              'sizes': [
+                [
+                  300,
+                  250
+                ]
+              ]
+            }
+          },
+          'bids': [{
+            'bidder': 'appnexus',
+            'params': {
+              'placementId': 13144370
+            },
+            'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+            'floorData': {
+              'skipped': false,
+              'skipRate': 0,
+              'modelVersion': 'new model 1.0',
+              'location': 'fetch',
+              'floorProvider': 'PubXFloor',
+              'fetchStatus': 'success'
+            }
+          }],
+          'sizes': [
+            [
+              300,
+              250
+            ]
+          ],
+          'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294'
+        }],
+        'adUnitCodes': [
+          '/19968336/header-bid-tag-1'
+        ],
+        'bidderRequests': [{
+          'bidderCode': 'appnexus',
+          'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+          'bidderRequestId': '184cbc05bb90ba',
+          'bids': [{
+            'bidder': 'appnexus',
+            'params': {
+              'placementId': 13144370
+            },
+            'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+            'floorData': {
+              'skipped': false,
+              'skipRate': 0,
+              'modelVersion': 'new model 1.0',
+              'location': 'fetch',
+              'floorProvider': 'PubXFloor',
+              'fetchStatus': 'success'
+            },
+            'mediaTypes': {
+              'banner': {
+                'sizes': [
+                  [
+                    300,
+                    250
+                  ]
+                ]
+              }
+            },
+            'adUnitCode': '/19968336/header-bid-tag-1',
+            'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294',
+            'sizes': [
+              [
+                300,
+                250
+              ]
+            ],
+            'bidId': '248f9a4489835e',
+            'bidderRequestId': '184cbc05bb90ba',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0
+          }],
+          'auctionStart': 1603865707180,
+          'timeout': 1000,
+          'refererInfo': {
+            'referer': 'http://local-pnh.net:8080/stream/',
+            'reachedTop': true,
+            'isAmp': false,
+            'numIframes': 0,
+            'stack': [
+              'http://local-pnh.net:8080/stream/'
+            ],
+            'canonicalUrl': null
+          },
+          'start': 1603865707182
+        }],
+        'noBids': [],
+        'bidsReceived': [],
+        'winningBids': [],
+        'timeout': 1000,
+        'config': {
+          'samplingRate': '1',
+          'pubxId': '6c415fc0-8b0e-4cf5-be73-01526a4db625'
+        }
+      },
+      'bidRequested': {
+        'bidderCode': 'appnexus',
+        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        'bidderRequestId': '184cbc05bb90ba',
+        'bids': [{
+          'bidder': 'appnexus',
+          'params': {
+            'placementId': 13144370
+          },
+          'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+          'floorData': {
+            'skipped': false,
+            'skipRate': 0,
+            'modelVersion': 'new model 1.0',
+            'location': 'fetch',
+            'floorProvider': 'PubXFloor',
+            'fetchStatus': 'success'
+          },
+          'mediaTypes': {
+            'banner': {
+              'sizes': [
+                [
+                  300,
+                  250
+                ]
+              ]
+            }
+          },
+          'adUnitCode': '/19968336/header-bid-tag-1',
+          'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294',
+          'sizes': [
+            [
+              300,
+              250
+            ]
+          ],
+          'bidId': '248f9a4489835e',
+          'bidderRequestId': '184cbc05bb90ba',
+          'src': 'client',
+          'bidRequestsCount': 1,
+          'bidderRequestsCount': 1,
+          'bidderWinsCount': 0
+        }],
+        'auctionStart': 1603865707180,
+        'timeout': 1000,
+        'refererInfo': {
+          'referer': 'http://local-pnh.net:8080/stream/',
+          'reachedTop': true,
+          'isAmp': false,
+          'numIframes': 0,
+          'stack': [
+            'http://local-pnh.net:8080/stream/'
+          ],
+          'canonicalUrl': null
+        },
+        'start': 1603865707182
+      },
+      'bidTimeout': [],
+      'bidResponse': {
+        'bidderCode': 'appnexus',
+        'width': 300,
+        'height': 250,
+        'statusMessage': 'Bid available',
+        'adId': '32780c4bc382cb',
+        'requestId': '248f9a4489835e',
+        'mediaType': 'banner',
+        'source': 'client',
+        'cpm': 0.5,
+        'creativeId': 96846035,
+        'currency': 'USD',
+        'netRevenue': true,
+        'ttl': 300,
+        'adUnitCode': '/19968336/header-bid-tag-1',
+        'appnexus': {
+          'buyerMemberId': 9325
+        },
+        'meta': {
+          'advertiserId': 2529885
+        },
+        'ad': '<!-- Creative 96846035 served by Member 9325 via AppNexus -->',
+        'originalCpm': 0.5,
+        'originalCurrency': 'USD',
+        'floorData': {
+          'floorValue': 0.4,
+          'floorRule': '/19968336/header-bid-tag-1|banner',
+          'floorCurrency': 'USD',
+          'cpmAfterAdjustments': 0.5,
+          'enforcements': {
+            'enforceJS': true,
+            'enforcePBS': false,
+            'floorDeals': true,
+            'bidAdjustment': true
+          },
+          'matchedFields': {
+            'gptSlot': '/19968336/header-bid-tag-1',
+            'mediaType': 'banner'
+          }
+        },
+        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        'responseTimestamp': 1603865707449,
+        'requestTimestamp': 1603865707182,
+        'bidder': 'appnexus',
+        'timeToRespond': 267,
+        'pbLg': '0.50',
+        'pbMg': '0.50',
+        'pbHg': '0.50',
+        'pbAg': '0.50',
+        'pbDg': '0.50',
+        'pbCg': '0.50',
+        'size': '300x250',
+        'adserverTargeting': {
+          'hb_bidder': 'appnexus',
+          'hb_adid': '32780c4bc382cb',
+          'hb_pb': '0.50',
+          'hb_size': '300x250',
+          'hb_source': 'client',
+          'hb_format': 'banner'
+        },
+      },
+      'auctionEnd': {
+        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        'timestamp': 1603865707180,
+        'auctionEnd': 1603865707180,
+        'auctionStatus': 'completed',
+        'adUnits': [{
+          'code': '/19968336/header-bid-tag-1',
+          'mediaTypes': {
+            'banner': {
+              'sizes': [
+                [
+                  300,
+                  250
+                ]
+              ]
+            }
+          },
+          'bids': [{
+            'bidder': 'appnexus',
+            'params': {
+              'placementId': 13144370
+            },
+            'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+            'floorData': {
+              'skipped': false,
+              'skipRate': 0,
+              'modelVersion': 'new model 1.0',
+              'location': 'fetch',
+              'floorProvider': 'PubXFloor',
+              'fetchStatus': 'success'
+            }
+          }],
+          'sizes': [
+            [
+              300,
+              250
+            ]
+          ],
+          'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294'
+        }],
+        'adUnitCodes': [
+          '/19968336/header-bid-tag-1'
+        ],
+        'bidderRequests': [{
+          'bidderCode': 'appnexus',
+          'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+          'bidderRequestId': '184cbc05bb90ba',
+          'bids': [{
+            'bidder': 'appnexus',
+            'params': {
+              'placementId': 13144370
+            },
+            'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+            'floorData': {
+              'skipped': false,
+              'skipRate': 0,
+              'modelVersion': 'new model 1.0',
+              'location': 'fetch',
+              'floorProvider': 'PubXFloor',
+              'fetchStatus': 'success'
+            },
+            'mediaTypes': {
+              'banner': {
+                'sizes': [
+                  [
+                    300,
+                    250
+                  ]
+                ]
+              }
+            },
+            'adUnitCode': '/19968336/header-bid-tag-1',
+            'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294',
+            'sizes': [
+              [
+                300,
+                250
+              ]
+            ],
+            'bidId': '248f9a4489835e',
+            'bidderRequestId': '184cbc05bb90ba',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0
+          }],
+          'auctionStart': 1603865707180,
+          'timeout': 1000,
+          'refererInfo': {
+            'referer': 'http://local-pnh.net:8080/stream/',
+            'reachedTop': true,
+            'isAmp': false,
+            'numIframes': 0,
+            'stack': [
+              'http://local-pnh.net:8080/stream/'
+            ],
+            'canonicalUrl': null
+          },
+          'start': 1603865707182
+        }],
+        'noBids': [],
+        'bidsReceived': [{
+          'bidderCode': 'appnexus',
+          'width': 300,
+          'height': 250,
+          'statusMessage': 'Bid available',
+          'adId': '32780c4bc382cb',
+          'requestId': '248f9a4489835e',
+          'mediaType': 'banner',
+          'source': 'client',
+          'cpm': 0.5,
+          'creativeId': 96846035,
+          'currency': 'USD',
+          'netRevenue': true,
+          'ttl': 300,
+          'adUnitCode': '/19968336/header-bid-tag-1',
+          'appnexus': {
+            'buyerMemberId': 9325
+          },
+          'meta': {
+            'advertiserId': 2529885
+          },
+          'ad': '<!-- Creative 96846035 served by Member 9325 via AppNexus -->',
+          'originalCpm': 0.5,
+          'originalCurrency': 'USD',
+          'floorData': {
+            'floorValue': 0.4,
+            'floorRule': '/19968336/header-bid-tag-1|banner',
+            'floorCurrency': 'USD',
+            'cpmAfterAdjustments': 0.5,
+            'enforcements': {
+              'enforceJS': true,
+              'enforcePBS': false,
+              'floorDeals': true,
+              'bidAdjustment': true
+            },
+            'matchedFields': {
+              'gptSlot': '/19968336/header-bid-tag-1',
+              'mediaType': 'banner'
+            }
+          },
+          'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+          'responseTimestamp': 1603865707449,
+          'requestTimestamp': 1603865707182,
+          'bidder': 'appnexus',
+          'timeToRespond': 267,
+          'pbLg': '0.50',
+          'pbMg': '0.50',
+          'pbHg': '0.50',
+          'pbAg': '0.50',
+          'pbDg': '0.50',
+          'pbCg': '0.50',
+          'size': '300x250',
+          'adserverTargeting': {
+            'hb_bidder': 'appnexus',
+            'hb_adid': '32780c4bc382cb',
+            'hb_pb': '0.50',
+            'hb_size': '300x250',
+            'hb_source': 'client',
+            'hb_format': 'banner'
+          },
+          'status': 'rendered',
+          'params': [{
+            'placementId': 13144370
+          }]
+        }],
+        'winningBids': [],
+        'timeout': 1000
+      },
+      'bidWon': {
+        'bidderCode': 'appnexus',
+        'width': 300,
+        'height': 250,
+        'statusMessage': 'Bid available',
+        'adId': '32780c4bc382cb',
+        'requestId': '248f9a4489835e',
+        'mediaType': 'banner',
+        'source': 'client',
+        'cpm': 0.5,
+        'creativeId': 96846035,
+        'currency': 'USD',
+        'netRevenue': true,
+        'ttl': 300,
+        'adUnitCode': '/19968336/header-bid-tag-1',
+        'appnexus': {
+          'buyerMemberId': 9325
+        },
+        'meta': {
+          'advertiserId': 2529885
+        },
+        'ad': '<!-- Creative 96846035 served by Member 9325 via AppNexus -->',
+        'originalCpm': 0.5,
+        'originalCurrency': 'USD',
+        'floorData': {
+          'floorValue': 0.4,
+          'floorRule': '/19968336/header-bid-tag-1|banner',
+          'floorCurrency': 'USD',
+          'cpmAfterAdjustments': 0.5,
+          'enforcements': {
+            'enforceJS': true,
+            'enforcePBS': false,
+            'floorDeals': true,
+            'bidAdjustment': true
+          },
+          'matchedFields': {
+            'gptSlot': '/19968336/header-bid-tag-1',
+            'mediaType': 'banner'
+          }
+        },
+        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        'responseTimestamp': 1603865707449,
+        'requestTimestamp': 1603865707182,
+        'bidder': 'appnexus',
+        'timeToRespond': 267,
+        'pbLg': '0.50',
+        'pbMg': '0.50',
+        'pbHg': '0.50',
+        'pbAg': '0.50',
+        'pbDg': '0.50',
+        'pbCg': '0.50',
+        'size': '300x250',
+        'adserverTargeting': {
+          'hb_bidder': 'appnexus',
+          'hb_adid': '32780c4bc382cb',
+          'hb_pb': '0.50',
+          'hb_size': '300x250',
+          'hb_source': 'client',
+          'hb_format': 'banner'
+        },
+        'status': 'rendered',
+        'params': [{
+          'placementId': 13144370
+        }]
+      }
+    };
+    let location = utils.getWindowLocation();
+
+    let expectedAfterBid = {
+      'bids': [{
+        'bidderCode': 'appnexus',
+        'bidId': '248f9a4489835e',
+        'adUnitCode': '/19968336/header-bid-tag-1',
+        'requestId': '184cbc05bb90ba',
+        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        'sizes': '300x250',
+        'renderStatus': 2,
+        'requestTimestamp': 1603865707182,
+        'creativeId': 96846035,
+        'currency': 'USD',
+        'cpm': 0.5,
+        'netRevenue': true,
+        'mediaType': 'banner',
+        'statusMessage': 'Bid available',
+        'floorData': {
+          'floorValue': 0.4,
+          'floorRule': '/19968336/header-bid-tag-1|banner',
+          'floorCurrency': 'USD',
+          'cpmAfterAdjustments': 0.5,
+          'enforcements': {
+            'enforceJS': true,
+            'enforcePBS': false,
+            'floorDeals': true,
+            'bidAdjustment': true
+          },
+          'matchedFields': {
+            'gptSlot': '/19968336/header-bid-tag-1',
+            'mediaType': 'banner'
+          }
+        },
+        'timeToRespond': 267,
+        'responseTimestamp': 1603865707449,
+        'platform': navigator.platform,
+        'deviceType': getDeviceType()
+      }],
+      'auctionInit': {
+        'host': location.host,
+        'path': location.pathname,
+        'search': location.search,
+        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        'timestamp': 1603865707180,
+        'auctionStatus': 'inProgress',
+        'adUnits': [{
+          'code': '/19968336/header-bid-tag-1',
+          'mediaTypes': {
+            'banner': {
+              'sizes': [
+                [
+                  300,
+                  250
+                ]
+              ]
+            }
+          },
+          'bids': [{
+            'bidder': 'appnexus',
+            'params': {
+              'placementId': 13144370
+            },
+            'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+            'floorData': {
+              'skipped': false,
+              'skipRate': 0,
+              'modelVersion': 'new model 1.0',
+              'location': 'fetch',
+              'floorProvider': 'PubXFloor',
+              'fetchStatus': 'success'
+            }
+          }],
+          'sizes': [
+            [
+              300,
+              250
+            ]
+          ],
+          'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294'
+        }],
+        'adUnitCodes': [
+          '/19968336/header-bid-tag-1'
+        ],
+        'bidderRequests': [{
+          'bidderCode': 'appnexus',
+          'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+          'bidderRequestId': '184cbc05bb90ba',
+          'bids': [{
+            'bidder': 'appnexus',
+            'params': {
+              'placementId': 13144370
+            },
+            'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+            'floorData': {
+              'skipped': false,
+              'skipRate': 0,
+              'modelVersion': 'new model 1.0',
+              'location': 'fetch',
+              'floorProvider': 'PubXFloor',
+              'fetchStatus': 'success'
+            },
+            'mediaTypes': {
+              'banner': {
+                'sizes': [
+                  [
+                    300,
+                    250
+                  ]
+                ]
+              }
+            },
+            'adUnitCode': '/19968336/header-bid-tag-1',
+            'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294',
+            'sizes': [
+              [
+                300,
+                250
+              ]
+            ],
+            'bidId': '248f9a4489835e',
+            'bidderRequestId': '184cbc05bb90ba',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0
+          }],
+          'auctionStart': 1603865707180,
+          'timeout': 1000,
+          'refererInfo': {
+            'referer': 'http://local-pnh.net:8080/stream/',
+            'reachedTop': true,
+            'isAmp': false,
+            'numIframes': 0,
+            'stack': [
+              'http://local-pnh.net:8080/stream/'
+            ],
+            'canonicalUrl': null
+          },
+          'start': 1603865707182
+        }],
+        'noBids': [],
+        'bidsReceived': [],
+        'winningBids': [],
+        'timeout': 1000,
+        'config': {
+          'samplingRate': '1',
+          'pubxId': '6c415fc0-8b0e-4cf5-be73-01526a4db625'
+        }
+      },
+      'initOptions': initOptions
+    };
+
+    let expectedAfterBidWon = {
+      'winningBid': {
+        'bidderCode': 'appnexus',
+        'bidId': '248f9a4489835e',
+        'adUnitCode': '/19968336/header-bid-tag-1',
+        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        'renderedSize': '300x250',
+        'renderStatus': 4,
+        'requestTimestamp': 1603865707182,
+        'creativeId': 96846035,
+        'currency': 'USD',
+        'cpm': 0.5,
+        'netRevenue': true,
+        'mediaType': 'banner',
+        'status': 'rendered',
+        'statusMessage': 'Bid available',
+        'floorData': {
+          'floorValue': 0.4,
+          'floorRule': '/19968336/header-bid-tag-1|banner',
+          'floorCurrency': 'USD',
+          'cpmAfterAdjustments': 0.5,
+          'enforcements': {
+            'enforceJS': true,
+            'enforcePBS': false,
+            'floorDeals': true,
+            'bidAdjustment': true
+          },
+          'matchedFields': {
+            'gptSlot': '/19968336/header-bid-tag-1',
+            'mediaType': 'banner'
+          }
+        },
+        'timeToRespond': 267,
+        'responseTimestamp': 1603865707449,
+        'platform': navigator.platform,
+        'deviceType': getDeviceType()
+      },
+      'initOptions': initOptions
+    }
+
+    adapterManager.registerAnalyticsAdapter({
+      code: 'pubxai',
+      adapter: pubxaiAnalyticsAdapter
+    });
+
+    beforeEach(function() {
+      adapterManager.enableAnalytics({
+        provider: 'pubxai',
+        options: initOptions
+      });
+    });
+
+    afterEach(function() {
+      pubxaiAnalyticsAdapter.disableAnalytics();
+    });
+
+    it('builds and sends auction data', function() {
+      // Step 1: Send auction init event
+      events.emit(constants.EVENTS.AUCTION_INIT, prebidEvent['auctionInit']);
+
+      // Step 2: Send bid requested event
+      events.emit(constants.EVENTS.BID_REQUESTED, prebidEvent['bidRequested']);
+
+      // Step 3: Send bid response event
+      events.emit(constants.EVENTS.BID_RESPONSE, prebidEvent['bidResponse']);
+
+      // Step 4: Send bid time out event
+      events.emit(constants.EVENTS.BID_TIMEOUT, prebidEvent['bidTimeout']);
+
+      // Step 5: Send auction end event
+      events.emit(constants.EVENTS.AUCTION_END, prebidEvent['auctionEnd']);
+
+      expect(server.requests.length).to.equal(1);
+
+      let realAfterBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(realAfterBid).to.deep.equal(expectedAfterBid);
+
+      // Step 6: Send auction bid won event
+      events.emit(constants.EVENTS.BID_WON, prebidEvent['bidWon']);
+
+      expect(server.requests.length).to.equal(2);
+
+      let winEventData = JSON.parse(server.requests[1].requestBody);
+
+      expect(winEventData).to.deep.equal(expectedAfterBidWon);
+    });
+  });
+});

From 6fea8444b35b1c903c662603947f884059f92bc0 Mon Sep 17 00:00:00 2001
From: BizzClick <73241175+BizzClick@users.noreply.github.com>
Date: Thu, 19 Nov 2020 10:37:09 +0200
Subject: [PATCH 022/304] init bizzclick prebid.js adapter (#5914)

* init bizzclick prebid.js adapter

* increase test coverage

* init bizzclick prebid.js adapter

* increase test coverage

* fix linting
---
 modules/bizzclickBidAdapter.js                | 307 +++++++++++++++
 modules/bizzclickBidAdapter.md                |  83 +++-
 test/spec/modules/bizzclickBidAdapter_spec.js | 369 ++++++++++++++++++
 3 files changed, 756 insertions(+), 3 deletions(-)
 create mode 100644 modules/bizzclickBidAdapter.js
 create mode 100644 test/spec/modules/bizzclickBidAdapter_spec.js

diff --git a/modules/bizzclickBidAdapter.js b/modules/bizzclickBidAdapter.js
new file mode 100644
index 00000000000..80d2f6b5395
--- /dev/null
+++ b/modules/bizzclickBidAdapter.js
@@ -0,0 +1,307 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+import {config} from '../src/config.js';
+
+const BIDDER_CODE = 'bizzclick';
+const ACCOUNTID_MACROS = '[account_id]';
+const URL_ENDPOINT = `https://us-e-node1.bizzclick.com/bid?rtb_seat_id=prebidjs&secret_key=${ACCOUNTID_MACROS}`;
+const NATIVE_ASSET_IDS = { 0: 'title', 2: 'icon', 3: 'image', 5: 'sponsoredBy', 4: 'body', 1: 'cta' };
+const NATIVE_PARAMS = {
+  title: {
+    id: 0,
+    name: 'title'
+  },
+  icon: {
+    id: 2,
+    type: 1,
+    name: 'img'
+  },
+  image: {
+    id: 3,
+    type: 3,
+    name: 'img'
+  },
+  sponsoredBy: {
+    id: 5,
+    name: 'data',
+    type: 1
+  },
+  body: {
+    id: 4,
+    name: 'data',
+    type: 2
+  },
+  cta: {
+    id: 1,
+    type: 12,
+    name: 'data'
+  }
+};
+const NATIVE_VERSION = '1.2';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: (bid) => {
+    return Boolean(bid.params.accountId) && Boolean(bid.params.placementId)
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: (validBidRequests, bidderRequest) => {
+    if (validBidRequests && validBidRequests.length === 0) return []
+    let accuontId = validBidRequests[0].params.accountId;
+    const endpointURL = URL_ENDPOINT.replace(ACCOUNTID_MACROS, accuontId);
+
+    let winTop = window;
+    let location;
+    try {
+      location = new URL(bidderRequest.refererInfo.referer)
+      winTop = window.top;
+    } catch (e) {
+      location = winTop.location;
+      utils.logMessage(e);
+    };
+
+    let bids = [];
+    for (let bidRequest of validBidRequests) {
+      let impObject = prepareImpObject(bidRequest);
+      let data = {
+        id: bidRequest.bidId,
+        test: config.getConfig('debug') ? 1 : 0,
+        cur: ['USD'],
+        device: {
+          w: winTop.screen.width,
+          h: winTop.screen.height,
+          language: (navigator && navigator.language) ? navigator.language.indexOf('-') != -1 ? navigator.language.split('-')[0] : navigator.language : '',
+        },
+        site: {
+          page: location.pathname,
+          host: location.host
+        },
+        source: {
+          tid: bidRequest.transactionId
+        },
+        tmax: bidRequest.timeout,
+        imp: [impObject],
+      };
+      bids.push(data)
+    }
+    return {
+      method: 'POST',
+      url: endpointURL,
+      data: bids
+    };
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: (serverResponse) => {
+    if (!serverResponse || !serverResponse.body) return []
+    let bizzclickResponse = serverResponse.body;
+
+    let bids = [];
+    for (let response of bizzclickResponse) {
+      let mediaType = response.seatbid[0].bid[0].ext && response.seatbid[0].bid[0].ext.mediaType ? response.seatbid[0].bid[0].ext.mediaType : BANNER;
+
+      let bid = {
+        requestId: response.id,
+        cpm: response.seatbid[0].bid[0].price,
+        width: response.seatbid[0].bid[0].w,
+        height: response.seatbid[0].bid[0].h,
+        ttl: response.ttl || 1200,
+        currency: response.cur || 'USD',
+        netRevenue: true,
+        creativeId: response.seatbid[0].bid[0].crid,
+        dealId: response.seatbid[0].bid[0].dealid,
+        mediaType: mediaType
+      };
+
+      switch (mediaType) {
+        case VIDEO:
+          bid.vastXml = response.seatbid[0].bid[0].adm
+          bid.vastUrl = response.seatbid[0].bid[0].ext.vastUrl
+          break
+        case NATIVE:
+          bid.native = parseNative(response.seatbid[0].bid[0].adm)
+          break
+        default:
+          bid.ad = response.seatbid[0].bid[0].adm
+      }
+
+      bids.push(bid);
+    }
+
+    return bids;
+  },
+};
+
+/**
+ * Determine type of request
+ *
+ * @param bidRequest
+ * @param type
+ * @returns {boolean}
+ */
+const checkRequestType = (bidRequest, type) => {
+  return (typeof utils.deepAccess(bidRequest, `mediaTypes.${type}`) !== 'undefined');
+}
+
+const parseNative = admObject => {
+  const { assets, link, imptrackers, jstracker } = admObject.native;
+  const result = {
+    clickUrl: link.url,
+    clickTrackers: link.clicktrackers || undefined,
+    impressionTrackers: imptrackers || undefined,
+    javascriptTrackers: jstracker ? [ jstracker ] : undefined
+  };
+  assets.forEach(asset => {
+    const kind = NATIVE_ASSET_IDS[asset.id];
+    const content = kind && asset[NATIVE_PARAMS[kind].name];
+    if (content) {
+      result[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
+    }
+  });
+
+  return result;
+}
+
+const prepareImpObject = (bidRequest) => {
+  let impObject = {
+    id: bidRequest.transactionId,
+    secure: 1,
+    ext: {
+      placementId: bidRequest.params.placementId
+    }
+  };
+  if (checkRequestType(bidRequest, BANNER)) {
+    impObject.banner = addBannerParameters(bidRequest);
+  }
+  if (checkRequestType(bidRequest, VIDEO)) {
+    impObject.video = addVideoParameters(bidRequest);
+  }
+  if (checkRequestType(bidRequest, NATIVE)) {
+    impObject.native = {
+      ver: NATIVE_VERSION,
+      request: addNativeParameters(bidRequest)
+    };
+  }
+  return impObject
+};
+
+const addNativeParameters = bidRequest => {
+  let impObject = {
+    id: bidRequest.transactionId,
+    ver: NATIVE_VERSION,
+  };
+
+  const assets = utils._map(bidRequest.mediaTypes.native, (bidParams, key) => {
+    const props = NATIVE_PARAMS[key];
+    const asset = {
+      required: bidParams.required & 1,
+    };
+    if (props) {
+      asset.id = props.id;
+      let wmin, hmin;
+      let aRatios = bidParams.aspect_ratios;
+
+      if (aRatios && aRatios[0]) {
+        aRatios = aRatios[0];
+        wmin = aRatios.min_width || 0;
+        hmin = aRatios.ratio_height * wmin / aRatios.ratio_width | 0;
+      }
+
+      if (bidParams.sizes) {
+        const sizes = flatten(bidParams.sizes);
+        wmin = sizes[0];
+        hmin = sizes[1];
+      }
+
+      asset[props.name] = {}
+
+      if (bidParams.len) asset[props.name]['len'] = bidParams.len;
+      if (props.type) asset[props.name]['type'] = props.type;
+      if (wmin) asset[props.name]['wmin'] = wmin;
+      if (hmin) asset[props.name]['hmin'] = hmin;
+
+      return asset;
+    }
+  }).filter(Boolean);
+
+  impObject.assets = assets;
+  return impObject
+}
+
+const addBannerParameters = (bidRequest) => {
+  let bannerObject = {};
+  const size = parseSizes(bidRequest, 'banner');
+  bannerObject.w = size[0];
+  bannerObject.h = size[1];
+  return bannerObject;
+};
+
+const parseSizes = (bid, mediaType) => {
+  let mediaTypes = bid.mediaTypes;
+  if (mediaType === 'video') {
+    let size = [];
+    if (mediaTypes.video && mediaTypes.video.w && mediaTypes.video.h) {
+      size = [
+        mediaTypes.video.w,
+        mediaTypes.video.h
+      ];
+    } else if (Array.isArray(utils.deepAccess(bid, 'mediaTypes.video.playerSize')) && bid.mediaTypes.video.playerSize.length === 1) {
+      size = bid.mediaTypes.video.playerSize[0];
+    } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0 && Array.isArray(bid.sizes[0]) && bid.sizes[0].length > 1) {
+      size = bid.sizes[0];
+    }
+    return size;
+  }
+  let sizes = [];
+  if (Array.isArray(mediaTypes.banner.sizes)) {
+    sizes = mediaTypes.banner.sizes[0];
+  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
+    sizes = bid.sizes
+  } else {
+    utils.logWarn('no sizes are setup or found');
+  }
+
+  return sizes
+}
+
+const addVideoParameters = (bidRequest) => {
+  let videoObj = {};
+  let supportParamsList = ['mimes', 'minduration', 'maxduration', 'protocols', 'startdelay', 'placement', 'skip', 'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity']
+
+  for (let param of supportParamsList) {
+    if (bidRequest.mediaTypes.video[param] !== undefined) {
+      videoObj[param] = bidRequest.mediaTypes.video[param];
+    }
+  }
+
+  const size = parseSizes(bidRequest, 'video');
+  videoObj.w = size[0];
+  videoObj.h = size[1];
+  return videoObj;
+}
+
+const flatten = arr => {
+  return [].concat(...arr);
+}
+
+registerBidder(spec);
diff --git a/modules/bizzclickBidAdapter.md b/modules/bizzclickBidAdapter.md
index 7dfa458b34c..6fc1bebf546 100644
--- a/modules/bizzclickBidAdapter.md
+++ b/modules/bizzclickBidAdapter.md
@@ -14,14 +14,91 @@ Module that connects to BizzClick SSP demand sources
 ```
     var adUnits = [{
                 code: 'placementId',
-                sizes: [[300, 250]],
+                      mediaTypes: {
+                          banner: {
+                              sizes: [[300, 250], [300,600]]
+                              }
+                              },
                 bids: [{
                         bidder: 'bizzclick',
                         params: {
-                            placementId: 0,
-                            type: 'banner'
+                            placementId: 'hash',
+                            accountId: 'accountId'
                         }
                     }]
+                },
+                {
+                    code: 'native_example',
+                    // sizes: [[1, 1]],
+                    mediaTypes: {
+                      native: {
+                        title: {
+                          required: true,
+                          len: 800
+                        },
+                        image: {
+                          required: true,
+                            len: 80
+                        },
+                        sponsoredBy: {
+                            required: true
+                        },
+                        clickUrl: {
+                            required: true
+                        },
+                        privacyLink: {
+                            required: false
+                        },
+                        body: {
+                            required: true
+                        },
+                        icon: {
+                            required: true,
+                            sizes: [50, 50]
+                        }
+                    }
+
+                    },
+                    bids: [    {
+                            bidder: 'bizzclick',
+                            params: {
+                                  placementId: 'hash',
+                            accountId: 'accountId'
+                            }
+                        }]
+            }, 
+            {
+    code: 'video1',
+    sizes: [640,480],
+    mediaTypes: { video: {
+      minduration:0,
+                maxduration:999,
+                boxingallowed:1,
+                skip:0,
+                mimes:[
+                    'application/javascript',
+                    'video/mp4'
+                ],
+                w:1920,
+                h:1080,
+                protocols:[
+                    2
+                ],
+                linearity:1,
+                api:[
+                    1,
+                    2
+                ]
+    } },
+    bids: [
+    {
+                bidder: 'bizzclick',
+                params: {
+                      placementId: 'hash',
+                            accountId: 'accountId'
                 }
+            }
+    ]
+  }
             ];
 ```
\ No newline at end of file
diff --git a/test/spec/modules/bizzclickBidAdapter_spec.js b/test/spec/modules/bizzclickBidAdapter_spec.js
new file mode 100644
index 00000000000..39ad4ae39c9
--- /dev/null
+++ b/test/spec/modules/bizzclickBidAdapter_spec.js
@@ -0,0 +1,369 @@
+import { expect } from 'chai';
+import { spec } from 'modules/bizzclickBidAdapter.js';
+
+const NATIVE_BID_REQUEST = {
+  code: 'native_example',
+  mediaTypes: {
+    native: {
+      title: {
+        required: true,
+        len: 800
+      },
+      image: {
+        required: true,
+        len: 80
+      },
+      sponsoredBy: {
+        required: true
+      },
+      clickUrl: {
+        required: true
+      },
+      privacyLink: {
+        required: false
+      },
+      body: {
+        required: true
+      },
+      icon: {
+        required: true,
+        sizes: [50, 50]
+      }
+    }
+  },
+  bidder: 'bizzclick',
+  params: {
+    placementId: 'hash',
+    accountId: 'accountId'
+  },
+  timeout: 1000
+
+};
+
+const BANNER_BID_REQUEST = {
+  code: 'banner_example',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250], [300, 600]]
+    }
+  },
+  bidder: 'bizzclick',
+  params: {
+    placementId: 'hash',
+    accountId: 'accountId'
+  },
+  timeout: 1000,
+
+}
+
+const bidRequest = {
+  refererInfo: {
+    referer: 'test.com'
+  }
+}
+
+const VIDEO_BID_REQUEST = {
+  code: 'video1',
+  sizes: [640, 480],
+  mediaTypes: { video: {
+    minduration: 0,
+    maxduration: 999,
+    boxingallowed: 1,
+    skip: 0,
+    mimes: [
+      'application/javascript',
+      'video/mp4'
+    ],
+    w: 1920,
+    h: 1080,
+    protocols: [
+      2
+    ],
+    linearity: 1,
+    api: [
+      1,
+      2
+    ]
+  }
+  },
+
+  bidder: 'bizzclick',
+  params: {
+    placementId: 'hash',
+    accountId: 'accountId'
+  },
+  timeout: 1000
+
+}
+
+const BANNER_BID_RESPONSE = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: 'admcode',
+      crid: 'crid',
+      ext: {
+        mediaType: 'banner'
+      }
+    }],
+  }],
+};
+
+const VIDEO_BID_RESPONSE = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: 'admcode',
+      crid: 'crid',
+      ext: {
+        mediaType: 'video',
+        vastUrl: 'http://example.vast',
+      }
+    }],
+  }],
+};
+
+let imgData = {
+  url: `https://example.com/image`,
+  w: 1200,
+  h: 627
+};
+
+const NATIVE_BID_RESPONSE = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: { native:
+          {
+            assets: [
+              {id: 0, title: 'dummyText'},
+              {id: 3, image: imgData},
+              {
+                id: 5,
+                data: {value: 'organization.name'}
+              }
+            ],
+            link: {url: 'example.com'},
+            imptrackers: ['tracker1.com', 'tracker2.com', 'tracker3.com'],
+            jstracker: 'tracker1.com'
+          }
+      },
+      crid: 'crid',
+      ext: {
+        mediaType: 'native'
+      }
+    }],
+  }],
+};
+
+describe('BizzclickAdapter', function() {
+  describe('isBidRequestValid', function() {
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(NATIVE_BID_REQUEST)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, NATIVE_BID_REQUEST);
+      delete bid.params;
+      bid.params = {
+        'IncorrectParam': 0
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('build Native Request', function () {
+    const request = spec.buildRequests([NATIVE_BID_REQUEST], bidRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://us-e-node1.bizzclick.com/bid?rtb_seat_id=prebidjs&secret_key=accountId');
+    });
+
+    it('Returns empty data if no valid requests are passed', function () {
+      let serverRequest = spec.buildRequests([]);
+      expect(serverRequest).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('build Banner Request', function () {
+    const request = spec.buildRequests([BANNER_BID_REQUEST]);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://us-e-node1.bizzclick.com/bid?rtb_seat_id=prebidjs&secret_key=accountId');
+    });
+  });
+
+  describe('build Video Request', function () {
+    const request = spec.buildRequests([VIDEO_BID_REQUEST]);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://us-e-node1.bizzclick.com/bid?rtb_seat_id=prebidjs&secret_key=accountId');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('Empty response must return empty array', function() {
+      const emptyResponse = null;
+      let response = spec.interpretResponse(emptyResponse);
+
+      expect(response).to.be.an('array').that.is.empty;
+    })
+
+    it('Should interpret banner response', function () {
+      const bannerResponse = {
+        body: [BANNER_BID_RESPONSE]
+      }
+
+      const expectedBidResponse = {
+        requestId: BANNER_BID_RESPONSE.id,
+        cpm: BANNER_BID_RESPONSE.seatbid[0].bid[0].price,
+        width: BANNER_BID_RESPONSE.seatbid[0].bid[0].w,
+        height: BANNER_BID_RESPONSE.seatbid[0].bid[0].h,
+        ttl: BANNER_BID_RESPONSE.ttl || 1200,
+        currency: BANNER_BID_RESPONSE.cur || 'USD',
+        netRevenue: true,
+        creativeId: BANNER_BID_RESPONSE.seatbid[0].bid[0].crid,
+        dealId: BANNER_BID_RESPONSE.seatbid[0].bid[0].dealid,
+        mediaType: 'banner',
+        ad: BANNER_BID_RESPONSE.seatbid[0].bid[0].adm
+      }
+
+      let bannerResponses = spec.interpretResponse(bannerResponse);
+
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.ad).to.equal(expectedBidResponse.ad);
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+
+    it('Should interpret video response', function () {
+      const videoResponse = {
+        body: [VIDEO_BID_RESPONSE]
+      }
+
+      const expectedBidResponse = {
+        requestId: VIDEO_BID_RESPONSE.id,
+        cpm: VIDEO_BID_RESPONSE.seatbid[0].bid[0].price,
+        width: VIDEO_BID_RESPONSE.seatbid[0].bid[0].w,
+        height: VIDEO_BID_RESPONSE.seatbid[0].bid[0].h,
+        ttl: VIDEO_BID_RESPONSE.ttl || 1200,
+        currency: VIDEO_BID_RESPONSE.cur || 'USD',
+        netRevenue: true,
+        creativeId: VIDEO_BID_RESPONSE.seatbid[0].bid[0].crid,
+        dealId: VIDEO_BID_RESPONSE.seatbid[0].bid[0].dealid,
+        mediaType: 'video',
+        vastXml: VIDEO_BID_RESPONSE.seatbid[0].bid[0].adm,
+        vastUrl: VIDEO_BID_RESPONSE.seatbid[0].bid[0].ext.vastUrl
+      }
+
+      let videoResponses = spec.interpretResponse(videoResponse);
+
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'vastXml', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.vastXml).to.equal(expectedBidResponse.vastXml)
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+
+    it('Should interpret native response', function () {
+      const nativeResponse = {
+        body: [NATIVE_BID_RESPONSE]
+      }
+
+      const expectedBidResponse = {
+        requestId: NATIVE_BID_RESPONSE.id,
+        cpm: NATIVE_BID_RESPONSE.seatbid[0].bid[0].price,
+        width: NATIVE_BID_RESPONSE.seatbid[0].bid[0].w,
+        height: NATIVE_BID_RESPONSE.seatbid[0].bid[0].h,
+        ttl: NATIVE_BID_RESPONSE.ttl || 1200,
+        currency: NATIVE_BID_RESPONSE.cur || 'USD',
+        netRevenue: true,
+        creativeId: NATIVE_BID_RESPONSE.seatbid[0].bid[0].crid,
+        dealId: NATIVE_BID_RESPONSE.seatbid[0].bid[0].dealid,
+        mediaType: 'native',
+        native: {clickUrl: NATIVE_BID_RESPONSE.seatbid[0].bid[0].adm.native.link.url}
+      }
+
+      let nativeResponses = spec.interpretResponse(nativeResponse);
+
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'native', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.native.clickUrl).to.equal(expectedBidResponse.native.clickUrl)
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+  });
+})

From 172df7f455fe2bf0605026ab0e21af1c5edf9be3 Mon Sep 17 00:00:00 2001
From: Jaimin Panchal <7393273+jaiminpanchal27@users.noreply.github.com>
Date: Thu, 19 Nov 2020 12:24:38 -0500
Subject: [PATCH 023/304] Appnexus: Update maintainer (#5987)

* Update maintainer

* change maintainer

Co-authored-by: Jaimin Panchal <email@example.com>
Co-authored-by: fawke <neelanjan.sen@gmail.com>
---
 modules/appnexusBidAdapter.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/appnexusBidAdapter.md b/modules/appnexusBidAdapter.md
index 6ec40e83b41..d1f61836297 100644
--- a/modules/appnexusBidAdapter.md
+++ b/modules/appnexusBidAdapter.md
@@ -3,7 +3,7 @@
 ```
 Module Name:  Appnexus Bid Adapter
 Module Type:  Bidder Adapter
-Maintainer: info@prebid.org
+Maintainer: prebid-js@xandr.com
 ```
 
 # Description

From 578213ccb52f5db858026b436f5c249e6f9e418e Mon Sep 17 00:00:00 2001
From: Stephen Johnston <stephenj@launchpowered.com>
Date: Thu, 19 Nov 2020 19:34:23 -0500
Subject: [PATCH 024/304] Fix import warning for webpack 5 (#5933)

Webpack 5 emits a warning when importing named exports from json files:

```
"WARNING in ../../node_modules/prebid.js/src/secureCreatives.js 15:16-30
Should not import the named export 'EVENTS'.'BID_WON' (imported as 'EVENTS') from default-exporting module (only default export is available soon)"
```

Co-authored-by: Garth Poitras <411908+gpoitch@users.noreply.github.com>
Co-authored-by: gpoitch <garth22@gmail.com>
---
 src/secureCreatives.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/secureCreatives.js b/src/secureCreatives.js
index 34de2be275c..cb192dd773e 100644
--- a/src/secureCreatives.js
+++ b/src/secureCreatives.js
@@ -5,14 +5,14 @@
 
 import events from './events.js';
 import { fireNativeTrackers, getAssetMessage } from './native.js';
-import { EVENTS } from './constants.json';
+import constants from './constants.json';
 import { logWarn, replaceAuctionPrice } from './utils.js';
 import { auctionManager } from './auctionManager.js';
 import find from 'core-js-pure/features/array/find.js';
 import { isRendererRequired, executeRenderer } from './Renderer.js';
 import includes from 'core-js-pure/features/array/includes.js';
 
-const BID_WON = EVENTS.BID_WON;
+const BID_WON = constants.EVENTS.BID_WON;
 
 export function listenMessagesFromCreative() {
   window.addEventListener('message', receiveMessage, false);

From c98a6334011bb3738885b2240cc8687170ec9bf7 Mon Sep 17 00:00:00 2001
From: Anand Venkatraman <avenkatraman@pulsepoint.com>
Date: Sat, 21 Nov 2020 02:04:35 +0530
Subject: [PATCH 025/304] PulsePoint Adapter: Fixing issue with multi-format
 requests (#5995)

* ET-1691: Pulsepoint Analytics adapter for Prebid. (#1)

* ET-1691: Adding pulsepoint analytics and tests for pulsepoint adapter

* ET-1691: Adding pulsepoint analytics and tests for pulsepoint adapter

* ET-1691: cleanup

* ET-1691: minor

* ET-1691: revert package.json change

* Adding bidRequest to bidFactory.createBid method as per https://github.com/prebid/Prebid.js/issues/509

* ET-1765: Adding support for additional params in PulsePoint adapter (#2)

* ET-1850: Fixing https://github.com/prebid/Prebid.js/issues/866

* Minor fix

* Adding mandatory parameters to Bid

* APPS-3793: Fixing multi-format request issue

* Added test
---
 modules/pulsepointBidAdapter.js               | 10 ++--
 .../spec/modules/pulsepointBidAdapter_spec.js | 54 +++++++++++++++++++
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/modules/pulsepointBidAdapter.js b/modules/pulsepointBidAdapter.js
index 005eadaa390..f74d79a3dc5 100644
--- a/modules/pulsepointBidAdapter.js
+++ b/modules/pulsepointBidAdapter.js
@@ -121,10 +121,7 @@ function bidResponseAvailable(request, response) {
         netRevenue: DEFAULT_NET_REVENUE,
         currency: bidResponse.cur || DEFAULT_CURRENCY
       };
-      if (idToImpMap[id]['native']) {
-        bid['native'] = nativeResponse(idToImpMap[id], idToBidMap[id]);
-        bid.mediaType = 'native';
-      } else if (idToImpMap[id].video) {
+      if (idToImpMap[id].video) {
         // for outstream, a renderer is specified
         if (idToSlotConfig[id] && utils.deepAccess(idToSlotConfig[id], 'mediaTypes.video.context') === 'outstream') {
           bid.renderer = outstreamRenderer(utils.deepAccess(idToSlotConfig[id], 'renderer.options'), utils.deepAccess(idToBidMap[id], 'ext.outstream'));
@@ -133,10 +130,13 @@ function bidResponseAvailable(request, response) {
         bid.mediaType = 'video';
         bid.width = idToBidMap[id].w;
         bid.height = idToBidMap[id].h;
-      } else {
+      } else if (idToImpMap[id].banner) {
         bid.ad = idToBidMap[id].adm;
         bid.width = idToBidMap[id].w || idToImpMap[id].banner.w;
         bid.height = idToBidMap[id].h || idToImpMap[id].banner.h;
+      } else if (idToImpMap[id]['native']) {
+        bid['native'] = nativeResponse(idToImpMap[id], idToBidMap[id]);
+        bid.mediaType = 'native';
       }
       bids.push(bid);
     }
diff --git a/test/spec/modules/pulsepointBidAdapter_spec.js b/test/spec/modules/pulsepointBidAdapter_spec.js
index cf81a26eebb..c3830d5cb46 100644
--- a/test/spec/modules/pulsepointBidAdapter_spec.js
+++ b/test/spec/modules/pulsepointBidAdapter_spec.js
@@ -724,4 +724,58 @@ describe('PulsePoint Adapter Tests', function () {
     expect(bid.width).to.equal(728);
     expect(bid.height).to.equal(90);
   });
+  it('Verify multi-format response', function () {
+    const bidRequests = deepClone(slotConfigs);
+    bidRequests[0].mediaTypes['native'] = {
+      title: {
+        required: true
+      },
+      image: {
+        required: true
+      },
+      sponsoredBy: {
+        required: true
+      }
+    };
+    bidRequests[1].params.video = {
+      w: 400,
+      h: 300,
+      minduration: 5,
+      maxduration: 10,
+    };
+    const request = spec.buildRequests(bidRequests, bidderRequest);
+    expect(request).to.be.not.null;
+    expect(request.data).to.be.not.null;
+    const ortbRequest = request.data;
+    expect(ortbRequest.imp).to.have.lengthOf(2);
+    // adsize on response
+    const ortbResponse = {
+      seatbid: [{
+        bid: [{
+          impid: ortbRequest.imp[0].id,
+          price: 1.25,
+          adm: 'This is an Ad',
+          crid: 'Creative#123',
+          w: 728,
+          h: 90
+        }, {
+          impid: ortbRequest.imp[1].id,
+          price: 2.5,
+          adm: '<vast url="http://ad.com/video"></vast>',
+          crid: 'Creative#234',
+          w: 728,
+          h: 90
+        }]
+      }]
+    };
+    // request has both types - banner and native, response is parsed as banner.
+    // for impression#2, response is parsed as video
+    const bids = spec.interpretResponse({ body: ortbResponse }, request);
+    expect(bids).to.have.lengthOf(2);
+    const bid = bids[0];
+    expect(bid.width).to.equal(728);
+    expect(bid.height).to.equal(90);
+    const secondBid = bids[1];
+    expect(secondBid.vastXml).to.equal('<vast url="http://ad.com/video"></vast>');
+  });
 });

From 1e98aef06bbe470838ee67779756747e962bdcec Mon Sep 17 00:00:00 2001
From: relaido <63339139+relaido@users.noreply.github.com>
Date: Sat, 21 Nov 2020 05:37:14 +0900
Subject: [PATCH 026/304] Fix/test code set cookie (#5996)

* add relaido adapter

* remove event listener

* fixed UserSyncs and e.data

* fix conflicts

* use storage Class

Co-authored-by: ishigami_shingo <s.ishigami@relaido.co.jp>
Co-authored-by: cmertv-sishigami <s.ishigami@cmertv.com>
Co-authored-by: t_bun <t.bun@cmertv.com>
---
 test/spec/modules/relaidoBidAdapter_spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/spec/modules/relaidoBidAdapter_spec.js b/test/spec/modules/relaidoBidAdapter_spec.js
index 65dcd9b7db7..ebc62752f16 100644
--- a/test/spec/modules/relaidoBidAdapter_spec.js
+++ b/test/spec/modules/relaidoBidAdapter_spec.js
@@ -15,7 +15,6 @@ const storage = getStorageManager();
 storage.setCookie(UUID_KEY, relaido_uuid);
 
 describe('RelaidoAdapter', function () {
-  window.document.cookie = `${UUID_KEY}=${relaido_uuid}`
   let bidRequest;
   let bidderRequest;
   let serverResponse;

From 04c941fcff2d4fb0581e363c81df4753f90be0af Mon Sep 17 00:00:00 2001
From: Monis Qadri <monis0395@users.noreply.github.com>
Date: Sat, 21 Nov 2020 03:55:13 +0530
Subject: [PATCH 027/304] Honour bidFloor key in params (#5999)

Co-authored-by: monis.q <monis.q@media.net>
---
 modules/medianetBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/medianetBidAdapter.js b/modules/medianetBidAdapter.js
index a30f6fc2627..a2dc8bdfd03 100644
--- a/modules/medianetBidAdapter.js
+++ b/modules/medianetBidAdapter.js
@@ -204,7 +204,7 @@ function slotParams(bidRequest) {
     params.tagid = bidRequest.params.crid.toString();
   }
 
-  let bidFloor = parseFloat(bidRequest.params.bidfloor);
+  let bidFloor = parseFloat(bidRequest.params.bidfloor || bidRequest.params.bidFloor);
   if (bidFloor) {
     params.bidfloor = bidFloor;
   }

From 8135e5d0045dfd3a045164f29624837a7c77289b Mon Sep 17 00:00:00 2001
From: Jurij Sinickij <jurij.sinickij@adform.com>
Date: Sat, 21 Nov 2020 07:47:37 +0200
Subject: [PATCH 028/304] adform adapter - allow to pass custom eids param
 (#6008)

---
 modules/adformBidAdapter.js                | 8 ++------
 test/spec/modules/adformBidAdapter_spec.js | 8 ++++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/adformBidAdapter.js b/modules/adformBidAdapter.js
index 48000e082b2..05e45a428d3 100644
--- a/modules/adformBidAdapter.js
+++ b/modules/adformBidAdapter.js
@@ -23,7 +23,7 @@ export const spec = {
     const eids = getEncodedEIDs(utils.deepAccess(validBidRequests, '0.userIdAsEids'));
 
     var request = [];
-    var globalParams = [ [ 'adxDomain', 'adx.adform.net' ], [ 'fd', 1 ], [ 'url', null ], [ 'tid', null ] ];
+    var globalParams = [ [ 'adxDomain', 'adx.adform.net' ], [ 'fd', 1 ], [ 'url', null ], [ 'tid', null ], [ 'eids', eids ] ];
     var bids = JSON.parse(JSON.stringify(validBidRequests));
     var bidder = (bids[0] && bids[0].bidder) || BIDDER_CODE;
     for (i = 0, l = bids.length; i < l; i++) {
@@ -65,10 +65,6 @@ export const spec = {
       request.push('us_privacy=' + bidderRequest.uspConsent);
     }
 
-    if (eids) {
-      request.push('eids=' + eids);
-    }
-
     for (i = 1, l = globalParams.length; i < l; i++) {
       _key = globalParams[i][0];
       _value = globalParams[i][1];
@@ -100,7 +96,7 @@ export const spec = {
     function getEncodedEIDs(eids) {
       if (utils.isArray(eids) && eids.length > 0) {
         const parsed = parseEIDs(eids);
-        return encodeURIComponent(btoa(JSON.stringify(parsed)));
+        return btoa(JSON.stringify(parsed));
       }
     }
 
diff --git a/test/spec/modules/adformBidAdapter_spec.js b/test/spec/modules/adformBidAdapter_spec.js
index 360979659de..23db7a8dc97 100644
--- a/test/spec/modules/adformBidAdapter_spec.js
+++ b/test/spec/modules/adformBidAdapter_spec.js
@@ -149,6 +149,14 @@ describe('Adform adapter', function () {
       });
     });
 
+    it('should allow to pass custom extended ids', function () {
+      bids[0].params.eids = 'some_id_value';
+      let request = spec.buildRequests(bids);
+      let eids = parseUrl(request.url).query.eids;
+
+      assert.equal(eids, 'some_id_value');
+    });
+
     describe('user privacy', function () {
       it('should send GDPR Consent data to adform if gdprApplies', function () {
         let request = spec.buildRequests([bids[0]], {gdprConsent: {gdprApplies: true, consentString: 'concentDataString'}});

From e5e899d2a8fca90f7b03e8e72e1d910a640cc6a0 Mon Sep 17 00:00:00 2001
From: John Salis <jsalis531@gmail.com>
Date: Sat, 21 Nov 2020 00:58:14 -0500
Subject: [PATCH 029/304] Add video response type param to Beachfront adapter
 (#6011)

* add video response type param to beachfront bidder

* run tests

Co-authored-by: John Salis <johnsalis@beachfrontmedia.com>
---
 modules/beachfrontBidAdapter.js               | 19 +++++---
 .../spec/modules/beachfrontBidAdapter_spec.js | 43 ++++++++++++-------
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/modules/beachfrontBidAdapter.js b/modules/beachfrontBidAdapter.js
index 5f0a4b03a04..4b30f47e2cf 100644
--- a/modules/beachfrontBidAdapter.js
+++ b/modules/beachfrontBidAdapter.js
@@ -6,7 +6,7 @@ import { VIDEO, BANNER } from '../src/mediaTypes.js';
 import find from 'core-js-pure/features/array/find.js';
 import includes from 'core-js-pure/features/array/includes.js';
 
-const ADAPTER_VERSION = '1.13';
+const ADAPTER_VERSION = '1.14';
 const ADAPTER_NAME = 'BFIO_PREBID';
 const OUTSTREAM = 'outstream';
 
@@ -61,18 +61,17 @@ export const spec = {
     response = response.body;
 
     if (isVideoBid(bidRequest)) {
-      if (!response || !response.url || !response.bidPrice) {
+      if (!response || !response.bidPrice) {
         utils.logWarn(`No valid video bids from ${spec.code} bidder`);
         return [];
       }
       let sizes = getVideoSizes(bidRequest);
       let firstSize = getFirstSize(sizes);
       let context = utils.deepAccess(bidRequest, 'mediaTypes.video.context');
-      return {
+      let responseType = getVideoBidParam(bidRequest, 'responseType') || 'both';
+      let bidResponse = {
         requestId: bidRequest.bidId,
         bidderCode: spec.code,
-        vastUrl: response.url,
-        vastXml: response.vast,
         cpm: response.bidPrice,
         width: firstSize.w,
         height: firstSize.h,
@@ -83,6 +82,16 @@ export const spec = {
         netRevenue: true,
         ttl: 300
       };
+
+      if (responseType === 'nurl' || responseType === 'both') {
+        bidResponse.vastUrl = response.url;
+      }
+
+      if (responseType === 'adm' || responseType === 'both') {
+        bidResponse.vastXml = response.vast;
+      }
+
+      return bidResponse;
     } else {
       if (!response || !response.length) {
         utils.logWarn(`No valid banner bids from ${spec.code} bidder`);
diff --git a/test/spec/modules/beachfrontBidAdapter_spec.js b/test/spec/modules/beachfrontBidAdapter_spec.js
index aa952d088a7..661780ffac0 100644
--- a/test/spec/modules/beachfrontBidAdapter_spec.js
+++ b/test/spec/modules/beachfrontBidAdapter_spec.js
@@ -530,16 +530,6 @@ describe('BeachfrontAdapter', function () {
         expect(bidResponse.length).to.equal(0);
       });
 
-      it('should return no bids if the response "url" is missing', function () {
-        const bidRequest = bidRequests[0];
-        bidRequest.mediaTypes = { video: {} };
-        const serverResponse = {
-          bidPrice: 5.00
-        };
-        const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
-        expect(bidResponse.length).to.equal(0);
-      });
-
       it('should return no bids if the response "bidPrice" is missing', function () {
         const bidRequest = bidRequests[0];
         bidRequest.mediaTypes = { video: {} };
@@ -562,6 +552,7 @@ describe('BeachfrontAdapter', function () {
         const serverResponse = {
           bidPrice: 5.00,
           url: 'http://reachms.bfmio.com/getmu?aid=bid:19c4a196-fb21-4c81-9a1a-ecc5437a39da',
+          vast: '<VAST version="3.0"></VAST>',
           crid: '123abc'
         };
         const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
@@ -571,7 +562,7 @@ describe('BeachfrontAdapter', function () {
           cpm: serverResponse.bidPrice,
           creativeId: serverResponse.crid,
           vastUrl: serverResponse.url,
-          vastXml: undefined,
+          vastXml: serverResponse.vast,
           width: width,
           height: height,
           renderer: null,
@@ -602,7 +593,7 @@ describe('BeachfrontAdapter', function () {
         });
       });
 
-      it('should return vast xml if found on the bid response', () => {
+      it('should return only vast url if the response type is "nurl"', () => {
         const width = 640;
         const height = 480;
         const bidRequest = bidRequests[0];
@@ -611,6 +602,7 @@ describe('BeachfrontAdapter', function () {
             playerSize: [ width, height ]
           }
         };
+        bidRequest.params.video = { responseType: 'nurl' };
         const serverResponse = {
           bidPrice: 5.00,
           url: 'http://reachms.bfmio.com/getmu?aid=bid:19c4a196-fb21-4c81-9a1a-ecc5437a39da',
@@ -618,10 +610,29 @@ describe('BeachfrontAdapter', function () {
           crid: '123abc'
         };
         const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
-        expect(bidResponse).to.deep.contain({
-          vastUrl: serverResponse.url,
-          vastXml: serverResponse.vast
-        });
+        expect(bidResponse.vastUrl).to.equal(serverResponse.url);
+        expect(bidResponse.vastXml).to.equal(undefined);
+      });
+
+      it('should return only vast xml if the response type is "adm"', () => {
+        const width = 640;
+        const height = 480;
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = {
+          video: {
+            playerSize: [ width, height ]
+          }
+        };
+        bidRequest.params.video = { responseType: 'adm' };
+        const serverResponse = {
+          bidPrice: 5.00,
+          url: 'http://reachms.bfmio.com/getmu?aid=bid:19c4a196-fb21-4c81-9a1a-ecc5437a39da',
+          vast: '<VAST version="3.0"></VAST>',
+          crid: '123abc'
+        };
+        const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+        expect(bidResponse.vastUrl).to.equal(undefined);
+        expect(bidResponse.vastXml).to.equal(serverResponse.vast);
       });
 
       it('should return a renderer for outstream video bids', function () {

From 022bcea3e9c72a9a2817c82484adad51fda8dcc0 Mon Sep 17 00:00:00 2001
From: Anthony Lauzon <ant@audigent.com>
Date: Sat, 21 Nov 2020 01:26:35 -0500
Subject: [PATCH 030/304] fix appnexus segment field format (#6013)

---
 modules/haloRtdProvider.js                |  5 ++---
 test/spec/modules/haloRtdProvider_spec.js | 24 +++++++++++------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/modules/haloRtdProvider.js b/modules/haloRtdProvider.js
index fff9e43ea2a..1ce44ca6004 100644
--- a/modules/haloRtdProvider.js
+++ b/modules/haloRtdProvider.js
@@ -33,9 +33,8 @@ const segmentMappers = {
     set(bid, 'params.user.segments', []);
     let appnexusSegments = [];
     segments.forEach(segment => {
-      if (typeof segment.value != 'undefined' && segment.value != null) {
-        let appnexusSegment = {'id': segment.id, 'value': segment.value};
-        appnexusSegments.push(appnexusSegment);
+      if (typeof segment.id != 'undefined' && segment.id != null) {
+        appnexusSegments.push(parseInt(segment.id));
       }
     })
     bid.params.user.segments = bid.params.user.segments.concat(appnexusSegments);
diff --git a/test/spec/modules/haloRtdProvider_spec.js b/test/spec/modules/haloRtdProvider_spec.js
index 17c2e19e1a6..69ea4bc997c 100644
--- a/test/spec/modules/haloRtdProvider_spec.js
+++ b/test/spec/modules/haloRtdProvider_spec.js
@@ -34,7 +34,7 @@ describe('haloRtdProvider', function() {
                       id: 'appnexus',
                       segment: [
                         {
-                          id: 'apnseg0'
+                          id: '0'
                         }
                       ]
                     }
@@ -43,7 +43,7 @@ describe('haloRtdProvider', function() {
               },
               params: {
                 user: {
-                  segments: [{'id': 'apnseg0', 'value': 0}]
+                  segments: [0]
                 }
               }
             }
@@ -82,22 +82,22 @@ describe('haloRtdProvider', function() {
       ];
 
       const data = {
-        appnexus: [{id: 'apnseg1', value: 0}, {id: 'apnseg2', value: 2}, {id: 'apnseg3'}],
+        appnexus: [{id: '1'}, {id: '2'}, {id: '3'}],
         generic: [{id: 'seg1'}, {id: 'seg2'}, {id: 'seg3'}]
       };
 
     	addSegmentData(adUnits, data, config);
 
-      expect(adUnits[0].bids[0].fpd.user.data[0].segment[0]).to.have.deep.property('id', 'apnseg0');
-      expect(adUnits[0].bids[0].fpd.user.data[0].segment[1]).to.have.deep.property('id', 'apnseg1');
-      expect(adUnits[0].bids[0].fpd.user.data[0].segment[2]).to.have.deep.property('id', 'apnseg2');
-      expect(adUnits[0].bids[0].fpd.user.data[0].segment[3]).to.have.deep.property('id', 'apnseg3');
-      expect(adUnits[0].bids[0].params.user).to.have.deep.property('segments', [{'id': 'apnseg0', 'value': 0}, {'id': 'apnseg1', 'value': 0}, {'id': 'apnseg2', 'value': 2}]);
+      expect(adUnits[0].bids[0].fpd.user.data[0].segment[0]).to.have.deep.property('id', '0');
+      expect(adUnits[0].bids[0].fpd.user.data[0].segment[1]).to.have.deep.property('id', '1');
+      expect(adUnits[0].bids[0].fpd.user.data[0].segment[2]).to.have.deep.property('id', '2');
+      expect(adUnits[0].bids[0].fpd.user.data[0].segment[3]).to.have.deep.property('id', '3');
+      expect(adUnits[0].bids[0].params.user).to.have.deep.property('segments', [0, 1, 2, 3]);
 
-      expect(adUnits[1].bids[0].fpd.user.data[0].segment[0]).to.have.deep.property('id', 'apnseg1');
-      expect(adUnits[1].bids[0].fpd.user.data[0].segment[1]).to.have.deep.property('id', 'apnseg2');
-      expect(adUnits[1].bids[0].fpd.user.data[0].segment[2]).to.have.deep.property('id', 'apnseg3');
-      expect(adUnits[1].bids[0].params.user).to.have.deep.property('segments', [{'id': 'apnseg1', 'value': 0}, {'id': 'apnseg2', 'value': 2}]);
+      expect(adUnits[1].bids[0].fpd.user.data[0].segment[0]).to.have.deep.property('id', '1');
+      expect(adUnits[1].bids[0].fpd.user.data[0].segment[1]).to.have.deep.property('id', '2');
+      expect(adUnits[1].bids[0].fpd.user.data[0].segment[2]).to.have.deep.property('id', '3');
+      expect(adUnits[1].bids[0].params.user).to.have.deep.property('segments', [1, 2, 3]);
 
       expect(adUnits[1].bids[1].fpd.user.data[0].segment[0]).to.have.deep.property('id', 'seg1');
       expect(adUnits[1].bids[1].fpd.user.data[0].segment[1]).to.have.deep.property('id', 'seg2');

From cebae4a07748bcf0570e1781c31bb9f865bffbab Mon Sep 17 00:00:00 2001
From: haxmediagithub <74675750+haxmediagithub@users.noreply.github.com>
Date: Mon, 23 Nov 2020 18:06:30 +0200
Subject: [PATCH 031/304] New haxmedia bidder adapter (#6001)

---
 modules/haxmediaBidAdapter.js                | 107 +++++++
 modules/haxmediaBidAdapter.md                |  72 +++++
 test/spec/modules/haxmediaBidAdapter_spec.js | 304 +++++++++++++++++++
 3 files changed, 483 insertions(+)
 create mode 100644 modules/haxmediaBidAdapter.js
 create mode 100644 modules/haxmediaBidAdapter.md
 create mode 100644 test/spec/modules/haxmediaBidAdapter_spec.js

diff --git a/modules/haxmediaBidAdapter.js b/modules/haxmediaBidAdapter.js
new file mode 100644
index 00000000000..c4ce2eb3663
--- /dev/null
+++ b/modules/haxmediaBidAdapter.js
@@ -0,0 +1,107 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+
+const BIDDER_CODE = 'haxmedia';
+const AD_URL = 'https://balancer.haxmedia.io/?c=o&m=multi';
+
+function isBidResponseValid(bid) {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
+    !bid.ttl || !bid.currency) {
+    return false;
+  }
+  switch (bid.mediaType) {
+    case BANNER:
+      return Boolean(bid.width && bid.height && bid.ad);
+    case VIDEO:
+      return Boolean(bid.vastUrl);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers);
+    default:
+      return false;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: (bid) => {
+    return Boolean(bid.bidId && bid.params && !isNaN(parseInt(bid.params.placementId)));
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest) => {
+    let winTop = window;
+    let location;
+    try {
+      location = new URL(bidderRequest.refererInfo.referer)
+      winTop = window.top;
+    } catch (e) {
+      location = winTop.location;
+      utils.logMessage(e);
+    };
+
+    const placements = [];
+    const request = {
+      'deviceWidth': winTop.screen.width,
+      'deviceHeight': winTop.screen.height,
+      'language': (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
+      'secure': 1,
+      'host': location.host,
+      'page': location.pathname,
+      'placements': placements
+    };
+
+    if (bidderRequest) {
+      if (bidderRequest.uspConsent) {
+        request.ccpa = bidderRequest.uspConsent;
+      }
+      if (bidderRequest.gdprConsent) {
+        request.gdpr = bidderRequest.gdprConsent
+      }
+    }
+
+    const len = validBidRequests.length;
+    for (let i = 0; i < len; i++) {
+      const bid = validBidRequests[i];
+      const placement = {
+        placementId: bid.params.placementId,
+        bidId: bid.bidId,
+        schain: bid.schain || {},
+      };
+      const mediaType = bid.mediaTypes
+
+      if (mediaType && mediaType[BANNER] && mediaType[BANNER].sizes) {
+        placement.sizes = mediaType[BANNER].sizes;
+        placement.traffic = BANNER;
+      } else if (mediaType && mediaType[VIDEO] && mediaType[VIDEO].playerSize) {
+        placement.wPlayer = mediaType[VIDEO].playerSize[0];
+        placement.hPlayer = mediaType[VIDEO].playerSize[1];
+        placement.traffic = VIDEO;
+      } else if (mediaType && mediaType[NATIVE]) {
+        placement.native = mediaType[NATIVE];
+        placement.traffic = NATIVE;
+      }
+      placements.push(placement);
+    }
+
+    return {
+      method: 'POST',
+      url: AD_URL,
+      data: request
+    };
+  },
+
+  interpretResponse: (serverResponse) => {
+    let response = [];
+    for (let i = 0; i < serverResponse.body.length; i++) {
+      let resItem = serverResponse.body[i];
+      if (isBidResponseValid(resItem)) {
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/haxmediaBidAdapter.md b/modules/haxmediaBidAdapter.md
new file mode 100644
index 00000000000..f661a9e4e71
--- /dev/null
+++ b/modules/haxmediaBidAdapter.md
@@ -0,0 +1,72 @@
+# Overview
+
+```
+Module Name: haxmedia Bidder Adapter
+Module Type: haxmedia Bidder Adapter
+Maintainer: haxmixqk@haxmediapartners.io
+```
+
+# Description
+
+Module that connects to haxmedia demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+                {
+                    code:'1',
+                    mediaTypes:{
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'haxmedia',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        video: {
+                            playerSize: [640, 480],
+                            context: 'instream'
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'haxmedia',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'haxmedia',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                }
+            ];
+```
diff --git a/test/spec/modules/haxmediaBidAdapter_spec.js b/test/spec/modules/haxmediaBidAdapter_spec.js
new file mode 100644
index 00000000000..2e39d771bdf
--- /dev/null
+++ b/test/spec/modules/haxmediaBidAdapter_spec.js
@@ -0,0 +1,304 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/haxmediaBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+
+describe('haxmediaBidAdapter', function () {
+  const bid = {
+    bidId: '23fhj33i987f',
+    bidder: 'haxmedia',
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+      placementId: 783,
+      traffic: BANNER
+    }
+  };
+
+  const bidderRequest = {
+    refererInfo: {
+      referer: 'test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      delete bid.params.placementId;
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests([bid], bidderRequest);
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://balancer.haxmedia.io/?c=o&m=multi');
+    });
+    it('Returns valid data if array of bids is valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements');
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.gdpr).to.not.exist;
+      expect(data.ccpa).to.not.exist;
+      let placement = data['placements'][0];
+      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'sizes', 'schain');
+      expect(placement.placementId).to.equal(783);
+      expect(placement.bidId).to.equal('23fhj33i987f');
+      expect(placement.traffic).to.equal(BANNER);
+      expect(placement.schain).to.be.an('object');
+      expect(placement.sizes).to.be.an('array');
+    });
+
+    it('Returns valid data for mediatype video', function () {
+      const playerSize = [300, 300];
+      bid.mediaTypes = {};
+      bid.params.traffic = VIDEO;
+      bid.mediaTypes[VIDEO] = {
+        playerSize
+      };
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      let placement = data['placements'][0];
+      expect(placement).to.be.an('object');
+      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'wPlayer', 'hPlayer', 'schain');
+      expect(placement.traffic).to.equal(VIDEO);
+      expect(placement.wPlayer).to.equal(playerSize[0]);
+      expect(placement.hPlayer).to.equal(playerSize[1]);
+    });
+
+    it('Returns valid data for mediatype native', function () {
+      const native = {
+        title: {
+          required: true
+        },
+        body: {
+          required: true
+        },
+        icon: {
+          required: true,
+          size: [64, 64]
+        }
+      };
+
+      bid.mediaTypes = {};
+      bid.params.traffic = NATIVE;
+      bid.mediaTypes[NATIVE] = native;
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      let placement = data['placements'][0];
+      expect(placement).to.be.an('object');
+      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'native', 'schain');
+      expect(placement.traffic).to.equal(NATIVE);
+      expect(placement.native).to.equal(native);
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      bidderRequest.gdprConsent = 'test';
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = 'test';
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+
+    it('Returns empty data if no valid requests are passed', function () {
+      serverRequest = spec.buildRequests([]);
+      let data = serverRequest.data;
+      expect(data.placements).to.be.an('array').that.is.empty;
+    });
+  });
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.width).to.equal(300);
+      expect(dataItem.height).to.equal(250);
+      expect(dataItem.ad).to.equal('Test');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
+          mediaType: 'native',
+          native: {
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
+          },
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+});

From 8930be4fc59e086bd6e0c5caf83e0dee673b4fa1 Mon Sep 17 00:00:00 2001
From: Brandon Ling <51931757+blingster7@users.noreply.github.com>
Date: Tue, 24 Nov 2020 02:02:34 -0500
Subject: [PATCH 032/304] [Triplelift] Add advertiserDomains support (#5993)

* Add IdentityLink support and fix UnifiedId.

It appears we've been looking for UnifiedId userIds
on the bidderRequest object, when they are found on bidRequests.
This commit fixes that error, and adds support for IdentityLink.

* change maintainer email to group

* TripleLift: Sending schain (#1)

* Sending schain

* null -> undefined

* Hardcode sync endpoint protocol

* Switch to EB2 sync endpoint

* Add support for image based user syncing

* Rename endpoint variable

* Add assertion

* Add CCPA query param

* Simplify check for usPrivacy argument

* put advertiser name in the bid.meta field if it exists

* update unit tests with meta.advertiserName field

* Triplelift: FPD key value pair support (#5)

* Triplelift: Add support for global fpd

* don't filter fpd

* adds coppa support back in

* add gvlid, update validation method, add unit tests

* remove advertiserDomains logic

* typo

* update _buildResponseObject to use new instream validation

* add advertiserDomains support

Co-authored-by: Will Chapin <wrchapin@gmail.com>
Co-authored-by: colbertk <50499465+colbertk@users.noreply.github.com>
Co-authored-by: David Andersen <davidwoodsandersen@gmail.com>
Co-authored-by: colbertk <kcolbert@triplelift.com>
Co-authored-by: Kevin Zhou <kzhou@triplelift.com>
Co-authored-by: kzhouTL <43545828+kzhouTL@users.noreply.github.com>
Co-authored-by: Sy Dao <iam.sydao@gmail.com>
Co-authored-by: sdao-tl <49252703+sdao-tl@users.noreply.github.com>
---
 modules/tripleliftBidAdapter.js                |  4 ++++
 test/spec/modules/tripleliftBidAdapter_spec.js | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/tripleliftBidAdapter.js b/modules/tripleliftBidAdapter.js
index 69c52711236..d54d76efb41 100644
--- a/modules/tripleliftBidAdapter.js
+++ b/modules/tripleliftBidAdapter.js
@@ -293,6 +293,10 @@ function _buildResponseObject(bidderRequest, bid) {
     if (bid.advertiser_name) {
       bidResponse.meta.advertiserName = bid.advertiser_name;
     }
+
+    if (bid.adomain && bid.adomain.length) {
+      bidResponse.meta.advertiserDomains = bid.adomain;
+    }
   };
   return bidResponse;
 }
diff --git a/test/spec/modules/tripleliftBidAdapter_spec.js b/test/spec/modules/tripleliftBidAdapter_spec.js
index f01949755c7..b417876f276 100644
--- a/test/spec/modules/tripleliftBidAdapter_spec.js
+++ b/test/spec/modules/tripleliftBidAdapter_spec.js
@@ -638,7 +638,8 @@ describe('triplelift adapter', function () {
               ad: 'ad-markup',
               iurl: 'https://s.adroll.com/a/IYR/N36/IYRN366MFVDITBAGNNT5U6.jpg',
               tl_source: 'tlx',
-              advertiser_name: 'fake advertiser name'
+              advertiser_name: 'fake advertiser name',
+              adomain: ['basspro.com', 'internetalerts.org']
             },
             {
               imp_id: 1,
@@ -747,6 +748,13 @@ describe('triplelift adapter', function () {
       expect(result[0].meta.advertiserName).to.equal('fake advertiser name');
       expect(result[1].meta).to.not.have.key('advertiserName');
     });
+
+    it('should include the advertiser domain array in the meta field if available', function () {
+      let result = tripleliftAdapterSpec.interpretResponse(response, {bidderRequest});
+      expect(result[0].meta.advertiserDomains[0]).to.equal('basspro.com');
+      expect(result[0].meta.advertiserDomains[1]).to.equal('internetalerts.org');
+      expect(result[1].meta).to.not.have.key('advertiserDomains');
+    });
   });
 
   describe('getUserSyncs', function() {

From 015c48b67956348888f1768fbaae8a9027222468 Mon Sep 17 00:00:00 2001
From: omerBrowsi <54346241+omerBrowsi@users.noreply.github.com>
Date: Tue, 24 Nov 2020 23:08:13 +0200
Subject: [PATCH 033/304] Browsi RTD provider docs (#5920)

* real time data module,
browsi sub module for real time data,
new hook bidsBackCallback,
fix for config unsubscribe

* change timeout&primary ad server only to auctionDelay
update docs

* support multiple providers

* change promise to callbacks
configure submodule on submodules.json

* bug fixes

* use Prebid ajax

* tests fix

* browsi real time data provider improvements

* real time data module,
browsi sub module for real time data,
new hook bidsBackCallback,
fix for config unsubscribe

* change timeout&primary ad server only to auctionDelay
update docs

* support multiple providers

* change promise to callbacks
configure submodule on submodules.json

* bug fixes

* use Prebid ajax

* tests fix

* browsi real time data provider improvements

* RTD docs
---
 modules/browsiRtdProvider.md      | 55 +++++++++++++++++++++++++++++++
 modules/rtdModule/provider.md     | 28 +++++++++-------
 modules/rtdModule/realTimeData.md | 32 ------------------
 3 files changed, 72 insertions(+), 43 deletions(-)
 create mode 100644 modules/browsiRtdProvider.md
 delete mode 100644 modules/rtdModule/realTimeData.md

diff --git a/modules/browsiRtdProvider.md b/modules/browsiRtdProvider.md
new file mode 100644
index 00000000000..0dd8c1d7609
--- /dev/null
+++ b/modules/browsiRtdProvider.md
@@ -0,0 +1,55 @@
+# Overview
+
+The Browsi RTD module provides viewability predictions for ad slots on the page.
+To use this module, you’ll need to work with [Browsi](https://gobrowsi.com/) to get an account and receive instructions on how to set up your pages and ad server.
+
+# Configurations
+
+Compile the Browsi RTD Provider into your Prebid build:
+
+`gulp build --modules=browsiRtdProvider`
+
+
+Configuration example for using RTD module with `browsi` provider
+```javascript
+    pbjs.setConfig({
+        "realTimeData": {
+            "auctionDelay": 1000,
+            dataProviders:[{
+                "name": "browsi",
+                "waitForIt": "true"
+                "params": {
+                    "url": "testUrl.com",
+                    "siteKey": "testKey",
+                    "pubKey": "testPub",
+                    "keyName":"bv"
+                }  
+            }]
+        }
+    });
+```  
+
+#Params
+
+Contact Browsi to get required params
+
+|  param name | type  |Scope | Description |
+| :------------ | :------------ | :------- | :------- |
+| url  | string  | required | Browsi server URL |
+| siteKey  | string  | required | Site key |
+| pubKey  | string  | required | Publisher key |
+| keyName  | string  | optional | Ad unit targeting key |
+
+
+#Output
+`getTargetingData` function will return expected viewability prediction in the following structure:
+```json
+{
+  "adUnitCode":{
+      "browsiViewability":"0.6"
+  },
+  "adUnitCode2":{
+      "browsiViewability":"0.9"
+  }
+}
+``` 
diff --git a/modules/rtdModule/provider.md b/modules/rtdModule/provider.md
index fb42e7188d3..116db160238 100644
--- a/modules/rtdModule/provider.md
+++ b/modules/rtdModule/provider.md
@@ -1,27 +1,33 @@
 New provider must include the following:
 
-1. sub module object:
-```
-export const subModuleName = {
-  name: String,
-  getData: Function <Promise>
-};
-```
+1. sub module object with the following keys:
 
-2. Function that returns the real time data according to the following structure:
-```
+|  param name | type  | Scope | Description | Params |
+| :------------ | :------------ | :------ | :------ | :------ |
+| name  | string  | required | must match the name provided by the publisher in the on-page config | n/a |
+|  init | function | required | defines the function that does any auction-level initialization required | config, userConsent |
+|  getTargetingData  | function | optional | defines a function that provides ad server targeting data to RTD-core | adUnitArray, config, userConsent |
+|  getBidRequestData  | function | optional | defines a function that provides ad server targeting data to RTD-core | reqBidsConfigObj, callback, config, userConsent  |
+|  onAuctionInitEvent | function | optional | listens to the AUCTION_INIT event and calls a sub-module function that lets it inspect and/or update the auction | auctionDetails, config, userConsent |
+|  onAuctionEndEvent | function |optional | listens to the AUCTION_END event and calls a sub-module function that lets it know when auction is done | auctionDetails, config, userConsent |
+|  onBidResponseEvent | function |optional | listens to the BID_RESPONSE event and calls a sub-module function that lets it know when a bid response has been collected | bidResponse, config, userConsent |
+
+2. `getTargetingData` function (if defined) should return ad unit targeting data according to the following structure:
+```json
 {
   "adUnitCode":{
       "key":"value",
       "key2":"value"
   },
   "adUnitCode2":{
-      "dataKey":"dataValue",
+      "dataKey":"dataValue"
   }
 }
 ``` 
 
 3. Hook to Real Time Data module:
-```
+```javascript
 submodule('realTimeData', subModuleName);
 ```
+
+4. See detailed documentation [here](https://docs.prebid.org/dev-docs/add-rtd-submodule.html)
diff --git a/modules/rtdModule/realTimeData.md b/modules/rtdModule/realTimeData.md
deleted file mode 100644
index b2859098b1f..00000000000
--- a/modules/rtdModule/realTimeData.md
+++ /dev/null
@@ -1,32 +0,0 @@
-## Real Time Data Configuration Example 
-
-Example showing config using `browsi` sub module
-```
-    pbjs.setConfig({
-        "realTimeData": {
-            "auctionDelay": 1000,
-            dataProviders[{
-                "name": "browsi",
-                "params": {
-                    "url": "testUrl.com",
-                    "siteKey": "testKey",
-                    "pubKey": "testPub",
-                    "keyName":"bv"
-                }  
-            }]
-        }
-    });
-```    
-
-Example showing real time data object received form `browsi` real time data provider
-```
-{
-  "adUnitCode":{
-      "key":"value",
-      "key2":"value"
-  },
-  "adUnitCode2":{
-      "dataKey":"dataValue",
-  }
-}
-```   

From 1f24ee48c906fd446178659a830cb1fe9af49532 Mon Sep 17 00:00:00 2001
From: GeoEdge-r-and-d <72186958+GeoEdge-r-and-d@users.noreply.github.com>
Date: Tue, 24 Nov 2020 23:30:30 +0200
Subject: [PATCH 034/304] Add Geoedge RTD provider submodule (#5869)

* Add Geoedge RTD provider submodule

* Add Geoedge RTD provider submodule accroding to RTD phase 3
* Add tests
* Add docs
* Add integration example
* Add as child module of RTD for easier builds

* Update RTD submodule interface

See https://docs.prebid.org/dev-docs/add-rtd-submodule.html

* Update tests

* Update integration example

remove unnecessary param

* Update docs

* Update RTD submodule provider

* Remove getConfig
* Get params from init
* Use beforeInit

* Update docs

Extend and document the wap param

* Update tests

* Remove unused config module

* Update integreation example

Relevant opening and inline comments

* Update Geoedge RTD submodule provider

* Hardcode HTTPS scheme
* Rename to "donePreload" for clarity
* Use regex to replace macros instead of loop

* Update tests

Preload request scheme is now always HTTPS

* Remove integration example HTML page

As for @Fawke request at https://github.com/prebid/Prebid.js/pull/5869#issuecomment-732237482

Co-authored-by: daniel manan <mmndaniel@gmail.com>
Co-authored-by: bretg <bgorsline@gmail.com>
---
 modules/.submodules.json                     |   3 +-
 modules/geoedgeRtdProvider.js                | 213 +++++++++++++++++++
 modules/geoedgeRtdProvider.md                |  67 ++++++
 test/spec/modules/geoedgeRtdProvider_spec.js | 111 ++++++++++
 4 files changed, 393 insertions(+), 1 deletion(-)
 create mode 100644 modules/geoedgeRtdProvider.js
 create mode 100644 modules/geoedgeRtdProvider.md
 create mode 100644 test/spec/modules/geoedgeRtdProvider_spec.js

diff --git a/modules/.submodules.json b/modules/.submodules.json
index 53caf7a0671..36ead7df888 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -28,6 +28,7 @@
     "browsiRtdProvider",
     "haloRtdProvider",
     "jwplayerRtdProvider",
-    "reconciliationRtdProvider"
+    "reconciliationRtdProvider",
+    "geoedgeRtdProvider"
   ]
 }
diff --git a/modules/geoedgeRtdProvider.js b/modules/geoedgeRtdProvider.js
new file mode 100644
index 00000000000..001ef67b66a
--- /dev/null
+++ b/modules/geoedgeRtdProvider.js
@@ -0,0 +1,213 @@
+/**
+ * This module adds geoedge provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch creative wrapper from geoedge server
+ * The module will place geoedge RUM client on bid responses markup
+ * @module modules/geoedgeProvider
+ * @requires module:modules/realTimeData
+ */
+
+/**
+ * @typedef {Object} ModuleParams
+ * @property {string} key
+ * @property {?Object} bidders
+ * @property {?boolean} wap
+ * @property {?string} keyName
+ */
+
+import { submodule } from '../src/hook.js';
+import { ajax } from '../src/ajax.js';
+import { generateUUID, insertElement, isEmpty, logError } from '../src/utils.js';
+
+/** @type {string} */
+const SUBMODULE_NAME = 'geoedge';
+/** @type {string} */
+export const WRAPPER_URL = 'https://wrappers.geoedge.be/wrapper.html';
+/** @type {string} */
+/* eslint-disable no-template-curly-in-string */
+export const HTML_PLACEHOLDER = '${creative}';
+/** @type {string} */
+const PV_ID = generateUUID();
+/** @type {string} */
+const HOST_NAME = 'https://rumcdn.geoedge.be';
+/** @type {string} */
+const FILE_NAME = 'grumi.js';
+/** @type {function} */
+export let getClientUrl = (key) => `${HOST_NAME}/${key}/${FILE_NAME}`;
+/** @type {string} */
+export let wrapper
+/** @type {boolean} */;
+let wrapperReady;
+/** @type {boolean} */;
+let preloaded;
+
+/**
+ * fetches the creative wrapper
+ * @param {function} sucess - success callback
+ */
+export function fetchWrapper(success) {
+  if (wrapperReady) {
+    return success(wrapper);
+  }
+  ajax(WRAPPER_URL, success);
+}
+
+/**
+ * sets the wrapper and calls preload client
+ * @param {string} responseText
+ */
+export function setWrapper(responseText) {
+  wrapperReady = true;
+  wrapper = responseText;
+}
+
+/**
+ * preloads the client
+  * @param {string} key
+ */
+export function preloadClient(key) {
+  let link = document.createElement('link');
+  link.rel = 'preload';
+  link.as = 'script';
+  link.href = getClientUrl(key);
+  link.onload = () => { preloaded = true };
+  insertElement(link);
+}
+
+/**
+ * creates identity function for string replace without special replacement patterns
+ * @param {string} str
+ * @return {function}
+ */
+function replacer(str) {
+  return function () {
+    return str;
+  }
+}
+
+export function wrapHtml(wrapper, html) {
+  return wrapper.replace(HTML_PLACEHOLDER, replacer(html));
+}
+
+/**
+ * generate macros dictionary from bid response
+ * @param {Object} bid
+ * @param {string} key
+ * @return {Object}
+ */
+function getMacros(bid, key) {
+  return {
+    '${key}': key,
+    '%%ADUNIT%%': bid.adUnitCode,
+    '%%WIDTH%%': bid.width,
+    '%%HEIGHT%%': bid.height,
+    '%%PATTERN:hb_adid%%': bid.adId,
+    '%%PATTERN:hb_bidder%%': bid.bidderCode,
+    '%_isHb!': true,
+    '%_hbcid!': bid.creativeId || '',
+    '%%PATTERN:hb_pb%%': bid.pbHg,
+    '%%SITE%%': location.hostname,
+    '%_pimp%': PV_ID
+  };
+}
+
+/**
+ * replace macro placeholders in a string with values from a dictionary
+ * @param {string} wrapper
+ * @param {Object} macros
+ * @return {string}
+ */
+function replaceMacros(wrapper, macros) {
+  var re = new RegExp('\\' + Object.keys(macros).join('|'), 'gi');
+
+  return wrapper.replace(re, function(matched) {
+    return macros[matched];
+  });
+}
+
+/**
+ * build final creative html with creative wrapper
+ * @param {Object} bid
+ * @param {string} wrapper
+ * @param {string} html
+ * @return {string}
+ */
+function buildHtml(bid, wrapper, html, key) {
+  let macros = getMacros(bid, key);
+  wrapper = replaceMacros(wrapper, macros);
+  return wrapHtml(wrapper, html);
+}
+
+/**
+ * muatates the bid ad property
+ * @param {Object} bid
+ * @param {string} ad
+ */
+function mutateBid(bid, ad) {
+  bid.ad = ad;
+}
+
+/**
+ * wraps a bid object with the creative wrapper
+ * @param {Object} bid
+ * @param {string} key
+ */
+export function wrapBidResponse(bid, key) {
+  let wrapped = buildHtml(bid, wrapper, bid.ad, key);
+  mutateBid(bid, wrapped);
+}
+
+/**
+ * checks if bidder's bids should be monitored
+ * @param {string} bidder
+ * @return {boolean}
+ */
+function isSupportedBidder(bidder, paramsBidders) {
+  return isEmpty(paramsBidders) || paramsBidders[bidder] === true;
+}
+
+/**
+ * checks if bid should be monitored
+ * @param {Object} bid
+ * @return {boolean}
+ */
+function shouldWrap(bid, params) {
+  let supportedBidder = isSupportedBidder(bid.bidderCode, params.bidders);
+  let donePreload = params.wap ? preloaded : true;
+  return wrapperReady && supportedBidder && donePreload;
+}
+
+function conditionallyWrap(bidResponse, config, userConsent) {
+  let params = config.params;
+  if (shouldWrap(bidResponse, params)) {
+    wrapBidResponse(bidResponse, params.key);
+  }
+}
+
+function init(config, userConsent) {
+  let params = config.params;
+  if (!params || !params.key) {
+    logError('missing key for geoedge RTD module provider');
+    return false;
+  }
+  preloadClient(params.key);
+  return true;
+}
+
+/** @type {RtdSubmodule} */
+export const geoedgeSubmodule = {
+  /**
+     * used to link submodule with realTimeData
+     * @type {string}
+     */
+  name: SUBMODULE_NAME,
+  init,
+  onBidResponseEvent: conditionallyWrap
+};
+
+export function beforeInit() {
+  fetchWrapper(setWrapper);
+  submodule('realTimeData', geoedgeSubmodule);
+}
+
+beforeInit();
diff --git a/modules/geoedgeRtdProvider.md b/modules/geoedgeRtdProvider.md
new file mode 100644
index 00000000000..e4aa046a97d
--- /dev/null
+++ b/modules/geoedgeRtdProvider.md
@@ -0,0 +1,67 @@
+## Overview
+
+Module Name: Geoedge Rtd provider
+Module Type: Rtd Provider
+Maintainer: guy.books@geoedge.com
+
+The Geoedge Realtime module let pusblishers to block bad ads such as automatic redirects, malware, offensive creatives and landing pages.
+To use this module, you'll need to work with [Geoedge](https://www.geoedge.com/publishers-real-time-protection/) to get an account and cutomer key.
+
+## Integration
+
+1) Build the geoedge RTD module into the Prebid.js package with:
+
+```
+gulp build --modules=geoedgeRtdProvider,...
+```
+
+2) Use `setConfig` to instruct Prebid.js to initilize the geoedge module, as specified below.
+
+## Configuration
+
+This module is configured as part of the `realTimeData.dataProviders` object:
+
+```javascript
+pbjs.setConfig({
+    realTimeData: {
+        dataProviders: [{
+            name: 'geoedge',
+            params: {
+                key: '123123', 
+                bidders: {
+                    'bidderA': true, // monitor bids form this bidder
+                    'bidderB': false // do not monitor bids form this bidder.
+                },
+                wap: true
+            }
+        }]
+    }
+});
+```
+
+Parameters details:
+
+{: .table .table-bordered .table-striped }
+|Name |Type |Description |Notes |
+| :------------ | :------------ | :------------ |:------------ |
+|name | String | Real time data module name |Required, always 'geoedge' |
+|params | Object | | |
+|params.key | String | Customer key |Required, contact Geoedge to get your key |
+|params.bidders | Object | Bidders to monitor |Optional, list of bidder to include / exclude from monitoring. Omitting this will monitor bids from all bidders. |
+|params.wap |Boolean |Wrap after preload |Optional, defaults to `false`. Set to `true` if you want to monitor only after the module has preloaded the monitoring client. |
+
+## Example
+
+To view an integration example:
+ 
+1) in your cli run:
+
+```
+gulp serve --modules=appnexusBidAdapter,geoedgeRtdProvider
+```
+
+2) in your browser, navigate to:
+
+```
+http://localhost:9999/integrationExamples/gpt/geoedgeRtdProvider_example.html
+```
diff --git a/test/spec/modules/geoedgeRtdProvider_spec.js b/test/spec/modules/geoedgeRtdProvider_spec.js
new file mode 100644
index 00000000000..cf4e0b53fde
--- /dev/null
+++ b/test/spec/modules/geoedgeRtdProvider_spec.js
@@ -0,0 +1,111 @@
+import * as utils from '../../../src/utils.js';
+import * as hook from '../../../src/hook.js'
+import { beforeInit, geoedgeSubmodule, setWrapper, wrapper, htmlPlaceholder, WRAPPER_URL, getClientUrl } from '../../../modules/geoedgeRtdProvider.js';
+import { server } from '../../../test/mocks/xhr.js';
+
+let key = '123123123';
+function makeConfig() {
+  return {
+    name: 'geoedge',
+    params: {
+      wap: false,
+      key: key,
+      bidders: {
+        bidderA: true,
+        bidderB: false
+      }
+    }
+  };
+}
+
+function mockBid(bidderCode) {
+  return {
+    'ad': '<creative/>',
+    'cpm': '1.00',
+    'width': 300,
+    'height': 250,
+    'bidderCode': bidderCode,
+    'requestId': utils.getUniqueIdentifierStr(),
+    'creativeId': 'id',
+    'currency': 'USD',
+    'netRevenue': true,
+    'ttl': 360
+  };
+}
+
+let mockWrapper = `<wrapper>${htmlPlaceholder}</wrapper>`;
+
+describe('Geoedge RTD module', function () {
+  describe('beforeInit', function () {
+    let submoduleStub;
+
+    before(function () {
+      submoduleStub = sinon.stub(hook, 'submodule');
+    });
+    after(function () {
+      submoduleStub.restore();
+    });
+    it('should fetch the wrapper', function () {
+      beforeInit();
+      let request = server.requests[0];
+      let isWrapperRequest = request && request.url && request.url && request.url === WRAPPER_URL;
+      expect(isWrapperRequest).to.equal(true);
+    });
+    it('should register RTD submodule provider', function () {
+      expect(submoduleStub.calledWith('realTimeData', geoedgeSubmodule)).to.equal(true);
+    });
+  });
+  describe('setWrapper', function () {
+    it('should set the wrapper', function () {
+      setWrapper(mockWrapper);
+      expect(wrapper).to.equal(mockWrapper);
+    });
+  });
+  describe('submodule', function () {
+    describe('name', function () {
+      it('should be geoedge', function () {
+        expect(geoedgeSubmodule.name).to.equal('geoedge');
+      });
+    });
+    describe('init', function () {
+      let insertElementStub;
+
+      before(function () {
+        insertElementStub = sinon.stub(utils, 'insertElement');
+      });
+      after(function () {
+        utils.insertElement.restore();
+      });
+      it('should return false when missing params or key', function () {
+        let missingParams = geoedgeSubmodule.init({});
+        let missingKey = geoedgeSubmodule.init({ params: {} });
+        expect(missingParams || missingKey).to.equal(false);
+      });
+      it('should return true when params are ok', function () {
+        expect(geoedgeSubmodule.init(makeConfig())).to.equal(true);
+      });
+      it('should preload the client', function () {
+        let isLinkPreloadAsScript = arg => arg.tagName === 'LINK' && arg.rel === 'preload' && arg.as === 'script' && arg.href === getClientUrl(key);
+        expect(insertElementStub.calledWith(sinon.match(isLinkPreloadAsScript))).to.equal(true);
+      });
+    });
+    describe('onBidResponseEvent', function () {
+      let bidFromA = mockBid('bidderA');
+      it('should wrap bid html when bidder is configured', function () {
+        geoedgeSubmodule.onBidResponseEvent(bidFromA, makeConfig());
+        expect(bidFromA.ad.indexOf('<wrapper>')).to.equal(0);
+      });
+      it('should not wrap bid html when bidder is not configured', function () {
+        let bidFromB = mockBid('bidderB');
+        geoedgeSubmodule.onBidResponseEvent(bidFromB, makeConfig());
+        expect(bidFromB.ad.indexOf('<wrapper>')).to.equal(-1);
+      });
+      it('should only muatate the bid ad porperty', function () {
+        let copy = Object.assign({}, bidFromA);
+        delete copy.ad;
+        let equalsOriginal = Object.keys(copy).every(key => copy[key] === bidFromA[key]);
+        expect(equalsOriginal).to.equal(true);
+      });
+    });
+  });
+});

From 678ffdfd69a666570dab4738c8b665b686a16458 Mon Sep 17 00:00:00 2001
From: wojciech-bialy-wpm
 <67895844+wojciech-bialy-wpm@users.noreply.github.com>
Date: Wed, 25 Nov 2020 05:41:17 +0100
Subject: [PATCH 035/304] sspBC adapter: update to v4.6 (notifications, user
 sync) (#5941)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update adapter to v4.6
- add notification endpoint
- send bidWon and onTimeout notifications
- send CMP version to user sync endpoint

Co-authored-by: Wojciech Biały <wb@WojciechBialy.local>
---
 modules/sspBCAdapter.js                | 51 +++++++++++++++++--
 test/spec/modules/sspBCAdapter_spec.js | 70 +++++++++++++++++++++++++-
 2 files changed, 116 insertions(+), 5 deletions(-)

diff --git a/modules/sspBCAdapter.js b/modules/sspBCAdapter.js
index ef89fb08449..4069c722e9d 100644
--- a/modules/sspBCAdapter.js
+++ b/modules/sspBCAdapter.js
@@ -1,14 +1,17 @@
 import * as utils from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'sspBC';
 const BIDDER_URL = 'https://ssp.wp.pl/bidder/';
 const SYNC_URL = 'https://ssp.wp.pl/bidder/usersync';
+const NOTIFY_URL = 'https://ssp.wp.pl/bidder/notify';
 const TMAX = 450;
-const BIDDER_VERSION = '4.5';
+const BIDDER_VERSION = '4.6';
 const W = window;
 const { navigator } = W;
+var consentApiVersion;
 
 const cookieSupport = () => {
   const isSafari = /^((?!chrome|android|crios|fxios).)*safari/i.test(navigator.userAgent);
@@ -53,6 +56,7 @@ const applyClientHints = ortbRequest => {
 
 function applyGdpr(bidderRequest, ortbRequest) {
   if (bidderRequest && bidderRequest.gdprConsent) {
+    consentApiVersion = bidderRequest.gdprConsent.apiVersion;
     ortbRequest.regs = Object.assign(ortbRequest.regs, { '[ortb_extensions.gdpr]': bidderRequest.gdprConsent.gdprApplies ? 1 : 0 });
     ortbRequest.user = Object.assign(ortbRequest.user, { '[ortb_extensions.consent]': bidderRequest.gdprConsent.consentString });
   }
@@ -68,6 +72,14 @@ function setOnAny(collection, key) {
   }
 }
 
+function sendNotification(payload) {
+  ajax(NOTIFY_URL, null, JSON.stringify(payload), {
+    withCredentials: false,
+    method: 'POST',
+    crossOrigin: true
+  });
+}
+
 /**
  * @param {object} slot Ad Unit Params by Prebid
  * @returns {object} Banner by OpenRTB 2.5 §3.2.6
@@ -278,6 +290,7 @@ const spec = {
               mediaType: 'banner',
               meta: {
                 advertiserDomains: serverBid.adomain,
+                networkName: seat,
               },
               netRevenue: true,
               ad: renderCreative(site, response.id, serverBid, seat, request.bidderRequest),
@@ -303,12 +316,44 @@ const spec = {
     if (syncOptions.iframeEnabled) {
       return [{
         type: 'iframe',
-        url: SYNC_URL,
+        url: SYNC_URL + '?tcf=' + consentApiVersion,
       }];
     }
     utils.logWarn('sspBC adapter requires iframe based user sync.');
   },
-  onTimeout() {
+
+  onTimeout(timeoutData) {
+    var adSlots = [];
+    const bid = timeoutData && timeoutData[0];
+    if (bid) {
+      timeoutData.forEach(bid => { adSlots.push(bid.params[0] && bid.params[0].id) })
+      const payload = {
+        event: 'timeout',
+        requestId: bid.auctionId,
+        siteId: bid.params ? [bid.params[0].siteId] : [],
+        slotId: adSlots,
+        timeout: bid.timeout,
+      }
+      sendNotification(payload);
+      return payload;
+    }
+  },
+
+  onBidWon(bid) {
+    if (bid && bid.auctionId) {
+      const payload = {
+        event: 'bidWon',
+        requestId: bid.auctionId,
+        siteId: bid.params ? [bid.params[0].siteId] : [],
+        slotId: bid.params ? [bid.params[0].id] : [],
+        cpm: bid.cpm,
+        creativeId: bid.creativeId,
+        adomain: (bid.meta && bid.meta.advertiserDomains) ? bid.meta.advertiserDomains[0] : '',
+        networkName: (bid.meta && bid.meta.networkName) ? bid.meta.networkName : '',
+      }
+      sendNotification(payload);
+      return payload;
+    }
   },
 };
 
diff --git a/test/spec/modules/sspBCAdapter_spec.js b/test/spec/modules/sspBCAdapter_spec.js
index 2cb0e8defa4..29718deb031 100644
--- a/test/spec/modules/sspBCAdapter_spec.js
+++ b/test/spec/modules/sspBCAdapter_spec.js
@@ -1,6 +1,8 @@
 import { assert, expect } from 'chai';
 import { spec } from 'modules/sspBCAdapter.js';
 import * as utils from 'src/utils.js';
+import * as sinon from 'sinon';
+import * as ajax from 'src/ajax.js';
 
 const BIDDER_CODE = 'sspBC';
 const BIDDER_URL = 'https://ssp.wp.pl/bidder/';
@@ -60,10 +62,33 @@ describe('SSPBC adapter', function () {
       },
       auctionId,
       bidderRequestId,
-      bidId: auctionId + '1',
+      bidId: auctionId + '2',
       transactionId,
     }
     ];
+    const bids_timeouted = [{
+      adUnitCode: 'test_wideboard',
+      bidder: BIDDER_CODE,
+      params: [{
+        id: '003',
+        siteId: '8816',
+      }],
+      auctionId,
+      bidId: auctionId + '1',
+      timeout: 100,
+    },
+    {
+      adUnitCode: 'test_rectangle',
+      bidder: BIDDER_CODE,
+      params: [{
+        id: '005',
+        siteId: '8816',
+      }],
+      auctionId,
+      bidId: auctionId + '2',
+      timeout: 100,
+    }
+    ];
     const bids_test = [{
       adUnitCode: 'test_wideboard',
       bidder: BIDDER_CODE,
@@ -209,6 +234,7 @@ describe('SSPBC adapter', function () {
     return {
       bids,
       bids_test,
+      bids_timeouted,
       bidRequest,
       bidRequestSingle,
       bidRequestTest,
@@ -323,7 +349,7 @@ describe('SSPBC adapter', function () {
 
     it('should provide correct url, if frame sync is allowed', function () {
       expect(syncResultAll).to.have.length(1);
-      expect(syncResultAll[0].url).to.be.equal(SYNC_URL);
+      expect(syncResultAll[0].url).to.have.string(SYNC_URL);
     });
 
     it('should send no syncs, if frame sync is not allowed', function () {
@@ -331,4 +357,44 @@ describe('SSPBC adapter', function () {
       expect(syncResultNone).to.be.undefined;
     });
   });
+
+  describe('onBidWon', function () {
+    it('should generate no notification if bid is undefined', function () {
+      let notificationPayload = spec.onBidWon();
+      expect(notificationPayload).to.be.undefined;
+    });
+
+    it('should generate notification with event name and request/site/slot data, if correct bid is provided', function () {
+      const { bids } = prepareTestData();
+      let bid = bids[0];
+      bid.params = [bid.params];
+
+      let notificationPayload = spec.onBidWon(bid);
+      expect(notificationPayload).to.have.property('event').that.equals('bidWon');
+      expect(notificationPayload).to.have.property('requestId').that.equals(bid.auctionId);
+      expect(notificationPayload).to.have.property('siteId').that.deep.equals([bid.params[0].siteId]);
+      expect(notificationPayload).to.have.property('slotId').that.deep.equals([bid.params[0].id]);
+    });
+  });
+
+  describe('onTimeout', function () {
+    it('should generate no notification if timeout data is undefined / has no bids', function () {
+      let notificationPayloadUndefined = spec.onTimeout();
+      let notificationPayloadNoBids = spec.onTimeout([]);
+
+      expect(notificationPayloadUndefined).to.be.undefined;
+      expect(notificationPayloadNoBids).to.be.undefined;
+    });
+
+    it('should generate single notification for any number of timeouted bids', function () {
+      const { bids_timeouted } = prepareTestData();
+
+      let notificationPayload = spec.onTimeout(bids_timeouted);
+
+      expect(notificationPayload).to.have.property('event').that.equals('timeout');
+      expect(notificationPayload).to.have.property('requestId').that.equals(bids_timeouted[0].auctionId);
+      expect(notificationPayload).to.have.property('siteId').that.deep.equals([bids_timeouted[0].params[0].siteId]);
+      expect(notificationPayload).to.have.property('slotId').that.deep.equals([bids_timeouted[0].params[0].id, bids_timeouted[1].params[0].id]);
+    });
+  });
 });

From 99fe1a77fa2b693517ecb139c7a40d0291c88e0b Mon Sep 17 00:00:00 2001
From: Neelanjan Sen <14229985+Fawke@users.noreply.github.com>
Date: Wed, 25 Nov 2020 16:17:40 +0530
Subject: [PATCH 036/304] Appnexus - Send CriteoId in eids array. (#6025)

* send criteo id in eids array

* remove a line space
---
 modules/appnexusBidAdapter.js                | 6 +++++-
 test/spec/modules/appnexusBidAdapter_spec.js | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index ff0e3230007..f714472bbb1 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -229,16 +229,20 @@ export const spec = {
     }
 
     const criteoId = utils.deepAccess(bidRequests[0], `userId.criteoId`);
+    let eids = [];
     if (criteoId) {
       let tpuids = [];
       tpuids.push({
         'provider': 'criteo',
         'user_id': criteoId
       });
+      eids.push({
+        source: 'criteo.com',
+        id: criteoId
+      });
       payload.tpuids = tpuids;
     }
 
-    let eids = [];
     const tdid = utils.deepAccess(bidRequests[0], `userId.tdid`);
     if (tdid) {
       eids.push({
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index 4102896ba94..21d3da358be 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -824,6 +824,11 @@ describe('AppNexusAdapter', function () {
         rti_partner: 'TDID'
       });
 
+      expect(payload.eids).to.deep.include({
+        source: 'criteo.com',
+        id: 'sample-criteo-userid',
+      });
+
       expect(payload.tpuids).to.deep.include({
         provider: 'criteo',
         user_id: 'sample-criteo-userid',

From e202cf5ad7ff39b0fa221908c8abdb31d2115847 Mon Sep 17 00:00:00 2001
From: Tucker <72400387+MenelikTucker-districtm@users.noreply.github.com>
Date: Wed, 25 Nov 2020 08:21:39 -0500
Subject: [PATCH 037/304] allow users to be sent to dmx even when gdpr is
 configured in prebid (#6027)

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

diff --git a/modules/districtmDMXBidAdapter.js b/modules/districtmDMXBidAdapter.js
index a7bcead5f0b..845cff460ee 100644
--- a/modules/districtmDMXBidAdapter.js
+++ b/modules/districtmDMXBidAdapter.js
@@ -128,9 +128,12 @@ export const spec = {
       dmxRequest.regs = {};
       dmxRequest.regs.ext = {};
       dmxRequest.regs.ext.gdpr = bidderRequest.gdprConsent.gdprApplies === true ? 1 : 0;
-      dmxRequest.user = {};
-      dmxRequest.user.ext = {};
-      dmxRequest.user.ext.consent = bidderRequest.gdprConsent.consentString;
+
+      if (bidderRequest.gdprConsent.gdprApplies === true) {
+        dmxRequest.user = {};
+        dmxRequest.user.ext = {};
+        dmxRequest.user.ext.consent = bidderRequest.gdprConsent.consentString;
+      }
     }
     dmxRequest.regs = dmxRequest.regs || {};
     dmxRequest.regs.coppa = config.getConfig('coppa') === true ? 1 : 0;

From 1137a64c508827d952a384975462b38d269cb46a Mon Sep 17 00:00:00 2001
From: Galphimbl <sashatkachov91@gmail.com>
Date: Wed, 25 Nov 2020 15:40:04 +0200
Subject: [PATCH 038/304] Admixer adapter update - add user syncs (#6024)

* Migrating to Prebid 1.0

* Migrating to Prebid 1.0

* Fix spec

* add gdpr and usp

* remove changes in gdpr_hello_world.html

* Update gdpr_hello_world.html

add spaces

* add user syncs

* remove comments

* tests

Co-authored-by: atkachov <atkachov91@admixer.ua>
---
 modules/admixerBidAdapter.js                | 20 ++++--
 test/spec/modules/admixerBidAdapter_spec.js | 76 +++++++++++++++------
 2 files changed, 70 insertions(+), 26 deletions(-)

diff --git a/modules/admixerBidAdapter.js b/modules/admixerBidAdapter.js
index b2f24cfa910..3bb392538ff 100644
--- a/modules/admixerBidAdapter.js
+++ b/modules/admixerBidAdapter.js
@@ -3,7 +3,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 
 const BIDDER_CODE = 'admixer';
 const ALIASES = ['go2net'];
-const ENDPOINT_URL = 'https://inv-nets.admixer.net/prebid.1.0.aspx';
+const ENDPOINT_URL = 'https://inv-nets.admixer.net/prebid.1.1.aspx';
 export const spec = {
   code: BIDDER_CODE,
   aliases: ALIASES,
@@ -51,10 +51,9 @@ export const spec = {
    */
   interpretResponse: function (serverResponse, bidRequest) {
     const bidResponses = [];
-    // loop through serverResponses {
     try {
-      serverResponse = serverResponse.body;
-      serverResponse.forEach((bidResponse) => {
+      const {body: {ads = []} = {}} = serverResponse;
+      ads.forEach((bidResponse) => {
         const bidResp = {
           requestId: bidResponse.bidId,
           cpm: bidResponse.cpm,
@@ -73,6 +72,19 @@ export const spec = {
       utils.logError(e);
     }
     return bidResponses;
+  },
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent) {
+    const pixels = [];
+    serverResponses.forEach(({body: {cm = {}} = {}}) => {
+      const {pixels: img = [], iframes: frm = []} = cm;
+      if (syncOptions.pixelEnabled) {
+        img.forEach((url) => pixels.push({type: 'image', url}));
+      }
+      if (syncOptions.iframeEnabled) {
+        frm.forEach((url) => pixels.push({type: 'iframe', url}));
+      }
+    });
+    return pixels;
   }
 };
 registerBidder(spec);
diff --git a/test/spec/modules/admixerBidAdapter_spec.js b/test/spec/modules/admixerBidAdapter_spec.js
index 6d2e3059dc8..6298eac4448 100644
--- a/test/spec/modules/admixerBidAdapter_spec.js
+++ b/test/spec/modules/admixerBidAdapter_spec.js
@@ -3,7 +3,7 @@ import {spec} from 'modules/admixerBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
 
 const BIDDER_CODE = 'admixer';
-const ENDPOINT_URL = 'https://inv-nets.admixer.net/prebid.1.0.aspx';
+const ENDPOINT_URL = 'https://inv-nets.admixer.net/prebid.1.1.aspx';
 const ZONE_ID = '2eb6bd58-865c-47ce-af7f-a918108c3fd2';
 
 describe('AdmixerAdapter', function () {
@@ -78,33 +78,35 @@ describe('AdmixerAdapter', function () {
 
   describe('interpretResponse', function () {
     let response = {
-      body: [{
-        'currency': 'USD',
-        'cpm': 6.210000,
-        'ad': '<div>ad</div>',
-        'width': 300,
-        'height': 600,
-        'creativeId': 'ccca3e5e-0c54-4761-9667-771322fbdffc',
-        'ttl': 360,
-        'netRevenue': false,
-        'bidId': '5e4e763b6bc60b'
-      }]
+      body: {
+        ads: [{
+          'currency': 'USD',
+          'cpm': 6.210000,
+          'ad': '<div>ad</div>',
+          'width': 300,
+          'height': 600,
+          'creativeId': 'ccca3e5e-0c54-4761-9667-771322fbdffc',
+          'ttl': 360,
+          'netRevenue': false,
+          'bidId': '5e4e763b6bc60b'
+        }]
+      }
     };
 
     it('should get correct bid response', function () {
-      const body = response.body;
+      const ads = response.body.ads;
       let expectedResponse = [
         {
-          'requestId': body[0].bidId,
-          'cpm': body[0].cpm,
-          'creativeId': body[0].creativeId,
-          'width': body[0].width,
-          'height': body[0].height,
-          'ad': body[0].ad,
+          'requestId': ads[0].bidId,
+          'cpm': ads[0].cpm,
+          'creativeId': ads[0].creativeId,
+          'width': ads[0].width,
+          'height': ads[0].height,
+          'ad': ads[0].ad,
           'vastUrl': undefined,
-          'currency': body[0].currency,
-          'netRevenue': body[0].netRevenue,
-          'ttl': body[0].ttl,
+          'currency': ads[0].currency,
+          'netRevenue': ads[0].netRevenue,
+          'ttl': ads[0].ttl,
         }
       ];
 
@@ -119,4 +121,34 @@ describe('AdmixerAdapter', function () {
       expect(result.length).to.equal(0);
     });
   });
+
+  describe('getUserSyncs', function () {
+    let imgUrl = 'https://example.com/img1';
+    let frmUrl = 'https://example.com/frm2';
+    let responses = [{
+      body: {
+        cm: {
+          pixels: [
+            imgUrl
+          ],
+          iframes: [
+            frmUrl
+          ],
+        }
+      }
+    }];
+
+    it('Returns valid values', function () {
+      let userSyncAll = spec.getUserSyncs({pixelEnabled: true, iframeEnabled: true}, responses);
+      let userSyncImg = spec.getUserSyncs({pixelEnabled: true, iframeEnabled: false}, responses);
+      let userSyncFrm = spec.getUserSyncs({pixelEnabled: false, iframeEnabled: true}, responses);
+      expect(userSyncAll).to.be.an('array').with.lengthOf(2);
+      expect(userSyncImg).to.be.an('array').with.lengthOf(1);
+      expect(userSyncImg[0].url).to.be.equal(imgUrl);
+      expect(userSyncImg[0].type).to.be.equal('image');
+      expect(userSyncFrm).to.be.an('array').with.lengthOf(1);
+      expect(userSyncFrm[0].url).to.be.equal(frmUrl);
+      expect(userSyncFrm[0].type).to.be.equal('iframe');
+    });
+  });
 });

From 939c455a469703f0c98d021fd70d3b851ae69ba7 Mon Sep 17 00:00:00 2001
From: Olivier <osazos@adagio.io>
Date: Wed, 25 Nov 2020 16:41:39 +0100
Subject: [PATCH 039/304] Add support for `backupOnly` option in mediaType
 video renderer (#5972)

* Add support for `backupOnly` option in mediaType video renderer

* Improve readability
---
 src/Renderer.js                  | 18 +++++++++++++++++-
 src/auction.js                   |  6 +++---
 test/spec/auctionmanager_spec.js | 32 ++++++++++++++++++++++++++++++++
 test/spec/renderer_spec.js       | 30 ++++++++++++++++++++++++++++++
 4 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/src/Renderer.js b/src/Renderer.js
index f073d97d052..7cedf278537 100644
--- a/src/Renderer.js
+++ b/src/Renderer.js
@@ -115,5 +115,21 @@ function isRendererPreferredFromAdUnit(adUnitCode) {
   const adUnit = find(adUnits, adUnit => {
     return adUnit.code === adUnitCode;
   });
-  return !!(adUnit && adUnit.renderer && adUnit.renderer.url && adUnit.renderer.render && !(utils.isBoolean(adUnit.renderer.backupOnly) && adUnit.renderer.backupOnly));
+
+  if (!adUnit) {
+    return false
+  }
+
+  // renderer defined at adUnit level
+  const adUnitRenderer = utils.deepAccess(adUnit, 'renderer');
+  const hasValidAdUnitRenderer = !!(adUnitRenderer && adUnitRenderer.url && adUnitRenderer.render);
+
+  // renderer defined at adUnit.mediaTypes level
+  const mediaTypeRenderer = utils.deepAccess(adUnit, 'mediaTypes.video.renderer');
+  const hasValidMediaTypeRenderer = !!(mediaTypeRenderer && mediaTypeRenderer.url && mediaTypeRenderer.render)
+
+  return !!(
+    (hasValidAdUnitRenderer && !(adUnitRenderer.backupOnly === true)) ||
+    (hasValidMediaTypeRenderer && !(mediaTypeRenderer.backupOnly === true))
+  );
 }
diff --git a/src/auction.js b/src/auction.js
index 6285bfdd905..c94e3adc9a7 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -57,7 +57,7 @@
  * @property {function(): void} callBids - sends requests to all adapters for bids
  */
 
-import {flatten, timestamp, adUnitsFilter, deepAccess, getBidRequest, getValue, parseUrl, isBoolean} from './utils.js';
+import {flatten, timestamp, adUnitsFilter, deepAccess, getBidRequest, getValue, parseUrl} from './utils.js';
 import { getPriceBucketString } from './cpmBucketManager.js';
 import { getNativeTargeting } from './native.js';
 import { getCacheUrl, store } from './videoCache.js';
@@ -533,9 +533,9 @@ function getPreparedBidForAuction({adUnitCode, bid, bidderRequest, auctionId}) {
   var renderer = null;
 
   // the renderer for the mediaType takes precendence
-  if (mediaTypeRenderer && mediaTypeRenderer.url && mediaTypeRenderer.render) {
+  if (mediaTypeRenderer && mediaTypeRenderer.url && !(mediaTypeRenderer.backupOnly === true && mediaTypeRenderer.render)) {
     renderer = mediaTypeRenderer;
-  } else if (adUnitRenderer && adUnitRenderer.url && !(adUnitRenderer.backupOnly && isBoolean(adUnitRenderer.backupOnly) && bid.renderer)) {
+  } else if (adUnitRenderer && adUnitRenderer.url && !(adUnitRenderer.backupOnly === true && bid.renderer)) {
     renderer = adUnitRenderer;
   }
 
diff --git a/test/spec/auctionmanager_spec.js b/test/spec/auctionmanager_spec.js
index d880ff0eaee..a50eba5e585 100644
--- a/test/spec/auctionmanager_spec.js
+++ b/test/spec/auctionmanager_spec.js
@@ -793,6 +793,38 @@ describe('auctionmanager.js', function () {
         assert.equal(addedBid.renderer.url, renderer.url);
       });
 
+      it('installs bidder-defined renderer when onlyBackup is true in mediaTypes.video options ', function () {
+        const renderer = {
+          url: 'videoRenderer.js',
+          backupOnly: true,
+          render: (bid) => bid
+        };
+        let myBid = mockBid();
+        let bidRequest = mockBidRequest(myBid);
+
+        bidRequest.bids[0] = {
+          ...bidRequest.bids[0],
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              renderer
+            }
+          }
+        };
+        makeRequestsStub.returns([bidRequest]);
+
+        myBid.mediaType = 'video';
+        myBid.renderer = {
+          url: 'renderer.js',
+          render: sinon.spy()
+        };
+        spec.interpretResponse.returns(myBid);
+        auction.callBids();
+
+        const addedBid = auction.getBidsReceived().pop();
+        assert.strictEqual(addedBid.renderer.url, myBid.renderer.url);
+      });
+
       it('bid for a regular unit and a video unit', function() {
         let renderer = {
           url: 'renderer.js',
diff --git a/test/spec/renderer_spec.js b/test/spec/renderer_spec.js
index 9bf551f35e8..dcca94396cd 100644
--- a/test/spec/renderer_spec.js
+++ b/test/spec/renderer_spec.js
@@ -155,6 +155,36 @@ describe('Renderer', function () {
       expect(loadExternalScript.called).to.be.true;
     });
 
+    it('should load external script instead of publisher-defined one when backupOnly option is true in mediaTypes.video options', function() {
+      $$PREBID_GLOBAL$$.adUnits = [{
+        code: 'video1',
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            mimes: ['video/mp4'],
+            playerSize: [[400, 300]],
+            renderer: {
+              url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+              backupOnly: true,
+              render: sinon.spy()
+            },
+          }
+        }
+      }]
+
+      let testRenderer = Renderer.install({
+        url: 'https://httpbin.org/post',
+        config: { test: 'config1' },
+        id: 1,
+        adUnitCode: 'video1'
+
+      });
+      testRenderer.setRender(() => {})
+
+      testRenderer.render()
+      expect(loadExternalScript.called).to.be.true;
+    });
+
     it('should call loadExternalScript() for script not defined on adUnit, only when .render() is called', function() {
       $$PREBID_GLOBAL$$.adUnits = [{
         code: 'video1',

From 18086e44fd33e921ef6ffe7ac8552d55c650fc35 Mon Sep 17 00:00:00 2001
From: mobfxoHB <74364234+mobfxoHB@users.noreply.github.com>
Date: Mon, 30 Nov 2020 19:24:12 +0200
Subject: [PATCH 040/304] New mobfox prebid adapter (#5978)

New mobfox prebid adapter
---
 modules/mobfoxpbBidAdapter.js                |  99 ++++++
 modules/mobfoxpbBidAdapter.md                |  72 +++++
 test/spec/modules/mobfoxpbBidAdapter_spec.js | 304 +++++++++++++++++++
 3 files changed, 475 insertions(+)
 create mode 100644 modules/mobfoxpbBidAdapter.js
 create mode 100644 modules/mobfoxpbBidAdapter.md
 create mode 100644 test/spec/modules/mobfoxpbBidAdapter_spec.js

diff --git a/modules/mobfoxpbBidAdapter.js b/modules/mobfoxpbBidAdapter.js
new file mode 100644
index 00000000000..c7e96b95179
--- /dev/null
+++ b/modules/mobfoxpbBidAdapter.js
@@ -0,0 +1,99 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+
+const BIDDER_CODE = 'mobfoxpb';
+const AD_URL = 'https://bes.mobfox.com/?c=o&m=multi';
+
+function isBidResponseValid(bid) {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
+    !bid.ttl || !bid.currency) {
+    return false;
+  }
+  switch (bid.mediaType) {
+    case BANNER:
+      return Boolean(bid.width && bid.height && bid.ad);
+    case VIDEO:
+      return Boolean(bid.vastUrl);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers);
+    default:
+      return false;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: (bid) => {
+    return Boolean(bid.bidId && bid.params && !isNaN(parseInt(bid.params.placementId)));
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest) => {
+    const winTop = utils.getWindowTop();
+    const location = winTop.location;
+    const placements = [];
+    const request = {
+      'deviceWidth': winTop.screen.width,
+      'deviceHeight': winTop.screen.height,
+      'language': (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
+      'secure': 1,
+      'host': location.host,
+      'page': location.pathname,
+      'placements': placements
+    };
+
+    if (bidderRequest) {
+      if (bidderRequest.uspConsent) {
+        request.ccpa = bidderRequest.uspConsent;
+      }
+      if (bidderRequest.gdprConsent) {
+        request.gdpr = bidderRequest.gdprConsent
+      }
+    }
+
+    const len = validBidRequests.length;
+    for (let i = 0; i < len; i++) {
+      const bid = validBidRequests[i];
+      const placement = {
+        placementId: bid.params.placementId,
+        bidId: bid.bidId,
+        schain: bid.schain || {},
+      };
+      const mediaType = bid.mediaTypes
+
+      if (mediaType && mediaType[BANNER] && mediaType[BANNER].sizes) {
+        placement.sizes = mediaType[BANNER].sizes;
+        placement.traffic = BANNER;
+      } else if (mediaType && mediaType[VIDEO] && mediaType[VIDEO].playerSize) {
+        placement.wPlayer = mediaType[VIDEO].playerSize[0];
+        placement.hPlayer = mediaType[VIDEO].playerSize[1];
+        placement.traffic = VIDEO;
+      } else if (mediaType && mediaType[NATIVE]) {
+        placement.native = mediaType[NATIVE];
+        placement.traffic = NATIVE;
+      }
+      placements.push(placement);
+    }
+
+    return {
+      method: 'POST',
+      url: AD_URL,
+      data: request
+    };
+  },
+
+  interpretResponse: (serverResponse) => {
+    let response = [];
+    for (let i = 0; i < serverResponse.body.length; i++) {
+      let resItem = serverResponse.body[i];
+      if (isBidResponseValid(resItem)) {
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/mobfoxpbBidAdapter.md b/modules/mobfoxpbBidAdapter.md
new file mode 100644
index 00000000000..6eb549919d7
--- /dev/null
+++ b/modules/mobfoxpbBidAdapter.md
@@ -0,0 +1,72 @@
+# Overview
+
+```
+Module Name: mobfox Bidder Adapter
+Module Type: mobfox Bidder Adapter
+Maintainer: platform@mobfox.com
+```
+
+# Description
+
+Module that connects to mobfox demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+                {
+                    code:'1',
+                    mediaTypes:{
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'mobfoxpb',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        video: {
+                            playerSize: [640, 480],
+                            context: 'instream'
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'mobfoxpb',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'mobfoxpb',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/test/spec/modules/mobfoxpbBidAdapter_spec.js b/test/spec/modules/mobfoxpbBidAdapter_spec.js
new file mode 100644
index 00000000000..a02d580ab88
--- /dev/null
+++ b/test/spec/modules/mobfoxpbBidAdapter_spec.js
@@ -0,0 +1,304 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/mobfoxpbBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+
+describe('MobfoxHBBidAdapter', function () {
+  const bid = {
+    bidId: '23fhj33i987f',
+    bidder: 'mobfoxpb',
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+      placementId: 783,
+      traffic: BANNER
+    }
+  };
+
+  const bidderRequest = {
+    refererInfo: {
+      referer: 'test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      delete bid.params.placementId;
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests([bid], bidderRequest);
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://bes.mobfox.com/?c=o&m=multi');
+    });
+    it('Returns valid data if array of bids is valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements');
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.gdpr).to.not.exist;
+      expect(data.ccpa).to.not.exist;
+      let placement = data['placements'][0];
+      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'sizes', 'schain');
+      expect(placement.placementId).to.equal(783);
+      expect(placement.bidId).to.equal('23fhj33i987f');
+      expect(placement.traffic).to.equal(BANNER);
+      expect(placement.schain).to.be.an('object');
+      expect(placement.sizes).to.be.an('array');
+    });
+
+    it('Returns valid data for mediatype video', function () {
+      const playerSize = [300, 300];
+      bid.mediaTypes = {};
+      bid.params.traffic = VIDEO;
+      bid.mediaTypes[VIDEO] = {
+        playerSize
+      };
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      let placement = data['placements'][0];
+      expect(placement).to.be.an('object');
+      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'wPlayer', 'hPlayer', 'schain');
+      expect(placement.traffic).to.equal(VIDEO);
+      expect(placement.wPlayer).to.equal(playerSize[0]);
+      expect(placement.hPlayer).to.equal(playerSize[1]);
+    });
+
+    it('Returns valid data for mediatype native', function () {
+      const native = {
+        title: {
+          required: true
+        },
+        body: {
+          required: true
+        },
+        icon: {
+          required: true,
+          size: [64, 64]
+        }
+      };
+
+      bid.mediaTypes = {};
+      bid.params.traffic = NATIVE;
+      bid.mediaTypes[NATIVE] = native;
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      let placement = data['placements'][0];
+      expect(placement).to.be.an('object');
+      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'native', 'schain');
+      expect(placement.traffic).to.equal(NATIVE);
+      expect(placement.native).to.equal(native);
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      bidderRequest.gdprConsent = 'test';
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = 'test';
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+
+    it('Returns empty data if no valid requests are passed', function () {
+      serverRequest = spec.buildRequests([]);
+      let data = serverRequest.data;
+      expect(data.placements).to.be.an('array').that.is.empty;
+    });
+  });
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.width).to.equal(300);
+      expect(dataItem.height).to.equal(250);
+      expect(dataItem.ad).to.equal('Test');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
+          mediaType: 'native',
+          native: {
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
+          },
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+});

From 4b3faf46277eabc28c078f3bd94d2ad950de5261 Mon Sep 17 00:00:00 2001
From: Avimobi <34269094+Avimobi@users.noreply.github.com>
Date: Tue, 1 Dec 2020 00:52:22 +0530
Subject: [PATCH 041/304] Update adkernelBidAdapter.js (#5957)

* Update adkernelBidAdapter.js

description: Prebid adbite Bidder Adaptor
Host: cpm.adbite.com

* Update adkernelBidAdapter_spec.js
---
 modules/adkernelBidAdapter.js                | 2 +-
 test/spec/modules/adkernelBidAdapter_spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
index 0e9093b0f63..29990ef1c44 100644
--- a/modules/adkernelBidAdapter.js
+++ b/modules/adkernelBidAdapter.js
@@ -52,7 +52,7 @@ const NATIVE_INDEX = NATIVE_MODEL.reduce((acc, val, idx) => {
 export const spec = {
 
   code: 'adkernel',
-  aliases: ['headbidding', 'adsolut', 'oftmediahb', 'audiencemedia', 'waardex_ak', 'roqoon', 'andbeyond'],
+  aliases: ['headbidding', 'adsolut', 'oftmediahb', 'audiencemedia', 'waardex_ak', 'roqoon', 'andbeyond', 'adbite'],
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   /**
diff --git a/test/spec/modules/adkernelBidAdapter_spec.js b/test/spec/modules/adkernelBidAdapter_spec.js
index 4015a56e82b..70789c4b933 100644
--- a/test/spec/modules/adkernelBidAdapter_spec.js
+++ b/test/spec/modules/adkernelBidAdapter_spec.js
@@ -556,7 +556,7 @@ describe('Adkernel adapter', function () {
 
   describe('adapter configuration', () => {
     it('should have aliases', () => {
-      expect(spec.aliases).to.have.lengthOf(7);
+      expect(spec.aliases).to.have.lengthOf(8);
     });
   });
 

From a7beb57e691fea813e036ffb507c4a4b89b43923 Mon Sep 17 00:00:00 2001
From: mmoschovas <63253416+mmoschovas@users.noreply.github.com>
Date: Mon, 30 Nov 2020 15:34:43 -0500
Subject: [PATCH 042/304] RP Analytics Adapter update for UTM KVs (#5998)

* RP Analytics Adapter update to scan URL query params to match 'utm_' params, convert to KV object format and pass data along as fpkvs. Unique query aram KVs will be added to the fpkvs object; whereas, query params will overwrite both matching KVs defined in localstorage or setConfig

* Update to attempt to fix CircleCi errors

* Update to use utils parseQS

* Minor change to attempt to pass Safari tests

* Switching spec logic to mock parseQS function as opposed to the window.location

* Another attempt to determine Safari failure

* Reverting last change and modifying fpkvs

* Added sort to test to correctly evaluate on Safari browser and reverted back to windowLocation mock

* Update to switch logic to utilize reduce()
---
 modules/rubiconAnalyticsAdapter.js            | 22 +++++
 .../modules/rubiconAnalyticsAdapter_spec.js   | 87 +++++++++++++++++++
 2 files changed, 109 insertions(+)

diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index 85b6596ba12..ff8cb7895b9 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -359,7 +359,29 @@ export function parseBidResponse(bid, previousBidResponse, auctionFloorData) {
   ]);
 }
 
+/*
+  Filters and converts URL Params into an object and returns only KVs that match the 'utm_KEY' format
+*/
+function getUtmParams() {
+  let search;
+
+  try {
+    search = utils.parseQS(utils.getWindowLocation().search);
+  } catch (e) {
+    search = {};
+  }
+
+  return Object.keys(search).reduce((accum, param) => {
+    if (param.match(/utm_/)) {
+      accum[param.replace(/utm_/, '')] = search[param];
+    }
+    return accum;
+  }, {});
+}
+
 function getFpkvs() {
+  rubiConf.fpkvs = Object.assign((rubiConf.fpkvs || {}), getUtmParams());
+
   const isValid = rubiConf.fpkvs && typeof rubiConf.fpkvs === 'object' && Object.keys(rubiConf.fpkvs).every(key => typeof rubiConf.fpkvs[key] === 'string');
   return isValid ? rubiConf.fpkvs : {};
 }
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index 9e343d07dd5..4891b8d3282 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -1083,6 +1083,34 @@ describe('rubicon analytics adapter', function () {
         expect(message).to.deep.equal(expectedMessage);
       });
 
+      it('should use the query utm param rubicon kv value and pass updated kv and pvid when defined', function () {
+        sandbox.stub(utils, 'getWindowLocation').returns({'search': '?utm_source=other', 'pbjs_debug': 'true'});
+
+        config.setConfig({rubicon: {
+          fpkvs: {
+            source: 'fb',
+            link: 'email'
+          }
+        }});
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session.pvid = STUBBED_UUID.slice(0, 8);
+        expectedMessage.fpkvs = [
+          {key: 'source', value: 'other'},
+          {key: 'link', value: 'email'}
+        ]
+
+        message.fpkvs.sort((left, right) => left.key < right.key);
+        expectedMessage.fpkvs.sort((left, right) => left.key < right.key);
+
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
       it('should pick up existing localStorage and use its values', function () {
         // set some localStorage
         let inputlocalStorage = {
@@ -1135,6 +1163,65 @@ describe('rubicon analytics adapter', function () {
         });
       });
 
+      it('should overwrite matching localstorge value and use its remaining values', function () {
+        sandbox.stub(utils, 'getWindowLocation').returns({'search': '?utm_source=fb&utm_click=dog'});
+
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519766113781, // 15 mins before "now"
+          expires: 1519787713781, // six hours later
+          lastSeen: 1519766113781,
+          fpkvs: { source: 'tw', link: 'email' }
+        };
+        getDataFromLocalStorageStub.withArgs('rpaSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({rubicon: {
+          fpkvs: {
+            link: 'email' // should merge this with what is in the localStorage!
+          }
+        }});
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session = {
+          id: '987654',
+          start: 1519766113781,
+          expires: 1519787713781,
+          pvid: expectedPvid
+        }
+        expectedMessage.fpkvs = [
+          {key: 'source', value: 'fb'},
+          {key: 'link', value: 'email'},
+          {key: 'click', value: 'dog'}
+        ]
+
+        message.fpkvs.sort((left, right) => left.key < right.key);
+        expectedMessage.fpkvs.sort((left, right) => left.key < right.key);
+
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: '987654', // should have stayed same
+          start: 1519766113781, // should have stayed same
+          expires: 1519787713781, // should have stayed same
+          lastSeen: 1519767013781, // lastSeen updated to our "now"
+          fpkvs: { source: 'fb', link: 'email', click: 'dog' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+
       it('should throw out session if lastSeen > 30 mins ago and create new one', function () {
         // set some localStorage
         let inputlocalStorage = {

From 57ef24aef6ea7bce3f339843f12c606e079d160c Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Mon, 30 Nov 2020 21:38:29 +0100
Subject: [PATCH 043/304] remove pubcommon optout from user id module checks
 (#5994)

---
 modules/userId/index.js          |  7 ++++---
 test/spec/modules/userId_spec.js | 15 +++++----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/modules/userId/index.js b/modules/userId/index.js
index 0923a92f516..f063fbc973b 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -134,6 +134,7 @@ const CONSENT_DATA_COOKIE_STORAGE_CONFIG = {
   name: '_pbjs_userid_consent_data',
   expires: 30 // 30 days expiration, which should match how often consent is refreshed by CMPs
 };
+export const PBJS_USER_ID_OPTOUT_NAME = '_pbjs_id_optout';
 export const coreStorage = getCoreStorageManager('userid');
 
 /** @type {string[]} */
@@ -701,15 +702,15 @@ export function init(config) {
   ].filter(i => i !== null);
 
   // exit immediately if opt out cookie or local storage keys exists.
-  if (validStorageTypes.indexOf(COOKIE) !== -1 && (coreStorage.getCookie('_pbjs_id_optout') || coreStorage.getCookie('_pubcid_optout'))) {
+  if (validStorageTypes.indexOf(COOKIE) !== -1 && coreStorage.getCookie(PBJS_USER_ID_OPTOUT_NAME)) {
     utils.logInfo(`${MODULE_NAME} - opt-out cookie found, exit module`);
     return;
   }
-  // _pubcid_optout is checked for compatibility with pubCommonId
-  if (validStorageTypes.indexOf(LOCAL_STORAGE) !== -1 && (coreStorage.getDataFromLocalStorage('_pbjs_id_optout') || coreStorage.getDataFromLocalStorage('_pubcid_optout'))) {
+  if (validStorageTypes.indexOf(LOCAL_STORAGE) !== -1 && coreStorage.getDataFromLocalStorage(PBJS_USER_ID_OPTOUT_NAME)) {
     utils.logInfo(`${MODULE_NAME} - opt-out localStorage found, exit module`);
     return;
   }
+
   // listen for config userSyncs to be set
   config.getConfig(conf => {
     // Note: support for 'usersync' was dropped as part of Prebid.js 4.0
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index 887e1f45640..981ebb5f50e 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -7,7 +7,8 @@ import {
   setStoredConsentData,
   setStoredValue,
   setSubmoduleRegistry,
-  syncDelay
+  syncDelay,
+  PBJS_USER_ID_OPTOUT_NAME
 } from 'modules/userId/index.js';
 import {createEidsArray} from 'modules/userId/eids.js';
 import {config} from 'src/config.js';
@@ -91,9 +92,7 @@ describe('User ID', function () {
   }
 
   before(function () {
-    coreStorage.setCookie('_pubcid_optout', '', EXPIRED_COOKIE_DATE);
-    localStorage.removeItem('_pbjs_id_optout');
-    localStorage.removeItem('_pubcid_optout');
+    localStorage.removeItem(PBJS_USER_ID_OPTOUT_NAME);
   });
 
   beforeEach(function () {
@@ -413,7 +412,7 @@ describe('User ID', function () {
 
   describe('Opt out', function () {
     before(function () {
-      coreStorage.setCookie('_pbjs_id_optout', '1', (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie(PBJS_USER_ID_OPTOUT_NAME, '1', (new Date(Date.now() + 5000).toUTCString()));
     });
 
     beforeEach(function () {
@@ -422,16 +421,12 @@ describe('User ID', function () {
 
     afterEach(function () {
       // removed cookie
-      coreStorage.setCookie('_pbjs_id_optout', '', EXPIRED_COOKIE_DATE);
+      coreStorage.setCookie(PBJS_USER_ID_OPTOUT_NAME, '', EXPIRED_COOKIE_DATE);
       $$PREBID_GLOBAL$$.requestBids.removeAll();
       utils.logInfo.restore();
       config.resetConfig();
     });
 
-    after(function () {
-      coreStorage.setCookie('_pbjs_id_optout', '', EXPIRED_COOKIE_DATE);
-    });
-
     it('fails initialization if opt out cookie exists', function () {
       setSubmoduleRegistry([pubCommonIdSubmodule]);
       init(config);

From 4638dffcb8996954dd0cd947c19c8eb56e614763 Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Mon, 30 Nov 2020 22:19:11 +0100
Subject: [PATCH 044/304] ID5 ID module - pass gdpr and usp parameters in body
 instead of querystring (#6032)

* move gdpr and usp parameters to the body rather than the querystring of calls to ID5

* remove unnecessary variables
---
 modules/id5IdSystem.js                | 7 ++++---
 test/spec/modules/id5IdSystem_spec.js | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/id5IdSystem.js b/modules/id5IdSystem.js
index a1596e96fcd..7033a71d015 100644
--- a/modules/id5IdSystem.js
+++ b/modules/id5IdSystem.js
@@ -78,13 +78,13 @@ export const id5IdSubmodule = {
       return undefined;
     }
 
+    const url = `https://id5-sync.com/g/v2/${config.params.partner}.json`;
     const hasGdpr = (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) ? 1 : 0;
-    const gdprConsentString = hasGdpr ? consentData.consentString : '';
-    const usp = uspDataHandler.getConsentData() || '';
-    const url = `https://id5-sync.com/g/v2/${config.params.partner}.json?gdpr_consent=${gdprConsentString}&gdpr=${hasGdpr}&us_privacy=${usp}`;
     const referer = getRefererInfo();
     const signature = (cacheIdObj && cacheIdObj.signature) ? cacheIdObj.signature : getLegacyCookieSignature();
     const data = {
+      'gdpr': hasGdpr,
+      'gdpr_consent': hasGdpr ? consentData.consentString : '',
       'partner': config.params.partner,
       'nbPage': incrementNb(config.params.partner),
       'o': 'pbjs',
@@ -94,6 +94,7 @@ export const id5IdSubmodule = {
       's': signature,
       'top': referer.reachedTop ? 1 : 0,
       'u': referer.stack[0] || window.location.href,
+      'us_privacy': uspDataHandler.getConsentData() || '',
       'v': '$prebid.version$'
     };
 
diff --git a/test/spec/modules/id5IdSystem_spec.js b/test/spec/modules/id5IdSystem_spec.js
index adffca6dbe5..845cf7fa010 100644
--- a/test/spec/modules/id5IdSystem_spec.js
+++ b/test/spec/modules/id5IdSystem_spec.js
@@ -143,6 +143,9 @@ describe('ID5 ID System', function() {
       expect(requestBody.s).to.eq('');
       expect(requestBody.provider).to.eq('');
       expect(requestBody.v).to.eq('$prebid.version$');
+      expect(requestBody.gdpr).to.exist;
+      expect(requestBody.gdpr_consent).to.exist
+      expect(requestBody.us_privacy).to.exist;
 
       request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
       expect(callbackSpy.calledOnce).to.be.true;

From 6f147c6ab3e072b9b052ef390be757e1f9fb0383 Mon Sep 17 00:00:00 2001
From: Prebid Manager <49466873+Prebid-Manager@users.noreply.github.com>
Date: Tue, 1 Dec 2020 03:51:20 +0000
Subject: [PATCH 045/304] Prebidmanager analytics adapter: fix console error
 when utm is null and collect page info (#6002)

* Fix PrebidManager analytics console error when utm data is null

* collect pageInfo in PrebidManager analytics adapter

* minor edit + add test for pageInfo in PrebidManager analytics adapter

Co-authored-by: apuzanova <apuzanova@asteriosoft.com>
---
 modules/prebidmanagerAnalyticsAdapter.js      | 13 ++++++++++-
 .../prebidmanagerAnalyticsAdapter_spec.js     | 23 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/modules/prebidmanagerAnalyticsAdapter.js b/modules/prebidmanagerAnalyticsAdapter.js
index b98ca864cd5..994ce4989f5 100644
--- a/modules/prebidmanagerAnalyticsAdapter.js
+++ b/modules/prebidmanagerAnalyticsAdapter.js
@@ -83,7 +83,7 @@ function collectUtmTagData() {
     if (newUtm === false) {
       utmTags.forEach(function (utmKey) {
         let itemValue = localStorage.getItem(`pm_${utmKey}`);
-        if (itemValue.length !== 0) {
+        if (itemValue && itemValue.length !== 0) {
           pmUtmTags[utmKey] = itemValue;
         }
       });
@@ -99,6 +99,16 @@ function collectUtmTagData() {
   return pmUtmTags;
 }
 
+function collectPageInfo() {
+  const pageInfo = {
+    domain: window.location.hostname,
+  }
+  if (document.referrer) {
+    pageInfo.referrerDomain = utils.parseUrl(document.referrer).hostname;
+  }
+  return pageInfo;
+}
+
 function flush() {
   if (!pmAnalyticsEnabled) {
     return;
@@ -111,6 +121,7 @@ function flush() {
       bundleId: initOptions.bundleId,
       events: _eventQueue,
       utmTags: collectUtmTagData(),
+      pageInfo: collectPageInfo(),
     };
 
     ajax(
diff --git a/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js b/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
index ce97789fe3e..ef7cb2bbe3b 100644
--- a/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
+++ b/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
@@ -1,6 +1,8 @@
 import prebidmanagerAnalytics from 'modules/prebidmanagerAnalyticsAdapter.js';
 import {expect} from 'chai';
 import {server} from 'test/mocks/xhr.js';
+import * as utils from 'src/utils.js';
+
 let events = require('src/events');
 let constants = require('src/constants.json');
 
@@ -98,7 +100,7 @@ describe('Prebid Manager Analytics Adapter', function () {
       events.emit(constants.EVENTS.AUCTION_END, {});
       events.emit(constants.EVENTS.BID_TIMEOUT, {});
 
-      sinon.assert.callCount(prebidmanagerAnalytics.track, 7);
+      sinon.assert.callCount(prebidmanagerAnalytics.track, 6);
     });
   });
 
@@ -135,4 +137,23 @@ describe('Prebid Manager Analytics Adapter', function () {
       expect(pmEvents.utmTags.utm_content).to.equal('');
     });
   });
+
+  describe('build page info', function () {
+    afterEach(function () {
+      prebidmanagerAnalytics.disableAnalytics()
+    });
+    it('should build page info', function () {
+      prebidmanagerAnalytics.enableAnalytics({
+        provider: 'prebidmanager',
+        options: {
+          bundleId: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+        }
+      });
+
+      const pmEvents = JSON.parse(server.requests[0].requestBody.substring(2));
+
+      expect(pmEvents.pageInfo.domain).to.equal(window.location.hostname);
+      expect(pmEvents.pageInfo.referrerDomain).to.equal(utils.parseUrl(document.referrer).hostname);
+    });
+  });
 });

From d5f228bd312d657e1f4881ebb51114696846bbf4 Mon Sep 17 00:00:00 2001
From: Nicholas Llerandi <nicholasllerandi@gmail.com>
Date: Mon, 30 Nov 2020 22:56:03 -0500
Subject: [PATCH 046/304] Rp adapter unit tests - userid mod support (#5985)

* ID5 support

* ID5 support; tests passed

* no-console:error

* UserId catchall support

* minor revision
---
 test/spec/modules/rubiconBidAdapter_spec.js | 37 +++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/test/spec/modules/rubiconBidAdapter_spec.js b/test/spec/modules/rubiconBidAdapter_spec.js
index 6659c281c33..b1ef02a6369 100644
--- a/test/spec/modules/rubiconBidAdapter_spec.js
+++ b/test/spec/modules/rubiconBidAdapter_spec.js
@@ -1221,6 +1221,43 @@ describe('the rubicon adapter', function () {
             });
           });
 
+          describe('ID5 support', function () {
+            it('should send ID5 id when userIdAsEids contains ID5', function () {
+              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
+              clonedBid.userId = {
+                id5id: {
+                  uid: '11111',
+                  ext: {
+                    linkType: '22222'
+                  }
+                }
+              };
+              clonedBid.userIdAsEids = createEidsArray(clonedBid.userId);
+              let [request] = spec.buildRequests([clonedBid], bidderRequest);
+              let data = parseQuery(request.data);
+
+              expect(data['eid_id5-sync.com']).to.equal('11111^1^22222');
+            });
+          });
+
+          describe('UserID catchall support', function () {
+            it('should send user id with generic format', function () {
+              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
+              // Hardcoding userIdAsEids since createEidsArray returns empty array if source not found in eids.js
+              clonedBid.userIdAsEids = [{
+                source: 'catchall',
+                uids: [{
+                  id: '11111',
+                  atype: 2
+                }]
+              }]
+              let [request] = spec.buildRequests([clonedBid], bidderRequest);
+              let data = parseQuery(request.data);
+
+              expect(data['eid_catchall']).to.equal('11111^2');
+            });
+          });
+
           describe('Config user.id support', function () {
             it('should send ppuid when config defines user.id', function () {
               config.setConfig({user: {id: '123'}});

From 0820790bbc1509b9c964f15d1487b5cff990cef2 Mon Sep 17 00:00:00 2001
From: bjorn-lw <32431346+bjorn-lw@users.noreply.github.com>
Date: Tue, 1 Dec 2020 11:33:33 +0100
Subject: [PATCH 047/304] Read floor data in analytic + support for Criteo Id
 (#6003)

* Livewrapped bid and analytics adapter

* Fixed some tests for browser compatibility

* Fixed some tests for browser compatibility

* Changed analytics adapter code name

* Fix double quote in debug message

* modified how gdpr is being passed

* Added support for Publisher Common ID Module

* Corrections for ttr in analytics

* ANalytics updates

* Auction start time stamp changed

* Detect recovered ad blocked requests
Make it possible to pass dynamic parameters to adapter

* Collect info on ad units receiving any valid bid

* Support for ID5
Pass metadata from adapter

* Typo in test + eids on wrong level

* Fix for Prebid 3.0

* Fix get referer

* http -> https in tests

* Native support

* Read sizes from mediatype.banner

* Revert accidental commit

* Support native data collection + minor refactorings

* Set analytics endpoint

* Support for app parameters

* Fix issue where adunits with bids were not counted on reload

* Send debug info from adapter to external debugger

* SChain support

* Send GDPR data in analytics request

* video support

Video support

* Report back floor via analytic

* Send auction id and adunit/bidder connection id

* Criteo id support

* Updated example

* livewrapped Analytics Adapter info file
---
 modules/livewrappedAnalyticsAdapter.js        | 108 +++++++++++---
 modules/livewrappedAnalyticsAdapter.md        |  22 +++
 modules/livewrappedBidAdapter.js              |   7 +-
 modules/livewrappedBidAdapter.md              |   2 +-
 .../livewrappedAnalyticsAdapter_spec.js       | 132 ++++++++++++++++--
 .../modules/livewrappedBidAdapter_spec.js     |  21 ++-
 6 files changed, 257 insertions(+), 35 deletions(-)
 create mode 100644 modules/livewrappedAnalyticsAdapter.md

diff --git a/modules/livewrappedAnalyticsAdapter.js b/modules/livewrappedAnalyticsAdapter.js
index 9f571cb5ae0..a872a709ec9 100644
--- a/modules/livewrappedAnalyticsAdapter.js
+++ b/modules/livewrappedAnalyticsAdapter.js
@@ -36,6 +36,15 @@ let livewrappedAnalyticsAdapter = Object.assign(adapter({EMPTYURL, ANALYTICSTYPE
         args.bids.forEach(function(bidRequest) {
           cache.auctions[args.auctionId].gdprApplies = args.gdprConsent ? args.gdprConsent.gdprApplies : undefined;
           cache.auctions[args.auctionId].gdprConsent = args.gdprConsent ? args.gdprConsent.consentString : undefined;
+          let lwFloor;
+
+          if (bidRequest.lwflr) {
+            lwFloor = bidRequest.lwflr.flr;
+
+            let buyerFloor = bidRequest.lwflr.bflrs ? bidRequest.lwflr.bflrs[bidRequest.bidder] : undefined;
+
+            lwFloor = buyerFloor || lwFloor;
+          }
 
           cache.auctions[args.auctionId].bids[bidRequest.bidId] = {
             bidder: bidRequest.bidder,
@@ -45,7 +54,11 @@ let livewrappedAnalyticsAdapter = Object.assign(adapter({EMPTYURL, ANALYTICSTYPE
             timeout: false,
             sendStatus: 0,
             readyToSend: 0,
-            start: args.start
+            start: args.start,
+            lwFloor: lwFloor,
+            floorData: bidRequest.floorData,
+            auc: bidRequest.auc,
+            buc: bidRequest.buc
           }
 
           utils.logInfo(bidRequest);
@@ -123,10 +136,11 @@ livewrappedAnalyticsAdapter.sendEvents = function() {
   var events = {
     publisherId: initOptions.publisherId,
     gdpr: sentRequests.gdpr,
+    auctionIds: sentRequests.auctionIds,
     requests: sentRequests.sentRequests,
-    responses: getResponses(),
-    wins: getWins(),
-    timeouts: getTimeouts(),
+    responses: getResponses(sentRequests.gdpr, sentRequests.auctionIds),
+    wins: getWins(sentRequests.gdpr, sentRequests.auctionIds),
+    timeouts: getTimeouts(sentRequests.auctionIds),
     bidAdUnits: getbidAdUnits(),
     rcv: getAdblockerRecovered()
   };
@@ -150,20 +164,12 @@ function getAdblockerRecovered() {
 function getSentRequests() {
   var sentRequests = [];
   var gdpr = [];
+  var auctionIds = [];
 
   Object.keys(cache.auctions).forEach(auctionId => {
     let auction = cache.auctions[auctionId];
-    var gdprPos = 0;
-    for (gdprPos = 0; gdprPos < gdpr.length; gdprPos++) {
-      if (gdpr[gdprPos].gdprApplies == auction.gdprApplies &&
-          gdpr[gdprPos].gdprConsent == auction.gdprConsent) {
-        break;
-      }
-    }
-
-    if (gdprPos == gdpr.length) {
-      gdpr[gdprPos] = {gdprApplies: auction.gdprApplies, gdprConsent: auction.gdprConsent};
-    }
+    let gdprPos = getGdprPos(gdpr, auction);
+    let auctionIdPos = getAuctionIdPos(auctionIds, auctionId);
 
     Object.keys(cache.auctions[auctionId].bids).forEach(bidId => {
       let bid = auction.bids[bidId];
@@ -174,21 +180,27 @@ function getSentRequests() {
           timeStamp: auction.timeStamp,
           adUnit: bid.adUnit,
           bidder: bid.bidder,
-          gdpr: gdprPos
+          gdpr: gdprPos,
+          floor: bid.lwFloor,
+          auctionId: auctionIdPos,
+          auc: bid.auc,
+          buc: bid.buc
         });
       }
     });
   });
 
-  return {gdpr: gdpr, sentRequests: sentRequests};
+  return {gdpr: gdpr, auctionIds: auctionIds, sentRequests: sentRequests};
 }
 
-function getResponses() {
+function getResponses(gdpr, auctionIds) {
   var responses = [];
 
   Object.keys(cache.auctions).forEach(auctionId => {
     Object.keys(cache.auctions[auctionId].bids).forEach(bidId => {
       let auction = cache.auctions[auctionId];
+      let gdprPos = getGdprPos(gdpr, auction);
+      let auctionIdPos = getAuctionIdPos(auctionIds, auctionId)
       let bid = auction.bids[bidId];
       if (bid.readyToSend && !(bid.sendStatus & RESPONSESENT) && !bid.timeout) {
         bid.sendStatus |= RESPONSESENT;
@@ -202,7 +214,13 @@ function getResponses() {
           cpm: bid.cpm,
           ttr: bid.ttr,
           IsBid: bid.isBid,
-          mediaType: bid.mediaType
+          mediaType: bid.mediaType,
+          gdpr: gdprPos,
+          floor: bid.floorData ? bid.floorData.floorValue : bid.lwFloor,
+          floorCur: bid.floorData ? bid.floorData.floorCurrency : undefined,
+          auctionId: auctionIdPos,
+          auc: bid.auc,
+          buc: bid.buc
         });
       }
     });
@@ -211,13 +229,16 @@ function getResponses() {
   return responses;
 }
 
-function getWins() {
+function getWins(gdpr, auctionIds) {
   var wins = [];
 
   Object.keys(cache.auctions).forEach(auctionId => {
     Object.keys(cache.auctions[auctionId].bids).forEach(bidId => {
       let auction = cache.auctions[auctionId];
+      let gdprPos = getGdprPos(gdpr, auction);
+      let auctionIdPos = getAuctionIdPos(auctionIds, auctionId);
       let bid = auction.bids[bidId];
+
       if (!(bid.sendStatus & WINSENT) && bid.won) {
         bid.sendStatus |= WINSENT;
 
@@ -228,7 +249,13 @@ function getWins() {
           width: bid.width,
           height: bid.height,
           cpm: bid.cpm,
-          mediaType: bid.mediaType
+          mediaType: bid.mediaType,
+          gdpr: gdprPos,
+          floor: bid.floorData ? bid.floorData.floorValue : bid.lwFloor,
+          floorCur: bid.floorData ? bid.floorData.floorCurrency : undefined,
+          auctionId: auctionIdPos,
+          auc: bid.auc,
+          buc: bid.buc
         });
       }
     });
@@ -237,10 +264,42 @@ function getWins() {
   return wins;
 }
 
-function getTimeouts() {
+function getGdprPos(gdpr, auction) {
+  var gdprPos = 0;
+  for (gdprPos = 0; gdprPos < gdpr.length; gdprPos++) {
+    if (gdpr[gdprPos].gdprApplies == auction.gdprApplies &&
+        gdpr[gdprPos].gdprConsent == auction.gdprConsent) {
+      break;
+    }
+  }
+
+  if (gdprPos == gdpr.length) {
+    gdpr[gdprPos] = {gdprApplies: auction.gdprApplies, gdprConsent: auction.gdprConsent};
+  }
+
+  return gdprPos;
+}
+
+function getAuctionIdPos(auctionIds, auctionId) {
+  var auctionIdPos = 0;
+  for (auctionIdPos = 0; auctionIdPos < auctionIds.length; auctionIdPos++) {
+    if (auctionIds[auctionIdPos] == auctionId) {
+      break;
+    }
+  }
+
+  if (auctionIdPos == auctionIds.length) {
+    auctionIds[auctionIdPos] = auctionId;
+  }
+
+  return auctionIdPos;
+}
+
+function getTimeouts(auctionIds) {
   var timeouts = [];
 
   Object.keys(cache.auctions).forEach(auctionId => {
+    let auctionIdPos = getAuctionIdPos(auctionIds, auctionId);
     Object.keys(cache.auctions[auctionId].bids).forEach(bidId => {
       let auction = cache.auctions[auctionId];
       let bid = auction.bids[bidId];
@@ -250,7 +309,10 @@ function getTimeouts() {
         timeouts.push({
           bidder: bid.bidder,
           adUnit: bid.adUnit,
-          timeStamp: auction.timeStamp
+          timeStamp: auction.timeStamp,
+          auctionId: auctionIdPos,
+          auc: bid.auc,
+          buc: bid.buc
         });
       }
     });
diff --git a/modules/livewrappedAnalyticsAdapter.md b/modules/livewrappedAnalyticsAdapter.md
new file mode 100644
index 00000000000..de4f352aa19
--- /dev/null
+++ b/modules/livewrappedAnalyticsAdapter.md
@@ -0,0 +1,22 @@
+# Overview
+Module Name: Livewrapped Analytics Adapter
+
+Module Type: Analytics Adapter
+
+Maintainer: info@livewrapped.com
+
+# Description
+
+Analytics adapter for Livewrapped AB. In order to use the adapter, please contact Livewrapped AB.
+
+# Test Parameters
+
+```
+{
+  provider: 'livewrapped',
+    options : {
+      publisherId: "64c01620-fa98-4936-9794-6001d8ebfdb0"
+    }
+}
+
+```
diff --git a/modules/livewrappedBidAdapter.js b/modules/livewrappedBidAdapter.js
index 0a5464fd21f..512fc775d95 100644
--- a/modules/livewrappedBidAdapter.js
+++ b/modules/livewrappedBidAdapter.js
@@ -221,6 +221,10 @@ function bidToAdRequest(bid) {
     options: bid.params.options
   };
 
+  if (bid.auc !== undefined) {
+    adRequest.auc = bid.auc;
+  }
+
   adRequest.native = utils.deepAccess(bid, 'mediaTypes.native');
 
   adRequest.video = utils.deepAccess(bid, 'mediaTypes.video');
@@ -276,8 +280,9 @@ function handleEids(bidRequests) {
   let eids = [];
   const bidRequest = bidRequests[0];
   if (bidRequest && bidRequest.userId) {
-    AddExternalUserId(eids, utils.deepAccess(bidRequest, `userId.pubcid`), 'pubcommon', 1); // Also add this to eids
+    AddExternalUserId(eids, utils.deepAccess(bidRequest, `userId.pubcid`), 'pubcid.org', 1); // Also add this to eids
     AddExternalUserId(eids, utils.deepAccess(bidRequest, `userId.id5id.uid`), 'id5-sync.com', 1);
+    AddExternalUserId(eids, utils.deepAccess(bidRequest, `userId.criteoId`), 'criteo.com', 1);
   }
   if (eids.length > 0) {
     return {user: {ext: {eids}}};
diff --git a/modules/livewrappedBidAdapter.md b/modules/livewrappedBidAdapter.md
index c5d867af8fe..10fc2a4778a 100644
--- a/modules/livewrappedBidAdapter.md
+++ b/modules/livewrappedBidAdapter.md
@@ -20,7 +20,7 @@ var adUnits = [
        bids: [{
          bidder: 'livewrapped',
          params: {
-           adUnitId: '6A32352E-BC17-4B94-B2A7-5BF1724417D7'
+           adUnitId: 'D801852A-681F-11E8-86A7-0A44794250D4'
          }
        }]
    }
diff --git a/test/spec/modules/livewrappedAnalyticsAdapter_spec.js b/test/spec/modules/livewrappedAnalyticsAdapter_spec.js
index c723f589fa0..ba9430e0b95 100644
--- a/test/spec/modules/livewrappedAnalyticsAdapter_spec.js
+++ b/test/spec/modules/livewrappedAnalyticsAdapter_spec.js
@@ -121,6 +121,7 @@ const MOCK = {
 const ANALYTICS_MESSAGE = {
   publisherId: 'CC411485-42BC-4F92-8389-42C503EE38D7',
   gdpr: [{}],
+  auctionIds: ['25c6d7f5-699a-4bfc-87c9-996f915341fa'],
   bidAdUnits: [
     {
       adUnit: 'panorama_d_1',
@@ -136,19 +137,22 @@ const ANALYTICS_MESSAGE = {
       adUnit: 'panorama_d_1',
       bidder: 'livewrapped',
       timeStamp: 1519149562216,
-      gdpr: 0
+      gdpr: 0,
+      auctionId: 0
     },
     {
       adUnit: 'box_d_1',
       bidder: 'livewrapped',
       timeStamp: 1519149562216,
-      gdpr: 0
+      gdpr: 0,
+      auctionId: 0
     },
     {
       adUnit: 'box_d_2',
       bidder: 'livewrapped',
       timeStamp: 1519149562216,
-      gdpr: 0
+      gdpr: 0,
+      auctionId: 0
     }
   ],
   responses: [
@@ -161,7 +165,9 @@ const ANALYTICS_MESSAGE = {
       cpm: 1.1,
       ttr: 200,
       IsBid: true,
-      mediaType: 1
+      mediaType: 1,
+      gdpr: 0,
+      auctionId: 0
     },
     {
       timeStamp: 1519149562216,
@@ -172,14 +178,18 @@ const ANALYTICS_MESSAGE = {
       cpm: 2.2,
       ttr: 300,
       IsBid: true,
-      mediaType: 1
+      mediaType: 1,
+      gdpr: 0,
+      auctionId: 0
     },
     {
       timeStamp: 1519149562216,
       adUnit: 'box_d_2',
       bidder: 'livewrapped',
       ttr: 200,
-      IsBid: false
+      IsBid: false,
+      gdpr: 0,
+      auctionId: 0
     }
   ],
   timeouts: [],
@@ -191,7 +201,9 @@ const ANALYTICS_MESSAGE = {
       width: 980,
       height: 240,
       cpm: 1.1,
-      mediaType: 1
+      mediaType: 1,
+      gdpr: 0,
+      auctionId: 0
     },
     {
       timeStamp: 1519149562216,
@@ -200,7 +212,9 @@ const ANALYTICS_MESSAGE = {
       width: 300,
       height: 250,
       cpm: 2.2,
-      mediaType: 1
+      mediaType: 1,
+      gdpr: 0,
+      auctionId: 0
     }
   ]
 };
@@ -351,7 +365,9 @@ describe('Livewrapped analytics adapter', function () {
         }
       },
       );
-      events.emit(BID_TIMEOUT, MOCK.BID_TIMEOUT);
+
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
       events.emit(AUCTION_END, MOCK.AUCTION_END);
 
       clock.tick(BID_WON_TIMEOUT + 1000);
@@ -366,6 +382,104 @@ describe('Livewrapped analytics adapter', function () {
       expect(message.requests.length).to.equal(2);
       expect(message.requests[0].gdpr).to.equal(0);
       expect(message.requests[1].gdpr).to.equal(0);
+
+      expect(message.responses.length).to.equal(1);
+      expect(message.responses[0].gdpr).to.equal(0);
+
+      expect(message.wins.length).to.equal(1);
+      expect(message.wins[0].gdpr).to.equal(0);
+    });
+
+    it('should forward floor data', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, {
+        'bidder': 'livewrapped',
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'bidderRequestId': '1be65d7958826a',
+        'bids': [
+          {
+            'bidder': 'livewrapped',
+            'adUnitCode': 'panorama_d_1',
+            'bidId': '2ecff0db240757',
+            'floorData': {
+              'floorValue': 1.1,
+              'floorCurrency': 'SEK'
+            }
+          }
+        ],
+        'start': 1519149562216
+      });
+
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      clock.tick(BID_WON_TIMEOUT + 1000);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+
+      expect(message.gdpr.length).to.equal(1);
+
+      expect(message.responses.length).to.equal(1);
+      expect(message.responses[0].floor).to.equal(1.1);
+      expect(message.responses[0].floorCur).to.equal('SEK');
+
+      expect(message.wins.length).to.equal(1);
+      expect(message.wins[0].floor).to.equal(1.1);
+      expect(message.wins[0].floorCur).to.equal('SEK');
+    });
+
+    it('should forward Livewrapped floor data', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, {
+        'bidder': 'livewrapped',
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'bidderRequestId': '1be65d7958826a',
+        'bids': [
+          {
+            'bidder': 'livewrapped',
+            'adUnitCode': 'panorama_d_1',
+            'bidId': '2ecff0db240757',
+            'lwflr': {
+              'flr': 1.1
+            }
+          },
+          {
+            'bidder': 'livewrapped',
+            'adUnitCode': 'box_d_1',
+            'bidId': '3ecff0db240757',
+            'lwflr': {
+              'flr': 1.1,
+              'bflrs': {'livewrapped': 2.2}
+            }
+          }
+        ],
+        'start': 1519149562216
+      });
+
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      clock.tick(BID_WON_TIMEOUT + 1000);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+
+      expect(message.gdpr.length).to.equal(1);
+
+      expect(message.responses.length).to.equal(2);
+      expect(message.responses[0].floor).to.equal(1.1);
+      expect(message.responses[1].floor).to.equal(2.2);
+
+      expect(message.wins.length).to.equal(2);
+      expect(message.wins[0].floor).to.equal(1.1);
+      expect(message.wins[1].floor).to.equal(2.2);
     });
   });
 
diff --git a/test/spec/modules/livewrappedBidAdapter_spec.js b/test/spec/modules/livewrappedBidAdapter_spec.js
index 2d5ba3f48df..7983e8fbb0b 100644
--- a/test/spec/modules/livewrappedBidAdapter_spec.js
+++ b/test/spec/modules/livewrappedBidAdapter_spec.js
@@ -811,7 +811,7 @@ describe('Livewrapped adapter tests', function () {
     let data = JSON.parse(result.data);
 
     expect(data.rtbData.user.ext.eids).to.deep.equal([{
-      'source': 'pubcommon',
+      'source': 'pubcid.org',
       'uids': [{
         'id': 'publisher-common-id',
         'atype': 1
@@ -819,6 +819,25 @@ describe('Livewrapped adapter tests', function () {
     }]);
   });
 
+  it('should make use of criteoId if available', function() {
+    sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
+    sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => true);
+    let testbidRequest = clone(bidderRequest);
+    delete testbidRequest.bids[0].params.userId;
+    testbidRequest.bids[0].userId = {};
+    testbidRequest.bids[0].userId.criteoId = 'criteo-id';
+    let result = spec.buildRequests(testbidRequest.bids, testbidRequest);
+    let data = JSON.parse(result.data);
+
+    expect(data.rtbData.user.ext.eids).to.deep.equal([{
+      'source': 'criteo.com',
+      'uids': [{
+        'id': 'criteo-id',
+        'atype': 1
+      }]
+    }]);
+  });
+
   it('should send schain object if available', function() {
     sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
     sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => true);

From 24cae189046b52d753ce5720a1701bd3ed7125f1 Mon Sep 17 00:00:00 2001
From: Galphimbl <sashatkachov91@gmail.com>
Date: Tue, 1 Dec 2020 16:43:31 +0200
Subject: [PATCH 048/304] Admixer adapter update - add deal id (#6042)

* Migrating to Prebid 1.0

* Migrating to Prebid 1.0

* Fix spec

* add gdpr and usp

* remove changes in gdpr_hello_world.html

* Update gdpr_hello_world.html

add spaces

* add user syncs

* remove comments

* tests

* add-deal-id

Co-authored-by: atkachov <atkachov91@admixer.ua>
---
 modules/admixerBidAdapter.js                | 1 +
 test/spec/modules/admixerBidAdapter_spec.js | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/admixerBidAdapter.js b/modules/admixerBidAdapter.js
index 3bb392538ff..405dd81cc8c 100644
--- a/modules/admixerBidAdapter.js
+++ b/modules/admixerBidAdapter.js
@@ -65,6 +65,7 @@ export const spec = {
           netRevenue: bidResponse.netRevenue,
           currency: bidResponse.currency,
           vastUrl: bidResponse.vastUrl,
+          dealId: bidResponse.dealId,
         };
         bidResponses.push(bidResp);
       });
diff --git a/test/spec/modules/admixerBidAdapter_spec.js b/test/spec/modules/admixerBidAdapter_spec.js
index 6298eac4448..dfadf1f95d5 100644
--- a/test/spec/modules/admixerBidAdapter_spec.js
+++ b/test/spec/modules/admixerBidAdapter_spec.js
@@ -88,7 +88,8 @@ describe('AdmixerAdapter', function () {
           'creativeId': 'ccca3e5e-0c54-4761-9667-771322fbdffc',
           'ttl': 360,
           'netRevenue': false,
-          'bidId': '5e4e763b6bc60b'
+          'bidId': '5e4e763b6bc60b',
+          'dealId': 'asd123',
         }]
       }
     };
@@ -107,6 +108,7 @@ describe('AdmixerAdapter', function () {
           'currency': ads[0].currency,
           'netRevenue': ads[0].netRevenue,
           'ttl': ads[0].ttl,
+          'dealId': ads[0].dealId,
         }
       ];
 

From 2609a1b804394fadd05bb99cd3c314e326f5796a Mon Sep 17 00:00:00 2001
From: Vladimir Fedoseev <vl.fedoseev@gmail.com>
Date: Tue, 1 Dec 2020 16:03:51 +0100
Subject: [PATCH 049/304] FID-251: Update Reconciliation RTD Provider to 2.1
 (#6037)

---
 .../reconciliationRtdProvider_example.html    |  5 +-
 modules/reconciliationRtdProvider.js          | 27 +-------
 .../modules/reconciliationRtdProvider_spec.js | 66 ++++++++-----------
 3 files changed, 34 insertions(+), 64 deletions(-)

diff --git a/integrationExamples/gpt/reconciliationRtdProvider_example.html b/integrationExamples/gpt/reconciliationRtdProvider_example.html
index af414e0b055..4f9b663c22d 100644
--- a/integrationExamples/gpt/reconciliationRtdProvider_example.html
+++ b/integrationExamples/gpt/reconciliationRtdProvider_example.html
@@ -82,8 +82,9 @@
 
     <script>
       googletag.cmd.push(function () {
-        googletag.defineSlot('/21834411153/rsdk-2', [[300, 250], [728, 90]], 'div-gpt-ad-rsdk-1').addService(googletag.pubads());
-
+        googletag.defineSlot('/21834411153/rsdk-2', [[300, 250], [728, 90]], 'div-gpt-ad-rsdk-1')
+          .addService(googletag.pubads())
+          .setTargeting('RSDK_VER', '2.1');
         googletag.pubads().enableSingleRequest();
         googletag.enableServices();
       });
diff --git a/modules/reconciliationRtdProvider.js b/modules/reconciliationRtdProvider.js
index 20acb6a535a..bd3d8861c5b 100644
--- a/modules/reconciliationRtdProvider.js
+++ b/modules/reconciliationRtdProvider.js
@@ -29,7 +29,7 @@ const MessageType = {
 /** @type {ModuleParams} */
 const DEFAULT_PARAMS = {
   initUrl: 'https://confirm.fiduciadlt.com/init',
-  impressionUrl: 'https://confirm.fiduciadlt.com/imp',
+  impressionUrl: 'https://confirm.fiduciadlt.com/pimp',
   allowAccess: false,
 };
 /** @type {ModuleParams} */
@@ -78,7 +78,7 @@ function handleAdMessage(e) {
       adDeliveryId,
     });
 
-    track.trackGet(_moduleParams.impressionUrl, args);
+    track.trackPost(_moduleParams.impressionUrl, args);
 
     // Send response back to the Advertiser tag
     let response = {
@@ -186,26 +186,6 @@ export function getSlotByWin(win) {
   );
 }
 
-/**
- * serialize object and return query params string
- * @param {Object} data
- * @return {string}
- */
-export function stringify(query) {
-  const parts = [];
-
-  for (let key in query) {
-    if (query.hasOwnProperty(key)) {
-      let val = query[key];
-      if (typeof query[key] !== 'object') {
-        parts.push(`${key}=${encodeURIComponent(val)}`);
-      } else {
-        parts.push(`${key}=${encodeURIComponent(stringify(val))}`);
-      }
-    }
-  }
-  return parts.join('&');
-}
 /**
  * Init Reconciliation post messages listeners to handle
  * impressions messages from ad creative
@@ -236,9 +216,6 @@ function trackInit(adUnits) {
  * @param {Object} data
  */
 export const track = {
-  trackGet(url, data) {
-    utils.triggerPixel(`${url}?${stringify(data)}`);
-  },
   trackPost(url, data) {
     const ajax = ajaxBuilder();
 
diff --git a/test/spec/modules/reconciliationRtdProvider_spec.js b/test/spec/modules/reconciliationRtdProvider_spec.js
index 8adca28248c..6efe55ddf46 100644
--- a/test/spec/modules/reconciliationRtdProvider_spec.js
+++ b/test/spec/modules/reconciliationRtdProvider_spec.js
@@ -1,7 +1,6 @@
 import {
   reconciliationSubmodule,
   track,
-  stringify,
   getTopIFrameWin,
   getSlotByWin
 } from 'modules/reconciliationRtdProvider.js';
@@ -18,16 +17,14 @@ describe('Reconciliation Real time data submodule', function () {
     }]
   };
 
-  let trackPostStub, trackGetStub;
+  let trackPostStub;
 
   beforeEach(function () {
     trackPostStub = sinon.stub(track, 'trackPost');
-    trackGetStub = sinon.stub(track, 'trackGet');
   });
 
   afterEach(function () {
     trackPostStub.restore();
-    trackGetStub.restore();
   });
 
   describe('reconciliationSubmodule', function () {
@@ -93,30 +90,6 @@ describe('Reconciliation Real time data submodule', function () {
       });
     });
 
-    describe('stringify parameters', function () {
-      it('should return query for flat object', function () {
-        const parameters = {
-          adUnitId: '/adunit',
-          adDeliveryId: '12345'
-        };
-
-        expect(stringify(parameters)).to.eql('adUnitId=%2Fadunit&adDeliveryId=12345');
-      });
-
-      it('should return query with nested parameters', function () {
-        const parameters = {
-          adUnitId: '/adunit',
-          adDeliveryId: '12345',
-          ext: {
-            adSize: '300x250',
-            adType: 'banner'
-          }
-        };
-
-        expect(stringify(parameters)).to.eql('adUnitId=%2Fadunit&adDeliveryId=12345&ext=adSize%3D300x250%26adType%3Dbanner');
-      });
-    });
-
     describe('get topmost iframe', function () {
       /**
        * - top
@@ -206,21 +179,40 @@ describe('Reconciliation Real time data submodule', function () {
           window.parent.postMessage(JSON.stringify({
             type: 'rsdk:impression:req',
             args: {
-              sourceMemberId: 'test_member_id',
-              sourceImpressionId: '123'
+              tagOwnerMemberId: "test_member_id",
+              dataSources: [
+                {
+                  memberId: "member_test",
+                  dataFeedName: "12345",
+                  impressionId: "54321",
+                  impressionIdDataField: "imp_id",
+                  allowedRecipientTypes: 41
+                }
+              ],
+              dataRecipients: [
+                {
+                  type: 1,
+                  memberId: "test_publisher_recipient"
+                },
+                {
+                  type: 16,
+                  memberId: "test_agency_recipient"
+                }
+              ]
             }
           }), '*');
         </script>`);
         adSlotIframe.contentDocument.close();
 
         setTimeout(() => {
-          expect(trackGetStub.calledOnce).to.be.true;
-          expect(trackGetStub.getCalls()[0].args[0]).to.eql('https://confirm.fiduciadlt.com/imp');
-          expect(trackGetStub.getCalls()[0].args[1].adUnitId).to.eql('/reconciliationAdunit');
-          expect(trackGetStub.getCalls()[0].args[1].adDeliveryId).to.eql('12345');
-          expect(trackGetStub.getCalls()[0].args[1].sourceMemberId).to.eql('test_member_id'); ;
-          expect(trackGetStub.getCalls()[0].args[1].sourceImpressionId).to.eql('123'); ;
-          expect(trackGetStub.getCalls()[0].args[1].publisherMemberId).to.eql('test_prebid_publisher');
+          expect(trackPostStub.calledOnce).to.be.true;
+          expect(trackPostStub.getCalls()[0].args[0]).to.eql('https://confirm.fiduciadlt.com/pimp');
+          expect(trackPostStub.getCalls()[0].args[1].adUnitId).to.eql('/reconciliationAdunit');
+          expect(trackPostStub.getCalls()[0].args[1].adDeliveryId).to.eql('12345');
+          expect(trackPostStub.getCalls()[0].args[1].tagOwnerMemberId).to.eql('test_member_id'); ;
+          expect(trackPostStub.getCalls()[0].args[1].dataSources.length).to.eql(1);
+          expect(trackPostStub.getCalls()[0].args[1].dataRecipients.length).to.eql(2);
+          expect(trackPostStub.getCalls()[0].args[1].publisherMemberId).to.eql('test_prebid_publisher');
           done();
         }, 100);
       });

From 6963bb33e01d6809fb6a641a9094fdf19bbe38d1 Mon Sep 17 00:00:00 2001
From: TheMediaGrid <44166371+TheMediaGrid@users.noreply.github.com>
Date: Tue, 1 Dec 2020 18:22:59 +0300
Subject: [PATCH 050/304] grid Bid Adapter: Fix empty  bidfloor (#6031)

* Added TheMediaGridNM Bid Adapter

* Updated required params for TheMediaGridNM Bid Adapter

* Update TheMediGridNM Bid Adapter

* Fix tests for TheMediaGridNM Bid Adapter

* Fixes after review for TheMediaGridNM Bid Adapter

* Add support of multi-format in TheMediaGrid Bid Adapter

* Update sync url for grid and gridNM Bid Adapters

* TheMediaGrid Bid Adapter: added keywords adUnit parameter

* Update TheMediaGrid Bid Adapter to support keywords from config

* Implement new request format for TheMediaGrid Bid Adapter

* Fix jwpseg params for TheMediaGrid Bid Adapter

* Update unit tests for The Media Grid Bid Adapter

* Fix typo in TheMediaGrid Bid Adapter

* Added test for jwTargeting in TheMediaGrid Bid Adapter

* The new request format was made by default in TheMediaGrid Bid Adapter

* Update userId format in ad request for TheMediaGrid Bid Adapter

* Added bidFloor parameter for TheMediaGrid Bid Adapter

* Fix for review TheMediaGrid Bid Adapter

* Support floorModule in TheMediaGrid Bid Adapter

* Fix empty bidfloor for TheMediaGrid Bid Adapter

* Some change to restart autotests
---
 modules/gridBidAdapter.js                | 15 +++++++++------
 test/spec/modules/gridBidAdapter_spec.js |  8 +-------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js
index db1402ea9ad..3f9d4fba31d 100644
--- a/modules/gridBidAdapter.js
+++ b/modules/gridBidAdapter.js
@@ -72,11 +72,12 @@ export const spec = {
       if (!userId) {
         userId = bid.userId;
       }
-      const {params: {uid, keywords, bidFloor}, mediaTypes, bidId, adUnitCode, rtd} = bid;
+      const {params: {uid, keywords}, mediaTypes, bidId, adUnitCode, rtd} = bid;
       bidsMap[bidId] = bid;
       if (!pageKeywords && !utils.isEmpty(keywords)) {
         pageKeywords = utils.transformBidderParamKeywords(keywords);
       }
+      const bidFloor = _getFloor(mediaTypes || {}, bid);
       const jwTargeting = rtd && rtd.jwplayer && rtd.jwplayer.targeting;
       if (jwTargeting) {
         if (!jwpseg && jwTargeting.segments) {
@@ -91,10 +92,13 @@ export const spec = {
         tagid: uid.toString(),
         ext: {
           divid: adUnitCode
-        },
-        bidfloor: _getFloor(mediaTypes || {}, bidFloor, bid)
+        }
       };
 
+      if (bidFloor) {
+        impObj.bidfloor = bidFloor;
+      }
+
       if (!mediaTypes || mediaTypes[BANNER]) {
         const banner = createBannerRequest(bid, mediaTypes ? mediaTypes[BANNER] : {});
         if (banner) {
@@ -323,13 +327,12 @@ export const spec = {
 /**
  * Gets bidfloor
  * @param {Object} mediaTypes
- * @param {Number} bidfloor
  * @param {Object} bid
  * @returns {Number} floor
  */
-function _getFloor (mediaTypes, bidfloor, bid) {
+function _getFloor (mediaTypes, bid) {
   const curMediaType = mediaTypes.video ? 'video' : 'banner';
-  let floor = bidfloor || 0;
+  let floor = bid.params.bidFloor || 0;
 
   if (typeof bid.getFloor === 'function') {
     const floorInfo = bid.getFloor({
diff --git a/test/spec/modules/gridBidAdapter_spec.js b/test/spec/modules/gridBidAdapter_spec.js
index 640bfda1fee..e884df40c5e 100644
--- a/test/spec/modules/gridBidAdapter_spec.js
+++ b/test/spec/modules/gridBidAdapter_spec.js
@@ -173,7 +173,6 @@ describe('TheMediaGrid Adapter', function () {
           'id': bidRequests[1].bidId,
           'tagid': bidRequests[1].params.uid,
           'ext': {'divid': bidRequests[1].adUnitCode},
-          'bidfloor': 0,
           'banner': {
             'w': 300,
             'h': 250,
@@ -211,7 +210,6 @@ describe('TheMediaGrid Adapter', function () {
           'id': bidRequests[1].bidId,
           'tagid': bidRequests[1].params.uid,
           'ext': {'divid': bidRequests[1].adUnitCode},
-          'bidfloor': 0,
           'banner': {
             'w': 300,
             'h': 250,
@@ -221,7 +219,6 @@ describe('TheMediaGrid Adapter', function () {
           'id': bidRequests[2].bidId,
           'tagid': bidRequests[2].params.uid,
           'ext': {'divid': bidRequests[2].adUnitCode},
-          'bidfloor': 0,
           'video': {
             'w': 400,
             'h': 600,
@@ -259,7 +256,6 @@ describe('TheMediaGrid Adapter', function () {
           'id': bidRequests[1].bidId,
           'tagid': bidRequests[1].params.uid,
           'ext': {'divid': bidRequests[1].adUnitCode},
-          'bidfloor': 0,
           'banner': {
             'w': 300,
             'h': 250,
@@ -269,7 +265,6 @@ describe('TheMediaGrid Adapter', function () {
           'id': bidRequests[2].bidId,
           'tagid': bidRequests[2].params.uid,
           'ext': {'divid': bidRequests[2].adUnitCode},
-          'bidfloor': 0,
           'video': {
             'w': 400,
             'h': 600,
@@ -279,7 +274,6 @@ describe('TheMediaGrid Adapter', function () {
           'id': bidRequests[3].bidId,
           'tagid': bidRequests[3].params.uid,
           'ext': {'divid': bidRequests[3].adUnitCode},
-          'bidfloor': 0,
           'banner': {
             'w': 728,
             'h': 90,
@@ -460,7 +454,7 @@ describe('TheMediaGrid Adapter', function () {
         'floor': 1.50
       };
       const bidRequest = Object.assign({
-        getFloor: _ => {
+        getFloor: (_) => {
           return floorTestData;
         }
       }, bidRequests[1]);

From 804d76c03ff9b6d55acaeb85a0072e437b67ccfb Mon Sep 17 00:00:00 2001
From: Ben Anderson <benanderson@benanderson.us>
Date: Tue, 1 Dec 2020 11:38:49 -0500
Subject: [PATCH 051/304] Add fabrick to eids file (#6022)

* Add entry of fabrickId in Eids #6021

* Add entry of fabrickId in Eids #6021

* Add entry of fabrickId in Eids #6021

* Add entry of fabrickId in Eids #6021

Co-authored-by: Anderson, Ben <Ben.Anderson@team.neustar>
---
 modules/userId/eids.js | 6 ++++++
 modules/userId/eids.md | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index 8118607fbde..2c627416341 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -162,6 +162,12 @@ const USER_IDS_CONFIG = {
   'vmuid': {
     source: 'verizonmedia.com',
     atype: 1
+  },
+
+  // Neustar Fabrick
+  'fabrickId': {
+    source: 'neustar.biz',
+    atype: 1
   }
 };
 
diff --git a/modules/userId/eids.md b/modules/userId/eids.md
index 3e51eff3165..0cf9b6d2d22 100644
--- a/modules/userId/eids.md
+++ b/modules/userId/eids.md
@@ -21,6 +21,14 @@ userIdAsEids = [
         }]
     },
 
+    {
+        source: 'neustar.biz',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+
     {
         source: 'id5-sync.com',
         uids: [{

From 1739fafdb35be2717236bbdd028302e97c976ec2 Mon Sep 17 00:00:00 2001
From: Matt Kendall <1870166+mkendall07@users.noreply.github.com>
Date: Tue, 1 Dec 2020 16:37:43 -0500
Subject: [PATCH 052/304] Added pubProvidedIdSystem to .submodules.json (#6056)

Seemed to be missing, so added it.
---
 modules/.submodules.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/.submodules.json b/modules/.submodules.json
index 36ead7df888..4e02391129a 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -18,7 +18,8 @@
     "quantcastIdSystem",
     "idxIdSystem",
     "fabrickIdSystem",
-    "verizonMediaIdSystem"
+    "verizonMediaIdSystem",
+    "pubProvidedIdSystem"
   ],
   "adpod": [
     "freeWheelAdserverVideo",

From 30fa056a74652f2a6c0bf6a279b36e7c35a46f88 Mon Sep 17 00:00:00 2001
From: Krushmedia <71434282+Krushmedia@users.noreply.github.com>
Date: Wed, 2 Dec 2020 01:22:01 +0200
Subject: [PATCH 053/304] Add getUserSync implementation into adapter (#6052)

* Add getUserSync implementation into adapter
---
 modules/krushmediaBidAdapter.js               | 19 ++++++++++++++
 .../spec/modules/krushmediaBidAdapter_spec.js | 25 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/modules/krushmediaBidAdapter.js b/modules/krushmediaBidAdapter.js
index f70500cc101..de1cce503e3 100644
--- a/modules/krushmediaBidAdapter.js
+++ b/modules/krushmediaBidAdapter.js
@@ -4,6 +4,7 @@ import * as utils from '../src/utils.js';
 
 const BIDDER_CODE = 'krushmedia';
 const AD_URL = 'https://ads4.krushmedia.com/?c=rtb&m=hb';
+const SYNC_URL = 'https://cs.krushmedia.com/html?src=pbjs'
 
 function isBidResponseValid(bid) {
   if (!bid.requestId || !bid.cpm || !bid.creativeId ||
@@ -99,6 +100,24 @@ export const spec = {
     }
     return response;
   },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncUrl = SYNC_URL
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+    return [{
+      type: 'iframe',
+      url: syncUrl
+    }];
+  }
 };
 
 registerBidder(spec);
diff --git a/test/spec/modules/krushmediaBidAdapter_spec.js b/test/spec/modules/krushmediaBidAdapter_spec.js
index 2673627bc6d..3af9ed64c43 100644
--- a/test/spec/modules/krushmediaBidAdapter_spec.js
+++ b/test/spec/modules/krushmediaBidAdapter_spec.js
@@ -301,4 +301,29 @@ describe('KrushmediabBidAdapter', function () {
       expect(serverResponses).to.be.an('array').that.is.empty;
     });
   });
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('iframe')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.krushmedia.com/html?src=pbjs&gdpr=1&gdpr_consent=ALL')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1NNN'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('iframe')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.krushmedia.com/html?src=pbjs&ccpa_consent=1NNN')
+    });
+  });
 });

From a52e943192d039fd13184fbe2118db9d5a4fe06a Mon Sep 17 00:00:00 2001
From: Slind14 <slind014@gmail.com>
Date: Wed, 2 Dec 2020 13:38:09 +0100
Subject: [PATCH 054/304] .babelrc.js - changed IE target from 10 to 11 (#6035)

IE 10 support was dropped a long time ago
---
 .babelrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.babelrc.js b/.babelrc.js
index bece57ec4a5..2fa95d0716e 100644
--- a/.babelrc.js
+++ b/.babelrc.js
@@ -20,7 +20,7 @@ module.exports = {
             "safari >=8",
             "edge >= 14",
             "ff >= 57",
-            "ie >= 10",
+            "ie >= 11",
             "ios >= 8"
           ]
         }

From ca452445ff8c43f05e1b2d686a99f5e558a9f07b Mon Sep 17 00:00:00 2001
From: Harshad Mane <harshad.mane@pubmatic.com>
Date: Wed, 2 Dec 2020 06:22:09 -0800
Subject: [PATCH 055/304] 6060 Fix for: Changing globalVarName causes gulp
 serve tests to fail  (#6069)

* added support for pubcommon, digitrust, id5id

* added support for IdentityLink

* changed the source for id5

* added unit test cases

* changed source param for identityLink

* fixed the breaking test case when globalVarName is changed
---
 test/spec/modules/richaudienceBidAdapter_spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/spec/modules/richaudienceBidAdapter_spec.js b/test/spec/modules/richaudienceBidAdapter_spec.js
index 1c710c46ea2..bdf50f2d7f5 100644
--- a/test/spec/modules/richaudienceBidAdapter_spec.js
+++ b/test/spec/modules/richaudienceBidAdapter_spec.js
@@ -348,7 +348,7 @@ describe('Richaudience adapter tests', function () {
   });
 
   describe('UID test', function () {
-    pbjs.setConfig({
+    config.setConfig({
       consentManagement: {
         cmpApi: 'iab',
         timeout: 5000,
@@ -739,7 +739,7 @@ describe('Richaudience adapter tests', function () {
     }, [], {consentString: '', gdprApplies: true});
     expect(syncs).to.have.lengthOf(0);
 
-    pbjs.setConfig({
+    config.setConfig({
       consentManagement: {
         cmpApi: 'iab',
         timeout: 5000,

From 03ed22133e4ebe8db68ff09bfe59e6af418e421c Mon Sep 17 00:00:00 2001
From: steve-a-districtm <56413795+steve-a-districtm@users.noreply.github.com>
Date: Wed, 2 Dec 2020 09:57:13 -0500
Subject: [PATCH 056/304] update ttl value (#6041)

* allow users to be sent to dmx even when gdpr is configured in prebid

* Change default ttl value

Change default ttl value for banner and video

Co-authored-by: Menelik Tucker <menelik@districtm.net>
Co-authored-by: Tucker <72400387+MenelikTucker-districtm@users.noreply.github.com>
---
 modules/districtmDMXBidAdapter.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/districtmDMXBidAdapter.js b/modules/districtmDMXBidAdapter.js
index 845cff460ee..60f6b9b64b1 100644
--- a/modules/districtmDMXBidAdapter.js
+++ b/modules/districtmDMXBidAdapter.js
@@ -39,9 +39,11 @@ export const spec = {
               nBid.requestId = nBid.impid;
               nBid.width = nBid.w || width;
               nBid.height = nBid.h || height;
+              nBid.ttl = 360;
               nBid.mediaType = bid.mediaTypes && bid.mediaTypes.video ? 'video' : 'banner';
               if (nBid.mediaType) {
                 nBid.vastXml = cleanVast(nBid.adm, nBid.nurl);
+                nBid.ttl = 3600;
               }
               if (nBid.dealid) {
                 nBid.dealId = nBid.dealid;
@@ -51,7 +53,6 @@ export const spec = {
               nBid.netRevenue = true;
               nBid.creativeId = nBid.crid;
               nBid.currency = 'USD';
-              nBid.ttl = 60;
               nBid.meta = nBid.meta || {};
               if (nBid.adomain && nBid.adomain.length > 0) {
                 nBid.meta.advertiserDomains = nBid.adomain;

From 6d29360058627a2d520aa33a9b1590f744d6815c Mon Sep 17 00:00:00 2001
From: Adam Browning <19834421+adam-browning@users.noreply.github.com>
Date: Wed, 2 Dec 2020 17:53:34 +0200
Subject: [PATCH 057/304] oneVideo Adapter - Custom Key Value Pair targeting
 support (SAPR-15478) (#6053)

* Custom key value pair support

* validate values are string or number terary

* validate values are string or number if statement

* custom key value pair unit tests

* restored LiveIntentIdSystem failing unit tests

* keep version 3.0.4

* fix double quotes eslint

* updated md file
---
 modules/oneVideoBidAdapter.js                |  8 +++
 modules/oneVideoBidAdapter.md                |  4 ++
 test/spec/modules/oneVideoBidAdapter_spec.js | 58 ++++++++++++++++++++
 3 files changed, 70 insertions(+)

diff --git a/modules/oneVideoBidAdapter.js b/modules/oneVideoBidAdapter.js
index c5bc054ac04..c287bc2f3b7 100644
--- a/modules/oneVideoBidAdapter.js
+++ b/modules/oneVideoBidAdapter.js
@@ -302,6 +302,14 @@ function getRequestData(bid, consentData, bidRequest) {
     bidData.site.ref = 'https://verizonmedia.com';
     bidData.tmax = 1000;
   }
+  if (bid.params.video.custom && Object.prototype.toString.call(bid.params.video.custom) === '[object Object]') {
+    bidData.imp[0].ext.custom = {};
+    for (const key in bid.params.video.custom) {
+      if (typeof bid.params.video.custom[key] === 'string' || typeof bid.params.video.custom[key] === 'number') {
+        bidData.imp[0].ext.custom[key] = bid.params.video.custom[key];
+      }
+    }
+  }
   return bidData;
 }
 
diff --git a/modules/oneVideoBidAdapter.md b/modules/oneVideoBidAdapter.md
index 72f251aac04..92958af9e83 100644
--- a/modules/oneVideoBidAdapter.md
+++ b/modules/oneVideoBidAdapter.md
@@ -40,6 +40,10 @@ Connects to Verizon Media's Video SSP (AKA ONE Video / Adap.tv) demand source to
                   inventoryid: 123,
                   minduration: 10,
                   maxduration: 30,
+                  custom: {
+                    key1: "value1",
+                    key2: 123345
+                  }
                 },
                 site: {
                     id: 1,
diff --git a/test/spec/modules/oneVideoBidAdapter_spec.js b/test/spec/modules/oneVideoBidAdapter_spec.js
index ae29bcd48ec..331ac8976e6 100644
--- a/test/spec/modules/oneVideoBidAdapter_spec.js
+++ b/test/spec/modules/oneVideoBidAdapter_spec.js
@@ -315,6 +315,64 @@ describe('OneVideoBidAdapter', function () {
       const schain = data.source.ext.schain;
       expect(schain.nodes[0].hp).to.equal(bidRequest.params.video.hp);
     })
+    it('should not accept key values pairs if custom is Undefined ', function () {
+      bidRequest.params.video.custom = null;
+      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const data = requests[0].data;
+      expect(data.imp[0].ext.custom).to.be.undefined;
+    });
+    it('should not accept key values pairs if custom is Array ', function () {
+      bidRequest.params.video.custom = [];
+      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const data = requests[0].data;
+      expect(data.imp[0].ext.custom).to.be.undefined;
+    });
+    it('should not accept key values pairs if custom is Number ', function () {
+      bidRequest.params.video.custom = 123456;
+      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const data = requests[0].data;
+      expect(data.imp[0].ext.custom).to.be.undefined;
+    });
+    it('should not accept key values pairs if custom is String ', function () {
+      bidRequest.params.video.custom = 'keyValuePairs';
+      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const data = requests[0].data;
+      expect(data.imp[0].ext.custom).to.be.undefined;
+    });
+    it('should not accept key values pairs if custom is Boolean ', function () {
+      bidRequest.params.video.custom = true;
+      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const data = requests[0].data;
+      expect(data.imp[0].ext.custom).to.be.undefined;
+    });
+    it('should accept key values pairs if custom is Object ', function () {
+      bidRequest.params.video.custom = {};
+      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const data = requests[0].data;
+      expect(data.imp[0].ext.custom).to.be.a('object');
+    });
+    it('should accept key values pairs if custom is Object ', function () {
+      bidRequest.params.video.custom = {
+        key1: 'value1',
+        key2: 'value2',
+        key3: 4444444,
+        key4: false,
+        key5: {nested: 'object'},
+        key6: ['string', 2, true, null],
+        key7: null,
+        key8: undefined
+      };
+      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const custom = requests[0].data.imp[0].ext.custom;
+      expect(custom['key1']).to.be.a('string');
+      expect(custom['key2']).to.be.a('string');
+      expect(custom['key3']).to.be.a('number');
+      expect(custom['key4']).to.not.exist;
+      expect(custom['key5']).to.not.exist;
+      expect(custom['key6']).to.not.exist;
+      expect(custom['key7']).to.not.exist;
+      expect(custom['key8']).to.not.exist;
+    });
   });
 
   describe('spec.interpretResponse', function () {

From 53b0ed0fbe9fca4cb8bd45d583db6a0de767ae6f Mon Sep 17 00:00:00 2001
From: Neelanjan Sen <14229985+Fawke@users.noreply.github.com>
Date: Wed, 2 Dec 2020 23:27:04 +0530
Subject: [PATCH 058/304] appnexusBidAdapter - remove tpuids (#6074)

---
 modules/appnexusBidAdapter.js                | 6 ------
 test/spec/modules/appnexusBidAdapter_spec.js | 7 +------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index f714472bbb1..203835db611 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -231,16 +231,10 @@ export const spec = {
     const criteoId = utils.deepAccess(bidRequests[0], `userId.criteoId`);
     let eids = [];
     if (criteoId) {
-      let tpuids = [];
-      tpuids.push({
-        'provider': 'criteo',
-        'user_id': criteoId
-      });
       eids.push({
         source: 'criteo.com',
         id: criteoId
       });
-      payload.tpuids = tpuids;
     }
 
     const tdid = utils.deepAccess(bidRequests[0], `userId.tdid`);
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index 21d3da358be..426259639e8 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -808,7 +808,7 @@ describe('AppNexusAdapter', function () {
       expect(request.options).to.deep.equal({withCredentials: false});
     });
 
-    it('should populate eids and tpuids when ttd id and criteo is available', function () {
+    it('should populate eids when ttd id and criteo is available', function () {
       const bidRequest = Object.assign({}, bidRequests[0], {
         userId: {
           tdid: 'sample-userid',
@@ -828,11 +828,6 @@ describe('AppNexusAdapter', function () {
         source: 'criteo.com',
         id: 'sample-criteo-userid',
       });
-
-      expect(payload.tpuids).to.deep.include({
-        provider: 'criteo',
-        user_id: 'sample-criteo-userid',
-      });
     });
 
     it('should populate iab_support object at the root level if omid support is detected', function () {

From bb501f062dbcadfa1e6554b9b33d5471e9b79e71 Mon Sep 17 00:00:00 2001
From: mmoschovas <63253416+mmoschovas@users.noreply.github.com>
Date: Wed, 2 Dec 2020 13:36:36 -0500
Subject: [PATCH 059/304] Rubicon Bid Adapter remove rp_floor param if floor
 not set (#6062)

* RP bid adapter update to not set rp_floor when floor param does not exist. Left logic to set rp_floor to value if above 0.01. If floor param exists and equals 0.01 or below, 0.01 will be passed

* Updated floor logic to be if a value is set greater than or equal to 0.01 then pass it otherwise dont set rp_floor
---
 modules/rubiconBidAdapter.js                |  2 +-
 test/spec/modules/rubiconBidAdapter_spec.js | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index b44ae108b38..e439f7fd2a4 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -460,7 +460,7 @@ export const spec = {
       'zone_id': params.zoneId,
       'size_id': parsedSizes[0],
       'alt_size_ids': parsedSizes.slice(1).join(',') || undefined,
-      'rp_floor': (params.floor = parseFloat(params.floor)) > 0.01 ? params.floor : 0.01,
+      'rp_floor': (params.floor = parseFloat(params.floor)) >= 0.01 ? params.floor : undefined,
       'rp_secure': '1',
       'tk_flint': `${rubiConf.int_type || DEFAULT_INTEGRATION}_v$prebid.version$`,
       'x_source.tid': bidRequest.transactionId,
diff --git a/test/spec/modules/rubiconBidAdapter_spec.js b/test/spec/modules/rubiconBidAdapter_spec.js
index b1ef02a6369..6944034a787 100644
--- a/test/spec/modules/rubiconBidAdapter_spec.js
+++ b/test/spec/modules/rubiconBidAdapter_spec.js
@@ -396,7 +396,10 @@ describe('the rubicon adapter', function () {
       describe('to fastlane', function () {
         it('should make a well-formed request object', function () {
           sandbox.stub(Math, 'random').callsFake(() => 0.1);
-          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          let duplicate = Object.assign(bidderRequest);
+          duplicate.bids[0].params.floor = 0.01;
+
+          let [request] = spec.buildRequests(duplicate.bids, duplicate);
           let data = parseQuery(request.data);
 
           expect(request.url).to.equal('https://fastlane.rubiconproject.com/a/api/fastlane.json');
@@ -551,7 +554,7 @@ describe('the rubicon adapter', function () {
           sandbox.stub(Math, 'random').callsFake(() => 0.1);
           let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
 
-          const referenceOrdering = ['account_id', 'site_id', 'zone_id', 'size_id', 'alt_size_ids', 'p_pos', 'rf', 'p_geo.latitude', 'p_geo.longitude', 'kw', 'tg_v.ucat', 'tg_v.lastsearch', 'tg_v.likes', 'tg_i.rating', 'tg_i.prodtype', 'tk_flint', 'x_source.tid', 'x_source.pchain', 'p_screen_res', 'rp_floor', 'rp_secure', 'tk_user_key', 'tg_fl.eid', 'slots', 'rand'];
+          const referenceOrdering = ['account_id', 'site_id', 'zone_id', 'size_id', 'alt_size_ids', 'p_pos', 'rf', 'p_geo.latitude', 'p_geo.longitude', 'kw', 'tg_v.ucat', 'tg_v.lastsearch', 'tg_v.likes', 'tg_i.rating', 'tg_i.prodtype', 'tk_flint', 'x_source.tid', 'x_source.pchain', 'p_screen_res', 'rp_secure', 'tk_user_key', 'tg_fl.eid', 'slots', 'rand'];
 
           request.data.split('&').forEach((item, i) => {
             expect(item.split('=')[0]).to.equal(referenceOrdering[i]);
@@ -566,7 +569,6 @@ describe('the rubicon adapter', function () {
             'size_id': '15',
             'alt_size_ids': '43',
             'p_pos': 'atf',
-            'rp_floor': '0.01',
             'rp_secure': /[01]/,
             'rand': '0.1',
             'tk_flint': INTEGRATION,
@@ -883,7 +885,6 @@ describe('the rubicon adapter', function () {
               'size_id': '15',
               'alt_size_ids': '43',
               'p_pos': 'atf',
-              'rp_floor': '0.01',
               'rp_secure': /[01]/,
               'rand': '0.1',
               'tk_flint': INTEGRATION,
@@ -2047,7 +2048,6 @@ describe('the rubicon adapter', function () {
             'size_id': 15,
             'alt_size_ids': '43',
             'p_pos': 'atf',
-            'rp_floor': 0.01,
             'rp_secure': /[01]/,
             'tk_flint': INTEGRATION,
             'x_source.tid': 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',

From 571c6a1b0357ec234ba8548534319e9a3f9b1eca Mon Sep 17 00:00:00 2001
From: Jason Snellbaker <jsnellbaker@appnexus.com>
Date: Wed, 2 Dec 2020 15:40:01 -0500
Subject: [PATCH 060/304] Prebid 4.18.0 Release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 48963f36c76..799c730e3cd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.18.0-pre",
+  "version": "4.18.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From b8eb346f72980ce126240efaee87488bb53ffa8f Mon Sep 17 00:00:00 2001
From: Jason Snellbaker <jsnellbaker@appnexus.com>
Date: Wed, 2 Dec 2020 15:53:46 -0500
Subject: [PATCH 061/304] increment pre version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 799c730e3cd..ed4514cee42 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.18.0",
+  "version": "4.19.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From cfe9786a282b3bb6acc9495ca59524b5ba3909ed Mon Sep 17 00:00:00 2001
From: David Carver <54326287+ndxcarver@users.noreply.github.com>
Date: Wed, 2 Dec 2020 15:45:16 -0600
Subject: [PATCH 062/304] LKQD: update adapter to include new parameters
 (#6033)

* LKQD: update adapter to include new parameters

* LKQD: update to use standardized coppa

* LKQD: convert true to 1 for api
---
 modules/lkqdBidAdapter.js                | 10 ++++++++
 test/spec/modules/lkqdBidAdapter_spec.js | 29 ++++++++++++++++++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/modules/lkqdBidAdapter.js b/modules/lkqdBidAdapter.js
index 51d5c48e1fc..0f5782649ad 100644
--- a/modules/lkqdBidAdapter.js
+++ b/modules/lkqdBidAdapter.js
@@ -1,6 +1,7 @@
 import * as utils from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
 
 const BIDDER_CODE = 'lkqd';
 const BID_TTL_DEFAULT = 300;
@@ -148,6 +149,9 @@ function buildRequests(validBidRequests, bidderRequest) {
       if (bidRequest.params.hasOwnProperty('dnt') && bidRequest.params.dnt != null) {
         sspData.dnt = bidRequest.params.dnt;
       }
+      if (config.getConfig('coppa') === true) {
+        sspData.coppa = 1;
+      }
       if (bidRequest.params.hasOwnProperty('pageurl') && bidRequest.params.pageurl != null) {
         sspData.pageurl = bidRequest.params.pageurl;
       } else if (bidderRequest && bidderRequest.refererInfo) {
@@ -177,6 +181,12 @@ function buildRequests(validBidRequests, bidderRequest) {
       sspData.bidWidth = playerWidth;
       sspData.bidHeight = playerHeight;
 
+      for (let k = 1; k <= 40; k++) {
+        if (bidRequest.params.hasOwnProperty(`c${k}`) && bidRequest.params[`c${k}`]) {
+          sspData[`c${k}`] = bidRequest.params[`c${k}`];
+        }
+      }
+
       bidRequests.push({
         method: 'GET',
         url: sspUrl,
diff --git a/test/spec/modules/lkqdBidAdapter_spec.js b/test/spec/modules/lkqdBidAdapter_spec.js
index f10d936a28b..1cd33d9ec59 100644
--- a/test/spec/modules/lkqdBidAdapter_spec.js
+++ b/test/spec/modules/lkqdBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import { spec } from 'modules/lkqdBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
-const { expect } = require('chai');
+import { config } from 'src/config.js';
+import { expect } from 'chai';
 
 describe('LKQD Bid Adapter Test', () => {
   const adapter = newBidder(spec);
@@ -47,7 +48,9 @@ describe('LKQD Bid Adapter Test', () => {
         'bidder': 'lkqd',
         'params': {
           'siteId': '662921',
-          'placementId': '263'
+          'placementId': '263',
+          'c1': 'newWindow',
+          'c20': 'lkqdCustom'
         },
         'adUnitCode': 'lkqd',
         'sizes': [[300, 250], [640, 480]],
@@ -75,6 +78,10 @@ describe('LKQD Bid Adapter Test', () => {
     ];
 
     it('should populate available parameters', () => {
+      sinon.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(true);
+
       const requests = spec.buildRequests(bidRequests);
       expect(requests.length).to.equal(2);
       const r1 = requests[0].data;
@@ -82,14 +89,26 @@ describe('LKQD Bid Adapter Test', () => {
       expect(r1).to.have.string('&sid=662921&');
       expect(r1).to.have.string('&width=300&');
       expect(r1).to.have.string('&height=250&');
+      expect(r1).to.have.string('&coppa=1&');
+      expect(r1).to.have.string('&c1=newWindow&');
+      expect(r1).to.have.string('&c20=lkqdCustom');
       const r2 = requests[1].data;
       expect(r2).to.have.string('pid=263&');
       expect(r2).to.have.string('&sid=662921&');
       expect(r2).to.have.string('&width=640&');
       expect(r2).to.have.string('&height=480&');
+      expect(r2).to.have.string('&coppa=1&');
+      expect(r2).to.have.string('&c1=newWindow&');
+      expect(r2).to.have.string('&c20=lkqdCustom');
+
+      config.getConfig.restore();
     });
 
     it('should not populate unspecified parameters', () => {
+      sinon.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(false);
+
       const requests = spec.buildRequests(bidRequests);
       expect(requests.length).to.equal(2);
       const r1 = requests[0].data;
@@ -99,6 +118,8 @@ describe('LKQD Bid Adapter Test', () => {
       expect(r1).to.not.have.string('&contentlength=');
       expect(r1).to.not.have.string('&contenturl=');
       expect(r1).to.not.have.string('&schain=');
+      expect(r1).to.not.have.string('&c10=');
+      expect(r1).to.not.have.string('coppa');
       const r2 = requests[1].data;
       expect(r2).to.not.have.string('&dnt=');
       expect(r2).to.not.have.string('&contentid=');
@@ -106,6 +127,10 @@ describe('LKQD Bid Adapter Test', () => {
       expect(r2).to.not.have.string('&contentlength=');
       expect(r2).to.not.have.string('&contenturl=');
       expect(r2).to.not.have.string('&schain=');
+      expect(r2).to.not.have.string('&c39=');
+      expect(r2).to.not.have.string('coppa');
+
+      config.getConfig.restore();
     });
 
     it('should handle single size request', () => {

From 19da021b34207fabc36686ee0ea6a2b2fc7d724e Mon Sep 17 00:00:00 2001
From: Meng <5110935+edmonl@users.noreply.github.com>
Date: Thu, 3 Dec 2020 10:07:06 -0500
Subject: [PATCH 063/304] pubGENIUS bid adapter: support video (#6040)

* pubGENIUS bid adapter: support video

* update md doc to show more video params
---
 modules/pubgeniusBidAdapter.js                |  93 ++++++++++++--
 modules/pubgeniusBidAdapter.md                |  35 +++++-
 test/spec/modules/pubgeniusBidAdapter_spec.js | 116 +++++++++++++++++-
 3 files changed, 229 insertions(+), 15 deletions(-)

diff --git a/modules/pubgeniusBidAdapter.js b/modules/pubgeniusBidAdapter.js
index 55f50e4b6a9..88e85a4fd7a 100644
--- a/modules/pubgeniusBidAdapter.js
+++ b/modules/pubgeniusBidAdapter.js
@@ -1,7 +1,7 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { ajax } from '../src/ajax.js';
 import { config } from '../src/config.js';
-import { BANNER } from '../src/mediaTypes.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import {
   deepAccess,
   deepSetValue,
@@ -12,15 +12,16 @@ import {
   isStr,
   logError,
   parseQueryStringParameters,
+  pick,
 } from '../src/utils.js';
 
-const BIDDER_VERSION = '1.0.0';
+const BIDDER_VERSION = '1.1.0';
 const BASE_URL = 'https://ortb.adpearl.io';
 
 export const spec = {
   code: 'pubgenius',
 
-  supportedMediaTypes: [ BANNER ],
+  supportedMediaTypes: [ BANNER, VIDEO ],
 
   isBidRequestValid(bid) {
     const adUnitId = bid.params.adUnitId;
@@ -29,8 +30,13 @@ export const spec = {
       return false;
     }
 
-    const sizes = deepAccess(bid, 'mediaTypes.banner.sizes');
-    return !!(sizes && sizes.length) && sizes.every(size => isArrayOfNums(size, 2));
+    const { mediaTypes } = bid;
+
+    if (mediaTypes.banner) {
+      return isValidBanner(mediaTypes.banner);
+    }
+
+    return isValidVideo(mediaTypes.video, bid.params.video);
   },
 
   buildRequests: function (bidRequests, bidderRequest) {
@@ -141,16 +147,44 @@ export const spec = {
   },
 };
 
+function buildVideoParams(videoMediaType, videoParams) {
+  videoMediaType = videoMediaType || {};
+  const params = pick(videoMediaType, ['api', 'mimes', 'protocols', 'playbackmethod']);
+
+  switch (videoMediaType.context) {
+    case 'instream':
+      params.placement = 1;
+      break;
+    case 'outstream':
+      params.placement = 2;
+      break;
+    default:
+      break;
+  }
+
+  if (videoMediaType.playerSize) {
+    params.w = videoMediaType.playerSize[0][0];
+    params.h = videoMediaType.playerSize[0][1];
+  }
+
+  return Object.assign(params, videoParams);
+}
+
 function buildImp(bid) {
   const imp = {
     id: bid.bidId,
-    banner: {
-      format: deepAccess(bid, 'mediaTypes.banner.sizes').map(size => ({ w: size[0], h: size[1] })),
-      topframe: numericBoolean(!inIframe()),
-    },
     tagid: String(bid.params.adUnitId),
   };
 
+  if (bid.mediaTypes.banner) {
+    imp.banner = {
+      format: bid.mediaTypes.banner.sizes.map(size => ({ w: size[0], h: size[1] })),
+      topframe: numericBoolean(!inIframe()),
+    };
+  } else {
+    imp.video = buildVideoParams(bid.mediaTypes.video, bid.params.video);
+  }
+
   const bidFloor = bid.params.bidFloor;
   if (isNumber(bidFloor)) {
     imp.bidfloor = bidFloor;
@@ -197,7 +231,6 @@ function interpretBid(bid) {
     cpm: bid.price,
     width: bid.w,
     height: bid.h,
-    ad: bid.adm,
     ttl: bid.exp,
     creativeId: bid.crid,
     netRevenue: true,
@@ -209,6 +242,28 @@ function interpretBid(bid) {
     };
   }
 
+  const pbadapter = deepAccess(bid, 'ext.pbadapter') || {};
+  switch (pbadapter.mediaType) {
+    case 'video':
+      if (bid.nurl) {
+        bidResponse.vastUrl = bid.nurl;
+      }
+
+      if (bid.adm) {
+        bidResponse.vastXml = bid.adm;
+      }
+
+      if (pbadapter.cacheKey) {
+        bidResponse.videoCacheKey = pbadapter.cacheKey;
+      }
+
+      bidResponse.mediaType = VIDEO;
+      break;
+    default: // banner by default
+      bidResponse.ad = bid.adm;
+      break;
+  }
+
   return bidResponse;
 }
 
@@ -221,4 +276,22 @@ function getBaseUrl() {
   return (pubg && pubg.endpoint) || BASE_URL;
 }
 
+function isValidSize(size) {
+  return isArrayOfNums(size, 2) && size[0] > 0 && size[1] > 0;
+}
+
+function isValidBanner(banner) {
+  const sizes = banner.sizes;
+  return !!(sizes && sizes.length) && sizes.every(isValidSize);
+}
+
+function isValidVideo(videoMediaType, videoParams) {
+  const params = buildVideoParams(videoMediaType, videoParams);
+
+  return !!(params.placement &&
+    isValidSize([params.w, params.h]) &&
+    params.mimes && params.mimes.length &&
+    isArrayOfNums(params.protocols) && params.protocols.length);
+}
+
 registerBidder(spec);
diff --git a/modules/pubgeniusBidAdapter.md b/modules/pubgeniusBidAdapter.md
index 66851af9c3f..ff23a433331 100644
--- a/modules/pubgeniusBidAdapter.md
+++ b/modules/pubgeniusBidAdapter.md
@@ -50,7 +50,40 @@ var adUnits = [
         }
       }
     ]
-  }
+  },
+  {
+    code: 'test-video',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 360],
+        mimes: ['video/mp4'],
+        protocols: [3],
+      }
+    },
+    bids: [
+      {
+        bidder: 'pubgenius',
+        params: {
+          adUnitId: '1001',
+          bidFloor: 1,
+          test: true,
+
+          // other video parameters as in OpenRTB v2.5 spec
+          video: {
+            skip: 1
+
+            // the following overrides mediaTypes.video of the ad unit
+            placement: 1,
+            w: 640,
+            h: 360,
+            mimes: ['video/mp4'],
+            protocols: [3],
+          }
+        }
+      }
+    ]
+  },
 ];
 ```
 
diff --git a/test/spec/modules/pubgeniusBidAdapter_spec.js b/test/spec/modules/pubgeniusBidAdapter_spec.js
index 4b5bf7efac0..c0b05510707 100644
--- a/test/spec/modules/pubgeniusBidAdapter_spec.js
+++ b/test/spec/modules/pubgeniusBidAdapter_spec.js
@@ -1,8 +1,9 @@
 import { expect } from 'chai';
 
 import { spec } from 'modules/pubgeniusBidAdapter.js';
-import { deepClone, parseQueryStringParameters } from 'src/utils.js';
 import { config } from 'src/config.js';
+import { VIDEO } from 'src/mediaTypes.js';
+import { deepClone, parseQueryStringParameters } from 'src/utils.js';
 import { server } from 'test/mocks/xhr.js';
 
 const {
@@ -23,8 +24,8 @@ describe('pubGENIUS adapter', () => {
   });
 
   describe('supportedMediaTypes', () => {
-    it('should contain only banner', () => {
-      expect(supportedMediaTypes).to.deep.equal(['banner']);
+    it('should contain banner and video', () => {
+      expect(supportedMediaTypes).to.deep.equal(['banner', 'video']);
     });
   });
 
@@ -77,6 +78,51 @@ describe('pubGENIUS adapter', () => {
 
       expect(isBidRequestValid(bid)).to.be.false;
     });
+
+    it('should return false without banner or video', () => {
+      bid.mediaTypes = {};
+
+      expect(isBidRequestValid(bid)).to.be.false;
+    });
+
+    it('should return true with valid video media type', () => {
+      bid.mediaTypes = {
+        video: {
+          context: 'instream',
+          playerSize: [[100, 100]],
+          mimes: ['video/mp4'],
+          protocols: [1],
+        },
+      };
+
+      expect(isBidRequestValid(bid)).to.be.true;
+    });
+
+    it('should return true with valid video params', () => {
+      bid.params.video = {
+        placement: 1,
+        w: 200,
+        h: 200,
+        mimes: ['video/mp4'],
+        protocols: [1],
+      };
+
+      expect(isBidRequestValid(bid)).to.be.true;
+    });
+
+    it('should return false without video protocols', () => {
+      bid.mediaTypes = {
+        video: {
+          context: 'instream',
+          playerSize: [[100, 100]],
+        },
+      };
+      bid.params.video = {
+        mimes: ['video/mp4'],
+      };
+
+      expect(isBidRequestValid(bid)).to.be.false;
+    });
   });
 
   describe('buildRequests', () => {
@@ -143,7 +189,7 @@ describe('pubGENIUS adapter', () => {
           tmax: 1200,
           ext: {
             pbadapter: {
-              version: '1.0.0',
+              version: '1.1.0',
             },
           },
         },
@@ -314,6 +360,44 @@ describe('pubGENIUS adapter', () => {
 
       expect(buildRequests([bidRequest], bidderRequest)).to.deep.equal(expectedRequest);
     });
+
+    it('should build video imp', () => {
+      bidRequest.mediaTypes = {
+        video: {
+          context: 'instream',
+          playerSize: [[200, 100]],
+          mimes: ['video/mp4'],
+          protocols: [2, 3],
+          api: [1, 2],
+          playbackmethod: [3, 4],
+        },
+      };
+      bidRequest.params.video = {
+        minduration: 5,
+        maxduration: 100,
+        skip: 1,
+        skipafter: 1,
+        startdelay: -1,
+      };
+
+      delete expectedRequest.data.imp[0].banner;
+      expectedRequest.data.imp[0].video = {
+        mimes: ['video/mp4'],
+        minduration: 5,
+        maxduration: 100,
+        protocols: [2, 3],
+        w: 200,
+        h: 100,
+        startdelay: -1,
+        placement: 1,
+        skip: 1,
+        skipafter: 1,
+        playbackmethod: [3, 4],
+        api: [1, 2],
+      };
+
+      expect(buildRequests([bidRequest], bidderRequest)).to.deep.equal(expectedRequest);
+    });
   });
 
   describe('interpretResponse', () => {
@@ -370,6 +454,30 @@ describe('pubGENIUS adapter', () => {
     it('should interpret no bids', () => {
       expect(interpretResponse({ body: {} })).to.deep.equal([]);
     });
+
+    it('should interpret video response', () => {
+      serverResponse.body.seatbid[0].bid[0] = {
+        ...serverResponse.body.seatbid[0].bid[0],
+        nurl: 'http://vasturl/cache?id=x',
+        ext: {
+          pbadapter: {
+            mediaType: 'video',
+            cacheKey: 'x',
+          },
+        },
+      };
+
+      delete expectedBidResponse.ad;
+      expectedBidResponse = {
+        ...expectedBidResponse,
+        vastUrl: 'http://vasturl/cache?id=x',
+        vastXml: 'fake_creative',
+        videoCacheKey: 'x',
+        mediaType: VIDEO,
+      };
+
+      expect(interpretResponse(serverResponse)).to.deep.equal([expectedBidResponse]);
+    });
   });
 
   describe('getUserSyncs', () => {

From ddebc4a2f8efb0aaa9c2c26c260bc25c380599b0 Mon Sep 17 00:00:00 2001
From: Jenine Drew <2839303+jeninedrew@users.noreply.github.com>
Date: Thu, 3 Dec 2020 21:12:29 -0500
Subject: [PATCH 064/304] Add Optional Params to Concert Adapter (#6064)

---
 modules/concertBidAdapter.js | 9 ++++++---
 modules/concertBidAdapter.md | 8 ++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/concertBidAdapter.js b/modules/concertBidAdapter.js
index d153ddf9ee2..3eb75799705 100644
--- a/modules/concertBidAdapter.js
+++ b/modules/concertBidAdapter.js
@@ -42,7 +42,7 @@ export const spec = {
         debug: utils.debugTurnedOn(),
         uid: getUid(bidderRequest),
         optedOut: hasOptedOutOfPersonalization(),
-        adapterVersion: '1.1.0',
+        adapterVersion: '1.1.1',
         uspConsent: bidderRequest.uspConsent,
         gdprConsent: bidderRequest.gdprConsent
       }
@@ -53,9 +53,12 @@ export const spec = {
         name: bidRequest.adUnitCode,
         bidId: bidRequest.bidId,
         transactionId: bidRequest.transactionId,
-        sizes: bidRequest.sizes,
+        sizes: bidRequest.params.sizes || bidRequest.sizes,
         partnerId: bidRequest.params.partnerId,
-        slotType: bidRequest.params.slotType
+        slotType: bidRequest.params.slotType,
+        adSlot: bidRequest.params.slot || bidRequest.adUnitCode,
+        placementId: bidRequest.params.placementId || '',
+        site: bidRequest.params.site || bidderRequest.refererInfo.referer
       }
 
       return slot;
diff --git a/modules/concertBidAdapter.md b/modules/concertBidAdapter.md
index faf774946d1..d8736082e5c 100644
--- a/modules/concertBidAdapter.md
+++ b/modules/concertBidAdapter.md
@@ -24,10 +24,14 @@ Module that connects to Concert demand sources
         {
           bidder: "concert",
           params: {
-            partnerId: 'test_partner'
+            partnerId: 'test_partner',
+            site: 'site_name',
+            placementId: 1234567,
+            slot: 'slot_name',
+            sizes: [[1030, 590]]
           }
         }
       ]
     }
   ];
-```
\ No newline at end of file
+```

From 2b730a841b59335ed089269913f4a4d44145db63 Mon Sep 17 00:00:00 2001
From: Olivier <osazos@adagio.io>
Date: Fri, 4 Dec 2020 10:34:25 +0100
Subject: [PATCH 065/304] adagioBidAdapter: add Video support (#6038)

* adagioBidAdapter: add outstream video support

* Lint: semi rule consistency

* IE11 support: remove Array.includes()

* Generate bidResponse.vastUrl based on vastXml dataUri encoding

* Update .md file
---
 modules/adagioBidAdapter.js                | 163 ++++++++++++++++++---
 modules/adagioBidAdapter.md                |  58 +++++++-
 test/spec/modules/adagioBidAdapter_spec.js | 142 ++++++++++++++++--
 3 files changed, 327 insertions(+), 36 deletions(-)

diff --git a/modules/adagioBidAdapter.js b/modules/adagioBidAdapter.js
index b20f832fd42..cab233d5387 100644
--- a/modules/adagioBidAdapter.js
+++ b/modules/adagioBidAdapter.js
@@ -2,23 +2,27 @@ 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 { loadExternalScript } from '../src/adloader.js';
 import JSEncrypt from 'jsencrypt/bin/jsencrypt.js';
 import sha256 from 'crypto-js/sha256.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { getRefererInfo } from '../src/refererDetection.js';
 import { createEidsArray } from './userId/eids.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { Renderer } from '../src/Renderer.js';
+import { OUTSTREAM } from '../src/video.js';
 
 export const BIDDER_CODE = 'adagio';
 export const LOG_PREFIX = 'Adagio:';
-export const VERSION = '2.5.0';
+export const VERSION = '2.6.0';
 export const FEATURES_VERSION = '1';
 export const ENDPOINT = 'https://mp.4dex.io/prebid';
-export const SUPPORTED_MEDIA_TYPES = ['banner'];
+export const SUPPORTED_MEDIA_TYPES = [BANNER, VIDEO];
 export const ADAGIO_TAG_URL = 'https://script.4dex.io/localstore.js';
 export const ADAGIO_LOCALSTORAGE_KEY = 'adagioScript';
 export const GVLID = 617;
 export const storage = getStorageManager(GVLID, 'adagio');
+export const RENDERER_URL = 'https://script.4dex.io/outstream-player.js';
 
 export const ADAGIO_PUBKEY = `-----BEGIN PUBLIC KEY-----
 MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9el0+OEn6fvEh1RdVHQu4cnT0
@@ -27,6 +31,35 @@ t0b0lsHN+W4n9kitS/DZ/xnxWK/9vxhv0ZtL1LL/rwR5Mup7rmJbNtDoNBw4TIGj
 pV6EP3MTLosuUEpLaQIDAQAB
 -----END PUBLIC KEY-----`;
 
+// This provide a whitelist and a basic validation
+// of OpenRTB 2.5 options used by the Adagio SSP.
+// https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf
+export const ORTB_VIDEO_PARAMS = {
+  'mimes': (value) => Array.isArray(value) && value.length > 0 && value.every(v => typeof v === 'string'),
+  'minduration': (value) => utils.isInteger(value),
+  'maxduration': (value) => utils.isInteger(value),
+  'protocols': (value) => Array.isArray(value) && value.every(v => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].indexOf(v) !== -1),
+  'w': (value) => utils.isInteger(value),
+  'h': (value) => utils.isInteger(value),
+  'startdelay': (value) => utils.isInteger(value),
+  'placement': (value) => Array.isArray(value) && value.every(v => [1, 2, 3, 4, 5].indexOf(v) !== -1),
+  'linearity': (value) => [1, 2].indexOf(value) !== -1,
+  'skip': (value) => [0, 1].indexOf(value) !== -1,
+  'skipmin': (value) => utils.isInteger(value),
+  'skipafter': (value) => utils.isInteger(value),
+  'sequence': (value) => utils.isInteger(value),
+  'battr': (value) => Array.isArray(value) && value.every(v => Array.from({length: 17}, (_, i) => i + 1).indexOf(v) !== -1),
+  'maxextended': (value) => utils.isInteger(value),
+  'minbitrate': (value) => utils.isInteger(value),
+  'maxbitrate': (value) => utils.isInteger(value),
+  'boxingallowed': (value) => [0, 1].indexOf(value) !== -1,
+  'playbackmethod': (value) => Array.isArray(value) && value.every(v => [1, 2, 3, 4, 5, 6].indexOf(v) !== -1),
+  'playbackend': (value) => [1, 2, 3].indexOf(value) !== -1,
+  'delivery': (value) => [1, 2, 3].indexOf(value) !== -1,
+  'pos': (value) => [0, 1, 2, 3, 4, 5, 6, 7].indexOf(value) !== -1,
+  'api': (value) => Array.isArray(value) && value.every(v => [1, 2, 3, 4, 5, 6].indexOf(v) !== -1)
+};
+
 let currentWindow;
 
 export function adagioScriptFromLocalStorageCb(ls) {
@@ -64,7 +97,7 @@ export function adagioScriptFromLocalStorageCb(ls) {
 
 export function getAdagioScript() {
   storage.getDataFromLocalStorage(ADAGIO_LOCALSTORAGE_KEY, (ls) => {
-    internal.adagioScriptFromLocalStorageCb(ls)
+    internal.adagioScriptFromLocalStorageCb(ls);
   });
 
   storage.localStorageIsEnabled(isValid => {
@@ -335,7 +368,7 @@ function getOrAddAdagioAdUnit(adUnitCode) {
   w.ADAGIO = w.ADAGIO || {};
 
   if (w.ADAGIO.adUnits[adUnitCode]) {
-    return w.ADAGIO.adUnits[adUnitCode]
+    return w.ADAGIO.adUnits[adUnitCode];
   }
 
   return w.ADAGIO.adUnits[adUnitCode] = {};
@@ -435,7 +468,7 @@ function getElementFromTopWindow(element, currentWindow) {
 };
 
 function autoDetectAdUnitElementId(adUnitCode) {
-  const autoDetectedAdUnit = utils.getGptSlotInfoForAdUnitCode(adUnitCode)
+  const autoDetectedAdUnit = utils.getGptSlotInfoForAdUnitCode(adUnitCode);
   let adUnitElementId = null;
 
   if (autoDetectedAdUnit && autoDetectedAdUnit.divId) {
@@ -450,16 +483,16 @@ function autoDetectEnvironment() {
   let environment;
   switch (device) {
     case 2:
-      environment = 'desktop'
+      environment = 'desktop';
       break;
     case 4:
-      environment = 'mobile'
+      environment = 'mobile';
       break;
     case 5:
-      environment = 'tablet'
+      environment = 'tablet';
       break;
   };
-  return environment
+  return environment;
 };
 
 function getFeatures(bidRequest, bidderRequest) {
@@ -507,6 +540,21 @@ function getFeatures(bidRequest, bidderRequest) {
   return features;
 };
 
+function isRendererPreferredFromPublisher(bidRequest) {
+  // renderer defined at adUnit level
+  const adUnitRenderer = utils.deepAccess(bidRequest, 'renderer');
+  const hasValidAdUnitRenderer = !!(adUnitRenderer && adUnitRenderer.url && adUnitRenderer.render);
+
+  // renderer defined at adUnit.mediaTypes level
+  const mediaTypeRenderer = utils.deepAccess(bidRequest, 'mediaTypes.video.renderer');
+  const hasValidMediaTypeRenderer = !!(mediaTypeRenderer && mediaTypeRenderer.url && mediaTypeRenderer.render);
+
+  return !!(
+    (hasValidAdUnitRenderer && !(adUnitRenderer.backupOnly === true)) ||
+    (hasValidMediaTypeRenderer && !(mediaTypeRenderer.backupOnly === true))
+  );
+}
+
 export const internal = {
   enqueue,
   getOrAddAdagioAdUnit,
@@ -521,7 +569,8 @@ export const internal = {
   getRefererInfo,
   adagioScriptFromLocalStorageCb,
   getCurrentWindow,
-  canAccessTopWindow
+  canAccessTopWindow,
+  isRendererPreferredFromPublisher
 };
 
 function _getGdprConsent(bidderRequest) {
@@ -539,7 +588,7 @@ function _getGdprConsent(bidderRequest) {
   const consent = {};
 
   if (apiVersion !== undefined) {
-    consent.apiVersion = apiVersion
+    consent.apiVersion = apiVersion;
   }
 
   if (consentString !== undefined) {
@@ -575,10 +624,62 @@ function _getSchain(bidRequest) {
 
 function _getEids(bidRequest) {
   if (utils.deepAccess(bidRequest, 'userId')) {
-    return createEidsArray(bidRequest.userId)
+    return createEidsArray(bidRequest.userId);
   }
 }
 
+function _buildVideoBidRequest(bidRequest) {
+  const videoAdUnitParams = utils.deepAccess(bidRequest, 'mediaTypes.video', {});
+  const videoBidderParams = utils.deepAccess(bidRequest, 'params.video', {});
+  const computedParams = {};
+
+  // Special case for playerSize.
+  // Eeach props will be overrided if they are defined in config.
+  if (Array.isArray(videoAdUnitParams.playerSize)) {
+    const tempSize = (Array.isArray(videoAdUnitParams.playerSize[0])) ? videoAdUnitParams.playerSize[0] : videoAdUnitParams.playerSize;
+    computedParams.w = tempSize[0];
+    computedParams.h = tempSize[1];
+  }
+
+  const videoParams = {
+    ...computedParams,
+    ...videoAdUnitParams,
+    ...videoBidderParams
+  };
+
+  if (videoParams.context && videoParams.context === OUTSTREAM) {
+    bidRequest.mediaTypes.video.playerName = (internal.isRendererPreferredFromPublisher(bidRequest)) ? 'other' : 'adagio';
+
+    if (bidRequest.mediaTypes.video.playerName === 'other') {
+      utils.logWarn(`${LOG_PREFIX} renderer.backupOnly has not been set. Adagio recommends to use its own player to get expected behavior.`);
+    }
+  }
+
+  // Only whitelisted OpenRTB options need to be validated.
+  // Other options will still remain in the `mediaTypes.video` object
+  // sent in the ad-request, but will be ignored by the SSP.
+  Object.keys(ORTB_VIDEO_PARAMS).forEach(paramName => {
+    if (videoParams.hasOwnProperty(paramName)) {
+      if (ORTB_VIDEO_PARAMS[paramName](videoParams[paramName])) {
+        bidRequest.mediaTypes.video[paramName] = videoParams[paramName];
+      } else {
+        delete bidRequest.mediaTypes.video[paramName];
+        utils.logWarn(`${LOG_PREFIX} The OpenRTB video param ${paramName} has been skipped due to misformating. Please refer to OpenRTB 2.5 spec.`);
+      }
+    }
+  });
+}
+
+function _renderer(bid) {
+  bid.renderer.push(() => {
+    if (typeof window.ADAGIO.outstreamPlayer === 'function') {
+      window.ADAGIO.outstreamPlayer(bid);
+    } else {
+      utils.logError(`${LOG_PREFIX} Adagio outstream player is not defined`);
+    }
+  });
+}
+
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
@@ -600,7 +701,7 @@ export const spec = {
       ...params,
       adUnitElementId,
       environment
-    }
+    };
 
     const debugData = () => ({
       action: 'pb-dbg',
@@ -631,7 +732,7 @@ export const spec = {
     // Store adUnits config.
     // If an adUnitCode has already been stored, it will be replaced.
     w.ADAGIO = w.ADAGIO || {};
-    w.ADAGIO.pbjsAdUnits = w.ADAGIO.pbjsAdUnits.filter((adUnit) => adUnit.code !== adUnitCode)
+    w.ADAGIO.pbjsAdUnits = w.ADAGIO.pbjsAdUnits.filter((adUnit) => adUnit.code !== adUnitCode);
     w.ADAGIO.pbjsAdUnits.push({
       code: adUnitCode,
       mediaTypes: mediaTypes || {},
@@ -667,6 +768,11 @@ export const spec = {
     const eids = _getEids(validBidRequests[0]) || [];
     const adUnits = utils._map(validBidRequests, (bidRequest) => {
       bidRequest.features = internal.getFeatures(bidRequest, bidderRequest);
+
+      if (utils.deepAccess(bidRequest, 'mediaTypes.video')) {
+        _buildVideoBidRequest(bidRequest);
+      }
+
       return bidRequest;
     });
 
@@ -674,7 +780,7 @@ export const spec = {
     const groupedAdUnits = adUnits.reduce((groupedAdUnits, adUnit) => {
       adUnit.params.organizationId = adUnit.params.organizationId.toString();
 
-      groupedAdUnits[adUnit.params.organizationId] = groupedAdUnits[adUnit.params.organizationId] || []
+      groupedAdUnits[adUnit.params.organizationId] = groupedAdUnits[adUnit.params.organizationId] || [];
       groupedAdUnits[adUnit.params.organizationId].push(adUnit);
 
       return groupedAdUnits;
@@ -709,7 +815,7 @@ export const spec = {
         options: {
           contentType: 'text/plain'
         }
-      }
+      };
     });
 
     return requests;
@@ -730,7 +836,30 @@ export const spec = {
         if (response.bids) {
           response.bids.forEach(bidObj => {
             const bidReq = (find(bidRequest.data.adUnits, bid => bid.bidId === bidObj.requestId));
+
             if (bidReq) {
+              if (bidObj.mediaType === VIDEO) {
+                const mediaTypeContext = utils.deepAccess(bidReq, 'mediaTypes.video.context');
+                // Adagio SSP returns a `vastXml` only. No `vastUrl` nor `videoCacheKey`.
+                if (!bidObj.vastUrl && bidObj.vastXml) {
+                  bidObj.vastUrl = 'data:text/xml;charset=utf-8;base64,' + btoa(bidObj.vastXml.replace(/\\"/g, '"'));
+                }
+
+                if (mediaTypeContext === OUTSTREAM) {
+                  bidObj.renderer = Renderer.install({
+                    id: bidObj.requestId,
+                    adUnitCode: bidObj.adUnitCode,
+                    url: bidObj.urlRenderer || RENDERER_URL,
+                    config: {
+                      ...utils.deepAccess(bidReq, 'mediaTypes.video'),
+                      ...utils.deepAccess(bidObj, 'outstream', {})
+                    }
+                  });
+
+                  bidObj.renderer.setRender(_renderer);
+                }
+              }
+
               bidObj.site = bidReq.params.site;
               bidObj.placement = bidReq.params.placement;
               bidObj.pagetype = bidReq.params.pagetype;
diff --git a/modules/adagioBidAdapter.md b/modules/adagioBidAdapter.md
index b34cc3fe37a..c55a24f1115 100644
--- a/modules/adagioBidAdapter.md
+++ b/modules/adagioBidAdapter.md
@@ -22,10 +22,10 @@ Connects to Adagio demand source to fetch bids.
         bids: [{
           bidder: 'adagio', // Required
           params: {
-            organizationId: '0', // Required - Organization ID provided by Adagio.
-            site: 'news-of-the-day', // Required - Site Name provided by Adagio.
-            placement: 'ban_atf', // Required. Refers to the placement of an adunit in a page. Must not contain any information about the type of device. Other example: `mpu_btf'.
-            adUnitElementId: 'dfp_banniere_atf', // Required - AdUnit element id. Refers to the adunit id in a page. Usually equals to the adunit code above.
+            organizationId: '1002', // Required - Organization ID provided by Adagio.
+            site: 'adagio-io', // Required - Site Name provided by Adagio.
+            placement: 'in_article', // Required. Refers to the placement of an adunit in a page. Must not contain any information about the type of device. Other example: `mpu_btf'.
+            adUnitElementId: 'article_outstream', // Required - AdUnit element id. Refers to the adunit id in a page. Usually equals to the adunit code above.
 
             // The following params are limited to 30 characters,
             // and can only contain the following characters:
@@ -37,7 +37,54 @@ Connects to Adagio demand source to fetch bids.
             environment: 'mobile', // Recommended. Environment where the page is displayed.
             category: 'sport', // Recommended. Category of the content displayed in the page.
             subcategory: 'handball', // Optional. Subcategory of the content displayed in the page.
-            postBid: false // Optional. Use it in case of Post-bid integration only.
+            postBid: false, // Optional. Use it in case of Post-bid integration only.
+            // Optional debug mode, used to get a bid response with expected cpm.
+            debug: {
+              enabled: true,
+              cpm: 3.00 // default to 1.00
+            }
+          }
+        }]
+      },
+      {
+        code: 'article_outstream',
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            playerSize: [640, 480],
+            mimes: ['video/mp4'],
+            skip: 1
+            // Other OpenRTB 2.5 video options…
+          }
+        },
+        bids: [{
+          bidder: 'adagio', // Required
+          params: {
+            organizationId: '1002', // Required - Organization ID provided by Adagio.
+            site: 'adagio-io', // Required - Site Name provided by Adagio.
+            placement: 'in_article', // Required. Refers to the placement of an adunit in a page. Must not contain any information about the type of device. Other example: `mpu_btf'.
+            adUnitElementId: 'article_outstream', // Required - AdUnit element id. Refers to the adunit id in a page. Usually equals to the adunit code above.
+
+            // The following params are limited to 30 characters,
+            // and can only contain the following characters:
+            // - alphanumeric (A-Z+a-z+0-9, case-insensitive)
+            // - dashes `-`
+            // - underscores `_`
+            // Also, each param can have at most 50 unique active values (case-insensitive).
+            pagetype: 'article', // Highly recommended. The pagetype describes what kind of content will be present in the page.
+            environment: 'mobile', // Recommended. Environment where the page is displayed.
+            category: 'sport', // Recommended. Category of the content displayed in the page.
+            subcategory: 'handball', // Optional. Subcategory of the content displayed in the page.
+            postBid: false, // Optional. Use it in case of Post-bid integration only.
+            video: {
+              skip: 0
+              // OpenRTB 2.5 video options defined here override ones defined in mediaTypes.
+            },
+            // Optional debug mode, used to get a bid response with expected cpm.
+            debug: {
+              enabled: true,
+              cpm: 3.00 // default to 1.00
+            }
           }
         }]
       }
@@ -88,5 +135,4 @@ Connects to Adagio demand source to fetch bids.
         ]
       }
     }
-
 ```
diff --git a/test/spec/modules/adagioBidAdapter_spec.js b/test/spec/modules/adagioBidAdapter_spec.js
index 86fb2e7cbd3..2cf97a1129b 100644
--- a/test/spec/modules/adagioBidAdapter_spec.js
+++ b/test/spec/modules/adagioBidAdapter_spec.js
@@ -1,6 +1,16 @@
 import find from 'core-js-pure/features/array/find.js';
 import { expect } from 'chai';
-import { _features, internal as adagio, adagioScriptFromLocalStorageCb, getAdagioScript, storage, spec, ENDPOINT, VERSION } from '../../../modules/adagioBidAdapter.js';
+import {
+  _features,
+  internal as adagio,
+  adagioScriptFromLocalStorageCb,
+  getAdagioScript,
+  storage,
+  spec,
+  ENDPOINT,
+  VERSION,
+  RENDERER_URL
+} from '../../../modules/adagioBidAdapter.js';
 import { loadExternalScript } from '../../../src/adloader.js';
 import * as utils from '../../../src/utils.js';
 import { config } from 'src/config.js';
@@ -107,7 +117,7 @@ describe('Adagio bid adapter', () => {
     adagioMock = sinon.mock(adagio);
     utilsMock = sinon.mock(utils);
 
-    sandbox = sinon.sandbox.create();
+    sandbox = sinon.createSandbox();
   });
 
   afterEach(() => {
@@ -254,7 +264,7 @@ describe('Adagio bid adapter', () => {
         // replace by the values defined in beforeEach
         window.top.ADAGIO = {
           ...window.ADAGIO
-        }
+        };
 
         spec.isBidRequestValid(bid01);
         spec.isBidRequestValid(bid02);
@@ -384,6 +394,81 @@ describe('Adagio bid adapter', () => {
       expect(requests[0].data.adUnits[0].features.url).to.not.exist;
     });
 
+    describe('With video mediatype', function() {
+      context('Outstream video', function() {
+        it('should logWarn if user does not set renderer.backupOnly: true', function() {
+          sandbox.spy(utils, 'logWarn');
+          const bid01 = new BidRequestBuilder({
+            adUnitCode: 'adunit-code-01',
+            mediaTypes: {
+              banner: { sizes: [[300, 250]] },
+              video: {
+                context: 'outstream',
+                playerSize: [[300, 250]],
+                renderer: {
+                  url: 'https://url.tld',
+                  render: () => true
+                }
+              }
+            },
+          }).withParams().build();
+          const bidderRequest = new BidderRequestBuilder().build();
+          const request = spec.buildRequests([bid01], bidderRequest)[0];
+
+          expect(request.data.adUnits[0].mediaTypes.video.playerName).to.equal('other');
+          sinon.assert.calledWith(utils.logWarn, 'Adagio: renderer.backupOnly has not been set. Adagio recommends to use its own player to get expected behavior.');
+        });
+      });
+
+      it('Update mediaTypes.video with OpenRTB options. Validate and sanitize whitelisted OpenRTB', function() {
+        sandbox.spy(utils, 'logWarn');
+        const bid01 = new BidRequestBuilder({
+          adUnitCode: 'adunit-code-01',
+          mediaTypes: {
+            banner: { sizes: [[300, 250]] },
+            video: {
+              context: 'outstream',
+              playerSize: [[300, 250]],
+              mimes: ['video/mp4'],
+              api: 5, // will be removed because invalid
+              playbackmethod: [7], // will be removed because invalid
+            }
+          },
+        }).withParams({
+          // options in video, will overide
+          video: {
+            skip: 1,
+            skipafter: 4,
+            minduration: 10,
+            maxduration: 30,
+            placement: [3],
+            protocols: [8]
+          }
+        }).build();
+
+        const bidderRequest = new BidderRequestBuilder().build();
+        const expected = {
+          context: 'outstream',
+          playerSize: [[300, 250]],
+          playerName: 'adagio',
+          mimes: ['video/mp4'],
+          skip: 1,
+          skipafter: 4,
+          minduration: 10,
+          maxduration: 30,
+          placement: [3],
+          protocols: [8],
+          w: 300,
+          h: 250
+        };
+
+        const requests = spec.buildRequests([bid01], bidderRequest);
+        expect(requests).to.have.lengthOf(1);
+        expect(requests[0].data.adUnits[0].mediaTypes.video).to.deep.equal(expected);
+        sinon.assert.calledTwice(utils.logWarn);
+      });
+    });
+
     describe('with sChain', function() {
       const schain = {
         ver: '1.0',
@@ -550,7 +635,7 @@ describe('Adagio bid adapter', () => {
     describe('with USPrivacy', function() {
       const bid01 = new BidRequestBuilder().withParams().build();
 
-      const consent = 'Y11N'
+      const consent = 'Y11N';
 
       it('should send the USPrivacy "ccpa.uspConsent" in the request', function () {
         const bidderRequest = new BidderRequestBuilder({
@@ -579,7 +664,7 @@ describe('Adagio bid adapter', () => {
       const userId = {
         sharedid: {id: '01EAJWWNEPN3CYMM5N8M5VXY22', third: '01EAJWWNEPN3CYMM5N8M5VXY22'},
         unsuported: '666'
-      }
+      };
 
       it('should send "user.eids" in the request for Prebid.js supported modules only', function() {
         const bid01 = new BidRequestBuilder({
@@ -601,11 +686,11 @@ describe('Adagio bid adapter', () => {
               id: '01EAJWWNEPN3CYMM5N8M5VXY22'
             }
           ]
-        }]
+        }];
 
-        expect(requests[0].data.user.eids).to.have.lengthOf(1)
-        expect(requests[0].data.user.eids).to.deep.equal(expected)
-      })
+        expect(requests[0].data.user.eids).to.have.lengthOf(1);
+        expect(requests[0].data.user.eids).to.deep.equal(expected);
+      });
 
       it('should send an empty "user.eids" array in the request if userId module is unsupported', function() {
         const bid01 = new BidRequestBuilder({
@@ -618,9 +703,9 @@ describe('Adagio bid adapter', () => {
 
         const requests = spec.buildRequests([bid01], bidderRequest);
 
-        expect(requests[0].data.user.eids).to.be.empty
-      })
-    })
+        expect(requests[0].data.user.eids).to.be.empty;
+      });
+    });
   });
 
   describe('interpretResponse()', function() {
@@ -732,6 +817,37 @@ describe('Adagio bid adapter', () => {
 
       utilsMock.verify();
     });
+
+    describe('Response with video outstream', () => {
+      const bidRequestWithOutstream = utils.deepClone(bidRequest);
+      bidRequestWithOutstream.data.adUnits[0].mediaTypes.video = {
+        context: 'outstream',
+        playerSize: [[300, 250]],
+        mimes: ['video/mp4'],
+        skip: true
+      };
+
+      const serverResponseWithOutstream = utils.deepClone(serverResponse);
+      serverResponseWithOutstream.body.bids[0].vastXml = '<VAST version="4.0"><Ad></Ad></VAST>';
+      serverResponseWithOutstream.body.bids[0].mediaType = 'video';
+      serverResponseWithOutstream.body.bids[0].outstream = {
+        bvwUrl: 'https://foo.baz',
+        impUrl: 'https://foo.bar'
+      };
+
+      it('should set a renderer in video outstream context', function() {
+        const bidResponse = spec.interpretResponse(serverResponseWithOutstream, bidRequestWithOutstream)[0];
+        expect(bidResponse).to.have.any.keys('outstream', 'renderer', 'mediaType');
+        expect(bidResponse.renderer).to.be.a('object');
+        expect(bidResponse.renderer.url).to.equal(RENDERER_URL);
+        expect(bidResponse.renderer.config.bvwUrl).to.be.ok;
+        expect(bidResponse.renderer.config.impUrl).to.be.ok;
+        expect(bidResponse.renderer.loaded).to.not.be.ok;
+        expect(bidResponse.width).to.equal(300);
+        expect(bidResponse.height).to.equal(250);
+        expect(bidResponse.vastUrl).to.match(/^data:text\/xml;/)
+      });
+    });
   });
 
   describe('getUserSyncs()', function() {
@@ -1195,7 +1311,7 @@ describe('Adagio bid adapter', () => {
 
         expect(loadExternalScript.called).to.be.false;
         expect(localStorage.getItem(ADAGIO_LOCALSTORAGE_KEY)).to.be.null;
-      })
+      });
     });
 
     it('should verify valid hash with valid script', function () {

From 5552473087d8e80d953ada7710206c9e1387252e Mon Sep 17 00:00:00 2001
From: Telaria Engineering <36203956+telariaEng@users.noreply.github.com>
Date: Fri, 4 Dec 2020 03:10:45 -0800
Subject: [PATCH 066/304] Not using utils.isEmpty on non objects (#6036)

* Added telaria bid adapter

* more documentation

* Added more test cases. And improved some code in the adapter

* Removed the check for optional params, they are handled in the server. Also updated certain param names used in  the test spec.

* added some spaces to fix CircleCI tests

* added some spaces to fix CircleCI tests

* fixed code indentation in /spec/AnalyticsAdapter_spec.js which causing the CircleCI tests to fail.

* Reverted the changes

* merged with prebid master.

* creative Id is required when we build a response but our server doesn't always have the crid, so using a sentinel value when we don't have the crid.

* - removed an un used method
- Removed the package-lock file.

* merging to master

* updated telaria bid adapter to use player size provided by the bid.mediaTypes.video.playerSize instead of bid.sizes.

https://github.com/prebid/Prebid.js/issues/3331

* - removed the requirement for having player size
- updated the test spec to reflect the above change
- removed changes to the package-lock.json file.

* added a param to the ad call url to let us know that the request is coming via hb.

* to lower casing the bidder code.

* Merge branch 'master' of https://github.com/prebid/Prebid.js

# Conflicts:
#	modules/telariaBidAdapter.js

Added GDPR support

* Sending the gdpr & gdpr consent string only if they're defined

* - Updated the test ad unit to use 'telaria' as the bidder code.
- Added an example URL.

* using the bidder code constant

* - Implemented the 'onTimeout' callback to fire a pixel when there's a timeout.
- Added the ability to serialize an schain object according to the description provided here: https://github.com/InteractiveAdvertisingBureau/openrtb/blob/master/supplychainobject.md

* some mods to the schain tag generation

* - added tests for schain param checking.

* - fixed a malformed url for timeouts

* - Removed a trailing ',' while generating a schain param.

* - Using the schain object from validBidRequest if present. Reverting to checking if params has it if not.

* - reverting changes to merge with master

* - Resolving merge issues

* - some formatting changes

* using val !== '' instead of utils.isEmpty(val)

* Checking for undefined in the getEncodedValIfNotEmpty method

Co-authored-by: Vinay Prasad <vprasad@tremorvideo.com>
Co-authored-by: Vinay Prasad <vprasad@telaria.com>
---
 modules/telariaBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/telariaBidAdapter.js b/modules/telariaBidAdapter.js
index acc20f6b183..71651b5af94 100644
--- a/modules/telariaBidAdapter.js
+++ b/modules/telariaBidAdapter.js
@@ -124,7 +124,7 @@ function getDefaultSrcPageUrl() {
 }
 
 function getEncodedValIfNotEmpty(val) {
-  return !utils.isEmpty(val) ? encodeURIComponent(val) : '';
+  return (val !== '' && val !== undefined) ? encodeURIComponent(val) : '';
 }
 
 /**

From 4b0b82f629f952716cb065fd11b9cfb6e8497c1d Mon Sep 17 00:00:00 2001
From: iskmerof <matt.foremski@gmail.com>
Date: Fri, 4 Dec 2020 06:47:55 -0500
Subject: [PATCH 067/304] Update adkernelBidAdapter.js for client alias (#6055)

* Update adkernelBidAdapter.js for client alias

* Update test unit to match new alias bidder count
---
 modules/adkernelBidAdapter.js                | 2 +-
 test/spec/modules/adkernelBidAdapter_spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
index 29990ef1c44..c34902eda46 100644
--- a/modules/adkernelBidAdapter.js
+++ b/modules/adkernelBidAdapter.js
@@ -52,7 +52,7 @@ const NATIVE_INDEX = NATIVE_MODEL.reduce((acc, val, idx) => {
 export const spec = {
 
   code: 'adkernel',
-  aliases: ['headbidding', 'adsolut', 'oftmediahb', 'audiencemedia', 'waardex_ak', 'roqoon', 'andbeyond', 'adbite'],
+  aliases: ['headbidding', 'adsolut', 'oftmediahb', 'audiencemedia', 'waardex_ak', 'roqoon', 'andbeyond', 'adbite', 'houseofpubs'],
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   /**
diff --git a/test/spec/modules/adkernelBidAdapter_spec.js b/test/spec/modules/adkernelBidAdapter_spec.js
index 70789c4b933..4d3dca7f344 100644
--- a/test/spec/modules/adkernelBidAdapter_spec.js
+++ b/test/spec/modules/adkernelBidAdapter_spec.js
@@ -556,7 +556,7 @@ describe('Adkernel adapter', function () {
 
   describe('adapter configuration', () => {
     it('should have aliases', () => {
-      expect(spec.aliases).to.have.lengthOf(8);
+      expect(spec.aliases).to.have.lengthOf(9);
     });
   });
 

From 8107da60820c5b5305b391c025d076cff35bc232 Mon Sep 17 00:00:00 2001
From: Rich Audience <integrations@richaudience.com>
Date: Fri, 4 Dec 2020 14:08:49 +0100
Subject: [PATCH 068/304] Add GVLID RichaudienceAdapter (#6071)

* Add GVLID RichaudienceAdapter

* Update package-lock.json

Co-authored-by: sgimenez <sergi.gimenez@richaudience.com>
---
 modules/richaudienceBidAdapter.js             |  1 +
 .../modules/richaudienceBidAdapter_spec.js    | 27 +++++++++++--------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/modules/richaudienceBidAdapter.js b/modules/richaudienceBidAdapter.js
index 3b899e2179d..a6b4202fc91 100755
--- a/modules/richaudienceBidAdapter.js
+++ b/modules/richaudienceBidAdapter.js
@@ -9,6 +9,7 @@ let REFERER = '';
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 108,
   aliases: ['ra'],
   supportedMediaTypes: [BANNER, VIDEO],
 
diff --git a/test/spec/modules/richaudienceBidAdapter_spec.js b/test/spec/modules/richaudienceBidAdapter_spec.js
index bdf50f2d7f5..90723fb863f 100644
--- a/test/spec/modules/richaudienceBidAdapter_spec.js
+++ b/test/spec/modules/richaudienceBidAdapter_spec.js
@@ -353,20 +353,25 @@ describe('Richaudience adapter tests', function () {
         cmpApi: 'iab',
         timeout: 5000,
         allowAuctionWithoutConsent: true
+      },
+      userSync: {
+        userIds: [{
+          name: 'id5Id',
+          params: {
+            partner: 173, // change to the Partner Number you received from ID5
+            pd: 'MT1iNTBjY...' // optional, see table below for a link to how to generate this
+          },
+          storage: {
+            type: 'html5', // "html5" is the required storage type
+            name: 'id5id', // "id5id" is the required storage name
+            expires: 90, // storage lasts for 90 days
+            refreshInSeconds: 8 * 3600 // refresh ID every 8 hours to ensure it's fresh
+          }
+        }],
+        auctionDelay: 50 // 50ms maximum auction delay, applies to all userId modules
       }
     });
     it('Verify build id5', function () {
-      DEFAULT_PARAMS_WO_OPTIONAL[0].userId = {};
-      DEFAULT_PARAMS_WO_OPTIONAL[0].userId.id5id = { uid: 'id5-user-id' };
-
-      var request = spec.buildRequests(DEFAULT_PARAMS_WO_OPTIONAL, DEFAULT_PARAMS_GDPR);
-      var requestContent = JSON.parse(request[0].data);
-
-      expect(requestContent.user).to.deep.equal([{
-        'userId': 'id5-user-id',
-        'source': 'id5-sync.com'
-      }]);
-
       var request;
       DEFAULT_PARAMS_WO_OPTIONAL[0].userId = {};
       DEFAULT_PARAMS_WO_OPTIONAL[0].userId.id5id = { uid: 1 };

From 8ea3f3b2727439464858bcfcbbc077d863e45c58 Mon Sep 17 00:00:00 2001
From: susyt <susan@fox.camp>
Date: Fri, 4 Dec 2020 08:45:09 -0800
Subject: [PATCH 069/304] GumGum: sets mediaType of bidRequest depending on
 product id (#6066)

* adds support for zone and pubId params

* adds support for iriscat field

* sets mediatype depending on product id

* Update doc for mediaType needed for video products
---
 modules/gumgumBidAdapter.js                |  5 ++--
 modules/gumgumBidAdapter.md                | 27 ++++++++++++++++-
 test/spec/modules/gumgumBidAdapter_spec.js | 34 +++++++++++++++-------
 3 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/modules/gumgumBidAdapter.js b/modules/gumgumBidAdapter.js
index 3206b7e1727..2cb5ce61064 100644
--- a/modules/gumgumBidAdapter.js
+++ b/modules/gumgumBidAdapter.js
@@ -403,6 +403,7 @@ function interpretResponse (serverResponse, bidRequest) {
   } = Object.assign(defaultResponse, serverResponseBody)
   let data = bidRequest.data || {}
   let product = data.pi
+  let mediaType = (product === 6 || product === 7) ? VIDEO : BANNER
   let isTestUnit = (product === 3 && data.si === 9)
   let sizes = utils.parseSizesInput(bidRequest.sizes)
   let [width, height] = sizes[0].split('x')
@@ -424,9 +425,9 @@ function interpretResponse (serverResponse, bidRequest) {
     bidResponses.push({
       // dealId: DEAL_ID,
       // referrer: REFERER,
-      ...(product === 7 && { vastXml: markup, mediaType: VIDEO }),
       ad: wrapper ? getWrapperCode(wrapper, Object.assign({}, serverResponseBody, { bidRequest })) : markup,
-      ...(product === 6 && {ad: markup}),
+      ...(mediaType === VIDEO && {ad: markup, vastXml: markup}),
+      mediaType,
       cpm: isTestUnit ? 0.1 : cpm,
       creativeId,
       currency: cur || 'USD',
diff --git a/modules/gumgumBidAdapter.md b/modules/gumgumBidAdapter.md
index f47666e9628..7b4f0c98ea7 100644
--- a/modules/gumgumBidAdapter.md
+++ b/modules/gumgumBidAdapter.md
@@ -8,7 +8,10 @@ Maintainer: engineering@gumgum.com
 
 # Description
 
-GumGum adapter for Prebid.js 1.0
+GumGum adapter for Prebid.js
+Please note that both video and in-video products require a mediaType of video. 
+All other products (in-screen, slot, native) should have a mediaType of banner.
+
 
 # Test Parameters
 ```
@@ -16,6 +19,11 @@ var adUnits = [
   {
     code: 'test-div',
     sizes: [[300, 250]],
+    mediaTypes: {
+        banner: {
+          sizes: [[300, 250]],
+        }
+    },
     bids: [
       {
         bidder: 'gumgum',
@@ -28,6 +36,11 @@ var adUnits = [
   },{
     code: 'test-div',
     sizes: [[300, 50]],
+    mediaTypes: {
+        banner: {
+          sizes: [[1, 1]],
+        }
+    },
     bids: [
       {
         bidder: 'gumgum',
@@ -40,6 +53,18 @@ var adUnits = [
   },{
     code: 'test-div',
     sizes: [[300, 50]],
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 480],
+        minduration: 1,
+        maxduration: 2,
+        linearity: 2,
+        startdelay: 1,
+        placement: 1,
+        protocols: [1, 2]
+      }
+    }
     bids: [
       {
         bidder: 'gumgum',
diff --git a/test/spec/modules/gumgumBidAdapter_spec.js b/test/spec/modules/gumgumBidAdapter_spec.js
index 701ce9a7e81..52a3a21db4e 100644
--- a/test/spec/modules/gumgumBidAdapter_spec.js
+++ b/test/spec/modules/gumgumBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import { expect } from 'chai';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { spec } from 'modules/gumgumBidAdapter.js';
+import { BANNER, VIDEO } from 'src/mediaTypes.js';
 
 const ENDPOINT = 'https://g2.gumgum.com/hbid/imp';
 const JCSI = { t: 0, rq: 8, pbv: '$prebid.version$' }
@@ -462,16 +463,15 @@ describe('gumgumAdapter', function () {
       pi: 3
     }
     let expectedResponse = {
-      'ad': '<html><h3>I am an ad</h3></html>',
-      'cpm': 0,
-      'creativeId': 29593,
-      'currency': 'USD',
-      'height': '250',
-      'netRevenue': true,
-      'requestId': 12345,
-      'width': '300',
-      // dealId: DEAL_ID,
-      // referrer: REFERER,
+      ad: '<html><h3>I am an ad</h3></html>',
+      cpm: 0,
+      creativeId: 29593,
+      currency: 'USD',
+      height: '250',
+      netRevenue: true,
+      requestId: 12345,
+      width: '300',
+      mediaType: BANNER,
       ttl: 60
     };
 
@@ -552,6 +552,20 @@ describe('gumgumAdapter', function () {
       const decodedResponse = JSON.parse(atob(bidResponse));
       expect(decodedResponse.jcsi).to.eql(JCSI);
     });
+
+    it('sets the correct mediaType depending on product', function () {
+      const bannerBidResponse = spec.interpretResponse({ body: serverResponse }, bidRequest)[0];
+      const invideoBidResponse = spec.interpretResponse({ body: serverResponse }, { ...bidRequest, data: { pi: 6 } })[0];
+      const videoBidResponse = spec.interpretResponse({ body: serverResponse }, { ...bidRequest, data: { pi: 7 } })[0];
+      expect(bannerBidResponse.mediaType).to.equal(BANNER);
+      expect(invideoBidResponse.mediaType).to.equal(VIDEO);
+      expect(videoBidResponse.mediaType).to.equal(VIDEO);
+    });
+
+    it('sets a vastXml property if mediaType is video', function () {
+      const videoBidResponse = spec.interpretResponse({ body: serverResponse }, { ...bidRequest, data: { pi: 7 } })[0];
+      expect(videoBidResponse.vastXml).to.exist;
+    });
   })
   describe('getUserSyncs', function () {
     const syncOptions = {

From 93536f0e5aa56ec8b3284feafeee698eaa974a74 Mon Sep 17 00:00:00 2001
From: Meng <5110935+edmonl@users.noreply.github.com>
Date: Fri, 4 Dec 2020 13:29:42 -0500
Subject: [PATCH 070/304] pubgenius: remove video cache key to be future-proof
 (#6081)

---
 modules/pubgeniusBidAdapter.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/pubgeniusBidAdapter.js b/modules/pubgeniusBidAdapter.js
index 88e85a4fd7a..5c750e66c25 100644
--- a/modules/pubgeniusBidAdapter.js
+++ b/modules/pubgeniusBidAdapter.js
@@ -253,10 +253,6 @@ function interpretBid(bid) {
         bidResponse.vastXml = bid.adm;
       }
 
-      if (pbadapter.cacheKey) {
-        bidResponse.videoCacheKey = pbadapter.cacheKey;
-      }
-
       bidResponse.mediaType = VIDEO;
       break;
     default: // banner by default

From b9a4cc6eb780e79e4f5775d3519af8ad38f23d0a Mon Sep 17 00:00:00 2001
From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com>
Date: Mon, 7 Dec 2020 10:36:18 -0500
Subject: [PATCH 071/304] fix pubgenius unit test (#6090)

---
 test/spec/modules/pubgeniusBidAdapter_spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/spec/modules/pubgeniusBidAdapter_spec.js b/test/spec/modules/pubgeniusBidAdapter_spec.js
index c0b05510707..382199dcffc 100644
--- a/test/spec/modules/pubgeniusBidAdapter_spec.js
+++ b/test/spec/modules/pubgeniusBidAdapter_spec.js
@@ -472,7 +472,6 @@ describe('pubGENIUS adapter', () => {
         ...expectedBidResponse,
         vastUrl: 'http://vasturl/cache?id=x',
         vastXml: 'fake_creative',
-        videoCacheKey: 'x',
         mediaType: VIDEO,
       };
 

From 5f6dab3008d4cca306b6d27a1d27937723fc2b89 Mon Sep 17 00:00:00 2001
From: Harshad Mane <harshad.mane@pubmatic.com>
Date: Mon, 7 Dec 2020 07:39:25 -0800
Subject: [PATCH 072/304] 6012: Fix for passing US Privacy string in
 buildVideoUrl and buildAdpodVideoUrl (#6075)

* added support for pubcommon, digitrust, id5id

* added support for IdentityLink

* changed the source for id5

* added unit test cases

* changed source param for identityLink

* pass USP consent string in dfpVideoUrl and dfpAdpodVideoUrl

* added test cases
---
 modules/dfpAdServerVideo.js                |  7 ++++
 test/spec/modules/dfpAdServerVideo_spec.js | 43 ++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/modules/dfpAdServerVideo.js b/modules/dfpAdServerVideo.js
index 554c44aa708..13677c90bae 100644
--- a/modules/dfpAdServerVideo.js
+++ b/modules/dfpAdServerVideo.js
@@ -8,6 +8,7 @@ import { deepAccess, isEmpty, logError, parseSizesInput, formatQS, parseUrl, bui
 import { config } from '../src/config.js';
 import { getHook, submodule } from '../src/hook.js';
 import { auctionManager } from '../src/auctionManager.js';
+import { uspDataHandler } from '../src/adapterManager.js';
 import events from '../src/events.js';
 import CONSTANTS from '../src/constants.json';
 
@@ -100,6 +101,9 @@ export function buildDfpVideoUrl(options) {
   const descriptionUrl = getDescriptionUrl(bid, options, 'params');
   if (descriptionUrl) { queryParams.description_url = descriptionUrl; }
 
+  const uspConsent = uspDataHandler.getConsentData();
+  if (uspConsent) { queryParams.us_privacy = uspConsent; }
+
   return buildUrl({
     protocol: 'https',
     host: 'securepubads.g.doubleclick.net',
@@ -183,6 +187,9 @@ export function buildAdpodVideoUrl({code, params, callback} = {}) {
       { cust_params: encodedCustomParams }
     );
 
+    const uspConsent = uspDataHandler.getConsentData();
+    if (uspConsent) { queryParams.us_privacy = uspConsent; }
+
     const masterTag = buildUrl({
       protocol: 'https',
       host: 'securepubads.g.doubleclick.net',
diff --git a/test/spec/modules/dfpAdServerVideo_spec.js b/test/spec/modules/dfpAdServerVideo_spec.js
index c0ecb9cad5e..ed9c968cfa2 100644
--- a/test/spec/modules/dfpAdServerVideo_spec.js
+++ b/test/spec/modules/dfpAdServerVideo_spec.js
@@ -7,6 +7,7 @@ import * as utils from 'src/utils.js';
 import { config } from 'src/config.js';
 import { targeting } from 'src/targeting.js';
 import { auctionManager } from 'src/auctionManager.js';
+import { uspDataHandler } from 'src/adapterManager.js';
 import * as adpod from 'modules/adpod.js';
 import { server } from 'test/mocks/xhr.js';
 
@@ -115,6 +116,44 @@ describe('The DFP video support module', function () {
     expect(customParams).to.have.property('hb_cache_id', bid.videoCacheKey);
   });
 
+  it('should include the us_privacy key when USP Consent is available', function () {
+    let uspDataHandlerStub = sinon.stub(uspDataHandler, 'getConsentData');
+    uspDataHandlerStub.returns('1YYY');
+
+    const bidCopy = utils.deepClone(bid);
+    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
+      hb_adid: 'ad_id',
+    });
+
+    const url = parse(buildDfpVideoUrl({
+      adUnit: adUnit,
+      bid: bidCopy,
+      params: {
+        'iu': 'my/adUnit'
+      }
+    }));
+    const queryObject = utils.parseQS(url.query);
+    expect(queryObject.us_privacy).to.equal('1YYY');
+    uspDataHandlerStub.restore();
+  });
+
+  it('should not include the us_privacy key when USP Consent is not available', function () {
+    const bidCopy = utils.deepClone(bid);
+    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
+      hb_adid: 'ad_id',
+    });
+
+    const url = parse(buildDfpVideoUrl({
+      adUnit: adUnit,
+      bid: bidCopy,
+      params: {
+        'iu': 'my/adUnit'
+      }
+    }));
+    const queryObject = utils.parseQS(url.query);
+    expect(queryObject.us_privacy).to.equal(undefined);
+  });
+
   describe('special targeting unit test', function () {
     const allTargetingData = {
       'hb_format': 'video',
@@ -350,6 +389,8 @@ describe('The DFP video support module', function () {
 
     it('should return masterTag url', function() {
       amStub.returns(getBidsReceived());
+      let uspDataHandlerStub = sinon.stub(uspDataHandler, 'getConsentData');
+      uspDataHandlerStub.returns('1YYY');
       let url;
       parse(buildAdpodVideoUrl({
         code: 'adUnitCode-1',
@@ -380,10 +421,12 @@ describe('The DFP video support module', function () {
         expect(queryParams).to.have.property('unviewed_position_start', '1');
         expect(queryParams).to.have.property('url');
         expect(queryParams).to.have.property('cust_params');
+        expect(queryParams).to.have.property('us_privacy', '1YYY');
 
         const custParams = utils.parseQS(decodeURIComponent(queryParams.cust_params));
         expect(custParams).to.have.property('hb_cache_id', '123');
         expect(custParams).to.have.property('hb_pb_cat_dur', '15.00_395_15s,15.00_406_30s,10.00_395_15s');
+        uspDataHandlerStub.restore();
       }
     });
 

From dbd0d84e30beb1547f35663e0c30d6efc45b60b0 Mon Sep 17 00:00:00 2001
From: Reinout Stevens <reinout@reinoutstevens.be>
Date: Mon, 7 Dec 2020 16:40:06 +0100
Subject: [PATCH 073/304] fix prebid server playerwidth and height (#6073)

Co-authored-by: Reinout Stevens <reinout@crazygames.com>
---
 modules/prebidServerBidAdapter/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 7c7962781d2..d90572d1093 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -750,8 +750,8 @@ const OPEN_RTB_PROTOCOL = {
           if (utils.deepAccess(bid, 'ext.prebid.type') === VIDEO) {
             bidObject.mediaType = VIDEO;
             let sizes = bidRequest.sizes && bidRequest.sizes[0];
-            bidObject.playerHeight = sizes[0];
-            bidObject.playerWidth = sizes[1];
+            bidObject.playerWidth = sizes[0];
+            bidObject.playerHeight = sizes[1];
 
             // try to get cache values from 'response.ext.prebid.cache.js'
             // else try 'bid.ext.prebid.targeting' as fallback

From 93f393abf070ff83ce2cc9cefb376864816a1feb Mon Sep 17 00:00:00 2001
From: Paul de Rosanbo <paul@rosanbo.com>
Date: Mon, 7 Dec 2020 16:40:51 +0100
Subject: [PATCH 074/304] Fix iframe __tcfapi arguments (#6058)

* Fix __tcfapi declaration in iframe

* Add tests for cmp declaration in iframe
---
 modules/consentManagement.js                | 58 ++++++++++++++-------
 test/spec/modules/consentManagement_spec.js | 18 +++++++
 2 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/modules/consentManagement.js b/modules/consentManagement.js
index 1060fdb5cc5..67af2baf959 100644
--- a/modules/consentManagement.js
+++ b/modules/consentManagement.js
@@ -199,29 +199,51 @@ function lookupIabConsent(cmpSuccess, cmpError, hookConfig) {
   function callCmpWhileInIframe(commandName, cmpFrame, moduleCallback) {
     let apiName = (cmpVersion === 2) ? '__tcfapi' : '__cmp';
 
+    let callId = Math.random() + '';
+    let callName = `${apiName}Call`;
+
     /* Setup up a __cmp function to do the postMessage and stash the callback.
       This function behaves (from the caller's perspective identicially to the in-frame __cmp call */
-    window[apiName] = function (cmd, arg, callback) {
-      let callId = Math.random() + '';
-      let callName = `${apiName}Call`;
-      let msg = {
-        [callName]: {
-          command: cmd,
-          parameter: arg,
-          callId: callId
-        }
-      };
-      if (cmpVersion !== 1) msg[callName].version = cmpVersion;
+    if (cmpVersion === 2) {
+      window[apiName] = function (cmd, cmpVersion, callback, arg) {
+        let msg = {
+          [callName]: {
+            command: cmd,
+            version: cmpVersion,
+            parameter: arg,
+            callId: callId
+          }
+        };
 
-      cmpCallbacks[callId] = callback;
-      cmpFrame.postMessage(msg, '*');
-    }
+        cmpCallbacks[callId] = callback;
+        cmpFrame.postMessage(msg, '*');
+      }
 
-    /** when we get the return message, call the stashed callback */
-    window.addEventListener('message', readPostMessageResponse, false);
+      /** when we get the return message, call the stashed callback */
+      window.addEventListener('message', readPostMessageResponse, false);
 
-    // call CMP
-    window[apiName](commandName, undefined, moduleCallback);
+      // call CMP
+      window[apiName](commandName, cmpVersion, moduleCallback);
+    } else {
+      window[apiName] = function (cmd, arg, callback) {
+        let msg = {
+          [callName]: {
+            command: cmd,
+            parameter: arg,
+            callId: callId
+          }
+        };
+
+        cmpCallbacks[callId] = callback;
+        cmpFrame.postMessage(msg, '*');
+      }
+
+      /** when we get the return message, call the stashed callback */
+      window.addEventListener('message', readPostMessageResponse, false);
+
+      // call CMP
+      window[apiName](commandName, undefined, moduleCallback);
+    }
 
     function readPostMessageResponse(event) {
       let cmpDataPkgName = `${apiName}Return`;
diff --git a/test/spec/modules/consentManagement_spec.js b/test/spec/modules/consentManagement_spec.js
index cf5c578502f..5e9b0f07f46 100644
--- a/test/spec/modules/consentManagement_spec.js
+++ b/test/spec/modules/consentManagement_spec.js
@@ -537,6 +537,15 @@ describe('consentManagement', function () {
         // from CMP window postMessage listener.
         testIFramedPage('with/JSON response', false, 'encoded_consent_data_via_post_message', 1);
         testIFramedPage('with/String response', true, 'encoded_consent_data_via_post_message', 1);
+
+        it('should contain correct V1 CMP definition', (done) => {
+          setConsentConfig(goodConfigWithAllowAuction);
+          requestBidsHook(() => {
+            const nbArguments = window.__cmp.toString().split('\n')[0].split(', ').length;
+            expect(nbArguments).to.equal(3);
+            done();
+          }, {});
+        });
       });
 
       describe('v2 CMP workflow for iframe pages:', function () {
@@ -562,6 +571,15 @@ describe('consentManagement', function () {
 
         testIFramedPage('with/JSON response', false, 'abc12345234', 2);
         testIFramedPage('with/String response', true, 'abc12345234', 2);
+
+        it('should contain correct v2 CMP definition', (done) => {
+          setConsentConfig(goodConfigWithAllowAuction);
+          requestBidsHook(() => {
+            const nbArguments = window.__tcfapi.toString().split('\n')[0].split(', ').length;
+            expect(nbArguments).to.equal(4);
+            done();
+          }, {});
+        });
       });
     });
 

From 12d55b951decf7f2786f3cae18d2fa34df76d4c2 Mon Sep 17 00:00:00 2001
From: Samuel Adu <samuel.adu@gmail.com>
Date: Tue, 8 Dec 2020 18:50:33 +0000
Subject: [PATCH 075/304] Feature/vmuid connectid rebrand (#6045)

* Key name change from vmuid to vmcid

* Change the userId key name to vmconnectid

* Support new key in response payload + remain backward compatible.

Co-authored-by: slimkrazy <sam@slimkrazy.com>
---
 modules/userId/eids.js                        |  4 +--
 modules/verizonMediaIdSystem.js               | 11 +++---
 modules/verizonMediaSystemId.md               |  4 +--
 test/spec/modules/aolBidAdapter_spec.js       |  2 +-
 .../spec/modules/verizonMediaIdSystem_spec.js | 34 +++++++++++++++----
 5 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index 2c627416341..d714d09962d 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -158,8 +158,8 @@ const USER_IDS_CONFIG = {
     atype: 1
   },
 
-  // Verizon Media
-  'vmuid': {
+  // Verizon Media ConnectID
+  'connectid': {
     source: 'verizonmedia.com',
     atype: 1
   },
diff --git a/modules/verizonMediaIdSystem.js b/modules/verizonMediaIdSystem.js
index 617561765cc..f39909f6666 100644
--- a/modules/verizonMediaIdSystem.js
+++ b/modules/verizonMediaIdSystem.js
@@ -12,7 +12,7 @@ import * as utils from '../src/utils.js';
 const MODULE_NAME = 'verizonMediaId';
 const VENDOR_ID = 25;
 const PLACEHOLDER = '__PIXEL_ID__';
-const VMUID_ENDPOINT = `https://ups.analytics.yahoo.com/ups/${PLACEHOLDER}/fed`;
+const VMCID_ENDPOINT = `https://ups.analytics.yahoo.com/ups/${PLACEHOLDER}/fed`;
 
 function isEUConsentRequired(consentData) {
   return !!(consentData && consentData.gdpr && consentData.gdpr.gdprApplies);
@@ -33,13 +33,14 @@ export const verizonMediaIdSubmodule = {
   /**
    * decode the stored id value for passing to bid requests
    * @function
-   * @returns {{vmuid: string} | undefined}
+   * @returns {{connectid: string} | undefined}
    */
   decode(value) {
-    return (value && typeof value.vmuid === 'string') ? {vmuid: value.vmuid} : undefined;
+    return (typeof value === 'object' && (value.connectid || value.vmuid))
+      ? {connectid: value.connectid || value.vmuid} : undefined;
   },
   /**
-   * get the VerizonMedia Id
+   * Gets the Verizon Media Connect ID
    * @function
    * @param {SubmoduleConfig} [config]
    * @param {ConsentData} [consentData]
@@ -83,7 +84,7 @@ export const verizonMediaIdSubmodule = {
           callback();
         }
       };
-      const endpoint = VMUID_ENDPOINT.replace(PLACEHOLDER, params.pixelId);
+      const endpoint = VMCID_ENDPOINT.replace(PLACEHOLDER, params.pixelId);
       let url = `${params.endpoint || endpoint}?${utils.formatQS(data)}`;
       verizonMediaIdSubmodule.getAjaxFn()(url, callbacks, null, {method: 'GET', withCredentials: true});
     };
diff --git a/modules/verizonMediaSystemId.md b/modules/verizonMediaSystemId.md
index 8d0e0bddaa9..c0d315dc754 100644
--- a/modules/verizonMediaSystemId.md
+++ b/modules/verizonMediaSystemId.md
@@ -10,9 +10,9 @@ pbjs.setConfig({
         userIds: [{
             name: 'verizonMediaId',
             storage: {
-                name: 'vmuid',
+                name: 'vmcid',
                 type: 'html5',
-                expires: 30
+                expires: 15
             },
             params: {
                 pixelId: 58776,
diff --git a/test/spec/modules/aolBidAdapter_spec.js b/test/spec/modules/aolBidAdapter_spec.js
index 11e1a317b70..8e74e19f420 100644
--- a/test/spec/modules/aolBidAdapter_spec.js
+++ b/test/spec/modules/aolBidAdapter_spec.js
@@ -93,7 +93,7 @@ describe('AolAdapter', function () {
 
   const USER_ID_DATA = {
     criteoId: SUPPORTED_USER_ID_SOURCES['criteo.com'],
-    vmuid: SUPPORTED_USER_ID_SOURCES['verizonmedia.com'],
+    connectid: SUPPORTED_USER_ID_SOURCES['verizonmedia.com'],
     idl_env: SUPPORTED_USER_ID_SOURCES['liveramp.com'],
     lipb: {
       lipbid: SUPPORTED_USER_ID_SOURCES['liveintent.com'],
diff --git a/test/spec/modules/verizonMediaIdSystem_spec.js b/test/spec/modules/verizonMediaIdSystem_spec.js
index a30be5a2569..c5d743235d6 100644
--- a/test/spec/modules/verizonMediaIdSystem_spec.js
+++ b/test/spec/modules/verizonMediaIdSystem_spec.js
@@ -165,12 +165,34 @@ describe('Verizon Media ID Submodule', () => {
   });
 
   describe('decode()', () => {
-    const VALID_API_RESPONSE = {
-      vmuid: '1234'
-    };
-    it('should return a newly constructed object with the vmuid property', () => {
-      expect(verizonMediaIdSubmodule.decode(VALID_API_RESPONSE)).to.deep.equal(VALID_API_RESPONSE);
-      expect(verizonMediaIdSubmodule.decode(VALID_API_RESPONSE)).to.not.equal(VALID_API_RESPONSE);
+    const VALID_API_RESPONSES = [{
+      key: 'vmiud',
+      expected: '1234',
+      payload: {
+        vmuid: '1234'
+      }
+    },
+    {
+      key: 'connectid',
+      expected: '4567',
+      payload: {
+        connectid: '4567'
+      }
+    },
+    {
+      key: 'both',
+      expected: '4567',
+      payload: {
+        vmuid: '1234',
+        connectid: '4567'
+      }
+    }];
+    VALID_API_RESPONSES.forEach(responseData => {
+      it('should return a newly constructed object with the connectid for a payload with ${responseData.key} key(s)', () => {
+        expect(verizonMediaIdSubmodule.decode(responseData.payload)).to.deep.equal(
+          {connectid: responseData.expected}
+        );
+      });
     });
 
     [{}, '', {foo: 'bar'}].forEach((response) => {

From 4c047f91e1c3bbc0b495427630f031753c561a42 Mon Sep 17 00:00:00 2001
From: John Salis <jsalis531@gmail.com>
Date: Tue, 8 Dec 2020 23:48:34 -0500
Subject: [PATCH 076/304] Beachfront adapter: Add banner tagid param (#6086)

* add tagid to banner request

* bump version

* update test case

* run tests

Co-authored-by: John Salis <johnsalis@beachfrontmedia.com>
---
 modules/beachfrontBidAdapter.js                | 3 ++-
 test/spec/modules/beachfrontBidAdapter_spec.js | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/beachfrontBidAdapter.js b/modules/beachfrontBidAdapter.js
index 4b30f47e2cf..44755a78864 100644
--- a/modules/beachfrontBidAdapter.js
+++ b/modules/beachfrontBidAdapter.js
@@ -6,7 +6,7 @@ import { VIDEO, BANNER } from '../src/mediaTypes.js';
 import find from 'core-js-pure/features/array/find.js';
 import includes from 'core-js-pure/features/array/includes.js';
 
-const ADAPTER_VERSION = '1.14';
+const ADAPTER_VERSION = '1.15';
 const ADAPTER_NAME = 'BFIO_PREBID';
 const OUTSTREAM = 'outstream';
 
@@ -387,6 +387,7 @@ function createBannerRequestData(bids, bidderRequest) {
       slot: bid.adUnitCode,
       id: getBannerBidParam(bid, 'appId'),
       bidfloor: getBannerBidParam(bid, 'bidfloor'),
+      tagid: getBannerBidParam(bid, 'tagid'),
       sizes: getBannerSizes(bid)
     };
   });
diff --git a/test/spec/modules/beachfrontBidAdapter_spec.js b/test/spec/modules/beachfrontBidAdapter_spec.js
index 661780ffac0..43c71dd6349 100644
--- a/test/spec/modules/beachfrontBidAdapter_spec.js
+++ b/test/spec/modules/beachfrontBidAdapter_spec.js
@@ -336,6 +336,7 @@ describe('BeachfrontAdapter', function () {
         const width = 300;
         const height = 250;
         const bidRequest = bidRequests[0];
+        bidRequest.params.tagid = '7cd7a7b4-ef3f-4aeb-9565-3627f255fa10';
         bidRequest.mediaTypes = {
           banner: {
             sizes: [ width, height ]
@@ -354,6 +355,7 @@ describe('BeachfrontAdapter', function () {
             slot: bidRequest.adUnitCode,
             id: bidRequest.params.appId,
             bidfloor: bidRequest.params.bidfloor,
+            tagid: bidRequest.params.tagid,
             sizes: [{ w: width, h: height }]
           }
         ]);

From cbd1169204dbf7f0bf0a3ea8fea4a85241f8dc11 Mon Sep 17 00:00:00 2001
From: jxdeveloper1 <71084096+jxdeveloper1@users.noreply.github.com>
Date: Wed, 9 Dec 2020 12:50:47 +0800
Subject: [PATCH 077/304] changed events endpoint (#6088)

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

diff --git a/modules/jixieBidAdapter.js b/modules/jixieBidAdapter.js
index d3ae090964c..7c6e0027482 100644
--- a/modules/jixieBidAdapter.js
+++ b/modules/jixieBidAdapter.js
@@ -9,7 +9,7 @@ import { Renderer } from '../src/Renderer.js';
 export const storage = getStorageManager();
 
 const BIDDER_CODE = 'jixie';
-const EVENTS_URL = 'https://jxhbtrackers.azurewebsites.net/sync/evt?';
+const EVENTS_URL = 'https://hbtra.jixie.io/sync/hb?';
 const JX_OUTSTREAM_RENDERER_URL = 'https://scripts.jixie.io/jxhboutstream.js';
 const REQUESTS_URL = 'https://hb.jixie.io/v2/hbpost';
 const sidTTLMins_ = 30;

From 478e0455b952e7f67e3b6124a862c8a871ee618b Mon Sep 17 00:00:00 2001
From: Brandon Ling <51931757+blingster7@users.noreply.github.com>
Date: Wed, 9 Dec 2020 02:29:33 -0500
Subject: [PATCH 078/304] [Triplelift] Fix FPD key-value pairs logic (#6065)

* follow spec to parse fpd
* ad unit support stub
* adunit method
* ad unit etc
* typo
* fix test
* typo
* change to const
---
 modules/tripleliftBidAdapter.js               | 31 +++++++++++++++++--
 .../spec/modules/tripleliftBidAdapter_spec.js | 31 ++++++++++++++-----
 2 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/modules/tripleliftBidAdapter.js b/modules/tripleliftBidAdapter.js
index d54d76efb41..4679c1faf62 100644
--- a/modules/tripleliftBidAdapter.js
+++ b/modules/tripleliftBidAdapter.js
@@ -122,6 +122,9 @@ function _buildPostBody(bidRequests) {
     } else if (bidRequest.mediaTypes.banner) {
       imp.banner = { format: _sizes(bidRequest.sizes) };
     };
+    if (!utils.isEmpty(bidRequest.fpd)) {
+      imp.fpd = _getAdUnitFpd(bidRequest.fpd);
+    }
     return imp;
   });
 
@@ -183,12 +186,34 @@ function _getFloor (bid) {
 }
 
 function _getGlobalFpd() {
-  let fpd = {};
+  const fpd = {};
+  const context = {}
+  const user = {};
+
   const fpdContext = Object.assign({}, config.getConfig('fpd.context'));
   const fpdUser = Object.assign({}, config.getConfig('fpd.user'));
 
-  _addEntries(fpd, fpdContext);
-  _addEntries(fpd, fpdUser);
+  _addEntries(context, fpdContext);
+  _addEntries(user, fpdUser);
+
+  if (!utils.isEmpty(context)) {
+    fpd.context = context;
+  }
+  if (!utils.isEmpty(user)) {
+    fpd.user = user;
+  }
+  return fpd;
+}
+
+function _getAdUnitFpd(adUnitFpd) {
+  const fpd = {};
+  const context = {};
+
+  _addEntries(context, adUnitFpd.context);
+
+  if (!utils.isEmpty(context)) {
+    fpd.context = context;
+  }
 
   return fpd;
 }
diff --git a/test/spec/modules/tripleliftBidAdapter_spec.js b/test/spec/modules/tripleliftBidAdapter_spec.js
index b417876f276..82578424027 100644
--- a/test/spec/modules/tripleliftBidAdapter_spec.js
+++ b/test/spec/modules/tripleliftBidAdapter_spec.js
@@ -143,6 +143,14 @@ describe('triplelift adapter', function () {
           auctionId: '1d1a030790a475',
           userId: {},
           schain,
+          fpd: {
+            context: {
+              pbAdSlot: 'homepage-top-rect',
+              data: {
+                adUnitSpecificAttribute: 123
+              }
+            }
+          }
         },
         {
           bidder: 'triplelift',
@@ -597,17 +605,19 @@ describe('triplelift adapter', function () {
       const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.imp[0].floor).to.equal(1.99);
     });
-    it('should send fpd on root level ext if kvps are available', function() {
+    it('should send global config fpd if kvps are available', function() {
       const sens = null;
       const category = ['news', 'weather', 'hurricane'];
       const pmp_elig = 'true';
       const fpd = {
         context: {
-          pmp_elig,
-          category,
+          pmp_elig: pmp_elig,
+          data: {
+            category: category
+          }
         },
         user: {
-          sens,
+          sens: sens,
         }
       }
       sandbox.stub(config, 'getConfig').callsFake(key => {
@@ -618,9 +628,16 @@ describe('triplelift adapter', function () {
       });
       const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
       const { data: payload } = request;
-      expect(payload.ext.fpd).to.not.haveOwnProperty('sens');
-      expect(payload.ext.fpd).to.haveOwnProperty('category');
-      expect(payload.ext.fpd).to.haveOwnProperty('pmp_elig');
+      expect(payload.ext.fpd.user).to.not.exist;
+      expect(payload.ext.fpd.context.data).to.haveOwnProperty('category');
+      expect(payload.ext.fpd.context).to.haveOwnProperty('pmp_elig');
+    });
+    it('should send ad unit fpd if kvps are available', function() {
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.imp[0].fpd.context).to.haveOwnProperty('pbAdSlot');
+      expect(request.data.imp[0].fpd.context).to.haveOwnProperty('data');
+      expect(request.data.imp[0].fpd.context.data).to.haveOwnProperty('adUnitSpecificAttribute');
+      expect(request.data.imp[1].fpd).to.not.exist;
     });
   });
 

From dd51f245abe600801703c70ca688fb55181a8d78 Mon Sep 17 00:00:00 2001
From: nyakove <43004249+nyakove@users.noreply.github.com>
Date: Wed, 9 Dec 2020 15:40:23 +0200
Subject: [PATCH 079/304] Add new adapter - adWMGBidAdapter (#6070)

* Add adWMG Bid Adapter

* Fix unit tests

Co-authored-by: Mikhail Dykun <m.dykun@wmgroup.us>
---
 modules/adWMGBidAdapter.js                | 297 ++++++++++++++++++++++
 modules/adWMGBidAdapter.md                |  34 +++
 test/spec/modules/adWMGBidAdapter_spec.js | 292 +++++++++++++++++++++
 3 files changed, 623 insertions(+)
 create mode 100644 modules/adWMGBidAdapter.js
 create mode 100644 modules/adWMGBidAdapter.md
 create mode 100644 test/spec/modules/adWMGBidAdapter_spec.js

diff --git a/modules/adWMGBidAdapter.js b/modules/adWMGBidAdapter.js
new file mode 100644
index 00000000000..3a0a8a22274
--- /dev/null
+++ b/modules/adWMGBidAdapter.js
@@ -0,0 +1,297 @@
+'use strict';
+
+import * as utils from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { BANNER } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'adWMG';
+const ENDPOINT = 'https://rtb.adwmg.com/prebid';
+let SYNC_ENDPOINT = 'https://rtb.adwmg.com/cphb.html?';
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['wmg'],
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid: (bid) => {
+    if (bid.bidder !== BIDDER_CODE) {
+      return false;
+    }
+
+    if (!(bid.params.publisherId)) {
+      return false;
+    }
+
+    return true;
+  },
+  buildRequests: (validBidRequests, bidderRequest) => {
+    const timeout = bidderRequest.timeout || 0;
+    const debug = config.getConfig('debug') || false;
+    const referrer = bidderRequest.refererInfo.referer;
+    const locale = window.navigator.language && window.navigator.language.length > 0 ? window.navigator.language.substr(0, 2) : '';
+    const domain = config.getConfig('publisherDomain') || (window.location && window.location.host ? window.location.host : '');
+    const ua = window.navigator.userAgent.toLowerCase();
+    const additional = spec.parseUserAgent(ua);
+
+    return validBidRequests.map(bidRequest => {
+      const adUnit = {
+        code: bidRequest.adUnitCode,
+        bids: {
+          bidder: bidRequest.bidder,
+          params: bidRequest.params
+        },
+        mediaTypes: bidRequest.mediaTypes
+      };
+
+      if (bidRequest.hasOwnProperty('sizes') && bidRequest.sizes.length > 0) {
+        adUnit.sizes = bidRequest.sizes;
+      }
+
+      const request = {
+        auctionId: bidRequest.auctionId,
+        requestId: bidRequest.bidId,
+        bidRequestsCount: bidRequest.bidRequestsCount,
+        bidderRequestId: bidRequest.bidderRequestId,
+        transactionId: bidRequest.transactionId,
+        referrer: referrer,
+        timeout: timeout,
+        adUnit: adUnit,
+        locale: locale,
+        domain: domain,
+        os: additional.os,
+        osv: additional.osv,
+        devicetype: additional.devicetype
+      };
+
+      if (bidderRequest.gdprConsent) {
+        request.gdpr = {
+          applies: bidderRequest.gdprConsent.gdprApplies,
+          consentString: bidderRequest.gdprConsent.consentString
+        };
+      }
+
+      /*       if (bidderRequest.uspConsent) {
+        request.uspConsent = bidderRequest.uspConsent;
+      }
+ */
+      if (bidRequest.userId && bidRequest.userId.pubcid) {
+        request.userId = {
+          pubcid: bidRequest.userId.pubcid
+        };
+      }
+
+      if (debug) {
+        request.debug = debug;
+      }
+
+      return {
+        method: 'POST',
+        url: ENDPOINT,
+        data: JSON.stringify(request)
+      }
+    });
+  },
+  interpretResponse: (serverResponse) => {
+    const bidResponses = [];
+
+    if (serverResponse.body) {
+      const response = serverResponse.body;
+      const bidResponse = {
+        requestId: response.requestId,
+        cpm: response.cpm,
+        width: response.width,
+        height: response.height,
+        creativeId: response.creativeId,
+        currency: response.currency,
+        netRevenue: response.netRevenue,
+        ttl: response.ttl,
+        ad: response.ad,
+      };
+      bidResponses.push(bidResponse);
+    }
+
+    return bidResponses;
+  },
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    if (gdprConsent) {
+      SYNC_ENDPOINT = utils.tryAppendQueryString(SYNC_ENDPOINT, 'gdpr', (gdprConsent.gdprApplies ? 1 : 0));
+    }
+
+    if (gdprConsent && typeof gdprConsent.consentString === 'string') {
+      SYNC_ENDPOINT = utils.tryAppendQueryString(SYNC_ENDPOINT, 'gdpr_consent', gdprConsent.consentString);
+    }
+
+    /*     if (uspConsent) {
+      SYNC_ENDPOINT = utils.tryAppendQueryString(SYNC_ENDPOINT, 'us_privacy', uspConsent);
+    } */
+    let syncs = [];
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: SYNC_ENDPOINT
+      });
+    }
+    return syncs;
+  },
+  parseUserAgent: (ua) => {
+    function detectDevice() {
+      if (/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i
+        .test(ua.toLowerCase())) {
+        return 5;
+      }
+      if (/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i
+        .test(ua.toLowerCase())) {
+        return 4;
+      }
+      if (/smart[-_\s]?tv|hbbtv|appletv|googletv|hdmi|netcast|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b/i
+        .test(ua.toLowerCase())) {
+        return 3;
+      }
+      return 2;
+    }
+
+    function detectOs() {
+      const module = {
+        options: [],
+        header: [navigator.platform, ua, navigator.appVersion, navigator.vendor, window.opera],
+        dataos: [{
+          name: 'Windows Phone',
+          value: 'Windows Phone',
+          version: 'OS'
+        },
+        {
+          name: 'Windows',
+          value: 'Win',
+          version: 'NT'
+        },
+        {
+          name: 'iOS',
+          value: 'iPhone',
+          version: 'OS'
+        },
+        {
+          name: 'iOS',
+          value: 'iPad',
+          version: 'OS'
+        },
+        {
+          name: 'Kindle',
+          value: 'Silk',
+          version: 'Silk'
+        },
+        {
+          name: 'Android',
+          value: 'Android',
+          version: 'Android'
+        },
+        {
+          name: 'PlayBook',
+          value: 'PlayBook',
+          version: 'OS'
+        },
+        {
+          name: 'BlackBerry',
+          value: 'BlackBerry',
+          version: '/'
+        },
+        {
+          name: 'Macintosh',
+          value: 'Mac',
+          version: 'OS X'
+        },
+        {
+          name: 'Linux',
+          value: 'Linux',
+          version: 'rv'
+        },
+        {
+          name: 'Palm',
+          value: 'Palm',
+          version: 'PalmOS'
+        }
+        ],
+        init: function () {
+          var agent = this.header.join(' ');
+          var os = this.matchItem(agent, this.dataos);
+          return {
+            os
+          };
+        },
+
+        getVersion: function (name, version) {
+          if (name === 'Windows') {
+            switch (parseFloat(version).toFixed(1)) {
+              case '5.0':
+                return '2000';
+              case '5.1':
+                return 'XP';
+              case '5.2':
+                return 'Server 2003';
+              case '6.0':
+                return 'Vista';
+              case '6.1':
+                return '7';
+              case '6.2':
+                return '8';
+              case '6.3':
+                return '8.1';
+              default:
+                return version || 'other';
+            }
+          } else return version || 'other';
+        },
+
+        matchItem: function (string, data) {
+          var i = 0;
+          var j = 0;
+          var regex, regexv, match, matches, version;
+
+          for (i = 0; i < data.length; i += 1) {
+            regex = new RegExp(data[i].value, 'i');
+            match = regex.test(string);
+            if (match) {
+              regexv = new RegExp(data[i].version + '[- /:;]([\\d._]+)', 'i');
+              matches = string.match(regexv);
+              version = '';
+              if (matches) {
+                if (matches[1]) {
+                  matches = matches[1];
+                }
+              }
+              if (matches) {
+                matches = matches.split(/[._]+/);
+                for (j = 0; j < matches.length; j += 1) {
+                  if (j === 0) {
+                    version += matches[j] + '.';
+                  } else {
+                    version += matches[j];
+                  }
+                }
+              } else {
+                version = 'other';
+              }
+              return {
+                name: data[i].name,
+                version: this.getVersion(data[i].name, version)
+              };
+            }
+          }
+          return {
+            name: 'unknown',
+            version: 'other'
+          };
+        }
+      };
+
+      var e = module.init();
+
+      return {
+        os: e.os.name || '',
+        osv: e.os.version || ''
+      }
+    }
+
+    return {devicetype: detectDevice(), os: detectOs().os, osv: detectOs().osv}
+  }
+}
+registerBidder(spec);
diff --git a/modules/adWMGBidAdapter.md b/modules/adWMGBidAdapter.md
new file mode 100644
index 00000000000..8c277b803db
--- /dev/null
+++ b/modules/adWMGBidAdapter.md
@@ -0,0 +1,34 @@
+# Overview
+
+```
+Module Name: adWMG Adapter
+Module Type: Bidder Adapter
+Maintainer: wbid@adwmg.com
+```
+
+# Description
+
+Module that connects to adWMG demand sources to fetch bids. Supports 'banner' ad format.
+
+# Bid Parameters
+
+| Key | Required | Example | Description |
+| --- | -------- | ------- | ----------- |
+| `publisherId` | yes | `'5cebea3c9eea646c7b623d5e'` | publisher ID from WMG Dashboard |
+| `IABCategories` | no | `['IAB1', 'IAB5']` | IAB ad categories for adUnit |
+
+
+# Test Parameters
+
+```javascript
+var adUnits = [{
+  code: 'wmg-test-div',
+  sizes: [[300, 250]],
+  bids: [{
+    bidder: 'adWMG',
+    params: {
+      publisherId: '5cebea3c9eea646c7b623d5e',
+      IABCategories: ['IAB1', 'IAB5']
+    },
+  }]
+}]
\ No newline at end of file
diff --git a/test/spec/modules/adWMGBidAdapter_spec.js b/test/spec/modules/adWMGBidAdapter_spec.js
new file mode 100644
index 00000000000..5c2364d454c
--- /dev/null
+++ b/test/spec/modules/adWMGBidAdapter_spec.js
@@ -0,0 +1,292 @@
+import { expect } from 'chai';
+import { spec } from 'modules/adWMGBidAdapter.js';
+import { config } from 'src/config.js';
+
+describe('adWMGBidAdapter', function () {
+  describe('isBidRequestValid', function () {
+    let bid;
+    beforeEach(function() {
+      bid = {
+        bidder: 'adWMG',
+        params: {
+          publisherId: '5cebea3c9eea646c7b623d5e'
+        },
+        mediaTypes: {
+          banner: {
+            size: [[300, 250]]
+          }
+        }
+      };
+    });
+
+    it('should return true when valid bid request is set', function() {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when bidder is not set to "adWMG"', function() {
+      bid.bidder = 'bidder';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when \'publisherId\' param are not set', function() {
+      delete bid.params.publisherId;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('parseUserAgent', function() {
+    let ua_desktop, ua_mobile, ua_tv, ua_tablet;
+    beforeEach(function() {
+      ua_desktop = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.66 Safari/537.36';
+      ua_tv = 'Mozilla/5.0 (Linux; NetCast; U) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/38.0.2125.122 Safari/537.31 SmartTV/7.0';
+      ua_mobile = 'Mozilla/5.0 (Linux; Android 7.0; SAMSUNG SM-G610M Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/7.2 Chrome/59.0.3071.125 Mobile Safari/537.36';
+      ua_tablet = 'Mozilla/5.0 (iPad; CPU OS 7_1_2 like Mac OS X) AppleWebKit/537.51.2 (KHTML, like Gecko) Version/7.0 Mobile/11D257 Safari/9537.53';
+    });
+
+    it('should return correct device type: desktop', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_desktop);
+      expect(userDeviceInfo.devicetype).to.equal(2);
+    });
+
+    it('should return correct device type: TV', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_tv);
+      expect(userDeviceInfo.devicetype).to.equal(3);
+    });
+
+    it('should return correct device type: mobile', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_mobile);
+      expect(userDeviceInfo.devicetype).to.equal(4);
+    });
+
+    it('should return correct device type: tablet', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_tablet);
+      expect(userDeviceInfo.devicetype).to.equal(5);
+    });
+
+    it('should return correct OS name', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_desktop);
+      expect(userDeviceInfo.os).to.equal('Windows');
+    });
+
+    it('should return correct OS version', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_desktop);
+      expect(userDeviceInfo.osv).to.equal('10.0');
+    });
+  });
+
+  describe('buildRequests', function () {
+    let bidRequests;
+    beforeEach(function() {
+      bidRequests = [
+        {
+          bidder: 'adWMG',
+          adUnitCode: 'adwmg-test-ad',
+          auctionId: 'test-auction-id',
+          bidId: 'test-bid-id',
+          bidRequestsCount: 1,
+          bidderRequestId: 'bidderrequestid123',
+          transactionId: 'transaction-id-123',
+          sizes: [[300, 250]],
+          requestId: 'requestid123',
+          params: {
+            floorPrice: 100,
+            currency: 'USD'
+          },
+          mediaTypes: {
+            banner: {
+              size: [[300, 250]]
+            }
+          },
+          userId: {
+            pubcid: 'pubc-id-123'
+          }
+        }, {
+          bidder: 'adWMG',
+          adUnitCode: 'adwmg-test-ad-2',
+          auctionId: 'test-auction-id-2',
+          bidId: 'test-bid-id-2',
+          bidRequestsCount: 1,
+          bidderRequestId: 'bidderrequestid456',
+          transactionId: 'transaction-id-456',
+          sizes: [[320, 50]],
+          requestId: 'requestid456',
+          params: {
+            floorPrice: 100,
+            currency: 'USD'
+          },
+          mediaTypes: {
+            banner: {
+              size: [[320, 50]]
+            }
+          },
+          userId: {
+            pubcid: 'pubc-id-456'
+          }
+        }
+      ];
+    });
+
+    let bidderRequest = {
+      refererInfo: {
+        referer: 'https://test.com'
+      },
+      gdprConsent: {
+        consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      }
+    };
+
+    it('should not contain a sizes when sizes is not set', function() {
+      delete bidRequests[0].sizes;
+      delete bidRequests[1].sizes;
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).sizes).to.be.an('undefined');
+      expect(JSON.parse(requests[1].data).sizes).to.be.an('undefined');
+    });
+
+    it('should not contain a userId when userId is not set', function() {
+      delete bidRequests[0].userId;
+      delete bidRequests[1].userId;
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).userId).to.be.an('undefined');
+      expect(JSON.parse(requests[1].data).userId).to.be.an('undefined');
+    });
+
+    it('should have a post method', function() {
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[1].method).to.equal('POST');
+    });
+
+    it('should contain a request id equals to the bid id', function() {
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).requestId).to.equal(bidRequests[0].bidId);
+      expect(JSON.parse(requests[1].data).requestId).to.equal(bidRequests[1].bidId);
+    });
+
+    it('should have an url that match the default endpoint', function() {
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(requests[0].url).to.equal('https://rtb.adwmg.com/prebid');
+      expect(requests[1].url).to.equal('https://rtb.adwmg.com/prebid');
+    });
+
+    it('should contain GDPR consent data if GDPR set', function() {
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).gdpr.applies).to.be.true;
+      expect(JSON.parse(requests[0].data).gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(JSON.parse(requests[1].data).gdpr.applies).to.be.true;
+      expect(JSON.parse(requests[1].data).gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+    })
+
+    it('should not contain GDPR consent data if GDPR not set', function() {
+      delete bidderRequest.gdprConsent;
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).gdpr).to.be.an('undefined');
+      expect(JSON.parse(requests[1].data).gdpr).to.be.an('undefined');
+    })
+
+    it('should set debug mode in requests if enabled', function() {
+      sinon.stub(config, 'getConfig').withArgs('debug').returns(true);
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).debug).to.be.true;
+      expect(JSON.parse(requests[1].data).debug).to.be.true;
+      config.getConfig.restore();
+    })
+  });
+
+  describe('interpretResponse', function () {
+    let serverResponse;
+    beforeEach(function() {
+      serverResponse = {
+        body: {
+          'requestId': 'request-id',
+          'cpm': 100,
+          'width': 300,
+          'height': 250,
+          'ad': '<div>ad</div>',
+          'ttl': 300,
+          'creativeId': 'creative-id',
+          'netRevenue': true,
+          'currency': 'USD'
+        }
+      };
+    });
+
+    it('should return a valid response', () => {
+      var responses = spec.interpretResponse(serverResponse);
+      expect(responses).to.be.an('array').that.is.not.empty;
+
+      let response = responses[0];
+      expect(response).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency');
+      expect(response.requestId).to.equal('request-id');
+      expect(response.cpm).to.equal(100);
+      expect(response.width).to.equal(300);
+      expect(response.height).to.equal(250);
+      expect(response.ad).to.equal('<div>ad</div>');
+      expect(response.ttl).to.equal(300);
+      expect(response.creativeId).to.equal('creative-id');
+      expect(response.netRevenue).to.be.true;
+      expect(response.currency).to.equal('USD');
+    });
+
+    it('should return an empty array when serverResponse is empty', () => {
+      serverResponse = {};
+      var responses = spec.interpretResponse(serverResponse);
+      expect(responses).to.deep.equal([]);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('should return nothing when sync is disabled', function () {
+      const syncOptions = {
+        'iframeEnabled': false,
+        'pixelEnabled': false
+      };
+
+      let syncs = spec.getUserSyncs(syncOptions);
+      expect(syncs).to.deep.equal([]);
+    });
+
+    it('should register iframe sync when only iframe is enabled', function () {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': false
+      };
+
+      let syncs = spec.getUserSyncs(syncOptions);
+      expect(syncs[0].type).to.equal('iframe');
+      expect(syncs[0].url).includes('https://rtb.adwmg.com/cphb.html?');
+    });
+
+    it('should register iframe sync when iframe and image are enabled', function () {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': true
+      };
+
+      let syncs = spec.getUserSyncs(syncOptions);
+      expect(syncs[0].type).to.equal('iframe');
+      expect(syncs[0].url).includes('https://rtb.adwmg.com/cphb.html?');
+    });
+
+    it('should send GDPR consent if enabled', function() {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': true
+      };
+      const gdprConsent = {
+        consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      };
+      const serverResponse = {};
+      let syncs = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent);
+      expect(syncs[0].url).includes('gdpr=1');
+      expect(syncs[0].url).includes(`gdpr_consent=${gdprConsent.consentString}`);
+    });
+  });
+});

From 9143962e09d3fcb00f7b9b23cff7d74be4502332 Mon Sep 17 00:00:00 2001
From: Stephen Johnston <stephenj@launchpowered.com>
Date: Wed, 9 Dec 2020 09:45:14 -0500
Subject: [PATCH 080/304] Add PubWise Bid Adapter (#6044)

* updates for first cut at bidder

* fix up height and width

* adds test spec

* remove hello_world from commit'

* updates to support native and fix issues found in initial review

* fix handling of new node in response for native vs banner

* updates to handle OpenRTB base

* updates to support RTB style calls

* updates to get back to parity

* updates to testing

* updates to test media type handling

* updates to handling testing

* updates to testing

* remove report file

* updates to fix up unit/spec tests

* updates to fix up unit/spec tests

* updates to fix up unit/spec tests

* updates to handling of gdpr

* Delete hello_world.html

* remove hellow-world-sample

* Pubwise 481 (#7)

* updates to support PubWise bid adapter, test cases and documentation

* updates to fix param tes

* Pubwise 481 (#8)

* fixes for unit testing

* remove unused variables and params

* Updates to Remove Unused Vars (#9)

* remove unused vars

* updates to fix up used and unsused params

* updates to fix up used and unsused params (#10)

* updates to fix up used and unsused params

* updates to remove usersync and add gvlid

* Pubwise 481 (#11)

* updates to remove usersync, add https, and add gvlid

* Update pubwiseBidAdapter.js

* updates to remove json, to remove options hit
---
 modules/pubwiseBidAdapter.js                | 777 ++++++++++++++++++++
 modules/pubwiseBidAdapter.md                |  78 ++
 test/spec/modules/pubwiseBidAdapter_spec.js | 575 +++++++++++++++
 3 files changed, 1430 insertions(+)
 create mode 100644 modules/pubwiseBidAdapter.js
 create mode 100644 modules/pubwiseBidAdapter.md
 create mode 100644 test/spec/modules/pubwiseBidAdapter_spec.js

diff --git a/modules/pubwiseBidAdapter.js b/modules/pubwiseBidAdapter.js
new file mode 100644
index 00000000000..f450a8bede8
--- /dev/null
+++ b/modules/pubwiseBidAdapter.js
@@ -0,0 +1,777 @@
+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';
+const VERSION = '0.1.0';
+const GVLID = 842;
+const NET_REVENUE = true;
+const UNDEFINED = undefined;
+const DEFAULT_CURRENCY = 'USD';
+const AUCTION_TYPE = 1;
+const BIDDER_CODE = 'pwbid';
+const ENDPOINT_URL = 'https://bid.pubwise.io/prebid';
+const DEFAULT_WIDTH = 0;
+const DEFAULT_HEIGHT = 0;
+const PREBID_NATIVE_HELP_LINK = 'https://prebid.org/dev-docs/show-native-ads.html';
+// const USERSYNC_URL = '//127.0.0.1:8080/usersync'
+
+const CUSTOM_PARAMS = {
+  'gender': '', // User gender
+  'yob': '', // User year of birth
+  'lat': '', // User location - Latitude
+  'lon': '', // User Location - Longitude
+};
+
+// rtb native types are meant to be dynamic and extendable
+// the extendable data asset types are nicely aligned
+// in practice we set an ID that is distinct for each real type of return
+const NATIVE_ASSETS = {
+  'TITLE': { ID: 1, KEY: 'title', TYPE: 0 },
+  'IMAGE': { ID: 2, KEY: 'image', TYPE: 0 },
+  'ICON': { ID: 3, KEY: 'icon', TYPE: 0 },
+  'SPONSOREDBY': { ID: 4, KEY: 'sponsoredBy', TYPE: 1 },
+  'BODY': { ID: 5, KEY: 'body', TYPE: 2 },
+  'CLICKURL': { ID: 6, KEY: 'clickUrl', TYPE: 0 },
+  'VIDEO': { ID: 7, KEY: 'video', TYPE: 0 },
+  'EXT': { ID: 8, KEY: 'ext', TYPE: 0 },
+  'DATA': { ID: 9, KEY: 'data', TYPE: 0 },
+  'LOGO': { ID: 10, KEY: 'logo', TYPE: 0 },
+  'SPONSORED': { ID: 11, KEY: 'sponsored', TYPE: 1 },
+  'DESC': { ID: 12, KEY: 'data', TYPE: 2 },
+  'RATING': { ID: 13, KEY: 'rating', TYPE: 3 },
+  'LIKES': { ID: 14, KEY: 'likes', TYPE: 4 },
+  'DOWNLOADS': { ID: 15, KEY: 'downloads', TYPE: 5 },
+  'PRICE': { ID: 16, KEY: 'price', TYPE: 6 },
+  'SALEPRICE': { ID: 17, KEY: 'saleprice', TYPE: 7 },
+  'PHONE': { ID: 18, KEY: 'phone', TYPE: 8 },
+  'ADDRESS': { ID: 19, KEY: 'address', TYPE: 9 },
+  'DESC2': { ID: 20, KEY: 'desc2', TYPE: 10 },
+  'DISPLAYURL': { ID: 21, KEY: 'displayurl', TYPE: 11 },
+  'CTA': { ID: 22, KEY: 'cta', TYPE: 12 }
+};
+
+const NATIVE_ASSET_IMAGE_TYPE = {
+  'ICON': 1,
+  'LOGO': 2,
+  'IMAGE': 3
+}
+
+// to render any native unit we have to have a few items
+const NATIVE_MINIMUM_REQUIRED_IMAGE_ASSETS = [
+  {
+    id: NATIVE_ASSETS.SPONSOREDBY.ID,
+    required: true,
+    data: {
+      type: 1
+    }
+  },
+  {
+    id: NATIVE_ASSETS.TITLE.ID,
+    required: true,
+  },
+  {
+    id: NATIVE_ASSETS.IMAGE.ID,
+    required: true,
+  }
+]
+
+let isInvalidNativeRequest = false
+let NATIVE_ASSET_ID_TO_KEY_MAP = {};
+let NATIVE_ASSET_KEY_TO_ASSET_MAP = {};
+
+// together allows traversal of NATIVE_ASSETS_LIST in any direction
+// id -> key
+utils._each(NATIVE_ASSETS, anAsset => { NATIVE_ASSET_ID_TO_KEY_MAP[anAsset.ID] = anAsset.KEY });
+// key -> asset
+utils._each(NATIVE_ASSETS, anAsset => { NATIVE_ASSET_KEY_TO_ASSET_MAP[anAsset.KEY] = anAsset });
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, NATIVE],
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    // siteId is required
+    if (bid.params && bid.params.siteId) {
+      // it must be a string
+      if (!utils.isStr(bid.params.siteId)) {
+        _logWarn('siteId is required for bid', bid);
+        return false;
+      }
+    } else {
+      return false;
+    }
+
+    return true;
+  },
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    var refererInfo;
+    if (bidderRequest && bidderRequest.refererInfo) {
+      refererInfo = bidderRequest.refererInfo;
+    }
+    var conf = _initConf(refererInfo);
+    var payload = _createOrtbTemplate(conf);
+    var bidCurrency = '';
+    var bid;
+    var blockedIabCategories = [];
+
+    validBidRequests.forEach(originalBid => {
+      bid = utils.deepClone(originalBid);
+      bid.params.adSlot = bid.params.adSlot || '';
+      _parseAdSlot(bid);
+
+      conf = _handleCustomParams(bid.params, conf);
+      conf.transactionId = bid.transactionId;
+      bidCurrency = bid.params.currency || UNDEFINED;
+      bid.params.currency = bidCurrency;
+
+      if (bid.params.hasOwnProperty('bcat') && utils.isArray(bid.params.bcat)) {
+        blockedIabCategories = blockedIabCategories.concat(bid.params.bcat);
+      }
+
+      var impObj = _createImpressionObject(bid, conf);
+      if (impObj) {
+        payload.imp.push(impObj);
+      }
+    });
+
+    // no payload imps, no rason to continue
+    if (payload.imp.length == 0) {
+      return;
+    }
+
+    // test bids can also be turned on here
+    if (window.location.href.indexOf('pubwiseTestBid=true') !== -1) {
+      payload.test = 1;
+    }
+
+    if (bid.params.isTest) {
+      payload.test = Number(bid.params.isTest) // should be 1 or 0
+    }
+    payload.site.publisher.id = bid.params.siteId.trim();
+    payload.user.gender = (conf.gender ? conf.gender.trim() : UNDEFINED);
+    payload.user.geo = {};
+    payload.user.geo.lat = _parseSlotParam('lat', conf.lat);
+    payload.user.geo.lon = _parseSlotParam('lon', conf.lon);
+    payload.user.yob = _parseSlotParam('yob', conf.yob);
+    payload.device.geo = payload.user.geo;
+    payload.site.page = payload.site.page.trim();
+    payload.site.domain = _getDomainFromURL(payload.site.page);
+
+    // add the content object from config in request
+    if (typeof config.getConfig('content') === 'object') {
+      payload.site.content = config.getConfig('content');
+    }
+
+    // merge the device from config.getConfig('device')
+    if (typeof config.getConfig('device') === 'object') {
+      payload.device = Object.assign(payload.device, config.getConfig('device'));
+    }
+
+    // passing transactionId in source.tid
+    utils.deepSetValue(payload, 'source.tid', conf.transactionId);
+
+    // schain
+    if (validBidRequests[0].schain) {
+      utils.deepSetValue(payload, 'source.ext.schain', validBidRequests[0].schain);
+    }
+
+    // gdpr consent
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      utils.deepSetValue(payload, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      utils.deepSetValue(payload, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+    }
+
+    // ccpa on the root object
+    if (bidderRequest && bidderRequest.uspConsent) {
+      utils.deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+
+    // if coppa is in effect then note it
+    if (config.getConfig('coppa') === true) {
+      utils.deepSetValue(payload, 'regs.coppa', 1);
+    }
+
+    var options = {contentType: 'text/plain'}
+
+    _logInfo('buildRequests payload', payload);
+    _logInfo('buildRequests bidderRequest', bidderRequest);
+
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: payload,
+      options: options,
+      bidderRequest: bidderRequest,
+    };
+  },
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (response, request) {
+    const bidResponses = [];
+    var respCur = DEFAULT_CURRENCY;
+    _logInfo('interpretResponse request', request);
+    let parsedRequest = request.data; // not currently stringified
+    // let parsedReferrer = parsedRequest.site && parsedRequest.site.ref ? parsedRequest.site.ref : '';
+
+    // try {
+    if (response.body && response.body.seatbid && utils.isArray(response.body.seatbid)) {
+      // Supporting multiple bid responses for same adSize
+      respCur = response.body.cur || respCur;
+      response.body.seatbid.forEach(seatbidder => {
+        seatbidder.bid &&
+            utils.isArray(seatbidder.bid) &&
+            seatbidder.bid.forEach(bid => {
+              let newBid = {
+                requestId: bid.impid,
+                cpm: (parseFloat(bid.price) || 0).toFixed(2),
+                width: bid.w,
+                height: bid.h,
+                creativeId: bid.crid || bid.id,
+                currency: respCur,
+                netRevenue: NET_REVENUE,
+                ttl: 300,
+                ad: bid.adm,
+                pw_seat: seatbidder.seat || null,
+                pw_dspid: bid.ext && bid.ext.dspid ? bid.ext.dspid : null,
+                partnerImpId: bid.id || '' // partner impression Id
+              };
+              if (parsedRequest.imp && parsedRequest.imp.length > 0) {
+                parsedRequest.imp.forEach(req => {
+                  if (bid.impid === req.id) {
+                    _checkMediaType(bid.adm, newBid);
+                    switch (newBid.mediaType) {
+                      case BANNER:
+                        break;
+                      case NATIVE:
+                        _parseNativeResponse(bid, newBid);
+                        break;
+                    }
+                  }
+                });
+              }
+
+              newBid.meta = {};
+              if (bid.ext && bid.ext.dspid) {
+                newBid.meta.networkId = bid.ext.dspid;
+              }
+              if (bid.ext && bid.ext.advid) {
+                newBid.meta.buyerId = bid.ext.advid;
+              }
+              if (bid.adomain && bid.adomain.length > 0) {
+                newBid.meta.advertiserDomains = bid.adomain;
+                newBid.meta.clickUrl = bid.adomain[0];
+              }
+
+              bidResponses.push(newBid);
+            });
+      });
+    }
+    // } catch (error) {
+    // _logError(error);
+    // }
+    return bidResponses;
+  }
+}
+
+function _checkMediaType(adm, newBid) {
+  // Create a regex here to check the strings
+  var admJSON = '';
+  if (adm.indexOf('"ver":') >= 0) {
+    try {
+      admJSON = JSON.parse(adm.replace(/\\/g, ''));
+      if (admJSON && admJSON.assets) {
+        newBid.mediaType = NATIVE;
+      }
+    } catch (e) {
+      _logWarn('Error: Cannot parse native reponse for ad response: ' + adm);
+    }
+  } else {
+    newBid.mediaType = BANNER;
+  }
+}
+
+function _parseNativeResponse(bid, newBid) {
+  newBid.native = {};
+  if (bid.hasOwnProperty('adm')) {
+    var adm = '';
+    try {
+      adm = JSON.parse(bid.adm.replace(/\\/g, ''));
+    } catch (ex) {
+      _logWarn('Error: Cannot parse native reponse for ad response: ' + newBid.adm);
+      return;
+    }
+    if (adm && adm.assets && adm.assets.length > 0) {
+      newBid.mediaType = NATIVE;
+      for (let i = 0, len = adm.assets.length; i < len; i++) {
+        switch (adm.assets[i].id) {
+          case NATIVE_ASSETS.TITLE.ID:
+            newBid.native.title = adm.assets[i].title && adm.assets[i].title.text;
+            break;
+          case NATIVE_ASSETS.IMAGE.ID:
+            newBid.native.image = {
+              url: adm.assets[i].img && adm.assets[i].img.url,
+              height: adm.assets[i].img && adm.assets[i].img.h,
+              width: adm.assets[i].img && adm.assets[i].img.w,
+            };
+            break;
+          case NATIVE_ASSETS.ICON.ID:
+            newBid.native.icon = {
+              url: adm.assets[i].img && adm.assets[i].img.url,
+              height: adm.assets[i].img && adm.assets[i].img.h,
+              width: adm.assets[i].img && adm.assets[i].img.w,
+            };
+            break;
+          case NATIVE_ASSETS.SPONSOREDBY.ID:
+          case NATIVE_ASSETS.BODY.ID:
+          case NATIVE_ASSETS.LIKES.ID:
+          case NATIVE_ASSETS.DOWNLOADS.ID:
+          case NATIVE_ASSETS.PRICE:
+          case NATIVE_ASSETS.SALEPRICE.ID:
+          case NATIVE_ASSETS.PHONE.ID:
+          case NATIVE_ASSETS.ADDRESS.ID:
+          case NATIVE_ASSETS.DESC2.ID:
+          case NATIVE_ASSETS.CTA.ID:
+          case NATIVE_ASSETS.RATING.ID:
+          case NATIVE_ASSETS.DISPLAYURL.ID:
+            newBid.native[NATIVE_ASSET_ID_TO_KEY_MAP[adm.assets[i].id]] = adm.assets[i].data && adm.assets[i].data.value;
+            break;
+        }
+      }
+      newBid.clickUrl = adm.link && adm.link.url;
+      newBid.clickTrackers = (adm.link && adm.link.clicktrackers) || [];
+      newBid.impressionTrackers = adm.imptrackers || [];
+      newBid.jstracker = adm.jstracker || [];
+      if (!newBid.width) {
+        newBid.width = DEFAULT_WIDTH;
+      }
+      if (!newBid.height) {
+        newBid.height = DEFAULT_HEIGHT;
+      }
+    }
+  }
+}
+
+function _getDomainFromURL(url) {
+  let anchor = document.createElement('a');
+  anchor.href = url;
+  return anchor.hostname;
+}
+
+function _handleCustomParams(params, conf) {
+  var key, value, entry;
+  for (key in CUSTOM_PARAMS) {
+    if (CUSTOM_PARAMS.hasOwnProperty(key)) {
+      value = params[key];
+      if (value) {
+        entry = CUSTOM_PARAMS[key];
+
+        if (typeof entry === 'object') {
+          // will be used in future when we want to
+          // process a custom param before using
+          // 'keyname': {f: function() {}}
+          value = entry.f(value, conf);
+        }
+
+        if (utils.isStr(value)) {
+          conf[key] = value;
+        } else {
+          _logWarn('Ignoring param : ' + key + ' with value : ' + CUSTOM_PARAMS[key] + ', expects string-value, found ' + typeof value);
+        }
+      }
+    }
+  }
+  return conf;
+}
+
+function _createOrtbTemplate(conf) {
+  return {
+    id: '' + new Date().getTime(),
+    at: AUCTION_TYPE,
+    cur: [DEFAULT_CURRENCY],
+    imp: [],
+    site: {
+      page: conf.pageURL,
+      ref: conf.refURL,
+      publisher: {}
+    },
+    device: {
+      ua: navigator.userAgent,
+      js: 1,
+      dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
+      h: screen.height,
+      w: screen.width,
+      language: navigator.language
+    },
+    user: {},
+    ext: {
+      version: VERSION
+    }
+  };
+}
+
+function _createImpressionObject(bid, conf) {
+  var impObj = {};
+  var bannerObj;
+  var nativeObj = {};
+  var mediaTypes = '';
+
+  impObj = {
+    id: bid.bidId,
+    tagid: bid.params.adUnit || undefined,
+    bidfloor: _parseSlotParam('bidFloor', bid.params.bidFloor), // capitalization dicated by 3.2.4 spec
+    secure: 1,
+    bidfloorcur: bid.params.currency ? _parseSlotParam('currency', bid.params.currency) : DEFAULT_CURRENCY // capitalization dicated by 3.2.4 spec
+  };
+
+  if (bid.hasOwnProperty('mediaTypes')) {
+    for (mediaTypes in bid.mediaTypes) {
+      switch (mediaTypes) {
+        case BANNER:
+          bannerObj = _createBannerRequest(bid);
+          if (bannerObj !== UNDEFINED) {
+            impObj.banner = bannerObj;
+          }
+          break;
+        case NATIVE:
+          nativeObj['request'] = JSON.stringify(_createNativeRequest(bid.nativeParams));
+          if (!isInvalidNativeRequest) {
+            impObj.native = nativeObj;
+          } else {
+            _logWarn('Error: Error in Native adunit ' + bid.params.adUnit + '. Ignoring the adunit. Refer to ' + PREBID_NATIVE_HELP_LINK + ' for more details.');
+          }
+          break;
+      }
+    }
+  } else {
+    _logWarn('MediaTypes are Required for all Adunit Configs', bid)
+  }
+
+  _addFloorFromFloorModule(impObj, bid);
+
+  return impObj.hasOwnProperty(BANNER) ||
+          impObj.hasOwnProperty(NATIVE) ? impObj : UNDEFINED;
+}
+
+function _parseSlotParam(paramName, paramValue) {
+  if (!utils.isStr(paramValue)) {
+    paramValue && _logWarn('Ignoring param key: ' + paramName + ', expects string-value, found ' + typeof paramValue);
+    return UNDEFINED;
+  }
+
+  switch (paramName) {
+    case 'bidFloor':
+      return parseFloat(paramValue) || UNDEFINED;
+    case 'lat':
+      return parseFloat(paramValue) || UNDEFINED;
+    case 'lon':
+      return parseFloat(paramValue) || UNDEFINED;
+    case 'yob':
+      return parseInt(paramValue) || UNDEFINED;
+    default:
+      return paramValue;
+  }
+}
+
+function _parseAdSlot(bid) {
+  _logInfo('parseAdSlot bid', bid)
+  bid.params.adUnit = '';
+  bid.params.width = 0;
+  bid.params.height = 0;
+  bid.params.adSlot = _cleanSlotName(bid.params.adSlot);
+
+  if (bid.hasOwnProperty('mediaTypes')) {
+    if (bid.mediaTypes.hasOwnProperty(BANNER) &&
+          bid.mediaTypes.banner.hasOwnProperty('sizes')) { // if its a banner, has mediaTypes and sizes
+      var i = 0;
+      var sizeArray = [];
+      for (;i < bid.mediaTypes.banner.sizes.length; i++) {
+        if (bid.mediaTypes.banner.sizes[i].length === 2) { // sizes[i].length will not be 2 in case where size is set as fluid, we want to skip that entry
+          sizeArray.push(bid.mediaTypes.banner.sizes[i]);
+        }
+      }
+      bid.mediaTypes.banner.sizes = sizeArray;
+      if (bid.mediaTypes.banner.sizes.length >= 1) {
+        // if there is more than one size then pop one onto the banner params width
+        // pop the first into the params, then remove it from mediaTypes
+        bid.params.width = bid.mediaTypes.banner.sizes[0][0];
+        bid.params.height = bid.mediaTypes.banner.sizes[0][1];
+        bid.mediaTypes.banner.sizes = bid.mediaTypes.banner.sizes.splice(1, bid.mediaTypes.banner.sizes.length - 1);
+      }
+    }
+  } else {
+    _logWarn('MediaTypes are Required for all Adunit Configs', bid)
+  }
+}
+
+function _cleanSlotName(slotName) {
+  if (utils.isStr(slotName)) {
+    return slotName.replace(/^\s+/g, '').replace(/\s+$/g, '');
+  }
+  return '';
+}
+
+function _initConf(refererInfo) {
+  return {
+    pageURL: (refererInfo && refererInfo.referer) ? refererInfo.referer : window.location.href,
+    refURL: window.document.referrer
+  };
+}
+
+function _commonNativeRequestObject(nativeAsset, params) {
+  var key = nativeAsset.KEY;
+  return {
+    id: nativeAsset.ID,
+    required: params[key].required ? 1 : 0,
+    data: {
+      type: nativeAsset.TYPE,
+      len: params[key].len,
+      ext: params[key].ext
+    }
+  };
+}
+
+function _addFloorFromFloorModule(impObj, bid) {
+  let bidFloor = -1; // indicates no floor
+
+  // get lowest floor from floorModule
+  if (typeof bid.getFloor === 'function' && !config.getConfig('pubwise.disableFloors')) {
+    [BANNER, NATIVE].forEach(mediaType => {
+      if (impObj.hasOwnProperty(mediaType)) {
+        let floorInfo = bid.getFloor({ currency: impObj.bidFloorCur, mediaType: mediaType, size: '*' });
+        if (typeof floorInfo === 'object' && floorInfo.currency === impObj.bidFloorCur && !isNaN(parseInt(floorInfo.floor))) {
+          let mediaTypeFloor = parseFloat(floorInfo.floor);
+          bidFloor = (bidFloor == -1 ? mediaTypeFloor : Math.min(mediaTypeFloor, bidFloor))
+        }
+      }
+    });
+  }
+
+  // get highest, if none then take the default -1
+  if (impObj.bidfloor) {
+    bidFloor = Math.max(bidFloor, impObj.bidfloor)
+  }
+
+  // assign if it has a valid floor - > 0
+  impObj.bidfloor = ((!isNaN(bidFloor) && bidFloor > 0) ? bidFloor : UNDEFINED);
+}
+
+function _createNativeRequest(params) {
+  var nativeRequestObject = {
+    assets: []
+  };
+  for (var key in params) {
+    if (params.hasOwnProperty(key)) {
+      var assetObj = {};
+      if (!(nativeRequestObject.assets && nativeRequestObject.assets.length > 0 && nativeRequestObject.assets.hasOwnProperty(key))) {
+        switch (key) {
+          case NATIVE_ASSETS.TITLE.KEY:
+            if (params[key].len || params[key].length) {
+              assetObj = {
+                id: NATIVE_ASSETS.TITLE.ID,
+                required: params[key].required ? 1 : 0,
+                title: {
+                  len: params[key].len || params[key].length,
+                  ext: params[key].ext
+                }
+              };
+            } else {
+              _logWarn('Error: Title Length is required for native ad: ' + JSON.stringify(params));
+            }
+            break;
+          case NATIVE_ASSETS.IMAGE.KEY:
+            if (params[key].sizes && params[key].sizes.length > 0) {
+              assetObj = {
+                id: NATIVE_ASSETS.IMAGE.ID,
+                required: params[key].required ? 1 : 0,
+                img: {
+                  type: NATIVE_ASSET_IMAGE_TYPE.IMAGE,
+                  w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
+                  h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
+                  wmin: params[key].wmin || params[key].minimumWidth || (params[key].minsizes ? params[key].minsizes[0] : UNDEFINED),
+                  hmin: params[key].hmin || params[key].minimumHeight || (params[key].minsizes ? params[key].minsizes[1] : UNDEFINED),
+                  mimes: params[key].mimes,
+                  ext: params[key].ext,
+                }
+              };
+            } else {
+              _logWarn('Error: Image sizes is required for native ad: ' + JSON.stringify(params));
+            }
+            break;
+          case NATIVE_ASSETS.ICON.KEY:
+            if (params[key].sizes && params[key].sizes.length > 0) {
+              assetObj = {
+                id: NATIVE_ASSETS.ICON.ID,
+                required: params[key].required ? 1 : 0,
+                img: {
+                  type: NATIVE_ASSET_IMAGE_TYPE.ICON,
+                  w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
+                  h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
+                }
+              };
+            } else {
+              _logWarn('Error: Icon sizes is required for native ad: ' + JSON.stringify(params));
+            };
+            break;
+          case NATIVE_ASSETS.VIDEO.KEY:
+            assetObj = {
+              id: NATIVE_ASSETS.VIDEO.ID,
+              required: params[key].required ? 1 : 0,
+              video: {
+                minduration: params[key].minduration,
+                maxduration: params[key].maxduration,
+                protocols: params[key].protocols,
+                mimes: params[key].mimes,
+                ext: params[key].ext
+              }
+            };
+            break;
+          case NATIVE_ASSETS.EXT.KEY:
+            assetObj = {
+              id: NATIVE_ASSETS.EXT.ID,
+              required: params[key].required ? 1 : 0,
+            };
+            break;
+          case NATIVE_ASSETS.LOGO.KEY:
+            assetObj = {
+              id: NATIVE_ASSETS.LOGO.ID,
+              required: params[key].required ? 1 : 0,
+              img: {
+                type: NATIVE_ASSET_IMAGE_TYPE.LOGO,
+                w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
+                h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED)
+              }
+            };
+            break;
+          case NATIVE_ASSETS.SPONSOREDBY.KEY:
+          case NATIVE_ASSETS.BODY.KEY:
+          case NATIVE_ASSETS.RATING.KEY:
+          case NATIVE_ASSETS.LIKES.KEY:
+          case NATIVE_ASSETS.DOWNLOADS.KEY:
+          case NATIVE_ASSETS.PRICE.KEY:
+          case NATIVE_ASSETS.SALEPRICE.KEY:
+          case NATIVE_ASSETS.PHONE.KEY:
+          case NATIVE_ASSETS.ADDRESS.KEY:
+          case NATIVE_ASSETS.DESC2.KEY:
+          case NATIVE_ASSETS.DISPLAYURL.KEY:
+          case NATIVE_ASSETS.CTA.KEY:
+            assetObj = _commonNativeRequestObject(NATIVE_ASSET_KEY_TO_ASSET_MAP[key], params);
+            break;
+        }
+      }
+    }
+    if (assetObj && assetObj.id) {
+      nativeRequestObject.assets[nativeRequestObject.assets.length] = assetObj;
+    }
+  };
+
+  // for native image adtype prebid has to have few required assests i.e. title,sponsoredBy, image
+  // if any of these are missing from the request then request will not be sent
+  var requiredAssetCount = NATIVE_MINIMUM_REQUIRED_IMAGE_ASSETS.length;
+  var presentrequiredAssetCount = 0;
+  NATIVE_MINIMUM_REQUIRED_IMAGE_ASSETS.forEach(ele => {
+    var lengthOfExistingAssets = nativeRequestObject.assets.length;
+    for (var i = 0; i < lengthOfExistingAssets; i++) {
+      if (ele.id == nativeRequestObject.assets[i].id) {
+        presentrequiredAssetCount++;
+        break;
+      }
+    }
+  });
+  if (requiredAssetCount == presentrequiredAssetCount) {
+    isInvalidNativeRequest = false;
+  } else {
+    isInvalidNativeRequest = true;
+  }
+  return nativeRequestObject;
+}
+
+function _createBannerRequest(bid) {
+  var sizes = bid.mediaTypes.banner.sizes;
+  var format = [];
+  var bannerObj;
+  if (sizes !== UNDEFINED && utils.isArray(sizes)) {
+    bannerObj = {};
+    if (!bid.params.width && !bid.params.height) {
+      if (sizes.length === 0) {
+        // i.e. since bid.params does not have width or height, and length of sizes is 0, need to ignore this banner imp
+        bannerObj = UNDEFINED;
+        _logWarn('Error: mediaTypes.banner.size missing for adunit: ' + bid.params.adUnit + '. Ignoring the banner impression in the adunit.');
+        return bannerObj;
+      } else {
+        bannerObj.w = parseInt(sizes[0][0], 10);
+        bannerObj.h = parseInt(sizes[0][1], 10);
+        sizes = sizes.splice(1, sizes.length - 1);
+      }
+    } else {
+      bannerObj.w = bid.params.width;
+      bannerObj.h = bid.params.height;
+    }
+    if (sizes.length > 0) {
+      format = [];
+      sizes.forEach(function (size) {
+        if (size.length > 1) {
+          format.push({ w: size[0], h: size[1] });
+        }
+      });
+      if (format.length > 0) {
+        bannerObj.format = format;
+      }
+    }
+    bannerObj.pos = 0;
+    bannerObj.topframe = utils.inIframe() ? 0 : 1;
+  } else {
+    _logWarn('Error: mediaTypes.banner.size missing for adunit: ' + bid.params.adUnit + '. Ignoring the banner impression in the adunit.');
+    bannerObj = UNDEFINED;
+  }
+  return bannerObj;
+}
+
+// various error levels are not always used
+// eslint-disable-next-line no-unused-vars
+function _logMessage(textValue, objectValue) {
+  utils.logMessage('PubWise: ' + textValue, objectValue);
+}
+
+// eslint-disable-next-line no-unused-vars
+function _logInfo(textValue, objectValue) {
+  utils.logInfo('PubWise: ' + textValue, objectValue);
+}
+
+// eslint-disable-next-line no-unused-vars
+function _logWarn(textValue, objectValue) {
+  utils.logWarn('PubWise: ' + textValue, objectValue);
+}
+
+// eslint-disable-next-line no-unused-vars
+function _logError(textValue, objectValue) {
+  utils.logError('PubWise: ' + textValue, objectValue);
+}
+
+// function _decorateLog() {
+//   arguments[0] = 'PubWise' + arguments[0];
+//   return arguments
+// }
+
+// these are exported only for testing so maintaining the JS convention of _ to indicate the intent
+export {
+  _checkMediaType,
+  _parseAdSlot
+}
+
+registerBidder(spec);
diff --git a/modules/pubwiseBidAdapter.md b/modules/pubwiseBidAdapter.md
new file mode 100644
index 00000000000..8cf38a63913
--- /dev/null
+++ b/modules/pubwiseBidAdapter.md
@@ -0,0 +1,78 @@
+# Overview
+
+```
+Module Name:  PubWise Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: info@pubwise.io
+```
+
+# Description
+
+Connects to PubWise exchange for bids.
+
+# Sample Banner Ad Unit: For Publishers
+
+With isTest parameter the system will respond in whatever dimensions provided.
+
+## Params
+
+
+
+## Banner
+```
+var adUnits = [
+    {
+        code: "div-gpt-ad-1460505748561-0",
+        mediaTypes: {
+        banner: {
+            sizes: [[300, 250]]
+        }
+        },
+        bids: [{
+            bidder: 'pubwise',
+            params: {
+                siteId: "xxxxxx",
+                isTest: true
+            }
+        }]
+    }
+]
+```
+## Native
+```
+var adUnits = [
+    {
+        code: 'div-gpt-ad-1460505748561-1',
+        sizes: [[1, 1]],
+        mediaTypes: {
+            native: {
+                title: {
+                    required: true,
+                    len: 80
+                },
+                body: {
+                    required: true
+                },
+                image: {
+                    required: true,
+                    sizes: [150, 50]
+                },
+                sponsoredBy: {
+                    required: true
+                },
+                icon: {
+                    required: false
+                }
+            }
+        },
+        bids: [{
+            bidder: 'pubwise',
+            params: {
+                siteId: "xxxxxx",
+                isTest: true,
+            },
+        }]
+    }
+]
+```
+
diff --git a/test/spec/modules/pubwiseBidAdapter_spec.js b/test/spec/modules/pubwiseBidAdapter_spec.js
new file mode 100644
index 00000000000..450b028f6c7
--- /dev/null
+++ b/test/spec/modules/pubwiseBidAdapter_spec.js
@@ -0,0 +1,575 @@
+// import or require modules necessary for the test, e.g.:
+
+import {expect} from 'chai';
+import {spec} from 'modules/pubwiseBidAdapter.js';
+import {_checkMediaType} from 'modules/pubwiseBidAdapter.js'; // this is exported only for testing so maintaining the JS convention of _ to indicate the intent
+import {_parseAdSlot} from 'modules/pubwiseBidAdapter.js'; // this is exported only for testing so maintaining the JS convention of _ to indicate the intent
+import * as utils from 'src/utils.js';
+
+const sampleRequestBanner = {
+  'id': '6c148795eb836a',
+  'tagid': 'div-gpt-ad-1460505748561-0',
+  'bidfloor': 1,
+  'secure': 1,
+  'bidfloorcur': 'USD',
+  'banner': {
+    'w': 300,
+    'h': 250,
+    'format': [
+      {
+        'w': 300,
+        'h': 600
+      }
+    ],
+    'pos': 0,
+    'topframe': 1
+  }
+};
+
+const sampleRequest = {
+  'at': 1,
+  'cur': [
+    'USD'
+  ],
+  'imp': [
+    sampleRequestBanner,
+    {
+      'id': '7329ddc1d84eb3',
+      'tagid': 'div-gpt-ad-1460505748561-1',
+      'secure': 1,
+      'bidfloorcur': 'USD',
+      'native': {
+        'request': '{"assets":[{"id":1,"required":1,"title":{"len":80}},{"id":5,"required":1,"data":{"type":2}},{"id":2,"required":1,"img":{"type":{"ID":2,"KEY":"image","TYPE":0},"w":150,"h":50}},{"id":4,"required":1,"data":{"type":1}}]}'
+      }
+    }
+  ],
+  'site': {
+    'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+    'ref': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+    'publisher': {
+      'id': 'xxxxxx'
+    }
+  },
+  'device': {
+    'ua': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome/86.0.4240.198 Safari/537.36',
+    'js': 1,
+    'dnt': 0,
+    'h': 600,
+    'w': 800,
+    'language': 'en-US',
+    'geo': {
+      'lat': 33.91989876432274,
+      'lon': -84.38897708175764
+    }
+  },
+  'user': {
+    'gender': 'M',
+    'geo': {
+      'lat': 33.91989876432274,
+      'lon': -84.38897708175764
+    },
+    'yob': 2000
+  },
+  'test': 0,
+  'ext': {
+    'version': '0.0.1'
+  },
+  'source': {
+    'tid': '2c8cd034-f068-4419-8c30-f07292c0d17b'
+  }
+};
+
+const sampleValidBannerBidRequest = {
+  'bidder': 'pubwise',
+  'params': {
+    'siteId': 'xxxxxx',
+    'bidFloor': '1.00',
+    'currency': 'USD',
+    'gender': 'M',
+    'lat': '33.91989876432274',
+    'lon': '-84.38897708175764',
+    'yob': '2000',
+    'bcat': ['IAB25-3', 'IAB26-1', 'IAB26-2', 'IAB26-3', 'IAB26-4'],
+  },
+  'gdprConsent': {
+    'consentString': 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA',
+    'gdprApplies': 1,
+  },
+  'uspConsent': 1,
+  'crumbs': {
+    'pubcid': '9a62f261-3c0b-4cc8-8db3-a72ae86ec6ba'
+  },
+  'fpd': {
+    'context': {
+      'adServer': {
+        'name': 'gam',
+        'adSlot': '/19968336/header-bid-tag-0'
+      },
+      'pbAdSlot': '/19968336/header-bid-tag-0'
+    }
+  },
+  'mediaTypes': {
+    'banner': {
+      'sizes': [
+        [
+          300,
+          250
+        ],
+        [
+          300,
+          600
+        ]
+      ]
+    }
+  },
+  'adUnitCode': 'div-gpt-ad-1460505748561-0',
+  'transactionId': '2001a8b2-3bcf-417d-b64f-92641dae21e0',
+  'sizes': [
+    [
+      300,
+      250
+    ],
+    [
+      300,
+      600
+    ]
+  ],
+  'bidId': '6c148795eb836a',
+  'bidderRequestId': '18a45bff5ff705',
+  'auctionId': '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+  'src': 'client',
+  'bidRequestsCount': 1,
+  'bidderRequestsCount': 1,
+  'bidderWinsCount': 0
+};
+
+const sampleValidBidRequests = [
+  sampleValidBannerBidRequest,
+  {
+    'bidder': 'pubwise',
+    'params': {
+      'siteId': 'xxxxxx'
+    },
+    'crumbs': {
+      'pubcid': '9a62f261-3c0b-4cc8-8db3-a72ae86ec6ba'
+    },
+    'nativeParams': {
+      'title': {
+        'required': true,
+        'len': 80
+      },
+      'body': {
+        'required': true
+      },
+      'image': {
+        'required': true,
+        'sizes': [
+          150,
+          50
+        ]
+      },
+      'sponsoredBy': {
+        'required': true
+      },
+      'icon': {
+        'required': false
+      }
+    },
+    'fpd': {
+      'context': {
+        'adServer': {
+          'name': 'gam',
+          'adSlot': '/19968336/header-bid-tag-0'
+        },
+        'pbAdSlot': '/19968336/header-bid-tag-0'
+      }
+    },
+    'mediaTypes': {
+      'native': {
+        'title': {
+          'required': true,
+          'len': 80
+        },
+        'body': {
+          'required': true
+        },
+        'image': {
+          'required': true,
+          'sizes': [
+            150,
+            50
+          ]
+        },
+        'sponsoredBy': {
+          'required': true
+        },
+        'icon': {
+          'required': false
+        }
+      }
+    },
+    'adUnitCode': 'div-gpt-ad-1460505748561-1',
+    'transactionId': '2c8cd034-f068-4419-8c30-f07292c0d17b',
+    'sizes': [],
+    'bidId': '30ab7516a51a7c',
+    'bidderRequestId': '18a45bff5ff705',
+    'auctionId': '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+    'src': 'client',
+    'bidRequestsCount': 1,
+    'bidderRequestsCount': 1,
+    'bidderWinsCount': 0
+  }
+]
+
+const sampleBidderBannerRequest = {
+  'bidder': 'pubwise',
+  'params': {
+    'siteId': 'xxxxxx',
+    'height': 250,
+    'width': 300,
+    'gender': 'M',
+    'yob': '2000',
+    'lat': '33.91989876432274',
+    'lon': '-84.38897708175764',
+    'bidFloor': '1.00',
+    'currency': 'USD',
+    'adSlot': '',
+    'adUnit': '',
+    'bcat': [
+      'IAB25-3',
+      'IAB26-1',
+      'IAB26-2',
+      'IAB26-3',
+      'IAB26-4',
+    ],
+  },
+  'crumbs': {
+    'pubcid': '9a62f261-3c0b-4cc8-8db3-a72ae86ec6ba'
+  },
+  'fpd': {
+    'context': {
+      'adServer': {
+        'name': 'gam',
+        'adSlot': '/19968336/header-bid-tag-0'
+      },
+      'pbAdSlot': '/19968336/header-bid-tag-0'
+    }
+  },
+  'mediaTypes': {
+    'banner': {
+      'sizes': [
+        [
+          300,
+          600
+        ]
+      ]
+    }
+  },
+  'adUnitCode': 'div-gpt-ad-1460505748561-0',
+  'transactionId': '2001a8b2-3bcf-417d-b64f-92641dae21e0',
+  'sizes': [
+    [
+      300,
+      250
+    ],
+    [
+      300,
+      600
+    ]
+  ],
+  'bidId': '6c148795eb836a',
+  'bidderRequestId': '18a45bff5ff705',
+  'auctionId': '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+  'src': 'client',
+  'bidRequestsCount': 1,
+  'bidderRequestsCount': 1,
+  'bidderWinsCount': 0,
+  'gdprConsent': {
+    'consentString': 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA',
+    'gdprApplies': 1,
+  },
+  'uspConsent': 1,
+};
+
+const sampleBidderRequest = {
+  'bidderCode': 'pubwise',
+  'auctionId': '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+  'bidderRequestId': '18a45bff5ff705',
+  'bids': [
+    sampleBidderBannerRequest,
+    {
+      'bidder': 'pubwise',
+      'params': {
+        'siteId': 'xxxxxx'
+      },
+      'crumbs': {
+        'pubcid': '9a62f261-3c0b-4cc8-8db3-a72ae86ec6ba'
+      },
+      'nativeParams': {
+        'title': {
+          'required': true,
+          'len': 80
+        },
+        'body': {
+          'required': true
+        },
+        'image': {
+          'required': true,
+          'sizes': [
+            150,
+            50
+          ]
+        },
+        'sponsoredBy': {
+          'required': true
+        },
+        'icon': {
+          'required': false
+        }
+      },
+      'fpd': {
+        'context': {
+          'adServer': {
+            'name': 'gam',
+            'adSlot': '/19968336/header-bid-tag-0'
+          },
+          'pbAdSlot': '/19968336/header-bid-tag-0'
+        }
+      },
+      'mediaTypes': {
+        'native': {
+          'title': {
+            'required': true,
+            'len': 80
+          },
+          'body': {
+            'required': true
+          },
+          'image': {
+            'required': true,
+            'sizes': [
+              150,
+              50
+            ]
+          },
+          'sponsoredBy': {
+            'required': true
+          },
+          'icon': {
+            'required': false
+          }
+        }
+      },
+      'adUnitCode': 'div-gpt-ad-1460505748561-1',
+      'transactionId': '2c8cd034-f068-4419-8c30-f07292c0d17b',
+      'sizes': [],
+      'bidId': '30ab7516a51a7c',
+      'bidderRequestId': '18a45bff5ff705',
+      'auctionId': '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+      'src': 'client',
+      'bidRequestsCount': 1,
+      'bidderRequestsCount': 1,
+      'bidderWinsCount': 0
+    }
+  ],
+  'auctionStart': 1606269202001,
+  'timeout': 1000,
+  'gdprConsent': {
+    'consentString': 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA',
+    'gdprApplies': 1,
+  },
+  'uspConsent': 1,
+  'refererInfo': {
+    'referer': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+    'reachedTop': true,
+    'isAmp': false,
+    'numIframes': 0,
+    'stack': [
+      'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true'
+    ],
+    'canonicalUrl': null
+  },
+  'start': 1606269202004
+};
+
+const sampleRTBResponse = {
+  'body': {
+    'id': '1606251348404',
+    'seatbid': [
+      {
+        'bid': [
+          {
+            'id': '1606579704052',
+            'impid': '6c148795eb836a',
+            'price': 1.23,
+            'adm': '\u003cdiv style="box-sizing: border-box;width:298px;height:248px;border: 1px solid rgba(0,0,0,.25);border-radius:10px;"\u003e\n\t\u003ch3 style="margin-top:80px;text-align: center;"\u003ePubWise Test Bid\u003c/h3\u003e\n\u003c/div\u003e',
+            'crid': 'test',
+            'w': 300,
+            'h': 250
+          },
+          {
+            'id': '1606579704052',
+            'impid': '7329ddc1d84eb3',
+            'price': 1.23,
+            'adm': '{"ver":"1.2","assets":[{"id":1,"title":{"text":"PubWise Test"}},{"id":2,"img":{"type":3,"url":"http://www.pubwise.io","w":300,"h":250}},{"id":3,"img":{"type":1,"url":"http://www.pubwise.io","w":150,"h":125}},{"id":5,"data":{"type":2,"value":"PubWise Test Desc"}},{"id":4,"data":{"type":1,"value":"PubWise.io"}}],"link":{"url":"http://www.pubwise.io"}}',
+            'crid': 'test',
+            'w': 300,
+            'h': 250
+          }
+        ]
+      }
+    ],
+    'bidid': 'testtesttest'
+  }
+};
+
+const samplePBBidObjects = [
+  {
+    'requestId': '6c148795eb836a',
+    'cpm': '1.23',
+    'width': 300,
+    'height': 250,
+    'creativeId': 'test',
+    'currency': 'USD',
+    'netRevenue': true,
+    'ttl': 300,
+    'ad': '<div style="box-sizing: border-box;width:298px;height:248px;border: 1px solid rgba(0,0,0,.25);border-radius:10px;">\n\t<h3 style="margin-top:80px;text-align: center;">PubWise Test Bid</h3>\n</div>',
+    'pw_seat': null,
+    'pw_dspid': null,
+    'partnerImpId': '1606579704052',
+    'meta': {},
+    'mediaType': 'banner',
+  },
+  {
+    'requestId': '7329ddc1d84eb3',
+    'cpm': '1.23',
+    'width': 300,
+    'height': 250,
+    'creativeId': 'test',
+    'currency': 'USD',
+    'netRevenue': true,
+    'ttl': 300,
+    'ad': '{\"ver\":\"1.2\",\"assets\":[{\"id\":1,\"title\":{\"text\":\"PubWise Test\"}},{\"id\":2,\"img\":{\"type\":3,\"url\":\"http://www.pubwise.io\",\"w\":300,\"h\":250}},{\"id\":3,\"img\":{\"type\":1,\"url\":\"http://www.pubwise.io\",\"w\":150,\"h\":125}},{\"id\":5,\"data\":{\"type\":2,\"value\":\"PubWise Test Desc\"}},{\"id\":4,\"data\":{\"type\":1,\"value\":\"PubWise.io\"}}],\"link\":{\"url\":\"http://www.pubwise.io\"}}',
+    'pw_seat': null,
+    'pw_dspid': null,
+    'partnerImpId': '1606579704052',
+    'mediaType': 'native',
+    'native': {
+      'body': 'PubWise Test Desc',
+      'icon': {
+        'height': 125,
+        'url': 'http://www.pubwise.io',
+        'width': 150,
+      },
+      'image': {
+        'height': 250,
+        'url': 'http://www.pubwise.io',
+        'width': 300,
+      },
+      'sponsoredBy': 'PubWise.io',
+      'title': 'PubWise Test'
+    },
+    'meta': {},
+    'impressionTrackers': [],
+    'jstracker': [],
+    'clickTrackers': [],
+    'clickUrl': 'http://www.pubwise.io'
+  }
+];
+
+describe('PubWiseAdapter', function () {
+  describe('Properly Validates Bids', function () {
+    it('valid bid', function () {
+      let validBid = {
+          bidder: 'pubwise',
+          params: {
+            siteId: 'xxxxxx'
+          }
+        },
+        isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(true);
+    });
+
+    it('valid bid: extra fields are ok', function () {
+      let validBid = {
+          bidder: 'pubwise',
+          params: {
+            siteId: 'xxxxxx',
+            gender: 'M',
+          }
+        },
+        isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(true);
+    });
+
+    it('invalid bid: no siteId', function () {
+      let inValidBid = {
+          bidder: 'pubwise',
+          params: {
+            gender: 'M',
+          }
+        },
+        isValid = spec.isBidRequestValid(inValidBid);
+      expect(isValid).to.equal(false);
+    });
+
+    it('invalid bid: siteId should be a string', function () {
+      let validBid = {
+          bidder: 'pubwise',
+          params: {
+            siteId: 123456
+          }
+        },
+        isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(false);
+    });
+  });
+
+  describe('Handling Request Construction', function () {
+    it('bid requests are not mutable', function() {
+      let sourceBidRequest = utils.deepClone(sampleValidBidRequests)
+      spec.buildRequests(sampleValidBidRequests, {auctinId: 'placeholder'});
+      expect(sampleValidBidRequests).to.deep.equal(sourceBidRequest, 'Should be unedited as they are used elsewhere');
+    });
+    it('should handle complex bidRequest', function() {
+      let request = spec.buildRequests(sampleValidBidRequests, sampleBidderRequest);
+      expect(request.bidderRequest).to.equal(sampleBidderRequest);
+    });
+    it('must conform to API for buildRequests', function() {
+      let request = spec.buildRequests(sampleValidBidRequests);
+      expect(request.bidderRequest).to.be.undefined;
+    });
+  });
+
+  describe('Identifies Media Types', function () {
+    it('identifies native adm type', function() {
+      let adm = '{"ver":"1.2","assets":[{"title":{"text":"PubWise Test"}},{"img":{"type":3,"url":"http://www.pubwise.io"}},{"img":{"type":1,"url":"http://www.pubwise.io"}},{"data":{"type":2,"value":"PubWise Test Desc"}},{"data":{"type":1,"value":"PubWise.io"}}],"link":{"url":""}}';
+      let newBid = {mediaType: 'unknown'};
+      _checkMediaType(adm, newBid);
+      expect(newBid.mediaType).to.equal('native', adm + ' Is a Native adm');
+    });
+
+    it('identifies banner adm type', function() {
+      let adm = '<div style="box-sizing: border-box;width:298px;height:248px;border: 1px solid rgba(0,0,0,.25);border-radius:10px;">↵	<h3 style="margin-top:80px;text-align: center;">PubWise Test Bid</h3>↵</div>';
+      let newBid = {mediaType: 'unknown'};
+      _checkMediaType(adm, newBid);
+      expect(newBid.mediaType).to.equal('banner', adm + ' Is a Banner adm');
+    });
+  });
+
+  describe('Properly Parses AdSlot Data', function () {
+    it('parses banner', function() {
+      let testBid = utils.deepClone(sampleValidBannerBidRequest)
+      _parseAdSlot(testBid)
+      expect(testBid).to.deep.equal(sampleBidderBannerRequest);
+    });
+  });
+
+  describe('Properly Handles Response', function () {
+    it('handles response with muiltiple responses', function() {
+      // the request when it comes back is on the data object
+      let pbResponse = spec.interpretResponse(sampleRTBResponse, {'data': sampleRequest})
+      expect(pbResponse).to.deep.equal(samplePBBidObjects);
+    });
+  });
+});

From a95f1db0e11b416a4885fc59aae1970053c9a30d Mon Sep 17 00:00:00 2001
From: cpuBird <54024689+cpuBird@users.noreply.github.com>
Date: Wed, 9 Dec 2020 21:24:30 +0530
Subject: [PATCH 081/304] Vdoai adapter update - Added video mediaType support
 (#5970)

* added video mediatype support to vdoai adapter

* added unit test
---
 modules/vdoaiBidAdapter.js                | 16 +++++++---
 modules/vdoaiBidAdapter.md                | 23 +++++++++++++++
 test/spec/modules/vdoaiBidAdapter_spec.js | 36 +++++++++++++++++++++++
 3 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/modules/vdoaiBidAdapter.js b/modules/vdoaiBidAdapter.js
index 395953fb737..8cfcd67bd00 100644
--- a/modules/vdoaiBidAdapter.js
+++ b/modules/vdoaiBidAdapter.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} from '../src/mediaTypes.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'vdo.ai';
 const ENDPOINT_URL = 'https://prebid.vdo.ai/auction';
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, VIDEO],
   /**
    * Determines whether or not the given bid request is valid.
    *
@@ -40,7 +40,8 @@ export const spec = {
         height: height,
         bidId: bidRequest.bidId,
         referer: bidderRequest.refererInfo.referer,
-        id: bidRequest.auctionId
+        id: bidRequest.auctionId,
+        mediaType: bidRequest.mediaTypes.video ? 'video' : 'banner'
       };
       bidRequest.params.bidFloor && (payload['bidFloor'] = bidRequest.params.bidFloor);
       return {
@@ -90,8 +91,15 @@ export const spec = {
         ttl: config.getConfig('_bidderTimeout'),
         // referrer: referrer,
         // ad: response.adm
-        ad: adCreative
+        // ad: adCreative,
+        mediaType: response.mediaType
       };
+
+      if (response.mediaType == 'video') {
+        bidResponse.vastXml = adCreative;
+      } else {
+        bidResponse.ad = adCreative;
+      }
       bidResponses.push(bidResponse);
     }
     return bidResponses;
diff --git a/modules/vdoaiBidAdapter.md b/modules/vdoaiBidAdapter.md
index 81bd8e69c1d..712adc0ec76 100644
--- a/modules/vdoaiBidAdapter.md
+++ b/modules/vdoaiBidAdapter.md
@@ -31,4 +31,27 @@ Module that connects to VDO.AI's demand sources
             ]
         }
     ];
+```
+
+
+# Video Test Parameters
+```
+var videoAdUnit = {
+  code: 'test-div',
+  sizes: [[640, 480]],
+  mediaTypes: {
+    video: {
+      playerSize: [[640, 480]],
+      context: 'instream'
+    },
+  },
+  bids: [
+    {
+        bidder: "vdo.ai",
+        params: {
+            placement: 'newsdv77'
+        }
+    }
+  ]
+};
 ```
\ No newline at end of file
diff --git a/test/spec/modules/vdoaiBidAdapter_spec.js b/test/spec/modules/vdoaiBidAdapter_spec.js
index c9d826d8dc8..5318bb43eca 100644
--- a/test/spec/modules/vdoaiBidAdapter_spec.js
+++ b/test/spec/modules/vdoaiBidAdapter_spec.js
@@ -37,6 +37,7 @@ describe('vdoaiBidAdapter', function () {
         'bidId': '23beaa6af6cdde',
         'bidderRequestId': '19c0c1efdf37e7',
         'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
+        'mediaTypes': 'banner'
       }
     ];
 
@@ -101,5 +102,40 @@ describe('vdoaiBidAdapter', function () {
       let result = spec.interpretResponse(serverResponse, bidRequest[0]);
       expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
     });
+
+    it('handles instream video responses', function () {
+      let serverResponse = {
+        body: {
+          'vdoCreative': '<!-- VAST Creative -->',
+          'price': 4.2,
+          'adid': '12345asdfg',
+          'currency': 'EUR',
+          'statusMessage': 'Bid available',
+          'requestId': 'bidId123',
+          'width': 300,
+          'height': 250,
+          'netRevenue': true,
+          'mediaType': 'video'
+        }
+      };
+      let bidRequest = [
+        {
+          'method': 'POST',
+          'url': ENDPOINT_URL,
+          'data': {
+            'placementId': 'testPlacementId',
+            'width': '300',
+            'height': '200',
+            'bidId': 'bidId123',
+            'referer': 'www.example.com',
+            'mediaType': 'video'
+          }
+        }
+      ];
+
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(result[0]).to.have.property('vastXml');
+      expect(result[0]).to.have.property('mediaType', 'video');
+    });
   });
 });

From c0af43297cc4ba8e89ca2d238e6469565850ff42 Mon Sep 17 00:00:00 2001
From: mmoschovas <63253416+mmoschovas@users.noreply.github.com>
Date: Wed, 9 Dec 2020 13:54:26 -0500
Subject: [PATCH 082/304] Price Floors update to include modelTimestamp
 displaying when the floors file was produced (#6061)

Rubicon Anaytics Update to pass modelTimestamp if exists
---
 modules/priceFloors.js                        |  1 +
 modules/rubiconAnalyticsAdapter.js            |  1 +
 test/spec/modules/priceFloors_spec.js         | 23 +++++++++++++++++++
 .../modules/rubiconAnalyticsAdapter_spec.js   |  3 +++
 4 files changed, 28 insertions(+)

diff --git a/modules/priceFloors.js b/modules/priceFloors.js
index fd8a46b172f..c0797f710de 100644
--- a/modules/priceFloors.js
+++ b/modules/priceFloors.js
@@ -291,6 +291,7 @@ export function updateAdUnitsForAuction(adUnits, floorData, auctionId) {
         skipRate: floorData.skipRate,
         floorMin: floorData.floorMin,
         modelVersion: utils.deepAccess(floorData, 'data.modelVersion'),
+        modelTimestamp: utils.deepAccess(floorData, 'data.modelTimestamp'),
         location: utils.deepAccess(floorData, 'data.location', 'noData'),
         floorProvider: floorData.floorProvider,
         fetchStatus: _floorsConfig.fetchStatus
diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index ff8cb7895b9..ad78c601ab6 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -237,6 +237,7 @@ function sendMessage(auctionId, bidWonId) {
         auction.floors = utils.pick(auctionCache.floorData, [
           'location',
           'modelVersion as modelName',
+          'modelTimestamp',
           'skipped',
           'enforcement', () => utils.deepAccess(auctionCache.floorData, 'enforcements.enforceJS'),
           'dealsEnforced', () => utils.deepAccess(auctionCache.floorData, 'enforcements.floorDeals'),
diff --git a/test/spec/modules/priceFloors_spec.js b/test/spec/modules/priceFloors_spec.js
index 8c673d29701..1b3ce021068 100644
--- a/test/spec/modules/priceFloors_spec.js
+++ b/test/spec/modules/priceFloors_spec.js
@@ -23,6 +23,7 @@ describe('the price floors module', function () {
   let clock;
   const basicFloorData = {
     modelVersion: 'basic model',
+    modelTimestamp: 1606772895,
     currency: 'USD',
     schema: {
       delimiter: '|',
@@ -184,6 +185,7 @@ describe('the price floors module', function () {
       let resultingData = getFloorsDataForAuction(inputFloorData, 'test_div_1');
       expect(resultingData).to.deep.equal({
         modelVersion: 'basic model',
+        modelTimestamp: 1606772895,
         currency: 'USD',
         schema: {
           delimiter: '|',
@@ -201,6 +203,7 @@ describe('the price floors module', function () {
       resultingData = getFloorsDataForAuction(inputFloorData, 'this_is_a_div');
       expect(resultingData).to.deep.equal({
         modelVersion: 'basic model',
+        modelTimestamp: 1606772895,
         currency: 'USD',
         schema: {
           delimiter: '^',
@@ -429,6 +432,7 @@ describe('the price floors module', function () {
         skipped: true,
         floorMin: undefined,
         modelVersion: undefined,
+        modelTimestamp: undefined,
         location: 'noData',
         skipRate: 0,
         fetchStatus: undefined,
@@ -463,6 +467,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'adUnit Model Version',
+        modelTimestamp: 1606772895,
         location: 'adUnit',
         skipRate: 0,
         fetchStatus: undefined,
@@ -496,6 +501,7 @@ describe('the price floors module', function () {
       validateBidRequests(true, {
         skipped: false,
         modelVersion: 'adUnit Model Version',
+        modelTimestamp: 1606772895,
         location: 'adUnit',
         skipRate: 0,
         floorMin: 7,
@@ -510,6 +516,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
         fetchStatus: undefined,
@@ -531,6 +538,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
         fetchStatus: undefined,
@@ -545,6 +553,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
         fetchStatus: undefined,
@@ -559,6 +568,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
         fetchStatus: undefined,
@@ -582,6 +592,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 50,
         fetchStatus: undefined,
@@ -596,6 +607,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 10,
         fetchStatus: undefined,
@@ -610,6 +622,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
         fetchStatus: undefined,
@@ -674,6 +687,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'model-1',
+        modelTimestamp: undefined,
         location: 'setConfig',
         skipRate: 0,
         fetchStatus: undefined,
@@ -687,6 +701,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'model-2',
+        modelTimestamp: undefined,
         location: 'setConfig',
         skipRate: 0,
         fetchStatus: undefined,
@@ -700,6 +715,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'model-3',
+        modelTimestamp: undefined,
         location: 'setConfig',
         skipRate: 0,
         fetchStatus: undefined,
@@ -729,6 +745,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
         fetchStatus: undefined,
@@ -808,6 +825,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
         fetchStatus: 'timeout',
@@ -846,6 +864,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'fetch model name',
+        modelTimestamp: 1606772895,
         location: 'fetch',
         skipRate: 0,
         fetchStatus: 'success',
@@ -883,6 +902,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'fetch model name',
+        modelTimestamp: 1606772895,
         location: 'fetch',
         skipRate: 0,
         fetchStatus: 'success',
@@ -923,6 +943,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'fetch model name',
+        modelTimestamp: 1606772895,
         location: 'fetch',
         skipRate: 95,
         fetchStatus: 'success',
@@ -945,6 +966,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
         fetchStatus: 'error',
@@ -969,6 +991,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
         fetchStatus: 'success',
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index 4891b8d3282..0d6cf331e52 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -852,6 +852,7 @@ describe('rubicon analytics adapter', function () {
       auctionInit.bidderRequests[0].bids[0].floorData = {
         skipped: false,
         modelVersion: 'someModelName',
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 15,
         fetchStatus: 'error',
@@ -953,6 +954,7 @@ describe('rubicon analytics adapter', function () {
       expect(message.auctions[0].floors).to.deep.equal({
         location: 'setConfig',
         modelName: 'someModelName',
+        modelTimestamp: 1606772895,
         skipped: false,
         enforcement: true,
         dealsEnforced: false,
@@ -998,6 +1000,7 @@ describe('rubicon analytics adapter', function () {
       expect(message.auctions[0].floors).to.deep.equal({
         location: 'setConfig',
         modelName: 'someModelName',
+        modelTimestamp: 1606772895,
         skipped: false,
         enforcement: true,
         dealsEnforced: false,

From a17c2346c233c301b948c5b5b69ad1d30a26c53a Mon Sep 17 00:00:00 2001
From: Olivier <osazos@adagio.io>
Date: Wed, 9 Dec 2020 20:26:28 +0100
Subject: [PATCH 083/304] Adagio Bid Adapter: hotfix - detect support for
 intersectionObserver (#6095)

* Detect support for intersectionObserver

* Fix IE11

* Add special params for non standard integration

* Stronger IntersectionObserver detection

* Fix test and add new params to .md file
---
 modules/adagioBidAdapter.js                | 19 +++++++++--
 modules/adagioBidAdapter.md                |  4 +++
 test/spec/modules/adagioBidAdapter_spec.js | 37 ++++++++++++++++++++--
 3 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/modules/adagioBidAdapter.js b/modules/adagioBidAdapter.js
index cab233d5387..6f7feec59c9 100644
--- a/modules/adagioBidAdapter.js
+++ b/modules/adagioBidAdapter.js
@@ -495,6 +495,12 @@ function autoDetectEnvironment() {
   return environment;
 };
 
+function supportIObs() {
+  const currentWindow = internal.getCurrentWindow();
+  return !!(currentWindow && currentWindow.IntersectionObserver && currentWindow.IntersectionObserverEntry &&
+    currentWindow.IntersectionObserverEntry.prototype && 'intersectionRatio' in currentWindow.IntersectionObserverEntry.prototype);
+}
+
 function getFeatures(bidRequest, bidderRequest) {
   const { adUnitCode, params } = bidRequest;
   const { adUnitElementId } = params;
@@ -569,6 +575,7 @@ export const internal = {
   getRefererInfo,
   adagioScriptFromLocalStorageCb,
   getCurrentWindow,
+  supportIObs,
   canAccessTopWindow,
   isRendererPreferredFromPublisher
 };
@@ -692,15 +699,21 @@ export const spec = {
       return false;
     }
 
-    const { organizationId, site, placement } = params;
-    const adUnitElementId = params.adUnitElementId || internal.autoDetectAdUnitElementId(adUnitCode);
+    const { organizationId, site } = params;
+    const adUnitElementId = (params.useAdUnitCodeAsAdUnitElementId === true)
+      ? adUnitCode
+      : params.adUnitElementId || internal.autoDetectAdUnitElementId(adUnitCode);
+    const placement = (params.useAdUnitCodeAsPlacement === true) ? adUnitCode : params.placement;
     const environment = params.environment || internal.autoDetectEnvironment();
+    const supportIObs = internal.supportIObs();
 
     // insure auto-detected params are kept in `bid` object.
     bid.params = {
       ...params,
       adUnitElementId,
-      environment
+      environment,
+      placement,
+      supportIObs
     };
 
     const debugData = () => ({
diff --git a/modules/adagioBidAdapter.md b/modules/adagioBidAdapter.md
index c55a24f1115..aa79338d79e 100644
--- a/modules/adagioBidAdapter.md
+++ b/modules/adagioBidAdapter.md
@@ -38,6 +38,8 @@ Connects to Adagio demand source to fetch bids.
             category: 'sport', // Recommended. Category of the content displayed in the page.
             subcategory: 'handball', // Optional. Subcategory of the content displayed in the page.
             postBid: false, // Optional. Use it in case of Post-bid integration only.
+            useAdUnitCodeAsAdUnitElementId: false // Optional. Use it by-pass adUnitElementId and use the adUnit code as value
+            useAdUnitCodeAsPlacement: false // Optional. Use it to by-pass placement and use the adUnit code as value
             // Optional debug mode, used to get a bid response with expected cpm.
             debug: {
               enabled: true,
@@ -76,6 +78,8 @@ Connects to Adagio demand source to fetch bids.
             category: 'sport', // Recommended. Category of the content displayed in the page.
             subcategory: 'handball', // Optional. Subcategory of the content displayed in the page.
             postBid: false, // Optional. Use it in case of Post-bid integration only.
+            useAdUnitCodeAsAdUnitElementId: false // Optional. Use it by-pass adUnitElementId and use the adUnit code as value
+            useAdUnitCodeAsPlacement: false // Optional. Use it to by-pass placement and use the adUnit code as value
             video: {
               skip: 0
               // OpenRTB 2.5 video options defined here override ones defined in mediaTypes.
diff --git a/test/spec/modules/adagioBidAdapter_spec.js b/test/spec/modules/adagioBidAdapter_spec.js
index 2cf97a1129b..0a585caaa1a 100644
--- a/test/spec/modules/adagioBidAdapter_spec.js
+++ b/test/spec/modules/adagioBidAdapter_spec.js
@@ -144,6 +144,19 @@ describe('Adagio bid adapter', () => {
       sinon.assert.callCount(utils.logWarn, 1);
     });
 
+    it('should use adUnit code for adUnitElementId and placement params', function() {
+      const bid01 = new BidRequestBuilder({ params: {
+        organizationId: '1000',
+        site: 'site-name',
+        useAdUnitCodeAsPlacement: true,
+        useAdUnitCodeAsAdUnitElementId: true
+      }}).build();
+
+      expect(spec.isBidRequestValid(bid01)).to.equal(true);
+      expect(bid01.params.adUnitElementId).to.equal('adunit-code');
+      expect(bid01.params.placement).to.equal('adunit-code');
+    })
+
     it('should return false when a required param is missing', function() {
       const bid01 = new BidRequestBuilder({ params: {
         organizationId: '1000',
@@ -229,7 +242,8 @@ describe('Adagio bid adapter', () => {
               placement: 'PAVE_ATF',
               site: 'SITE-NAME',
               adUnitElementId: 'gpt-adunit-code',
-              environment: 'desktop'
+              environment: 'desktop',
+              supportIObs: true
             }
           }],
           auctionId: '4fd1ca2d-846c-4211-b9e5-321dfe1709c9',
@@ -249,7 +263,8 @@ describe('Adagio bid adapter', () => {
               placement: 'PAVE_ATF',
               site: 'SITE-NAME',
               adUnitElementId: 'gpt-adunit-code',
-              environment: 'desktop'
+              environment: 'desktop',
+              supportIObs: true
             }
           }],
           auctionId: '4fd1ca2d-846c-4211-b9e5-321dfe1709c9',
@@ -260,6 +275,7 @@ describe('Adagio bid adapter', () => {
 
       it('should store bids config once by bid in window.top if it accessible', function() {
         sandbox.stub(adagio, 'getCurrentWindow').returns(window.top);
+        sandbox.stub(adagio, 'supportIObs').returns(true);
 
         // replace by the values defined in beforeEach
         window.top.ADAGIO = {
@@ -274,8 +290,22 @@ describe('Adagio bid adapter', () => {
         expect(find(window.top.ADAGIO.pbjsAdUnits, aU => aU.code === 'adunit-code-02')).to.deep.eql(expected[1]);
       });
 
+      it('should detect IntersectionObserver support', function() {
+        sandbox.stub(adagio, 'getCurrentWindow').returns(window.top);
+        sandbox.stub(adagio, 'supportIObs').returns(false);
+
+        window.top.ADAGIO = {
+          ...window.ADAGIO
+        };
+
+        spec.isBidRequestValid(bid01);
+        const validBidReq = find(window.top.ADAGIO.pbjsAdUnits, aU => aU.code === 'adunit-code-01');
+        expect(validBidReq.bids[0].params.supportIObs).to.equal(false);
+      });
+
       it('should store bids config once by bid in current window', function() {
         sandbox.stub(adagio, 'getCurrentWindow').returns(window.self);
+        sandbox.stub(adagio, 'supportIObs').returns(true);
 
         spec.isBidRequestValid(bid01);
         spec.isBidRequestValid(bid02);
@@ -740,7 +770,8 @@ describe('Adagio bid adapter', () => {
             pagetype: 'ARTICLE',
             category: 'NEWS',
             subcategory: 'SPORT',
-            environment: 'desktop'
+            environment: 'desktop',
+            supportIObs: true
           },
           adUnitCode: 'adunit-code',
           mediaTypes: {

From 83bafc0475a68033f6e0d9d1fe9e7014cea5ead8 Mon Sep 17 00:00:00 2001
From: Gena <wertixvost@gmail.com>
Date: Wed, 9 Dec 2020 22:11:58 +0200
Subject: [PATCH 084/304] Adt new alias (#6004)

* Add new alias

* Add new aliases and fix endpoints

* lint

* Fix tests
---
 modules/adtelligentBidAdapter.js                | 16 ++++++++++++----
 test/spec/modules/adtelligentBidAdapter_spec.js | 17 +++++++++++------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/modules/adtelligentBidAdapter.js b/modules/adtelligentBidAdapter.js
index 51138a2cac7..b2e37767a1e 100644
--- a/modules/adtelligentBidAdapter.js
+++ b/modules/adtelligentBidAdapter.js
@@ -12,15 +12,23 @@ const HOST_GETTERS = {
   default: (function () {
     let num = 0;
     return function () {
-      return 'ghb' + subdomainSuffixes[num++ % subdomainSuffixes.length] + '.adtelligent.com'
+      return 'ghb' + subdomainSuffixes[num++ % subdomainSuffixes.length] + '.adtelligent.com';
     }
   }()),
   appaloosa: function () {
-    return 'hb.appaloosa.media'
+    return 'ghb.hb.appaloosa.media';
+  },
+  onefiftytwomedia: function() {
+    return 'ghb.ads.152media.com';
+  },
+  mediafuse: function() {
+    return 'ghb.hbmp.mediafuse.com';
   }
+
 }
 const getUri = function (bidderCode) {
-  let getter = HOST_GETTERS[bidderCode] || HOST_GETTERS['default'];
+  let bidderWithoutSuffix = bidderCode.split('_')[0];
+  let getter = HOST_GETTERS[bidderWithoutSuffix] || HOST_GETTERS['default'];
   return PROTOCOL + getter() + AUCTION_PATH
 }
 const OUTSTREAM_SRC = 'https://player.adtelligent.com/outstream-unit/2.01/outstream.min.js';
@@ -32,7 +40,7 @@ const syncsCache = {};
 export const spec = {
   code: BIDDER_CODE,
   gvlid: 410,
-  aliases: ['onefiftytwomedia', 'selectmedia', 'appaloosa'],
+  aliases: ['onefiftytwomedia', 'selectmedia', 'appaloosa', 'mediafuse'],
   supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid: function (bid) {
     return !!utils.deepAccess(bid, 'params.aid');
diff --git a/test/spec/modules/adtelligentBidAdapter_spec.js b/test/spec/modules/adtelligentBidAdapter_spec.js
index 62449771416..5c1e4a38d03 100644
--- a/test/spec/modules/adtelligentBidAdapter_spec.js
+++ b/test/spec/modules/adtelligentBidAdapter_spec.js
@@ -11,8 +11,13 @@ const EXPECTED_ENDPOINTS = [
   'https://ghb.adtelligent.com/v2/auction/'
 ];
 const aliasEP = {
-  appaloosa: 'https://hb.appaloosa.media/v2/auction/'
+  appaloosa: 'https://ghb.hb.appaloosa.media/v2/auction/',
+  appaloosa_publisherSuffix: 'https://ghb.hb.appaloosa.media/v2/auction/',
+  onefiftytwomedia: 'https://ghb.ads.152media.com/v2/auction/',
+  mediafuse: 'https://ghb.hbmp.mediafuse.com/v2/auction/'
 };
+
+const DEFAULT_ADATPER_REQ = { bidderCode: 'adtelligent' };
 const DISPLAY_REQUEST = {
   'bidder': 'adtelligent',
   'params': {
@@ -244,10 +249,10 @@ describe('adtelligentBidAdapter', () => {
     let videoBidRequests = [VIDEO_REQUEST];
     let displayBidRequests = [DISPLAY_REQUEST];
     let videoAndDisplayBidRequests = [DISPLAY_REQUEST, VIDEO_REQUEST];
-    const displayRequest = spec.buildRequests(displayBidRequests, {});
-    const videoRequest = spec.buildRequests(videoBidRequests, {});
-    const videoAndDisplayRequests = spec.buildRequests(videoAndDisplayBidRequests, {});
-    const rotatingRequest = spec.buildRequests(displayBidRequests, {});
+    const displayRequest = spec.buildRequests(displayBidRequests, DEFAULT_ADATPER_REQ);
+    const videoRequest = spec.buildRequests(videoBidRequests, DEFAULT_ADATPER_REQ);
+    const videoAndDisplayRequests = spec.buildRequests(videoAndDisplayBidRequests, DEFAULT_ADATPER_REQ);
+    const rotatingRequest = spec.buildRequests(displayBidRequests, DEFAULT_ADATPER_REQ);
     it('rotates endpoints', () => {
       const bidReqUrls = [displayRequest[0], videoRequest[0], videoAndDisplayRequests[0], rotatingRequest[0]].map(br => br.url);
       expect(bidReqUrls).to.deep.equal(EXPECTED_ENDPOINTS);
@@ -276,7 +281,7 @@ describe('adtelligentBidAdapter', () => {
       expect(videoAndDisplayRequests.every(comparator)).to.be.true;
     });
     it('forms correct ADPOD request', () => {
-      const pbBidReqData = spec.buildRequests([ADPOD_REQUEST], {})[0].data;
+      const pbBidReqData = spec.buildRequests([ADPOD_REQUEST], DEFAULT_ADATPER_REQ)[0].data;
       const impRequest = pbBidReqData.BidRequests[0]
       expect(impRequest.AdType).to.be.equal('video');
       expect(impRequest.Adpod).to.be.a('object');

From 09601b65a6a82aca419afcc618bd798cf429aa22 Mon Sep 17 00:00:00 2001
From: Mike Chowla <mike.chowla@pubmatic.com>
Date: Wed, 9 Dec 2020 12:49:22 -0800
Subject: [PATCH 085/304] Prebid 4.9.0 Release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ed4514cee42..5c82e724453 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.19.0-pre",
+  "version": "4.19.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 3496b3f627202fedca7a4a42d97407b819d6c014 Mon Sep 17 00:00:00 2001
From: Mike Chowla <mike.chowla@pubmatic.com>
Date: Wed, 9 Dec 2020 13:14:51 -0800
Subject: [PATCH 086/304] Increment pre version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5c82e724453..04ec495c93d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.19.0",
+  "version": "4.20.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From f7a91ca2e00c2530d7a4a8fbaa959aab8e455b26 Mon Sep 17 00:00:00 2001
From: Stephen Johnston <stephenj@launchpowered.com>
Date: Wed, 9 Dec 2020 17:54:33 -0500
Subject: [PATCH 087/304] Add Release Drafter Instructions to PR_REVIEW.md
 (#6085)

* Add Release Drafter Instructions to PR_REVIEW.md

* Add Prettier Formatting

Makes keywords more distinct.

Co-authored-by: Scott Menzer <scott@id5.io>

Co-authored-by: Scott Menzer <scott@id5.io>
---
 PR_REVIEW.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/PR_REVIEW.md b/PR_REVIEW.md
index f991a0254f5..662a1a871c8 100644
--- a/PR_REVIEW.md
+++ b/PR_REVIEW.md
@@ -18,7 +18,10 @@ For modules and core platform updates, the initial reviewer should request an ad
 - If the change results in needing updates to docs (such as public API change, module interface etc), add a label for "needs docs" and inform the submitter they must submit a docs PR to update the appropriate area of Prebid.org **before the PR can merge**. Help them with finding where the docs are located on prebid.org if needed. 
 - If all above is good, add a `LGTM` comment and, if the change is in PBS-core or is an important module like the prebidServerBidAdapter, request 1 additional core member to review.
 - Once there are 2 `LGTM` on the PR, merge to master
-- Add a line into the [draft release](https://github.com/prebid/Prebid.js/releases) notes for this submission. If no draft release is available, create one using [this template]( https://gist.github.com/mkendall07/c3af6f4691bed8a46738b3675cb5a479)
+- The [draft release](https://github.com/prebid/Prebid.js/releases) notes are managed by [release drafter](https://github.com/release-drafter/release-drafter). To get the PR added to the release notes do the steps below. A github action will use that information to build the release notes.
+    - Adjust the PR Title to be appropriate for release notes
+    - Add a label for `feature`, `maintenance`, `fix`, `bugfix` or `bug` to categorize the PR
+    - Add a semver label of `major`, `minor` or `patch` to indicate the scope of change    
 
 ### Reviewing a New or Updated Bid Adapter
 Documentation they're supposed to be following is https://docs.prebid.org/dev-docs/bidder-adaptor.html

From 03b8213de8bede7883323fff6f3ccf00bad08410 Mon Sep 17 00:00:00 2001
From: olafbuitelaar <olaf.buitelaar@gmail.com>
Date: Thu, 10 Dec 2020 10:36:45 +0100
Subject: [PATCH 088/304] fix typo in PREVENT_WRITING_ON_MAIN_DOCUMENT (#6102)

---
 src/constants.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/constants.json b/src/constants.json
index 7c0af445cdb..7e82946b65c 100644
--- a/src/constants.json
+++ b/src/constants.json
@@ -41,7 +41,7 @@
     "AUCTION_DEBUG": "auctionDebug"
   },
   "AD_RENDER_FAILED_REASON" : {
-    "PREVENT_WRITING_ON_MAIN_DOCUMENT": "preventWritingOnMainDocuemnt",
+    "PREVENT_WRITING_ON_MAIN_DOCUMENT": "preventWritingOnMainDocument",
     "NO_AD": "noAd",
     "EXCEPTION": "exception",
     "CANNOT_FIND_AD": "cannotFindAd",

From 754ce678b47b8e13148e0a02a9db0d477ce3eaa6 Mon Sep 17 00:00:00 2001
From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com>
Date: Thu, 10 Dec 2020 06:10:25 -0500
Subject: [PATCH 089/304] appnexusBidAdapter - update segment param logic
 (#6103)

---
 modules/appnexusBidAdapter.js                | 14 +++++++++++++-
 test/spec/modules/appnexusBidAdapter_spec.js |  2 ++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index 203835db611..c102bee4e58 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -107,7 +107,19 @@ export const spec = {
         .filter(param => includes(USER_PARAMS, param))
         .forEach((param) => {
           let uparam = utils.convertCamelToUnderscore(param);
-          userObj[uparam] = userObjBid.params.user[param]
+          if (param === 'segments' && utils.isArray(userObjBid.params.user[param])) {
+            let segs = [];
+            userObjBid.params.user[param].forEach(val => {
+              if (utils.isNumber(val)) {
+                segs.push({'id': val});
+              } else if (utils.isPlainObject(val)) {
+                segs.push(val);
+              }
+            });
+            userObj[uparam] = segs;
+          } else if (param !== 'segments') {
+            userObj[uparam] = userObjBid.params.user[param];
+          }
         });
     }
 
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index 426259639e8..9b12d892440 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -265,6 +265,7 @@ describe('AppNexusAdapter', function () {
             placementId: '10433394',
             user: {
               externalUid: '123',
+              segments: [123, { id: 987, value: 876 }],
               foobar: 'invalid'
             }
           }
@@ -277,6 +278,7 @@ describe('AppNexusAdapter', function () {
       expect(payload.user).to.exist;
       expect(payload.user).to.deep.equal({
         external_uid: '123',
+        segments: [{id: 123}, {id: 987, value: 876}]
       });
     });
 

From c8353d39bc769e4fe3ee3b9a7dd3467dbd7bdf2c Mon Sep 17 00:00:00 2001
From: Hiroaki Kubota <hiroaki.kubota@mail.crumb.jp>
Date: Fri, 11 Dec 2020 08:56:10 +0900
Subject: [PATCH 090/304] Change craftBidAdapter request URL (#6096)

---
 modules/craftBidAdapter.js                | 5 +++--
 test/spec/modules/craftBidAdapter_spec.js | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/craftBidAdapter.js b/modules/craftBidAdapter.js
index 3838f5dee59..0124f96a107 100644
--- a/modules/craftBidAdapter.js
+++ b/modules/craftBidAdapter.js
@@ -7,7 +7,7 @@ import includes from 'core-js-pure/features/array/includes.js';
 import { getStorageManager } from '../src/storageManager.js';
 
 const BIDDER_CODE = 'craft';
-const URL = 'https://gacraft.jp/prebid-v3';
+const URL_BASE = 'https://gacraft.jp/prebid-v3';
 const TTL = 360;
 const storage = getStorageManager();
 
@@ -143,10 +143,11 @@ function formatRequest(payload, bidderRequest) {
       withCredentials: false
     };
   }
+
   const payloadString = JSON.stringify(payload);
   return {
     method: 'POST',
-    url: URL,
+    url: `${URL_BASE}/${payload.tags[0].sitekey}`,
     data: payloadString,
     bidderRequest,
     options
diff --git a/test/spec/modules/craftBidAdapter_spec.js b/test/spec/modules/craftBidAdapter_spec.js
index ef7dd7c3232..3f4bc977016 100644
--- a/test/spec/modules/craftBidAdapter_spec.js
+++ b/test/spec/modules/craftBidAdapter_spec.js
@@ -81,7 +81,7 @@ describe('craftAdapter', function () {
     it('sends bid request to ENDPOINT via POST', function () {
       let request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.method).to.equal('POST');
-      expect(request.url).to.equal('https://gacraft.jp/prebid-v3');
+      expect(request.url).to.equal('https://gacraft.jp/prebid-v3/craft-prebid-example');
       let data = JSON.parse(request.data);
       expect(data.tags).to.deep.equals([{
         sitekey: 'craft-prebid-example',

From 0a5f9db693d54278e8198fb00be018089d892db4 Mon Sep 17 00:00:00 2001
From: Oleg Naydenov <onaydenov@users.noreply.github.com>
Date: Fri, 11 Dec 2020 20:59:20 +0200
Subject: [PATCH 091/304] Add Kubient bid adapter, Remove alias from Fidelity
 bid adapter. (#6084)

* Add New Kubient Bid Adapter

* Add New Kubient Bid Adapter

* Fidelity Bid Adapter Update. Less 'Kubient' Alias

* New Kubient Bid Adapter. Errors fix.
---
 modules/fidelityBidAdapter.js               |   1 -
 modules/kubientBidAdapter.js                | 111 +++++++++
 modules/kubientBidAdapter.md                |  26 ++
 test/spec/modules/kubientBidAdapter_spec.js | 259 ++++++++++++++++++++
 4 files changed, 396 insertions(+), 1 deletion(-)
 create mode 100644 modules/kubientBidAdapter.js
 create mode 100644 modules/kubientBidAdapter.md
 create mode 100644 test/spec/modules/kubientBidAdapter_spec.js

diff --git a/modules/fidelityBidAdapter.js b/modules/fidelityBidAdapter.js
index baf5384fbfe..fac273721ff 100644
--- a/modules/fidelityBidAdapter.js
+++ b/modules/fidelityBidAdapter.js
@@ -6,7 +6,6 @@ const BIDDER_SERVER = 'x.fidelity-media.com';
 const FIDELITY_VENDOR_ID = 408;
 export const spec = {
   code: BIDDER_CODE,
-  aliases: ['kubient'],
   gvlid: 408,
   isBidRequestValid: function isBidRequestValid(bid) {
     return !!(bid && bid.params && bid.params.zoneid);
diff --git a/modules/kubientBidAdapter.js b/modules/kubientBidAdapter.js
new file mode 100644
index 00000000000..8f6ea53ecce
--- /dev/null
+++ b/modules/kubientBidAdapter.js
@@ -0,0 +1,111 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+
+const BIDDER_CODE = 'kubient';
+const END_POINT = 'https://kssp.kbntx.ch/pbjs';
+const VERSION = '1.0';
+const VENDOR_ID = 794;
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: VENDOR_ID,
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid: function (bid) {
+    return !!(bid && bid.params);
+  },
+  buildRequests: function (validBidRequests, bidderRequest) {
+    if (!validBidRequests || !bidderRequest) {
+      return;
+    }
+    const result = validBidRequests.map(function (bid) {
+      let data = {
+        v: VERSION,
+        requestId: bid.bidderRequestId,
+        adSlots: [{
+          bidId: bid.bidId,
+          zoneId: bid.params.zoneid || '',
+          floor: bid.params.floor || 0.0,
+          sizes: bid.sizes || [],
+          schain: bid.schain || {},
+          mediaTypes: bid.mediaTypes
+        }],
+        referer: (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) ? bidderRequest.refererInfo.referer : null,
+        tmax: bidderRequest.timeout,
+        gdpr: (bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) ? 1 : 0,
+        consent: (bidderRequest.gdprConsent && bidderRequest.gdprConsent.consentString) ? bidderRequest.gdprConsent.consentString : null,
+        consentGiven: kubientGetConsentGiven(bidderRequest.gdprConsent),
+        uspConsent: bidderRequest.uspConsent
+      };
+      return {
+        method: 'POST',
+        url: END_POINT,
+        data: JSON.stringify(data)
+      };
+    });
+    return result;
+  },
+  interpretResponse: function interpretResponse(serverResponse, request) {
+    if (!serverResponse || !serverResponse.body || !serverResponse.body.seatbid) {
+      return [];
+    }
+    let bidResponses = [];
+    serverResponse.body.seatbid.forEach(seatbid => {
+      let bids = seatbid.bid || [];
+      bids.forEach(bid => {
+        bidResponses.push({
+          requestId: bid.bidId,
+          cpm: bid.price,
+          currency: bid.cur,
+          width: bid.w,
+          height: bid.h,
+          creativeId: bid.creativeId,
+          netRevenue: bid.netRevenue,
+          ttl: bid.ttl,
+          ad: bid.adm
+        });
+      });
+    });
+    return bidResponses;
+  },
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = [];
+    let gdprParams = '';
+    if (gdprConsent && typeof gdprConsent.consentString === 'string') {
+      gdprParams = `?consent_str=${gdprConsent.consentString}`;
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        gdprParams = gdprParams + `&gdpr=${Number(gdprConsent.gdprApplies)}`;
+      }
+      gdprParams = gdprParams + `&consent_given=` + kubientGetConsentGiven(gdprConsent);
+    }
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: 'https://kdmp.kbntx.ch/init.html' + gdprParams
+      });
+    }
+    if (syncOptions.pixelEnabled) {
+      syncs.push({
+        type: 'image',
+        url: 'https://kdmp.kbntx.ch/init.png' + gdprParams
+      });
+    }
+    return syncs;
+  }
+};
+
+function kubientGetConsentGiven(gdprConsent) {
+  let consentGiven = 0;
+  if (typeof gdprConsent !== 'undefined') {
+    let apiVersion = utils.deepAccess(gdprConsent, `apiVersion`);
+    switch (apiVersion) {
+      case 1:
+        consentGiven = utils.deepAccess(gdprConsent, `vendorData.vendorConsents.${VENDOR_ID}`) ? 1 : 0;
+        break;
+      case 2:
+        consentGiven = utils.deepAccess(gdprConsent, `vendorData.vendor.consents.${VENDOR_ID}`) ? 1 : 0;
+        break;
+    }
+  }
+  return consentGiven;
+}
+registerBidder(spec);
diff --git a/modules/kubientBidAdapter.md b/modules/kubientBidAdapter.md
new file mode 100644
index 00000000000..9f3e1d5f52e
--- /dev/null
+++ b/modules/kubientBidAdapter.md
@@ -0,0 +1,26 @@
+# Overview
+​
+**Module Name**: Kubient Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**:  artem.aleksashkin@kubient.com
+​
+# Description
+​
+Connects to Kubient KSSP demand source to fetch bids.  
+​
+# Test Parameters
+```
+    var adUnits = [{
+      code: 'banner-ad-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250],[728, 90]],
+        }
+      },
+            bids: [{
+                "bidder": "kubient",
+                "params": {
+                    "zoneid": "5fbb948f1e22b",
+                }   
+            }]      
+        }];         
diff --git a/test/spec/modules/kubientBidAdapter_spec.js b/test/spec/modules/kubientBidAdapter_spec.js
new file mode 100644
index 00000000000..1df4370b2ba
--- /dev/null
+++ b/test/spec/modules/kubientBidAdapter_spec.js
@@ -0,0 +1,259 @@
+import { expect, assert } from 'chai';
+import { spec } from 'modules/kubientBidAdapter.js';
+
+describe('KubientAdapter', function () {
+  let bid = {
+    bidId: '2dd581a2b6281d',
+    bidder: 'kubient',
+    bidderRequestId: '145e1d6a7837c9',
+    params: {
+      zoneid: '5678',
+      floor: 0.05,
+    },
+    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]]
+      }
+    },
+    transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62',
+    schain: {
+      ver: '1.0',
+      complete: 1,
+      nodes: [
+        {
+          asi: 'example.com',
+          sid: '0',
+          hp: 1,
+          rid: 'bidrequestid',
+          domain: 'example.com'
+        }
+      ]
+    }
+  };
+  let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+  let uspConsentData = '1YCC';
+  let bidderRequest = {
+    bidderCode: 'kubient',
+    auctionId: 'fffffff-ffff-ffff-ffff-ffffffffffff',
+    bidderRequestId: 'ffffffffffffff',
+    start: 1472239426002,
+    auctionStart: 1472239426000,
+    timeout: 5000,
+    refererInfo: {
+      referer: 'http://www.example.com',
+      reachedTop: true,
+    },
+    gdprConsent: {
+      consentString: consentString,
+      gdprApplies: true
+    },
+    uspConsent: uspConsentData,
+    bids: [bid]
+  };
+  describe('buildRequests', function () {
+    let serverRequests = spec.buildRequests([bid], bidderRequest);
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequests).to.be.an('array');
+    });
+    for (let i = 0; i < serverRequests.length; i++) {
+      let serverRequest = serverRequests[i];
+      it('Creates a ServerRequest object with method, URL and data', function () {
+        expect(serverRequest.method).to.be.a('string');
+        expect(serverRequest.url).to.be.a('string');
+        expect(serverRequest.data).to.be.a('string');
+      });
+      it('Returns POST method', function () {
+        expect(serverRequest.method).to.equal('POST');
+      });
+      it('Returns valid URL', function () {
+        expect(serverRequest.url).to.equal('https://kssp.kbntx.ch/pbjs');
+      });
+      it('Returns valid data if array of bids is valid', function () {
+        let data = JSON.parse(serverRequest.data);
+        expect(data).to.be.an('object');
+        expect(data).to.have.all.keys('v', 'requestId', 'adSlots', 'gdpr', 'referer', 'tmax', 'consent', 'consentGiven', 'uspConsent');
+        expect(data.v).to.exist.and.to.be.a('string');
+        expect(data.requestId).to.exist.and.to.be.a('string');
+        expect(data.referer).to.be.a('string');
+        expect(data.tmax).to.exist.and.to.be.a('number');
+        expect(data.gdpr).to.exist.and.to.be.within(0, 1);
+        expect(data.consent).to.equal(consentString);
+        expect(data.uspConsent).to.exist.and.to.equal(uspConsentData);
+        for (let j = 0; j < data['adSlots'].length; j++) {
+          let adSlot = data['adSlots'][i];
+          expect(adSlot).to.have.all.keys('bidId', 'zoneId', 'floor', 'sizes', 'schain', 'mediaTypes');
+          expect(adSlot.bidId).to.be.a('string');
+          expect(adSlot.zoneId).to.be.a('string');
+          expect(adSlot.floor).to.be.a('number');
+          expect(adSlot.sizes).to.be.an('array');
+          expect(adSlot.schain).to.be.an('object');
+          expect(adSlot.mediaTypes).to.be.an('object');
+        }
+      });
+    }
+  });
+
+  describe('isBidRequestValid', function () {
+    it('Should return true when required params are found', function () {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+    it('Should return false when required params are not found', function () {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+    it('Should return false when params are not found', function () {
+      delete bid.params;
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('Should interpret response', function () {
+      const serverResponse = {
+        body:
+          {
+            seatbid: [
+              {
+                bid: [
+                  {
+                    bidId: '000',
+                    price: 1.5,
+                    adm: '<div>test</div>',
+                    creativeId: 'creativeId',
+                    w: 300,
+                    h: 250,
+                    cur: 'USD',
+                    netRevenue: false,
+                    ttl: 360
+                  }
+                ]
+              }
+            ]
+          }
+      };
+      let bannerResponses = spec.interpretResponse(serverResponse);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'ad', 'creativeId', 'width', 'height', 'currency', 'netRevenue', 'ttl');
+      expect(dataItem.requestId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].bidId);
+      expect(dataItem.cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
+      expect(dataItem.ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
+      expect(dataItem.creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].creativeId);
+      expect(dataItem.width).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].w);
+      expect(dataItem.height).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].h);
+      expect(dataItem.currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].cur);
+      expect(dataItem.netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(serverResponse.body.seatbid[0].bid[0].netRevenue);
+      expect(dataItem.ttl).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].ttl);
+    });
+
+    it('Should return no ad when not given a server response', function () {
+      const ads = spec.interpretResponse(null);
+      expect(ads).to.be.an('array').and.to.have.length(0);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('should register the sync iframe without gdpr', function () {
+      let syncOptions = {
+        iframeEnabled: true
+      };
+      let serverResponses = null;
+      let gdprConsent = {
+        consentString: consentString
+      };
+      let uspConsent = null;
+      let syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent);
+      expect(syncs).to.be.an('array').and.to.have.length(1);
+      expect(syncs[0].type).to.equal('iframe');
+      expect(syncs[0].url).to.equal('https://kdmp.kbntx.ch/init.html?consent_str=' + consentString + '&consent_given=0');
+    });
+    it('should register the sync iframe with gdpr', function () {
+      let syncOptions = {
+        iframeEnabled: true
+      };
+      let serverResponses = null;
+      let gdprConsent = {
+        gdprApplies: true,
+        consentString: consentString
+      };
+      let uspConsent = null;
+      let syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent);
+      expect(syncs).to.be.an('array').and.to.have.length(1);
+      expect(syncs[0].type).to.equal('iframe');
+      expect(syncs[0].url).to.equal('https://kdmp.kbntx.ch/init.html?consent_str=' + consentString + '&gdpr=1&consent_given=0');
+    });
+    it('should register the sync iframe with gdpr vendor', function () {
+      let syncOptions = {
+        iframeEnabled: true
+      };
+      let serverResponses = null;
+      let gdprConsent = {
+        gdprApplies: true,
+        consentString: consentString,
+        apiVersion: 1,
+        vendorData: {
+          vendorConsents: {
+            794: 1
+          }
+        }
+      };
+      let uspConsent = null;
+      let syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent);
+      expect(syncs).to.be.an('array').and.to.have.length(1);
+      expect(syncs[0].type).to.equal('iframe');
+      expect(syncs[0].url).to.equal('https://kdmp.kbntx.ch/init.html?consent_str=' + consentString + '&gdpr=1&consent_given=1');
+    });
+    it('should register the sync image without gdpr', function () {
+      let syncOptions = {
+        pixelEnabled: true
+      };
+      let serverResponses = null;
+      let gdprConsent = {
+        consentString: consentString
+      };
+      let uspConsent = null;
+      let syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent);
+      expect(syncs).to.be.an('array').and.to.have.length(1);
+      expect(syncs[0].type).to.equal('image');
+      expect(syncs[0].url).to.equal('https://kdmp.kbntx.ch/init.png?consent_str=' + consentString + '&consent_given=0');
+    });
+    it('should register the sync image with gdpr', function () {
+      let syncOptions = {
+        pixelEnabled: true
+      };
+      let serverResponses = null;
+      let gdprConsent = {
+        gdprApplies: true,
+        consentString: consentString
+      };
+      let uspConsent = null;
+      let syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent);
+      expect(syncs).to.be.an('array').and.to.have.length(1);
+      expect(syncs[0].type).to.equal('image');
+      expect(syncs[0].url).to.equal('https://kdmp.kbntx.ch/init.png?consent_str=' + consentString + '&gdpr=1&consent_given=0');
+    });
+    it('should register the sync image with gdpr vendor', function () {
+      let syncOptions = {
+        pixelEnabled: true
+      };
+      let serverResponses = null;
+      let gdprConsent = {
+        gdprApplies: true,
+        consentString: consentString,
+        apiVersion: 2,
+        vendorData: {
+          vendor: {
+            consents: {
+              794: 1
+            }
+          }
+        }
+      };
+      let uspConsent = null;
+      let syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent);
+      expect(syncs).to.be.an('array').and.to.have.length(1);
+      expect(syncs[0].type).to.equal('image');
+      expect(syncs[0].url).to.equal('https://kdmp.kbntx.ch/init.png?consent_str=' + consentString + '&gdpr=1&consent_given=1');
+    });
+  })
+});

From 9f38423d98a9572163541957a50c70f1dedae037 Mon Sep 17 00:00:00 2001
From: Mathieu Pheulpin <sokaru91@gmail.com>
Date: Fri, 11 Dec 2020 13:30:24 -0800
Subject: [PATCH 092/304] [Sharethrough] Add Support for badv/bcat and Identity
 Link User ID (#6100)

* Add support for badv and bcat

[#175358412]

Co-authored-by: Michael Duran <mduran@sharethrough.com>

* Add support for Identity Link

[#175688307]

Co-authored-by: Michael Duran <mduran@sharethrough.com>

Co-authored-by: Michael Duran <mduran@sharethrough.com>
---
 modules/sharethroughBidAdapter.js             | 16 +++++-
 modules/sharethroughBidAdapter.md             |  8 ++-
 .../modules/sharethroughBidAdapter_spec.js    | 54 ++++++++++++++++---
 3 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/modules/sharethroughBidAdapter.js b/modules/sharethroughBidAdapter.js
index 7df161db713..89484b1c68b 100644
--- a/modules/sharethroughBidAdapter.js
+++ b/modules/sharethroughBidAdapter.js
@@ -1,7 +1,7 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import * as utils from '../src/utils.js';
 
-const VERSION = '3.2.1';
+const VERSION = '3.3.0';
 const BIDDER_CODE = 'sharethrough';
 const STR_ENDPOINT = 'https://btlr.sharethrough.com/WYu2BXv1/v1';
 const DEFAULT_SIZE = [1, 1];
@@ -56,6 +56,10 @@ export const sharethroughAdapterSpec = {
         query.pubcid = bidRequest.crumbs.pubcid;
       }
 
+      if (bidRequest.userId && bidRequest.userId.idl_env) {
+        query.idluid = bidRequest.userId.idl_env;
+      }
+
       if (bidRequest.schain) {
         query.schain = JSON.stringify(bidRequest.schain);
       }
@@ -64,6 +68,14 @@ export const sharethroughAdapterSpec = {
         query.bidfloor = parseFloat(bidRequest.bidfloor);
       }
 
+      if (bidRequest.params.badv) {
+        query.badv = bidRequest.params.badv;
+      }
+
+      if (bidRequest.params.bcat) {
+        query.bcat = bidRequest.params.bcat;
+      }
+
       // Data that does not need to go to the server,
       // but we need as part of interpretResponse()
       const strData = {
@@ -73,7 +85,7 @@ export const sharethroughAdapterSpec = {
       };
 
       return {
-        method: 'GET',
+        method: 'POST',
         url: STR_ENDPOINT,
         data: query,
         strData: strData
diff --git a/modules/sharethroughBidAdapter.md b/modules/sharethroughBidAdapter.md
index 2290e370cae..396b8164577 100644
--- a/modules/sharethroughBidAdapter.md
+++ b/modules/sharethroughBidAdapter.md
@@ -29,7 +29,13 @@ Module that connects to Sharethrough's demand sources
             // OPTIONAL - If iframeSize is provided, we'll use this size for the iframe
             // otherwise we'll grab the largest size from the sizes array
             // This is ignored if iframe: false
-            iframeSize: [250, 250]
+            iframeSize: [250, 250],
+
+            // OPTIONAL - Blocked Advertiser Domains
+            badv: ['domain1.com', 'domain2.com'],
+
+            // OPTIONAL - Blocked Categories (IAB codes)
+            bcat: ['IAB1-1', 'IAB1-2'],
           }
         }
       ]
diff --git a/test/spec/modules/sharethroughBidAdapter_spec.js b/test/spec/modules/sharethroughBidAdapter_spec.js
index d45d1e977e6..cd9071a6098 100644
--- a/test/spec/modules/sharethroughBidAdapter_spec.js
+++ b/test/spec/modules/sharethroughBidAdapter_spec.js
@@ -14,7 +14,8 @@ const bidRequests = [
     },
     userId: {
       tdid: 'fake-tdid',
-      pubcid: 'fake-pubcid'
+      pubcid: 'fake-pubcid',
+      idl_env: 'fake-identity-link'
     },
     crumbs: {
       pubcid: 'fake-pubcid-in-crumbs-obj'
@@ -40,12 +41,32 @@ const bidRequests = [
       iframe: true,
       iframeSize: [500, 500]
     }
-  }
+  },
+  {
+    bidder: 'sharethrough',
+    bidId: 'bidId4',
+    sizes: [[700, 400]],
+    placementCode: 'bar',
+    params: {
+      pkey: 'dddd4444',
+      badv: ['domain1.com', 'domain2.com']
+    }
+  },
+  {
+    bidder: 'sharethrough',
+    bidId: 'bidId5',
+    sizes: [[700, 400]],
+    placementCode: 'bar',
+    params: {
+      pkey: 'eeee5555',
+      bcat: ['IAB1-1', 'IAB1-2']
+    }
+  },
 ];
 
 const prebidRequests = [
   {
-    method: 'GET',
+    method: 'POST',
     url: 'https://btlr.sharethrough.com/WYu2BXv1/v1',
     data: {
       bidId: 'bidId',
@@ -57,7 +78,7 @@ const prebidRequests = [
     }
   },
   {
-    method: 'GET',
+    method: 'POST',
     url: 'https://btlr.sharethrough.com/WYu2BXv1/v1',
     data: {
       bidId: 'bidId',
@@ -69,7 +90,7 @@ const prebidRequests = [
     }
   },
   {
-    method: 'GET',
+    method: 'POST',
     url: 'https://btlr.sharethrough.com/WYu2BXv1/v1',
     data: {
       bidId: 'bidId',
@@ -82,7 +103,7 @@ const prebidRequests = [
     }
   },
   {
-    method: 'GET',
+    method: 'POST',
     url: 'https://btlr.sharethrough.com/WYu2BXv1/v1',
     data: {
       bidId: 'bidId',
@@ -94,7 +115,7 @@ const prebidRequests = [
     }
   },
   {
-    method: 'GET',
+    method: 'POST',
     url: 'https://btlr.sharethrough.com/WYu2BXv1/v1',
     data: {
       bidId: 'bidId',
@@ -225,7 +246,7 @@ describe('sharethrough adapter spec', function() {
 
       expect(builtBidRequests[0].url).to.eq('https://btlr.sharethrough.com/WYu2BXv1/v1');
       expect(builtBidRequests[1].url).to.eq('https://btlr.sharethrough.com/WYu2BXv1/v1');
-      expect(builtBidRequests[0].method).to.eq('GET');
+      expect(builtBidRequests[0].method).to.eq('POST');
     });
 
     it('should set the instant_play_capable parameter correctly based on browser userAgent string', function() {
@@ -315,6 +336,11 @@ describe('sharethrough adapter spec', function() {
       expect(bidRequest.data.pubcid).to.eq('fake-pubcid');
     });
 
+    it('should add the idluid parameter if a bid request contains a value for Identity Link from Live Ramp', function() {
+      const bidRequest = spec.buildRequests(bidRequests)[0];
+      expect(bidRequest.data.idluid).to.eq('fake-identity-link');
+    });
+
     it('should add Sharethrough specific parameters', function() {
       const builtBidRequests = spec.buildRequests(bidRequests);
       expect(builtBidRequests[0]).to.deep.include({
@@ -346,6 +372,18 @@ describe('sharethrough adapter spec', function() {
       expect(builtBidRequest.data.schain).to.eq(JSON.stringify(bidRequest.schain));
     });
 
+    it('should add badv if provided', () => {
+      const builtBidRequest = spec.buildRequests([bidRequests[3]])[0];
+
+      expect(builtBidRequest.data.badv).to.have.members(['domain1.com', 'domain2.com'])
+    });
+
+    it('should add bcat if provided', () => {
+      const builtBidRequest = spec.buildRequests([bidRequests[4]])[0];
+
+      expect(builtBidRequest.data.bcat).to.have.members(['IAB1-1', 'IAB1-2'])
+    });
+
     it('should not add a supply chain parameter if schain is missing', function() {
       const bidRequest = spec.buildRequests(bidRequests)[0];
       expect(bidRequest.data).to.not.include.any.keys('schain');

From 25270510561bf2b8d3f303d25b0a6c80277fd03c Mon Sep 17 00:00:00 2001
From: Egor Gordeev <48566506+egsgordeev@users.noreply.github.com>
Date: Mon, 14 Dec 2020 10:51:48 +0400
Subject: [PATCH 093/304] Sovrn: Pass the imp.ext.deals field (#6098)

* EX-2549 Pass segments parameter as imp.ext.dealids array

* EX-2549 Address Jon's feedback

* EX-2549 Reworked the solution

* EX-2549 Blackbird compatibility

* EX-2549 Address Jon's comments

* EX-2549 Addressed upstream PR comments
---
 modules/sovrnBidAdapter.js                | 14 ++++++++++--
 test/spec/modules/sovrnBidAdapter_spec.js | 26 +++++++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/modules/sovrnBidAdapter.js b/modules/sovrnBidAdapter.js
index 62f5e85779e..8f8158fd0c9 100644
--- a/modules/sovrnBidAdapter.js
+++ b/modules/sovrnBidAdapter.js
@@ -53,7 +53,7 @@ export const spec = {
         bidSizes = ((utils.isArray(bidSizes) && utils.isArray(bidSizes[0])) ? bidSizes : [bidSizes])
         bidSizes = bidSizes.filter(size => utils.isArray(size))
         const processedSizes = bidSizes.map(size => ({w: parseInt(size[0], 10), h: parseInt(size[1], 10)}))
-        sovrnImps.push({
+        const imp = {
           adunitcode: bid.adUnitCode,
           id: bid.bidId,
           banner: {
@@ -63,7 +63,17 @@ export const spec = {
           },
           tagid: String(utils.getBidIdParameter('tagid', bid.params)),
           bidfloor: utils.getBidIdParameter('bidfloor', bid.params)
-        });
+        }
+
+        const segmentsString = utils.getBidIdParameter('segments', bid.params)
+
+        if (segmentsString) {
+          imp.ext = {
+            deals: segmentsString.split(',').map(deal => deal.trim())
+          }
+        }
+
+        sovrnImps.push(imp);
       });
 
       const page = bidderRequest.refererInfo.referer
diff --git a/test/spec/modules/sovrnBidAdapter_spec.js b/test/spec/modules/sovrnBidAdapter_spec.js
index 983ade4dd14..769be73a272 100644
--- a/test/spec/modules/sovrnBidAdapter_spec.js
+++ b/test/spec/modules/sovrnBidAdapter_spec.js
@@ -276,6 +276,32 @@ describe('sovrnBidAdapter', function() {
       expect(data.user.ext.tpid[0].uid).to.equal('A_CRITEO_ID')
       expect(data.user.ext.prebid_criteoid).to.equal('A_CRITEO_ID')
     });
+
+    it('should ignore empty segments', function() {
+      const payload = JSON.parse(request.data)
+      expect(payload.imp[0].ext).to.be.undefined
+    })
+
+    it('should pass the segments param value as trimmed deal ids array', function() {
+      const segmentsRequests = [{
+        'bidder': 'sovrn',
+        'params': {
+          'segments': ' test1,test2 '
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [
+          [300, 250],
+          [300, 600]
+        ],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475'
+      }];
+      const request = spec.buildRequests(segmentsRequests, bidderRequest)
+      const payload = JSON.parse(request.data)
+      expect(payload.imp[0].ext.deals[0]).to.equal('test1')
+      expect(payload.imp[0].ext.deals[1]).to.equal('test2')
+    })
   });
 
   describe('interpretResponse', function () {

From 42be508d35e10ab60d9421873d2b60ae97b66cb0 Mon Sep 17 00:00:00 2001
From: Adam Browning <19834421+adam-browning@users.noreply.github.com>
Date: Mon, 14 Dec 2020 12:07:32 +0200
Subject: [PATCH 094/304] oneVideo Adapter - Dynamic TTL support (SAPR-15473)
 (#6108)

* ttl incoming value or default 300

* ttl validation 0-3600

* Fix to oneVideo tests

* added ttl unit tests

* updated md file

* update minor version 3.0.5

* Updated unit test for minor version check

* remove x from liveIntentIdSystem_spec.js

* md conflict fix

* fix missing comma in md file

* update minor version 3.0.5

* remove x from liveIntentIdSystem_spec.js

* update md file

* added ttl to md file

* ttl incoming value or default 300

* ttl validation 0-3600

* Fix to oneVideo tests

* added ttl unit tests

* updated md file

* update minor version 3.0.5

* Updated unit test for minor version check

* remove x from liveIntentIdSystem_spec.js

* md conflict fix

* update minor version 3.0.5

* remove x from liveIntentIdSystem_spec.js

* update md file

* added ttl to md file

* cleanup
---
 modules/oneVideoBidAdapter.js                |  5 ++--
 modules/oneVideoBidAdapter.md                |  2 ++
 test/spec/modules/oneVideoBidAdapter_spec.js | 28 ++++++++++++++++++--
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/modules/oneVideoBidAdapter.js b/modules/oneVideoBidAdapter.js
index c287bc2f3b7..8a71910e8fc 100644
--- a/modules/oneVideoBidAdapter.js
+++ b/modules/oneVideoBidAdapter.js
@@ -4,7 +4,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 const BIDDER_CODE = 'oneVideo';
 export const spec = {
   code: 'oneVideo',
-  VERSION: '3.0.4',
+  VERSION: '3.0.5',
   ENDPOINT: 'https://ads.adaptv.advertising.com/rtb/openrtb?ext_id=',
   E2ETESTENDPOINT: 'https://ads-wc.v.ssp.yahoo.com/rtb/openrtb?ext_id=',
   SYNC_ENDPOINT1: 'https://pixel.advertising.com/ups/57304/sync?gdpr=&gdpr_consent=&_origin=0&redir=true',
@@ -99,7 +99,7 @@ export const spec = {
       width: size.width,
       height: size.height,
       currency: response.cur,
-      ttl: 100,
+      ttl: (bidRequest.params.video.ttl > 0 && bidRequest.params.video.ttl <= 3600) ? bidRequest.params.video.ttl : 300,
       netRevenue: true,
       adUnitCode: bidRequest.adUnitCode
     };
@@ -113,7 +113,6 @@ export const spec = {
     } else if (bid.adm) {
       bidResponse.vastXml = bid.adm;
     }
-
     if (bidRequest.mediaTypes.video) {
       bidResponse.renderer = (bidRequest.mediaTypes.video.context === 'outstream') ? newRenderer(bidRequest, bidResponse) : undefined;
     }
diff --git a/modules/oneVideoBidAdapter.md b/modules/oneVideoBidAdapter.md
index 92958af9e83..d413c9d64e5 100644
--- a/modules/oneVideoBidAdapter.md
+++ b/modules/oneVideoBidAdapter.md
@@ -40,6 +40,7 @@ Connects to Verizon Media's Video SSP (AKA ONE Video / Adap.tv) demand source to
                   inventoryid: 123,
                   minduration: 10,
                   maxduration: 30,
+                  ttl: 300,
                   custom: {
                     key1: "value1",
                     key2: 123345
@@ -89,6 +90,7 @@ Connects to Verizon Media's Video SSP (AKA ONE Video / Adap.tv) demand source to
                   inventoryid: 123,
                   minduration: 10,
                   maxduration: 30,
+                  ttl: 250
                 },
                 site: {
                     id: 1,
diff --git a/test/spec/modules/oneVideoBidAdapter_spec.js b/test/spec/modules/oneVideoBidAdapter_spec.js
index 331ac8976e6..83adf8a4b11 100644
--- a/test/spec/modules/oneVideoBidAdapter_spec.js
+++ b/test/spec/modules/oneVideoBidAdapter_spec.js
@@ -217,7 +217,7 @@ describe('OneVideoBidAdapter', function () {
       const placement = bidRequest.params.video.placement;
       const rewarded = bidRequest.params.video.rewarded;
       const inventoryid = bidRequest.params.video.inventoryid;
-      const VERSION = '3.0.4';
+      const VERSION = '3.0.5';
       expect(data.imp[0].video.w).to.equal(width);
       expect(data.imp[0].video.h).to.equal(height);
       expect(data.imp[0].bidfloor).to.equal(bidRequest.params.bidfloor);
@@ -407,7 +407,7 @@ describe('OneVideoBidAdapter', function () {
         height: 480,
         mediaType: 'video',
         currency: 'USD',
-        ttl: 100,
+        ttl: 300,
         netRevenue: true,
         adUnitCode: bidRequest.adUnitCode,
         renderer: (bidRequest.mediaTypes.video.context === 'outstream') ? newRenderer(bidRequest, bidResponse) : undefined,
@@ -434,6 +434,30 @@ describe('OneVideoBidAdapter', function () {
       expect(bidResponse.mediaType).to.equal('banner');
       expect(bidResponse.renderer).to.be.undefined;
     });
+
+    it('should default ttl to 300', function () {
+      const serverResponse = {seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: '<VAST></VAST>'}]}], cur: 'USD'};
+      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+      expect(bidResponse.ttl).to.equal(300);
+    });
+    it('should not allow ttl above 3601, default to 300', function () {
+      bidRequest.params.video.ttl = 3601;
+      const serverResponse = {seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: '<VAST></VAST>'}]}], cur: 'USD'};
+      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+      expect(bidResponse.ttl).to.equal(300);
+    });
+    it('should not allow ttl below 1, default to 300', function () {
+      bidRequest.params.video.ttl = 0;
+      const serverResponse = {seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: '<VAST></VAST>'}]}], cur: 'USD'};
+      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+      expect(bidResponse.ttl).to.equal(300);
+    });
+    it('should use custom ttl if under 3600', function () {
+      bidRequest.params.video.ttl = 1000;
+      const serverResponse = {seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: '<VAST></VAST>'}]}], cur: 'USD'};
+      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+      expect(bidResponse.ttl).to.equal(1000);
+    });
   });
 
   describe('when GDPR and uspConsent applies', function () {

From a2454a5e9f18ca72e34c4eedbd144f88f5e7872e Mon Sep 17 00:00:00 2001
From: Stephen Johnston <stephenj@launchpowered.com>
Date: Mon, 14 Dec 2020 07:04:32 -0500
Subject: [PATCH 095/304] Add Gulp Review-Start Task (#6067)

* add review-start gulp command

* remove watch, unecessary for reviews

* add instructions to reviewer file for new command

* Updates to add back watch

* updates to had reviewer hub page

* Update PR_REVIEW.md
---
 PR_REVIEW.md                                 | 11 ++++++
 gulpfile.js                                  | 20 +++++++++-
 integrationExamples/reviewerTools/index.html | 40 ++++++++++++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100755 integrationExamples/reviewerTools/index.html

diff --git a/PR_REVIEW.md b/PR_REVIEW.md
index 662a1a871c8..0519cbb7b6e 100644
--- a/PR_REVIEW.md
+++ b/PR_REVIEW.md
@@ -5,6 +5,17 @@ If the PR is for a standard bid adapter or a standard analytics adapter, just th
 
 For modules and core platform updates, the initial reviewer should request an additional team member to review as a sanity check. Merge should only happen when the PR has 2 `LGTM` from the core team and a documentation PR if required.
 
+### Running Tests and Verifying Integrations
+
+General gulp commands include separate commands for serving the codebase on a built in webserver, creating code coverage reports and allowing serving integration examples. The `review-start` gulp command combinese those into one command.
+
+- Run `gulp review-start`, adding the host parameter `gulp review-start --host=0.0.0.0` will bind to all IPs on the machine
+    - A page will open which provides a hub for common reviewer tools.
+    - If you need to manually acceess the tools:
+        - Navigate to build/coverage/lcov-report/index.html to view coverage
+        - Navigate to integrationExamples/gpt/hellow_world.html for basic integration testing
+        - The hello_world.html and other exampls can be edited and used as needed to verify functionality
+
 ### General PR review Process
 - All required global and bidder-adapter rules defined in the [Module Rules](https://docs.prebid.org/dev-docs/module-rules.html) must be followed. Please review these rules often - we depend on reviewers to enforce them.
 - Checkout the branch (these instructions are available on the github PR page as well).
diff --git a/gulpfile.js b/gulpfile.js
index 879e34ae588..b7a9e442a8c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -86,7 +86,8 @@ function viewCoverage(done) {
   connect.server({
     port: coveragePort,
     root: 'build/coverage/lcov-report',
-    livereload: false
+    livereload: false,
+    debug: true
   });
   opens('http://' + mylocalhost + ':' + coveragePort);
   done();
@@ -94,6 +95,19 @@ function viewCoverage(done) {
 
 viewCoverage.displayName = 'view-coverage';
 
+// View the reviewer tools page
+function viewReview(done) {
+  var mylocalhost = (argv.host) ? argv.host : 'localhost';
+  var reviewUrl = 'http://' + mylocalhost + ':' + port + '/integrationExamples/reviewerTools/index.html'; // reuse the main port from 9999
+
+  // console.log(`stdout: opening` + reviewUrl);
+
+  opens(reviewUrl);
+  done();
+};
+
+viewReview.displayName = 'view-review';
+
 // Watch Task with Live Reload
 function watch(done) {
   var mainWatcher = gulp.watch([
@@ -383,4 +397,8 @@ gulp.task('e2e-test', gulp.series(clean, setupE2e, gulp.parallel('build-bundle-p
 gulp.task(bundleToStdout);
 gulp.task('bundle', gulpBundle.bind(null, false)); // used for just concatenating pre-built files with no build step
 
+// build task for reviewers, runs test-coverage, serves, without watching
+gulp.task(viewReview);
+gulp.task('review-start', gulp.series(clean, lint, gulp.parallel('build-bundle-dev', watch, testCoverage), viewReview));
+
 module.exports = nodeBundle;
diff --git a/integrationExamples/reviewerTools/index.html b/integrationExamples/reviewerTools/index.html
new file mode 100755
index 00000000000..2732cb4fd88
--- /dev/null
+++ b/integrationExamples/reviewerTools/index.html
@@ -0,0 +1,40 @@
+<html lang="en">
+<head>
+    <!--
+        This page provides links to common reviewer tools, tips and tricks.
+    -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <title>Prebid Reviewer Tools</title>
+    <style>
+        .section{padding-top:40px;}
+        .container{max-width:600px;margin:0 auto;}
+    </style>
+</head>
+
+<body>
+    <div class="section">
+        <div class="container">            
+            <div class="row">
+                <h1>Reviewer Tools</h1>
+                <p>Below are links to the most common tool used by Prebid reviewers. For more info on PR review processes check out the <a href="https://github.com/prebid/Prebid.js/blob/master/PR_REVIEW.md">General PR Review Process</a> page on Github.</p>
+                <h2>Common</h2>
+                <ul>
+                    <li><a href="/build/coverage/lcov-report">Code Coverage</a></li>
+                    <li><a href="/integrationExamples/gpt/hello_world.html">Hello World</a></li>        
+                </ul>
+                <h2>Other Tools</h2>
+                <ul>
+                    <li><a href="/integrationExamples/">Other Integration Examples</a></li>
+                </ul>
+                <h2>Documentation & Training Material</h2>
+                <ul>
+                    <li><a href="https://github.com/prebid/Prebid.js/blob/master/PR_REVIEW.md">General PR Review Process</a></li>
+                    <li><a href="https://youtu.be/aNCJ_Ct6Q8Y">Reviewer Video</a></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
\ No newline at end of file

From 94c9dcc5d64b3ec2ec10636bdc68182b9d5be462 Mon Sep 17 00:00:00 2001
From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com>
Date: Mon, 14 Dec 2020 09:20:34 -0500
Subject: [PATCH 096/304] appnexusBidAdapter - add support for test flag
 (#6119)

---
 modules/appnexusBidAdapter.js                |  6 ++++++
 test/spec/modules/appnexusBidAdapter_spec.js | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index c102bee4e58..3a9f37f4ca8 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -498,6 +498,12 @@ function formatRequest(payload, bidderRequest) {
     }
   }
 
+  if (utils.getParameterByName('apn_test').toUpperCase() === 'TRUE' || config.getConfig('apn_test') === true) {
+    options.customHeaders = {
+      'X-Is-Test': 1
+    }
+  }
+
   if (payload.tags.length > MAX_IMPS_PER_REQUEST) {
     const clonedPayload = utils.deepClone(payload);
 
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index 9b12d892440..a36eab03fe1 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -784,6 +784,18 @@ describe('AppNexusAdapter', function () {
       config.getConfig.restore();
     });
 
+    it('should set the X-Is-Test customHeader if test flag is enabled', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      sinon.stub(config, 'getConfig')
+        .withArgs('apn_test')
+        .returns(true);
+
+      const request = spec.buildRequests([bidRequest]);
+      expect(request.options.customHeaders).to.deep.equal({'X-Is-Test': 1});
+
+      config.getConfig.restore();
+    });
+
     it('should set withCredentials to false if purpose 1 consent is not given', function () {
       let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
       let bidderRequest = {

From 2102f4a1c1548bacb775cf6c011c6eba621c81d1 Mon Sep 17 00:00:00 2001
From: fgcloutier <fgc@adledge.com>
Date: Mon, 14 Dec 2020 15:55:29 +0100
Subject: [PATCH 097/304] feat(sublimeBidAdapter): updating sublimeBidAdapter
 module (#6113)

- using a simple-request for the POST bid request
- renaming our internal ver pixel param to pbav
---
 modules/sublimeBidAdapter.js                | 11 ++---
 test/spec/modules/sublimeBidAdapter_spec.js | 47 ++++++++++++++++++---
 2 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/modules/sublimeBidAdapter.js b/modules/sublimeBidAdapter.js
index e9f7cf19033..7a573ca4c4b 100644
--- a/modules/sublimeBidAdapter.js
+++ b/modules/sublimeBidAdapter.js
@@ -9,7 +9,7 @@ const DEFAULT_CURRENCY = 'EUR';
 const DEFAULT_PROTOCOL = 'https';
 const DEFAULT_TTL = 600;
 const SUBLIME_ANTENNA = 'antenna.ayads.co';
-const SUBLIME_VERSION = '0.6.0';
+const SUBLIME_VERSION = '0.7.0';
 
 /**
  * Debug log message
@@ -50,7 +50,7 @@ export function sendEvent(eventName) {
     src: 'pa',
     puid: state.transactionId || state.notifyId,
     trId: state.transactionId || state.notifyId,
-    ver: SUBLIME_VERSION,
+    pbav: SUBLIME_VERSION,
   };
 
   log('Sending pixel for event: ' + eventName, eventObject);
@@ -128,10 +128,10 @@ function buildRequests(validBidRequests, bidderRequest) {
     return {
       method: 'POST',
       url: protocol + '://' + bidHost + '/bid',
-      data: payload,
+      data: JSON.stringify(payload),
       options: {
-        contentType: 'application/json',
-        withCredentials: true
+        contentType: 'text/plain',
+        withCredentials: false
       },
     }
   });
@@ -210,6 +210,7 @@ export const spec = {
   code: BIDDER_CODE,
   gvlid: BIDDER_GVLID,
   aliases: [],
+  sendEvent: sendEvent,
   isBidRequestValid: isBidRequestValid,
   buildRequests: buildRequests,
   interpretResponse: interpretResponse,
diff --git a/test/spec/modules/sublimeBidAdapter_spec.js b/test/spec/modules/sublimeBidAdapter_spec.js
index 008f24730bc..a0765a0d396 100644
--- a/test/spec/modules/sublimeBidAdapter_spec.js
+++ b/test/spec/modules/sublimeBidAdapter_spec.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { spec, sendEvent, log, setState, state } from 'modules/sublimeBidAdapter.js';
+import { spec } from 'modules/sublimeBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 
 let utils = require('src/utils');
@@ -9,6 +9,16 @@ describe('Sublime Adapter', function() {
 
   describe('sendEvent', function() {
     let sandbox;
+    const triggeredPixelProperties = [
+      't',
+      'tse',
+      'z',
+      'e',
+      'src',
+      'puid',
+      'trId',
+      'pbav',
+    ];
 
     beforeEach(function () {
       sandbox = sinon.sandbox.create();
@@ -16,8 +26,10 @@ describe('Sublime Adapter', function() {
 
     it('should trigger pixel', function () {
       sandbox.spy(utils, 'triggerPixel');
-      sendEvent('test', true);
+      spec.sendEvent('test');
       expect(utils.triggerPixel.called).to.equal(true);
+      const params = utils.parseUrl(utils.triggerPixel.args[0][0]).search;
+      expect(Object.keys(params)).to.have.members(triggeredPixelProperties);
     });
 
     afterEach(function () {
@@ -94,8 +106,9 @@ describe('Sublime Adapter', function() {
     });
 
     it('should contains a request id equals to the bid id', function() {
-      expect(request[0].data.requestId).to.equal(bidRequests[0].bidId);
-      expect(request[1].data.requestId).to.equal(bidRequests[1].bidId);
+      for (let i = 0; i < request.length; i = i + 1) {
+        expect(JSON.parse(request[i].data).requestId).to.equal(bidRequests[i].bidId);
+      }
     });
 
     it('should have an url that contains bid keyword', function() {
@@ -149,7 +162,7 @@ describe('Sublime Adapter', function() {
           currency: 'USD',
           netRevenue: true,
           ttl: 600,
-          pbav: '0.6.0',
+          pbav: '0.7.0',
           ad: '',
         },
       ];
@@ -191,7 +204,7 @@ describe('Sublime Adapter', function() {
         netRevenue: true,
         ttl: 600,
         ad: '<!-- Creative -->',
-        pbav: '0.6.0',
+        pbav: '0.7.0',
       };
 
       expect(result[0]).to.deep.equal(expectedResponse);
@@ -241,7 +254,7 @@ describe('Sublime Adapter', function() {
         netRevenue: true,
         ttl: 600,
         ad: '<!-- ad -->',
-        pbav: '0.6.0',
+        pbav: '0.7.0',
       };
 
       expect(result[0]).to.deep.equal(expectedResponse);
@@ -279,4 +292,24 @@ describe('Sublime Adapter', function() {
       });
     });
   });
+
+  describe('onBidWon', function() {
+    let sandbox;
+    let bid = { foo: 'bar' };
+
+    beforeEach(function () {
+      sandbox = sinon.sandbox.create();
+    });
+
+    it('should trigger "bidwon" pixel', function () {
+      sandbox.spy(utils, 'triggerPixel');
+      spec.onBidWon(bid);
+      const params = utils.parseUrl(utils.triggerPixel.args[0][0]).search;
+      expect(params.e).to.equal('bidwon');
+    });
+
+    afterEach(function () {
+      sandbox.restore();
+    });
+  })
 });

From 0fec20d2914a291abdfa052a59b988f3b300b656 Mon Sep 17 00:00:00 2001
From: OneTagDevOps <38786435+OneTagDevOps@users.noreply.github.com>
Date: Mon, 14 Dec 2020 16:36:39 +0100
Subject: [PATCH 098/304] oneTag Bid Adapter: bidRequest object adjustments
 (#6105)

* Propagates server data directly without members picking, extracts userIds from the the validBidRequest object

* Picks netRevenue value from received bid, defaulting to false

Co-authored-by: francesco <f.orazini@onetag.com>
---
 modules/onetagBidAdapter.js | 87 ++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 50 deletions(-)

diff --git a/modules/onetagBidAdapter.js b/modules/onetagBidAdapter.js
index 1a2df023b81..16b8096646f 100644
--- a/modules/onetagBidAdapter.js
+++ b/modules/onetagBidAdapter.js
@@ -6,6 +6,7 @@ import { Renderer } from '../src/Renderer.js';
 import find from 'core-js-pure/features/array/find.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { createEidsArray } from './userId/eids.js';
 
 const ENDPOINT = 'https://onetag-sys.com/prebid-request';
 const USER_SYNC_ENDPOINT = 'https://onetag-sys.com/usync/';
@@ -63,8 +64,8 @@ function buildRequests(validBidRequests, bidderRequest) {
   if (bidderRequest && bidderRequest.uspConsent) {
     payload.usPrivacy = bidderRequest.uspConsent;
   }
-  if (bidderRequest && bidderRequest.userId) {
-    payload.userId = bidderRequest.userId;
+  if (validBidRequests && validBidRequests.length !== 0 && validBidRequests[0].userId) {
+    payload.userId = createEidsArray(validBidRequests[0].userId);
   }
   try {
     if (storage.hasLocalStorage()) {
@@ -88,47 +89,34 @@ function interpretResponse(serverResponse, bidderRequest) {
   if (!body.bids || !Array.isArray(body.bids) || body.bids.length === 0) {
     return bids;
   }
-  body.bids.forEach(({
-    requestId,
-    cpm,
-    width,
-    height,
-    creativeId,
-    dealId,
-    currency,
-    mediaType,
-    ttl,
-    rendererUrl,
-    ad,
-    vastUrl,
-    videoCacheKey
-  }) => {
+  body.bids.forEach(bid => {
     const responseBid = {
-      requestId,
-      cpm,
-      width,
-      height,
-      creativeId,
-      dealId: dealId == null ? dealId : '',
-      currency,
-      netRevenue: false,
+      requestId: bid.requestId,
+      cpm: bid.cpm,
+      width: bid.width,
+      height: bid.height,
+      creativeId: bid.creativeId,
+      dealId: bid.dealId == null ? bid.dealId : '',
+      currency: bid.currency,
+      netRevenue: bid.netRevenue || false,
+      mediaType: bid.mediaType,
       meta: {
-        mediaType
+        mediaType: bid.mediaType
       },
-      ttl: ttl || 300
+      ttl: bid.ttl || 300
     };
-    if (mediaType === BANNER) {
-      responseBid.ad = ad;
-    } else if (mediaType === VIDEO) {
-      const {context, adUnitCode} = find(requestData.bids, (item) => item.bidId === requestId);
+    if (bid.mediaType === BANNER) {
+      responseBid.ad = bid.ad;
+    } else if (bid.mediaType === VIDEO) {
+      const {context, adUnitCode} = find(requestData.bids, (item) => item.bidId === bid.requestId);
       if (context === INSTREAM) {
-        responseBid.vastUrl = vastUrl;
-        responseBid.videoCacheKey = videoCacheKey;
+        responseBid.vastUrl = bid.vastUrl;
+        responseBid.videoCacheKey = bid.videoCacheKey;
       } else if (context === OUTSTREAM) {
-        responseBid.vastXml = ad;
-        responseBid.vastUrl = vastUrl;
-        if (rendererUrl) {
-          responseBid.renderer = createRenderer({requestId, rendererUrl, adUnitCode});
+        responseBid.vastXml = bid.ad;
+        responseBid.vastUrl = bid.vastUrl;
+        if (bid.rendererUrl) {
+          responseBid.renderer = createRenderer({ ...bid, adUnitCode });
         }
       }
     }
@@ -146,25 +134,24 @@ function createRenderer(bid, rendererOptions = {}) {
     loaded: false
   });
   try {
-    renderer.setRender(onetagRenderer);
+    renderer.setRender(({renderer, width, height, vastXml, adUnitCode}) => {
+      renderer.push(() => {
+        window.onetag.Player.init({
+          ...bid,
+          width,
+          height,
+          vastXml,
+          nodeId: adUnitCode,
+          config: renderer.getConfig()
+        });
+      });
+    });
   } catch (e) {
 
   }
   return renderer;
 }
 
-function onetagRenderer({renderer, width, height, vastXml, adUnitCode}) {
-  renderer.push(() => {
-    window.onetag.Player.init({
-      width,
-      height,
-      vastXml,
-      nodeId: adUnitCode,
-      config: renderer.getConfig()
-    });
-  });
-}
-
 function getFrameNesting() {
   let topmostFrame = window;
   let parent = window.parent;

From 30711be00243e653a25785b2d7b46b9df8f5e120 Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Mon, 14 Dec 2020 21:41:42 +0100
Subject: [PATCH 099/304] a/b testing framework baked in to the ID5 user id
 module (#6076)

---
 modules/id5IdSystem.js                |  47 ++++++--
 modules/id5IdSystem.md                |  21 +++-
 modules/userId/eids.md                |   3 +-
 test/spec/modules/id5IdSystem_spec.js | 157 +++++++++++++++++++++++++-
 4 files changed, 209 insertions(+), 19 deletions(-)

diff --git a/modules/id5IdSystem.js b/modules/id5IdSystem.js
index 7033a71d015..17a808badaa 100644
--- a/modules/id5IdSystem.js
+++ b/modules/id5IdSystem.js
@@ -42,27 +42,58 @@ export const id5IdSubmodule = {
    * decode the stored id value for passing to bid requests
    * @function decode
    * @param {(Object|string)} value
+   * @param {SubmoduleConfig|undefined} config
    * @returns {(Object|undefined)}
    */
-  decode(value) {
-    let uid;
+  decode(value, config) {
+    let universalUid;
     let linkType = 0;
 
     if (value && typeof value.universal_uid === 'string') {
-      uid = value.universal_uid;
+      universalUid = value.universal_uid;
       linkType = value.link_type || linkType;
     } else {
       return undefined;
     }
 
-    return {
-      'id5id': {
-        'uid': uid,
-        'ext': {
-          'linkType': linkType
+    // check for A/B testing configuration and hide ID if in Control Group
+    let abConfig = (config && config.params && config.params.abTesting) || { enabled: false };
+    let controlGroup = false;
+    if (
+      abConfig.enabled === true &&
+      (!utils.isNumber(abConfig.controlGroupPct) ||
+        abConfig.controlGroupPct < 0 ||
+        abConfig.controlGroupPct > 1)
+    ) {
+      // A/B Testing is enabled, but configured improperly, so skip A/B testing
+      utils.logError('User ID - ID5 submodule: A/B Testing controlGroupPct must be a number >= 0 and <= 1! Skipping A/B Testing');
+    } else if (
+      abConfig.enabled === true &&
+      Math.random() < abConfig.controlGroupPct
+    ) {
+      // A/B Testing is enabled and user is in the Control Group, so do not share the ID5 ID
+      utils.logInfo('User ID - ID5 submodule: A/B Testing Enabled - request is in the Control Group, so the ID5 ID is NOT exposed');
+      universalUid = linkType = 0;
+      controlGroup = true;
+    } else if (abConfig.enabled === true) {
+      // A/B Testing is enabled but user is not in the Control Group, so ID5 ID is shared
+      utils.logInfo('User ID - ID5 submodule: A/B Testing Enabled - request is NOT in the Control Group, so the ID5 ID is exposed');
+    }
+
+    let responseObj = {
+      id5id: {
+        uid: universalUid,
+        ext: {
+          linkType: linkType
         }
       }
     };
+
+    if (abConfig.enabled === true) {
+      utils.deepSetValue(responseObj, 'id5id.ext.abTestingControlGroup', controlGroup);
+    }
+
+    return responseObj;
   },
 
   /**
diff --git a/modules/id5IdSystem.md b/modules/id5IdSystem.md
index e5e3969c19c..6b2192834fa 100644
--- a/modules/id5IdSystem.md
+++ b/modules/id5IdSystem.md
@@ -22,14 +22,18 @@ The following configuration parameters are available:
 pbjs.setConfig({
   userSync: {
     userIds: [{
-      name: "id5Id",
+      name: 'id5Id',
       params: {
         partner: 173,            // change to the Partner Number you received from ID5
-        pd: "MT1iNTBjY..."       // optional, see table below for a link to how to generate this
+        pd: 'MT1iNTBjY...',      // optional, see table below for a link to how to generate this
+        abTesting: {             // optional
+          enabled: true,         // false by default
+          controlGroupPct: 0.1   // valid values are 0.0 - 1.0 (inclusive)
+        }
       },
       storage: {
-        type: "html5",           // "html5" is the required storage type
-        name: "id5id",           // "id5id" is the required storage name
+        type: 'html5',           // "html5" is the required storage type
+        name: 'id5id',           // "id5id" is the required storage name
         expires: 90,             // storage lasts for 90 days
         refreshInSeconds: 8*3600 // refresh ID every 8 hours to ensure it's fresh
       }
@@ -46,6 +50,9 @@ pbjs.setConfig({
 | params.partner | Required | Number | This is the ID5 Partner Number obtained from registering with ID5. | `173` |
 | params.pd | Optional | String | Publisher-supplied data used for linking ID5 IDs across domains. See [our documentation](https://wiki.id5.io/x/BIAZ) for details on generating the string. Omit the parameter or leave as an empty string if no data to supply | `"MT1iNTBjY..."` |
 | params.provider | Optional | String | An identifier provided by ID5 to technology partners who manage Prebid setups on behalf of publishers. Reach out to [ID5](mailto:prebid@id5.io) if you have questions about this parameter  | `pubmatic-identity-hub` |
+| params.abTesting | Optional | Object | Allows publishers to easily run an A/B Test. If enabled and the user is in the Control Group, the ID5 ID will NOT be exposed to bid adapters for that request | Disabled by default |
+| params.abTesting.enabled | Optional | Boolean | Set this to `true` to turn on this feature | `true` or `false` |
+| params.abTesting.controlGroupPct | Optional | Number | Must be a number between `0.0` and `1.0` (inclusive) and is used to determine the percentage of requests that fall into the control group (and thus not exposing the ID5 ID). For example, a value of `0.20` will result in 20% of requests without an ID5 ID and 80% with an ID. | `0.1` |
 | storage | Required | Object | Storage settings for how the User ID module will cache the ID5 ID locally | |
 | storage.type | Required | String | This is where the results of the user ID will be stored. ID5 **requires** `"html5"`. | `"html5"` |
 | storage.name | Required | String | The name of the local storage where the user ID will be stored. ID5 **requires** `"id5id"`. | `"id5id"` |
@@ -53,3 +60,9 @@ pbjs.setConfig({
 | storage.refreshInSeconds | Optional | Integer | How many seconds until the ID5 ID will be refreshed. ID5 strongly recommends 8 hours between refreshes | `8*3600` |
 
 **ATTENTION:** As of Prebid.js v4.14.0, ID5 requires `storage.type` to be `"html5"` and `storage.name` to be `"id5id"`. Using other values will display a warning today, but in an upcoming release, it will prevent the ID5 module from loading. This change is to ensure the ID5 module in Prebid.js interoperates properly with the [ID5 API](https://github.com/id5io/id5-api.js) and to reduce the size of publishers' first-party cookies that are sent to their web servers. If you have any questions, please reach out to us at [prebid@id5.io](mailto:prebid@id5.io).
+
+### A Note on A/B Testing
+
+Publishers may want to test the value of the ID5 ID with their downstream partners. While there are various ways to do this, A/B testing is a standard approach. Instead of publishers manually enabling or disabling the ID5 User ID Module based on their control group settings (which leads to fewer calls to ID5, reducing our ability to recognize the user), we have baked this in to our module directly.
+
+To turn on A/B Testing, simply edit the configuration (see above table) to enable it and set what percentage of requests you would like to set for the control group. The control group is the set of requests where an ID5 ID will not be exposed in to bid adapters or in the various user id functions available on the `pbjs` global. An additional value of `ext.abTestingControlGroup` will be set to `true` or `false` that can be used to inform reporting systems that the request was in the control group or not. It's important to note that the control group is request based, and not user based. In other words, from one page view to another, a user may be in or out of the control group.
diff --git a/modules/userId/eids.md b/modules/userId/eids.md
index 0cf9b6d2d22..fecf7e888bf 100644
--- a/modules/userId/eids.md
+++ b/modules/userId/eids.md
@@ -36,7 +36,8 @@ userIdAsEids = [
             atype: 1
         },
         ext: {
-            linkType: 2
+            linkType: 2,
+            abTestingControlGroup: false
         }]
     },
 
diff --git a/test/spec/modules/id5IdSystem_spec.js b/test/spec/modules/id5IdSystem_spec.js
index 845cf7fa010..afde1696766 100644
--- a/test/spec/modules/id5IdSystem_spec.js
+++ b/test/spec/modules/id5IdSystem_spec.js
@@ -26,16 +26,19 @@ describe('ID5 ID System', function() {
   const ID5_NB_STORAGE_NAME = nbCacheName(ID5_TEST_PARTNER_ID);
   const ID5_STORED_ID = 'storedid5id';
   const ID5_STORED_SIGNATURE = '123456';
+  const ID5_STORED_LINK_TYPE = 1;
   const ID5_STORED_OBJ = {
     'universal_uid': ID5_STORED_ID,
-    'signature': ID5_STORED_SIGNATURE
+    'signature': ID5_STORED_SIGNATURE,
+    'link_type': ID5_STORED_LINK_TYPE
   };
   const ID5_RESPONSE_ID = 'newid5id';
   const ID5_RESPONSE_SIGNATURE = 'abcdef';
+  const ID5_RESPONSE_LINK_TYPE = 2;
   const ID5_JSON_RESPONSE = {
     'universal_uid': ID5_RESPONSE_ID,
     'signature': ID5_RESPONSE_SIGNATURE,
-    'link_type': 0
+    'link_type': ID5_RESPONSE_LINK_TYPE
   };
 
   function getId5FetchConfig(storageName = ID5_STORAGE_NAME, storageType = 'html5') {
@@ -268,7 +271,7 @@ describe('ID5 ID System', function() {
               source: ID5_SOURCE,
               uids: [{ id: ID5_STORED_ID, atype: 1 }],
               ext: {
-                linkType: 0
+                linkType: ID5_STORED_LINK_TYPE
               }
             });
           });
@@ -360,13 +363,155 @@ describe('ID5 ID System', function() {
   });
 
   describe('Decode stored object', function() {
-    const expectedDecodedObject = { id5id: { uid: ID5_STORED_ID, ext: { linkType: 0 } } };
+    const expectedDecodedObject = { id5id: { uid: ID5_STORED_ID, ext: { linkType: ID5_STORED_LINK_TYPE } } };
 
     it('should properly decode from a stored object', function() {
-      expect(id5IdSubmodule.decode(ID5_STORED_OBJ)).to.deep.equal(expectedDecodedObject);
+      expect(id5IdSubmodule.decode(ID5_STORED_OBJ, getId5FetchConfig())).to.deep.equal(expectedDecodedObject);
     });
     it('should return undefined if passed a string', function() {
-      expect(id5IdSubmodule.decode('somestring')).to.eq(undefined);
+      expect(id5IdSubmodule.decode('somestring', getId5FetchConfig())).to.eq(undefined);
+    });
+  });
+
+  describe('A/B Testing', function() {
+    const expectedDecodedObjectWithIdAbOff = { id5id: { uid: ID5_STORED_ID, ext: { linkType: ID5_STORED_LINK_TYPE } } };
+    const expectedDecodedObjectWithIdAbOn = { id5id: { uid: ID5_STORED_ID, ext: { linkType: ID5_STORED_LINK_TYPE, abTestingControlGroup: false } } };
+    const expectedDecodedObjectWithoutIdAbOn = { id5id: { uid: 0, ext: { linkType: 0, abTestingControlGroup: true } } };
+    let testConfig;
+
+    beforeEach(function() {
+      testConfig = getId5FetchConfig();
+    });
+
+    describe('Configuration Validation', function() {
+      let logErrorSpy;
+      let logInfoSpy;
+
+      beforeEach(function() {
+        logErrorSpy = sinon.spy(utils, 'logError');
+        logInfoSpy = sinon.spy(utils, 'logInfo');
+      });
+      afterEach(function() {
+        logErrorSpy.restore();
+        logInfoSpy.restore();
+      });
+
+      // A/B Testing ON, but invalid config
+      let testInvalidAbTestingConfigsWithError = [
+        { enabled: true },
+        { enabled: true, controlGroupPct: 2 },
+        { enabled: true, controlGroupPct: -1 },
+        { enabled: true, controlGroupPct: 'a' },
+        { enabled: true, controlGroupPct: true }
+      ];
+      testInvalidAbTestingConfigsWithError.forEach((testAbTestingConfig) => {
+        it('should error if config is invalid, and always return an ID', function () {
+          testConfig.params.abTesting = testAbTestingConfig;
+          let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+          expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOn);
+          sinon.assert.calledOnce(logErrorSpy);
+        });
+      });
+
+      // A/B Testing OFF, with invalid config (ignore)
+      let testInvalidAbTestingConfigsWithoutError = [
+        { enabled: false, controlGroupPct: -1 },
+        { enabled: false, controlGroupPct: 2 },
+        { enabled: false, controlGroupPct: 'a' },
+        { enabled: false, controlGroupPct: true }
+      ];
+      testInvalidAbTestingConfigsWithoutError.forEach((testAbTestingConfig) => {
+        it('should not error if config is invalid but A/B testing is off, and always return an ID', function () {
+          testConfig.params.abTesting = testAbTestingConfig;
+          let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+          expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOff);
+          sinon.assert.notCalled(logErrorSpy);
+          sinon.assert.notCalled(logInfoSpy);
+        });
+      });
+
+      // A/B Testing ON, with valid config
+      let testValidConfigs = [
+        { enabled: true, controlGroupPct: 0 },
+        { enabled: true, controlGroupPct: 0.5 },
+        { enabled: true, controlGroupPct: 1 }
+      ];
+      testValidConfigs.forEach((testAbTestingConfig) => {
+        it('should not error if config is valid', function () {
+          testConfig.params.abTesting = testAbTestingConfig;
+          id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+          sinon.assert.notCalled(logErrorSpy);
+          sinon.assert.calledOnce(logInfoSpy);
+        });
+      });
+    });
+
+    describe('A/B Testing Config is not Set', function() {
+      let randStub;
+
+      beforeEach(function() {
+        randStub = sinon.stub(Math, 'random').callsFake(function() {
+          return 0;
+        });
+      });
+      afterEach(function () {
+        randStub.restore();
+      });
+
+      it('should expose ID when A/B config is not set', function () {
+        let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+        expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOff);
+      });
+
+      it('should expose ID when A/B config is empty', function () {
+        testConfig.params.abTesting = { };
+
+        let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+        expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOff);
+      });
+    });
+
+    describe('A/B Testing Config is Set', function() {
+      let randStub;
+
+      beforeEach(function() {
+        randStub = sinon.stub(Math, 'random').callsFake(function() {
+          return 0.25;
+        });
+      });
+      afterEach(function () {
+        randStub.restore();
+      });
+
+      it('should expose ID when A/B testing is off', function () {
+        testConfig.params.abTesting = {
+          enabled: false,
+          controlGroupPct: 0.5
+        };
+
+        let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+        expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOff);
+      });
+
+      it('should expose ID when not in control group', function () {
+        testConfig.params.abTesting = {
+          enabled: true,
+          controlGroupPct: 0.1
+        };
+
+        let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+        expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOn);
+      });
+
+      it('should not expose ID when in control group', function () {
+        testConfig.params.abTesting = {
+          enabled: true,
+          controlGroupPct: 0.5
+        };
+
+        let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+        expect(decoded).to.deep.equal(expectedDecodedObjectWithoutIdAbOn);
+      });
     });
   });
 });

From f6f27dd06a8fcbc06cf47dfacf61347a7d892da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rok=20Su=C5=A1nik?= <rokostik@gmail.com>
Date: Mon, 14 Dec 2020 22:47:11 +0100
Subject: [PATCH 100/304] Add Zemanta adapter (#6039)

---
 modules/zemantaBidAdapter.js                | 256 ++++++++++
 modules/zemantaBidAdapter.md                | 107 +++++
 test/spec/modules/zemantaBidAdapter_spec.js | 487 ++++++++++++++++++++
 3 files changed, 850 insertions(+)
 create mode 100644 modules/zemantaBidAdapter.js
 create mode 100644 modules/zemantaBidAdapter.md
 create mode 100644 test/spec/modules/zemantaBidAdapter_spec.js

diff --git a/modules/zemantaBidAdapter.js b/modules/zemantaBidAdapter.js
new file mode 100644
index 00000000000..aa7a24985e0
--- /dev/null
+++ b/modules/zemantaBidAdapter.js
@@ -0,0 +1,256 @@
+// jshint esversion: 6, es3: false, node: true
+'use strict';
+
+import {
+  registerBidder
+} from '../src/adapters/bidderFactory.js';
+import { NATIVE, BANNER } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'zemanta';
+const CURRENCY = 'USD';
+const NATIVE_ASSET_IDS = { 0: 'title', 2: 'icon', 3: 'image', 5: 'sponsoredBy', 4: 'body', 1: 'cta' };
+const NATIVE_PARAMS = {
+  title: { id: 0, name: 'title' },
+  icon: { id: 2, type: 1, name: 'img' },
+  image: { id: 3, type: 3, name: 'img' },
+  sponsoredBy: { id: 5, name: 'data', type: 1 },
+  body: { id: 4, name: 'data', type: 2 },
+  cta: { id: 1, type: 12, name: 'data' }
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [ NATIVE, BANNER ],
+  isBidRequestValid: (bid) => {
+    return (
+      !!config.getConfig('zemanta.bidderUrl') &&
+      !!utils.deepAccess(bid, 'params.publisher.id') &&
+      !!(bid.nativeParams || bid.sizes)
+    );
+  },
+  buildRequests: (validBidRequests, bidderRequest) => {
+    const page = bidderRequest.refererInfo.referer;
+    const ua = navigator.userAgent;
+    const test = setOnAny(validBidRequests, 'params.test');
+    const publisher = setOnAny(validBidRequests, 'params.publisher');
+    const cur = CURRENCY;
+    const endpointUrl = config.getConfig('zemanta.bidderUrl');
+    const timeout = bidderRequest.timeout;
+
+    const imps = validBidRequests.map((bid, id) => {
+      bid.netRevenue = 'net';
+      const imp = {
+        id: id + 1 + ''
+      }
+
+      if (bid.params.tagid) {
+        imp.tagid = bid.params.tagid
+      }
+
+      if (bid.nativeParams) {
+        imp.native = {
+          request: JSON.stringify({
+            assets: getNativeAssets(bid)
+          })
+        }
+      } else {
+        imp.banner = {
+          format: transformSizes(bid.sizes)
+        }
+      }
+
+      return imp;
+    });
+
+    const request = {
+      id: bidderRequest.auctionId,
+      site: { page, publisher },
+      device: { ua },
+      source: { fd: 1 },
+      cur: [cur],
+      tmax: timeout,
+      imp: imps
+    };
+
+    if (test) {
+      request.is_debug = !!test;
+      request.test = 1;
+    }
+
+    if (utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies')) {
+      utils.deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString)
+      utils.deepSetValue(request, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies & 1)
+    }
+    if (bidderRequest.uspConsent) {
+      utils.deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent)
+    }
+    if (config.getConfig('coppa') === true) {
+      utils.deepSetValue(request, 'regs.coppa', config.getConfig('coppa') & 1)
+    }
+
+    return {
+      method: 'POST',
+      url: endpointUrl,
+      data: JSON.stringify(request),
+      bids: validBidRequests
+    };
+  },
+  interpretResponse: (serverResponse, { bids }) => {
+    if (!serverResponse.body) {
+      return [];
+    }
+    const { seatbid, cur } = serverResponse.body;
+
+    const bidResponses = flatten(seatbid.map(seat => seat.bid)).reduce((result, bid) => {
+      result[bid.impid - 1] = bid;
+      return result;
+    }, []);
+
+    return bids.map((bid, id) => {
+      const bidResponse = bidResponses[id];
+      if (bidResponse) {
+        const type = bid.nativeParams ? NATIVE : BANNER;
+        const bidObject = {
+          requestId: bid.bidId,
+          cpm: bidResponse.price,
+          creativeId: bidResponse.crid,
+          ttl: 360,
+          netRevenue: bid.netRevenue === 'net',
+          currency: cur,
+          mediaType: type,
+          nurl: bidResponse.nurl,
+        };
+        if (type === NATIVE) {
+          bidObject.native = parseNative(bidResponse);
+        } else {
+          bidObject.ad = bidResponse.adm;
+          bidObject.width = bidResponse.w;
+          bidObject.height = bidResponse.h;
+        }
+        return bidObject;
+      }
+    }).filter(Boolean);
+  },
+  getUserSyncs: (syncOptions) => {
+    const syncs = [];
+    const syncUrl = config.getConfig('zemanta.usersyncUrl');
+    if (syncOptions.pixelEnabled && syncUrl) {
+      syncs.push({
+        type: 'image',
+        url: syncUrl
+      });
+    }
+    return syncs;
+  },
+  onBidWon: (bid) => {
+    ajax(utils.replaceAuctionPrice(bid.nurl, bid.originalCpm))
+  }
+};
+
+registerBidder(spec);
+
+function parseNative(bid) {
+  const { assets, link, eventtrackers } = JSON.parse(bid.adm);
+  const result = {
+    clickUrl: link.url,
+    clickTrackers: link.clicktrackers || undefined
+  };
+  assets.forEach(asset => {
+    const kind = NATIVE_ASSET_IDS[asset.id];
+    const content = kind && asset[NATIVE_PARAMS[kind].name];
+    if (content) {
+      result[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
+    }
+  });
+  if (eventtrackers) {
+    result.impressionTrackers = [];
+    eventtrackers.forEach(tracker => {
+      if (tracker.event !== 1) return;
+      switch (tracker.method) {
+        case 1: // img
+          result.impressionTrackers.push(tracker.url);
+          break;
+        case 2: // js
+          result.javascriptTrackers = `<script src=\"${tracker.url}\"></script>`;
+          break;
+      }
+    });
+  }
+  return result;
+}
+
+function setOnAny(collection, key) {
+  for (let i = 0, result; i < collection.length; i++) {
+    result = utils.deepAccess(collection[i], key);
+    if (result) {
+      return result;
+    }
+  }
+}
+
+function flatten(arr) {
+  return [].concat(...arr);
+}
+
+function getNativeAssets(bid) {
+  return utils._map(bid.nativeParams, (bidParams, key) => {
+    const props = NATIVE_PARAMS[key];
+    const asset = {
+      required: bidParams.required & 1,
+    };
+    if (props) {
+      asset.id = props.id;
+      let wmin, hmin, w, h;
+      let aRatios = bidParams.aspect_ratios;
+
+      if (aRatios && aRatios[0]) {
+        aRatios = aRatios[0];
+        wmin = aRatios.min_width || 0;
+        hmin = aRatios.ratio_height * wmin / aRatios.ratio_width | 0;
+      }
+
+      if (bidParams.sizes) {
+        const sizes = flatten(bidParams.sizes);
+        w = sizes[0];
+        h = sizes[1];
+      }
+
+      asset[props.name] = {
+        len: bidParams.len,
+        type: props.type,
+        wmin,
+        hmin,
+        w,
+        h
+      };
+
+      return asset;
+    }
+  }).filter(Boolean);
+}
+
+/* Turn bid request sizes into ut-compatible format */
+function transformSizes(requestSizes) {
+  if (!utils.isArray(requestSizes)) {
+    return [];
+  }
+
+  if (requestSizes.length === 2 && !utils.isArray(requestSizes[0])) {
+    return [{
+      w: parseInt(requestSizes[0], 10),
+      h: parseInt(requestSizes[1], 10)
+    }];
+  } else if (utils.isArray(requestSizes[0])) {
+    return requestSizes.map(item =>
+      ({
+        w: parseInt(item[0], 10),
+        h: parseInt(item[1], 10)
+      })
+    );
+  }
+
+  return [];
+}
diff --git a/modules/zemantaBidAdapter.md b/modules/zemantaBidAdapter.md
new file mode 100644
index 00000000000..d991b67d429
--- /dev/null
+++ b/modules/zemantaBidAdapter.md
@@ -0,0 +1,107 @@
+# Overview
+
+```
+Module Name: Zemanta Adapter
+Module Type: Bidder Adapter
+Maintainer: prog-ops-team@outbrain.com
+```
+
+# Description
+
+Module that connects to zemanta bidder to fetch bids.
+Both native and display formats are supported but not at the same time. Using OpenRTB standard.
+
+# Configuration
+
+## Bidder and usersync URLs
+
+The Zemanta adapter does not work without setting the correct bidder and usersync URLs.
+You will receive the URLs when contacting us.
+
+```
+pbjs.setConfig({
+    zemanta: {
+      bidderUrl: 'https://bidder-url.com',
+      usersyncUrl: 'https://usersync-url.com'
+    }
+});
+```
+
+
+# Test Native Parameters
+```
+    var adUnits = [
+        code: '/19968336/prebid_native_example_1',
+        mediaTypes: {
+            native: {
+                image: {
+                    required: false,
+                    sizes: [100, 50]
+                },
+                title: {
+                    required: false,
+                    len: 140
+                },
+                sponsoredBy: {
+                    required: false
+                },
+                clickUrl: {
+                    required: false
+                },
+                body: {
+                    required: false
+                },
+                icon: {
+                    required: false,
+                    sizes: [50, 50]
+                }
+            }
+        },
+        bids: [{
+            bidder: 'zemanta',
+            params: {
+                publisher: {
+                  id: '2706', // required
+                  name: 'Publishers Name',
+                  domain: 'publisher.com'
+                },
+                tagid: 'tag-id'
+            }
+        }]
+    ];
+
+    pbjs.setConfig({
+        zemanta: {
+          bidderUrl: 'https://prebidtest.zemanta.com/api/bidder/prebidtest/bid/'
+        }
+    });
+```
+
+# Test Display Parameters
+```
+    var adUnits = [
+        code: '/19968336/prebid_display_example_1',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        bids: [{
+            bidder: 'zemanta',
+            params: {
+                publisher: {
+                  id: '2706', // required
+                  name: 'Publishers Name',
+                  domain: 'publisher.com'
+                },
+                tagid: 'tag-id'
+            },
+        }]
+    ];
+
+    pbjs.setConfig({
+        zemanta: {
+          bidderUrl: 'https://prebidtest.zemanta.com/api/bidder/prebidtest/bid/'
+        }
+    });
+```
diff --git a/test/spec/modules/zemantaBidAdapter_spec.js b/test/spec/modules/zemantaBidAdapter_spec.js
new file mode 100644
index 00000000000..ab685890620
--- /dev/null
+++ b/test/spec/modules/zemantaBidAdapter_spec.js
@@ -0,0 +1,487 @@
+import {expect} from 'chai';
+import {spec} from 'modules/zemantaBidAdapter.js';
+import {config} from 'src/config.js';
+import {server} from 'test/mocks/xhr';
+
+describe('Zemanta Adapter', function () {
+  describe('Bid request and response', function () {
+    const commonBidRequest = {
+      bidder: 'zemanta',
+      params: {
+        publisher: {
+          id: 'publisher-id'
+        },
+      },
+      bidId: '2d6815a92ba1ba',
+      auctionId: '12043683-3254-4f74-8934-f941b085579e',
+    }
+    const nativeBidRequestParams = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [
+            120,
+            100
+          ],
+          sendId: true
+        },
+        title: {
+          required: true,
+          sendId: true
+        },
+        sponsoredBy: {
+          required: false
+        }
+      },
+    }
+
+    const displayBidRequestParams = {
+      sizes: [
+        [
+          300,
+          250
+        ]
+      ]
+    }
+
+    describe('isBidRequestValid', function () {
+      before(() => {
+        config.setConfig({
+          zemanta: {
+            bidderUrl: 'https://bidder-url.com',
+          }
+        }
+        )
+      })
+      after(() => {
+        config.resetConfig()
+      })
+
+      it('should fail when bid is invalid', function () {
+        const bid = {
+          bidder: 'zemanta',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+      it('should succeed when bid contains native params', function () {
+        const bid = {
+          bidder: 'zemanta',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...nativeBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(true)
+      })
+      it('should succeed when bid contains sizes', function () {
+        const bid = {
+          bidder: 'zemanta',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...displayBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(true)
+      })
+      it('should fail if publisher id is not set', function () {
+        const bid = {
+          bidder: 'zemanta',
+          ...nativeBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+      it('should fail if bidder url is not set', function () {
+        const bid = {
+          bidder: 'zemanta',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...nativeBidRequestParams,
+        }
+        config.resetConfig()
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+    })
+
+    describe('buildRequests', function () {
+      before(() => {
+        config.setConfig({
+          zemanta: {
+            bidderUrl: 'https://bidder-url.com',
+          }
+        }
+        )
+      })
+      after(() => {
+        config.resetConfig()
+      })
+
+      const commonBidderRequest = {
+        refererInfo: {
+          referer: 'https://example.com/'
+        }
+      }
+
+      it('should build native request', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const expectedNativeAssets = {
+          assets: [
+            {
+              required: 1,
+              id: 3,
+              img: {
+                type: 3,
+                w: 120,
+                h: 100
+              }
+            },
+            {
+              required: 1,
+              id: 0,
+              title: {}
+            },
+            {
+              required: 0,
+              id: 5,
+              data: {
+                type: 1
+              }
+            }
+          ]
+        }
+        const expectedData = {
+          site: {
+            page: 'https://example.com/',
+            publisher: {
+              id: 'publisher-id'
+            }
+          },
+          device: {
+            ua: navigator.userAgent
+          },
+          source: {
+            fd: 1
+          },
+          cur: [
+            'USD'
+          ],
+          imp: [
+            {
+              id: '1',
+              native: {
+                request: JSON.stringify(expectedNativeAssets)
+              }
+            }
+          ]
+        }
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        expect(res.url).to.equal('https://bidder-url.com')
+        expect(res.data).to.deep.equal(JSON.stringify(expectedData))
+      });
+
+      it('should build display request', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...displayBidRequestParams,
+        }
+        const expectedData = {
+          site: {
+            page: 'https://example.com/',
+            publisher: {
+              id: 'publisher-id'
+            }
+          },
+          device: {
+            ua: navigator.userAgent
+          },
+          source: {
+            fd: 1
+          },
+          cur: [
+            'USD'
+          ],
+          imp: [
+            {
+              id: '1',
+              banner: {
+                format: [
+                  {
+                    w: 300,
+                    h: 250
+                  }
+                ]
+              }
+            }
+          ]
+        }
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        expect(res.url).to.equal('https://bidder-url.com')
+        expect(res.data).to.deep.equal(JSON.stringify(expectedData))
+      })
+
+      it('should pass optional tagid in request', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        bidRequest.params.tagid = 'test-tag'
+
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.imp[0].tagid).to.equal('test-tag')
+      });
+
+      it('should pass bidder timeout', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const bidderRequest = {
+          ...commonBidderRequest,
+          timeout: 500
+        }
+        const res = spec.buildRequests([bidRequest], bidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.tmax).to.equal(500)
+      });
+
+      it('should pass GDPR consent', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const bidderRequest = {
+          ...commonBidderRequest,
+          gdprConsent: {
+            gdprApplies: true,
+            consentString: 'consentString',
+          }
+        }
+        const res = spec.buildRequests([bidRequest], bidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.user.ext.consent).to.equal('consentString')
+        expect(resData.regs.ext.gdpr).to.equal(1)
+      });
+
+      it('should pass us privacy consent', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const bidderRequest = {
+          ...commonBidderRequest,
+          uspConsent: 'consentString'
+        }
+        const res = spec.buildRequests([bidRequest], bidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.regs.ext.us_privacy).to.equal('consentString')
+      });
+
+      it('should pass coppa consent', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        config.setConfig({coppa: true})
+
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.regs.coppa).to.equal(1)
+
+        config.resetConfig()
+      });
+    })
+
+    describe('interpretResponse', function () {
+      it('should return empty array if no valid bids', function () {
+        const res = spec.interpretResponse({}, [])
+        expect(res).to.be.an('array').that.is.empty
+      });
+
+      it('should interpret native response', function () {
+        const serverResponse = {
+          body: {
+            id: '0a73e68c-9967-4391-b01b-dda2d9fc54e4',
+            seatbid: [
+              {
+                bid: [
+                  {
+                    id: '82822cf5-259c-11eb-8a52-f29e5275aa57',
+                    impid: '1',
+                    price: 1.1,
+                    nurl: 'http://example.com/win/${AUCTION_PRICE}',
+                    adm: '{"ver":"1.2","assets":[{"id":3,"required":1,"img":{"url":"http://example.com/img/url","w":120,"h":100}},{"id":0,"required":1,"title":{"text":"Test title"}},{"id":5,"data":{"value":"Test sponsor"}}],"link":{"url":"http://example.com/click/url"},"eventtrackers":[{"event":1,"method":1,"url":"http://example.com/impression"}]}',
+                    adomain: [
+                      'example.co'
+                    ],
+                    cid: '3487171',
+                    crid: '28023739',
+                    cat: [
+                      'IAB10-2'
+                    ]
+                  }
+                ],
+                seat: 'acc-5537'
+              }
+            ],
+            bidid: '82822cf5-259c-11eb-8a52-b48e7518c657',
+            cur: 'USD'
+          },
+        }
+        const request = {
+          bids: [
+            {
+              ...commonBidRequest,
+              ...nativeBidRequestParams,
+            }
+          ]
+        }
+        const expectedRes = [
+          {
+            requestId: request.bids[0].bidId,
+            cpm: 1.1,
+            creativeId: '28023739',
+            ttl: 360,
+            netRevenue: false,
+            currency: 'USD',
+            mediaType: 'native',
+            nurl: 'http://example.com/win/${AUCTION_PRICE}',
+            native: {
+              clickTrackers: undefined,
+              clickUrl: 'http://example.com/click/url',
+              image: {
+                url: 'http://example.com/img/url',
+                width: 120,
+                height: 100
+              },
+              title: 'Test title',
+              sponsoredBy: 'Test sponsor',
+              impressionTrackers: [
+                'http://example.com/impression',
+              ]
+            }
+          }
+        ]
+
+        const res = spec.interpretResponse(serverResponse, request)
+        expect(res).to.deep.equal(expectedRes)
+      });
+
+      it('should interpret display response', function () {
+        const serverResponse = {
+          body: {
+            id: '6b2eedc8-8ff5-46ef-adcf-e701b508943e',
+            seatbid: [
+              {
+                bid: [
+                  {
+                    id: 'd90fe7fa-28d7-11eb-8ce4-462a842a7cf9',
+                    impid: '1',
+                    price: 1.1,
+                    nurl: 'http://example.com/win/${AUCTION_PRICE}',
+                    adm: '<div>ad</div>',
+                    adomain: [
+                      'example.com'
+                    ],
+                    cid: '3865084',
+                    crid: '29998660',
+                    cat: [
+                      'IAB10-2'
+                    ],
+                    w: 300,
+                    h: 250
+                  }
+                ],
+                seat: 'acc-6536'
+              }
+            ],
+            bidid: 'd90fe7fa-28d7-11eb-8ce4-13d94bfa26f9',
+            cur: 'USD'
+          }
+        }
+        const request = {
+          bids: [
+            {
+              ...commonBidRequest,
+              ...displayBidRequestParams
+            }
+          ]
+        }
+        const expectedRes = [
+          {
+            requestId: request.bids[0].bidId,
+            cpm: 1.1,
+            creativeId: '29998660',
+            ttl: 360,
+            netRevenue: false,
+            currency: 'USD',
+            mediaType: 'banner',
+            nurl: 'http://example.com/win/${AUCTION_PRICE}',
+            ad: '<div>ad</div>',
+            width: 300,
+            height: 250
+          }
+        ]
+
+        const res = spec.interpretResponse(serverResponse, request)
+        expect(res).to.deep.equal(expectedRes)
+      });
+    })
+  })
+
+  describe('getUserSyncs', function () {
+    before(() => {
+      config.setConfig({
+        zemanta: {
+          usersyncUrl: 'https://usersync-url.com',
+        }
+      }
+      )
+    })
+    after(() => {
+      config.resetConfig()
+    })
+
+    it('should return user sync if pixel enabled', function () {
+      const ret = spec.getUserSyncs({pixelEnabled: true})
+      expect(ret).to.deep.equal([{type: 'image', url: 'https://usersync-url.com'}])
+    })
+
+    it('should not return user sync if pixel disabled', function () {
+      const ret = spec.getUserSyncs({pixelEnabled: false})
+      expect(ret).to.be.an('array').that.is.empty
+    })
+
+    it('should not return user sync if url is not set', function () {
+      config.resetConfig()
+      const ret = spec.getUserSyncs({pixelEnabled: true})
+      expect(ret).to.be.an('array').that.is.empty
+    })
+  })
+
+  describe('onBidWon', function () {
+    it('should make an ajax call with the original cpm', function () {
+      const bid = {
+        nurl: 'http://example.com/win/${AUCTION_PRICE}',
+        cpm: 2.1,
+        originalCpm: 1.1,
+      }
+      spec.onBidWon(bid)
+      expect(server.requests[0].url).to.equals('http://example.com/win/1.1')
+    });
+  })
+})

From 6b4494ccae3e928f8aa1bbd1cdbb17c49c079424 Mon Sep 17 00:00:00 2001
From: cpuBird <54024689+cpuBird@users.noreply.github.com>
Date: Tue, 15 Dec 2020 14:57:25 +0530
Subject: [PATCH 101/304] vdoai Bid Adapter: added multisize array in bid
 requests (#6101)

* added multisize array in vdoai bid requests

* fixing a bug dimentions
---
 modules/vdoaiBidAdapter.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/vdoaiBidAdapter.js b/modules/vdoaiBidAdapter.js
index 8cfcd67bd00..d4fda36b1fc 100644
--- a/modules/vdoaiBidAdapter.js
+++ b/modules/vdoaiBidAdapter.js
@@ -30,14 +30,12 @@ export const spec = {
     if (validBidRequests.length === 0) {
       return [];
     }
+
     return validBidRequests.map(bidRequest => {
-      const sizes = utils.parseSizesInput(bidRequest.params.size || bidRequest.sizes)[0];
-      const width = sizes.split('x')[0];
-      const height = sizes.split('x')[1];
+      const sizes = utils.getAdUnitSizes(bidRequest);
       const payload = {
         placementId: bidRequest.params.placementId,
-        width: width,
-        height: height,
+        sizes: sizes,
         bidId: bidRequest.bidId,
         referer: bidderRequest.refererInfo.referer,
         id: bidRequest.auctionId,
@@ -64,9 +62,9 @@ export const spec = {
     const response = serverResponse.body;
     const creativeId = response.adid || 0;
     // const width = response.w || 0;
-    const width = bidRequest.data.width;
+    const width = response.width;
     // const height = response.h || 0;
-    const height = bidRequest.data.height;
+    const height = response.height;
     const cpm = response.price || 0;
 
     response.rWidth = width;

From 53e629145010fbc97925e5dd2207324e3f2891d7 Mon Sep 17 00:00:00 2001
From: Vadim Gush <vadim_gush@lineate.com>
Date: Wed, 16 Dec 2020 06:49:25 +0400
Subject: [PATCH 102/304] Sovrn Bid Adapter: Change TTL field (#6083)

* Change TTL field for SovrnBidAdapter

* Fix unit tests

* Fix codestyle in unit tests

* Fix tests

* Fix tests

* Removed ext field from some tests

* Trying to make ext field optional

* Codestyle changes
---
 modules/sovrnBidAdapter.js                | 2 +-
 test/spec/modules/sovrnBidAdapter_spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/sovrnBidAdapter.js b/modules/sovrnBidAdapter.js
index 8f8158fd0c9..176b090fbe5 100644
--- a/modules/sovrnBidAdapter.js
+++ b/modules/sovrnBidAdapter.js
@@ -153,7 +153,7 @@ export const spec = {
             netRevenue: true,
             mediaType: BANNER,
             ad: decodeURIComponent(`${sovrnBid.adm}<img src="${sovrnBid.nurl}">`),
-            ttl: sovrnBid.ttl || 90
+            ttl: sovrnBid.ext ? (sovrnBid.ext.ttl || 90) : 90
           });
         });
       }
diff --git a/test/spec/modules/sovrnBidAdapter_spec.js b/test/spec/modules/sovrnBidAdapter_spec.js
index 769be73a272..2bb5cdbdf3c 100644
--- a/test/spec/modules/sovrnBidAdapter_spec.js
+++ b/test/spec/modules/sovrnBidAdapter_spec.js
@@ -387,7 +387,7 @@ describe('sovrnBidAdapter', function() {
     });
 
     it('should get correct bid response when ttl is set', function () {
-      response.body.seatbid[0].bid[0].ttl = 480;
+      response.body.seatbid[0].bid[0].ext = { 'ttl': 480 };
 
       let expectedResponse = [{
         'requestId': '263c448586f5a1',

From a9f1795f6de579d84f03a542458b6c4228a7257f Mon Sep 17 00:00:00 2001
From: pro-nsk <32703851+pro-nsk@users.noreply.github.com>
Date: Wed, 16 Dec 2020 16:32:39 +0700
Subject: [PATCH 103/304] Change bidder url for Qwarry adapter (#6128)

* qwarry bid adapter

* formatting fixes

* fix tests for qwarry

* qwarry bid adapter

* add header for qwarry bid adapter

* bid requests fix

* fix tests

* response fix

* fix tests for Qwarry bid adapter

* add pos parameter to qwarry bid adapter

* qwarryBidAdapter onBidWon hotfix

* Change bidder endpoint url for Qwarry adapter

Co-authored-by: Artem Kostritsa <akostritsa@akostritsa.com>
Co-authored-by: Alexander Kascheev <akascheev@asteriosoft.com>
---
 modules/qwarryBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/qwarryBidAdapter.js b/modules/qwarryBidAdapter.js
index 7c2ec0f085b..7cb83520979 100644
--- a/modules/qwarryBidAdapter.js
+++ b/modules/qwarryBidAdapter.js
@@ -4,7 +4,7 @@ import { ajax } from '../src/ajax.js';
 import { VIDEO } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'qwarry';
-export const ENDPOINT = 'https://ui-bidder.kantics.co/bid/adtag?prebid=true'
+export const ENDPOINT = 'https://bidder.qwarry.co/bid/adtag?prebid=true'
 
 export const spec = {
   code: BIDDER_CODE,

From 1410a738cf7802227e3dc353b62440e9545f9947 Mon Sep 17 00:00:00 2001
From: Stephen Johnston <stephenj@launchpowered.com>
Date: Wed, 16 Dec 2020 05:33:36 -0500
Subject: [PATCH 104/304] Add Automatic Release Drafter Functionality to Prebid
 Repository (#5954)

* Create release-drafter.yml

* Create release-drafter.yml

* Update release-drafter.yml

* Update release-drafter.yml
---
 .github/release-drafter.yml           | 28 +++++++++++++++++++++++++++
 .github/workflows/release-drafter.yml | 18 +++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 .github/release-drafter.yml
 create mode 100644 .github/workflows/release-drafter.yml

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
new file mode 100644
index 00000000000..8984252f4c3
--- /dev/null
+++ b/.github/release-drafter.yml
@@ -0,0 +1,28 @@
+
+name-template: 'Prebid $RESOLVED_VERSION Release'
+tag-template: '$RESOLVED_VERSION'
+categories:
+  - title: '🚀 New Features'
+    label: 'feature'
+  - title: '🛠 Maintenance'
+    label: 'maintenance'    
+  - title: '🐛 Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'      
+change-template: '- $TITLE (#$NUMBER)'
+version-resolver:
+  major:
+    labels:
+      - 'major'
+  minor:
+    labels:
+      - 'minor'
+  patch:
+    labels:
+      - 'patch'
+  default: patch
+template: |
+  ## In This Release
+  $CHANGES
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
new file mode 100644
index 00000000000..8152b61275d
--- /dev/null
+++ b/.github/workflows/release-drafter.yml
@@ -0,0 +1,18 @@
+name: Release Drafter
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - uses: release-drafter/release-drafter@v5
+        with:
+         config-name: release-drafter.yml         
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 54df547a22551cba288348768ed2d61cd2181667 Mon Sep 17 00:00:00 2001
From: mmoschovas <63253416+mmoschovas@users.noreply.github.com>
Date: Wed, 16 Dec 2020 12:43:41 -0500
Subject: [PATCH 105/304] Price Floors update to include modelWeight in the bid
 request to give additional context for Analytics adapters that the Floors
 Module is schema mode 2, and the floors module picks a model prior to an
 auction based on the modelWeight supplied in the floors module definition
 (#6126)

Rubicon Analytics Update to pass modelWeight if exists
---
 modules/priceFloors.js                        |  1 +
 modules/rubiconAnalyticsAdapter.js            |  1 +
 test/spec/modules/priceFloors_spec.js         | 25 +++++++++++++++++++
 .../modules/rubiconAnalyticsAdapter_spec.js   |  3 +++
 4 files changed, 30 insertions(+)

diff --git a/modules/priceFloors.js b/modules/priceFloors.js
index c0797f710de..7c8834c2ae2 100644
--- a/modules/priceFloors.js
+++ b/modules/priceFloors.js
@@ -291,6 +291,7 @@ export function updateAdUnitsForAuction(adUnits, floorData, auctionId) {
         skipRate: floorData.skipRate,
         floorMin: floorData.floorMin,
         modelVersion: utils.deepAccess(floorData, 'data.modelVersion'),
+        modelWeight: utils.deepAccess(floorData, 'data.modelWeight'),
         modelTimestamp: utils.deepAccess(floorData, 'data.modelTimestamp'),
         location: utils.deepAccess(floorData, 'data.location', 'noData'),
         floorProvider: floorData.floorProvider,
diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index ad78c601ab6..38d83a40bc7 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -237,6 +237,7 @@ function sendMessage(auctionId, bidWonId) {
         auction.floors = utils.pick(auctionCache.floorData, [
           'location',
           'modelVersion as modelName',
+          'modelWeight',
           'modelTimestamp',
           'skipped',
           'enforcement', () => utils.deepAccess(auctionCache.floorData, 'enforcements.enforceJS'),
diff --git a/test/spec/modules/priceFloors_spec.js b/test/spec/modules/priceFloors_spec.js
index 1b3ce021068..984d6da1cb9 100644
--- a/test/spec/modules/priceFloors_spec.js
+++ b/test/spec/modules/priceFloors_spec.js
@@ -23,6 +23,7 @@ describe('the price floors module', function () {
   let clock;
   const basicFloorData = {
     modelVersion: 'basic model',
+    modelWeight: 10,
     modelTimestamp: 1606772895,
     currency: 'USD',
     schema: {
@@ -38,6 +39,7 @@ describe('the price floors module', function () {
   const basicFloorDataHigh = {
     floorMin: 7.0,
     modelVersion: 'basic model',
+    modelWeight: 10,
     currency: 'USD',
     schema: {
       delimiter: '|',
@@ -52,6 +54,7 @@ describe('the price floors module', function () {
   const basicFloorDataLow = {
     floorMin: 2.3,
     modelVersion: 'basic model',
+    modelWeight: 10,
     currency: 'USD',
     schema: {
       delimiter: '|',
@@ -185,6 +188,7 @@ describe('the price floors module', function () {
       let resultingData = getFloorsDataForAuction(inputFloorData, 'test_div_1');
       expect(resultingData).to.deep.equal({
         modelVersion: 'basic model',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         currency: 'USD',
         schema: {
@@ -203,6 +207,7 @@ describe('the price floors module', function () {
       resultingData = getFloorsDataForAuction(inputFloorData, 'this_is_a_div');
       expect(resultingData).to.deep.equal({
         modelVersion: 'basic model',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         currency: 'USD',
         schema: {
@@ -432,6 +437,7 @@ describe('the price floors module', function () {
         skipped: true,
         floorMin: undefined,
         modelVersion: undefined,
+        modelWeight: undefined,
         modelTimestamp: undefined,
         location: 'noData',
         skipRate: 0,
@@ -467,6 +473,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'adUnit Model Version',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'adUnit',
         skipRate: 0,
@@ -501,6 +508,7 @@ describe('the price floors module', function () {
       validateBidRequests(true, {
         skipped: false,
         modelVersion: 'adUnit Model Version',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'adUnit',
         skipRate: 0,
@@ -516,6 +524,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
@@ -538,6 +547,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
@@ -553,6 +563,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
@@ -568,6 +579,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
@@ -592,6 +604,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 50,
@@ -607,6 +620,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 10,
@@ -622,6 +636,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
@@ -687,6 +702,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'model-1',
+        modelWeight: 10,
         modelTimestamp: undefined,
         location: 'setConfig',
         skipRate: 0,
@@ -701,6 +717,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'model-2',
+        modelWeight: 40,
         modelTimestamp: undefined,
         location: 'setConfig',
         skipRate: 0,
@@ -715,6 +732,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'model-3',
+        modelWeight: 50,
         modelTimestamp: undefined,
         location: 'setConfig',
         skipRate: 0,
@@ -745,6 +763,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
@@ -825,6 +844,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
@@ -864,6 +884,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'fetch model name',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'fetch',
         skipRate: 0,
@@ -902,6 +923,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'fetch model name',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'fetch',
         skipRate: 0,
@@ -943,6 +965,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'fetch model name',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'fetch',
         skipRate: 95,
@@ -966,6 +989,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
@@ -991,6 +1015,7 @@ describe('the price floors module', function () {
         skipped: false,
         floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index 0d6cf331e52..1dd524e1838 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -852,6 +852,7 @@ describe('rubicon analytics adapter', function () {
       auctionInit.bidderRequests[0].bids[0].floorData = {
         skipped: false,
         modelVersion: 'someModelName',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 15,
@@ -954,6 +955,7 @@ describe('rubicon analytics adapter', function () {
       expect(message.auctions[0].floors).to.deep.equal({
         location: 'setConfig',
         modelName: 'someModelName',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         skipped: false,
         enforcement: true,
@@ -1000,6 +1002,7 @@ describe('rubicon analytics adapter', function () {
       expect(message.auctions[0].floors).to.deep.equal({
         location: 'setConfig',
         modelName: 'someModelName',
+        modelWeight: 10,
         modelTimestamp: 1606772895,
         skipped: false,
         enforcement: true,

From eebdee25e946792e21cf64eff5f97f32d4e299a0 Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Wed, 16 Dec 2020 19:39:22 +0100
Subject: [PATCH 106/304] Prebid 4.20.0 Release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 04ec495c93d..30ba2494182 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.20.0-pre",
+  "version": "4.20.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 282866ae79e92873d02620beac56d15b03dc7635 Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Wed, 16 Dec 2020 20:12:28 +0100
Subject: [PATCH 107/304] Increment pre version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 30ba2494182..f65b996a393 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.20.0",
+  "version": "4.21.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 47e96ad7ae62040ede8c9b84a192e0b718d9947a Mon Sep 17 00:00:00 2001
From: susyt <susan@fox.camp>
Date: Wed, 16 Dec 2020 12:00:48 -0800
Subject: [PATCH 108/304] GumGum: makes slot and invideo products avail with
 pubId (#6107)

---
 modules/gumgumBidAdapter.js                | 10 ++--
 modules/gumgumBidAdapter.md                | 69 +++++++++++++++++++++-
 test/spec/modules/gumgumBidAdapter_spec.js | 58 ++++++++----------
 3 files changed, 97 insertions(+), 40 deletions(-)

diff --git a/modules/gumgumBidAdapter.js b/modules/gumgumBidAdapter.js
index 2cb5ce61064..c9bf77494cf 100644
--- a/modules/gumgumBidAdapter.js
+++ b/modules/gumgumBidAdapter.js
@@ -273,8 +273,9 @@ function buildRequests (validBidRequests, bidderRequest) {
       data.iriscat = params.iriscat;
     }
 
-    if (params.zone) {
-      data.t = params.zone;
+    if (params.zone || params.pubId) {
+      params.zone ? (data.t = params.zone) : (data.pubId = params.pubId);
+
       data.pi = 2; // inscreen
       // override pi if the following is found
       if (params.slot) {
@@ -285,11 +286,8 @@ function buildRequests (validBidRequests, bidderRequest) {
         data.ni = parseInt(params.native, 10);
         data.pi = 5;
       } else if (mediaTypes.video) {
-        data.pi = mediaTypes.video.linearity === 1 ? 7 : 6; // video : invideo
+        data.pi = mediaTypes.video.linearity === 2 ? 6 : 7; // invideo : video
       }
-    } else if (params.pubId) {
-      data.pubId = params.pubId
-      data.pi = mediaTypes.video ? 7 : 2; // video : inscreen
     } else { // legacy params
       data = { ...data, ...handleLegacyParams(params, sizes) }
     }
diff --git a/modules/gumgumBidAdapter.md b/modules/gumgumBidAdapter.md
index 7b4f0c98ea7..57d56235d1c 100644
--- a/modules/gumgumBidAdapter.md
+++ b/modules/gumgumBidAdapter.md
@@ -10,11 +10,76 @@ Maintainer: engineering@gumgum.com
 
 GumGum adapter for Prebid.js
 Please note that both video and in-video products require a mediaType of video. 
-All other products (in-screen, slot, native) should have a mediaType of banner.
-
+In-screen and slot products should have a mediaType of banner.
 
 # Test Parameters
 ```
+var adUnits = [
+  {
+    code: 'slot-placement',
+    sizes: [[300, 250]],
+    mediaTypes: {
+        banner: {
+          sizes: [[300, 250]],
+        }
+    },
+    bids: [
+      {
+        bidder: 'gumgum',
+        params: {
+          zone: 'dc9d6be1', // GumGum Zone ID given to the client
+          slot: '15901', // GumGum Slot ID given to the client,
+          bidfloor: 0.03 // CPM bid floor
+        }
+      }
+    ]
+  },{
+    code: 'inscreen-placement',
+    sizes: [[300, 50]],
+    mediaTypes: {
+        banner: {
+          sizes: [[1, 1]],
+        }
+    },
+    bids: [
+      {
+        bidder: 'gumgum',
+        params: {
+          zone: 'dc9d6be1', // GumGum Zone ID given to the client
+          bidfloor: 0.03 // CPM bid floor
+        }
+      }
+    ]
+  },{
+    code: 'video-placement',
+    sizes: [[300, 50]],
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 480],
+        minduration: 1,
+        maxduration: 2,
+        linearity: 1,
+        startdelay: 1,
+        placement: 1,
+        protocols: [1, 2]
+      }
+    },
+    bids: [
+      {
+        bidder: 'gumgum',
+        params: {
+          zone: 'ggumtest', // GumGum Zone ID given to the client
+          bidfloor: 0.03 // CPM bid floor
+        }
+      }
+    ]
+  }
+];
+```
+
+# Legacy Test Parameters
+```
 var adUnits = [
   {
     code: 'test-div',
diff --git a/test/spec/modules/gumgumBidAdapter_spec.js b/test/spec/modules/gumgumBidAdapter_spec.js
index 52a3a21db4e..a2a1b733d3c 100644
--- a/test/spec/modules/gumgumBidAdapter_spec.js
+++ b/test/spec/modules/gumgumBidAdapter_spec.js
@@ -35,7 +35,7 @@ describe('gumgumAdapter', function () {
 
     it('should return true when required params found', function () {
       const zoneBid = { ...bid, params: { 'zone': '123' } };
-      const pubIdBid = { ...bid, params: { 'pubId': '123' } };
+      const pubIdBid = { ...bid, params: { 'pubId': 123 } };
       expect(spec.isBidRequestValid(bid)).to.equal(true);
       expect(spec.isBidRequestValid(zoneBid)).to.equal(true);
       expect(spec.isBidRequestValid(pubIdBid)).to.equal(true);
@@ -143,23 +143,24 @@ describe('gumgumAdapter', function () {
         protocols: [1, 2]
       }
     };
+    const zoneParam = { 'zone': '123a' };
+    const pubIdParam = { 'pubId': 123 };
 
-    describe('zone param', function () {
-      const zoneParam = { 'zone': '123a' };
+    it('should set pubId param if found', function () {
+      const request = { ...bidRequests[0], params: pubIdParam };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.pubId).to.equal(pubIdParam.pubId);
+    });
 
-      it('should set t and pi param', function () {
-        const request = { ...bidRequests[0], params: zoneParam };
-        const bidRequest = spec.buildRequests([request])[0];
-        expect(bidRequest.data.t).to.equal(zoneParam.zone);
-        expect(bidRequest.data.pi).to.equal(2);
-      });
-      it('should set the correct pi param if slot param is found', function () {
-        const request = { ...bidRequests[0], params: { ...zoneParam, 'slot': 1 } };
-        const bidRequest = spec.buildRequests([request])[0];
-        expect(bidRequest.data.pi).to.equal(3);
-      });
+    it('should set t param when zone param is found', function () {
+      const request = { ...bidRequests[0], params: zoneParam };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.t).to.equal(zoneParam.zone);
+    });
+
+    describe('product id', function () {
       it('should set the correct pi param if native param is found', function () {
-        const request = { ...bidRequests[0], params: { ...zoneParam, 'native': 2 } };
+        const request = { ...bidRequests[0], params: { ...zoneParam, native: 2 } };
         const bidRequest = spec.buildRequests([request])[0];
         expect(bidRequest.data.pi).to.equal(5);
       });
@@ -174,25 +175,18 @@ describe('gumgumAdapter', function () {
         const bidRequest = spec.buildRequests([request])[0];
         expect(bidRequest.data.pi).to.equal(6);
       });
-    });
-
-    describe('pubId zone', function () {
-      const pubIdParam = { 'pubId': 'abc' };
-
-      it('should set t param', function () {
-        const request = { ...bidRequests[0], params: pubIdParam };
+      it('should set the correct pi param if slot param is found', function () {
+        const request = { ...bidRequests[0], params: { ...zoneParam, slot: '123s' } };
         const bidRequest = spec.buildRequests([request])[0];
-        expect(bidRequest.data.pubId).to.equal(pubIdParam.pubId);
+        expect(bidRequest.data.pi).to.equal(3);
       });
-
-      it('should set the correct pi depending on what is found in mediaTypes', function () {
-        const request = { ...bidRequests[0], params: pubIdParam };
-        const bidRequest = spec.buildRequests([request])[0];
-        const vidRequest = { ...bidRequests[0], mediaTypes: vidMediaTypes, params: { 'videoPubID': 123 } };
-        const vidBidRequest = spec.buildRequests([vidRequest])[0];
-
-        expect(bidRequest.data.pi).to.equal(2);
-        expect(vidBidRequest.data.pi).to.equal(7);
+      it('should default the pi param to 2 if only zone or pubId param is found', function () {
+        const zoneRequest = { ...bidRequests[0], params: zoneParam };
+        const pubIdRequest = { ...bidRequests[0], params: pubIdParam };
+        const zoneBidRequest = spec.buildRequests([zoneRequest])[0];
+        const pubIdBidRequest = spec.buildRequests([pubIdRequest])[0];
+        expect(zoneBidRequest.data.pi).to.equal(2);
+        expect(pubIdBidRequest.data.pi).to.equal(2);
       });
     });
 

From 453e080e678570a394d8c5a9fbed8650b2a04be5 Mon Sep 17 00:00:00 2001
From: readpeaktuomo <66239046+readpeaktuomo@users.noreply.github.com>
Date: Fri, 18 Dec 2020 18:37:43 +0200
Subject: [PATCH 109/304] Add support for tagId parameter (#6133)

* Add support for tagId parameter

* Update maintainer email to an alias
---
 modules/readpeakBidAdapter.js                | 3 ++-
 modules/readpeakBidAdapter.md                | 5 +++--
 test/spec/modules/readpeakBidAdapter_spec.js | 7 +++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/readpeakBidAdapter.js b/modules/readpeakBidAdapter.js
index c72bbdd658f..2f4173f240b 100644
--- a/modules/readpeakBidAdapter.js
+++ b/modules/readpeakBidAdapter.js
@@ -98,7 +98,8 @@ function impression(slot) {
     id: slot.bidId,
     native: nativeImpression(slot),
     bidfloor: slot.params.bidfloor || 0,
-    bidfloorcur: slot.params.bidfloorcur || 'USD'
+    bidfloorcur: slot.params.bidfloorcur || 'USD',
+    tagId: slot.params.tagId || '0'
   };
 }
 
diff --git a/modules/readpeakBidAdapter.md b/modules/readpeakBidAdapter.md
index a15767f29a7..da250e7f77a 100644
--- a/modules/readpeakBidAdapter.md
+++ b/modules/readpeakBidAdapter.md
@@ -4,7 +4,7 @@ Module Name: ReadPeak Bid Adapter
 
 Module Type: Bidder Adapter
 
-Maintainer: kurre.stahlberg@readpeak.com
+Maintainer: devteam@readpeak.com
 
 # Description
 
@@ -23,7 +23,8 @@ Please reach out to your account team or hello@readpeak.com for more information
             params: {
                 bidfloor: 5.00,
                 publisherId: 'test',
-                siteId: 'test'
+                siteId: 'test',
+                tagId: 'test-tag-1'
             },
         }]
     }];
diff --git a/test/spec/modules/readpeakBidAdapter_spec.js b/test/spec/modules/readpeakBidAdapter_spec.js
index 0c6f942e724..d5a877f6221 100644
--- a/test/spec/modules/readpeakBidAdapter_spec.js
+++ b/test/spec/modules/readpeakBidAdapter_spec.js
@@ -28,7 +28,8 @@ describe('ReadPeakAdapter', function() {
       params: {
         bidfloor: 5.0,
         publisherId: '11bc5dd5-7421-4dd8-c926-40fa653bec76',
-        siteId: '11bc5dd5-7421-4dd8-c926-40fa653bec77'
+        siteId: '11bc5dd5-7421-4dd8-c926-40fa653bec77',
+        tagId: 'test-tag-1'
       },
       bidId: '2ffb201a808da7',
       bidderRequestId: '178e34bad3658f',
@@ -104,7 +105,8 @@ describe('ReadPeakAdapter', function() {
               ver: '1.1'
             },
             bidfloor: 5,
-            bidfloorcur: 'USD'
+            bidfloorcur: 'USD',
+            tagId: 'test-tag-1'
           }
         ],
         site: {
@@ -177,6 +179,7 @@ describe('ReadPeakAdapter', function() {
       expect(data.id).to.equal(bidRequest.bidderRequestId);
       expect(data.imp[0].bidfloor).to.equal(bidRequest.params.bidfloor);
       expect(data.imp[0].bidfloorcur).to.equal('USD');
+      expect(data.imp[0].tagId).to.equal('test-tag-1');
       expect(data.site.publisher.id).to.equal(bidRequest.params.publisherId);
       expect(data.site.id).to.equal(bidRequest.params.siteId);
       expect(data.site.page).to.equal(bidderRequest.refererInfo.referer);

From 78917f5a5128cde43e063facfaa61c81c9b14e6a Mon Sep 17 00:00:00 2001
From: Zak Andree <zandree@owneriq.com>
Date: Fri, 18 Dec 2020 11:47:21 -0800
Subject: [PATCH 110/304] Inmar bidder adapter: Make adNetId an optional
 paramater (#6136)

* Update Inmar bidder adapter

* Set withCredentials to true

* Remove inmarId from Inmar bidder adapter

* Remove withCredentials because it defaults to true
---
 modules/inmarBidAdapter.js                |  5 +----
 modules/inmarBidAdapter.md                |  2 --
 test/spec/modules/inmarBidAdapter_spec.js | 11 -----------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/modules/inmarBidAdapter.js b/modules/inmarBidAdapter.js
index b5ab72266fc..7583985b23c 100755
--- a/modules/inmarBidAdapter.js
+++ b/modules/inmarBidAdapter.js
@@ -17,7 +17,7 @@ export const spec = {
    * @returns {boolean} True if this is a valid bid, and false otherwise
    */
   isBidRequestValid: function(bid) {
-    return !!(bid.params && bid.params.partnerId && bid.params.adnetId);
+    return !!(bid.params && bid.params.partnerId);
   },
 
   /**
@@ -49,9 +49,6 @@ export const spec = {
     return {
       method: 'POST',
       url: 'https://prebid.owneriq.net:8443/bidder/pb/bid',
-      options: {
-        withCredentials: false
-      },
       data: payloadString,
     };
   },
diff --git a/modules/inmarBidAdapter.md b/modules/inmarBidAdapter.md
index 1bacb30f2dd..8ed6b998602 100644
--- a/modules/inmarBidAdapter.md
+++ b/modules/inmarBidAdapter.md
@@ -25,7 +25,6 @@ Please reach out to your account manager for more information.
                         bidder: 'inmar',
                         params: {
                             partnerId: 12345,
-                            adnetId: 'ADb1f40rmi',
                             position: 1
                         }
                     }]
@@ -37,7 +36,6 @@ Please reach out to your account manager for more information.
                         bidder: 'inmar',
                         params: {
                             partnerId: 12345,
-                            adnetId: 'ADb1f40rmo',
                             position: 0
                         }
                     }]
diff --git a/test/spec/modules/inmarBidAdapter_spec.js b/test/spec/modules/inmarBidAdapter_spec.js
index 86b7ab3a8af..998fe20d369 100644
--- a/test/spec/modules/inmarBidAdapter_spec.js
+++ b/test/spec/modules/inmarBidAdapter_spec.js
@@ -17,7 +17,6 @@ describe('Inmar adapter tests', function () {
     },
     bidder: 'inmar',
     params: {
-      adnetId: 'ADb1f40rmi',
       partnerId: 12345
     },
     auctionId: '0cb3144c-d084-4686-b0d6-f5dbe917c563',
@@ -39,7 +38,6 @@ describe('Inmar adapter tests', function () {
     },
     bidder: 'inmar',
     params: {
-      adnetId: 'ADb1f40rmi',
       partnerId: 12345
     },
     auctionId: '0cb3144c-d084-4686-b0d6-f5dbe917c563',
@@ -60,7 +58,6 @@ describe('Inmar adapter tests', function () {
     ],
     bidder: 'inmar',
     params: {
-      adnetId: 'ADb1f40rmi',
       partnerId: 12345,
     },
     auctionId: '851adee7-d843-48f9-a7e9-9ff00573fcbf',
@@ -118,7 +115,6 @@ describe('Inmar adapter tests', function () {
 
     expect(request).to.have.property('method').and.to.equal('POST');
     const requestContent = JSON.parse(request.data);
-    expect(requestContent.bidRequests[0].params).to.have.property('adnetId').and.to.equal('ADb1f40rmi');
     expect(requestContent.bidRequests[0].params).to.have.property('partnerId').and.to.equal(12345);
     expect(requestContent.bidRequests[0]).to.have.property('auctionId').and.to.equal('0cb3144c-d084-4686-b0d6-f5dbe917c563');
     expect(requestContent.bidRequests[0]).to.have.property('bidId').and.to.equal('2c7c8e9c900244');
@@ -198,19 +194,12 @@ describe('Inmar adapter tests', function () {
     })).to.equal(false);
     expect(spec.isBidRequestValid({
       params: {
-        adnetId: 'ADb1f40rmi'
       }
     })).to.equal(false);
     expect(spec.isBidRequestValid({
       params: {
         partnerId: 12345
       }
-    })).to.equal(false);
-    expect(spec.isBidRequestValid({
-      params: {
-        adnetId: 'ADb1f40rmi',
-        partnerId: 12345
-      }
     })).to.equal(true);
   });
 

From 2c1e5352efafc8fb5eae02eff4ac59bee82fdc74 Mon Sep 17 00:00:00 2001
From: hybrid-ai <58724131+hybrid-ai@users.noreply.github.com>
Date: Sat, 19 Dec 2020 18:46:55 +0300
Subject: [PATCH 111/304] Added VOX Bidder Adapter (#6030)

* Added voxBidAdapter.js to get a bid from partners.hybrid.ai

* Added placements ids for testing

Co-authored-by: s-shevtsov <s.shevtsov@targetix.net>
---
 modules/voxBidAdapter.js                | 247 ++++++++++++++++++
 modules/voxBidAdapter.md                | 237 ++++++++++++++++++
 test/spec/modules/voxBidAdapter_spec.js | 320 ++++++++++++++++++++++++
 3 files changed, 804 insertions(+)
 create mode 100644 modules/voxBidAdapter.js
 create mode 100644 modules/voxBidAdapter.md
 create mode 100644 test/spec/modules/voxBidAdapter_spec.js

diff --git a/modules/voxBidAdapter.js b/modules/voxBidAdapter.js
new file mode 100644
index 00000000000..450f270db31
--- /dev/null
+++ b/modules/voxBidAdapter.js
@@ -0,0 +1,247 @@
+import * as utils from '../src/utils.js'
+import { registerBidder } from '../src/adapters/bidderFactory.js'
+import {BANNER, VIDEO} from '../src/mediaTypes.js'
+import find from 'core-js-pure/features/array/find.js';
+import {auctionManager} from '../src/auctionManager.js';
+import {Renderer} from '../src/Renderer.js';
+
+const BIDDER_CODE = 'vox';
+const SSP_ENDPOINT = 'https://ssp.hybrid.ai/auction/prebid';
+const VIDEO_RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
+const TTL = 60;
+
+function buildBidRequests(validBidRequests) {
+  return utils._map(validBidRequests, function(validBidRequest) {
+    const params = validBidRequest.params;
+    const bidRequest = {
+      bidId: validBidRequest.bidId,
+      transactionId: validBidRequest.transactionId,
+      sizes: validBidRequest.sizes,
+      placement: params.placement,
+      placeId: params.placementId,
+      imageUrl: params.imageUrl
+    };
+
+    return bidRequest;
+  })
+}
+
+const outstreamRender = bid => {
+  bid.renderer.push(() => {
+    window.ANOutstreamVideo.renderAd({
+      sizes: [bid.width, bid.height],
+      targetId: bid.adUnitCode,
+      rendererOptions: {
+        showBigPlayButton: false,
+        showProgressBar: 'bar',
+        showVolume: false,
+        allowFullscreen: true,
+        skippable: false,
+        content: bid.vastXml
+      }
+    });
+  });
+}
+
+const createRenderer = (bid) => {
+  const renderer = Renderer.install({
+    targetId: bid.adUnitCode,
+    url: VIDEO_RENDERER_URL,
+    loaded: false
+  });
+
+  try {
+    renderer.setRender(outstreamRender);
+  } catch (err) {
+    utils.logWarn('Prebid Error calling setRender on renderer', err);
+  }
+
+  return renderer;
+}
+
+function buildBid(bidData) {
+  const bid = {
+    requestId: bidData.bidId,
+    cpm: bidData.price,
+    width: bidData.content.width,
+    height: bidData.content.height,
+    creativeId: bidData.content.seanceId || bidData.bidId,
+    currency: bidData.currency,
+    netRevenue: true,
+    mediaType: BANNER,
+    ttl: TTL,
+    content: bidData.content
+  };
+
+  if (bidData.placement === 'video') {
+    bid.vastXml = bidData.content;
+    bid.mediaType = VIDEO;
+
+    let adUnit = find(auctionManager.getAdUnits(), function (unit) {
+      return unit.transactionId === bidData.transactionId;
+    });
+
+    if (adUnit) {
+      bid.width = adUnit.mediaTypes.video.playerSize[0][0];
+      bid.height = adUnit.mediaTypes.video.playerSize[0][1];
+
+      if (adUnit.mediaTypes.video.context === 'outstream') {
+        bid.renderer = createRenderer(bid);
+      }
+    }
+  } else if (bidData.placement === 'inImage') {
+    bid.mediaType = BANNER;
+    bid.ad = wrapInImageBanner(bid, bidData);
+  } else {
+    bid.mediaType = BANNER;
+    bid.ad = wrapBanner(bid, bidData);
+  }
+
+  return bid;
+}
+
+function getMediaTypeFromBid(bid) {
+  return bid.mediaTypes && Object.keys(bid.mediaTypes)[0];
+}
+
+function hasVideoMandatoryParams(mediaTypes) {
+  const isHasVideoContext = !!mediaTypes.video && (mediaTypes.video.context === 'instream' || mediaTypes.video.context === 'outstream');
+
+  const isPlayerSize =
+    !!utils.deepAccess(mediaTypes, 'video.playerSize') &&
+    utils.isArray(utils.deepAccess(mediaTypes, 'video.playerSize'));
+
+  return isHasVideoContext && isPlayerSize;
+}
+
+function wrapInImageBanner(bid, bidData) {
+  return `<!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <title></title>
+        <script id="prebidrenderer"></script>
+        <style>html, body {width: 100%; height: 100%; margin: 0;}</style>
+    </head>
+    <body>
+      <div data-hyb-ssp-in-image-overlay="${bidData.content.placeId}" style="width: 100%; height: 100%;"></div>
+      <script>
+        var s = document.getElementById("prebidrenderer");
+        s.onload = function () {
+          var _html = "${encodeURIComponent(JSON.stringify(bid))}";
+          window._ao_ssp.registerInImage(JSON.parse(decodeURIComponent(_html)));
+        }
+        s.src = "https://st.hybrid.ai/prebidrenderer.js?t=" + Date.now();
+        if (parent.window.frames[window.name]) {
+            var parentDocument = window.parent.document.getElementById(parent.window.frames[window.name].name);
+            parentDocument.style.height = "100%";
+            parentDocument.style.width = "100%";
+        }
+      </script>
+    </body>
+  </html>`;
+}
+
+function wrapBanner(bid, bidData) {
+  return `<!DOCTYPE html>
+    <html lang="en">
+    <head>
+      <meta charset="UTF-8">
+      <title></title>
+      <script id="prebidrenderer"></script>
+      <style>html, body {width: 100%; height: 100%; margin: 0;}</style>
+    </head>
+    <body>
+      <div data-hyb-ssp-ad-place="${bidData.content.placeId}"></div>
+      <script>
+        var s = document.getElementById("prebidrenderer");
+        s.onload = function () {
+            var _html = "${encodeURIComponent(JSON.stringify(bid))}";
+            window._ao_ssp.registerAds(JSON.parse(decodeURIComponent(_html)));
+        }
+        s.src = "https://st.hybrid.ai/prebidrenderer.js?t=" + Date.now();
+      </script>
+    </body>
+  </html>`;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid(bid) {
+    return (
+      !!bid.params.placementId &&
+      !!bid.params.placement &&
+      (
+        (getMediaTypeFromBid(bid) === BANNER && bid.params.placement === 'banner') ||
+        (getMediaTypeFromBid(bid) === BANNER && bid.params.placement === 'inImage' && !!bid.params.imageUrl) ||
+        (getMediaTypeFromBid(bid) === VIDEO && bid.params.placement === 'video' && hasVideoMandatoryParams(bid.mediaTypes))
+      )
+    );
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests(validBidRequests, bidderRequest) {
+    const payload = {
+      url: bidderRequest.refererInfo.referer,
+      cmp: !!bidderRequest.gdprConsent,
+      bidRequests: buildBidRequests(validBidRequests)
+    };
+
+    if (payload.cmp) {
+      const gdprApplies = bidderRequest.gdprConsent.gdprApplies;
+      if (gdprApplies !== undefined) payload['ga'] = gdprApplies;
+      payload['cs'] = bidderRequest.gdprConsent.consentString;
+    }
+
+    const payloadString = JSON.stringify(payload);
+
+    return {
+      method: 'POST',
+      url: SSP_ENDPOINT,
+      data: payloadString,
+      options: {
+        contentType: 'application/json'
+      }
+    }
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function(serverResponse, bidRequest) {
+    let bidRequests = JSON.parse(bidRequest.data).bidRequests;
+    const serverBody = serverResponse.body;
+
+    if (serverBody && serverBody.bids && utils.isArray(serverBody.bids)) {
+      return utils._map(serverBody.bids, function(bid) {
+        let rawBid = find(bidRequests, function (item) {
+          return item.bidId === bid.bidId;
+        });
+        bid.placement = rawBid.placement;
+        bid.transactionId = rawBid.transactionId;
+        bid.placeId = rawBid.placeId;
+        return buildBid(bid);
+      });
+    } else {
+      return [];
+    }
+  }
+
+}
+registerBidder(spec);
diff --git a/modules/voxBidAdapter.md b/modules/voxBidAdapter.md
new file mode 100644
index 00000000000..3fc0383e6f8
--- /dev/null
+++ b/modules/voxBidAdapter.md
@@ -0,0 +1,237 @@
+# Overview
+
+
+**Module Name**: VOX Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**: prebid@hybrid.ai
+
+# Description
+
+You can use this adapter to get a bid from partners.hybrid.ai
+
+
+## Sample Banner Ad Unit
+
+```js
+var adUnits = [{
+    code: 'banner_ad_unit',
+    mediaTypes: {
+        banner: {
+            sizes: [[160, 600]]
+        }
+    },
+    bids: [{
+        bidder: "vox",
+        params: {
+            placement: "banner",                      // required
+            placementId: "5fc77bc5a757531e24c89a4c"   // required
+        }
+    }]
+}];
+```
+
+## Sample Video Ad Unit
+
+```js
+var adUnits = [{
+    code: 'video_ad_unit',
+    mediaTypes: {
+        video: {
+            context: 'outstream',      // required
+            playerSize: [[640, 480]]   // required
+        }
+    },
+    bids: [{
+        bidder: 'vox',
+        params: {
+            placement: "video",                       // required
+            placementId: "5fc77a94a757531e24c89a3d"   // required
+        }
+    }]
+}];
+```
+
+# Sample In-Image Ad Unit
+
+```js
+var adUnits = [{
+    code: 'test-div',
+    mediaTypes: {
+        banner: {
+            sizes: [0, 0]
+        }
+    },
+    bids: [{
+        bidder: "vox",
+        params: {
+            placement: "inImage",
+            placementId: "5fc77b40a757531e24c89a42",
+            imageUrl: "https://gallery.voxexchange.io/vox-main.png"
+        }
+    }]
+}];
+```
+
+# Example page with In-Image
+
+```html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>Prebid.js Banner Example</title>
+	<script async src="prebid.js"></script>
+	<style>
+        .banner-block {
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            top: 0;
+            left: 0;
+            z-index: 1;
+            border: none;
+            overflow: hidden;
+        }
+    </style>
+    <script>
+        var adUnits = [{
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [0, 0]
+                }
+            },
+            bids: [{
+                bidder: "vox",
+                params: {
+                    placement: "inImage",
+                    placementId: "5fc77b40a757531e24c89a42",
+                    imageUrl: "https://gallery.voxexchange.io/vox-main.png"
+                }
+            }]
+        }];
+
+        var pbjs = pbjs || {};
+        pbjs.que = pbjs.que || [];
+
+        pbjs.que.push(function() {
+            pbjs.addAdUnits(adUnits);
+            pbjs.requestBids({
+                bidsBackHandler: function (e) {
+                    if (pbjs.adserverRequestSent) return;
+                    pbjs.adserverRequestSent = true;
+
+                    var params = pbjs.getAdserverTargetingForAdUnitCode("test-div");
+                    var iframe = document.getElementById('test-div');
+
+                    if (params && params['hb_adid']) {
+                        iframe.parentElement.style.position = "relative";
+                        iframe.style.display = "block";
+                        pbjs.renderAd(iframe.contentDocument, params['hb_adid']);
+                    }
+                }
+            });
+        });
+    </script>
+</head>
+<body>
+	<h2>Prebid.js InImage Banner Test</h2>
+	<div style="width: 600px;">
+        <img src="https://gallery.voxexchange.io/vox-main.png" />
+        <iframe id='test-div' class="banner-block" style="display: none;"></iframe>
+    </div>
+</body>
+</html>
+```
+
+# Example page with In-Image and GPT
+
+```html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>Prebid.js Banner Example</title>
+	<script async src="prebid.js"></script>
+	<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+	<style>
+		.banner-block {
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			top: 0;
+			left: 0;
+			z-index: 1;
+			border: none;
+			overflow: hidden;
+		}
+		.banner-block div {
+			width: 100%;
+			height: 100%;
+		}
+	</style>
+	<script>
+		var pbjs = pbjs || {};
+		pbjs.que = pbjs.que || [];
+
+		var adUnits = [{
+			code: 'div-gpt-ad-1574864639578-0',
+			mediaTypes: {
+				banner: {
+					sizes: [1, 1]
+				}
+			},
+			bids: [{
+				bidder: "vox",
+				params: {
+					placement: "inImage",
+					placementId: "5fc77b40a757531e24c89a42",
+					imageUrl: "https://gallery.voxexchange.io/vox-main.png"
+				}
+			}]
+		}];
+
+		var googletag = googletag || {};
+		googletag.cmd = googletag.cmd || [];
+
+		googletag.cmd.push(() => {
+			googletag.pubads().disableInitialLoad();
+		});
+
+		pbjs.que.push(() => {
+			pbjs.addAdUnits(adUnits);
+			pbjs.requestBids({ bidsBackHandler: sendAdServerRequest });
+		});
+
+		function sendAdServerRequest() {
+			googletag.cmd.push(() => {
+				pbjs.que.push(() => {
+					pbjs.setTargetingForGPTAsync('div-gpt-ad-1574864639578-0');
+					googletag.pubads().refresh();
+				});
+			});
+		}
+
+		googletag.cmd.push(() => {
+			googletag
+				.defineSlot('/21877108735/rtb-pbjs', [1, 1], 'div-gpt-ad-1574864639578-0')
+				.addService(googletag.pubads());
+
+			googletag.pubads().enableSingleRequest();
+			googletag.enableServices();
+		});
+	</script>
+</head>
+<body>
+	<h2>Prebid.js Banner Ad Unit Test</h2>
+	<div style="width: 600px; position: relative">
+		<img src="https://gallery.voxexchange.io/vox-main.png" />
+		<div id='div-gpt-ad-1574864639578-0' class="banner-block">
+			<script>
+				googletag.cmd.push(() => { googletag.display('div-gpt-ad-1574864639578-0'); });
+			</script>
+		</div>
+	</div>
+</body>
+</html>
+```
diff --git a/test/spec/modules/voxBidAdapter_spec.js b/test/spec/modules/voxBidAdapter_spec.js
new file mode 100644
index 00000000000..c6221cba9e5
--- /dev/null
+++ b/test/spec/modules/voxBidAdapter_spec.js
@@ -0,0 +1,320 @@
+import { expect } from 'chai'
+import { spec } from 'modules/voxBidAdapter.js'
+
+function getSlotConfigs(mediaTypes, params) {
+  return {
+    params: params,
+    sizes: [],
+    bidId: '2df8c0733f284e',
+    bidder: 'vox',
+    mediaTypes: mediaTypes,
+    transactionId: '31a58515-3634-4e90-9c96-f86196db1459'
+  }
+}
+
+describe('VOX Adapter', function() {
+  const PLACE_ID = '5af45ad34d506ee7acad0c26';
+  const bidderRequest = {
+    refererInfo: { referer: 'referer' }
+  }
+  const bannerMandatoryParams = {
+    placementId: PLACE_ID,
+    placement: 'banner'
+  }
+  const videoMandatoryParams = {
+    placementId: PLACE_ID,
+    placement: 'video'
+  }
+  const inImageMandatoryParams = {
+    placementId: PLACE_ID,
+    placement: 'inImage',
+    imageUrl: 'https://hybrid.ai/images/image.jpg'
+  }
+  const validBidRequests = [
+    getSlotConfigs({ banner: {} }, bannerMandatoryParams),
+    getSlotConfigs({ video: {playerSize: [[640, 480]], context: 'outstream'} }, videoMandatoryParams),
+    getSlotConfigs({ banner: {sizes: [0, 0]} }, inImageMandatoryParams)
+  ]
+  describe('isBidRequestValid method', function() {
+    describe('returns true', function() {
+      describe('when banner slot config has all mandatory params', () => {
+        describe('and banner placement has the correct value', function() {
+          const slotConfig = getSlotConfigs(
+            {banner: {}},
+            {
+              placementId: PLACE_ID,
+              placement: 'banner'
+            }
+          )
+          const isBidRequestValid = spec.isBidRequestValid(slotConfig)
+          expect(isBidRequestValid).to.equal(true)
+        })
+        describe('and In-Image placement has the correct value', function() {
+          const slotConfig = getSlotConfigs(
+            {
+              banner: {
+                sizes: [[0, 0]]
+              }
+            },
+            {
+              placementId: PLACE_ID,
+              placement: 'inImage',
+              imageUrl: 'imageUrl'
+            }
+          )
+          const isBidRequestValid = spec.isBidRequestValid(slotConfig)
+          expect(isBidRequestValid).to.equal(true)
+        })
+        describe('when video slot has all mandatory params.', function() {
+          it('should return true, when video mediatype object are correct.', function() {
+            const slotConfig = getSlotConfigs(
+              {
+                video: {
+                  context: 'instream',
+                  playerSize: [[640, 480]]
+                }
+              },
+              {
+                placementId: PLACE_ID,
+                placement: 'video'
+              }
+            )
+            const isBidRequestValid = spec.isBidRequestValid(slotConfig)
+            expect(isBidRequestValid).to.equal(true)
+          })
+        })
+      })
+    })
+    describe('returns false', function() {
+      describe('when params are not correct', function() {
+        function createSlotconfig(params) {
+          return getSlotConfigs({ banner: {} }, params)
+        }
+        it('does not have the placementId.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createSlotconfig({
+              placement: 'banner'
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+        it('does not have the placement.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createSlotconfig({
+              placementId: PLACE_ID
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+        it('does not have the imageUrl.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createSlotconfig({
+              placementId: PLACE_ID,
+              placement: 'inImage'
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+        it('does not have a the correct placement.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createSlotconfig({
+              placementId: PLACE_ID,
+              placement: 'something'
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+      })
+      describe('when video mediaType object is not correct.', function() {
+        function createVideoSlotconfig(mediaType) {
+          return getSlotConfigs(mediaType, {
+            placementId: PLACE_ID,
+            placement: 'video'
+          })
+        }
+        it('is a void object', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createVideoSlotconfig({ video: {} })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+        it('does not have playerSize.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createVideoSlotconfig({ video: { context: 'instream' } })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+        it('does not have context', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createVideoSlotconfig({
+              video: {
+                playerSize: [[640, 480]]
+              }
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+      })
+    })
+  })
+  it('Url params should be correct ', function() {
+    const request = spec.buildRequests(validBidRequests, bidderRequest)
+    expect(request.method).to.equal('POST')
+    expect(request.url).to.equal('https://ssp.hybrid.ai/auction/prebid')
+  })
+
+  describe('buildRequests method', function() {
+    it('Common data request should be correct', function() {
+      const request = spec.buildRequests(validBidRequests, bidderRequest)
+      const data = JSON.parse(request.data)
+      expect(Array.isArray(data.bidRequests)).to.equal(true)
+      expect(data.url).to.equal('referer')
+      data.bidRequests.forEach(bid => {
+        expect(bid.bidId).to.equal('2df8c0733f284e')
+        expect(bid.placeId).to.equal(PLACE_ID)
+        expect(bid.transactionId).to.equal('31a58515-3634-4e90-9c96-f86196db1459')
+      })
+    })
+
+    describe('GDPR params', function() {
+      describe('when there are not consent management platform', function() {
+        it('cmp should be false', function() {
+          const request = spec.buildRequests(validBidRequests, bidderRequest)
+          const data = JSON.parse(request.data)
+          expect(data.cmp).to.equal(false)
+        })
+      })
+      describe('when there are consent management platform', function() {
+        it('cmps should be true and ga should not sended, when gdprApplies is undefined', function() {
+          bidderRequest['gdprConsent'] = {
+            gdprApplies: undefined,
+            consentString: 'consentString'
+          }
+          const request = spec.buildRequests(validBidRequests, bidderRequest)
+          const data = JSON.parse(request.data)
+          expect(data.cmp).to.equal(true)
+          expect(Object.keys(data).indexOf('data')).to.equal(-1)
+          expect(data.cs).to.equal('consentString')
+        })
+        it('cmps should be true and all gdpr parameters should be sended, when there are gdprApplies', function() {
+          bidderRequest['gdprConsent'] = {
+            gdprApplies: true,
+            consentString: 'consentString'
+          }
+          const request = spec.buildRequests(validBidRequests, bidderRequest)
+          const data = JSON.parse(request.data)
+          expect(data.cmp).to.equal(true)
+          expect(data.ga).to.equal(true)
+          expect(data.cs).to.equal('consentString')
+        })
+      })
+    })
+  })
+
+  describe('interpret response method', function() {
+    it('should return a void array, when the server response are not correct.', function() {
+      const request = { data: JSON.stringify({}) }
+      const serverResponse = {
+        body: {}
+      }
+      const bids = spec.interpretResponse(serverResponse, request)
+      expect(typeof bids).to.equal('object')
+      expect(bids.length).to.equal(0)
+    })
+    it('should return a void array, when the server response have not got bids.', function() {
+      const request = { data: JSON.stringify({}) }
+      const serverResponse = { body: { bids: [] } }
+      const bids = spec.interpretResponse(serverResponse, request)
+      expect(typeof bids).to.equal('object')
+      expect(bids.length).to.equal(0)
+    })
+    describe('when the server response return a bid', function() {
+      describe('the bid is a banner', function() {
+        it('should return a banner bid', function() {
+          const request = spec.buildRequests([validBidRequests[0]], bidderRequest)
+          const serverResponse = {
+            body: {
+              bids: [
+                {
+                  bidId: '2df8c0733f284e',
+                  price: 0.5,
+                  currency: 'USD',
+                  content: {
+                    content: 'html',
+                    width: 100,
+                    height: 100
+                  }
+                }
+              ]
+            }
+          }
+          const bids = spec.interpretResponse(serverResponse, request)
+          expect(bids.length).to.equal(1)
+          expect(bids[0].requestId).to.equal('2df8c0733f284e')
+          expect(bids[0].mediaType).to.equal(spec.supportedMediaTypes[0])
+          expect(bids[0].cpm).to.equal(0.5)
+          expect(bids[0].width).to.equal(100)
+          expect(bids[0].height).to.equal(100)
+          expect(bids[0].currency).to.equal('USD')
+          expect(bids[0].netRevenue).to.equal(true)
+          expect(typeof bids[0].ad).to.equal('string')
+        })
+        it('should return a In-Image bid', function() {
+          const request = spec.buildRequests([validBidRequests[2]], bidderRequest)
+          const serverResponse = {
+            body: {
+              bids: [
+                {
+                  bidId: '2df8c0733f284e',
+                  price: 0.5,
+                  currency: 'USD',
+                  content: {
+                    content: 'html',
+                    width: 100,
+                    height: 100
+                  },
+                  ttl: 360
+                }
+              ]
+            }
+          }
+          const bids = spec.interpretResponse(serverResponse, request)
+          expect(bids.length).to.equal(1)
+          expect(bids[0].requestId).to.equal('2df8c0733f284e')
+          expect(bids[0].cpm).to.equal(0.5)
+          expect(bids[0].width).to.equal(100)
+          expect(bids[0].height).to.equal(100)
+          expect(bids[0].currency).to.equal('USD')
+          expect(bids[0].netRevenue).to.equal(true)
+          expect(typeof bids[0].ad).to.equal('string')
+        })
+      })
+      describe('the bid is a video', function() {
+        it('should return a video bid', function() {
+          const request = spec.buildRequests([validBidRequests[1]], bidderRequest)
+          const serverResponse = {
+            body: {
+              bids: [
+                {
+                  bidId: '2df8c0733f284e',
+                  price: 0.5,
+                  currency: 'USD',
+                  content: 'html',
+                  transactionId: '31a58515-3634-4e90-9c96-f86196db1459'
+                }
+              ]
+            }
+          }
+          const bids = spec.interpretResponse(serverResponse, request)
+          expect(bids.length).to.equal(1)
+          expect(bids[0].requestId).to.equal('2df8c0733f284e')
+          expect(bids[0].mediaType).to.equal(spec.supportedMediaTypes[1])
+          expect(bids[0].cpm).to.equal(0.5)
+          expect(bids[0].currency).to.equal('USD')
+          expect(bids[0].netRevenue).to.equal(true)
+          expect(typeof bids[0].vastXml).to.equal('string')
+        })
+      })
+    })
+  })
+})

From 5dd60a1078ebe39602ce5722e32fb3fd3a3f9d13 Mon Sep 17 00:00:00 2001
From: reemeng <29702905+reemeng@users.noreply.github.com>
Date: Mon, 21 Dec 2020 10:12:30 +0200
Subject: [PATCH 112/304] added Engageya bid adapter (#6109)

* added Engageya bid adapter

* moved test function from adapter to spec

* remove function import

* PAGE_URL should be String
---
 modules/engageyaBidAdapter.js                | 133 +++++++++++++++
 modules/engageyaBidAdapter.md                |  68 ++++++++
 test/spec/modules/engageyaBidAdapter_spec.js | 161 +++++++++++++++++++
 3 files changed, 362 insertions(+)
 create mode 100644 modules/engageyaBidAdapter.js
 create mode 100644 modules/engageyaBidAdapter.md
 create mode 100644 test/spec/modules/engageyaBidAdapter_spec.js

diff --git a/modules/engageyaBidAdapter.js b/modules/engageyaBidAdapter.js
new file mode 100644
index 00000000000..321b3287c2b
--- /dev/null
+++ b/modules/engageyaBidAdapter.js
@@ -0,0 +1,133 @@
+import {
+  BANNER,
+  NATIVE
+} from '../src/mediaTypes.js';
+
+const {
+  registerBidder
+} = require('../src/adapters/bidderFactory.js');
+const BIDDER_CODE = 'engageya';
+const ENDPOINT_URL = 'https://recs.engageya.com/rec-api/getrecs.json';
+const ENDPOINT_METHOD = 'GET';
+
+function getPageUrl() {
+  var pUrl = window.location.href;
+  if (isInIframe()) {
+    pUrl = document.referrer ? document.referrer : pUrl;
+  }
+  pUrl = encodeURIComponent(pUrl);
+  return pUrl;
+}
+
+function isInIframe() {
+  try {
+    var isInIframe = (window.self !== window.top);
+  } catch (e) {
+    isInIframe = true;
+  }
+  return isInIframe;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, NATIVE],
+  isBidRequestValid: function(bid) {
+    return bid && bid.params && bid.params.hasOwnProperty('widgetId') && bid.params.hasOwnProperty('websiteId') && !isNaN(bid.params.widgetId) && !isNaN(bid.params.websiteId);
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    var bidRequests = [];
+    if (validBidRequests && validBidRequests.length > 0) {
+      validBidRequests.forEach(function(bidRequest) {
+        if (bidRequest.params) {
+          var mediaType = bidRequest.hasOwnProperty('nativeParams') ? 1 : 2;
+          var imageWidth = -1;
+          var imageHeight = -1;
+          if (bidRequest.sizes && bidRequest.sizes.length > 0) {
+            imageWidth = bidRequest.sizes[0][0];
+            imageHeight = bidRequest.sizes[0][1];
+          } else if (bidRequest.nativeParams && bidRequest.nativeParams.image && bidRequest.nativeParams.image.sizes) {
+            imageWidth = bidRequest.nativeParams.image.sizes[0];
+            imageHeight = bidRequest.nativeParams.image.sizes[1];
+          }
+
+          var widgetId = bidRequest.params.widgetId;
+          var websiteId = bidRequest.params.websiteId;
+          var pageUrl = (bidRequest.params.pageUrl && bidRequest.params.pageUrl != '[PAGE_URL]') ? bidRequest.params.pageUrl : '';
+          if (!pageUrl) {
+            pageUrl = (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer) ? bidderRequest.refererInfo.referer : getPageUrl();
+          }
+          var bidId = bidRequest.bidId;
+          var finalUrl = ENDPOINT_URL + '?pubid=0&webid=' + websiteId + '&wid=' + widgetId + '&url=' + pageUrl + '&ireqid=' + bidId + '&pbtpid=' + mediaType + '&imw=' + imageWidth + '&imh=' + imageHeight;
+          if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprApplies && bidderRequest.consentString) {
+            finalUrl += '&is_gdpr=1&gdpr_consent=' + bidderRequest.consentString;
+          }
+          bidRequests.push({
+            url: finalUrl,
+            method: ENDPOINT_METHOD,
+            data: ''
+          });
+        }
+      });
+    }
+
+    return bidRequests;
+  },
+
+  interpretResponse: function(serverResponse, bidRequest) {
+    const bidResponses = [];
+    if (serverResponse.body && serverResponse.body.recs && serverResponse.body.recs.length > 0) {
+      var response = serverResponse.body;
+      var isNative = response.pbtypeId == 1;
+      response.recs.forEach(function(rec) {
+        var imageSrc = rec.thumbnail_path.indexOf('http') == -1 ? 'https:' + rec.thumbnail_path : rec.thumbnail_path;
+        if (isNative) {
+          bidResponses.push({
+            requestId: response.ireqId,
+            cpm: rec.ecpm,
+            width: response.imageWidth,
+            height: response.imageHeight,
+            creativeId: rec.postId,
+            currency: 'USD',
+            netRevenue: false,
+            ttl: 360,
+            native: {
+              title: rec.title,
+              body: '',
+              image: {
+                url: imageSrc,
+                width: response.imageWidth,
+                height: response.imageHeight
+              },
+              privacyLink: '',
+              clickUrl: rec.clickUrl,
+              displayUrl: rec.url,
+              cta: '',
+              sponsoredBy: rec.displayName,
+              impressionTrackers: [],
+            },
+          });
+        } else {
+          // var htmlTag = "<img src='https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png' style='position: absolute; left: 50%; top:50%; margin-left: -113px; margin-top:-79px;'>";
+          var htmlTag = '<html><div id="ENG_TAG"><a href="' + rec.clickUrl + '" target=_blank><img src="' + imageSrc + '" style="width:' + response.imageWidth + 'px;height:' + response.imageHeight + 'px;"/></a></div></html>';
+          var tag = rec.tag ? rec.tag : htmlTag;
+          bidResponses.push({
+            requestId: response.ireqId,
+            cpm: rec.ecpm,
+            width: response.imageWidth,
+            height: response.imageHeight,
+            creativeId: rec.postId,
+            currency: 'USD',
+            netRevenue: false,
+            ttl: 360,
+            ad: tag,
+          });
+        }
+      });
+    }
+
+    return bidResponses;
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/engageyaBidAdapter.md b/modules/engageyaBidAdapter.md
new file mode 100644
index 00000000000..541ba548eeb
--- /dev/null
+++ b/modules/engageyaBidAdapter.md
@@ -0,0 +1,68 @@
+# Overview
+
+```
+Module Name: Engageya's Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: reem@engageya.com
+```
+
+# Description
+
+Module that connects to Engageya's demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],  // a display size
+                }
+            },
+            bids: [
+                {
+                    bidder: "engageya",
+                    params: {
+						widgetId: '<put here widget id>',
+						websiteId: '<put here website id>',
+						pageUrl:'[PAGE_URL]'
+					}
+                }
+            ]
+        },{
+            code: 'test-div',
+            mediaTypes: {
+                native: {
+					image: {
+						required: true,
+						sizes: [236, 202]
+					},
+					title: {
+						required: true,
+						len: 80
+					},
+					sponsoredBy: {
+						required: true
+					},
+					clickUrl: {
+						required: true
+					},
+					body: {
+						required: true
+					}
+				}
+            },
+            bids: [
+                {
+                    bidder: "engageya",
+                    params: {
+                        widgetId: '<put here widget id>',
+						websiteId: '<put here website id>',
+						pageUrl:'[PAGE_URL]'
+                    }
+                }
+            ]
+        }
+    ];
+```
\ No newline at end of file
diff --git a/test/spec/modules/engageyaBidAdapter_spec.js b/test/spec/modules/engageyaBidAdapter_spec.js
new file mode 100644
index 00000000000..ad411fc9350
--- /dev/null
+++ b/test/spec/modules/engageyaBidAdapter_spec.js
@@ -0,0 +1,161 @@
+import {expect} from 'chai';
+import {spec} from 'modules/engageyaBidAdapter.js';
+import * as utils from 'src/utils.js';
+
+const ENDPOINT_URL = 'https://recs.engageya.com/rec-api/getrecs.json';
+
+export const _getUrlVars = function(url) {
+  var hash;
+  var myJson = {};
+  var hashes = url.slice(url.indexOf('?') + 1).split('&');
+  for (var i = 0; i < hashes.length; i++) {
+    hash = hashes[i].split('=');
+    myJson[hash[0]] = hash[1];
+  }
+  return myJson;
+}
+
+describe('engageya adapter', function() {
+  let bidRequests;
+  let nativeBidRequests;
+
+  beforeEach(function() {
+    bidRequests = [
+      {
+        bidder: 'engageya',
+        params: {
+          widgetId: 85610,
+          websiteId: 91140,
+          pageUrl: '[PAGE_URL]'
+        }
+      }
+    ]
+
+    nativeBidRequests = [
+      {
+        bidder: 'engageya',
+        params: {
+          widgetId: 85610,
+          websiteId: 91140,
+          pageUrl: '[PAGE_URL]'
+        },
+        nativeParams: {
+          title: {
+            required: true,
+            len: 80
+          },
+          image: {
+            required: true,
+            sizes: [150, 50]
+          },
+          sponsoredBy: {
+            required: true
+          }
+        }
+      }
+    ]
+  })
+  describe('isBidRequestValid', function () {
+    it('valid bid case', function () {
+      let validBid = {
+        bidder: 'engageya',
+        params: {
+          widgetId: 85610,
+          websiteId: 91140,
+          pageUrl: '[PAGE_URL]'
+        }
+      }
+      let isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(true);
+    });
+
+    it('invalid bid case: widgetId and websiteId is not passed', function() {
+      let validBid = {
+        bidder: 'engageya',
+        params: {
+        }
+      }
+      let isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(false);
+    })
+
+    it('invalid bid case: widget id must be number', function() {
+      let invalidBid = {
+        bidder: 'engageya',
+        params: {
+          widgetId: '157746a',
+          websiteId: 91140,
+          pageUrl: '[PAGE_URL]'
+        }
+      }
+      let isValid = spec.isBidRequestValid(invalidBid);
+      expect(isValid).to.equal(false);
+    })
+  })
+
+  describe('buildRequests', function () {
+    it('sends bid request to ENDPOINT via GET', function () {
+      const request = spec.buildRequests(bidRequests)[0];
+      expect(request.url).to.include(ENDPOINT_URL);
+      expect(request.method).to.equal('GET');
+    });
+
+    it('buildRequests function should not modify original bidRequests object', function () {
+      let originalBidRequests = utils.deepClone(bidRequests);
+      let request = spec.buildRequests(bidRequests);
+      expect(bidRequests).to.deep.equal(originalBidRequests);
+    });
+
+    it('buildRequests function should not modify original nativeBidRequests object', function () {
+      let originalBidRequests = utils.deepClone(nativeBidRequests);
+      let request = spec.buildRequests(nativeBidRequests);
+      expect(nativeBidRequests).to.deep.equal(originalBidRequests);
+    });
+
+    it('Request params check', function() {
+      let request = spec.buildRequests(bidRequests)[0];
+      const data = _getUrlVars(request.url)
+      expect(parseInt(data.wid)).to.exist.and.to.equal(bidRequests[0].params.widgetId);
+      expect(parseInt(data.webid)).to.exist.and.to.equal(bidRequests[0].params.websiteId);
+    })
+  })
+
+  describe('interpretResponse', function () {
+    let response = {recs: [
+      {
+        'ecpm': 0.0920,
+        'postId': '<!-- CREATIVE ID -->',
+        'ad': '<!-- ADS TAG -->',
+        'thumbnail_path': 'https://engageya.live/wp-content/uploads/2019/05/images.png'
+      }
+    ],
+    imageWidth: 300,
+    imageHeight: 250,
+    ireqId: '1d236f7890b',
+    pbtypeId: 2};
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {
+          'requestId': '1d236f7890b',
+          'cpm': 0.0920,
+          'width': 300,
+          'height': 250,
+          'netRevenue': false,
+          'currency': 'USD',
+          'creativeId': '<!-- CREATIVE ID -->',
+          'ttl': 700,
+          'ad': '<!-- ADS TAG -->'
+        }
+      ];
+      let request = spec.buildRequests(bidRequests)[0];
+      let result = spec.interpretResponse({body: response}, request);
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      expect(result[0].cpm).to.not.equal(null);
+      expect(result[0].creativeId).to.not.equal(null);
+      expect(result[0].ad).to.not.equal(null);
+      expect(result[0].currency).to.equal('USD');
+      expect(result[0].netRevenue).to.equal(false);
+    });
+  })
+})

From d68f2e0c43df4429ea81fc0d8675b0ddf8fddec7 Mon Sep 17 00:00:00 2001
From: TheMediaGrid <44166371+TheMediaGrid@users.noreply.github.com>
Date: Mon, 21 Dec 2020 12:54:18 +0300
Subject: [PATCH 113/304] Fix userIds format for TheMediaGrid Bid Adapter
 (#6142)

* Added TheMediaGridNM Bid Adapter

* Updated required params for TheMediaGridNM Bid Adapter

* Update TheMediGridNM Bid Adapter

* Fix tests for TheMediaGridNM Bid Adapter

* Fixes after review for TheMediaGridNM Bid Adapter

* Add support of multi-format in TheMediaGrid Bid Adapter

* Update sync url for grid and gridNM Bid Adapters

* TheMediaGrid Bid Adapter: added keywords adUnit parameter

* Update TheMediaGrid Bid Adapter to support keywords from config

* Implement new request format for TheMediaGrid Bid Adapter

* Fix jwpseg params for TheMediaGrid Bid Adapter

* Update unit tests for The Media Grid Bid Adapter

* Fix typo in TheMediaGrid Bid Adapter

* Added test for jwTargeting in TheMediaGrid Bid Adapter

* The new request format was made by default in TheMediaGrid Bid Adapter

* Update userId format in ad request for TheMediaGrid Bid Adapter

* Added bidFloor parameter for TheMediaGrid Bid Adapter

* Fix for review TheMediaGrid Bid Adapter

* Support floorModule in TheMediaGrid Bid Adapter

* Fix empty bidfloor for TheMediaGrid Bid Adapter

* Some change to restart autotests

* Fix userIds format for TheMediaGrid Bid Adapter

* Remove digitrust userId from TheMediaGrid Bid Adapter
---
 modules/gridBidAdapter.js                | 67 +++-----------------
 test/spec/modules/gridBidAdapter_spec.js | 78 +++++++-----------------
 2 files changed, 30 insertions(+), 115 deletions(-)

diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js
index 3f9d4fba31d..6e610b67e0e 100644
--- a/modules/gridBidAdapter.js
+++ b/modules/gridBidAdapter.js
@@ -51,6 +51,7 @@ export const spec = {
     let content = null;
     let schain = null;
     let userId = null;
+    let userIdAsEids = null;
     let user = null;
     let userExt = null;
     let {bidderRequestId, auctionId, gdprConsent, uspConsent, timeout, refererInfo} = bidderRequest || {};
@@ -72,6 +73,9 @@ export const spec = {
       if (!userId) {
         userId = bid.userId;
       }
+      if (!userIdAsEids) {
+        userIdAsEids = bid.userIdAsEids;
+      }
       const {params: {uid, keywords}, mediaTypes, bidId, adUnitCode, rtd} = bid;
       bidsMap[bidId] = bid;
       if (!pageKeywords && !utils.isEmpty(keywords)) {
@@ -161,66 +165,9 @@ export const spec = {
       userExt = {consent: gdprConsent.consentString};
     }
 
-    if (userId) {
-      if (userId.tdid) {
-        userExt = userExt || {};
-        userExt.eids = userExt.eids || [];
-        userExt.eids.push({
-          source: 'adserver.org', // Unified ID
-          uids: [{
-            id: userId.tdid,
-            ext: {
-              rtiPartner: 'TDID'
-            }
-          }]
-        });
-      }
-      if (userId.id5id && userId.id5id.uid) {
-        userExt = userExt || {};
-        userExt.eids = userExt.eids || [];
-        userExt.eids.push({
-          source: 'id5-sync.com',
-          uids: [{
-            id: userId.id5id.uid
-          }],
-          ext: userId.id5id.ext
-        });
-      }
-      if (userId.lipb && userId.lipb.lipbid) {
-        userExt = userExt || {};
-        userExt.eids = userExt.eids || [];
-        userExt.eids.push({
-          source: 'liveintent.com',
-          uids: [{
-            id: userId.lipb.lipbid
-          }]
-        });
-      }
-      if (userId.idl_env) {
-        userExt = userExt || {};
-        userExt.eids = userExt.eids || [];
-        userExt.eids.push({
-          source: 'identityLink',
-          uids: [{
-            id: userId.idl_env
-          }]
-        });
-      }
-      if (userId.criteoId) {
-        userExt = userExt || {};
-        userExt.eids = userExt.eids || [];
-        userExt.eids.push({
-          source: 'criteo.com',
-          uids: [{
-            id: userId.criteoId
-          }]
-        });
-      }
-
-      if (userId.digitrustid && userId.digitrustid.data && userId.digitrustid.data.id) {
-        userExt = userExt || {};
-        userExt.digitrust = Object.assign({}, userId.digitrustid.data);
-      }
+    if (userIdAsEids && userIdAsEids.length) {
+      userExt = userExt || {};
+      userExt.eids = [...userIdAsEids];
     }
 
     if (userExt && Object.keys(userExt).length) {
diff --git a/test/spec/modules/gridBidAdapter_spec.js b/test/spec/modules/gridBidAdapter_spec.js
index e884df40c5e..084c67562e6 100644
--- a/test/spec/modules/gridBidAdapter_spec.js
+++ b/test/spec/modules/gridBidAdapter_spec.js
@@ -311,68 +311,36 @@ describe('TheMediaGrid Adapter', function () {
     });
 
     it('if userId is present payload must have user.ext param with right keys', function () {
-      const bidRequestsWithUserIds = bidRequests.map((bid) => {
-        return Object.assign({
-          userId: {
-            id5id: { uid: 'id5id_1', ext: { linkType: 2 } },
-            tdid: 'tdid_1',
-            digitrustid: {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
-            lipb: {lipbid: 'lipb_1'},
-            idl_env: 'idl_env_1',
-            criteoId: 'criteoId_1'
-          }
-        }, bid);
-      });
-      const request = spec.buildRequests(bidRequestsWithUserIds, bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('user');
-      expect(payload.user).to.have.property('ext');
-      expect(payload.user.ext.digitrust).to.deep.equal({
-        id: 'DTID',
-        keyv: 4,
-        privacy: {
-          optout: false
+      const eids = [
+        {
+          source: 'pubcid.org',
+          uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+          }]
         },
-        producer: 'ABC',
-        version: 2
-      });
-      expect(payload.user.ext.eids).to.deep.equal([
         {
           source: 'adserver.org',
           uids: [{
-            id: 'tdid_1',
+            id: 'some-random-id-value',
+            atype: 1,
             ext: {
               rtiPartner: 'TDID'
             }
           }]
-        },
-        {
-          source: 'id5-sync.com',
-          uids: [{
-            id: 'id5id_1'
-          }],
-          ext: { linkType: 2 }
-        },
-        {
-          source: 'liveintent.com',
-          uids: [{
-            id: 'lipb_1'
-          }]
-        },
-        {
-          source: 'identityLink',
-          uids: [{
-            id: 'idl_env_1'
-          }]
-        },
-        {
-          source: 'criteo.com',
-          uids: [{
-            id: 'criteoId_1'
-          }]
         }
-      ]);
+      ];
+      const bidRequestsWithUserIds = bidRequests.map((bid) => {
+        return Object.assign({
+          userIdAsEids: eids
+        }, bid);
+      });
+      const request = spec.buildRequests(bidRequestsWithUserIds, bidderRequest);
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.have.property('user');
+      expect(payload.user).to.have.property('ext');
+      expect(payload.user.ext.eids).to.deep.equal(eids);
     });
 
     it('if schain is present payload must have source.ext.schain param', function () {
@@ -403,7 +371,7 @@ describe('TheMediaGrid Adapter', function () {
     it('if content and segment is present in jwTargeting, payload must have right params', function () {
       const jsContent = {id: 'test_jw_content_id'};
       const jsSegments = ['test_seg_1', 'test_seg_2'];
-      const bidRequestsWithUserIds = bidRequests.map((bid) => {
+      const bidRequestsWithJwTargeting = bidRequests.map((bid) => {
         return Object.assign({
           rtd: {
             jwplayer: {
@@ -415,7 +383,7 @@ describe('TheMediaGrid Adapter', function () {
           }
         }, bid);
       });
-      const request = spec.buildRequests(bidRequestsWithUserIds, bidderRequest);
+      const request = spec.buildRequests(bidRequestsWithJwTargeting, bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('user');

From 3e73c11e1285aa40588c21e616602f853e4a4dab Mon Sep 17 00:00:00 2001
From: Newton <5769156+iamnewton@users.noreply.github.com>
Date: Mon, 21 Dec 2020 02:00:15 -0800
Subject: [PATCH 114/304] ID Library feat: turn off fullscan by default (#6140)

* chore: lint HTML example page

* chore: add space to logging statement for clarity

* chore: update package lock

* feat: turn off fullscan by default

* chore: format the HTML for readibility

* chore: fix test

* Revert "chore: update package lock"

This reverts commit 4faf19489677de3c278b625535f4ba01877ccacb.
---
 integrationExamples/gpt/userId_example.html | 589 ++++++++++----------
 modules/idLibrary.js                        |   4 +-
 modules/idLibrary.md                        |  38 +-
 test/spec/modules/idLibrary_spec.js         |   6 +-
 4 files changed, 318 insertions(+), 319 deletions(-)

diff --git a/integrationExamples/gpt/userId_example.html b/integrationExamples/gpt/userId_example.html
index 7375293fdf0..e6f9255326a 100644
--- a/integrationExamples/gpt/userId_example.html
+++ b/integrationExamples/gpt/userId_example.html
@@ -1,334 +1,335 @@
+<!DOCTYPE html>
 <html>
-<head>
-    <script>
-        (function(window, document) {
-            if (!window.__cmp) {
-                window.__cmp = (function() {
-                    var listen = window.attachEvent || window.addEventListener;
-                    listen('message', function(event) {
-                        window.__cmp.receiveMessage(event);
-                    }, false);
+    <head>
+        <title>User ID Library Example</title>
+        <script>
+            (function(window, document) {
+                if (!window.__cmp) {
+                    window.__cmp = (function() {
+                        var listen = window.attachEvent || window.addEventListener;
+                        listen('message', function(event) {
+                            window.__cmp.receiveMessage(event);
+                        }, false);
 
-                    function addLocatorFrame() {
-                        if (!window.frames['__cmpLocator']) {
-                            if (document.body) {
-                                var frame = document.createElement('iframe');
-                                frame.style.display = 'none';
-                                frame.name = '__cmpLocator';
-                                document.body.appendChild(frame);
-                            } else {
-                                setTimeout(addLocatorFrame, 5);
+                        function addLocatorFrame() {
+                            if (!window.frames['__cmpLocator']) {
+                                if (document.body) {
+                                    var frame = document.createElement('iframe');
+                                    frame.style.display = 'none';
+                                    frame.name = '__cmpLocator';
+                                    document.body.appendChild(frame);
+                                } else {
+                                    setTimeout(addLocatorFrame, 5);
+                                }
                             }
                         }
-                    }
-                    addLocatorFrame();
+                        addLocatorFrame();
 
-                    var commandQueue = [];
-                    var cmp = function(command, parameter, callback) {
-                        if (command === 'ping') {
-                            if (callback) {
-                                callback({
-                                    gdprAppliesGlobally: !!(window.__cmp && window.__cmp.config && window.__cmp.config.storeConsentGlobally),
-                                    cmpLoaded: false
+                        var commandQueue = [];
+                        var cmp = function(command, parameter, callback) {
+                            if (command === 'ping') {
+                                if (callback) {
+                                    callback({
+                                        gdprAppliesGlobally: !!(window.__cmp && window.__cmp.config && window.__cmp.config.storeConsentGlobally),
+                                        cmpLoaded: false
+                                    });
+                                }
+                            } else {
+                                commandQueue.push({
+                                    command: command,
+                                    parameter: parameter,
+                                    callback: callback
+                                });
+                            }
+                        };
+                        cmp.commandQueue = commandQueue;
+                        cmp.receiveMessage = function(event) {
+                            var data = event && event.data && event.data.__cmpCall;
+                            if (data) {
+                                commandQueue.push({
+                                    callId: data.callId,
+                                    command: data.command,
+                                    parameter: data.parameter,
+                                    event: event
                                 });
                             }
-                        } else {
-                            commandQueue.push({
-                                command: command,
-                                parameter: parameter,
-                                callback: callback
-                            });
+                        };
+                        cmp.config = {
+                            //
+                            // Modify config values here
+                            //
+                            // globalVendorListLocation: 'https://vendorlist.consensu.org/vendorlist.json',
+                            // customPurposeListLocation: './purposes.json',
+                            // globalConsentLocation: './portal.html',
+                            // storeConsentGlobally: false,
+                            // storePublisherData: false,
+                            logging: 'debug'//,
+                            // localization: {},
+                            // forceLocale: 'en-us'
+                        };
+                        return cmp;
+                    }());
+                    var t = document.createElement('script');
+                    t.async = false;
+                    t.src = 'http://acdn.adnxs.com/cmp/cmp.bundle.js';
+                    var tag = document.getElementsByTagName('head')[0];
+                    tag.appendChild(t);
+                }
+            })(window, document);
+            // window.__cmp('showConsentTool');
+        </script>
+
+        <script>
+            var FAILSAFE_TIMEOUT = 2000;
+
+            var adUnits = [
+                {
+                    code: 'test-div',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [[300,250],[300,600],[728,90]]
                         }
-                    };
-                    cmp.commandQueue = commandQueue;
-                    cmp.receiveMessage = function(event) {
-                        var data = event && event.data && event.data.__cmpCall;
-                        if (data) {
-                            commandQueue.push({
-                                callId: data.callId,
-                                command: data.command,
-                                parameter: data.parameter,
-                                event: event
-                            });
+                    },
+                    bids: [
+                        {
+                            bidder: 'rubicon',
+                            params: {
+                                accountId: '1001',
+                                siteId: '113932',
+                                zoneId: '535510'
+                            }
                         }
-                    };
-                    cmp.config = {
-                        //
-                        // Modify config values here
-                        //
-                        // globalVendorListLocation: 'https://vendorlist.consensu.org/vendorlist.json',
-                        // customPurposeListLocation: './purposes.json',
-                        // globalConsentLocation: './portal.html',
-                        // storeConsentGlobally: false,
-                        // storePublisherData: false,
-                        logging: 'debug'//,
-                        // localization: {},
-                        // forceLocale: 'en-us'
-                    };
-                    return cmp;
-                }());
-                var t = document.createElement('script');
-                t.async = false;
-                t.src = 'http://acdn.adnxs.com/cmp/cmp.bundle.js';
-                var tag = document.getElementsByTagName('head')[0];
-                tag.appendChild(t);
-            }
-        })(window, document);
-        // window.__cmp('showConsentTool');
-    </script>
+                    ]
+                }
+            ];
 
-    <script>
-        var FAILSAFE_TIMEOUT = 2000;
+            var pbjs = pbjs || {};
+            pbjs.que = pbjs.que || [];
+        </script>
+        <script src="../../build/dev/prebid.js" async></script>
 
-        var adUnits = [
-            {
-                code: 'test-div',
-                mediaTypes: {
-                    banner: {
-                        sizes: [[300,250],[300,600],[728,90]]
-                    }
-                },
-                bids: [
-                    {
-                        bidder: 'rubicon',
-                        params: {
-                            accountId: '1001',
-                            siteId: '113932',
-                            zoneId: '535510'
-                        }
-                    }
-                ]
-            }
-        ];
+        <script>
+            var googletag = googletag || {};
+            googletag.cmd = googletag.cmd || [];
+            googletag.cmd.push(function() {
+                googletag.pubads().disableInitialLoad();
+            });
 
-        var pbjs = pbjs || {};
-        pbjs.que = pbjs.que || [];
-    </script>
-    <script src="../../build/dev/prebid.js" async></script>
+            pbjs.que.push(function() {
+                pbjs.setConfig({
+                    debug: true,
+                    consentManagement: {
+                        cmpApi: 'iab',
+                        timeout: 1000,
+                        defaultGdprScope: true
+                    },
+                    // consentManagement: {
+                    //     cmpApi: 'static',
+                    //     consentData: {
+                    //         consentString: 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA'
+                    //         vendorData: {
+                    //             purposeConsents: {
+                    //                 '1': true
+                    //             }
+                    //         }
+                    //     }
+                    // },
+                    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",
+                                url: "http://match.adsrvr.org/track/rid?ttd_pid=prebid&fmt=json"
+                            },
+                            storage: {
+                                type: "html5",
+                                name: "unifiedid",
+                                expires: 30
+                            },
+                        },{
+                            name: "intentIqId",
+                            params: {
+                                partner: 0, //Set your real IntentIQ partner ID here for production.
+                            },
+                            storage: {
+                                type: "cookie",
+                                name: "intentIqId",
+                                expires: 30
+                            },
+                        },
+                        {
+                            name: "id5Id",
+                            params: {
+                                partner: 173 //Set your real ID5 partner ID here for production, please ask for one at http://id5.io/prebid
+                            },
+                            storage: {
+                                type: "cookie",
+                                name: "id5id",
+                                expires: 90,
+                                refreshInSeconds: 8*3600 // Refresh frequency of cookies, defaulting to 'expires'
+                            },
 
-    <script>
-        var googletag = googletag || {};
-        googletag.cmd = googletag.cmd || [];
-        googletag.cmd.push(function() {
-            googletag.pubads().disableInitialLoad();
-        });
+                        }, {
+                            name: "merkleId",
+                            params: {
+                                ptk: '12345678-aaaa-bbbb-cccc-123456789abc', //Set your real merkle partner key here
+                                pubid: 'EXAMPLE' //Set your real merkle publisher id here
+                            },
+                            storage: {
+                                type: "html5",
+                                name: "merkleId",
+                                expires: 30
+                            },
 
-        pbjs.que.push(function() {
-            pbjs.setConfig({
-                debug: true,
-                consentManagement: {
-                    cmpApi: 'iab',
-                    timeout: 1000,
-                    defaultGdprScope: true
-                },
-                // consentManagement: {
-                //     cmpApi: 'static',
-                //     consentData: {
-                //         consentString: 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA'
-                //         vendorData: {
-                //             purposeConsents: {
-                //                 '1': true
-                //             }
-                //         }
-                //     }
-                // },
-                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",
+                        },{
+                            name: "parrableId",
+                            params: {
+                                // change to Parrable Partner Client ID(s) you received from the Parrable Partners you are using
+                                partner: '30182847-e426-4ff9-b2b5-9ca1324ea09b'
+                            }
+                        }, {
+                            name: "pubCommonId",
+                            storage: {
+                                type: "cookie",
+                                name: "pubcid",
+                                expires: 365
+                            },
+                            // value: {
+                            //     foo: '9879878907987',
+                            //     bar:'93939'
+                            // }
+                        },  {
+                        name: 'identityLink',
                         params: {
-                            partner: "prebid",
-                            url: "http://match.adsrvr.org/track/rid?ttd_pid=prebid&fmt=json"
+                            pid: '14' // Set your real identityLink placement ID here
                         },
                         storage: {
-                            type: "html5",
-                            name: "unifiedid",
+                            type: 'cookie',
+                            name: 'idl_env',
                             expires: 30
+                        }
                         },
-                    },{
-                        name: "intentIqId",
+                        {
+                        name: "sharedId",
                         params: {
-                            partner: 0, //Set your real IntentIQ partner ID here for production.
+                            syncTime: 60 // in seconds, default is 24 hours
                         },
                         storage: {
                             type: "cookie",
-                            name: "intentIqId",
-                            expires: 30
+                            name: "sharedid",
+                            expires: 28
+                        }
                         },
-                    },
-                     {
-                        name: "id5Id",
+                        {
+                        name: 'lotamePanoramaId'
+                        },
+                        {
+                        name: "liveIntentId",
                         params: {
-                            partner: 173 //Set your real ID5 partner ID here for production, please ask for one at http://id5.io/prebid
+                            publisherId: "9896876"
                         },
                         storage: {
                             type: "cookie",
-                            name: "id5id",
-                            expires: 90,
-                            refreshInSeconds: 8*3600 // Refresh frequency of cookies, defaulting to 'expires'
+                            name: "_li_pbid",
+                            expires: 28
+                        }
                         },
-
-                    }, {
-                        name: "merkleId",
-                        params: {
-                            ptk: '12345678-aaaa-bbbb-cccc-123456789abc', //Set your real merkle partner key here
-                            pubid: 'EXAMPLE' //Set your real merkle publisher id here
+                        {
+                            name: "zeotapIdPlus"
                         },
-                        storage: {
-                            type: "html5",
-                            name: "merkleId",
-                            expires: 30
+                        {
+                            name: 'haloId',
+                            storage: {
+                                type: "cookie",
+                                name: "haloId",
+                                expires: 28
+                            }
                         },
-
-                    },{
-                        name: "parrableId",
-                        params: {
-                            // change to Parrable Partner Client ID(s) you received from the Parrable Partners you are using
-                            partner: '30182847-e426-4ff9-b2b5-9ca1324ea09b'
-                        }
-                    }, {
-                        name: "pubCommonId",
-                        storage: {
-                            type: "cookie",
-                            name: "pubcid",
-                            expires: 365
+                        {
+                            name: "quantcastId"
                         },
-                        // value: {
-                        //     foo: '9879878907987',
-                        //     bar:'93939'
-                        // }
-                    },  {
-                      name: 'identityLink',
-                      params: {
-                        pid: '14' // Set your real identityLink placement ID here
-                      },
-                      storage: {
-                        type: 'cookie',
-                        name: 'idl_env',
-                        expires: 30
-                      }
-                    },
-                    {
-                      name: "sharedId",
-                      params: {
-                        syncTime: 60 // in seconds, default is 24 hours
-                      },
-                      storage: {
-                        type: "cookie",
-                        name: "sharedid",
-                        expires: 28
-                      }
-                    },
-                    {
-                      name: 'lotamePanoramaId'
-                    },
-                    {
-                      name: "liveIntentId",
-                      params: {
-                        publisherId: "9896876"
-                      },
-                      storage: {
-                        type: "cookie",
-                        name: "_li_pbid",
-                        expires: 28
-                      }
-                    },
-                    {
-                        name: "zeotapIdPlus"
-                    },
-                    {
-                        name: 'haloId',
-                        storage: {
-                            type: "cookie",
-                            name: "haloId",
-                            expires: 28
-                        }
-                    },
-                    {
-                        name: "quantcastId"
-                    },
-                    {
-                        name: "criteo"
-                    },
-                    ],
-                    syncDelay: 5000,
-                    auctionDelay: 1000
-                }
-            });
-            pbjs.addAdUnits(adUnits);
-            pbjs.requestBids({
-                bidsBackHandler: sendAdserverRequest
-            });
-        });
-
-        function sendAdserverRequest() {
-            if (pbjs.adserverRequestSent) return;
-            pbjs.adserverRequestSent = true;
-            googletag.cmd.push(function() {
-                pbjs.que.push(function() {
-                    pbjs.setTargetingForGPTAsync();
-                    googletag.pubads().refresh();
+                        {
+                            name: "criteo"
+                        },
+                        ],
+                        syncDelay: 5000,
+                        auctionDelay: 1000
+                    }
+                });
+                pbjs.addAdUnits(adUnits);
+                pbjs.requestBids({
+                    bidsBackHandler: sendAdserverRequest
                 });
             });
-        }
 
-        setTimeout(function() {
-            sendAdserverRequest();
-        }, FAILSAFE_TIMEOUT);
-    </script>
+            function sendAdserverRequest() {
+                if (pbjs.adserverRequestSent) return;
+                pbjs.adserverRequestSent = true;
+                googletag.cmd.push(function() {
+                    pbjs.que.push(function() {
+                        pbjs.setTargetingForGPTAsync();
+                        googletag.pubads().refresh();
+                    });
+                });
+            }
 
-    <script>
-        (function () {
-            var gads = document.createElement('script');
-            gads.async = true;
-            gads.type = 'text/javascript';
-            var useSSL = 'https:' == document.location.protocol;
-            gads.src = (useSSL ? 'https:' : 'http:') +
-                '//www.googletagservices.com/tag/js/gpt.js';
-            var node = document.getElementsByTagName('script')[0];
-            node.parentNode.insertBefore(gads, node);
-        })();
-    </script>
+            setTimeout(function() {
+                sendAdserverRequest();
+            }, FAILSAFE_TIMEOUT);
+        </script>
 
-    <script>
-        googletag.cmd.push(function() {
-            googletag.defineSlot('/112115922/FL_PB_MedRect', [[300, 250],[300,600]], 'test-div').addService(googletag.pubads());
-            googletag.pubads().enableSingleRequest();
-            googletag.enableServices();
-        });
-    </script>
-</head>
+        <script>
+            (function () {
+                var gads = document.createElement('script');
+                gads.async = true;
+                gads.type = 'text/javascript';
+                var useSSL = 'https:' == document.location.protocol;
+                gads.src = (useSSL ? 'https:' : 'http:') +
+                    '//www.googletagservices.com/tag/js/gpt.js';
+                var node = document.getElementsByTagName('script')[0];
+                node.parentNode.insertBefore(gads, node);
+            })();
+        </script>
 
-<body>
-<h2>Rubicon Project Prebid</h2>
+        <script>
+            googletag.cmd.push(function() {
+                googletag.defineSlot('/112115922/FL_PB_MedRect', [[300, 250],[300,600]], 'test-div').addService(googletag.pubads());
+                googletag.pubads().enableSingleRequest();
+                googletag.enableServices();
+            });
+        </script>
+    </head>
 
-<div id='test-div'>
-    <script>
-        googletag.cmd.push(function() { googletag.display('test-div'); });
-    </script>
-</div>
-</body>
+    <body>
+        <h2>Rubicon Project Prebid</h2>
+        <div id="test-div">
+            <script>
+                googletag.cmd.push(function() { googletag.display('test-div'); });
+            </script>
+        </div>
+    </body>
 </html>
diff --git a/modules/idLibrary.js b/modules/idLibrary.js
index ba3cc0b5efb..988f3417b30 100644
--- a/modules/idLibrary.js
+++ b/modules/idLibrary.js
@@ -8,7 +8,7 @@ let email;
 let conf;
 const LOG_PRE_FIX = 'ID-Library: ';
 const CONF_DEFAULT_OBSERVER_DEBOUNCE_MS = 250;
-const CONF_DEFAULT_FULL_BODY_SCAN = true;
+const CONF_DEFAULT_FULL_BODY_SCAN = false;
 const OBSERVER_CONFIG = {
   subtree: true,
   attributes: true,
@@ -38,7 +38,7 @@ function getEmail(value) {
   if (!matched) {
     return null;
   }
-  logInfo('Email found' + matched[0]);
+  logInfo('Email found: ' + matched[0]);
   return matched[0];
 }
 
diff --git a/modules/idLibrary.md b/modules/idLibrary.md
index 69b63dc466b..28d40c389f3 100644
--- a/modules/idLibrary.md
+++ b/modules/idLibrary.md
@@ -1,24 +1,22 @@
-## ID Library Configuration Example 
+# ID Library
 
+## Configuration Options
 
-|Param            |Required                         |Description                         |
-|----------------|-------------------------------|-----------------------------|
-|url |Yes           | The url endpoint is used to post the hashed email and user ids.           |
-|target          |No            |It should contain the element id from which the email can be read.      |
-|debounce          |No            | Time in milliseconds before the email and ids are fetched           |
-|fullscan          |No            | Option to enable/disable full body scan to get email. By default the full body scan is enabled.           |
+| Parameter  | Required | Type    | Default | Description |
+| :--------- | :------- | :------ | :------ | :---------- |
+| `target`   | Yes      | String  | N/A     | ID attribute of the element from which the email can be read. |
+| `url`      | Yes      | String  | N/A     | URL endpoint used to post the hashed email and user IDs. |
+| `debounce` | No       | Number  | 250     | Time in milliseconds before the email and IDs are fetched. |
+| `fullscan` | No       | Boolean | false   | Enable/disable a full page body scan to get email. |
 
-### Example
-```
- pbjs.setConfig({
-                idLibrary:{
-                    url: <url>,
-                    debounce: 250,
-                    target: 'username',
-                    fullscan: false
-               },
-            });
-```    
+## Example
 
-
-```   
+```javascript
+pbjs.setConfig({
+    idLibrary: {
+        target: 'username',
+        url: 'https://example.com',
+        debounce: 250,
+        fullscan: false,
+    },
+});
diff --git a/test/spec/modules/idLibrary_spec.js b/test/spec/modules/idLibrary_spec.js
index da61850f29b..682c2df1e44 100644
--- a/test/spec/modules/idLibrary_spec.js
+++ b/test/spec/modules/idLibrary_spec.js
@@ -50,12 +50,12 @@ describe('currency', function () {
     it('results with config default fullscan ', function () {
       let config = { 'url': 'URL' }
       idlibrary.setConfig(config);
-      expect(config.fullscan).to.be.equal(true);
+      expect(config.fullscan).to.be.equal(false);
     });
     it('results with config fullscan ', function () {
-      let config = { 'url': 'URL', 'fullscan': false }
+      let config = { 'url': 'URL', 'fullscan': true }
       idlibrary.setConfig(config);
-      expect(config.fullscan).to.be.equal(false);
+      expect(config.fullscan).to.be.equal(true);
     });
   });
 });

From 2f055063ccca4d08c2cb5e8fe13abadd8346ba4c Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Mon, 21 Dec 2020 11:01:50 +0100
Subject: [PATCH 115/304] update release process for notes on release drafter
 checks (#6137)

* update release process for notes on release drafter checks

* update section titles
---
 RELEASE_SCHEDULE.md | 83 ++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 42 deletions(-)

diff --git a/RELEASE_SCHEDULE.md b/RELEASE_SCHEDULE.md
index 7b2c6244bd7..bfbd0772c3e 100644
--- a/RELEASE_SCHEDULE.md
+++ b/RELEASE_SCHEDULE.md
@@ -1,6 +1,14 @@
 **Table of Contents**
 - [Release Schedule](#release-schedule)
 - [Release Process](#release-process)
+  - [1. Make sure that all PRs have been named and labeled properly per the PR Process](#1-make-sure-that-all-prs-have-been-named-and-labeled-properly-per-the-pr-process)
+  - [2. Make sure all browserstack tests are passing](#2-make-sure-all-browserstack-tests-are-passing)
+  - [3. Prepare Prebid Code](#3-prepare-prebid-code)
+  - [4. Verify the Release](#4-verify-the-release)
+  - [5. Create a GitHub release](#5-create-a-github-release)
+  - [6. Update coveralls _(skip for legacy)_](#6-update-coveralls-skip-for-legacy)
+  - [7. Distribute the code](#7-distribute-the-code)
+  - [8. Increment Version for Next Release](#8-increment-version-for-next-release)
 - [Beta Releases](#beta-releases)
 - [FAQs](#faqs)
 
@@ -9,7 +17,7 @@
 We aim to push a new release of Prebid.js every week on Tuesday.
 
 While the releases will be available immediately for those using direct Git access,
-it will be about a week before the Prebid Org [Download Page](http://prebid.org/download.html) will be updated.  
+it will be about a week before the Prebid Org [Download Page](http://prebid.org/download.html) will be updated.
 
 You can determine what is in a given build using the [releases page](https://github.com/prebid/Prebid.js/releases)
 
@@ -19,14 +27,20 @@ Announcements regarding releases will be made to the #headerbidding-dev channel
 
 _Note: If `github.com/prebid/Prebid.js` is not configured as the git origin for your repo, all of the following git commands will have to be modified to reference the proper remote (e.g. `upstream`)_
 
-1. Make Sure all browserstack tests are passing. On PR merge to master CircleCI will run unit tests on browserstack. Checking the last CircleCI build [here](https://circleci.com/gh/prebid/Prebid.js) for master branch will show you detailed results. 
-  
-   In case of failure do following, 
+### 1. Make sure that all PRs have been named and labeled properly per the [PR Process](https://github.com/prebid/Prebid.js/blob/master/PR_REVIEW.md#general-pr-review-process)
+   * Do this by checking the latest draft release from the [releases page](https://github.com/prebid/Prebid.js/releases) and make sure nothing appears in the first section called "In This Release". If they do, please open the PRs and add the appropriate labels.
+   * Do a quick check that all the titles/descriptions look ok, and if not, adjust the PR title.
+
+### 2. Make sure all browserstack tests are passing
+
+   On PR merge to master, CircleCI will run unit tests on browserstack. Checking the last CircleCI build [here](https://circleci.com/gh/prebid/Prebid.js) for master branch will show you detailed results.**
+
+   In case of failure do following,
      - Try to fix the failing tests.
      - If you are not able to fix tests in time. Skip the test, create issue and tag contributor.
 
-   #### How to run tests in browserstack
-   
+   **How to run tests in browserstack**
+
    _Note: the following browserstack information is only relevant for debugging purposes, if you will not be debugging then it can be skipped._
 
    Set the environment variables. You may want to add these to your `~/.bashrc` for convenience.
@@ -35,40 +49,40 @@ _Note: If `github.com/prebid/Prebid.js` is not configured as the git origin for
    export BROWSERSTACK_USERNAME="my browserstack username"
    export BROWSERSTACK_ACCESS_KEY="my browserstack access key"
    ```
-   
+
    ```
    gulp test --browserstack >> prebid_test.log
-   
+
    vim prebid_test.log // Will show the test results
    ```
 
 
-2. Prepare Prebid Code
+### 3. Prepare Prebid Code
 
    Update the package.json version to become the current release. Then commit your changes.
 
    ```
-   git commit -m "Prebid 1.x.x Release"
+   git commit -m "Prebid 4.x.x Release"
    git push
    ```
 
-3. Verify Release
+### 4. Verify the Release
 
    Make sure your there are no more merges to master branch. Prebid code is clean and up to date.
 
-4. Create a GitHub release
+### 5. Create a GitHub release
+
+   Edit the most recent [release notes](https://github.com/prebid/Prebid.js/releases) draft and make sure the correct version is set and the master branch is selected in the dropdown. Click `Publish release`. GitHub will create release tag.
 
-   Edit the most recent [release notes](https://github.com/prebid/Prebid.js/releases) draft and make sure the correct tag is in the dropdown. Click `Publish`. GitHub will create release tag. 
-   
-   Pull these changes locally by running command 
+   Pull these changes locally by running command
    ```
    git pull
    git fetch --tags
-   ``` 
-   
+   ```
+
    and verify the tag.
 
-5. Update coveralls _(skip for legacy)_
+### 6. Update coveralls _(skip for legacy)_
 
    We use https://coveralls.io/ to show parts of code covered by unit tests.
 
@@ -80,35 +94,23 @@ _Note: If `github.com/prebid/Prebid.js` is not configured as the git origin for
 
    Run `gulp coveralls` to update code coverage history.
 
-6. Distribute the code 
+### 7. Distribute the code
 
-   _Note: do not go to step 7 until step 6 has been verified completed._
+   _Note: do not go to step 8 until step 7 has been verified completed._
 
    Reach out to any of the Appnexus folks to trigger the jenkins job.
 
-   // TODO 
+   // TODO:
    Jenkins job is moving files to appnexus cdn, pushing prebid.js to npm, purging cache and sending notification to slack.
    Move all the files from Appnexus CDN to jsDelivr and create bash script to do above tasks.
 
-7. Post Release Version
-   
-   Update the version
-   Manually edit Prebid's package.json to become "1.x.x-pre" (using the values for the next release). Then commit your changes.
+### 8. Increment Version for Next Release
+
+   Update the version by manually editing Prebid's `package.json` to become "4.x.x-pre" (using the values for the next release). Then commit your changes.
    ```
    git commit -m "Increment pre version"
    git push
    ```
-   
-8. Create new release draft
-
-   Go to [github releases](https://github.com/prebid/Prebid.js/releases) and add a new draft for the next version of Prebid.js with the following template:
-```
-## 🚀New Features
- 
-## 🛠Maintenance
- 
-## 🐛Bug Fixes
-```
 
 ## Beta Releases
 
@@ -129,11 +131,8 @@ Characteristics of a `GA` release:
 ## FAQs
 
 **1. Is there flexibility in the schedule?**
-
-If a major bug is found in the current release, a maintenance patch will be done as soon as possible.
-
-It is unlikely that we will put out a maintenance patch at the request of a given bid adapter or module owner.
+* If a major bug is found in the current release, a maintenance patch will be done as soon as possible.
+* It is unlikely that we will put out a maintenance patch at the request of a given bid adapter or module owner.
 
 **2. What Pull Requests make it into a release?**
-
-Every PR that's merged into master will be part of a release. Here are the [PR review guidelines](https://github.com/prebid/Prebid.js/blob/master/PR_REVIEW.md).
+* Every PR that's merged into master will be part of a release. Here are the [PR review guidelines](https://github.com/prebid/Prebid.js/blob/master/PR_REVIEW.md).

From 5d2ccb2fdd52c7bffa1b75b01afcd2af94036da6 Mon Sep 17 00:00:00 2001
From: wojciech-bialy-wpm
 <67895844+wojciech-bialy-wpm@users.noreply.github.com>
Date: Mon, 21 Dec 2020 22:56:52 +0100
Subject: [PATCH 116/304] Sspbc Bid Adapter: multiple updates (#6118)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add sspbc adapter

* tests for sspbc adapter

* sspBC adapter v4.5: set correct creativeId, add adomain to bid.meta, set test mode in adexchange, read site SN from bid response

* sspBC adapter v4.5: set meta.advertiserDomains, update test to expect bid.meta

* sspBC Adapter: add ajax tests (test ad with & without gdpr)

* sspBC Adapter: remove ajax tests

* Update adapter to v4.6

Update adapter to v4.6
- add notification endpoint
- send bidWon and onTimeout notifications
- send CMP version to user sync endpoint

* Remove console logs for notification events

* Change payload data in onTimeout event

* Update tests for sspBC adapter

Update tests for sspBC adapter:
- add onBidWon test
- add onTimeout test
- alter getUserSyncs test

* Update sspBC adapter to v4.7; enable oneCodeId mode; change module name to ensure combatibility with prebid.org downloader

* sspBc adapter: Bug fixes in v4.7 - change notification format, fix oneCode detection data, convert slot number to int

Co-authored-by: Wojciech Biały <wb@WojciechBialy.local>
---
 .../{sspBCAdapter.js => sspBCBidAdapter.js}   | 140 +++++++++++-------
 .../{sspBCAdapter.md => sspBCBidAdapter.md}   |  16 +-
 ...dapter_spec.js => sspBCBidAdapter_spec.js} | 109 ++++++++++++--
 3 files changed, 188 insertions(+), 77 deletions(-)
 rename modules/{sspBCAdapter.js => sspBCBidAdapter.js} (72%)
 rename modules/{sspBCAdapter.md => sspBCBidAdapter.md} (68%)
 rename test/spec/modules/{sspBCAdapter_spec.js => sspBCBidAdapter_spec.js} (78%)

diff --git a/modules/sspBCAdapter.js b/modules/sspBCBidAdapter.js
similarity index 72%
rename from modules/sspBCAdapter.js
rename to modules/sspBCBidAdapter.js
index 4069c722e9d..1f250992fee 100644
--- a/modules/sspBCAdapter.js
+++ b/modules/sspBCBidAdapter.js
@@ -8,11 +8,58 @@ const BIDDER_URL = 'https://ssp.wp.pl/bidder/';
 const SYNC_URL = 'https://ssp.wp.pl/bidder/usersync';
 const NOTIFY_URL = 'https://ssp.wp.pl/bidder/notify';
 const TMAX = 450;
-const BIDDER_VERSION = '4.6';
+const BIDDER_VERSION = '4.7';
 const W = window;
 const { navigator } = W;
+const oneCodeDetection = {};
 var consentApiVersion;
 
+/**
+ * Get bid parameters for notification
+ * @param {*} bidData - bid (bidWon), or array of bids (timeout)
+ */
+const getNotificationPayload = bidData => {
+  if (bidData) {
+    const bids = utils.isArray(bidData) ? bidData : [bidData];
+    if (bids.length > 0) {
+      const result = {
+        requestId: undefined,
+        siteId: [],
+        adUnit: [],
+        slotId: [],
+      }
+      bids.forEach(bid => {
+        let params = utils.isArray(bid.params) ? bid.params[0] : bid.params;
+        params = params || {};
+
+        // check for stored detection
+        if (oneCodeDetection[bid.requestId]) {
+          params.siteId = oneCodeDetection[bid.requestId][0];
+          params.id = oneCodeDetection[bid.requestId][1];
+        }
+
+        if (params.siteId) {
+          result.siteId.push(params.siteId);
+        }
+        if (params.id) {
+          result.slotId.push(params.id);
+        }
+        if (bid.cpm) {
+          const meta = bid.meta || {};
+          result.cpm = bid.cpm;
+          result.creativeId = bid.creativeId;
+          result.adomain = meta.advertiserDomains && meta.advertiserDomains[0];
+          result.networkName = meta.networkName;
+        }
+        result.adUnit.push(bid.adUnitCode)
+        result.requestId = bid.auctionId || result.requestId;
+        result.timeout = bid.timeout || result.timeout;
+      })
+      return result;
+    }
+  }
+}
+
 const cookieSupport = () => {
   const isSafari = /^((?!chrome|android|crios|fxios).)*safari/i.test(navigator.userAgent);
   const useCookies = navigator.cookieEnabled || !!document.cookie.length;
@@ -104,13 +151,13 @@ function mapBanner(slot) {
 
 function mapImpression(slot) {
   const imp = {
-    id: slot.params.id,
+    id: (slot.params && slot.params.id) ? slot.params.id : 'bidid-' + slot.bidId,
     banner: mapBanner(slot),
     /* native: mapNative(slot), */
-    tagid: slot.params.id,
+    tagid: slot.adUnitCode,
   };
 
-  const bidfloor = parseFloat(slot.params.bidfloor);
+  const bidfloor = (slot.params && slot.params.bidFloor) ? parseFloat(slot.params.bidFloor) : undefined;
 
   if (bidfloor) {
     imp.bidfloor = bidfloor;
@@ -170,6 +217,7 @@ function renderCreative(site, auctionId, bid, seat, request) {
 </style>
   <script>
   window.rekid = ${site.id};
+  window.slot = ${parseInt(site.slot, 10)};
   window.wp_sn = "${site.sn}";
   window.mcad = JSON.parse(decodeURI(atob("${mcbase}")));
   window.gdpr = ${JSON.stringify(request.gdprConsent)};
@@ -197,11 +245,8 @@ const spec = {
   aliases: [],
   supportedMediaTypes: [BANNER],
   isBidRequestValid(bid) {
-    if (bid.params && bid.params.siteId && bid.params.id) {
-      return true;
-    }
-
-    return false;
+    // as per OneCode integration, bids without params are valid
+    return true;
   },
   buildRequests(validBidRequests, bidderRequest) {
     if ((!validBidRequests) || (validBidRequests.length < 1)) {
@@ -246,7 +291,7 @@ const spec = {
   interpretResponse(serverResponse, request) {
     const response = serverResponse.body;
     const bids = [];
-    let site = JSON.parse(request.data).site; // get page and referer data from request
+    const site = JSON.parse(request.data).site; // get page and referer data from request
     site.sn = response.sn || 'mc_adapter'; // WPM site name (wp_sn)
     let seat;
 
@@ -254,34 +299,31 @@ const spec = {
       response.seatbid.forEach(seatbid => {
         seat = seatbid.seat;
         seatbid.bid.forEach(serverBid => {
-          const bidRequest = request.bidderRequest.bids.filter(b => b.params.id === serverBid.impid)[0];
-
-          if (bidRequest) {
-            const bidFloor = bidRequest.params.bidFloor || 0;
-            const bidCpm = bidRequest.params.flatCpm;
-
-            if (!serverBid.gam && bidRequest.params.gam) {
-              // build GAM config
-              serverBid.gam = JSON.stringify({
-                placement: bidRequest.params.gam,
-                multiplier: 1,
-                floor: bidRequest.params.gamFloor,
-                ceil: 100,
-                namedSizes: ['fluid'],
-                div: 'div-gpt-ad-x01',
-                targeting: {
-                  OAS_retarg: '0',
-                  PREBID_ON: '1',
-                  DFPHASH: '',
-                  emptygaf: '0',
-                },
-              });
-            }
+          const bidRequest = request.bidderRequest.bids.filter(b => {
+            const bidId = b.params ? b.params.id : 'bidid-' + b.bidId;
+            return bidId === serverBid.impid;
+          })[0];
+          site.slot = bidRequest && bidRequest.params ? bidRequest.params.slotid : undefined;
+
+          if (serverBid.ext) {
+            /*
+              bid response might include ext object containing siteId / slotId, as detected by OneCode
+              update site / slot data in this case
+            */
+            site.id = serverBid.ext.siteid || site.id;
+            site.slot = serverBid.ext.slotid || site.slot;
+          }
+
+          if (bidRequest && site.id && !site.id.includes('bidid')) {
+            // store site data for future notification
+            oneCodeDetection[bidRequest.bidId] = [site.id, site.slot];
+
+            const bidFloor = (bidRequest.params && bidRequest.params.bidFloor) ? bidRequest.params.bidFloor : 0;
 
             const bid = {
               requestId: bidRequest.bidId,
               creativeId: serverBid.crid || 'mcad_' + request.bidderRequest.auctionId + '_' + request.bidderRequest.params.id,
-              cpm: bidCpm || serverBid.price,
+              cpm: serverBid.price,
               currency: response.cur,
               ttl: serverBid.exp || 300,
               width: serverBid.w,
@@ -304,7 +346,7 @@ const spec = {
               }
             }
           } else {
-            utils.logWarn('Discarding response - no matching request', serverBid.impid);
+            utils.logWarn('Discarding response - no matching request / site id', serverBid.impid);
           }
         });
       });
@@ -323,34 +365,18 @@ const spec = {
   },
 
   onTimeout(timeoutData) {
-    var adSlots = [];
-    const bid = timeoutData && timeoutData[0];
-    if (bid) {
-      timeoutData.forEach(bid => { adSlots.push(bid.params[0] && bid.params[0].id) })
-      const payload = {
-        event: 'timeout',
-        requestId: bid.auctionId,
-        siteId: bid.params ? [bid.params[0].siteId] : [],
-        slotId: adSlots,
-        timeout: bid.timeout,
-      }
+    const payload = getNotificationPayload(timeoutData);
+    if (payload) {
+      payload.event = 'timeout';
       sendNotification(payload);
       return payload;
     }
   },
 
   onBidWon(bid) {
-    if (bid && bid.auctionId) {
-      const payload = {
-        event: 'bidWon',
-        requestId: bid.auctionId,
-        siteId: bid.params ? [bid.params[0].siteId] : [],
-        slotId: bid.params ? [bid.params[0].id] : [],
-        cpm: bid.cpm,
-        creativeId: bid.creativeId,
-        adomain: (bid.meta && bid.meta.advertiserDomains) ? bid.meta.advertiserDomains[0] : '',
-        networkName: (bid.meta && bid.meta.networkName) ? bid.meta.networkName : '',
-      }
+    const payload = getNotificationPayload(bid);
+    if (payload) {
+      payload.event = 'bidWon';
       sendNotification(payload);
       return payload;
     }
diff --git a/modules/sspBCAdapter.md b/modules/sspBCBidAdapter.md
similarity index 68%
rename from modules/sspBCAdapter.md
rename to modules/sspBCBidAdapter.md
index 645f41fcdc1..67a2ba1c7ba 100644
--- a/modules/sspBCAdapter.md
+++ b/modules/sspBCBidAdapter.md
@@ -10,9 +10,16 @@ Module that connects to Wirtualna Polska Media header bidding endpoint to fetch
 Only banner format is supported.
 Supported currencies: USD, EUR, PLN
 
-
 Required parameters:
+- none
 
+Optional parameters:
+- site id 
+- adslot id
+- domain
+- page
+- tmax
+- bidFloor
 
 # Test Parameters
 ```
@@ -28,11 +35,12 @@ var adUnits = [
       bids: [{
          bidder: 'sspBC',
          params: {
-            id: '006',                          // required
-            siteId: '235911',                   // required
+            id: '006',                          // optional
+            siteId: '235911',                   // optional
             domain: 'somesite.pl',              // optional
             page: 'somesite.pl/somepage.html',  // optional
-            tmax: 250                           // optional
+            tmax: 250,                          // optional
+            bidFloor: 0.1                       // optional
          }
        }]
    }
diff --git a/test/spec/modules/sspBCAdapter_spec.js b/test/spec/modules/sspBCBidAdapter_spec.js
similarity index 78%
rename from test/spec/modules/sspBCAdapter_spec.js
rename to test/spec/modules/sspBCBidAdapter_spec.js
index 29718deb031..efbfa37f6ca 100644
--- a/test/spec/modules/sspBCAdapter_spec.js
+++ b/test/spec/modules/sspBCBidAdapter_spec.js
@@ -1,8 +1,6 @@
 import { assert, expect } from 'chai';
-import { spec } from 'modules/sspBCAdapter.js';
+import { spec } from 'modules/sspBCBidAdapter.js';
 import * as utils from 'src/utils.js';
-import * as sinon from 'sinon';
-import * as ajax from 'src/ajax.js';
 
 const BIDDER_CODE = 'sspBC';
 const BIDDER_URL = 'https://ssp.wp.pl/bidder/';
@@ -66,6 +64,28 @@ describe('SSPBC adapter', function () {
       transactionId,
     }
     ];
+    const bid_OneCode = {
+      adUnitCode: 'test_wideboard',
+      bidder: BIDDER_CODE,
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [728, 90],
+            [750, 100],
+            [750, 200]
+          ]
+        }
+      },
+      sizes: [
+        [728, 90],
+        [750, 100],
+        [750, 200]
+      ],
+      auctionId,
+      bidderRequestId,
+      bidId: auctionId + '1',
+      transactionId,
+    };
     const bids_timeouted = [{
       adUnitCode: 'test_wideboard',
       bidder: BIDDER_CODE,
@@ -144,6 +164,18 @@ describe('SSPBC adapter', function () {
         stack: ['https://test.site.pl/'],
       }
     };
+    const bidRequestOneCode = {
+      auctionId,
+      bidderCode: BIDDER_CODE,
+      bidderRequestId,
+      bids: [bid_OneCode],
+      gdprConsent,
+      refererInfo: {
+        reachedTop: true,
+        referer: 'https://test.site.pl/',
+        stack: ['https://test.site.pl/'],
+      }
+    };
     const bidRequestTest = {
       auctionId,
       bidderCode: BIDDER_CODE,
@@ -174,6 +206,8 @@ describe('SSPBC adapter', function () {
           'bid': [{
             'id': '3347324c-6889-46d2-a800-ae78a5214c06',
             'impid': '003',
+            'siteid': '8816',
+            'slotid': '003',
             'price': 1,
             'adid': 'lxHWkB7OnZeso3QiN1N4',
             'nurl': '',
@@ -190,6 +224,8 @@ describe('SSPBC adapter', function () {
           'bid': [{
             'id': '2d766853-ea07-4529-8299-5f0ebadc546a',
             'impid': '005',
+            'siteid': '8816',
+            'slotid': '005',
             'price': 2,
             'adm': 'AD CODE 2',
             'cid': '57744',
@@ -210,6 +246,8 @@ describe('SSPBC adapter', function () {
           'bid': [{
             'id': '3347324c-6889-46d2-a800-ae78a5214c06',
             'impid': '003',
+            'siteid': '8816',
+            'slotid': '003',
             'price': 1,
             'adid': 'lxHWkB7OnZeso3QiN1N4',
             'nurl': '',
@@ -226,20 +264,50 @@ describe('SSPBC adapter', function () {
         'cur': 'PLN'
       }
     };
+    const serverResponseOneCode = {
+      'body': {
+        'id': auctionId,
+        'seatbid': [{
+          'bid': [{
+            'id': '3347324c-6889-46d2-a800-ae78a5214c06',
+            'impid': 'bidid-' + auctionId + '1',
+            'price': 1,
+            'adid': 'lxHWkB7OnZeso3QiN1N4',
+            'nurl': '',
+            'adm': 'AD CODE 1',
+            'adomain': ['adomain.pl'],
+            'cid': 'BZ4gAg21T5nNtxlUCDSW',
+            'crid': 'lxHWkB7OnZeso3QiN1N4',
+            'w': 728,
+            'h': 90,
+            'ext': {
+              'siteid': '8816',
+              'slotid': '003',
+            },
+          }],
+          'seat': 'dsp1',
+          'group': 0
+        }],
+        'cur': 'PLN'
+      }
+    };
     const emptyResponse = {
       'body': {
         'id': auctionId,
       }
     }
     return {
+      bid_OneCode,
       bids,
       bids_test,
       bids_timeouted,
       bidRequest,
+      bidRequestOneCode,
       bidRequestSingle,
       bidRequestTest,
       bidRequestTestNoGDPR,
       serverResponse,
+      serverResponseOneCode,
       serverResponseSingle,
       emptyResponse
     };
@@ -257,13 +325,10 @@ describe('SSPBC adapter', function () {
     const { bids } = prepareTestData();
     let bid = bids[0];
 
-    it('should return true when required params found', function () {
+    it('should always return true whether bid has params (standard) or not (OneCode)', function () {
       assert(spec.isBidRequestValid(bid));
-    });
-
-    it('should return false when required params are missing', function () {
       bid.params.id = undefined;
-      assert.isFalse(spec.isBidRequestValid(bid));
+      assert(spec.isBidRequestValid(bid));
     });
   });
 
@@ -308,9 +373,10 @@ describe('SSPBC adapter', function () {
   });
 
   describe('interpretResponse', function () {
-    const { bids, emptyResponse, serverResponse, serverResponseSingle, bidRequest, bidRequestSingle } = prepareTestData();
+    const { bid_OneCode, bids, emptyResponse, serverResponse, serverResponseOneCode, serverResponseSingle, bidRequest, bidRequestOneCode, bidRequestSingle } = prepareTestData();
     const request = spec.buildRequests(bids, bidRequest);
     const requestSingle = spec.buildRequests([bids[0]], bidRequestSingle);
+    const requestOneCode = spec.buildRequests([bid_OneCode], bidRequestOneCode);
 
     it('should handle nobid responses', function () {
       let result = spec.interpretResponse(emptyResponse, request);
@@ -326,6 +392,19 @@ describe('SSPBC adapter', function () {
       expect(resultSingle[0]).to.have.keys('ad', 'cpm', 'width', 'height', 'bidderCode', 'mediaType', 'meta', 'requestId', 'creativeId', 'currency', 'netRevenue', 'ttl');
     });
 
+    it('should create bid from OneCode (parameter-less) request, if response contains siteId', function () {
+      let resultOneCode = spec.interpretResponse(serverResponseOneCode, requestOneCode);
+
+      expect(resultOneCode.length).to.equal(1);
+      expect(resultOneCode[0]).to.have.keys('ad', 'cpm', 'width', 'height', 'bidderCode', 'mediaType', 'meta', 'requestId', 'creativeId', 'currency', 'netRevenue', 'ttl');
+    });
+
+    it('should not create bid from OneCode (parameter-less) request, if response does not contain siteId', function () {
+      let resultOneCodeNoMatch = spec.interpretResponse(serverResponse, requestOneCode);
+
+      expect(resultOneCodeNoMatch.length).to.equal(0);
+    });
+
     it('should handle a partial response', function () {
       let resultPartial = spec.interpretResponse(serverResponseSingle, request);
       expect(resultPartial.length).to.equal(1);
@@ -364,16 +443,16 @@ describe('SSPBC adapter', function () {
       expect(notificationPayload).to.be.undefined;
     });
 
-    it('should generate notification with event name and request/site/slot data, if correct bid is provided', function () {
+    it('should generate notification with event name and request/adUnit data, if correct bid is provided. Should also contain site/slot data as arrays.', function () {
       const { bids } = prepareTestData();
       let bid = bids[0];
-      bid.params = [bid.params];
 
       let notificationPayload = spec.onBidWon(bid);
       expect(notificationPayload).to.have.property('event').that.equals('bidWon');
       expect(notificationPayload).to.have.property('requestId').that.equals(bid.auctionId);
-      expect(notificationPayload).to.have.property('siteId').that.deep.equals([bid.params[0].siteId]);
-      expect(notificationPayload).to.have.property('slotId').that.deep.equals([bid.params[0].id]);
+      expect(notificationPayload).to.have.property('adUnit').that.deep.equals([bid.adUnitCode]);
+      expect(notificationPayload).to.have.property('siteId').that.is.an('array');
+      expect(notificationPayload).to.have.property('slotId').that.is.an('array');
     });
   });
 
@@ -388,13 +467,11 @@ describe('SSPBC adapter', function () {
 
     it('should generate single notification for any number of timeouted bids', function () {
       const { bids_timeouted } = prepareTestData();
-
       let notificationPayload = spec.onTimeout(bids_timeouted);
 
       expect(notificationPayload).to.have.property('event').that.equals('timeout');
       expect(notificationPayload).to.have.property('requestId').that.equals(bids_timeouted[0].auctionId);
-      expect(notificationPayload).to.have.property('siteId').that.deep.equals([bids_timeouted[0].params[0].siteId]);
-      expect(notificationPayload).to.have.property('slotId').that.deep.equals([bids_timeouted[0].params[0].id, bids_timeouted[1].params[0].id]);
+      expect(notificationPayload).to.have.property('adUnit').that.deep.equals([bids_timeouted[0].adUnitCode, bids_timeouted[1].adUnitCode]);
     });
   });
 });

From 4bfd475163a09466d04d217410c67302a376e695 Mon Sep 17 00:00:00 2001
From: Adam Browning <19834421+adam-browning@users.noreply.github.com>
Date: Tue, 22 Dec 2020 15:29:58 +0200
Subject: [PATCH 117/304] oneVideo Adapter - Content Object support
 (SAPR-15477) (#6110)

* updated object,str,num validations using pbjs utils

* validation if statements for content object

* validation if statements for content object

* updated contetn object validations using utils

* refractoring clean if statement

* fixing typos

* added todos

* added category string & data object validations

* fixed esling ENDPOINT issue

* updated content obj unit tests

* fixed cat & data validation

* fixed producer as object

* revert .includes() to .indexof() for IE

* reduced content obj params accoriding to ad-server support

* fixed typeOf typo

* fixed episode to Number

* gitignore

* restore gitignore

* removed unsupported params from md file

* reverted package & pagkage-lock

* fixed incorrect episdoe from str to num
---
 modules/oneVideoBidAdapter.js                |  32 ++-
 modules/oneVideoBidAdapter.md                |  86 ++++++
 test/spec/modules/oneVideoBidAdapter_spec.js | 273 ++++++++++++++++---
 3 files changed, 345 insertions(+), 46 deletions(-)

diff --git a/modules/oneVideoBidAdapter.js b/modules/oneVideoBidAdapter.js
index 8a71910e8fc..2f9275f969d 100644
--- a/modules/oneVideoBidAdapter.js
+++ b/modules/oneVideoBidAdapter.js
@@ -75,7 +75,7 @@ export const spec = {
    * @param {*} serverResponse A successful response from the server.
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
-  interpretResponse: function(response, { bidRequest }) {
+  interpretResponse: function(response, {bidRequest}) {
     let bid;
     let size;
     let bidResponse;
@@ -127,7 +127,10 @@ export const spec = {
    * @return {UserSync[]} The user syncs which should be dropped.
    */
   getUserSyncs: function(syncOptions, responses, consentData = {}) {
-    let { gdprApplies, consentString = '' } = consentData;
+    let {
+      gdprApplies,
+      consentString = ''
+    } = consentData;
 
     if (syncOptions.pixelEnabled) {
       return [{
@@ -301,14 +304,33 @@ function getRequestData(bid, consentData, bidRequest) {
     bidData.site.ref = 'https://verizonmedia.com';
     bidData.tmax = 1000;
   }
-  if (bid.params.video.custom && Object.prototype.toString.call(bid.params.video.custom) === '[object Object]') {
+  if (bid.params.video.custom && utils.isPlainObject(bid.params.video.custom)) {
     bidData.imp[0].ext.custom = {};
     for (const key in bid.params.video.custom) {
-      if (typeof bid.params.video.custom[key] === 'string' || typeof bid.params.video.custom[key] === 'number') {
+      if (utils.isStr(bid.params.video.custom[key]) || utils.isNumber(bid.params.video.custom[key])) {
         bidData.imp[0].ext.custom[key] = bid.params.video.custom[key];
       }
     }
   }
+  if (bid.params.video.content && utils.isPlainObject(bid.params.video.content)) {
+    bidData.imp[0].content = {};
+    const contentStringKeys = ['id', 'title', 'series', 'season', 'genre', 'contentrating', 'language'];
+    const contentNumberkeys = ['episode', 'prodq', 'context', 'livestream', 'len'];
+    const contentArrayKeys = ['cat'];
+    const contentObjectKeys = ['ext'];
+    for (const contentKey in bid.params.video.content) {
+      if (
+        (contentStringKeys.indexOf(contentKey) > -1 && utils.isStr(bid.params.video.content[contentKey])) ||
+        (contentNumberkeys.indexOf(contentKey) > -1 && utils.isNumber(bid.params.video.content[contentKey])) ||
+        (contentObjectKeys.indexOf(contentKey) > -1 && utils.isPlainObject(bid.params.video.content[contentKey])) ||
+        (contentArrayKeys.indexOf(contentKey) > -1 && utils.isArray(bid.params.video.content[contentKey]) &&
+        bid.params.video.content[contentKey].every(catStr => utils.isStr(catStr)))) {
+        bidData.imp[0].content[contentKey] = bid.params.video.content[contentKey];
+      } else {
+        utils.logMessage('oneVideo bid adapter validation error: ', contentKey, ' is either not supported is OpenRTB V2.5 or value is undefined');
+      }
+    }
+  }
   return bidData;
 }
 
@@ -324,7 +346,7 @@ function newRenderer(bidRequest, bid) {
     bidRequest.renderer = {};
     bidRequest.renderer.url = 'https://cdn.vidible.tv/prod/hb-outstream-renderer/renderer.js';
     bidRequest.renderer.render = function(bid) {
-      setTimeout(function () {
+      setTimeout(function() {
         // eslint-disable-next-line no-undef
         o2PlayerRender(bid);
       }, 700)
diff --git a/modules/oneVideoBidAdapter.md b/modules/oneVideoBidAdapter.md
index d413c9d64e5..97c4e91ca78 100644
--- a/modules/oneVideoBidAdapter.md
+++ b/modules/oneVideoBidAdapter.md
@@ -300,3 +300,89 @@ var adUnits = [
       }
   ]
 ```
+# Content Object Support
+The oneVideoBidAdapter supports passing of OpenRTB V2.5 Content Object.
+
+```
+const adUnits = [{
+            code: 'video1',
+            mediaTypes: {
+                video: {
+                    context: 'outstream',
+                    playerSize: [640, 480]
+                }
+            },
+            bids: [{
+                bidder: 'oneVideo',
+                params: {
+                    video: {
+                        playerWidth: 640,
+                        playerHeight: 480,
+                        mimes: ['video/mp4', 'application/javascript'],
+                        protocols: [2, 5],
+                        api: [1, 2],
+                        ttl: 300,
+                        content: {
+                            id: "1234",
+                            title: "Title",
+                            series: "Series",
+                            season: "Season",
+                            episode: 1
+                            cat: [
+                                "IAB1",
+                                "IAB1-1",
+                                "IAB1-2",
+                                "IAB2",
+                                "IAB2-1"
+                            ],
+                            genre: "Genre",
+                            contentrating: "C-Rating",
+                            language: "EN",
+                            prodq: 1,
+                            context: 1,
+                            livestream: 0,
+                            len: 360,
+                            ext: {
+                                network: "ext-network",
+                                channel: "ext-channel"
+                            }
+                        }
+                      },
+                      pubId: 'HBExchange'
+                    }
+                }
+            }]
+        }]
+```
+
+
+# TTL Support
+The oneVideoBidAdapter supports passing of "Time To Live" (ttl)  that indicates to prebid chache for how long to keep the chaced winning bid alive.
+Value is Number in seconds
+You can enter any number between 1 - 3600 (seconds)
+```
+const adUnits = [{
+            code: 'video1',
+            mediaTypes: {
+                video: {
+                    context: 'outstream',
+                    playerSize: [640, 480]
+                }
+            },
+            bids: [{
+                bidder: 'oneVideo',
+                params: {
+                    video: {
+                        playerWidth: 640,
+                        playerHeight: 480,
+                        mimes: ['video/mp4', 'application/javascript'],
+                        protocols: [2, 5],
+                        api: [1, 2],
+                        ttl: 300
+                    },
+                    pubId: 'HBExchange'
+                }
+            }]
+        }]
+```
+
diff --git a/test/spec/modules/oneVideoBidAdapter_spec.js b/test/spec/modules/oneVideoBidAdapter_spec.js
index 83adf8a4b11..bc37ea15255 100644
--- a/test/spec/modules/oneVideoBidAdapter_spec.js
+++ b/test/spec/modules/oneVideoBidAdapter_spec.js
@@ -1,5 +1,9 @@
-import { expect } from 'chai';
-import { spec } from 'modules/oneVideoBidAdapter.js';
+import {
+  expect
+} from 'chai';
+import {
+  spec
+} from 'modules/oneVideoBidAdapter.js';
 import * as utils from 'src/utils.js';
 
 describe('OneVideoBidAdapter', function () {
@@ -200,20 +204,20 @@ describe('OneVideoBidAdapter', function () {
 
   describe('spec.buildRequests', function () {
     it('should create a POST request for every bid', function () {
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       expect(requests[0].method).to.equal('POST');
       expect(requests[0].url).to.equal(spec.ENDPOINT + bidRequest.params.pubId);
     });
 
     it('should attach the bid request object', function () {
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       expect(requests[0].bidRequest).to.equal(bidRequest);
     });
 
     it('should attach request data', function () {
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
-      const [ width, height ] = bidRequest.sizes;
+      const [width, height] = bidRequest.sizes;
       const placement = bidRequest.params.video.placement;
       const rewarded = bidRequest.params.video.rewarded;
       const inventoryid = bidRequest.params.video.inventoryid;
@@ -231,8 +235,10 @@ describe('OneVideoBidAdapter', function () {
     it('must parse bid size from a nested array', function () {
       const width = 640;
       const height = 480;
-      bidRequest.sizes = [[ width, height ]];
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      bidRequest.sizes = [
+        [width, height]
+      ];
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       expect(data.imp[0].video.w).to.equal(width);
       expect(data.imp[0].video.h).to.equal(height);
@@ -240,14 +246,14 @@ describe('OneVideoBidAdapter', function () {
 
     it('should set pubId to HBExchange when bid.params.video.e2etest = true', function () {
       bidRequest.params.video.e2etest = true;
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       expect(requests[0].method).to.equal('POST');
       expect(requests[0].url).to.equal(spec.E2ETESTENDPOINT + 'HBExchange');
     });
 
     it('should attach End 2 End test data', function () {
       bidRequest.params.video.e2etest = true;
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       expect(data.imp[0].bidfloor).to.not.exist;
       expect(data.imp[0].video.w).to.equal(300);
@@ -260,7 +266,7 @@ describe('OneVideoBidAdapter', function () {
     });
 
     it('it should create new schain and send it if video.params.sid exists', function () {
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       const schain = data.source.ext.schain;
       expect(schain.nodes.length).to.equal(1);
@@ -281,7 +287,7 @@ describe('OneVideoBidAdapter', function () {
         }]
       };
       bidRequest.schain = globalSchain;
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       const schain = data.source.ext.schain;
       expect(schain.nodes.length).to.equal(1);
@@ -300,7 +306,7 @@ describe('OneVideoBidAdapter', function () {
         }]
       };
       bidRequest.schain = globalSchain;
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       const schain = data.source.ext.schain;
       expect(schain.nodes.length).to.equal(1);
@@ -310,44 +316,44 @@ describe('OneVideoBidAdapter', function () {
     })
 
     it('should append hp to new schain created by sid if video.params.hp is passed', function () {
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       const schain = data.source.ext.schain;
       expect(schain.nodes[0].hp).to.equal(bidRequest.params.video.hp);
     })
     it('should not accept key values pairs if custom is Undefined ', function () {
       bidRequest.params.video.custom = null;
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       expect(data.imp[0].ext.custom).to.be.undefined;
     });
     it('should not accept key values pairs if custom is Array ', function () {
       bidRequest.params.video.custom = [];
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       expect(data.imp[0].ext.custom).to.be.undefined;
     });
     it('should not accept key values pairs if custom is Number ', function () {
       bidRequest.params.video.custom = 123456;
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       expect(data.imp[0].ext.custom).to.be.undefined;
     });
     it('should not accept key values pairs if custom is String ', function () {
       bidRequest.params.video.custom = 'keyValuePairs';
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       expect(data.imp[0].ext.custom).to.be.undefined;
     });
     it('should not accept key values pairs if custom is Boolean ', function () {
       bidRequest.params.video.custom = true;
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       expect(data.imp[0].ext.custom).to.be.undefined;
     });
     it('should accept key values pairs if custom is Object ', function () {
       bidRequest.params.video.custom = {};
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       expect(data.imp[0].ext.custom).to.be.a('object');
     });
@@ -357,12 +363,14 @@ describe('OneVideoBidAdapter', function () {
         key2: 'value2',
         key3: 4444444,
         key4: false,
-        key5: {nested: 'object'},
+        key5: {
+          nested: 'object'
+        },
         key6: ['string', 2, true, null],
         key7: null,
         key8: undefined
       };
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const custom = requests[0].data.imp[0].ext.custom;
       expect(custom['key1']).to.be.a('string');
       expect(custom['key2']).to.be.a('string');
@@ -373,29 +381,188 @@ describe('OneVideoBidAdapter', function () {
       expect(custom['key7']).to.not.exist;
       expect(custom['key8']).to.not.exist;
     });
+
+    describe('content object validations', function () {
+      it('should not accept content object if value is Undefined ', function () {
+        bidRequest.params.video.content = null;
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.imp[0].content).to.be.undefined;
+      });
+      it('should not accept content object if value is is Array ', function () {
+        bidRequest.params.video.content = [];
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.imp[0].content).to.be.undefined;
+      });
+      it('should not accept content object if value is Number ', function () {
+        bidRequest.params.video.content = 123456;
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.imp[0].content).to.be.undefined;
+      });
+      it('should not accept content object if value is String ', function () {
+        bidRequest.params.video.content = 'keyValuePairs';
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.imp[0].content).to.be.undefined;
+      });
+      it('should not accept content object if value is Boolean ', function () {
+        bidRequest.params.video.content = true;
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.imp[0].content).to.be.undefined;
+      });
+      it('should accept content object if value is Object ', function () {
+        bidRequest.params.video.content = {};
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.imp[0].content).to.be.a('object');
+      });
+
+      it('should not append unsupported content object keys', function () {
+        bidRequest.params.video.content = {
+          fake: 'news',
+          unreal: 'param',
+          counterfit: 'data'
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.imp[0].content).to.be.empty;
+      });
+
+      it('should not append content string parameters if value is not string ', function () {
+        bidRequest.params.video.content = {
+          id: 1234,
+          title: ['Title'],
+          series: ['Series'],
+          season: ['Season'],
+          genre: ['Genre'],
+          contentrating: {1: 'C-Rating'},
+          language: {1: 'EN'}
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.imp[0].content).to.be.a('object');
+        expect(data.imp[0].content).to.be.empty
+      });
+      it('should not append content Number parameters if value is not Number ', function () {
+        bidRequest.params.video.content = {
+          episode: '1',
+          context: 'context',
+          livestream: {0: 'stream'},
+          len: [360],
+          prodq: [1],
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.imp[0].content).to.be.a('object');
+        expect(data.imp[0].content).to.be.empty
+      });
+      it('should not append content Array parameters if value is not Array ', function () {
+        bidRequest.params.video.content = {
+          cat: 'categories',
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.imp[0].content).to.be.a('object');
+        expect(data.imp[0].content).to.be.empty
+      });
+      it('should not append content ext if value is not Object ', function () {
+        bidRequest.params.video.content = {
+          ext: 'content.ext',
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.imp[0].content).to.be.a('object');
+        expect(data.imp[0].content).to.be.empty
+      });
+      it('should append supported parameters if value match validations ', function () {
+        bidRequest.params.video.content = {
+          id: '1234',
+          title: 'Title',
+          series: 'Series',
+          season: 'Season',
+          cat: [
+            'IAB1'
+          ],
+          genre: 'Genre',
+          contentrating: 'C-Rating',
+          language: 'EN',
+          episode: 1,
+          prodq: 1,
+          context: 1,
+          livestream: 0,
+          len: 360,
+          ext: {}
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.imp[0].content).to.deep.equal(bidRequest.params.video.content);
+      });
+    });
   });
 
   describe('spec.interpretResponse', function () {
     it('should return no bids if the response is not valid', function () {
-      const bidResponse = spec.interpretResponse({ body: null }, { bidRequest });
+      const bidResponse = spec.interpretResponse({
+        body: null
+      }, {
+        bidRequest
+      });
       expect(bidResponse.length).to.equal(0);
     });
 
     it('should return no bids if the response "nurl" and "adm" are missing', function () {
-      const serverResponse = {seatbid: [{bid: [{price: 6.01}]}]};
-      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+      const serverResponse = {
+        seatbid: [{
+          bid: [{
+            price: 6.01
+          }]
+        }]
+      };
+      const bidResponse = spec.interpretResponse({
+        body: serverResponse
+      }, {
+        bidRequest
+      });
       expect(bidResponse.length).to.equal(0);
     });
 
     it('should return no bids if the response "price" is missing', function () {
-      const serverResponse = {seatbid: [{bid: [{adm: '<VAST></VAST>'}]}]};
-      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+      const serverResponse = {
+        seatbid: [{
+          bid: [{
+            adm: '<VAST></VAST>'
+          }]
+        }]
+      };
+      const bidResponse = spec.interpretResponse({
+        body: serverResponse
+      }, {
+        bidRequest
+      });
       expect(bidResponse.length).to.equal(0);
     });
 
     it('should return a valid video bid response with just "adm"', function () {
-      const serverResponse = {seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: '<VAST></VAST>'}]}], cur: 'USD'};
-      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+      const serverResponse = {
+        seatbid: [{
+          bid: [{
+            id: 1,
+            adid: 123,
+            crid: 2,
+            price: 6.01,
+            adm: '<VAST></VAST>'
+          }]
+        }],
+        cur: 'USD'
+      };
+      const bidResponse = spec.interpretResponse({
+        body: serverResponse
+      }, {
+        bidRequest
+      });
       let o = {
         requestId: bidRequest.bidId,
         bidderCode: spec.code,
@@ -428,8 +595,23 @@ describe('OneVideoBidAdapter', function () {
           }
         }
       }
-      const serverResponse = {seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: '<div>DAP UNIT HERE</div>'}]}], cur: 'USD'};
-      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+      const serverResponse = {
+        seatbid: [{
+          bid: [{
+            id: 1,
+            adid: 123,
+            crid: 2,
+            price: 6.01,
+            adm: '<div>DAP UNIT HERE</div>'
+          }]
+        }],
+        cur: 'USD'
+      };
+      const bidResponse = spec.interpretResponse({
+        body: serverResponse
+      }, {
+        bidRequest
+      });
       expect(bidResponse.ad).to.equal('<div>DAP UNIT HERE</div>');
       expect(bidResponse.mediaType).to.equal('banner');
       expect(bidResponse.renderer).to.be.undefined;
@@ -500,22 +682,22 @@ describe('OneVideoBidAdapter', function () {
     });
 
     it('should send a signal to specify that GDPR applies to this request', function () {
-      const request = spec.buildRequests([ bidRequest ], bidderRequest);
+      const request = spec.buildRequests([bidRequest], bidderRequest);
       expect(request[0].data.regs.ext.gdpr).to.equal(1);
     });
 
     it('should send the consent string', function () {
-      const request = spec.buildRequests([ bidRequest ], bidderRequest);
+      const request = spec.buildRequests([bidRequest], bidderRequest);
       expect(request[0].data.user.ext.consent).to.equal(bidderRequest.gdprConsent.consentString);
     });
 
     it('should send the uspConsent string', function () {
-      const request = spec.buildRequests([ bidRequest ], bidderRequest);
+      const request = spec.buildRequests([bidRequest], bidderRequest);
       expect(request[0].data.regs.ext.us_privacy).to.equal(bidderRequest.uspConsent);
     });
 
     it('should send the uspConsent and GDPR ', function () {
-      const request = spec.buildRequests([ bidRequest ], bidderRequest);
+      const request = spec.buildRequests([bidRequest], bidderRequest);
       expect(request[0].data.regs.ext.gdpr).to.equal(1);
       expect(request[0].data.regs.ext.us_privacy).to.equal(bidderRequest.uspConsent);
     });
@@ -559,7 +741,7 @@ describe('OneVideoBidAdapter', function () {
           pubId: 'OneMDisplay'
         }
       };
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       const width = bidRequest.params.video.playerWidth;
       const height = bidRequest.params.video.playerHeight;
@@ -609,7 +791,7 @@ describe('OneVideoBidAdapter', function () {
           pubId: 'OneMDisplay'
         }
       };
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       const width = bidRequest.params.video.playerWidth;
       const height = bidRequest.params.video.playerHeight;
@@ -655,7 +837,7 @@ describe('OneVideoBidAdapter', function () {
           pubId: 'OneMDisplay'
         }
       };
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       const width = bidRequest.params.video.playerWidth;
       const height = bidRequest.params.video.playerHeight;
@@ -674,19 +856,28 @@ describe('OneVideoBidAdapter', function () {
       const GDPR_CONSENT_STRING = 'GDPR_CONSENT_STRING';
 
       it('should get correct user sync when iframeEnabled', function () {
-        let pixel = spec.getUserSyncs({pixelEnabled: true}, {}, {gdprApplies: true, consentString: GDPR_CONSENT_STRING})
+        let pixel = spec.getUserSyncs({
+          pixelEnabled: true
+        }, {}, {
+          gdprApplies: true,
+          consentString: GDPR_CONSENT_STRING
+        })
         expect(pixel[1].type).to.equal('image');
         expect(pixel[1].url).to.equal('https://sync-tm.everesttech.net/upi/pid/m7y5t93k?gdpr=1&gdpr_consent=' + GDPR_CONSENT_STRING + '&redir=https%3A%2F%2Fpixel.advertising.com%2Fups%2F55986%2Fsync%3Fuid%3D%24%7BUSER_ID%7D%26_origin%3D0&gdpr=1&gdpr_consent=' + encodeURI(GDPR_CONSENT_STRING));
       });
 
       it('should default to gdprApplies=0 when consentData is undefined', function () {
-        let pixel = spec.getUserSyncs({pixelEnabled: true}, {}, undefined);
+        let pixel = spec.getUserSyncs({
+          pixelEnabled: true
+        }, {}, undefined);
         expect(pixel[1].url).to.equal('https://sync-tm.everesttech.net/upi/pid/m7y5t93k?gdpr=0&gdpr_consent=&redir=https%3A%2F%2Fpixel.advertising.com%2Fups%2F55986%2Fsync%3Fuid%3D%24%7BUSER_ID%7D%26_origin%3D0&gdpr=0&gdpr_consent=');
       });
     });
 
     describe('verify sync pixels', function () {
-      let pixel = spec.getUserSyncs({pixelEnabled: true}, {}, undefined);
+      let pixel = spec.getUserSyncs({
+        pixelEnabled: true
+      }, {}, undefined);
       it('should be UPS sync pixel for DBM', function () {
         expect(pixel[0].url).to.equal('https://pixel.advertising.com/ups/57304/sync?gdpr=&gdpr_consent=&_origin=0&redir=true')
       });

From be14e4c46fc4b7471908ffebb05f2d474310f61d Mon Sep 17 00:00:00 2001
From: Lisa Benmore <lbenmore@gmail.com>
Date: Tue, 22 Dec 2020 05:46:20 -0800
Subject: [PATCH 118/304] GumGum: adds support for new field - irisid (#6129)

* adds support for new field - irisid

* remove package-lock.json

* revert psckage-lock.json to source
---
 modules/gumgumBidAdapter.js                |  4 +++
 test/spec/modules/gumgumBidAdapter_spec.js | 33 +++++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/modules/gumgumBidAdapter.js b/modules/gumgumBidAdapter.js
index c9bf77494cf..2b0f7e03d22 100644
--- a/modules/gumgumBidAdapter.js
+++ b/modules/gumgumBidAdapter.js
@@ -273,6 +273,10 @@ function buildRequests (validBidRequests, bidderRequest) {
       data.iriscat = params.iriscat;
     }
 
+    if (params.irisid && typeof params.irisid === 'string') {
+      data.irisid = params.irisid;
+    }
+
     if (params.zone || params.pubId) {
       params.zone ? (data.t = params.zone) : (data.pubId = params.pubId);
 
diff --git a/test/spec/modules/gumgumBidAdapter_spec.js b/test/spec/modules/gumgumBidAdapter_spec.js
index a2a1b733d3c..0d37c8b1d25 100644
--- a/test/spec/modules/gumgumBidAdapter_spec.js
+++ b/test/spec/modules/gumgumBidAdapter_spec.js
@@ -1,7 +1,8 @@
+import { BANNER, VIDEO } from 'src/mediaTypes.js';
+
 import { expect } from 'chai';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { spec } from 'modules/gumgumBidAdapter.js';
-import { BANNER, VIDEO } from 'src/mediaTypes.js';
 
 const ENDPOINT = 'https://g2.gumgum.com/hbid/imp';
 const JCSI = { t: 0, rq: 8, pbv: '$prebid.version$' }
@@ -158,6 +159,36 @@ describe('gumgumAdapter', function () {
       expect(bidRequest.data.t).to.equal(zoneParam.zone);
     });
 
+    it('should set the iriscat param when found', function () {
+      const request = { ...bidRequests[0], params: { iriscat: 'abc123' } }
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data).to.have.property('iriscat');
+    });
+
+    it('should not set the iriscat param when not found', function () {
+      const request = { ...bidRequests[0] }
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data).to.not.have.property('iriscat');
+    });
+
+    it('should set the irisid param when found', function () {
+      const request = { ...bidRequests[0], params: { irisid: 'abc123' } }
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data).to.have.property('irisid');
+    });
+
+    it('should not set the irisid param when not found', function () {
+      const request = { ...bidRequests[0] }
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data).to.not.have.property('irisid');
+    });
+
+    it('should not set the irisid param when not of type string', function () {
+      const request = { ...bidRequests[0], params: { irisid: 123456 } }
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data).to.not.have.property('irisid');
+    });
+
     describe('product id', function () {
       it('should set the correct pi param if native param is found', function () {
         const request = { ...bidRequests[0], params: { ...zoneParam, native: 2 } };

From 64c560b314296a9ebde654b135bf591f13266549 Mon Sep 17 00:00:00 2001
From: Galphimbl <sashatkachov91@gmail.com>
Date: Tue, 22 Dec 2020 15:54:16 +0200
Subject: [PATCH 119/304] AdmixerBidAdapter - add alias , add adapter config
 (#6120)

* add alias "adblender", custom endpoint

* remove houseofpubs

* add config example

* update email

* adblender.md fix naming
---
 modules/adblender.md                        | 36 +++++++++++++++++++++
 modules/admixerBidAdapter.js                |  8 +++--
 test/spec/modules/admixerBidAdapter_spec.js | 13 ++++++++
 3 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 modules/adblender.md

diff --git a/modules/adblender.md b/modules/adblender.md
new file mode 100644
index 00000000000..e70b2a4a8ed
--- /dev/null
+++ b/modules/adblender.md
@@ -0,0 +1,36 @@
+# Overview
+
+Module Name: AdBlender Bidder Adapter  
+Module Type: Bidder Adapter  
+Maintainer: contact@ad-blender.com
+
+# Description
+
+Connects to AdBlender demand source to fetch bids.  
+Banner and Video formats are supported.  
+Please use ```adblender``` as the bidder code.  
+#Bidder Config
+You can set an alternate endpoint url `pbjs.setBidderConfig` for the bidder `adblender`
+```
+pbjs.setBidderConfig({
+        bidders: ["adblender"],
+        config: {"adblender": { "endpoint_url": "https://inv-nets.admixer.net/adblender.1.1.aspx"}}
+      })
+```
+# Ad Unit Example
+```
+    var adUnits = [
+           {
+               code: 'desktop-banner-ad-div',
+               sizes: [[300, 250]],  // a display size
+               bids: [
+                   {
+                       bidder: "adblender",
+                       params: {
+                           zone: 'fb3d34d0-7a88-4a4a-a5c9-8088cd7845f4'
+                       }
+                   }
+               ]
+           }
+       ];
+```
diff --git a/modules/admixerBidAdapter.js b/modules/admixerBidAdapter.js
index 405dd81cc8c..765b3d0f127 100644
--- a/modules/admixerBidAdapter.js
+++ b/modules/admixerBidAdapter.js
@@ -1,8 +1,9 @@
 import * as utils from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {config} from '../src/config.js';
 
 const BIDDER_CODE = 'admixer';
-const ALIASES = ['go2net'];
+const ALIASES = ['go2net', 'adblender'];
 const ENDPOINT_URL = 'https://inv-nets.admixer.net/prebid.1.1.aspx';
 export const spec = {
   code: BIDDER_CODE,
@@ -21,7 +22,10 @@ export const spec = {
     const payload = {
       imps: [],
     };
+    let endpointUrl;
     if (bidderRequest) {
+      const {bidderCode} = bidderRequest;
+      endpointUrl = config.getConfig(`${bidderCode}.endpoint_url`);
       if (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
         payload.referrer = encodeURIComponent(bidderRequest.refererInfo.referer);
       }
@@ -42,7 +46,7 @@ export const spec = {
     const payloadString = JSON.stringify(payload);
     return {
       method: 'GET',
-      url: ENDPOINT_URL,
+      url: endpointUrl || ENDPOINT_URL,
       data: `data=${payloadString}`,
     };
   },
diff --git a/test/spec/modules/admixerBidAdapter_spec.js b/test/spec/modules/admixerBidAdapter_spec.js
index dfadf1f95d5..1321d81d536 100644
--- a/test/spec/modules/admixerBidAdapter_spec.js
+++ b/test/spec/modules/admixerBidAdapter_spec.js
@@ -1,9 +1,11 @@
 import {expect} from 'chai';
 import {spec} from 'modules/admixerBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
+import {config} from '../../../src/config.js';
 
 const BIDDER_CODE = 'admixer';
 const ENDPOINT_URL = 'https://inv-nets.admixer.net/prebid.1.1.aspx';
+const ENDPOINT_URL_CUSTOM = 'https://custom.admixer.net/prebid.aspx';
 const ZONE_ID = '2eb6bd58-865c-47ce-af7f-a918108c3fd2';
 
 describe('AdmixerAdapter', function () {
@@ -57,6 +59,7 @@ describe('AdmixerAdapter', function () {
       }
     ];
     let bidderRequest = {
+      bidderCode: BIDDER_CODE,
       refererInfo: {
         referer: 'https://example.com'
       }
@@ -74,6 +77,16 @@ describe('AdmixerAdapter', function () {
       expect(request.url).to.equal(ENDPOINT_URL);
       expect(request.method).to.equal('GET');
     });
+
+    it('sends bid request to CUSTOM_ENDPOINT via GET', function () {
+      config.setBidderConfig({
+        bidders: [BIDDER_CODE], // one or more bidders
+        config: {[BIDDER_CODE]: {endpoint_url: ENDPOINT_URL_CUSTOM}}
+      });
+      const request = config.runWithBidder(BIDDER_CODE, () => spec.buildRequests(validRequest, bidderRequest));
+      expect(request.url).to.equal(ENDPOINT_URL_CUSTOM);
+      expect(request.method).to.equal('GET');
+    });
   });
 
   describe('interpretResponse', function () {

From 30af7a0fddf40e4604a47cd8927afddf71b8b5dd Mon Sep 17 00:00:00 2001
From: mwehr-zeta <70167335+mwehr-zeta@users.noreply.github.com>
Date: Tue, 22 Dec 2020 12:37:04 -0500
Subject: [PATCH 120/304] Zeta updates - Pass additional data through adapter
 (#6134)

* Submit Zeta Adapter to Prebid

* comments addressed

* demo changes

* additional polishing

* additional polishing

* Update hello_world.html

* remove extraneous changes to hello_world.html

* no, really this time

* additional polishing

* add unit test

* Update Zeta bid adapter to pass more data
---
 modules/zetaBidAdapter.js                | 64 +++++++++++++++---------
 modules/zetaBidAdapter.md                |  7 ++-
 test/spec/modules/zetaBidAdapter_spec.js |  7 ++-
 3 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/modules/zetaBidAdapter.js b/modules/zetaBidAdapter.js
index f60e8946799..09d631b3d18 100644
--- a/modules/zetaBidAdapter.js
+++ b/modules/zetaBidAdapter.js
@@ -20,19 +20,37 @@ export const spec = {
      */
   isBidRequestValid: function(bid) {
     // check for all required bid fields
-    let isValid = !!(
-      bid &&
-      bid.bidId &&
-      bid.params &&
-      bid.params.ip &&
-      bid.params.user &&
-      bid.params.user.buyeruid &&
-      bid.params.definerId
-    );
-    if (!isValid) {
-      utils.logWarn('Invalid bid request');
+    if (!(bid &&
+          bid.bidId &&
+          bid.params)) {
+      utils.logWarn('Invalid bid request - missing required bid data');
+      return false;
     }
-    return isValid;
+
+    if (!(bid.params.user &&
+          bid.params.user.buyeruid)) {
+      utils.logWarn('Invalid bid request - missing required user data');
+      return false;
+    }
+
+    if (!(bid.params.device &&
+          bid.params.device.ip)) {
+      utils.logWarn('Invalid bid request - missing required device data');
+      return false;
+    }
+
+    if (!(bid.params.device.geo &&
+          bid.params.device.geo.country)) {
+      utils.logWarn('Invalid bid request - missing required geo data');
+      return false;
+    }
+
+    if (!bid.params.definerId) {
+      utils.logWarn('Invalid bid request - missing required definer data');
+      return false;
+    }
+
+    return true;
   },
 
   /**
@@ -51,27 +69,23 @@ export const spec = {
       secure: secure,
       banner: buildBanner(request)
     };
-    let isMobile = /(ios|ipod|ipad|iphone|android)/i.test(navigator.userAgent) ? 1 : 0;
     let payload = {
       id: bidderRequest.auctionId,
       cur: [DEFAULT_CUR],
       imp: [impData],
-      site: {
-        mobile: isMobile,
-        page: bidderRequest.refererInfo.referer
-      },
-      device: {
-        ua: navigator.userAgent,
-        ip: params.ip
-      },
-      user: {
-        buyeruid: params.user.buyeruid,
-        uid: params.user.uid
-      },
+      site: params.site ? params.site : {},
+      device: params.device ? params.device : {},
+      user: params.user ? params.user : {},
+      app: params.app ? params.app : {},
       ext: {
         definerId: params.definerId
       }
     };
+
+    payload.device.ua = navigator.userAgent;
+    payload.site.page = bidderRequest.refererInfo.referer;
+    payload.site.mobile = /(ios|ipod|ipad|iphone|android)/i.test(navigator.userAgent) ? 1 : 0;
+
     if (params.test) {
       payload.test = params.test;
     }
diff --git a/modules/zetaBidAdapter.md b/modules/zetaBidAdapter.md
index ce19b831d4d..d99846c7822 100644
--- a/modules/zetaBidAdapter.md
+++ b/modules/zetaBidAdapter.md
@@ -29,7 +29,12 @@ Module that connects to Zeta's demand sources
                                 uid: 12345,
                                 buyeruid: 12345
                             },
-                            ip: '111.222.33.44',
+                            device: {
+                                ip: '111.222.33.44',
+                                geo: {
+                                    country: "USA"
+                                }
+                            },
                             definerId: 1,
                             test: 1
                         }
diff --git a/test/spec/modules/zetaBidAdapter_spec.js b/test/spec/modules/zetaBidAdapter_spec.js
index 0d11614c926..b3380ab35db 100644
--- a/test/spec/modules/zetaBidAdapter_spec.js
+++ b/test/spec/modules/zetaBidAdapter_spec.js
@@ -18,7 +18,12 @@ describe('Zeta Bid Adapter', function() {
         uid: 12345,
         buyeruid: 12345
       },
-      ip: '111.222.33.44',
+      device: {
+        ip: '111.222.33.44',
+        geo: {
+          country: 'USA'
+        }
+      },
       definerId: 1,
       test: 1
     }

From 080b6b74e2b515ff726ae4abeedac19d3f2889ee Mon Sep 17 00:00:00 2001
From: BertiBauer <14088844+BertiBauer@users.noreply.github.com>
Date: Mon, 28 Dec 2020 18:32:37 +0100
Subject: [PATCH 121/304] Yieldlab - Update Adsize Handling (#6123)

---
 modules/yieldlabBidAdapter.js                | 13 ++++++-------
 modules/yieldlabBidAdapter.md                |  4 +---
 test/spec/modules/yieldlabBidAdapter_spec.js | 11 +++++------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/modules/yieldlabBidAdapter.js b/modules/yieldlabBidAdapter.js
index 5465a10a884..f36e3a8257b 100644
--- a/modules/yieldlabBidAdapter.js
+++ b/modules/yieldlabBidAdapter.js
@@ -96,8 +96,8 @@ export const spec = {
       })
 
       if (matchedBid) {
-        const primarysize = bidRequest.sizes.length === 2 && !utils.isArray(bidRequest.sizes[0]) ? bidRequest.sizes : bidRequest.sizes[0]
-        const customsize = bidRequest.params.adSize !== undefined ? parseSize(bidRequest.params.adSize) : primarysize
+        const adUnitSize = bidRequest.sizes.length === 2 && !utils.isArray(bidRequest.sizes[0]) ? bidRequest.sizes : bidRequest.sizes[0]
+        const adSize = bidRequest.params.adSize !== undefined ? parseSize(bidRequest.params.adSize) : (matchedBid.adsize !== undefined) ? parseSize(matchedBid.adsize) : adUnitSize
         const extId = bidRequest.params.extId !== undefined ? '&id=' + bidRequest.params.extId : ''
         const adType = matchedBid.adtype !== undefined ? matchedBid.adtype : ''
         const gdprApplies = reqParams.gdpr ? '&gdpr=' + reqParams.gdpr : ''
@@ -106,15 +106,15 @@ export const spec = {
         const bidResponse = {
           requestId: bidRequest.bidId,
           cpm: matchedBid.price / 100,
-          width: customsize[0],
-          height: customsize[1],
+          width: adSize[0],
+          height: adSize[1],
           creativeId: '' + matchedBid.id,
           dealId: (matchedBid['c.dealid']) ? matchedBid['c.dealid'] : matchedBid.pid,
           currency: CURRENCY_CODE,
           netRevenue: false,
           ttl: BID_RESPONSE_TTL_SEC,
           referrer: '',
-          ad: `<script src="${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/${customsize[0]}x${customsize[1]}?ts=${timestamp}${extId}${gdprApplies}${gdprConsent}"></script>`
+          ad: `<script src="${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/?ts=${timestamp}${extId}${gdprApplies}${gdprConsent}"></script>`
         }
 
         if (isVideo(bidRequest, adType)) {
@@ -124,8 +124,7 @@ export const spec = {
             bidResponse.height = playersize[1]
           }
           bidResponse.mediaType = VIDEO
-          bidResponse.vastUrl = `${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/${customsize[0]}x${customsize[1]}?ts=${timestamp}${extId}${gdprApplies}${gdprConsent}`
-
+          bidResponse.vastUrl = `${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/?ts=${timestamp}${extId}${gdprApplies}${gdprConsent}`
           if (isOutstream(bidRequest)) {
             const renderer = Renderer.install({
               id: bidRequest.bidId,
diff --git a/modules/yieldlabBidAdapter.md b/modules/yieldlabBidAdapter.md
index 37897b83f12..a7a3f2715dc 100644
--- a/modules/yieldlabBidAdapter.md
+++ b/modules/yieldlabBidAdapter.md
@@ -21,7 +21,6 @@ Module that connects to Yieldlab's demand sources
                    params: {
                        adslotId: "5220336",
                        supplyId: "1381604",
-                       adSize: "728x90",
                        targeting: {
                            key1: "value1",
                            key2: "value2"
@@ -41,8 +40,7 @@ Module that connects to Yieldlab's demand sources
                    bidder: "yieldlab",
                    params: {
                        adslotId: "5220339",
-                       supplyId: "1381604",
-                       adSize: "640x480"
+                       supplyId: "1381604"
                    }
                }]
            }
diff --git a/test/spec/modules/yieldlabBidAdapter_spec.js b/test/spec/modules/yieldlabBidAdapter_spec.js
index cd2c46a5664..72f70ca0208 100644
--- a/test/spec/modules/yieldlabBidAdapter_spec.js
+++ b/test/spec/modules/yieldlabBidAdapter_spec.js
@@ -7,7 +7,6 @@ const REQUEST = {
   'params': {
     'adslotId': '1111',
     'supplyId': '2222',
-    'adSize': '728x90',
     'targeting': {
       'key1': 'value1',
       'key2': 'value2',
@@ -57,6 +56,7 @@ const RESPONSE = {
   id: 1111,
   price: 1,
   pid: 2222,
+  adsize: '728x90',
   adtype: 'BANNER'
 }
 
@@ -88,8 +88,7 @@ describe('yieldlabBidAdapter', function () {
       const request = {
         'params': {
           'adslotId': '1111',
-          'supplyId': '2222',
-          'adSize': '728x90'
+          'supplyId': '2222'
         }
       }
       expect(spec.isBidRequestValid(request)).to.equal(true)
@@ -180,7 +179,7 @@ describe('yieldlabBidAdapter', function () {
       expect(result[0].netRevenue).to.equal(false)
       expect(result[0].ttl).to.equal(300)
       expect(result[0].referrer).to.equal('')
-      expect(result[0].ad).to.include('<script src="https://ad.yieldlab.net/d/1111/2222/728x90?ts=')
+      expect(result[0].ad).to.include('<script src="https://ad.yieldlab.net/d/1111/2222/?ts=')
       expect(result[0].ad).to.include('&id=abc')
     })
 
@@ -211,7 +210,7 @@ describe('yieldlabBidAdapter', function () {
       expect(result[0].netRevenue).to.equal(false)
       expect(result[0].ttl).to.equal(300)
       expect(result[0].referrer).to.equal('')
-      expect(result[0].ad).to.include('<script src="https://ad.yieldlab.net/d/1111/2222/728x90?ts=')
+      expect(result[0].ad).to.include('<script src="https://ad.yieldlab.net/d/1111/2222/?ts=')
       expect(result[0].ad).to.include('&id=abc')
     })
 
@@ -228,7 +227,7 @@ describe('yieldlabBidAdapter', function () {
       expect(result[0].requestId).to.equal('2d925f27f5079f')
       expect(result[0].cpm).to.equal(0.01)
       expect(result[0].mediaType).to.equal('video')
-      expect(result[0].vastUrl).to.include('https://ad.yieldlab.net/d/1111/2222/728x90?ts=')
+      expect(result[0].vastUrl).to.include('https://ad.yieldlab.net/d/1111/2222/?ts=')
       expect(result[0].vastUrl).to.include('&id=abc')
     })
 

From e7ca0c9de87b1da85edfa3c4ee8a65ddf836ffcd Mon Sep 17 00:00:00 2001
From: Scott Floam <scottfloam@gmail.com>
Date: Mon, 4 Jan 2021 17:16:58 -0500
Subject: [PATCH 122/304] FreeWheel add support for campaignId, bannerId, and
 dealId (#6144)

* Refactored dealId code to modularize obtaining ids from the Impression node
    * Added support for obtaining bannerId and campaignId
    * Added logic to prioritize Impression nodes with a rootViewKey
    * Added test cases to cover new logic for obtaining dealId, bannerId, and campaignId
---
 modules/freewheel-sspBidAdapter.js            | 52 +++++++++++++++----
 .../modules/freewheel-sspBidAdapter_spec.js   | 28 +++++++++-
 2 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/modules/freewheel-sspBidAdapter.js b/modules/freewheel-sspBidAdapter.js
index 53f490a0a3c..1c9cd75f76f 100644
--- a/modules/freewheel-sspBidAdapter.js
+++ b/modules/freewheel-sspBidAdapter.js
@@ -102,22 +102,49 @@ function getCreativeId(xmlNode) {
   return creaId;
 }
 
-function getDealId(xmlNode) {
-  var dealId = '';
+function getValueFromKeyInImpressionNode(xmlNode, key) {
+  var value = '';
   var impNodes = xmlNode.querySelectorAll('Impression'); // Nodelist.forEach is not supported in IE and Edge
-  // Workaround given here https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10638731/
-
+  var isRootViewKeyPresent = false;
+  var isAdsDisplayStartedPresent = false;
   Array.prototype.forEach.call(impNodes, function (el) {
-    var queries = el.textContent.substring(el.textContent.indexOf('?') + 1).split('&');
+    if (isRootViewKeyPresent && isAdsDisplayStartedPresent) {
+      return value;
+    }
+    isRootViewKeyPresent = false;
+    isAdsDisplayStartedPresent = false;
+    var text = el.textContent;
+    var queries = text.substring(el.textContent.indexOf('?') + 1).split('&');
+    var tempValue = '';
     Array.prototype.forEach.call(queries, function (item) {
       var split = item.split('=');
-      if (split[0] == 'dealId') {
-        dealId = split[1];
+      if (split[0] == key) {
+        tempValue = split[1];
+      }
+      if (split[0] == 'reqType' && split[1] == 'AdsDisplayStarted') {
+        isAdsDisplayStartedPresent = true;
+      }
+      if (split[0] == 'rootViewKey') {
+        isRootViewKeyPresent = true;
       }
     });
+    if (isAdsDisplayStartedPresent) {
+      value = tempValue;
+    }
   });
+  return value;
+}
 
-  return dealId;
+function getDealId(xmlNode) {
+  return getValueFromKeyInImpressionNode(xmlNode, 'dealId');
+}
+
+function getBannerId(xmlNode) {
+  return getValueFromKeyInImpressionNode(xmlNode, 'adId');
+}
+
+function getCampaignId(xmlNode) {
+  return getValueFromKeyInImpressionNode(xmlNode, 'campaignId');
 }
 
 /**
@@ -373,7 +400,8 @@ export const spec = {
     const princingData = getPricing(xmlDoc);
     const creativeId = getCreativeId(xmlDoc);
     const dealId = getDealId(xmlDoc);
-
+    const campaignId = getCampaignId(xmlDoc);
+    const bannerId = getBannerId(xmlDoc);
     const topWin = getTopMostWindow();
     if (!topWin.freewheelssp_cache) {
       topWin.freewheelssp_cache = {};
@@ -392,7 +420,9 @@ export const spec = {
         currency: princingData.currency,
         netRevenue: true,
         ttl: 360,
-        dealId: dealId
+        dealId: dealId,
+        campaignId: campaignId,
+        bannerId: bannerId
       };
 
       if (bidrequest.mediaTypes.video) {
@@ -426,6 +456,6 @@ export const spec = {
       return [];
     }
   },
+};
 
-}
 registerBidder(spec);
diff --git a/test/spec/modules/freewheel-sspBidAdapter_spec.js b/test/spec/modules/freewheel-sspBidAdapter_spec.js
index c44d7908ba8..e416bd1c26b 100644
--- a/test/spec/modules/freewheel-sspBidAdapter_spec.js
+++ b/test/spec/modules/freewheel-sspBidAdapter_spec.js
@@ -323,7 +323,10 @@ describe('freewheelSSP BidAdapter Test', () => {
     '  <InLine>' +
     '   <AdSystem>Adswizz</AdSystem>' +
     '   <Impression id="dmp-1617899169-2513"></Impression>' +
-    '   <Impression id="user-sync-1617899169-1">https://ads.stickyadstv.com/auto-user-sync?dealId=NRJ-PRO-00008</Impression>' +
+    '   <Impression id="user-sync-1617899169-1">https://ads.stickyadstv.com/auto-user-sync?dealId=NRJ-PRO-12008</Impression>' +
+    '   <Impression id="727435745">' +
+    '   <![CDATA[ https://ads.stickyadstv.com/www/delivery/swfIndex.php?reqType=AdsDisplayStarted&dealId=NRJ-PRO-00008&campaignId=SMF-WOW-55555&adId=12345&viewKey=1607626986121029-54&sessionId=e3230a6bef6e0d2327422ff5282435&zoneId=2003&impId=1&cb=1932360&trackingIds=19651873%2C28161297%2C28161329%2C29847601%2C29967745%2C61392385&listenerId=eddf2aebad29655bb2b6abac276c50ef& ]]>' +
+    '   </Impression>' +
     '   <Creatives>' +
     '    <Creative id=\'28517153\' sequence=\'1\'>' +
     '     <Linear>' +
@@ -358,6 +361,8 @@ describe('freewheelSSP BidAdapter Test', () => {
           netRevenue: true,
           ttl: 360,
           dealId: 'NRJ-PRO-00008',
+          campaignId: 'SMF-WOW-55555',
+          bannerId: '12345',
           ad: ad
         }
       ];
@@ -365,6 +370,8 @@ describe('freewheelSSP BidAdapter Test', () => {
       let result = spec.interpretResponse(response, request[0]);
       expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
       expect(result[0].dealId).to.equal('NRJ-PRO-00008');
+      expect(result[0].campaignId).to.equal('SMF-WOW-55555');
+      expect(result[0].bannerId).to.equal('12345');
     });
 
     it('should get correct bid response with formated ad', () => {
@@ -381,6 +388,8 @@ describe('freewheelSSP BidAdapter Test', () => {
           netRevenue: true,
           ttl: 360,
           dealId: 'NRJ-PRO-00008',
+          campaignId: 'SMF-WOW-55555',
+          bannerId: '12345',
           ad: formattedAd
         }
       ];
@@ -388,6 +397,8 @@ describe('freewheelSSP BidAdapter Test', () => {
       let result = spec.interpretResponse(response, request[0]);
       expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
       expect(result[0].dealId).to.equal('NRJ-PRO-00008');
+      expect(result[0].campaignId).to.equal('SMF-WOW-55555');
+      expect(result[0].bannerId).to.equal('12345');
     });
 
     it('handles nobid responses', () => {
@@ -398,6 +409,7 @@ describe('freewheelSSP BidAdapter Test', () => {
       expect(result.length).to.equal(0);
     });
   });
+
   describe('interpretResponseForVideo', () => {
     let bidRequests = [
       {
@@ -461,6 +473,12 @@ describe('freewheelSSP BidAdapter Test', () => {
     '   <AdSystem>Adswizz</AdSystem>' +
     '   <Impression id="dmp-1617899169-2513"></Impression>' +
     '   <Impression id="user-sync-1617899169-1">https://ads.stickyadstv.com/auto-user-sync?dealId=NRJ-PRO-00008</Impression>' +
+    '   <Impression id="727435745">' +
+    '   <![CDATA[ https://ads.stickyadstv.com/www/delivery/swfIndex.php?reqType=AdsDisplayStarted&dealId=NRJ-PRO-00008&campaignId=SMF-WOW-55555&adId=12345&rootViewKey=1607626986121029-54&sessionId=e3230a6bef6e0d2327422ff5282435&zoneId=2003&impId=1&cb=1932360&trackingIds=19651873%2C28161297%2C28161329%2C29847601%2C29967745%2C61392385&listenerId=eddf2aebad29655bb2b6abac276c50ef& ]]>' +
+    '   </Impression>' +
+    '   <Impression id="727435745">' +
+    '   <![CDATA[ https://ads.stickyadstv.com/www/delivery/swfIndex.php?reqType=AdsDisplayStarted&dealId=NRJ-PRO-00128&campaignId=SMF-WOW-22222&adId=77777&sessionId=e3230a6bef6e0d2327422ff5282435&zoneId=2003&impId=1&cb=1932360&trackingIds=19651873%2C28161297%2C28161329%2C29847601%2C29967745%2C61392385&listenerId=eddf2aebad29655bb2b6abac276c50ef& ]]>' +
+    '   </Impression>' +
     '   <Creatives>' +
     '    <Creative id=\'28517153\' sequence=\'1\'>' +
     '     <Linear>' +
@@ -495,6 +513,8 @@ describe('freewheelSSP BidAdapter Test', () => {
           netRevenue: true,
           ttl: 360,
           dealId: 'NRJ-PRO-00008',
+          campaignId: 'SMF-WOW-55555',
+          bannerId: '12345',
           vastXml: response,
           mediaType: 'video',
           ad: ad
@@ -504,6 +524,8 @@ describe('freewheelSSP BidAdapter Test', () => {
       let result = spec.interpretResponse(response, request[0]);
       expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
       expect(result[0].dealId).to.equal('NRJ-PRO-00008');
+      expect(result[0].campaignId).to.equal('SMF-WOW-55555');
+      expect(result[0].bannerId).to.equal('12345');
     });
 
     it('should get correct bid response with formated ad', () => {
@@ -520,6 +542,8 @@ describe('freewheelSSP BidAdapter Test', () => {
           netRevenue: true,
           ttl: 360,
           dealId: 'NRJ-PRO-00008',
+          campaignId: 'SMF-WOW-55555',
+          bannerId: '12345',
           vastXml: response,
           mediaType: 'video',
           ad: formattedAd
@@ -529,6 +553,8 @@ describe('freewheelSSP BidAdapter Test', () => {
       let result = spec.interpretResponse(response, request[0]);
       expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
       expect(result[0].dealId).to.equal('NRJ-PRO-00008');
+      expect(result[0].campaignId).to.equal('SMF-WOW-55555');
+      expect(result[0].bannerId).to.equal('12345');
     });
 
     it('handles nobid responses', () => {

From 24538cafbde25d286a17765abd0ae5bdc7c41212 Mon Sep 17 00:00:00 2001
From: liranbaruch <liranb@ironsrc.com>
Date: Tue, 5 Jan 2021 15:10:32 +0200
Subject: [PATCH 123/304] IronSourceBidAdapter: Change logic of detect pageURL
 (#6147)

* Change ironsource to be lower case all over code

* Add test mode to the IronSource bidder

* get dynamic ttl from the server response

* Change page_url logic
---
 modules/ironsourceBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ironsourceBidAdapter.js b/modules/ironsourceBidAdapter.js
index e23c0cb857d..ba510e86e7f 100644
--- a/modules/ironsourceBidAdapter.js
+++ b/modules/ironsourceBidAdapter.js
@@ -243,7 +243,7 @@ function generateParameters(bid, bidderRequest) {
 
   if (bidderRequest && bidderRequest.refererInfo) {
     requestParams.referrer = utils.deepAccess(bidderRequest, 'refererInfo.referer');
-    requestParams.page_url = utils.deepAccess(bidderRequest, 'refererInfo.canonicalUrl') || config.getConfig('pageUrl') || utils.deepAccess(window, 'location.href');
+    requestParams.page_url = config.getConfig('pageUrl') || utils.deepAccess(window, 'location.href');
   }
 
   return requestParams;

From 0fc9e23d3078ab7aa04be6379c0937874d2c86ec Mon Sep 17 00:00:00 2001
From: Janko Ulaga <janko.ulaga@gmail.com>
Date: Tue, 5 Jan 2021 21:24:21 +0100
Subject: [PATCH 124/304] LiveConnect, lighter-weight module (#6016)

* NT. Trying out how webpack plays with env vars

* NT. Test run before merge

* NT. POC kinda ok for me now

* NT. Updated the lc version to released one.

* NT. Reverting test data. Ready for PR

* NT. Fixing linting.

* NT. Fixing the email hash scenario.
---
 modules/liveIntentIdSystem.js                 |  41 ++--
 package-lock.json                             |  24 +--
 package.json                                  |   2 +-
 .../modules/liveIntentIdMinimalSystem_spec.js | 188 ++++++++++++++++++
 test/spec/modules/liveIntentIdSystem_spec.js  |   4 +-
 webpack.conf.js                               |   3 +-
 6 files changed, 221 insertions(+), 41 deletions(-)
 create mode 100644 test/spec/modules/liveIntentIdMinimalSystem_spec.js

diff --git a/modules/liveIntentIdSystem.js b/modules/liveIntentIdSystem.js
index 4f18c73ad2a..f87d67aae8e 100644
--- a/modules/liveIntentIdSystem.js
+++ b/modules/liveIntentIdSystem.js
@@ -8,9 +8,10 @@ import * as utils from '../src/utils.js';
 import { triggerPixel } from '../src/utils.js';
 import { ajaxBuilder } from '../src/ajax.js';
 import { submodule } from '../src/hook.js';
-import { LiveConnect } from 'live-connect-js/cjs/live-connect.js';
+import { LiveConnect } from 'live-connect-js/esm/initializer.js';
 import { gdprDataHandler, uspDataHandler } from '../src/adapterManager.js';
 import { getStorageManager } from '../src/storageManager.js';
+import { MinimalLiveConnect } from 'live-connect-js/esm/minimal-live-connect.js';
 
 const MODULE_NAME = 'liveIntentId';
 export const storage = getStorageManager(null, MODULE_NAME);
@@ -42,26 +43,18 @@ export function reset() {
   if (window && window.liQ) {
     window.liQ = [];
   }
+  liveIntentIdSubmodule.setModuleMode(null)
   eventFired = false;
   liveConnect = null;
 }
 
 function parseLiveIntentCollectorConfig(collectConfig) {
   const config = {};
-  if (collectConfig) {
-    if (collectConfig.appId) {
-      config.appId = collectConfig.appId;
-    }
-    if (collectConfig.fpiStorageStrategy) {
-      config.storageStrategy = collectConfig.fpiStorageStrategy;
-    }
-    if (collectConfig.fpiExpirationDays) {
-      config.expirationDays = collectConfig.fpiExpirationDays;
-    }
-    if (collectConfig.collectorUrl) {
-      config.collectorUrl = collectConfig.collectorUrl;
-    }
-  }
+  collectConfig = collectConfig || {}
+  collectConfig.appId && (config.appId = collectConfig.appId);
+  collectConfig.fpiStorageStrategy && (config.storageStrategy = collectConfig.fpiStorageStrategy);
+  collectConfig.fpiExpirationDays && (config.expirationDays = collectConfig.fpiExpirationDays);
+  collectConfig.collectorUrl && (config.collectorUrl = collectConfig.collectorUrl);
   return config;
 }
 
@@ -90,9 +83,6 @@ function initializeLiveConnect(configParams) {
   liveConnectConfig.wrapperName = 'prebid';
   liveConnectConfig.identityResolutionConfig = identityResolutionConfig;
   liveConnectConfig.identifiersToResolve = configParams.identifiersToResolve || [];
-  if (configParams.emailHash) {
-    liveConnectConfig.eventSource = { hash: configParams.emailHash }
-  }
   const usPrivacyString = uspDataHandler.getConsentData();
   if (usPrivacyString) {
     liveConnectConfig.usPrivacyString = usPrivacyString;
@@ -105,7 +95,10 @@ function initializeLiveConnect(configParams) {
 
   // The second param is the storage object, LS & Cookie manipulation uses PBJS utils.
   // The third param is the ajax and pixel object, the ajax and pixel use PBJS utils.
-  liveConnect = LiveConnect(liveConnectConfig, storage, calls);
+  liveConnect = liveIntentIdSubmodule.getInitializer()(liveConnectConfig, storage, calls);
+  if (configParams.emailHash) {
+    liveConnect.push({ hash: configParams.emailHash })
+  }
   return liveConnect;
 }
 
@@ -118,12 +111,20 @@ function tryFireEvent() {
 
 /** @type {Submodule} */
 export const liveIntentIdSubmodule = {
+  moduleMode: process.env.LiveConnectMode,
   /**
    * used to link submodule with config
    * @type {string}
    */
   name: MODULE_NAME,
 
+  setModuleMode(mode) {
+    this.moduleMode = mode
+  },
+  getInitializer() {
+    return this.moduleMode === 'minimal' ? MinimalLiveConnect : LiveConnect
+  },
+
   /**
    * decode the stored id value for passing to bid requests. Note that lipb object is a wrapper for everything, and
    * internally it could contain more data other than `lipbid`(e.g. `segments`) depending on the `partner` and
@@ -136,7 +137,7 @@ export const liveIntentIdSubmodule = {
   decode(value, config) {
     const configParams = (config && config.params) || {};
     function composeIdObject(value) {
-      const base = { 'lipbid': value['unifiedId'] };
+      const base = { 'lipbid': value.unifiedId };
       delete value.unifiedId;
       return { 'lipb': { ...base, ...value } };
     }
diff --git a/package-lock.json b/package-lock.json
index bf95487ed9d..330298cbaac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.14.0-pre",
+  "version": "4.15.0-pre",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1920,11 +1920,6 @@
         "schema-utils": "^2.7.0"
       }
     },
-    "@kiosked/ulid": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@kiosked/ulid/-/ulid-3.0.0.tgz",
-      "integrity": "sha512-ZKt2KIgGHDaGfKt6FjYvCpDvBXZRRoE8b+wDOlAV76aXKpq6ITiSUnPYevR4y55NKDnwCvwOrjWe+aVOCAK8kQ=="
-    },
     "@sindresorhus/is": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-3.0.0.tgz",
@@ -2771,7 +2766,8 @@
     "abab": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
-      "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg=="
+      "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==",
+      "dev": true
     },
     "abbrev": {
       "version": "1.0.9",
@@ -5069,11 +5065,6 @@
       "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
       "dev": true
     },
-    "browser-cookies": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browser-cookies/-/browser-cookies-1.2.0.tgz",
-      "integrity": "sha1-/KP/ubamOq3E2MCZnGtX0Pp9KbU="
-    },
     "browser-process-hrtime": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
@@ -15727,13 +15718,10 @@
       "dev": true
     },
     "live-connect-js": {
-      "version": "1.1.23",
-      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-1.1.23.tgz",
-      "integrity": "sha512-alOXlYyDdMXt8zzCIs3+iCrdi6r/69c7YRN3sMETa3b2cCOxep3i9j2O0iepk2hxT5JxiR1MvqlqdWAL9d2Hcg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-2.0.0.tgz",
+      "integrity": "sha512-Xhrj1JU5LoLjJuujjTlvDfc/n3Shzk2hPlYmLdCx/lsltFFVuCFa9uM8u5mcHlmOUKP5pu9I54bAITxZBMHoXg==",
       "requires": {
-        "@kiosked/ulid": "^3.0.0",
-        "abab": "^2.0.3",
-        "browser-cookies": "^1.2.0",
         "tiny-hashes": "1.0.1"
       }
     },
diff --git a/package.json b/package.json
index f65b996a393..9688d57c449 100644
--- a/package.json
+++ b/package.json
@@ -112,6 +112,6 @@
     "fun-hooks": "^0.9.9",
     "jsencrypt": "^3.0.0-rc.1",
     "just-clone": "^1.0.2",
-    "live-connect-js": "^1.1.23"
+    "live-connect-js": "2.0.0"
   }
 }
diff --git a/test/spec/modules/liveIntentIdMinimalSystem_spec.js b/test/spec/modules/liveIntentIdMinimalSystem_spec.js
new file mode 100644
index 00000000000..b0f97ae0300
--- /dev/null
+++ b/test/spec/modules/liveIntentIdMinimalSystem_spec.js
@@ -0,0 +1,188 @@
+import * as utils from 'src/utils.js';
+import { gdprDataHandler, uspDataHandler } from '../../../src/adapterManager.js';
+import { server } from 'test/mocks/xhr.js';
+import { liveIntentIdSubmodule, reset as resetLiveIntentIdSubmodule, storage } from 'modules/liveIntentIdSystem.js';
+
+const PUBLISHER_ID = '89899';
+const defaultConfigParams = { params: {publisherId: PUBLISHER_ID} };
+const responseHeader = {'Content-Type': 'application/json'};
+
+describe('LiveIntentMinimalId', function() {
+  let logErrorStub;
+  let uspConsentDataStub;
+  let gdprConsentDataStub;
+  let getCookieStub;
+  let getDataFromLocalStorageStub;
+  let imgStub;
+
+  beforeEach(function() {
+    liveIntentIdSubmodule.setModuleMode('minimal');
+    imgStub = sinon.stub(utils, 'triggerPixel');
+    getCookieStub = sinon.stub(storage, 'getCookie');
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    logErrorStub = sinon.stub(utils, 'logError');
+    uspConsentDataStub = sinon.stub(uspDataHandler, 'getConsentData');
+    gdprConsentDataStub = sinon.stub(gdprDataHandler, 'getConsentData');
+  });
+
+  afterEach(function() {
+    imgStub.restore();
+    getCookieStub.restore();
+    getDataFromLocalStorageStub.restore();
+    logErrorStub.restore();
+    uspConsentDataStub.restore();
+    gdprConsentDataStub.restore();
+    liveIntentIdSubmodule.setModuleMode('minimal');
+    resetLiveIntentIdSubmodule();
+  });
+  it('should not fire an event when getId', function() {
+    uspConsentDataStub.returns('1YNY');
+    gdprConsentDataStub.returns({
+      gdprApplies: true,
+      consentString: 'consentDataString'
+    })
+    liveIntentIdSubmodule.getId(defaultConfigParams);
+    expect(server.requests[0]).to.eql(undefined)
+  });
+
+  it('should not return a decoded identifier when the unifiedId is not present in the value', function() {
+    const result = liveIntentIdSubmodule.decode({ additionalData: 'data' });
+    expect(result).to.be.undefined;
+  });
+
+  it('should initialize LiveConnect and send no data', function() {
+    liveIntentIdSubmodule.getId(defaultConfigParams);
+    liveIntentIdSubmodule.decode({}, defaultConfigParams);
+    liveIntentIdSubmodule.getId(defaultConfigParams);
+    liveIntentIdSubmodule.decode({}, defaultConfigParams);
+    expect(server.requests.length).to.be.eq(0);
+  });
+
+  it('should call the Custom URL of the LiveIntent Identity Exchange endpoint', function() {
+    getCookieStub.returns(null);
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {...defaultConfigParams.params, ...{'url': 'https://dummy.liveintent.com/idex'}} }).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/prebid/89899');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should call the default url of the LiveIntent Identity Exchange endpoint, with a partner', function() {
+    getCookieStub.returns(null);
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
+      ...{
+        'url': 'https://dummy.liveintent.com/idex',
+        'partner': 'rubicon'
+      }
+    } }).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/rubicon/89899');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should call the LiveIntent Identity Exchange endpoint, with no additional query params', function() {
+    getCookieStub.returns(null);
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should log an error and continue to callback if ajax request errors', function() {
+    getCookieStub.returns(null);
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899');
+    request.respond(
+      503,
+      responseHeader,
+      'Unavailable'
+    );
+    expect(logErrorStub.calledOnce).to.be.true;
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should include the LiveConnect identifier when calling the LiveIntent Identity Exchange endpoint', function() {
+    const oldCookie = 'a-xxxx--123e4567-e89b-12d3-a456-426655440000'
+    getDataFromLocalStorageStub.withArgs('_li_duid').returns(oldCookie);
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}`);
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should include the LiveConnect identifier and additional Identifiers to resolve', function() {
+    const oldCookie = 'a-xxxx--123e4567-e89b-12d3-a456-426655440000'
+    getDataFromLocalStorageStub.withArgs('_li_duid').returns(oldCookie);
+    getDataFromLocalStorageStub.withArgs('_thirdPC').returns('third-pc');
+    const configParams = { params: {
+      ...defaultConfigParams.params,
+      ...{
+        'identifiersToResolve': ['_thirdPC']
+      }
+    }};
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId(configParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}&_thirdPC=third-pc`);
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should include an additional identifier value to resolve even if it is an object', function() {
+    getCookieStub.returns(null);
+    getDataFromLocalStorageStub.withArgs('_thirdPC').returns({'key': 'value'});
+    const configParams = { params: {
+      ...defaultConfigParams.params,
+      ...{
+        'identifiersToResolve': ['_thirdPC']
+      }
+    }};
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId(configParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?_thirdPC=%7B%22key%22%3A%22value%22%7D');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+});
diff --git a/test/spec/modules/liveIntentIdSystem_spec.js b/test/spec/modules/liveIntentIdSystem_spec.js
index aae60cbcd19..3b4e4b9d9a7 100644
--- a/test/spec/modules/liveIntentIdSystem_spec.js
+++ b/test/spec/modules/liveIntentIdSystem_spec.js
@@ -2,7 +2,8 @@ import { liveIntentIdSubmodule, reset as resetLiveIntentIdSubmodule, storage } f
 import * as utils from 'src/utils.js';
 import { gdprDataHandler, uspDataHandler } from '../../../src/adapterManager.js';
 import { server } from 'test/mocks/xhr.js';
-
+resetLiveIntentIdSubmodule();
+liveIntentIdSubmodule.setModuleMode('standard')
 const PUBLISHER_ID = '89899';
 const defaultConfigParams = { params: {publisherId: PUBLISHER_ID} };
 const responseHeader = {'Content-Type': 'application/json'}
@@ -16,6 +17,7 @@ describe('LiveIntentId', function() {
   let imgStub;
 
   beforeEach(function() {
+    liveIntentIdSubmodule.setModuleMode('standard');
     imgStub = sinon.stub(utils, 'triggerPixel');
     getCookieStub = sinon.stub(storage, 'getCookie');
     getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
diff --git a/webpack.conf.js b/webpack.conf.js
index a5c75fa8a1a..6f0841757b0 100644
--- a/webpack.conf.js
+++ b/webpack.conf.js
@@ -13,7 +13,8 @@ var neverBundle = [
 ];
 
 var plugins = [
-  new RequireEnsureWithoutJsonp()
+  new RequireEnsureWithoutJsonp(),
+  new webpack.EnvironmentPlugin(['LiveConnectMode'])
 ];
 
 if (argv.analyze) {

From 56d9930966ae6e21ecc8f562e463d0b76e8f728a Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Tue, 5 Jan 2021 15:49:20 -0800
Subject: [PATCH 125/304] Remove hard string req, just convert instead (#6160)

---
 modules/rubiconAnalyticsAdapter.js            |  8 ++++--
 .../modules/rubiconAnalyticsAdapter_spec.js   | 28 +++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index 38d83a40bc7..670adc9fe6d 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -384,8 +384,12 @@ function getUtmParams() {
 function getFpkvs() {
   rubiConf.fpkvs = Object.assign((rubiConf.fpkvs || {}), getUtmParams());
 
-  const isValid = rubiConf.fpkvs && typeof rubiConf.fpkvs === 'object' && Object.keys(rubiConf.fpkvs).every(key => typeof rubiConf.fpkvs[key] === 'string');
-  return isValid ? rubiConf.fpkvs : {};
+  // convert all values to strings
+  Object.keys(rubiConf.fpkvs).forEach(key => {
+    rubiConf.fpkvs[key] = rubiConf.fpkvs[key] + '';
+  });
+
+  return rubiConf.fpkvs;
 }
 
 let samplingFactor = 1;
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index 1dd524e1838..78792ff2ce7 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -1089,6 +1089,34 @@ describe('rubicon analytics adapter', function () {
         expect(message).to.deep.equal(expectedMessage);
       });
 
+      it('should convert kvs to strings before sending', function () {
+        config.setConfig({rubicon: {
+          fpkvs: {
+            number: 24,
+            boolean: false,
+            string: 'hello',
+            array: ['one', 2, 'three'],
+            object: {one: 'two'}
+          }
+        }});
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session.pvid = STUBBED_UUID.slice(0, 8);
+        expectedMessage.fpkvs = [
+          {key: 'number', value: '24'},
+          {key: 'boolean', value: 'false'},
+          {key: 'string', value: 'hello'},
+          {key: 'array', value: 'one,2,three'},
+          {key: 'object', value: '[object Object]'}
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
       it('should use the query utm param rubicon kv value and pass updated kv and pvid when defined', function () {
         sandbox.stub(utils, 'getWindowLocation').returns({'search': '?utm_source=other', 'pbjs_debug': 'true'});
 

From c2a50bab34d6947c81d7234fa94c8004e2b44bd9 Mon Sep 17 00:00:00 2001
From: Jozef Bartek <31618107+jbartek25@users.noreply.github.com>
Date: Wed, 6 Jan 2021 11:50:46 +0100
Subject: [PATCH 126/304] Add video skippability params (#6161)

---
 modules/improvedigitalBidAdapter.js           | 39 +++++++-
 .../modules/improvedigitalBidAdapter_spec.js  | 90 ++++++++++++++++++-
 2 files changed, 125 insertions(+), 4 deletions(-)

diff --git a/modules/improvedigitalBidAdapter.js b/modules/improvedigitalBidAdapter.js
index 0e2d8f6f7dd..0432adf2b2d 100644
--- a/modules/improvedigitalBidAdapter.js
+++ b/modules/improvedigitalBidAdapter.js
@@ -4,12 +4,14 @@ import { config } from '../src/config.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import {Renderer} from '../src/Renderer.js';
 import { createEidsArray } from './userId/eids.js';
+import includes from 'core-js-pure/features/array/includes.js';
 
 const BIDDER_CODE = 'improvedigital';
 const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
+const VIDEO_TARGETING = ['skip', 'skipmin', 'skipafter'];
 
 export const spec = {
-  version: '7.1.0',
+  version: '7.2.0',
   code: BIDDER_CODE,
   gvlid: 253,
   aliases: ['id'],
@@ -202,6 +204,21 @@ function isOutstreamVideo(bid) {
   return videoMediaType && context === 'outstream';
 }
 
+function getVideoTargetingParams(bid) {
+  const result = {};
+  Object.keys(Object(bid.mediaTypes.video))
+    .filter(key => includes(VIDEO_TARGETING, key))
+    .forEach(key => {
+      result[ key ] = bid.mediaTypes.video[ key ];
+    });
+  Object.keys(Object(bid.params.video))
+    .filter(key => includes(VIDEO_TARGETING, key))
+    .forEach(key => {
+      result[ key ] = bid.params.video[ key ];
+    });
+  return result;
+}
+
 function outstreamRender(bid) {
   bid.renderer.push(() => {
     window.ANOutstreamVideo.renderAd({
@@ -255,6 +272,9 @@ function getNormalizedBidRequest(bid) {
   if (isInstreamVideo(bid)) {
     normalizedBidRequest.adTypes = [ VIDEO ];
   }
+  if (isInstreamVideo(bid) || isOutstreamVideo(bid)) {
+    normalizedBidRequest.video = getVideoTargetingParams(bid);
+  }
   if (placementId) {
     normalizedBidRequest.placementId = placementId;
   } else {
@@ -400,7 +420,7 @@ export function ImproveDigitalAdServerJSClient(endPoint) {
     AD_SERVER_BASE_URL: 'ice.360yield.com',
     END_POINT: endPoint || 'hb',
     AD_SERVER_URL_PARAM: 'jsonp=',
-    CLIENT_VERSION: 'JS-6.3.0',
+    CLIENT_VERSION: 'JS-6.4.0',
     MAX_URL_LENGTH: 2083,
     ERROR_CODES: {
       MISSING_PLACEMENT_PARAMS: 2,
@@ -609,6 +629,21 @@ export function ImproveDigitalAdServerJSClient(endPoint) {
     if (placementObject.transactionId) {
       impressionObject.tid = placementObject.transactionId;
     }
+    if (!utils.isEmpty(placementObject.video)) {
+      const video = Object.assign({}, placementObject.video);
+      // skip must be 0 or 1
+      if (video.skip !== 1) {
+        delete video.skipmin;
+        delete video.skipafter;
+        if (video.skip !== 0) {
+          utils.logWarn(`video.skip: invalid value '${video.skip}'. Expected 0 or 1`);
+          delete video.skip;
+        }
+      }
+      if (!utils.isEmpty(video)) {
+        impressionObject.video = video;
+      }
+    }
     if (placementObject.keyValues) {
       for (let key in placementObject.keyValues) {
         for (let valueCounter = 0; valueCounter < placementObject.keyValues[key].length; valueCounter++) {
diff --git a/test/spec/modules/improvedigitalBidAdapter_spec.js b/test/spec/modules/improvedigitalBidAdapter_spec.js
index 89ec5aed8c3..4d0da695d95 100644
--- a/test/spec/modules/improvedigitalBidAdapter_spec.js
+++ b/test/spec/modules/improvedigitalBidAdapter_spec.js
@@ -28,6 +28,12 @@ describe('Improve Digital Adapter Tests', function () {
     sizes: [[300, 250], [160, 600], ['blah', 150], [-1, 300], [300, -5]]
   };
 
+  const videoParams = {
+    skip: 1,
+    skipmin: 5,
+    skipafter: 30
+  }
+
   const instreamBidRequest = utils.deepClone(simpleBidRequest);
   instreamBidRequest.mediaTypes = {
     video: {
@@ -280,14 +286,23 @@ describe('Improve Digital Adapter Tests', function () {
       expect(params.bid_request.referrer).to.equal('https://blah.com/test.html');
     });
 
+    it('should not add video params for banner', function () {
+      const bidRequest = JSON.parse(JSON.stringify(simpleBidRequest));
+      bidRequest.params.video = videoParams;
+      const request = spec.buildRequests([bidRequest], bidderRequest)[0];
+      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].video).to.not.exist;
+    });
+
     it('should add ad type for instream video', function () {
-      let bidRequest = Object.assign({}, simpleBidRequest);
+      let bidRequest = JSON.parse(JSON.stringify(simpleBidRequest));
       bidRequest.mediaType = 'video';
       let request = spec.buildRequests([bidRequest], bidderRequest)[0];
       let params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
       expect(params.bid_request.imp[0].ad_types).to.deep.equal(['video']);
+      expect(params.bid_request.imp[0].video).to.not.exist;
 
-      bidRequest = Object.assign({}, simpleBidRequest);
+      bidRequest = JSON.parse(JSON.stringify(simpleBidRequest));
       bidRequest.mediaTypes = {
         video: {
           context: 'instream',
@@ -297,18 +312,89 @@ describe('Improve Digital Adapter Tests', function () {
       request = spec.buildRequests([bidRequest], bidderRequest)[0];
       params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
       expect(params.bid_request.imp[0].ad_types).to.deep.equal(['video']);
+      expect(params.bid_request.imp[0].video).to.not.exist;
     });
 
     it('should not set ad type for outstream video', function() {
       const request = spec.buildRequests([outstreamBidRequest])[0];
       const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
       expect(params.bid_request.imp[0].ad_types).to.not.exist;
+      expect(params.bid_request.imp[0].video).to.not.exist;
     });
 
     it('should not set ad type for multi-format bids', function() {
       const request = spec.buildRequests([multiFormatBidRequest], bidderRequest)[0];
       const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
       expect(params.bid_request.imp[0].ad_types).to.not.exist;
+      expect(params.bid_request.imp[0].video).to.not.exist;
+    });
+
+    it('should set video params for instream', function() {
+      const bidRequest = JSON.parse(JSON.stringify(instreamBidRequest));
+      bidRequest.params.video = videoParams;
+      const request = spec.buildRequests([bidRequest])[0];
+      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].video).to.deep.equal(videoParams);
+    });
+
+    it('should set skip params only if skip=1', function() {
+      const bidRequest = JSON.parse(JSON.stringify(instreamBidRequest));
+      // 1
+      const videoTest = {
+        skip: 1,
+        skipmin: 5,
+        skipafter: 30
+      }
+      bidRequest.params.video = videoTest;
+      let request = spec.buildRequests([bidRequest])[0];
+      let params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].video).to.deep.equal(videoTest);
+
+      // 0 - leave out skipmin and skipafter
+      videoTest.skip = 0;
+      bidRequest.params.video = videoTest;
+      request = spec.buildRequests([bidRequest])[0];
+      params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].video).to.deep.equal({ skip: 0 });
+
+      // other
+      videoTest.skip = 'blah';
+      bidRequest.params.video = videoTest;
+      request = spec.buildRequests([bidRequest])[0];
+      params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].video).to.not.exist;
+    });
+
+    it('should ignore invalid/unexpected video params', function() {
+      const bidRequest = JSON.parse(JSON.stringify(instreamBidRequest));
+      // 1
+      const videoTest = {
+        skip: 1,
+        skipmin: 5,
+        skipafter: 30
+      }
+      const videoTestInvParam = Object.assign({}, videoTest);
+      videoTestInvParam.blah = 1;
+      bidRequest.params.video = videoTestInvParam;
+      let request = spec.buildRequests([bidRequest])[0];
+      let params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].video).to.deep.equal(videoTest);
+    });
+
+    it('should set video params for outstream', function() {
+      const bidRequest = JSON.parse(JSON.stringify(outstreamBidRequest));
+      bidRequest.params.video = videoParams;
+      const request = spec.buildRequests([bidRequest])[0];
+      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].video).to.deep.equal(videoParams);
+    });
+
+    it('should set video params for multi-format', function() {
+      const bidRequest = JSON.parse(JSON.stringify(multiFormatBidRequest));
+      bidRequest.params.video = videoParams;
+      const request = spec.buildRequests([bidRequest])[0];
+      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].video).to.deep.equal(videoParams);
     });
 
     it('should not set Prebid sizes in bid request for instream video', function () {

From c832131091afdc82091659acea6553b3210c6b97 Mon Sep 17 00:00:00 2001
From: Pub-X <63354024+Pub-X@users.noreply.github.com>
Date: Wed, 6 Jan 2021 20:05:56 +0900
Subject: [PATCH 127/304] pubx bid adapter: add getUserSyncs (#6164)

---
 modules/pubxBidAdapter.js                | 47 +++++++++++++++++
 test/spec/modules/pubxBidAdapter_spec.js | 64 ++++++++++++++++++++++++
 2 files changed, 111 insertions(+)

diff --git a/modules/pubxBidAdapter.js b/modules/pubxBidAdapter.js
index 44c95e8e19a..35d75e96f95 100644
--- a/modules/pubxBidAdapter.js
+++ b/modules/pubxBidAdapter.js
@@ -1,6 +1,7 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 const BIDDER_CODE = 'pubx';
 const BID_ENDPOINT = 'https://api.primecaster.net/adlogue/api/slot/bid';
+const USER_SYNC_URL = 'https://api.primecaster.net/primecaster_dmppv.html'
 export const spec = {
   code: BIDDER_CODE,
   isBidRequestValid: function(bid) {
@@ -42,6 +43,52 @@ export const spec = {
       bidResponses.push(bidResponse);
     } else {};
     return bidResponses;
+  },
+  /**
+   * Determine which user syncs should occur
+   * @param {object} syncOptions
+   * @param {array} serverResponses
+   * @returns {array} User sync pixels
+   */
+  getUserSyncs: function (syncOptions, serverResponses) {
+    const kwTag = document.getElementsByName('keywords');
+    let kwString = '';
+    let kwEnc = '';
+    let titleContent = !!document.title && document.title;
+    let titleEnc = '';
+    let descContent = !!document.getElementsByName('description') && !!document.getElementsByName('description')[0] && document.getElementsByName('description')[0].content;
+    let descEnc = '';
+    const pageUrl = location.href.replace(/\?.*$/, '');
+    const pageEnc = encodeURIComponent(pageUrl);
+    const refUrl = document.referrer.replace(/\?.*$/, '');
+    const refEnc = encodeURIComponent(refUrl);
+    if (kwTag.length) {
+      const kwContents = kwTag[0].content;
+      if (kwContents.length > 20) {
+        const kwArray = kwContents.substr(0, 20).split(',');
+        kwArray.pop();
+        kwString = kwArray.join();
+      } else {
+        kwString = kwContents;
+      }
+      kwEnc = encodeURIComponent(kwString)
+    } else { }
+    if (titleContent) {
+      if (titleContent.length > 30) {
+        titleContent = titleContent.substr(0, 30);
+      } else {};
+      titleEnc = encodeURIComponent(titleContent);
+    } else { };
+    if (descContent) {
+      if (descContent.length > 60) {
+        descContent = descContent.substr(0, 60);
+      } else {};
+      descEnc = encodeURIComponent(descContent);
+    } else { };
+    return (syncOptions.iframeEnabled) ? [{
+      type: 'iframe',
+      url: USER_SYNC_URL + '?pkw=' + kwEnc + '&pd=' + descEnc + '&pu=' + pageEnc + '&pref=' + refEnc + '&pt=' + titleEnc
+    }] : [];
   }
 }
 registerBidder(spec);
diff --git a/test/spec/modules/pubxBidAdapter_spec.js b/test/spec/modules/pubxBidAdapter_spec.js
index d5f1a0f5da3..6cea8787845 100644
--- a/test/spec/modules/pubxBidAdapter_spec.js
+++ b/test/spec/modules/pubxBidAdapter_spec.js
@@ -60,6 +60,70 @@ describe('pubxAdapter', function () {
     });
   });
 
+  describe('getUserSyncs', function () {
+    const sandbox = sinon.sandbox.create();
+
+    const keywordsText = 'meta1,meta2,meta3,meta4,meta5';
+    const descriptionText = 'description1description2description3description4description5description';
+
+    let documentStubMeta;
+
+    beforeEach(function () {
+      documentStubMeta = sandbox.stub(document, 'getElementsByName');
+      const metaElKeywords = document.createElement('meta');
+      metaElKeywords.setAttribute('name', 'keywords');
+      metaElKeywords.setAttribute('content', keywordsText);
+      documentStubMeta.withArgs('keywords').returns([metaElKeywords]);
+
+      const metaElDescription = document.createElement('meta');
+      metaElDescription.setAttribute('name', 'description');
+      metaElDescription.setAttribute('content', descriptionText);
+      documentStubMeta.withArgs('description').returns([metaElDescription]);
+    });
+
+    afterEach(function () {
+      documentStubMeta.restore();
+    });
+
+    let kwString = '';
+    let kwEnc = '';
+    let descContent = '';
+    let descEnc = '';
+
+    it('returns empty sync array when iframe is not enabled', function () {
+      const syncOptions = {};
+      expect(spec.getUserSyncs(syncOptions)).to.deep.equal([]);
+    });
+
+    it('returns kwEnc when there is kwTag with more than 20 length', function () {
+      const kwArray = keywordsText.substr(0, 20).split(',');
+      kwArray.pop();
+      kwString = kwArray.join();
+      kwEnc = encodeURIComponent(kwString);
+      const syncs = spec.getUserSyncs({ iframeEnabled: true });
+      expect(syncs[0].url).to.include(`pkw=${kwEnc}`);
+    });
+
+    it('returns kwEnc when there is kwTag with more than 60 length', function () {
+      descContent = descContent.substr(0, 60);
+      descEnc = encodeURIComponent(descContent);
+      const syncs = spec.getUserSyncs({ iframeEnabled: true });
+      expect(syncs[0].url).to.include(`pkw=${descEnc}`);
+    });
+
+    it('returns titleEnc when there is titleContent with more than 30 length', function () {
+      let titleText = 'title1title2title3title4title5title';
+      const documentStubTitle = sandbox.stub(document, 'title').value(titleText);
+
+      if (titleText.length > 30) {
+        titleText = titleText.substr(0, 30);
+      }
+
+      const syncs = spec.getUserSyncs({ iframeEnabled: true });
+      expect(syncs[0].url).to.include(`pt=${encodeURIComponent(titleText)}`);
+    });
+  });
+
   describe('interpretResponse', function () {
     const serverResponse = {
       body: {

From 1804e6466cea640bb314b5900c931059dcef8e25 Mon Sep 17 00:00:00 2001
From: chino117 <chino117@hotmail.com>
Date: Wed, 6 Jan 2021 13:51:23 -0300
Subject: [PATCH 128/304] Eplanning: new prioritization metric for adunit sizes
 (#6139)

* Eplanning: new optional parameter is added

* Eplanning: new prioritization metric for adunit sizes

* Eplanning: desktop prioritization test for adunit sizes
---
 modules/eplanningBidAdapter.js                |  52 +++++++-
 test/spec/modules/eplanningBidAdapter_spec.js | 113 +++++++++++++++++-
 2 files changed, 159 insertions(+), 6 deletions(-)

diff --git a/modules/eplanningBidAdapter.js b/modules/eplanningBidAdapter.js
index ac5ba659ad7..f85423ff05c 100644
--- a/modules/eplanningBidAdapter.js
+++ b/modules/eplanningBidAdapter.js
@@ -8,7 +8,7 @@ const BIDDER_CODE = 'eplanning';
 const rnd = Math.random();
 const DEFAULT_SV = 'ads.us.e-planning.net';
 const DEFAULT_ISV = 'i.e-planning.net';
-const PARAMS = ['ci', 'sv', 't', 'ml'];
+const PARAMS = ['ci', 'sv', 't', 'ml', 'sn'];
 const DOLLARS = 'USD';
 const NET_REVENUE = true;
 const TTL = 120;
@@ -16,6 +16,9 @@ const NULL_SIZE = '1x1';
 const FILE = 'file';
 const STORAGE_RENDER_PREFIX = 'pbsr_';
 const STORAGE_VIEW_PREFIX = 'pbvi_';
+const mobileUserAgent = isMobileUserAgent();
+const PRIORITY_ORDER_FOR_MOBILE_SIZES_ASC = ['1x1', '300x50', '320x50', '300x250'];
+const PRIORITY_ORDER_FOR_DESKTOP_SIZES_ASC = ['1x1', '970x90', '970x250', '160x600', '300x600', '728x90', '300x250'];
 
 export const spec = {
   code: BIDDER_CODE,
@@ -140,6 +143,18 @@ export const spec = {
   },
 }
 
+function getUserAgent() {
+  return window.navigator.userAgent;
+}
+function getInnerWidth() {
+  return utils.getWindowSelf().innerWidth;
+}
+function isMobileUserAgent() {
+  return getUserAgent().match(/(mobile)|(ip(hone|ad))|(android)|(blackberry)|(nokia)|(phone)|(opera\smini)/i);
+}
+function isMobileDevice() {
+  return (getInnerWidth() <= 1024) || window.orientation || mobileUserAgent;
+}
 function getUrlConfig(bidRequests) {
   if (isTestRequest(bidRequests)) {
     return getTestConfig(bidRequests.filter(br => br.params.t));
@@ -173,8 +188,32 @@ function getTestConfig(bidRequests) {
   };
 }
 
+function compareSizesByPriority(size1, size2) {
+  var priorityOrderForSizesAsc = isMobileDevice() ? PRIORITY_ORDER_FOR_MOBILE_SIZES_ASC : PRIORITY_ORDER_FOR_DESKTOP_SIZES_ASC;
+  var index1 = priorityOrderForSizesAsc.indexOf(size1);
+  var index2 = priorityOrderForSizesAsc.indexOf(size2);
+  if (index1 > -1) {
+    if (index2 > -1) {
+      return (index1 < index2) ? 1 : -1;
+    } else {
+      return -1;
+    }
+  } else {
+    return (index2 > -1) ? 1 : 0;
+  }
+}
+
+function getSizesSortedByPriority(sizes) {
+  return utils.parseSizesInput(sizes).sort(compareSizesByPriority);
+}
+
 function getSize(bid, first) {
-  return bid.sizes && bid.sizes.length ? utils.parseSizesInput(first ? bid.sizes[0] : bid.sizes).join(',') : NULL_SIZE;
+  var arraySizes = bid.sizes && bid.sizes.length ? getSizesSortedByPriority(bid.sizes) : [];
+  if (arraySizes.length) {
+    return first ? arraySizes[0] : arraySizes.join(',');
+  } else {
+    return NULL_SIZE;
+  }
 }
 
 function getSpacesStruct(bids) {
@@ -197,7 +236,14 @@ function getSpaces(bidRequests, ml) {
   let es = {str: '', vs: '', map: {}};
   es.str = Object.keys(spacesStruct).map(size => spacesStruct[size].map((bid, i) => {
     es.vs += getVs(bid);
-    let name = ml ? cleanName(bid.adUnitCode) : getSize(bid, true) + '_' + i;
+
+    let name;
+    if (ml) {
+      name = cleanName(bid.adUnitCode);
+    } else {
+      name = (bid.params && bid.params.sn) || (getSize(bid, true) + '_' + i);
+    }
+
     es.map[name] = bid.bidId;
     return name + ':' + getSize(bid);
   }).join('+')).join('+');
diff --git a/test/spec/modules/eplanningBidAdapter_spec.js b/test/spec/modules/eplanningBidAdapter_spec.js
index f267680b46b..5969777f4da 100644
--- a/test/spec/modules/eplanningBidAdapter_spec.js
+++ b/test/spec/modules/eplanningBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import { expect } from 'chai';
 import { spec, storage } from 'modules/eplanningBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+import * as utils from 'src/utils.js';
 
 describe('E-Planning Adapter', function () {
   const adapter = newBidder('spec');
@@ -32,6 +33,15 @@ describe('E-Planning Adapter', function () {
     'adUnitCode': ADUNIT_CODE,
     'sizes': [[300, 250], [300, 600]],
   };
+  const validBid2 = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID2,
+    'params': {
+      'ci': CI,
+    },
+    'adUnitCode': ADUNIT_CODE2,
+    'sizes': [[300, 250], [300, 600]],
+  };
   const ML = '1';
   const validBidMappingLinear = {
     'bidder': 'eplanning',
@@ -43,13 +53,14 @@ describe('E-Planning Adapter', function () {
     'adUnitCode': ADUNIT_CODE,
     'sizes': [[300, 250], [300, 600]],
   };
-  const validBid2 = {
+  const SN = 'spaceName';
+  const validBidSpaceName = {
     'bidder': 'eplanning',
-    'bidId': BID_ID2,
+    'bidId': BID_ID,
     'params': {
       'ci': CI,
+      'sn': SN,
     },
-    'adUnitCode': ADUNIT_CODE2,
     'sizes': [[300, 250], [300, 600]],
   };
   const validBidView = {
@@ -95,6 +106,39 @@ describe('E-Planning Adapter', function () {
     'adUnitCode': 'adunit-code',
     'sizes': [[300, 250], [300, 600]],
   };
+  const validBidExistingSizesInPriorityListForMobile = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+    },
+    'adUnitCode': ADUNIT_CODE,
+    'sizes': [[970, 250], [320, 50], [300, 50]],
+  };
+  const validBidSizesNotExistingInPriorityListForMobile = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+    },
+    'adUnitCode': ADUNIT_CODE,
+    'sizes': [[970, 250], [300, 70], [160, 600]],
+  };
+  const validBidExistingSizesInPriorityListForDesktop = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+    },
+    'adUnitCode': ADUNIT_CODE,
+    'sizes': [[970, 250], [300, 600], [300, 250]],
+    'ext': {
+      'screen': {
+        'w': 1025,
+        'h': 1025
+      }
+    }
+  };
   const response = {
     body: {
       'sI': {
@@ -247,6 +291,27 @@ describe('E-Planning Adapter', function () {
 
   describe('buildRequests', function () {
     let bidRequests = [validBid];
+    let sandbox;
+    beforeEach(() => {
+      sandbox = sinon.sandbox.create();
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    });
+
+    const createWindow = () => {
+      const win = {};
+      win.self = win;
+      win.innerWidth = 1025;
+      return win;
+    };
+
+    function setupSingleWindow(sandBox) {
+      const win = createWindow();
+      sandBox.stub(utils, 'getWindowSelf').returns(win);
+    }
+
     it('should create the url correctly', function () {
       const url = spec.buildRequests(bidRequests, bidderRequest).url;
       expect(url).to.equal('https://ads.us.e-planning.net/hb/1/' + CI + '/1/localhost/ROS');
@@ -278,6 +343,12 @@ describe('E-Planning Adapter', function () {
       expect(e).to.equal(CLEAN_ADUNIT_CODE_ML + ':300x250,300x600');
     });
 
+    it('should return e parameter with space name attribute with value according to the adunit sizes', function () {
+      let bidRequestsSN = [validBidSpaceName];
+      const e = spec.buildRequests(bidRequestsSN, bidderRequest).data.e;
+      expect(e).to.equal(SN + ':300x250,300x600');
+    });
+
     it('should return correct e parameter with more than one adunit', function () {
       const NEW_CODE = ADUNIT_CODE + '2';
       const CLEAN_NEW_CODE = CLEAN_ADUNIT_CODE + '2';
@@ -314,6 +385,23 @@ describe('E-Planning Adapter', function () {
       expect(e).to.equal(CLEAN_ADUNIT_CODE_ML + ':300x250,300x600+' + CLEAN_NEW_CODE + ':100x100');
     });
 
+    it('should return correct e parameter with space name attribute with more than one adunit', function () {
+      let bidRequestsSN = [validBidSpaceName];
+      const NEW_SN = 'anotherNameSpace';
+      const anotherBid = {
+        'bidder': 'eplanning',
+        'params': {
+          'ci': CI,
+          'sn': NEW_SN,
+        },
+        'sizes': [[100, 100]],
+      };
+      bidRequestsSN.push(anotherBid);
+
+      const e = spec.buildRequests(bidRequestsSN, bidderRequest).data.e;
+      expect(e).to.equal(SN + ':300x250,300x600+' + NEW_SN + ':100x100');
+    });
+
     it('should return correct e parameter when the adunit has no size', function () {
       const noSizeBid = {
         'bidder': 'eplanning',
@@ -388,6 +476,25 @@ describe('E-Planning Adapter', function () {
       const dataRequest = request.data;
       expect(dataRequest.ccpa).to.equal('consentCcpa');
     });
+
+    it('should return the e parameter with a value according to the sizes in order corresponding to the mobile priority list of the ad units', function () {
+      let bidRequestsPrioritySizes = [validBidExistingSizesInPriorityListForMobile];
+      const e = spec.buildRequests(bidRequestsPrioritySizes, bidderRequest).data.e;
+      expect(e).to.equal('320x50_0:320x50,300x50,970x250');
+    });
+
+    it('should return the e parameter with a value according to the sizes in order corresponding to the desktop priority list of the ad units', function () {
+      let bidRequestsPrioritySizes = [validBidExistingSizesInPriorityListForDesktop];
+      setupSingleWindow(sandbox);
+      const e = spec.buildRequests(bidRequestsPrioritySizes, bidderRequest).data.e;
+      expect(e).to.equal('300x250_0:300x250,300x600,970x250');
+    });
+
+    it('should return the e parameter with a value according to the sizes in order as they are sent from the ad units', function () {
+      let bidRequestsPrioritySizes2 = [validBidSizesNotExistingInPriorityListForMobile];
+      const e = spec.buildRequests(bidRequestsPrioritySizes2, bidderRequest).data.e;
+      expect(e).to.equal('970x250_0:970x250,300x70,160x600');
+    });
   });
 
   describe('interpretResponse', function () {

From 53183da5cc48b5341758256ab69c4d67c248e96a Mon Sep 17 00:00:00 2001
From: Mike Chowla <mike.chowla@pubmatic.com>
Date: Wed, 6 Jan 2021 13:18:56 -0800
Subject: [PATCH 129/304] Prebid 4.21.0 Release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9688d57c449..3d40f717306 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.21.0-pre",
+  "version": "4.21.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From d47b9616ca043d32427295c1e9e8d01804debc3c Mon Sep 17 00:00:00 2001
From: Mike Chowla <mike.chowla@pubmatic.com>
Date: Wed, 6 Jan 2021 13:40:44 -0800
Subject: [PATCH 130/304] Increment pre version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3d40f717306..0aae435980f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.21.0",
+  "version": "4.22.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From caaad496755a3ed78af23bf33f988d6d3ceb94b0 Mon Sep 17 00:00:00 2001
From: cpuBird <54024689+cpuBird@users.noreply.github.com>
Date: Thu, 7 Jan 2021 18:59:00 +0530
Subject: [PATCH 131/304] changed vdo.ai bidder code to vdoai (#6135)

---
 modules/vdoaiBidAdapter.js                | 2 +-
 modules/vdoaiBidAdapter.md                | 8 ++++----
 test/spec/modules/vdoaiBidAdapter_spec.js | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/vdoaiBidAdapter.js b/modules/vdoaiBidAdapter.js
index d4fda36b1fc..92d665887a5 100644
--- a/modules/vdoaiBidAdapter.js
+++ b/modules/vdoaiBidAdapter.js
@@ -3,7 +3,7 @@ import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
-const BIDDER_CODE = 'vdo.ai';
+const BIDDER_CODE = 'vdoai';
 const ENDPOINT_URL = 'https://prebid.vdo.ai/auction';
 
 export const spec = {
diff --git a/modules/vdoaiBidAdapter.md b/modules/vdoaiBidAdapter.md
index 712adc0ec76..04200cc9be0 100644
--- a/modules/vdoaiBidAdapter.md
+++ b/modules/vdoaiBidAdapter.md
@@ -22,9 +22,9 @@ Module that connects to VDO.AI's demand sources
             },
             bids: [
                 {
-                    bidder: "vdo.ai",
+                    bidder: "vdoai",
                     params: {
-                        placement: 'newsdv77',
+                        placementId: 'newsdv77',
                         bidFloor: 0.01  // Optional
                     }
                 }
@@ -47,9 +47,9 @@ var videoAdUnit = {
   },
   bids: [
     {
-        bidder: "vdo.ai",
+        bidder: "vdoai",
         params: {
-            placement: 'newsdv77'
+            placementId: 'newsdv77'
         }
     }
   ]
diff --git a/test/spec/modules/vdoaiBidAdapter_spec.js b/test/spec/modules/vdoaiBidAdapter_spec.js
index 5318bb43eca..d78a5ce04f6 100644
--- a/test/spec/modules/vdoaiBidAdapter_spec.js
+++ b/test/spec/modules/vdoaiBidAdapter_spec.js
@@ -8,7 +8,7 @@ describe('vdoaiBidAdapter', function () {
   const adapter = newBidder(spec);
   describe('isBidRequestValid', function () {
     let bid = {
-      'bidder': 'vdo.ai',
+      'bidder': 'vdoai',
       'params': {
         placementId: 'testPlacementId'
       },
@@ -27,7 +27,7 @@ describe('vdoaiBidAdapter', function () {
   describe('buildRequests', function () {
     let bidRequests = [
       {
-        'bidder': 'vdo.ai',
+        'bidder': 'vdoai',
         'params': {
           placementId: 'testPlacementId'
         },

From da2f5d11269cd3607be5d53f4dd51115c52660ae Mon Sep 17 00:00:00 2001
From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com>
Date: Fri, 8 Jan 2021 01:51:42 -0500
Subject: [PATCH 132/304] appnexusBidAdapter - add support for netId userID
 (#6114)

---
 modules/appnexusBidAdapter.js                |  8 ++++++++
 test/spec/modules/appnexusBidAdapter_spec.js | 10 ++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index 3a9f37f4ca8..be4df7f55bb 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -249,6 +249,14 @@ export const spec = {
       });
     }
 
+    const netidId = utils.deepAccess(bidRequests[0], `userId.netId`);
+    if (netidId) {
+      eids.push({
+        source: 'netid.de',
+        id: netidId
+      });
+    }
+
     const tdid = utils.deepAccess(bidRequests[0], `userId.tdid`);
     if (tdid) {
       eids.push({
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index a36eab03fe1..81ff5daeaeb 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -822,11 +822,12 @@ describe('AppNexusAdapter', function () {
       expect(request.options).to.deep.equal({withCredentials: false});
     });
 
-    it('should populate eids when ttd id and criteo is available', function () {
+    it('should populate eids when supported userIds are available', function () {
       const bidRequest = Object.assign({}, bidRequests[0], {
         userId: {
           tdid: 'sample-userid',
-          criteoId: 'sample-criteo-userid'
+          criteoId: 'sample-criteo-userid',
+          netId: 'sample-netId-userid'
         }
       });
 
@@ -842,6 +843,11 @@ describe('AppNexusAdapter', function () {
         source: 'criteo.com',
         id: 'sample-criteo-userid',
       });
+
+      expect(payload.eids).to.deep.include({
+        source: 'netid.de',
+        id: 'sample-netId-userid',
+      });
     });
 
     it('should populate iab_support object at the root level if omid support is detected', function () {

From c056832739c8e55711960dee4d92fd1a0f521a1f Mon Sep 17 00:00:00 2001
From: ucfunnel <39581136+ucfunnel@users.noreply.github.com>
Date: Fri, 8 Jan 2021 23:39:34 +0800
Subject: [PATCH 133/304] Update ucfunnelBidAdapter (#6157)

* support TCFv2.0
* support coppa
* support Publisher Domain
* support meta.mediaType and meta.advertiserDomains
* test parameters for validating bids

Co-authored-by: root <root@ubuntu.members.linode.com>
Co-authored-by: Ryan Chou <ryanchou0210@gmail.com>
Co-authored-by: jack.hsieh <moonnight8520@gmail.com>
---
 modules/ucfunnelBidAdapter.js                | 104 ++++++++++++++++---
 test/spec/modules/ucfunnelBidAdapter_spec.js |  31 ++++--
 2 files changed, 116 insertions(+), 19 deletions(-)

diff --git a/modules/ucfunnelBidAdapter.js b/modules/ucfunnelBidAdapter.js
index f9982edef36..d54ad7fb0ee 100644
--- a/modules/ucfunnelBidAdapter.js
+++ b/modules/ucfunnelBidAdapter.js
@@ -1,12 +1,13 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
+import { config } from '../src/config.js';
 import * as utils from '../src/utils.js';
 const storage = getStorageManager();
 const COOKIE_NAME = 'ucf_uid';
 const VER = 'ADGENT_PREBID-2018011501';
 const BIDDER_CODE = 'ucfunnel';
-
+const GVLID = 607;
 const VIDEO_CONTEXT = {
   INSTREAM: 0,
   OUSTREAM: 2
@@ -14,6 +15,7 @@ const VIDEO_CONTEXT = {
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   ENDPOINT: 'https://hb.aralego.com/header',
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
   /**
@@ -65,11 +67,12 @@ export const spec = {
     let bid = {
       requestId: bidRequest.bidId,
       cpm: ad.cpm || 0,
-      creativeId: ad.ad_id || bidRequest.params.adid,
+      creativeId: ad.crid || ad.ad_id || bidRequest.params.adid,
       dealId: ad.deal || null,
       currency: 'USD',
       netRevenue: true,
-      ttl: 1800
+      ttl: 1800,
+      meta: {}
     };
 
     if (bidRequest.params && bidRequest.params.bidfloor && ad.cpm && ad.cpm < bidRequest.params.bidfloor) {
@@ -77,6 +80,10 @@ export const spec = {
     }
     if (ad.creative_type) {
       bid.mediaType = ad.creative_type;
+      bid.meta.mediaType = ad.creative_type;
+    }
+    if (ad.adomain) {
+      bid.meta.advertiserDomains = ad.adomain;
     }
 
     switch (ad.creative_type) {
@@ -124,16 +131,19 @@ export const spec = {
     return [bid];
   },
 
-  getUserSyncs: function(syncOptions) {
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent = {}, uspConsent) {
+    let gdprApplies = (gdprConsent && gdprConsent.gdprApplies) ? '1' : '';
+    let apiVersion = (gdprConsent) ? gdprConsent.apiVersion : '';
+    let consentString = (gdprConsent) ? gdprConsent.consentString : '';
     if (syncOptions.iframeEnabled) {
       return [{
         type: 'iframe',
-        url: 'https://cdn.aralego.net/ucfad/cookie/sync.html'
+        url: 'https://cdn.aralego.net/ucfad/cookie/sync.html' + getCookieSyncParameter(gdprApplies, apiVersion, consentString, uspConsent)
       }];
     } else if (syncOptions.pixelEnabled) {
       return [{
         type: 'image',
-        url: 'https://sync.aralego.com/idSync'
+        url: 'https://sync.aralego.com/idSync' + getCookieSyncParameter(gdprApplies, apiVersion, consentString, uspConsent)
       }];
     }
   }
@@ -146,6 +156,22 @@ function transformSizes(requestSizes) {
   }
 }
 
+function getCookieSyncParameter(gdprApplies, apiVersion, consentString, uspConsent) {
+  let param = '?';
+  if (gdprApplies == '1') {
+    param = param + 'gdpr=1&';
+  }
+  if (apiVersion == 1) {
+    param = param + 'euconsent=' + consentString + '&';
+  } else if (apiVersion == 2) {
+    param = param + 'euconsent-v2=' + consentString + '&';
+  }
+  if (uspConsent) {
+    param = param + 'usprivacy=' + uspConsent;
+  }
+  return (param == '?') ? '' : param;
+}
+
 function parseSizes(bid) {
   let params = bid.params;
   if (bid.mediaType === VIDEO) {
@@ -202,14 +228,14 @@ function getRequestData(bid, bidderRequest) {
     schain: supplyChain,
     fp: bid.params.bidfloor
   };
-
+  addUserId(bidData, bid.userId);
   try {
     bidData.host = window.top.location.hostname;
-    bidData.u = window.top.location.href;
+    bidData.u = config.getConfig('publisherDomain') || window.top.location.href;
     bidData.xr = 0;
   } catch (e) {
     bidData.host = window.location.hostname;
-    bidData.u = document.referrer || window.location.href;
+    bidData.u = config.getConfig('publisherDomain') || bidderRequest.refererInfo.referrer || document.referrer || window.location.href;
     bidData.xr = 1;
   }
 
@@ -253,11 +279,63 @@ function getRequestData(bid, bidderRequest) {
   }
 
   if (bidderRequest && bidderRequest.gdprConsent) {
-    Object.assign(bidData, {
-      gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0,
-      euconsent: bidderRequest.gdprConsent.consentString
-    });
+    if (bidderRequest.gdprConsent.apiVersion == 1) {
+      Object.assign(bidData, {
+        gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0,
+        euconsent: bidderRequest.gdprConsent.consentString
+      });
+    } else if (bidderRequest.gdprConsent.apiVersion == 2) {
+      Object.assign(bidData, {
+        gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0,
+        'euconsent-v2': bidderRequest.gdprConsent.consentString
+      });
+    }
+  }
+
+  if (config.getConfig('coppa')) {
+    bidData.coppa = true;
   }
 
   return bidData;
 }
+
+function addUserId(bidData, userId) {
+  utils._each(userId, (userIdObjectOrValue, userIdProviderKey) => {
+    switch (userIdProviderKey) {
+      case 'sharedid':
+        if (userIdObjectOrValue.id) {
+          bidData[userIdProviderKey + '_id'] = userIdObjectOrValue.id;
+        }
+        if (userIdObjectOrValue.third) {
+          bidData[userIdProviderKey + '_third'] = userIdObjectOrValue.third;
+        }
+        break;
+      case 'haloId':
+        if (userIdObjectOrValue.haloId) {
+          bidData[userIdProviderKey + 'haloId'] = userIdObjectOrValue.haloId;
+        }
+        if (userIdObjectOrValue.auSeg) {
+          bidData[userIdProviderKey + '_auSeg'] = userIdObjectOrValue.auSeg;
+        }
+        break;
+      case 'parrableId':
+        if (userIdObjectOrValue.eid) {
+          bidData[userIdProviderKey + '_eid'] = userIdObjectOrValue.eid;
+        }
+        break;
+      case 'id5id':
+        if (userIdObjectOrValue.uid) {
+          bidData[userIdProviderKey + '_uid'] = userIdObjectOrValue.uid;
+        }
+        if (userIdObjectOrValue.ext && userIdObjectOrValue.ext.linkType) {
+          bidData[userIdProviderKey + '_linkType'] = userIdObjectOrValue.ext.linkType;
+        }
+        break;
+      default:
+        bidData[userIdProviderKey] = userIdObjectOrValue;
+        break;
+    }
+  });
+
+  return bidData;
+}
diff --git a/test/spec/modules/ucfunnelBidAdapter_spec.js b/test/spec/modules/ucfunnelBidAdapter_spec.js
index b5f29287f81..a2939eb95c3 100644
--- a/test/spec/modules/ucfunnelBidAdapter_spec.js
+++ b/test/spec/modules/ucfunnelBidAdapter_spec.js
@@ -1,7 +1,6 @@
 import { expect } from 'chai';
 import { spec } from 'modules/ucfunnelBidAdapter.js';
 import {BANNER, VIDEO, NATIVE} from 'src/mediaTypes.js';
-
 const URL = 'https://hb.aralego.com/header';
 const BIDDER_CODE = 'ucfunnel';
 
@@ -9,6 +8,17 @@ const bidderRequest = {
   uspConsent: '1YNN'
 };
 
+const userId = {
+  'criteoId': 'vYlICF9oREZlTHBGRVdrJTJCUUJnc3U2ckNVaXhrV1JWVUZVSUxzZmJlcnJZR0ZxbVhFRnU5bDAlMkJaUWwxWTlNcmdEeHFrJTJGajBWVlV4T3lFQ0FyRVcxNyUyQlIxa0lLSlFhcWJpTm9PSkdPVkx0JTJCbzlQRTQlM0Q',
+  'id5id': {'uid': 'ID5-8ekgswyBTQqnkEKy0ErmeQ1GN5wV4pSmA-RE4eRedA'},
+  'netId': 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg',
+  'parrableId': {'eid': '01.1608624401.fe44bca9b96873084a0d4e9d0ac5729f13790ba8f8e58fa4707b6b3c096df91c6b5f254992bdad4ab1dd4a89919081e9b877d7a039ac3183709277665bac124f28e277d109f0ff965058'},
+  'pubcid': 'd8aa10fa-d86c-451d-aad8-5f16162a9e64',
+  'sharedid': {'id': '01ESHXW4HD29KMF387T63JQ9H5', 'third': '01ESHXW4HD29KMF387T63JQ9H5'},
+  'tdid': 'D6885E90-2A7A-4E0F-87CB-7734ED1B99A3',
+  'haloId': {}
+}
+
 const validBannerBidReq = {
   bidder: BIDDER_CODE,
   params: {
@@ -18,6 +28,7 @@ const validBannerBidReq = {
   sizes: [[300, 250]],
   bidId: '263be71e91dd9d',
   auctionId: '9ad1fa8d-2297-4660-a018-b39945054746',
+  userId: userId,
   'schain': {
     'ver': '1.0',
     'complete': 1,
@@ -50,7 +61,8 @@ const validBannerBidRes = {
   adm: '<html style="height:100%"><body style="width:300px;height: 100%;padding:0;margin:0 auto;"><div style="width:100%;height:100%;display:table;"><div style="width:100%;height:100%;display:table-cell;text-align:center;vertical-align:middle;"><a href="//www.ucfunnel.com/" target="_blank"><img src="//cdn.aralego.net/ucfad/house/ucf/AdGent-300x250.jpg" width="300px" height="250px" align="middle" style="border:none"></a></div></div></body></html>',
   cpm: 1.01,
   height: 250,
-  width: 300
+  width: 300,
+  crid: 'test-crid'
 };
 
 const invalidBannerBidRes = '';
@@ -112,6 +124,13 @@ const validNativeBidRes = {
   width: 1
 };
 
+const gdprConsent = {
+  consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+  vendorData: {},
+  gdprApplies: true,
+  apiVersion: 2
+};
+
 describe('ucfunnel Adapter', function () {
   describe('request', function () {
     it('should validate bid request', function () {
@@ -253,18 +272,18 @@ describe('ucfunnel Adapter', function () {
 
   describe('cookie sync', function () {
     describe('cookie sync iframe', function () {
-      const result = spec.getUserSyncs({'iframeEnabled': true});
+      const result = spec.getUserSyncs({'iframeEnabled': true}, null, gdprConsent);
 
       it('should return cookie sync iframe info', function () {
         expect(result[0].type).to.equal('iframe');
-        expect(result[0].url).to.equal('https://cdn.aralego.net/ucfad/cookie/sync.html');
+        expect(result[0].url).to.equal('https://cdn.aralego.net/ucfad/cookie/sync.html?gdpr=1&euconsent-v2=CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA&');
       });
     });
     describe('cookie sync image', function () {
-      const result = spec.getUserSyncs({'pixelEnabled': true});
+      const result = spec.getUserSyncs({'pixelEnabled': true}, null, gdprConsent);
       it('should return cookie sync image info', function () {
         expect(result[0].type).to.equal('image');
-        expect(result[0].url).to.equal('https://sync.aralego.com/idSync');
+        expect(result[0].url).to.equal('https://sync.aralego.com/idSync?gdpr=1&euconsent-v2=CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA&');
       });
     });
   });

From 3cc18ad7665a921907eaa2000c3a2532d598fef4 Mon Sep 17 00:00:00 2001
From: msm0504 <51493331+msm0504@users.noreply.github.com>
Date: Fri, 8 Jan 2021 10:53:36 -0500
Subject: [PATCH 134/304] DfpAdServerVideo: Pass GDPR Consent Data (#6143)

* pass GDPR consent data in dfpVideoUrl and dfpAdpodVideoUrl

* Send gdpr param as a number

Co-authored-by: Mark Monday <mmonday@rubiconproject.com>
---
 modules/dfpAdServerVideo.js                | 16 ++++-
 test/spec/modules/dfpAdServerVideo_spec.js | 84 +++++++++++++++++++++-
 2 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/modules/dfpAdServerVideo.js b/modules/dfpAdServerVideo.js
index 13677c90bae..22c904b604c 100644
--- a/modules/dfpAdServerVideo.js
+++ b/modules/dfpAdServerVideo.js
@@ -8,7 +8,7 @@ import { deepAccess, isEmpty, logError, parseSizesInput, formatQS, parseUrl, bui
 import { config } from '../src/config.js';
 import { getHook, submodule } from '../src/hook.js';
 import { auctionManager } from '../src/auctionManager.js';
-import { uspDataHandler } from '../src/adapterManager.js';
+import { gdprDataHandler, uspDataHandler } from '../src/adapterManager.js';
 import events from '../src/events.js';
 import CONSTANTS from '../src/constants.json';
 
@@ -101,6 +101,13 @@ export function buildDfpVideoUrl(options) {
   const descriptionUrl = getDescriptionUrl(bid, options, 'params');
   if (descriptionUrl) { queryParams.description_url = descriptionUrl; }
 
+  const gdprConsent = gdprDataHandler.getConsentData();
+  if (gdprConsent) {
+    if (typeof gdprConsent.gdprApplies === 'boolean') { queryParams.gdpr = Number(gdprConsent.gdprApplies); }
+    if (gdprConsent.consentString) { queryParams.gdpr_consent = gdprConsent.consentString; }
+    if (gdprConsent.addtlConsent) { queryParams.addtl_consent = gdprConsent.addtlConsent; }
+  }
+
   const uspConsent = uspDataHandler.getConsentData();
   if (uspConsent) { queryParams.us_privacy = uspConsent; }
 
@@ -187,6 +194,13 @@ export function buildAdpodVideoUrl({code, params, callback} = {}) {
       { cust_params: encodedCustomParams }
     );
 
+    const gdprConsent = gdprDataHandler.getConsentData();
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') { queryParams.gdpr = Number(gdprConsent.gdprApplies); }
+      if (gdprConsent.consentString) { queryParams.gdpr_consent = gdprConsent.consentString; }
+      if (gdprConsent.addtlConsent) { queryParams.addtl_consent = gdprConsent.addtlConsent; }
+    }
+
     const uspConsent = uspDataHandler.getConsentData();
     if (uspConsent) { queryParams.us_privacy = uspConsent; }
 
diff --git a/test/spec/modules/dfpAdServerVideo_spec.js b/test/spec/modules/dfpAdServerVideo_spec.js
index ed9c968cfa2..eaffca01e06 100644
--- a/test/spec/modules/dfpAdServerVideo_spec.js
+++ b/test/spec/modules/dfpAdServerVideo_spec.js
@@ -7,7 +7,7 @@ import * as utils from 'src/utils.js';
 import { config } from 'src/config.js';
 import { targeting } from 'src/targeting.js';
 import { auctionManager } from 'src/auctionManager.js';
-import { uspDataHandler } from 'src/adapterManager.js';
+import { gdprDataHandler, uspDataHandler } from 'src/adapterManager.js';
 import * as adpod from 'modules/adpod.js';
 import { server } from 'test/mocks/xhr.js';
 
@@ -154,6 +154,78 @@ describe('The DFP video support module', function () {
     expect(queryObject.us_privacy).to.equal(undefined);
   });
 
+  it('should include the GDPR keys when GDPR Consent is available', function () {
+    let gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
+    gdprDataHandlerStub.returns({
+      gdprApplies: true,
+      consentString: 'consent',
+      addtlConsent: 'moreConsent'
+    });
+
+    const bidCopy = utils.deepClone(bid);
+    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
+      hb_adid: 'ad_id',
+    });
+
+    const url = parse(buildDfpVideoUrl({
+      adUnit: adUnit,
+      bid: bidCopy,
+      params: {
+        'iu': 'my/adUnit'
+      }
+    }));
+    const queryObject = utils.parseQS(url.query);
+    expect(queryObject.gdpr).to.equal('1');
+    expect(queryObject.gdpr_consent).to.equal('consent');
+    expect(queryObject.addtl_consent).to.equal('moreConsent');
+    gdprDataHandlerStub.restore();
+  });
+
+  it('should not include the GDPR keys when GDPR Consent is not available', function () {
+    const bidCopy = utils.deepClone(bid);
+    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
+      hb_adid: 'ad_id',
+    });
+
+    const url = parse(buildDfpVideoUrl({
+      adUnit: adUnit,
+      bid: bidCopy,
+      params: {
+        'iu': 'my/adUnit'
+      }
+    }));
+    const queryObject = utils.parseQS(url.query);
+    expect(queryObject.gdpr).to.equal(undefined);
+    expect(queryObject.gdpr_consent).to.equal(undefined);
+    expect(queryObject.addtl_consent).to.equal(undefined);
+  });
+
+  it('should only include the GDPR keys for GDPR Consent fields with values', function () {
+    let gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
+    gdprDataHandlerStub.returns({
+      gdprApplies: true,
+      consentString: 'consent',
+    });
+
+    const bidCopy = utils.deepClone(bid);
+    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
+      hb_adid: 'ad_id',
+    });
+
+    const url = parse(buildDfpVideoUrl({
+      adUnit: adUnit,
+      bid: bidCopy,
+      params: {
+        'iu': 'my/adUnit'
+      }
+    }));
+    const queryObject = utils.parseQS(url.query);
+    expect(queryObject.gdpr).to.equal('1');
+    expect(queryObject.gdpr_consent).to.equal('consent');
+    expect(queryObject.addtl_consent).to.equal(undefined);
+    gdprDataHandlerStub.restore();
+  });
+
   describe('special targeting unit test', function () {
     const allTargetingData = {
       'hb_format': 'video',
@@ -391,6 +463,12 @@ describe('The DFP video support module', function () {
       amStub.returns(getBidsReceived());
       let uspDataHandlerStub = sinon.stub(uspDataHandler, 'getConsentData');
       uspDataHandlerStub.returns('1YYY');
+      let gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
+      gdprDataHandlerStub.returns({
+        gdprApplies: true,
+        consentString: 'consent',
+        addtlConsent: 'moreConsent'
+      });
       let url;
       parse(buildAdpodVideoUrl({
         code: 'adUnitCode-1',
@@ -422,11 +500,15 @@ describe('The DFP video support module', function () {
         expect(queryParams).to.have.property('url');
         expect(queryParams).to.have.property('cust_params');
         expect(queryParams).to.have.property('us_privacy', '1YYY');
+        expect(queryParams).to.have.property('gdpr', '1');
+        expect(queryParams).to.have.property('gdpr_consent', 'consent');
+        expect(queryParams).to.have.property('addtl_consent', 'moreConsent');
 
         const custParams = utils.parseQS(decodeURIComponent(queryParams.cust_params));
         expect(custParams).to.have.property('hb_cache_id', '123');
         expect(custParams).to.have.property('hb_pb_cat_dur', '15.00_395_15s,15.00_406_30s,10.00_395_15s');
         uspDataHandlerStub.restore();
+        gdprDataHandlerStub.restore();
       }
     });
 

From 2db99bcece9002e7ce606e3ac9445adfa9f90684 Mon Sep 17 00:00:00 2001
From: Vidyome <35255015+vidyome@users.noreply.github.com>
Date: Fri, 8 Jan 2021 19:12:51 +0300
Subject: [PATCH 135/304] TE Medya Prebid Adapter (#6168)

* TE Medya Prebid Adapter

Hello @aleksatr ,
We have completed the prebid adapter development for our TE Medya advertisement panel. We ran the tests and checked that it works. I request your review.
Best.

* Create temedyaBidAdapter_spec.js

* Update temedyaBidAdapter_spec.js

* Update temedyaBidAdapter_spec.js

* Update temedyaBidAdapter_spec.js
---
 modules/temedyaBidAdapter.js                | 144 ++++++++++++++++
 modules/temedyaBidAdapter.md                |  64 +++++++
 test/spec/modules/temedyaBidAdapter_spec.js | 177 ++++++++++++++++++++
 3 files changed, 385 insertions(+)
 create mode 100644 modules/temedyaBidAdapter.js
 create mode 100644 modules/temedyaBidAdapter.md
 create mode 100644 test/spec/modules/temedyaBidAdapter_spec.js

diff --git a/modules/temedyaBidAdapter.js b/modules/temedyaBidAdapter.js
new file mode 100644
index 00000000000..4577fb295cd
--- /dev/null
+++ b/modules/temedyaBidAdapter.js
@@ -0,0 +1,144 @@
+import * as utils from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'temedya';
+const ENDPOINT_URL = 'https://adm.vidyome.com/';
+const ENDPOINT_METHOD = 'GET';
+const CURRENCY = 'TRY';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, NATIVE],
+  /**
+  * Determines whether or not the given bid request is valid.
+  *
+  * @param {BidRequest} bid The bid params to validate.
+  * @return boolean True if this is a valid bid, and false otherwise.
+  */
+  isBidRequestValid: function (bid) {
+    return !!(bid.params.widgetId);
+  },
+  /**
+  * Make a server request from the list of BidRequests.
+  *
+  * @param {validBidRequests[]} - an array of bids
+  * @return ServerRequest Info describing the request to the server.
+  */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    return validBidRequests.map(req => {
+      const mediaType = this._isBannerRequest(req) ? 'display' : NATIVE;
+      const data = {
+        wid: req.params.widgetId,
+        type: mediaType,
+        count: (req.params.count > 6 ? 6 : req.params.count) || 1,
+        mediaType: mediaType,
+        requestid: req.bidId
+      };
+      if (mediaType === 'display') {
+        data.sizes = utils.parseSizesInput(
+          req.mediaTypes && req.mediaTypes.banner && req.mediaTypes.banner.sizes
+        ).join('|')
+      }
+      /** @type {ServerRequest} */
+      return {
+        method: ENDPOINT_METHOD,
+        url: ENDPOINT_URL,
+        data: utils.parseQueryStringParameters(data),
+        options: { withCredentials: false, requestId: req.bidId, mediaType: mediaType }
+      };
+    });
+  },
+  /**
+  * Unpack the response from the server into a list of bids.
+  *
+  * @param {ServerResponse} serverResponse A successful response from the server.
+  * @return {Bid[]} An array of bids which were nested inside the server.
+  */
+  interpretResponse: function (serverResponse, bidRequest) {
+    try {
+      const bidResponse = serverResponse.body;
+      const bidResponses = [];
+      if (bidResponse && bidRequest.options.mediaType == NATIVE) {
+        bidResponse.ads.forEach(function(ad) {
+          bidResponses.push({
+            requestId: bidRequest.options.requestId,
+            cpm: parseFloat(ad.assets.cpm) || 1,
+            width: 320,
+            height: 240,
+            creativeId: ad.assets.id,
+            currency: ad.currency || CURRENCY,
+            netRevenue: false,
+            mediaType: NATIVE,
+            ttl: 360,
+            native: {
+              title: ad.assets.title,
+              body: ad.assets.body || '',
+              icon: {
+                url: ad.assets.files[0],
+                width: 320,
+                height: 240
+              },
+              image: {
+                url: ad.assets.files[0],
+                width: 320,
+                height: 240
+              },
+              privacyLink: '',
+              clickUrl: ad.assets.click_url,
+              displayUrl: ad.assets.click_url,
+              cta: '',
+              sponsoredBy: ad.assets.sponsor || '',
+              impressionTrackers: [bidResponse.base.widget.impression + '&ids=' + ad.id + ':' + ad.assets.id],
+            },
+          });
+        });
+      } else if (bidResponse && bidRequest.options.mediaType == 'display') {
+        bidResponse.ads.forEach(function(ad) {
+          let w = ad.assets.width || 300;
+          let h = ad.assets.height || 250;
+          let htmlTag = '<!doctype html><html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" href="https://widget.cdn.vidyome.com/builds/neytivme.css"></head>';
+          htmlTag += '<body><div id="tem_banner" class="size' + w + '-' + h + '" style="width:' + w + 'px;height:' + h + 'px">';
+          htmlTag += '<i onclick="window.open(\'https://www.temedya.com\', \'_blank\')">TE Medya</i>';
+          htmlTag += '<a href="' + ad.assets.click_url + '" target="_blank">';
+          htmlTag += '<div class="image-with-text">';
+          htmlTag += '<div class="tem-img"><img src="' + ad.assets.files[0] + '" style="width:' + w + 'px;height:' + h + 'px;"/></div>';
+          if (ad.assets.title) {
+            htmlTag += '<div class="text-elements">';
+            htmlTag += '<h2>' + ad.assets.title + '</h2>';
+            htmlTag += '<p>' + (ad.assets.sponsor || '') + '</p>';
+            htmlTag += '<em><canvas height="100" width="100"></canvas></em>';
+            htmlTag += '</div>';
+          };
+          htmlTag += '</div></a><img style="display: none;" src="' + bidResponse.base.widget.impression + '&ids=' + ad.id + ':' + ad.assets.id + '">';
+          htmlTag += '</div></body></html>';
+          bidResponses.push({
+            requestId: bidRequest.options.requestId,
+            cpm: parseFloat(ad.assets.cpm) || 1,
+            width: w,
+            height: h,
+            creativeId: ad.assets.id,
+            currency: ad.currency || CURRENCY,
+            netRevenue: false,
+            ttl: 360,
+            mediaType: BANNER,
+            ad: htmlTag
+          });
+        });
+      }
+      return bidResponses;
+    } catch (err) {
+      utils.logError(err);
+      return [];
+    }
+  },
+  /**
+   * @param {BidRequest} req
+   * @return {boolean}
+   * @private
+   */
+  _isBannerRequest(req) {
+    return !!(req.mediaTypes && req.mediaTypes.banner);
+  }
+}
+registerBidder(spec);
diff --git a/modules/temedyaBidAdapter.md b/modules/temedyaBidAdapter.md
new file mode 100644
index 00000000000..31ac4f3689b
--- /dev/null
+++ b/modules/temedyaBidAdapter.md
@@ -0,0 +1,64 @@
+# Overview
+
+Module Name: TE Medya Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@temedya.com
+
+# Description
+
+Module that connects to TE Medya's demand sources.
+
+TE Medya supports Native and Banner. 
+
+
+# Test Parameters
+# Native
+```
+
+    var adUnits = [
+        {
+            code:'tme_div_id',
+            mediaTypes:{
+                native: {
+                    title: {
+                        required: true
+                    }
+                }
+            },
+            bids:[
+                {
+                    bidder: 'temedya',
+                    params: {
+                        widgetId: 753497,
+                        count: 1
+                    }
+                }
+            ]
+        }
+    ];
+```
+# Test Parameters
+# Banner
+```
+
+    var adUnits = [
+        {
+            code:'tme_div_id',
+            mediaTypes:{
+                banner: {
+                    banner: {
+                        sizes:[300, 250]
+                    }
+                }
+            },
+            bids:[
+                {
+                    bidder: 'temedya',
+                    params: {
+                        widgetId: 753497
+                    }
+                }
+            ]
+        }
+    ];
+```
\ No newline at end of file
diff --git a/test/spec/modules/temedyaBidAdapter_spec.js b/test/spec/modules/temedyaBidAdapter_spec.js
new file mode 100644
index 00000000000..4867bfac4f4
--- /dev/null
+++ b/test/spec/modules/temedyaBidAdapter_spec.js
@@ -0,0 +1,177 @@
+import {expect} from 'chai';
+import {spec} from 'modules/temedyaBidAdapter.js';
+import * as utils from 'src/utils.js';
+
+const ENDPOINT_URL = 'https://adm.vidyome.com/';
+
+export const _getUrlVars = function(url) {
+  var hash;
+  var myJson = {};
+  var hashes = url.slice(url.indexOf('?') + 1).split('&');
+  for (var i = 0; i < hashes.length; i++) {
+    hash = hashes[i].split('=');
+    myJson[hash[0]] = hash[1];
+  }
+  return myJson;
+}
+
+describe('temedya adapter', function() {
+  let bidRequests;
+  let nativeBidRequests;
+
+  beforeEach(function() {
+    bidRequests = [
+      {
+        bidder: 'temedya',
+        params: {
+          widgetId: 753497,
+          count: 1
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        }
+      }
+    ]
+
+    nativeBidRequests = [
+      {
+        bidder: 'temedya',
+        params: {
+          widgetId: 753497,
+          count: 1
+        },
+        nativeParams: {
+          title: {
+            required: true
+          },
+          image: {
+            required: true
+          }
+        }
+      }
+    ]
+  })
+
+  describe('isBidRequestValid', function () {
+    it('valid bid case', function () {
+      let validBid = {
+        bidder: 'temedya',
+        params: {
+          widgetId: 753497,
+          count: 1
+        }
+      }
+      let isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(true);
+    });
+
+    it('invalid bid case: widgetId and countId is not passed', function() {
+      let validBid = {
+        bidder: 'temedya',
+        params: {
+        }
+      }
+      let isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(false);
+    })
+  })
+
+  describe('buildRequests', function () {
+    it('sends bid request to ENDPOINT via GET', function () {
+      const request = spec.buildRequests(bidRequests)[0];
+      expect(request.url).to.include(ENDPOINT_URL);
+      expect(request.method).to.equal('GET');
+    });
+
+    it('buildRequests function should not modify original bidRequests object', function () {
+      let originalBidRequests = utils.deepClone(bidRequests);
+      let request = spec.buildRequests(bidRequests);
+      expect(bidRequests).to.deep.equal(originalBidRequests);
+    });
+
+    it('buildRequests function should not modify original nativeBidRequests object', function () {
+      let originalBidRequests = utils.deepClone(nativeBidRequests);
+      let request = spec.buildRequests(nativeBidRequests);
+      expect(nativeBidRequests).to.deep.equal(originalBidRequests);
+    });
+
+    it('Request params check', function() {
+      let request = spec.buildRequests(bidRequests)[0];
+      const data = _getUrlVars(request.url)
+      data.type = 'native';
+      data.wid = bidRequests[0].params.widgetId;
+      data.count = bidRequests[0].params.count;
+    })
+  })
+
+  describe('interpretResponse', function () {
+    let response = {
+      ads: [
+        {
+          'id': 30,
+          'name': 'Pro Trader Desktop Ocak',
+          'assets': {
+            'sponsor': 'Yatırım Bülteni',
+            'cpm': '0.30188070875464',
+            'name': 'SLC2-DESKTOP',
+            'files': [
+              'https://dsp-vidyome.cdn.vidyome.com/dsp/assets/84066_SLC2_640X480_82KB.jpg'
+            ],
+            'id': 9,
+            'title': '6 ayda zengin oldu! Günde 2 saat çalışarak bilgisayar başında zengin oldu.',
+            'body': 'Sizde yapabilirsiniz!',
+            'landing_url': 'https://bit.ly/3l6RhKG',
+            'click_url': 'https://adclick.adm.vidyome.com/collect?campaignId=30&creativeId=9&widId=122129&v=1609960813742&uri=https%3A%2F%2Fbit.ly%2F3l6RhKG%3Futm_source%3DVidyome%26utm_medium%3Dnative%26utm_campaign%3D30%26utm_term%3D9%26utm_content%3D122129'
+          },
+          'conversion_urls': [
+
+          ],
+          'impression_urls': [
+
+          ]
+        }
+      ],
+      base: {
+        'isSmartphone': false,
+        'isTablet': false,
+        'isDesktop': true,
+        'isConnectedTv': false,
+        'country': 'tr',
+        'wid': 753497,
+        'type': 'native',
+        'locale': 'tr',
+        'widget': {
+          'click': 'https://stats.vidyome.com/s/widgets/collect?widgetId=122129&eventType=click',
+          'impression': 'https://impression.adm.vidyome.com/collect/v1?widgetId=122129'
+        }
+      },
+    };
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {
+          'requestId': '1d236f7890b',
+          'cpm': 0.0920,
+          'width': 300,
+          'height': 250,
+          'netRevenue': false,
+          'mediaType': 'native',
+          'currency': 'TRY',
+          'creativeId': '<!-- CREATIVE ID -->',
+          'ttl': 700,
+          'ad': '<!-- ADS TAG -->'
+        }
+      ];
+      let request = spec.buildRequests(bidRequests)[0];
+      let result = spec.interpretResponse({body: response}, request);
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      expect(result[0].cpm).to.not.equal(null);
+      expect(result[0].creativeId).to.not.equal(null);
+      expect(result[0].ad).to.not.equal(null);
+      expect(result[0].currency).to.equal('TRY');
+      expect(result[0].netRevenue).to.equal(false);
+    });
+  })
+})

From bfc6009de025c5585e8f113dda52b5896254bda4 Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Fri, 8 Jan 2021 23:13:22 +0100
Subject: [PATCH 136/304] store privacy object from id5 response in local
 storage for interoperability with our api (#6169)

---
 modules/id5IdSystem.js                |  4 +++
 test/spec/modules/id5IdSystem_spec.js | 46 +++++++++++++++++++++------
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/modules/id5IdSystem.js b/modules/id5IdSystem.js
index 17a808badaa..45ddc85da5f 100644
--- a/modules/id5IdSystem.js
+++ b/modules/id5IdSystem.js
@@ -16,6 +16,7 @@ const MODULE_NAME = 'id5Id';
 const GVLID = 131;
 const NB_EXP_DAYS = 30;
 export const ID5_STORAGE_NAME = 'id5id';
+export const ID5_PRIVACY_STORAGE_NAME = `${ID5_STORAGE_NAME}_privacy`;
 const LOCAL_STORAGE = 'html5';
 
 // order the legacy cookie names in reverse priority order so the last
@@ -137,6 +138,9 @@ export const id5IdSubmodule = {
             try {
               responseObj = JSON.parse(response);
               resetNb(config.params.partner);
+              if (responseObj.privacy) {
+                storeInLocalStorage(ID5_PRIVACY_STORAGE_NAME, JSON.stringify(responseObj.privacy), NB_EXP_DAYS);
+              }
 
               // TODO: remove after requiring publishers to use localstorage and
               // all publishers have upgraded
diff --git a/test/spec/modules/id5IdSystem_spec.js b/test/spec/modules/id5IdSystem_spec.js
index afde1696766..1b13059a7f8 100644
--- a/test/spec/modules/id5IdSystem_spec.js
+++ b/test/spec/modules/id5IdSystem_spec.js
@@ -1,6 +1,7 @@
 import {
   id5IdSubmodule,
   ID5_STORAGE_NAME,
+  ID5_PRIVACY_STORAGE_NAME,
   getFromLocalStorage,
   storeInLocalStorage,
   expDaysStr,
@@ -180,10 +181,10 @@ describe('ID5 ID System', function() {
     it('should call the ID5 server with pd field when pd config is set', function () {
       const pubData = 'b50ca08271795a8e7e4012813f23d505193d75c0f2e2bb99baa63aa822f66ed3';
 
-      let config = getId5FetchConfig();
-      config.params.pd = pubData;
+      let id5Config = getId5FetchConfig();
+      id5Config.params.pd = pubData;
 
-      let submoduleCallback = id5IdSubmodule.getId(config, undefined, ID5_STORED_OBJ).callback;
+      let submoduleCallback = id5IdSubmodule.getId(id5Config, undefined, ID5_STORED_OBJ).callback;
       submoduleCallback(callbackSpy);
 
       let request = server.requests[0];
@@ -194,10 +195,10 @@ describe('ID5 ID System', function() {
     });
 
     it('should call the ID5 server with empty pd field when pd config is not set', function () {
-      let config = getId5FetchConfig();
-      config.params.pd = undefined;
+      let id5Config = getId5FetchConfig();
+      id5Config.params.pd = undefined;
 
-      let submoduleCallback = id5IdSubmodule.getId(config, undefined, ID5_STORED_OBJ).callback;
+      let submoduleCallback = id5IdSubmodule.getId(id5Config, undefined, ID5_STORED_OBJ).callback;
       submoduleCallback(callbackSpy);
 
       let request = server.requests[0];
@@ -236,6 +237,33 @@ describe('ID5 ID System', function() {
 
       expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(0);
     });
+
+    it('should store the privacy object from the ID5 server response', function () {
+      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, ID5_STORED_OBJ).callback;
+      submoduleCallback(callbackSpy);
+
+      let request = server.requests[0];
+
+      let responseObject = utils.deepClone(ID5_JSON_RESPONSE);
+      responseObject.privacy = {
+        jurisdiction: 'gdpr',
+        id5_consent: true
+      };
+      request.respond(200, responseHeader, JSON.stringify(responseObject));
+      expect(getFromLocalStorage(ID5_PRIVACY_STORAGE_NAME)).to.be.eq(JSON.stringify(responseObject.privacy));
+      coreStorage.removeDataFromLocalStorage(ID5_PRIVACY_STORAGE_NAME);
+    });
+
+    it('should not store a privacy object if not part of ID5 server response', function () {
+      coreStorage.removeDataFromLocalStorage(ID5_PRIVACY_STORAGE_NAME);
+      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, ID5_STORED_OBJ).callback;
+      submoduleCallback(callbackSpy);
+
+      let request = server.requests[0];
+
+      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      expect(getFromLocalStorage(ID5_PRIVACY_STORAGE_NAME)).to.be.null;
+    });
   });
 
   describe('Request Bids Hook', function() {
@@ -309,7 +337,7 @@ describe('ID5 ID System', function() {
       config.setConfig(getFetchLocalStorageConfig());
 
       let innerAdUnits;
-      requestBidsHook((config) => { innerAdUnits = config.adUnits }, {adUnits});
+      requestBidsHook((adUnitConfig) => { innerAdUnits = adUnitConfig.adUnits }, {adUnits});
 
       expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(1);
     });
@@ -323,7 +351,7 @@ describe('ID5 ID System', function() {
       config.setConfig(getFetchLocalStorageConfig());
 
       let innerAdUnits;
-      requestBidsHook((config) => { innerAdUnits = config.adUnits }, {adUnits});
+      requestBidsHook((adUnitConfig) => { innerAdUnits = adUnitConfig.adUnits }, {adUnits});
 
       expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(2);
     });
@@ -341,7 +369,7 @@ describe('ID5 ID System', function() {
       config.setConfig(id5Config);
 
       let innerAdUnits;
-      requestBidsHook((config) => { innerAdUnits = config.adUnits }, {adUnits});
+      requestBidsHook((adUnitConfig) => { innerAdUnits = adUnitConfig.adUnits }, {adUnits});
 
       expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(2);
 

From 15740651949eba256864ecd40bfedbac4df67820 Mon Sep 17 00:00:00 2001
From: RAJKUMAR NATARAJAN <raj.cs.psg@gmail.com>
Date: Mon, 11 Jan 2021 10:30:12 -0500
Subject: [PATCH 137/304] CAP-2116 updated the placementId property to tagId
 (#6171)

Co-authored-by: Rajkumar Natarajan <rajkumar.natarajan@synacor.com>
---
 modules/synacormediaBidAdapter.js             |  16 +--
 modules/synacormediaBidAdapter.md             |   4 +-
 .../modules/synacormediaBidAdapter_spec.js    | 112 ++++++++++++++----
 3 files changed, 101 insertions(+), 31 deletions(-)

diff --git a/modules/synacormediaBidAdapter.js b/modules/synacormediaBidAdapter.js
index 6608107c93f..55a91d87448 100644
--- a/modules/synacormediaBidAdapter.js
+++ b/modules/synacormediaBidAdapter.js
@@ -24,7 +24,7 @@ export const spec = {
       bid.mediaTypes.hasOwnProperty('video');
   },
   isBidRequestValid: function(bid) {
-    const hasRequiredParams = bid && bid.params && bid.params.hasOwnProperty('placementId') && bid.params.hasOwnProperty('seatId');
+    const hasRequiredParams = bid && bid.params && (bid.params.hasOwnProperty('placementId') || bid.params.hasOwnProperty('tagId')) && bid.params.hasOwnProperty('seatId');
     const hasAdSizes = bid && getAdUnitSizes(bid).filter(size => BLOCKED_AD_SIZES.indexOf(size.join('x')) === -1).length > 0
     return !!(hasRequiredParams && hasAdSizes);
   },
@@ -61,7 +61,7 @@ export const spec = {
       } else {
         seatId = bid.params.seatId;
       }
-      const placementId = bid.params.placementId;
+      const tagIdOrplacementId = bid.params.tagId || bid.params.placementId;
       const bidFloor = bid.params.bidfloor ? parseFloat(bid.params.bidfloor) : null;
       if (isNaN(bidFloor)) {
         logWarn(`Synacormedia: there is an invalid bid floor: ${bid.params.bidfloor}`);
@@ -77,9 +77,9 @@ export const spec = {
 
       let imps = [];
       if (videoOrBannerKey === 'banner') {
-        imps = this.buildBannerImpressions(adSizes, bid, placementId, pos, bidFloor, videoOrBannerKey);
+        imps = this.buildBannerImpressions(adSizes, bid, tagIdOrplacementId, pos, bidFloor, videoOrBannerKey);
       } else if (videoOrBannerKey === 'video') {
-        imps = this.buildVideoImpressions(adSizes, bid, placementId, pos, bidFloor, videoOrBannerKey);
+        imps = this.buildVideoImpressions(adSizes, bid, tagIdOrplacementId, pos, bidFloor, videoOrBannerKey);
       }
       if (imps.length > 0) {
         imps.forEach(i => openRtbBidRequest.imp.push(i));
@@ -104,7 +104,7 @@ export const spec = {
     }
   },
 
-  buildBannerImpressions: function(adSizes, bid, placementId, pos, bidFloor, videoOrBannerKey) {
+  buildBannerImpressions: function (adSizes, bid, tagIdOrPlacementId, pos, bidFloor, videoOrBannerKey) {
     let format = [];
     let imps = [];
     adSizes.forEach((size, i) => {
@@ -125,7 +125,7 @@ export const spec = {
           format,
           pos
         },
-        tagid: placementId,
+        tagid: tagIdOrPlacementId,
       };
       if (bidFloor !== null && !isNaN(bidFloor)) {
         imp.bidfloor = bidFloor;
@@ -135,7 +135,7 @@ export const spec = {
     return imps;
   },
 
-  buildVideoImpressions: function(adSizes, bid, placementId, pos, bidFloor, videoOrBannerKey) {
+  buildVideoImpressions: function(adSizes, bid, tagIdOrPlacementId, pos, bidFloor, videoOrBannerKey) {
     let imps = [];
     adSizes.forEach((size, i) => {
       if (!size || size.length != 2) {
@@ -145,7 +145,7 @@ export const spec = {
       const size1 = size[1];
       const imp = {
         id: `${videoOrBannerKey.substring(0, 1)}${bid.bidId}-${size0}x${size1}`,
-        tagid: placementId
+        tagid: tagIdOrPlacementId
       };
       if (bidFloor !== null && !isNaN(bidFloor)) {
         imp.bidfloor = bidFloor;
diff --git a/modules/synacormediaBidAdapter.md b/modules/synacormediaBidAdapter.md
index fd71f07b3a3..523c66fd1d9 100644
--- a/modules/synacormediaBidAdapter.md
+++ b/modules/synacormediaBidAdapter.md
@@ -33,7 +33,7 @@ https://track.technoratimedia.com/openrtb/tags?ID=%%PATTERN:hb_cache_id_synacorm
           bidder: "synacormedia",
           params: {
               seatId: "prebid",
-              placementId: "demo1",
+              tagId: "demo1",
               bidfloor: 0.10,
               pos: 1
           }
@@ -52,7 +52,7 @@ https://track.technoratimedia.com/openrtb/tags?ID=%%PATTERN:hb_cache_id_synacorm
           bidder: "synacormedia",
           params: {
               seatId: "prebid",
-              placementId: "demo1",
+              tagId: "demo1",
               bidfloor: 0.20,
               pos: 1,
               video: {
diff --git a/test/spec/modules/synacormediaBidAdapter_spec.js b/test/spec/modules/synacormediaBidAdapter_spec.js
index dd40e634723..5ec8700ce89 100644
--- a/test/spec/modules/synacormediaBidAdapter_spec.js
+++ b/test/spec/modules/synacormediaBidAdapter_spec.js
@@ -11,12 +11,19 @@ describe('synacormediaBidAdapter ', function () {
         sizes: [300, 250],
         params: {
           seatId: 'prebid',
-          placementId: '1234'
+          tagId: '1234'
         }
       };
     });
 
     it('should return true when params placementId and seatId are truthy', function () {
+      bid.params.placementId = bid.params.tagId;
+      delete bid.params.tagId;
+      assert(spec.isBidRequestValid(bid));
+    });
+
+    it('should return true when params tagId and seatId are truthy', function () {
+      delete bid.params.placementId;
       assert(spec.isBidRequestValid(bid));
     });
 
@@ -35,8 +42,9 @@ describe('synacormediaBidAdapter ', function () {
       assert.isFalse(spec.isBidRequestValid(bid));
     });
 
-    it('should return false when placementId param is missing', function () {
+    it('should return false when both placementId param and tagId param are missing', function () {
       delete bid.params.placementId;
+      delete bid.params.tagId;
       assert.isFalse(spec.isBidRequestValid(bid));
     });
 
@@ -53,7 +61,7 @@ describe('synacormediaBidAdapter ', function () {
       sizes: [[300, 250], [300, 600]],
       params: {
         seatId: 'prebid',
-        placementId: '1234',
+        tagId: '1234',
         bidfloor: '0.50'
       }
     };
@@ -63,7 +71,7 @@ describe('synacormediaBidAdapter ', function () {
       sizes: [[300, 250], [300, 600]],
       params: {
         seatId: 'prebid',
-        placementId: '1234',
+        tagId: '1234',
         bidfloor: '0.50'
       },
       mediaTypes: {
@@ -84,7 +92,7 @@ describe('synacormediaBidAdapter ', function () {
       sizes: [[640, 480]],
       params: {
         seatId: 'prebid',
-        placementId: '1234',
+        tagId: '1234',
         bidfloor: '0.50'
       },
       mediaTypes: {
@@ -110,7 +118,7 @@ describe('synacormediaBidAdapter ', function () {
       bidder: 'synacormedia',
       params: {
         seatId: 'prebid',
-        placementId: '1234',
+        tagId: '1234',
         video: {
           minduration: 30
         }
@@ -163,7 +171,7 @@ describe('synacormediaBidAdapter ', function () {
       sizes: [[300, 250], [300, 600]],
       params: {
         seatId: 'prebid',
-        placementId: '1234',
+        tagId: '1234',
         bidfloor: '0.50'
       }
     };
@@ -230,7 +238,7 @@ describe('synacormediaBidAdapter ', function () {
         sizes: [[300, 600]],
         params: {
           seatId: validBidRequest.params.seatId,
-          placementId: '5678',
+          tagId: '5678',
           bidfloor: '0.50'
         }
       };
@@ -262,7 +270,7 @@ describe('synacormediaBidAdapter ', function () {
         sizes: [[300, 250]],
         params: {
           seatId: 'somethingelse',
-          placementId: '5678',
+          tagId: '5678',
           bidfloor: '0.50'
         }
       };
@@ -295,7 +303,7 @@ describe('synacormediaBidAdapter ', function () {
         sizes: [[300, 250]],
         params: {
           seatId: 'prebid',
-          placementId: '1234',
+          tagId: '1234',
           bidfloor: 'abcd'
         }
       };
@@ -327,7 +335,7 @@ describe('synacormediaBidAdapter ', function () {
         sizes: [[300, 250]],
         params: {
           seatId: 'prebid',
-          placementId: '1234'
+          tagId: '1234'
         }
       };
       let req = spec.buildRequests([badFloorBidRequest], bidderRequest);
@@ -358,7 +366,7 @@ describe('synacormediaBidAdapter ', function () {
         sizes: [[300, 250]],
         params: {
           seatId: 'prebid',
-          placementId: '1234',
+          tagId: '1234',
           pos: 1
         }
       };
@@ -390,7 +398,7 @@ describe('synacormediaBidAdapter ', function () {
         sizes: [[300, 250]],
         params: {
           seatId: 'prebid',
-          placementId: '1234',
+          tagId: '1234',
         }
       };
       let req = spec.buildRequests([newPosBidRequest], bidderRequest);
@@ -425,7 +433,7 @@ describe('synacormediaBidAdapter ', function () {
         sizes: [],
         params: {
           seatId: 'prebid',
-          placementId: '1234',
+          tagId: '1234',
           bidfloor: '0.50'
         }
       };
@@ -435,7 +443,7 @@ describe('synacormediaBidAdapter ', function () {
         sizes: [[300]],
         params: {
           seatId: 'prebid',
-          placementId: '1234',
+          tagId: '1234',
           bidfloor: '0.50'
         }
       };
@@ -457,7 +465,7 @@ describe('synacormediaBidAdapter ', function () {
         bidder: 'synacormedia',
         params: {
           seatId: 'prebid',
-          placementId: '1234',
+          tagId: '1234',
           video: {
             minduration: 30,
             maxduration: 45,
@@ -515,7 +523,7 @@ describe('synacormediaBidAdapter ', function () {
         bidder: 'synacormedia',
         params: {
           seatId: 'prebid',
-          placementId: '1234',
+          tagId: '1234',
           video: {
             minduration: 30,
             maxduration: 45,
@@ -582,12 +590,74 @@ describe('synacormediaBidAdapter ', function () {
     })
   });
 
+  describe('Bid Requests with placementId should be backward compatible ', function () {
+    let validVideoBidReq = {
+      bidder: 'synacormedia',
+      params: {
+        seatId: 'prebid',
+        placementId: 'demo1',
+        pos: 1,
+        video: {}
+      },
+      renderer: {
+        url: '../syncOutstreamPlayer.js'
+      },
+      mediaTypes: {
+        video: {
+          playerSize: [[300, 250]],
+          context: 'outstream'
+        }
+      },
+      adUnitCode: 'div-1',
+      transactionId: '0869f34e-090b-4b20-84ee-46ff41405a39',
+      sizes: [[300, 250]],
+      bidId: '22b3a2268d9f0e',
+      bidderRequestId: '1d195910597e13',
+      auctionId: '3375d336-2aea-4ee7-804c-6d26b621ad20',
+      src: 'client',
+      bidRequestsCount: 1,
+      bidderRequestsCount: 1,
+      bidderWinsCount: 0
+    };
+
+    let validBannerBidRequest = {
+      bidId: '9876abcd',
+      sizes: [[300, 250]],
+      params: {
+        seatId: 'prebid',
+        placementId: '1234',
+      }
+    };
+
+    let bidderRequest = {
+      refererInfo: {
+        referer: 'http://localhost:9999/'
+      },
+      bidderCode: 'synacormedia',
+      auctionId: 'f8a75621-d672-4cbb-9275-3db7d74fb110'
+    };
+
+    it('should return valid bid request for banner impression', function () {
+      let req = spec.buildRequests([validBannerBidRequest], bidderRequest);
+      expect(req).to.have.property('method', 'POST');
+      expect(req).to.have.property('url');
+      expect(req.url).to.contain('//prebid.technoratimedia.com/openrtb/bids/prebid?src=$$REPO_AND_VERSION$$');
+    });
+
+    it('should return valid bid request for video impression', function () {
+      let req = spec.buildRequests([validVideoBidReq], bidderRequest);
+      expect(req).to.have.property('method', 'POST');
+      expect(req).to.have.property('url');
+      expect(req.url).to.contain('//prebid.technoratimedia.com/openrtb/bids/prebid?src=$$REPO_AND_VERSION$$');
+    });
+  });
+
   describe('Bid Requests with schain object ', function() {
     let validBidReq = {
       bidder: 'synacormedia',
       params: {
         seatId: 'prebid',
-        placementId: 'demo1',
+        tagId: 'demo1',
         pos: 1,
         video: {}
       },
@@ -634,7 +704,7 @@ describe('synacormediaBidAdapter ', function () {
           bidder: 'synacormedia',
           params: {
             seatId: 'prebid',
-            placementId: 'demo1',
+            tagId: 'demo1',
             pos: 1,
             video: {}
           },
@@ -914,8 +984,8 @@ describe('synacormediaBidAdapter ', function () {
       });
 
       let resp = spec.interpretResponse(serverRespVideo, bidRequest);
-	  sandbox.restore();
-	  expect(resp[0].videoCacheKey).to.not.exist;
+	    sandbox.restore();
+	    expect(resp[0].videoCacheKey).to.not.exist;
     });
 
     it('should use video bid request height and width if not present in response', function () {

From c2f84cf1c5c4f2ed82a07b332d54d0d7c82286f8 Mon Sep 17 00:00:00 2001
From: noamtzuberi <Noam.Tzuberi@ironsrc.com>
Date: Mon, 11 Jan 2021 19:22:17 +0200
Subject: [PATCH 138/304] Rise adapter (#6165)

* add Rise adapter

* fixes

* change param isOrg to org

* Rise adapter

* change email for rise

* fix circle failed

* bump

* bump

* bump

* remove space
---
 modules/riseBidAdapter.js                | 250 ++++++++++++++++
 modules/riseBidAdapter.md                |  51 ++++
 test/spec/modules/riseBidAdapter_spec.js | 363 +++++++++++++++++++++++
 3 files changed, 664 insertions(+)
 create mode 100644 modules/riseBidAdapter.js
 create mode 100644 modules/riseBidAdapter.md
 create mode 100644 test/spec/modules/riseBidAdapter_spec.js

diff --git a/modules/riseBidAdapter.js b/modules/riseBidAdapter.js
new file mode 100644
index 00000000000..a891e0aa883
--- /dev/null
+++ b/modules/riseBidAdapter.js
@@ -0,0 +1,250 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import * as utils from '../src/utils.js';
+import {VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+
+const SUPPORTED_AD_TYPES = [VIDEO];
+const BIDDER_CODE = 'rise';
+const BIDDER_VERSION = '4.0.0';
+const TTL = 360;
+const SELLER_ENDPOINT = 'https://hb.yellowblue.io/';
+const MODES = {
+  PRODUCTION: 'hb',
+  TEST: 'hb-test'
+}
+const SUPPORTED_SYNC_METHODS = {
+  IFRAME: 'iframe',
+  PIXEL: 'pixel'
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  version: BIDDER_VERSION,
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+  isBidRequestValid: function(bidRequest) {
+    return !!(bidRequest.params.org);
+  },
+  buildRequests: function (bidRequests, bidderRequest) {
+    if (bidRequests.length === 0) {
+      return [];
+    }
+
+    const requests = [];
+
+    bidRequests.forEach(bid => {
+      requests.push(buildVideoRequest(bid, bidderRequest));
+    });
+
+    return requests;
+  },
+  interpretResponse: function({body}) {
+    const bidResponses = [];
+
+    const bidResponse = {
+      requestId: body.requestId,
+      cpm: body.cpm,
+      width: body.width,
+      height: body.height,
+      creativeId: body.requestId,
+      currency: body.currency,
+      netRevenue: body.netRevenue,
+      ttl: body.ttl || TTL,
+      vastXml: body.vastXml,
+      mediaType: VIDEO
+    };
+
+    bidResponses.push(bidResponse);
+
+    return bidResponses;
+  },
+  getUserSyncs: function(syncOptions, serverResponses) {
+    const syncs = [];
+    for (const response of serverResponses) {
+      if (syncOptions.iframeEnabled && response.body.userSyncURL) {
+        syncs.push({
+          type: 'iframe',
+          url: response.body.userSyncURL
+        });
+      }
+      if (syncOptions.pixelEnabled && utils.isArray(response.body.userSyncPixels)) {
+        const pixels = response.body.userSyncPixels.map(pixel => {
+          return {
+            type: 'image',
+            url: pixel
+          }
+        })
+        syncs.push(...pixels)
+      }
+    }
+    return syncs;
+  }
+};
+
+registerBidder(spec);
+
+/**
+ * Build the video request
+ * @param bid {bid}
+ * @param bidderRequest {bidderRequest}
+ * @returns {Object}
+ */
+function buildVideoRequest(bid, bidderRequest) {
+  const sellerParams = generateParameters(bid, bidderRequest);
+  const {params} = bid;
+  return {
+    method: 'GET',
+    url: getEndpoint(params.testMode),
+    data: sellerParams
+  };
+}
+
+/**
+ * Get the the ad size from the bid
+ * @param bid {bid}
+ * @returns {Array}
+ */
+function getSizes(bid) {
+  if (utils.deepAccess(bid, 'mediaTypes.video.sizes')) {
+    return bid.mediaTypes.video.sizes[0];
+  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
+    return bid.sizes[0];
+  }
+  return [];
+}
+
+/**
+ * Get schain string value
+ * @param schainObject {Object}
+ * @returns {string}
+ */
+function getSupplyChain(schainObject) {
+  if (utils.isEmpty(schainObject)) {
+    return '';
+  }
+  let scStr = `${schainObject.ver},${schainObject.complete}`;
+  schainObject.nodes.forEach((node) => {
+    scStr += '!';
+    scStr += `${getEncodedValIfNotEmpty(node.asi)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.sid)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.hp)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.rid)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.name)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.domain)}`;
+  });
+  return scStr;
+}
+
+/**
+ * Get encoded node value
+ * @param val {string}
+ * @returns {string}
+ */
+function getEncodedValIfNotEmpty(val) {
+  return !utils.isEmpty(val) ? encodeURIComponent(val) : '';
+}
+
+/**
+ * Get preferred user-sync method based on publisher configuration
+ * @param bidderCode {string}
+ * @returns {string}
+ */
+function getAllowedSyncMethod(filterSettings, bidderCode) {
+  const iframeConfigsToCheck = ['all', 'iframe'];
+  const pixelConfigToCheck = 'image';
+  if (filterSettings && iframeConfigsToCheck.some(config => isSyncMethodAllowed(filterSettings[config], bidderCode))) {
+    return SUPPORTED_SYNC_METHODS.IFRAME;
+  }
+  if (!filterSettings || !filterSettings[pixelConfigToCheck] || isSyncMethodAllowed(filterSettings[pixelConfigToCheck], bidderCode)) {
+    return SUPPORTED_SYNC_METHODS.PIXEL;
+  }
+}
+
+/**
+ * Check if sync rule is supported
+ * @param syncRule {Object}
+ * @param bidderCode {string}
+ * @returns {boolean}
+ */
+function isSyncMethodAllowed(syncRule, bidderCode) {
+  if (!syncRule) {
+    return false;
+  }
+  const isInclude = syncRule.filter === 'include';
+  const bidders = utils.isArray(syncRule.bidders) ? syncRule.bidders : [bidderCode];
+  return isInclude && utils.contains(bidders, bidderCode);
+}
+
+/**
+ * Get the seller endpoint
+ * @param testMode {boolean}
+ * @returns {string}
+ */
+function getEndpoint(testMode) {
+  return testMode
+    ? SELLER_ENDPOINT + MODES.TEST
+    : SELLER_ENDPOINT + MODES.PRODUCTION;
+}
+
+/**
+ * Generate query parameters for the request
+ * @param bid {bid}
+ * @param bidderRequest {bidderRequest}
+ * @returns {Object}
+ */
+function generateParameters(bid, bidderRequest) {
+  const timeout = config.getConfig('bidderTimeout');
+  const { syncEnabled, filterSettings } = config.getConfig('userSync') || {};
+  const [ width, height ] = getSizes(bid);
+  const { params } = bid;
+  const { bidderCode } = bidderRequest;
+  const domain = window.location.hostname;
+
+  const requestParams = {
+    auction_start: utils.timestamp(),
+    ad_unit_code: utils.getBidIdParameter('adUnitCode', bid),
+    tmax: timeout,
+    width: width,
+    height: height,
+    publisher_id: params.org,
+    floor_price: params.floorPrice,
+    ua: navigator.userAgent,
+    bid_id: utils.getBidIdParameter('bidId', bid),
+    bidder_request_id: utils.getBidIdParameter('bidderRequestId', bid),
+    transaction_id: utils.getBidIdParameter('transactionId', bid),
+    session_id: utils.getBidIdParameter('auctionId', bid),
+    publisher_name: domain,
+    site_domain: domain,
+    bidder_version: BIDDER_VERSION
+  };
+
+  if (syncEnabled) {
+    const allowedSyncMethod = getAllowedSyncMethod(filterSettings, bidderCode);
+    if (allowedSyncMethod) {
+      requestParams.cs_method = allowedSyncMethod;
+    }
+  }
+
+  if (bidderRequest.uspConsent) {
+    requestParams.us_privacy = bidderRequest.uspConsent;
+  }
+
+  if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
+    requestParams.gdpr = bidderRequest.gdprConsent.gdprApplies;
+    requestParams.gdpr_consent = bidderRequest.gdprConsent.consentString;
+  }
+
+  if (params.ifa) {
+    requestParams.ifa = params.ifa;
+  }
+
+  if (bid.schain) {
+    requestParams.schain = getSupplyChain(bid.schain);
+  }
+
+  if (bidderRequest && bidderRequest.refererInfo) {
+    requestParams.referrer = utils.deepAccess(bidderRequest, 'refererInfo.referer');
+    requestParams.page_url = config.getConfig('pageUrl') || utils.deepAccess(window, 'location.href');
+  }
+
+  return requestParams;
+}
diff --git a/modules/riseBidAdapter.md b/modules/riseBidAdapter.md
new file mode 100644
index 00000000000..67eeab18226
--- /dev/null
+++ b/modules/riseBidAdapter.md
@@ -0,0 +1,51 @@
+#Overview
+
+Module Name: Rise Bidder Adapter
+
+Module Type: Bidder Adapter
+
+Maintainer: prebid-rise-engage@risecodes.com
+
+
+# Description
+
+Module that connects to Rise's demand sources.
+
+The Rise adapter requires setup and approval from the Rise. Please reach out to prebid-rise-engage@risecodes.com to create an Rise account.
+
+The adapter supports Video(instream). For the integration, Rise returns content as vastXML and requires the publisher to define the cache url in config passed to Prebid for it to be valid in the auction.
+
+# Bid Parameters
+## Video
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `org` | required | String |  Rise publisher Id provided by your Rise representative  | "56f91cd4d3e3660002000033"
+| `floorPrice` | optional | Number |  Minimum price in USD. Misuse of this parameter can impact revenue | 2.00
+| `ifa` | optional | String |  The ID for advertisers (also referred to as "IDFA")  | "XXX-XXX"
+| `testMode` | optional | Boolean |  This activates the test mode  | false
+
+# Test Parameters
+```javascript
+var adUnits = [
+       {
+        code: 'dfp-video-div',
+        sizes: [[640, 480]],
+        mediaTypes: {
+          video: {
+            playerSize: [[640, 480]],
+            context: 'instream'
+          }
+        },
+        bids: [{
+          bidder: 'rise',
+          params: {
+            org: '56f91cd4d3e3660002000033', // Required
+            floorPrice: 2.00, // Optional
+            ifa: 'XXX-XXX', // Optional
+            testMode: false // Optional
+          }
+        }]
+      }
+   ];
+```
diff --git a/test/spec/modules/riseBidAdapter_spec.js b/test/spec/modules/riseBidAdapter_spec.js
new file mode 100644
index 00000000000..176437c4f27
--- /dev/null
+++ b/test/spec/modules/riseBidAdapter_spec.js
@@ -0,0 +1,363 @@
+import { expect } from 'chai';
+import { spec } from 'modules/riseBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+import { VIDEO } from '../../../src/mediaTypes.js';
+
+const ENDPOINT = 'https://hb.yellowblue.io/hb';
+const TEST_ENDPOINT = 'https://hb.yellowblue.io/hb-test';
+const TTL = 360;
+
+describe('riseAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    const bid = {
+      'bidder': spec.code,
+      'adUnitCode': 'adunit-code',
+      'sizes': [['640', '480']],
+      'params': {
+        'org': 'jdye8weeyirk00000001'
+      }
+    };
+
+    it('should return true when required params are passed', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not found', function () {
+      const newBid = Object.assign({}, bid);
+      delete newBid.params;
+      newBid.params = {
+        'org': null
+      };
+      expect(spec.isBidRequestValid(newBid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'org': 'jdye8weeyirk00000001'
+        },
+        'bidId': '299ffc8cca0b87',
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+      }
+    ];
+
+    const testModeBidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'org': 'jdye8weeyirk00000001',
+          'testMode': true
+        },
+        'bidId': '299ffc8cca0b87',
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+      }
+    ];
+
+    const bidderRequest = {
+      bidderCode: 'rise',
+    }
+
+    it('sends bid request to ENDPOINT via GET', function () {
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.url).to.equal(ENDPOINT);
+        expect(request.method).to.equal('GET');
+      }
+    });
+
+    it('sends bid request to test ENDPOINT via GET', function () {
+      const requests = spec.buildRequests(testModeBidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.url).to.equal(TEST_ENDPOINT);
+        expect(request.method).to.equal('GET');
+      }
+    });
+
+    it('should send the correct bid Id', function () {
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data.bid_id).to.equal('299ffc8cca0b87');
+      }
+    });
+
+    it('should send the correct width and height', function () {
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.have.property('width', 640);
+        expect(request.data).to.have.property('height', 480);
+      }
+    });
+
+    it('should respect syncEnabled option', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: false,
+          filterSettings: {
+            all: {
+              bidders: '*',
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.not.have.property('cs_method');
+      }
+    });
+
+    it('should respect "iframe" filter settings', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            iframe: {
+              bidders: [spec.code],
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.have.property('cs_method', 'iframe');
+      }
+    });
+
+    it('should respect "all" filter settings', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            all: {
+              bidders: [spec.code],
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.have.property('cs_method', 'iframe');
+      }
+    });
+
+    it('should send the pixel user sync param if userSync is enabled and no "iframe" or "all" configs are present', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true
+        }
+      });
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.have.property('cs_method', 'pixel');
+      }
+    });
+
+    it('should respect total exclusion', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            image: {
+              bidders: [spec.code],
+              filter: 'exclude'
+            },
+            iframe: {
+              bidders: [spec.code],
+              filter: 'exclude'
+            }
+          }
+        }
+      });
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.not.have.property('cs_method');
+      }
+    });
+
+    it('should have us_privacy param if usPrivacy is available in the bidRequest', function () {
+      const bidderRequestWithUSP = Object.assign({uspConsent: '1YNN'}, bidderRequest);
+      const requests = spec.buildRequests(bidRequests, bidderRequestWithUSP);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.have.property('us_privacy', '1YNN');
+      }
+    });
+
+    it('should have an empty us_privacy param if usPrivacy is missing in the bidRequest', function () {
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.not.have.property('us_privacy');
+      }
+    });
+
+    it('should not send the gdpr param if gdprApplies is false in the bidRequest', function () {
+      const bidderRequestWithGDPR = Object.assign({gdprConsent: {gdprApplies: false}}, bidderRequest);
+      const requests = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.not.have.property('gdpr');
+        expect(request.data).to.not.have.property('gdpr_consent');
+      }
+    });
+
+    it('should send the gdpr param if gdprApplies is true in the bidRequest', function () {
+      const bidderRequestWithGDPR = Object.assign({gdprConsent: {gdprApplies: true, consentString: 'test-consent-string'}}, bidderRequest);
+      const requests = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.have.property('gdpr', true);
+        expect(request.data).to.have.property('gdpr_consent', 'test-consent-string');
+      }
+    });
+
+    it('should have schain param if it is available in the bidRequest', () => {
+      const schain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{ asi: 'indirectseller.com', sid: '00001', hp: 1 }],
+      };
+      bidRequests[0].schain = schain;
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.have.property('schain', '1.0,1!indirectseller.com,00001,,,,');
+      }
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const response = {
+      cpm: 12.5,
+      vastXml: '<VAST version="3.0"></VAST>',
+      width: 640,
+      height: 480,
+      requestId: '21e12606d47ba7',
+      netRevenue: true,
+      currency: 'USD'
+    };
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {
+          requestId: '21e12606d47ba7',
+          cpm: 12.5,
+          width: 640,
+          height: 480,
+          creativeId: '21e12606d47ba7',
+          currency: 'USD',
+          netRevenue: true,
+          ttl: TTL,
+          vastXml: '<VAST version="3.0"></VAST>',
+          mediaType: VIDEO
+        }
+      ];
+      const result = spec.interpretResponse({ body: response });
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+    });
+  })
+
+  describe('getUserSyncs', function() {
+    const imageSyncResponse = {
+      body: {
+        userSyncPixels: [
+          'https://image-sync-url.test/1',
+          'https://image-sync-url.test/2',
+          'https://image-sync-url.test/3'
+        ]
+      }
+    };
+
+    const iframeSyncResponse = {
+      body: {
+        userSyncURL: 'https://iframe-sync-url.test'
+      }
+    };
+
+    it('should register all img urls from the response', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true }, [imageSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/1'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/2'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/3'
+        }
+      ]);
+    });
+
+    it('should register the iframe url from the response', function() {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, [iframeSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://iframe-sync-url.test'
+        }
+      ]);
+    });
+
+    it('should register both image and iframe urls from the responses', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true, iframeEnabled: true }, [iframeSyncResponse, imageSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://iframe-sync-url.test'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/1'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/2'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/3'
+        }
+      ]);
+    });
+
+    it('should handle an empty response', function() {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, []);
+      expect(syncs).to.deep.equal([]);
+    });
+
+    it('should handle when user syncs are disabled', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: false }, [imageSyncResponse]);
+      expect(syncs).to.deep.equal([]);
+    });
+  })
+});

From 888cd973046587a681d6a8804b47394456e25cd9 Mon Sep 17 00:00:00 2001
From: Drilon Kastrati <drilon@gjirafa.com>
Date: Tue, 12 Jan 2021 20:37:16 +0100
Subject: [PATCH 139/304] new optional params (#6148)

---
 modules/gjirafaBidAdapter.js | 2 ++
 modules/malltvBidAdapter.js  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/gjirafaBidAdapter.js b/modules/gjirafaBidAdapter.js
index 48496b52c05..fc1232436b4 100644
--- a/modules/gjirafaBidAdapter.js
+++ b/modules/gjirafaBidAdapter.js
@@ -49,6 +49,8 @@ export const spec = {
         adUnitId: adUnitId,
         placementId: placementId,
         bidid: bidRequest.bidId,
+        count: bidRequest.params.count,
+        skipTime: bidRequest.params.skipTime
       };
     });
 
diff --git a/modules/malltvBidAdapter.js b/modules/malltvBidAdapter.js
index 846935a5522..776e3f6458b 100644
--- a/modules/malltvBidAdapter.js
+++ b/modules/malltvBidAdapter.js
@@ -49,6 +49,8 @@ export const spec = {
         adUnitId: adUnitId,
         placementId: placementId,
         bidid: bidRequest.bidId,
+        count: bidRequest.params.count,
+        skipTime: bidRequest.params.skipTime
       };
     });
 

From 5ed440070a2c33880c36541d5bb03e757f4c9d34 Mon Sep 17 00:00:00 2001
From: Mark <markaconrad@users.noreply.github.com>
Date: Tue, 12 Jan 2021 19:59:37 -0500
Subject: [PATCH 140/304] =?UTF-8?q?Add=20the=20root=20domain=20check=20met?=
 =?UTF-8?q?hod=20as=20a=20util=20method=20added=20for=20use=20mod=E2=80=A6?=
 =?UTF-8?q?=20(#6124)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add the root domain check method as a global method added for use modules

* Add a date suffix to keep the test cookie random

* Per review, moved the findRootDomain method to utils out of the userId modules

* More the domain method back the user module but attach it to the submodule so that userId modules can have access to it

* Remove the storageManager as it is no longer used in utils
---
 integrationExamples/gpt/userId_example.html |  3 +-
 modules/userId/index.js                     | 69 +++++++++++++++++++++
 test/spec/modules/userId_spec.js            | 46 +++++++++++++-
 3 files changed, 116 insertions(+), 2 deletions(-)

diff --git a/integrationExamples/gpt/userId_example.html b/integrationExamples/gpt/userId_example.html
index e6f9255326a..fa9b1e3b5fd 100644
--- a/integrationExamples/gpt/userId_example.html
+++ b/integrationExamples/gpt/userId_example.html
@@ -109,6 +109,7 @@
         <script src="../../build/dev/prebid.js" async></script>
 
         <script>
+            function getHashedEmail() {}
             var googletag = googletag || {};
             googletag.cmd = googletag.cmd || [];
             googletag.cmd.push(function() {
@@ -157,7 +158,7 @@
                                         }
                                     }]
                                 }],
-                                eidsFunction: getHashedEmail  // any user defined function that exists in the page
+                                eidsFunction: getHashedEmail // any user defined function that exists in the page
                             }
                         },{
                             name: "unifiedId",
diff --git a/modules/userId/index.js b/modules/userId/index.js
index f063fbc973b..9294311de69 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -48,6 +48,20 @@
  * @type {string}
  */
 
+/**
+ * @property
+ * @summary use a predefined domain override for cookies or provide your own
+ * @name Submodule#domainOverride
+ * @type {(undefined|function)}
+ */
+
+/**
+ * @function
+ * @summary Returns the root domain
+ * @name Submodule#findRootDomain
+ * @returns {string}
+ */
+
 /**
  * @typedef {Object} SubmoduleConfig
  * @property {string} name - the User ID submodule name (used to link submodule with config)
@@ -315,6 +329,60 @@ function hasGDPRConsent(consentData) {
   return true;
 }
 
+/**
+   * Find the root domain
+   * @param {string|undefined} fullDomain
+   * @return {string}
+   */
+export function findRootDomain(fullDomain = window.location.hostname) {
+  if (!coreStorage.cookiesAreEnabled()) {
+    return fullDomain;
+  }
+
+  const domainParts = fullDomain.split('.');
+  if (domainParts.length == 2) {
+    return fullDomain;
+  }
+  let rootDomain;
+  let continueSearching;
+  let startIndex = -2;
+  const TEST_COOKIE_NAME = `_rdc${Date.now()}`;
+  const TEST_COOKIE_VALUE = 'writeable';
+  do {
+    rootDomain = domainParts.slice(startIndex).join('.');
+    let expirationDate = new Date(utils.timestamp() + 10 * 1000).toUTCString();
+
+    // Write a test cookie
+    coreStorage.setCookie(
+      TEST_COOKIE_NAME,
+      TEST_COOKIE_VALUE,
+      expirationDate,
+      'Lax',
+      rootDomain,
+      undefined
+    );
+
+    // See if the write was successful
+    const value = coreStorage.getCookie(TEST_COOKIE_NAME, undefined);
+    if (value === TEST_COOKIE_VALUE) {
+      continueSearching = false;
+      // Delete our test cookie
+      coreStorage.setCookie(
+        TEST_COOKIE_NAME,
+        '',
+        'Thu, 01 Jan 1970 00:00:01 GMT',
+        undefined,
+        rootDomain,
+        undefined
+      );
+    } else {
+      startIndex += -1;
+      continueSearching = Math.abs(startIndex) <= domainParts.length;
+    }
+  } while (continueSearching);
+  return rootDomain;
+}
+
 /**
  * @param {SubmoduleContainer[]} submodules
  * @param {function} cb - callback for after processing is done.
@@ -657,6 +725,7 @@ function updateSubmodules() {
   // find submodule and the matching configuration, if found create and append a SubmoduleContainer
   submodules = addedSubmodules.map(i => {
     const submoduleConfig = find(configs, j => j.name === i.name);
+    i.findRootDomain = findRootDomain;
     return submoduleConfig ? {
       submodule: i,
       config: submoduleConfig,
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index 981ebb5f50e..9eace12cd2b 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -8,7 +8,8 @@ import {
   setStoredValue,
   setSubmoduleRegistry,
   syncDelay,
-  PBJS_USER_ID_OPTOUT_NAME
+  PBJS_USER_ID_OPTOUT_NAME,
+  findRootDomain,
 } from 'modules/userId/index.js';
 import {createEidsArray} from 'modules/userId/eids.js';
 import {config} from 'src/config.js';
@@ -2145,6 +2146,8 @@ describe('User ID', function () {
     let coreStorageSpy;
     beforeEach(function () {
       coreStorageSpy = sinon.spy(coreStorage, 'setCookie');
+      setSubmoduleRegistry([pubCommonIdSubmodule]);
+      init(config);
     });
     afterEach(function () {
       coreStorageSpy.restore();
@@ -2360,5 +2363,46 @@ describe('User ID', function () {
         sinon.assert.calledOnce(mockExtendId);
       });
     });
+
+    describe('findRootDomain', function () {
+      let sandbox;
+
+      beforeEach(function () {
+        setSubmoduleRegistry([pubCommonIdSubmodule]);
+        init(config);
+        config.setConfig({
+          userSync: {
+            syncDelay: 0,
+            userIds: [
+              {
+                name: 'pubCommonId',
+                value: { pubcid: '11111' },
+              },
+            ],
+          },
+        });
+        sandbox = sinon.createSandbox();
+        sandbox
+          .stub(coreStorage, 'getCookie')
+          .onFirstCall()
+          .returns(null) // .co.uk
+          .onSecondCall()
+          .returns('writeable'); // realdomain.co.uk;
+      });
+
+      afterEach(function () {
+        sandbox.restore();
+      });
+
+      it('should just find the root domain', function () {
+        var domain = findRootDomain('sub.realdomain.co.uk');
+        expect(domain).to.be.eq('realdomain.co.uk');
+      });
+
+      it('should find the full domain when no subdomain is present', function () {
+        var domain = findRootDomain('realdomain.co.uk');
+        expect(domain).to.be.eq('realdomain.co.uk');
+      });
+    });
   });
 });

From 4a56c6790a74dfaaea528e2440e6e88b65197b63 Mon Sep 17 00:00:00 2001
From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com>
Date: Wed, 13 Jan 2021 04:34:00 -0500
Subject: [PATCH 141/304] fix includes and find references in various files
 (#6183)

---
 modules/adxpremiumAnalyticsAdapter.js           | 3 ++-
 modules/cleanmedianetBidAdapter.js              | 3 ++-
 modules/gamoshiBidAdapter.js                    | 3 ++-
 modules/medianetAnalyticsAdapter.js             | 5 +++--
 modules/sspBCBidAdapter.js                      | 3 ++-
 modules/verizonMediaIdSystem.js                 | 3 ++-
 modules/yieldmoBidAdapter.js                    | 3 ++-
 modules/yuktamediaAnalyticsAdapter.js           | 3 ++-
 src/targeting.js                                | 3 ++-
 test/spec/modules/stroeerCoreBidAdapter_spec.js | 3 ++-
 test/spec/modules/userId_spec.js                | 3 ++-
 11 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/modules/adxpremiumAnalyticsAdapter.js b/modules/adxpremiumAnalyticsAdapter.js
index 0aa0ca32374..f11e3b8d4e5 100644
--- a/modules/adxpremiumAnalyticsAdapter.js
+++ b/modules/adxpremiumAnalyticsAdapter.js
@@ -3,6 +3,7 @@ import adapter from '../src/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import * as utils from '../src/utils.js';
+import includes from 'core-js-pure/features/array/includes.js';
 
 const analyticsType = 'endpoint';
 const defaultUrl = 'https://adxpremium.services/graphql';
@@ -211,7 +212,7 @@ function deviceType() {
 }
 
 function clearSlot(elementId) {
-  if (elementIds.includes(elementId)) { elementIds.splice(elementIds.indexOf(elementId), 1); utils.logInfo('AdxPremium Analytics - Done with: ' + elementId); }
+  if (includes(elementIds, elementId)) { elementIds.splice(elementIds.indexOf(elementId), 1); utils.logInfo('AdxPremium Analytics - Done with: ' + elementId); }
   if (elementIds.length == 0 && !requestSent && !timeoutBased) {
     requestSent = true;
     sendEvent(completeObject);
diff --git a/modules/cleanmedianetBidAdapter.js b/modules/cleanmedianetBidAdapter.js
index a8f37450d68..80e4f13e7d4 100644
--- a/modules/cleanmedianetBidAdapter.js
+++ b/modules/cleanmedianetBidAdapter.js
@@ -3,6 +3,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
 import {Renderer} from '../src/Renderer.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import includes from 'core-js-pure/features/array/includes.js';
 
 export const helper = {
   getTopWindowDomain: function (url) {
@@ -119,7 +120,7 @@ export const spec = {
 
       const hasFavoredMediaType =
         params.favoredMediaType &&
-        this.supportedMediaTypes.includes(params.favoredMediaType);
+        includes(this.supportedMediaTypes, params.favoredMediaType);
 
       if (!mediaTypes || mediaTypes.banner) {
         if (!hasFavoredMediaType || params.favoredMediaType === BANNER) {
diff --git a/modules/gamoshiBidAdapter.js b/modules/gamoshiBidAdapter.js
index 48a142a66a6..f8d2b70981c 100644
--- a/modules/gamoshiBidAdapter.js
+++ b/modules/gamoshiBidAdapter.js
@@ -3,6 +3,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
 import {Renderer} from '../src/Renderer.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import includes from 'core-js-pure/features/array/includes.js';
 
 const ENDPOINTS = {
   'gamoshi': 'https://rtb.gamoshi.io'
@@ -111,7 +112,7 @@ export const spec = {
       };
 
       const hasFavoredMediaType =
-        params.favoredMediaType && this.supportedMediaTypes.includes(params.favoredMediaType);
+        params.favoredMediaType && includes(this.supportedMediaTypes, params.favoredMediaType);
 
       if (!mediaTypes || mediaTypes.banner) {
         if (!hasFavoredMediaType || params.favoredMediaType === BANNER) {
diff --git a/modules/medianetAnalyticsAdapter.js b/modules/medianetAnalyticsAdapter.js
index 35c9273f951..cb65a6afc54 100644
--- a/modules/medianetAnalyticsAdapter.js
+++ b/modules/medianetAnalyticsAdapter.js
@@ -4,7 +4,8 @@ import CONSTANTS from '../src/constants.json';
 import * as utils from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 import { getRefererInfo } from '../src/refererDetection.js';
-import { AUCTION_COMPLETED, AUCTION_IN_PROGRESS, getPriceGranularity } from '../src/auction.js'
+import { AUCTION_COMPLETED, AUCTION_IN_PROGRESS, getPriceGranularity } from '../src/auction.js';
+import includes from 'core-js-pure/features/array/includes.js';
 
 const analyticsType = 'endpoint';
 const ENDPOINT = 'https://pb-logs.media.net/log?logid=kfk&evtid=prebid_analytics_events_client';
@@ -125,7 +126,7 @@ class Configure {
       this.setDataFromResponse(response);
       this.overrideDomainLevelData(response);
       this.overrideToDebug(this.mnetDebugConfig);
-      this.urlToConsume = VALID_URL_KEY.includes(response.urlKey) ? response.urlKey : this.urlToConsume;
+      this.urlToConsume = includes(VALID_URL_KEY, response.urlKey) ? response.urlKey : this.urlToConsume;
       this.ajaxState = CONFIG_PASS;
     } catch (e) {
       this.ajaxState = CONFIG_ERROR;
diff --git a/modules/sspBCBidAdapter.js b/modules/sspBCBidAdapter.js
index 1f250992fee..b6e5b88e0f4 100644
--- a/modules/sspBCBidAdapter.js
+++ b/modules/sspBCBidAdapter.js
@@ -2,6 +2,7 @@ import * as utils from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
+import strIncludes from 'core-js-pure/features/string/includes.js';
 
 const BIDDER_CODE = 'sspBC';
 const BIDDER_URL = 'https://ssp.wp.pl/bidder/';
@@ -314,7 +315,7 @@ const spec = {
             site.slot = serverBid.ext.slotid || site.slot;
           }
 
-          if (bidRequest && site.id && !site.id.includes('bidid')) {
+          if (bidRequest && site.id && !strIncludes(site.id, 'bidid')) {
             // store site data for future notification
             oneCodeDetection[bidRequest.bidId] = [site.id, site.slot];
 
diff --git a/modules/verizonMediaIdSystem.js b/modules/verizonMediaIdSystem.js
index f39909f6666..fdfb8a993d8 100644
--- a/modules/verizonMediaIdSystem.js
+++ b/modules/verizonMediaIdSystem.js
@@ -8,6 +8,7 @@
 import {ajax} from '../src/ajax.js';
 import {submodule} from '../src/hook.js';
 import * as utils from '../src/utils.js';
+import includes from 'core-js-pure/features/array/includes.js';
 
 const MODULE_NAME = 'verizonMediaId';
 const VENDOR_ID = 25;
@@ -55,7 +56,7 @@ export const verizonMediaIdSubmodule = {
     }
 
     const data = {
-      '1p': [1, '1', true].includes(params['1p']) ? '1' : '0',
+      '1p': includes([1, '1', true], params['1p']) ? '1' : '0',
       he: params.he,
       gdpr: isEUConsentRequired(consentData) ? '1' : '0',
       euconsent: isEUConsentRequired(consentData) ? consentData.gdpr.consentString : '',
diff --git a/modules/yieldmoBidAdapter.js b/modules/yieldmoBidAdapter.js
index 05af0bf0d66..c1151617ac4 100644
--- a/modules/yieldmoBidAdapter.js
+++ b/modules/yieldmoBidAdapter.js
@@ -2,6 +2,7 @@ import * as utils from '../src/utils.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import includes from 'core-js-pure/features/array/includes';
+import find from 'core-js-pure/features/array/find.js';
 
 const BIDDER_CODE = 'yieldmo';
 const CURRENCY = 'USD';
@@ -197,7 +198,7 @@ function createNewBannerBid(response) {
  * @param bidRequest server request
  */
 function createNewVideoBid(response, bidRequest) {
-  const imp = (utils.deepAccess(bidRequest, 'data.imp') || []).find(imp => imp.id === response.impid);
+  const imp = find((utils.deepAccess(bidRequest, 'data.imp') || []), imp => imp.id === response.impid);
   return {
     requestId: imp.id,
     cpm: response.price,
diff --git a/modules/yuktamediaAnalyticsAdapter.js b/modules/yuktamediaAnalyticsAdapter.js
index caca3bf3341..2ef2d251ace 100644
--- a/modules/yuktamediaAnalyticsAdapter.js
+++ b/modules/yuktamediaAnalyticsAdapter.js
@@ -5,6 +5,7 @@ import CONSTANTS from '../src/constants.json';
 import * as utils from '../src/utils.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { getRefererInfo } from '../src/refererDetection.js';
+import strIncludes from 'core-js-pure/features/string/includes.js';
 
 const storage = getStorageManager();
 const yuktamediaAnalyticsVersion = 'v3.1.0';
@@ -152,7 +153,7 @@ var yuktamediaAnalyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoin
               bidResponse.responseTimestamp = args.responseTimestamp;
               bidResponse.bidForSize = args.size;
               for (const [adserverTargetingKey, adserverTargetingValue] of Object.entries(args.adserverTargeting)) {
-                if (['body', 'icon', 'image', 'linkurl', 'host', 'path'].every((ele) => !adserverTargetingKey.includes(ele))) {
+                if (['body', 'icon', 'image', 'linkurl', 'host', 'path'].every((ele) => !strIncludes(adserverTargetingKey, ele))) {
                   bidResponse['adserverTargeting-' + adserverTargetingKey] = adserverTargetingValue;
                 }
               }
diff --git a/src/targeting.js b/src/targeting.js
index b6a38bdbb61..1c1a97a7016 100644
--- a/src/targeting.js
+++ b/src/targeting.js
@@ -5,6 +5,7 @@ import { auctionManager } from './auctionManager.js';
 import { sizeSupported } from './sizeMapping.js';
 import { ADPOD } from './mediaTypes.js';
 import includes from 'core-js-pure/features/array/includes.js';
+import find from 'core-js-pure/features/array/find.js';
 
 const utils = require('./utils.js');
 var CONSTANTS = require('./constants.json');
@@ -200,7 +201,7 @@ export function newTargeting(auctionManager) {
         // check if key is in default keys, if not, it's custom, we won't remove it.
         const isCustom = defaultKeys.filter(defaultKey => key.indexOf(defaultKeyring[defaultKey]) === 0).length === 0;
         // check if key explicitly allowed, if not, we'll remove it.
-        const found = isCustom || allowedKeys.find(allowedKey => {
+        const found = isCustom || find(allowedKeys, allowedKey => {
           const allowedKeyName = defaultKeyring[allowedKey];
           // we're looking to see if the key exactly starts with one of our default keys.
           // (which hopefully means it's not custom)
diff --git a/test/spec/modules/stroeerCoreBidAdapter_spec.js b/test/spec/modules/stroeerCoreBidAdapter_spec.js
index dd02ebb7c8e..4b028d563d3 100644
--- a/test/spec/modules/stroeerCoreBidAdapter_spec.js
+++ b/test/spec/modules/stroeerCoreBidAdapter_spec.js
@@ -2,6 +2,7 @@ import {assert} from 'chai';
 import {spec} from 'modules/stroeerCoreBidAdapter.js';
 import * as utils from 'src/utils.js';
 import {BANNER, VIDEO} from '../../../src/mediaTypes.js';
+import find from 'core-js-pure/features/array/find.js';
 
 describe('stroeerCore bid adapter', function () {
   let sandbox;
@@ -123,7 +124,7 @@ describe('stroeerCore bid adapter', function () {
           }
         },
         referrer,
-        getElementById: id => placementElements.find(el => el.id === id)
+        getElementById: id => find(placementElements, el => el.id === id)
       }
     };
 
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index 9eace12cd2b..9ada17d7460 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -23,6 +23,7 @@ import {
   setConsentConfig
 } from 'modules/consentManagement.js';
 import {server} from 'test/mocks/xhr.js';
+import find from 'core-js-pure/features/array/find.js';
 import {unifiedIdSubmodule} from 'modules/unifiedIdSystem.js';
 import {pubCommonIdSubmodule} from 'modules/pubCommonIdSystem.js';
 import {britepoolIdSubmodule} from 'modules/britepoolIdSystem.js';
@@ -87,7 +88,7 @@ describe('User ID', function () {
   }
 
   function findEid(eids, source) {
-    return eids.find((eid) => {
+    return find(eids, (eid) => {
       if (eid.source === source) { return true; }
     });
   }

From 19a0d7239d57576ff8e70c535ee9511141e50a53 Mon Sep 17 00:00:00 2001
From: Niksok <belnamtar@mail.ru>
Date: Wed, 13 Jan 2021 18:21:38 +0300
Subject: [PATCH 142/304] Fix typo in mediaforce bid adapter (#6181)

* add mediaforce bid adapter

* make use of unused variable language

* Added native support for Mediaforce Bid Adapter

* Fix test endpoint url for Mediaforce Bid Adapter

* cleanup

* Added the ability to send multiple bids in one ad request for mediaforce bid adapter

* Fixes after review for mediaforce bid adapter

* Fix typo in mediaforce bid adapter

Co-authored-by: ksanksana <little.grey.goblin@gmail.com>
---
 modules/mediaforceBidAdapter.js                | 2 +-
 test/spec/modules/mediaforceBidAdapter_spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mediaforceBidAdapter.js b/modules/mediaforceBidAdapter.js
index 7e29bb519b5..e03423f36ac 100644
--- a/modules/mediaforceBidAdapter.js
+++ b/modules/mediaforceBidAdapter.js
@@ -128,7 +128,7 @@ export const spec = {
       let impObj = {
         id: bid.bidId,
         tagid: tagid,
-        secure: window.location.protocol === 'https' ? 1 : 0,
+        secure: window.location.protocol === 'https:' ? 1 : 0,
         bidfloor: bidfloor,
         ext: {
           mediaforce: {
diff --git a/test/spec/modules/mediaforceBidAdapter_spec.js b/test/spec/modules/mediaforceBidAdapter_spec.js
index 0b3271da770..24326afe5c0 100644
--- a/test/spec/modules/mediaforceBidAdapter_spec.js
+++ b/test/spec/modules/mediaforceBidAdapter_spec.js
@@ -142,7 +142,7 @@ describe('mediaforce bid adapter', function () {
 
     const requestUrl = `${baseUrl}/header_bid`;
     const dnt = utils.getDNT() ? 1 : 0;
-    const secure = window.location.protocol === 'https' ? 1 : 0;
+    const secure = window.location.protocol === 'https:' ? 1 : 0;
     const pageUrl = window.location.href;
     const timeout = 1500;
 

From 4938e4f3422de32380739b262051aee3e6708ef6 Mon Sep 17 00:00:00 2001
From: mmoschovas <63253416+mmoschovas@users.noreply.github.com>
Date: Wed, 13 Jan 2021 11:15:53 -0500
Subject: [PATCH 143/304] Prebid JS Native Phase 2 update: (#5411)

* Prebid JS Native Phase 2 update:

1) Key Suppression for Native keys with sendTargetingKeys set to false at nativeParams.sendTargetingKeys or within asset i.e. nativeParams.image.sendTargetingKeys. Logic as follows:
   - If nativeParams.sendTargetingKeys set to false but asset has sendTargetingKeys set to true then add the KV
   - Else if nativeParams.sendTargetingKeys is set to true and asset does not have sendTargetingKeys defined or it is set to true then add KV
   - Else if nativeParams.sendTargetingKeys is not defined and asset does not have sendTargetingKeys defined or it is set
 to true then add KV
   If no conditions met then key is suppressed
2) Adds rendererUrl or adTemplate to the bid object for easy retrieval if assets requested from creative
3) Adds new logic to receiveMessage function in secureCreatives.js to answer data.action of 'allAssetRequest' with all available assets on the bid that have a value
4) Adds new native keys to constants.json

* Update to simplify send asset logic

* Fixed asset location typo

* Update to include message listener for native resize and update adObject for auction to include creative height and trigger resize

Co-authored-by: Michael Moschovas <mmoschovas@NY-Moschovas.local>
---
 src/constants.json       |   4 +-
 src/native.js            |  71 +++++++++++---
 src/secureCreatives.js   |   9 +-
 test/spec/native_spec.js | 196 ++++++++++++++++++++++++++++++++++++++-
 4 files changed, 265 insertions(+), 15 deletions(-)

diff --git a/src/constants.json b/src/constants.json
index 7e82946b65c..92b1dc6cc34 100644
--- a/src/constants.json
+++ b/src/constants.json
@@ -88,7 +88,9 @@
     "likes": "hb_native_likes",
     "phone": "hb_native_phone",
     "price": "hb_native_price",
-    "salePrice": "hb_native_saleprice"
+    "salePrice": "hb_native_saleprice",
+    "rendererUrl": "hb_renderer_url",
+    "adTemplate": "hb_adTemplate"
   },
   "S2S" : {
     "SRC" : "s2s",
diff --git a/src/native.js b/src/native.js
index e41d7740ffa..2d22e16c8a5 100644
--- a/src/native.js
+++ b/src/native.js
@@ -154,22 +154,41 @@ export function fireNativeTrackers(message, adObject) {
 export function getNativeTargeting(bid, bidReq) {
   let keyValues = {};
 
+  if (deepAccess(bidReq, 'nativeParams.rendererUrl')) {
+    bid['native']['rendererUrl'] = getAssetValue(bidReq.nativeParams['rendererUrl']);
+  } else if (deepAccess(bidReq, 'nativeParams.adTemplate')) {
+    bid['native']['adTemplate'] = getAssetValue(bidReq.nativeParams['adTemplate']);
+  }
+
+  const globalSendTargetingKeys = deepAccess(
+    bidReq,
+    `nativeParams.sendTargetingKeys`
+  ) !== false;
+
   Object.keys(bid['native']).forEach(asset => {
-    const key = CONSTANTS.NATIVE_KEYS[asset];
-    let value = getAssetValue(bid['native'][asset]);
+    if (asset !== 'adTemplate') {
+      const key = CONSTANTS.NATIVE_KEYS[asset];
+      let value = getAssetValue(bid['native'][asset]);
 
-    const sendPlaceholder = deepAccess(
-      bidReq,
-      `mediaTypes.native.${asset}.sendId`
-    );
+      const sendPlaceholder = deepAccess(
+        bidReq,
+        `mediaTypes.native.${asset}.sendId`
+      );
 
-    if (sendPlaceholder) {
-      const placeholder = `${key}:${bid.adId}`;
-      value = placeholder;
-    }
+      if (sendPlaceholder) {
+        const placeholder = `${key}:${bid.adId}`;
+        value = placeholder;
+      }
+
+      const assetSendTargetingKeys = deepAccess(
+        bidReq,
+        `nativeParams.${asset}.sendTargetingKeys`);
 
-    if (key && value) {
-      keyValues[key] = value;
+      const sendTargeting = typeof assetSendTargetingKeys === 'boolean' ? assetSendTargetingKeys : globalSendTargetingKeys;
+
+      if (key && value && sendTargeting) {
+        keyValues[key] = value;
+      }
     }
   });
 
@@ -187,6 +206,12 @@ export function getAssetMessage(data, adObject) {
     assets: [],
   };
 
+  if (adObject.native.hasOwnProperty('adTemplate')) {
+    message.adTemplate = getAssetValue(adObject.native['adTemplate']);
+  } if (adObject.native.hasOwnProperty('rendererUrl')) {
+    message.rendererUrl = getAssetValue(adObject.native['rendererUrl']);
+  }
+
   data.assets.forEach(asset => {
     const key = getKeyByValue(CONSTANTS.NATIVE_KEYS, asset);
     const value = getAssetValue(adObject.native[key]);
@@ -197,6 +222,28 @@ export function getAssetMessage(data, adObject) {
   return message;
 }
 
+export function getAllAssetsMessage(data, adObject) {
+  const message = {
+    message: 'assetResponse',
+    adId: data.adId,
+    assets: []
+  };
+
+  Object.keys(adObject.native).forEach(function(key, index) {
+    if (key === 'adTemplate' && adObject.native[key]) {
+      message.adTemplate = getAssetValue(adObject.native[key]);
+    } else if (key === 'rendererUrl' && adObject.native[key]) {
+      message.rendererUrl = getAssetValue(adObject.native[key]);
+    } else if (adObject.native[key] && CONSTANTS.NATIVE_KEYS.hasOwnProperty(key)) {
+      const value = getAssetValue(adObject.native[key]);
+
+      message.assets.push({ key, value });
+    }
+  });
+
+  return message;
+}
+
 /**
  * Native assets can be a string or an object with a url prop. Returns the value
  * appropriate for sending in adserver targeting or placeholder replacement.
diff --git a/src/secureCreatives.js b/src/secureCreatives.js
index cb192dd773e..def1a9abdbb 100644
--- a/src/secureCreatives.js
+++ b/src/secureCreatives.js
@@ -4,7 +4,7 @@
  */
 
 import events from './events.js';
-import { fireNativeTrackers, getAssetMessage } from './native.js';
+import { fireNativeTrackers, getAssetMessage, getAllAssetsMessage } from './native.js';
 import constants from './constants.json';
 import { logWarn, replaceAuctionPrice } from './utils.js';
 import { auctionManager } from './auctionManager.js';
@@ -51,6 +51,13 @@ function receiveMessage(ev) {
         const message = getAssetMessage(data, adObject);
         ev.source.postMessage(JSON.stringify(message), ev.origin);
         return;
+      } else if (data.action === 'allAssetRequest') {
+        const message = getAllAssetsMessage(data, adObject);
+        ev.source.postMessage(JSON.stringify(message), ev.origin);
+      } else if (data.action === 'resizeNativeHeight') {
+        adObject.height = data.height;
+        adObject.width = data.width;
+        resizeRemoteCreative(adObject);
       }
 
       const trackerType = fireNativeTrackers(data, adObject);
diff --git a/test/spec/native_spec.js b/test/spec/native_spec.js
index bd56ba53e4a..ef9d407dd0c 100644
--- a/test/spec/native_spec.js
+++ b/test/spec/native_spec.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { fireNativeTrackers, getNativeTargeting, nativeBidIsValid, getAssetMessage } from 'src/native.js';
+import { fireNativeTrackers, getNativeTargeting, nativeBidIsValid, getAssetMessage, getAllAssetsMessage } from 'src/native.js';
 import CONSTANTS from 'src/constants.json';
 const utils = require('src/utils');
 
@@ -87,6 +87,136 @@ describe('native.js', function () {
     ]);
   });
 
+  it('should only include targeting that has sendTargetingKeys set to true', function () {
+    const bidRequest = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [150, 50]
+        },
+        title: {
+          required: true,
+          len: 80,
+          sendTargetingKeys: true
+        },
+        sendTargetingKeys: false,
+      }
+
+    };
+    const targeting = getNativeTargeting(bid, bidRequest);
+
+    expect(Object.keys(targeting)).to.deep.equal([
+      CONSTANTS.NATIVE_KEYS.title
+    ]);
+  });
+
+  it('should only include targeting if sendTargetingKeys not set to false', function () {
+    const bidRequest = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [150, 50]
+        },
+        title: {
+          required: true,
+          len: 80
+        },
+        body: {
+          required: true
+        },
+        clickUrl: {
+          required: true
+        },
+        icon: {
+          required: false,
+          sendTargetingKeys: false
+        },
+        cta: {
+          required: false,
+          sendTargetingKeys: false
+        },
+        sponsoredBy: {
+          required: false,
+          sendTargetingKeys: false
+        }
+      }
+
+    };
+    const targeting = getNativeTargeting(bid, bidRequest);
+
+    expect(Object.keys(targeting)).to.deep.equal([
+      CONSTANTS.NATIVE_KEYS.title,
+      CONSTANTS.NATIVE_KEYS.body,
+      CONSTANTS.NATIVE_KEYS.image,
+      CONSTANTS.NATIVE_KEYS.clickUrl
+    ]);
+  });
+
+  it('should copy over rendererUrl to bid object and include it in targeting', function () {
+    const bidRequest = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [150, 50]
+        },
+        title: {
+          required: true,
+          len: 80,
+        },
+        rendererUrl: {
+          url: 'https://www.renderer.com/'
+        }
+      }
+
+    };
+    const targeting = getNativeTargeting(bid, bidRequest);
+
+    expect(Object.keys(targeting)).to.deep.equal([
+      CONSTANTS.NATIVE_KEYS.title,
+      CONSTANTS.NATIVE_KEYS.body,
+      CONSTANTS.NATIVE_KEYS.cta,
+      CONSTANTS.NATIVE_KEYS.image,
+      CONSTANTS.NATIVE_KEYS.icon,
+      CONSTANTS.NATIVE_KEYS.sponsoredBy,
+      CONSTANTS.NATIVE_KEYS.clickUrl,
+      CONSTANTS.NATIVE_KEYS.rendererUrl
+    ]);
+
+    expect(bid.native.rendererUrl).to.deep.equal('https://www.renderer.com/');
+    delete bid.native.rendererUrl;
+  });
+
+  it('should copy over adTemplate to bid object and include it in targeting', function () {
+    const bidRequest = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [150, 50]
+        },
+        title: {
+          required: true,
+          len: 80,
+        },
+        adTemplate: '<div><p>##hb_native_body##<\/p><\/div>'
+      }
+
+    };
+    const targeting = getNativeTargeting(bid, bidRequest);
+
+    expect(Object.keys(targeting)).to.deep.equal([
+      CONSTANTS.NATIVE_KEYS.title,
+      CONSTANTS.NATIVE_KEYS.body,
+      CONSTANTS.NATIVE_KEYS.cta,
+      CONSTANTS.NATIVE_KEYS.image,
+      CONSTANTS.NATIVE_KEYS.icon,
+      CONSTANTS.NATIVE_KEYS.sponsoredBy,
+      CONSTANTS.NATIVE_KEYS.clickUrl
+    ]);
+
+    expect(bid.native.adTemplate).to.deep.equal('<div><p>##hb_native_body##<\/p><\/div>');
+    delete bid.native.adTemplate;
+  });
+
   it('fires impression trackers', function () {
     fireNativeTrackers({}, bid);
     sinon.assert.calledOnce(triggerPixelStub);
@@ -125,6 +255,70 @@ describe('native.js', function () {
       value: bid.native.clickUrl
     });
   });
+
+  it('creates native all asset message', function() {
+    const messageRequest = {
+      message: 'Prebid Native',
+      action: 'allAssetRequest',
+      adId: '123',
+    };
+
+    const message = getAllAssetsMessage(messageRequest, bid);
+
+    expect(message.assets.length).to.equal(7);
+    expect(message.assets).to.deep.include({
+      key: 'body',
+      value: bid.native.body
+    });
+    expect(message.assets).to.deep.include({
+      key: 'image',
+      value: bid.native.image.url
+    });
+    expect(message.assets).to.deep.include({
+      key: 'clickUrl',
+      value: bid.native.clickUrl
+    });
+    expect(message.assets).to.deep.include({
+      key: 'title',
+      value: bid.native.title
+    });
+    expect(message.assets).to.deep.include({
+      key: 'icon',
+      value: bid.native.icon.url
+    });
+    expect(message.assets).to.deep.include({
+      key: 'cta',
+      value: bid.native.cta
+    });
+    expect(message.assets).to.deep.include({
+      key: 'sponsoredBy',
+      value: bid.native.sponsoredBy
+    });
+  });
+
+  it('creates native all asset message with only defined fields', function() {
+    const messageRequest = {
+      message: 'Prebid Native',
+      action: 'allAssetRequest',
+      adId: '123',
+    };
+
+    const message = getAllAssetsMessage(messageRequest, bidWithUndefinedFields);
+
+    expect(message.assets.length).to.equal(3);
+    expect(message.assets).to.deep.include({
+      key: 'clickUrl',
+      value: bid.native.clickUrl
+    });
+    expect(message.assets).to.deep.include({
+      key: 'title',
+      value: bid.native.title
+    });
+    expect(message.assets).to.deep.include({
+      key: 'sponsoredBy',
+      value: bid.native.sponsoredBy
+    });
+  });
 });
 
 describe('validate native', function () {

From 681c8e7b51752205ec123c053351deafcaab77c0 Mon Sep 17 00:00:00 2001
From: Reinout Stevens <reinout@reinoutstevens.be>
Date: Wed, 13 Jan 2021 18:31:15 +0100
Subject: [PATCH 144/304] Improve __uspapi behavior in iframe (#6072)

* align locator + fix remove listener

* update comment

Co-authored-by: Reinout Stevens <reinout@crazygames.com>
---
 modules/consentManagementUsp.js | 90 +++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 32 deletions(-)

diff --git a/modules/consentManagementUsp.js b/modules/consentManagementUsp.js
index 3edacb41549..cba9c2758d0 100644
--- a/modules/consentManagementUsp.js
+++ b/modules/consentManagementUsp.js
@@ -44,6 +44,35 @@ function lookupStaticConsentData(cmpSuccess, cmpError, hookConfig) {
  * @param {object} hookConfig contains module related variables (see comment in requestBidsHook function)
  */
 function lookupUspConsent(uspSuccess, uspError, hookConfig) {
+  function findUsp() {
+    let f = window;
+    let uspapiFrame;
+    let uspapiFunction;
+
+    while (!uspapiFrame) {
+      try {
+        if (typeof f.__uspapi === 'function') {
+          uspapiFunction = f.__uspapi;
+          uspapiFrame = f;
+          break;
+        }
+      } catch (e) {}
+
+      try {
+        if (f.frames['__uspapiLocator']) {
+          uspapiFrame = f;
+          break;
+        }
+      } catch (e) {}
+      if (f === window.top) break;
+      f = f.parent;
+    }
+    return {
+      uspapiFrame,
+      uspapiFunction,
+    };
+  }
+
   function handleUspApiResponseCallbacks() {
     const uspResponse = {};
 
@@ -61,41 +90,43 @@ function lookupUspConsent(uspSuccess, uspError, hookConfig) {
           uspResponse.usPrivacy = consentResponse.uspString;
         }
         afterEach();
-      }
+      },
     };
   }
 
   let callbackHandler = handleUspApiResponseCallbacks();
   let uspapiCallbacks = {};
 
+  let { uspapiFrame, uspapiFunction } = findUsp();
+
+  if (!uspapiFrame) {
+    return uspError('USP CMP not found.', hookConfig);
+  }
+
   // to collect the consent information from the user, we perform a call to USPAPI
   // to collect the user's consent choices represented as a string (via getUSPData)
 
   // the following code also determines where the USPAPI is located and uses the proper workflow to communicate with it:
-  // - use the USPAPI locator code to see if USP's located in the current window or an ancestor window. This works in friendly or cross domain iframes
+  // - use the USPAPI locator code to see if USP's located in the current window or an ancestor window.
+  // - else assume prebid is in an iframe, and use the locator to see if the CMP is located in a higher parent window. This works in cross domain iframes.
   // - if USPAPI is not found, the iframe function will call the uspError exit callback to abort the rest of the USPAPI workflow
-  // - try to call the __uspapi() function directly, otherwise use the postMessage() api
-  // find the CMP frame/window
-
-  try {
-    // try to call __uspapi directly
-    window.__uspapi('getUSPData', USPAPI_VERSION, callbackHandler.consentDataCallback);
-  } catch (e) {
-    // must not have been accessible, try using postMessage() api
-    let f = window;
-    let uspapiFrame;
-    while (!uspapiFrame) {
-      try {
-        if (f.frames['__uspapiLocator']) uspapiFrame = f;
-      } catch (e) { }
-      if (f === window.top) break;
-      f = f.parent;
-    }
 
-    if (!uspapiFrame) {
-      return uspError('USP CMP not found.', hookConfig);
-    }
-    callUspApiWhileInIframe('getUSPData', uspapiFrame, callbackHandler.consentDataCallback);
+  if (utils.isFn(uspapiFunction)) {
+    utils.logInfo('Detected USP CMP is directly accessible, calling it now...');
+    uspapiFunction(
+      'getUSPData',
+      USPAPI_VERSION,
+      callbackHandler.consentDataCallback
+    );
+  } else {
+    utils.logInfo(
+      'Detected USP CMP is outside the current iframe where Prebid.js is located, calling it now...'
+    );
+    callUspApiWhileInIframe(
+      'getUSPData',
+      uspapiFrame,
+      callbackHandler.consentDataCallback
+    );
   }
 
   function callUspApiWhileInIframe(commandName, uspapiFrame, moduleCallback) {
@@ -107,19 +138,19 @@ function lookupUspConsent(uspSuccess, uspError, hookConfig) {
         __uspapiCall: {
           command: cmd,
           version: ver,
-          callId: callId
-        }
+          callId: callId,
+        },
       };
 
       uspapiCallbacks[callId] = callback;
       uspapiFrame.postMessage(msg, '*');
-    }
+    };
 
     /** when we get the return message, call the stashed callback */
     window.addEventListener('message', readPostMessageResponse, false);
 
     // call uspapi
-    window.__uspapi(commandName, USPAPI_VERSION, uspapiCallback);
+    window.__uspapi(commandName, USPAPI_VERSION, moduleCallback);
 
     function readPostMessageResponse(event) {
       const res = event && event.data && event.data.__uspapiReturn;
@@ -130,11 +161,6 @@ function lookupUspConsent(uspSuccess, uspError, hookConfig) {
         }
       }
     }
-
-    function uspapiCallback(consentObject, success) {
-      window.removeEventListener('message', readPostMessageResponse, false);
-      moduleCallback(consentObject, success);
-    }
   }
 }
 

From bbd64ab56698ef2531f829d44079ed7c01743424 Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Wed, 13 Jan 2021 18:51:54 +0100
Subject: [PATCH 145/304] Prebid 4.22.0 Release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0aae435980f..ef282783167 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.22.0-pre",
+  "version": "4.22.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From c8665c50980a4e00653b1676e778b97ceb8eeb97 Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Wed, 13 Jan 2021 19:12:15 +0100
Subject: [PATCH 146/304] Increment pre version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ef282783167..57f7a629d19 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.22.0",
+  "version": "4.23.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 4b6ee784bd44eeb222753be7510f58996b7ef695 Mon Sep 17 00:00:00 2001
From: John Rosendahl <jrosendahl@gmail.com>
Date: Thu, 14 Jan 2021 01:35:33 -0700
Subject: [PATCH 147/304] Sovrn: Add Support for Floor Module (#6155)

* EX-2549 Pass segments parameter as imp.ext.dealids array

* EX-2549 Address Jon's feedback

* EX-2549 Reworked the solution

* EX-2549 Blackbird compatibility

* EX-2549 Address Jon's comments

* EX-2549 Addressed upstream PR comments

* added floor module support

* added function check

* rerun test

Co-authored-by: Egor Gordeev <egordeev@lineate.com>
Co-authored-by: Egor Gordeev <48566506+egsgordeev@users.noreply.github.com>
---
 modules/sovrnBidAdapter.js                | 17 +++++++---
 test/spec/modules/sovrnBidAdapter_spec.js | 39 +++++++++++++++++++++--
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/modules/sovrnBidAdapter.js b/modules/sovrnBidAdapter.js
index 176b090fbe5..9ec4d339753 100644
--- a/modules/sovrnBidAdapter.js
+++ b/modules/sovrnBidAdapter.js
@@ -14,7 +14,7 @@ export const spec = {
    * @return boolean for whether or not a bid is valid
    */
   isBidRequestValid: function(bid) {
-    return !!(bid.params.tagid && !isNaN(parseFloat(bid.params.tagid)) && isFinite(bid.params.tagid));
+    return !!(bid.params.tagid && !isNaN(parseFloat(bid.params.tagid)) && isFinite(bid.params.tagid))
   },
 
   /**
@@ -45,14 +45,21 @@ export const spec = {
         }
 
         if (bid.schain) {
-          schain = schain || bid.schain;
+          schain = schain || bid.schain
         }
-        iv = iv || utils.getBidIdParameter('iv', bid.params);
+        iv = iv || utils.getBidIdParameter('iv', bid.params)
 
-        let bidSizes = (bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) || bid.sizes;
+        let bidSizes = (bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) || bid.sizes
         bidSizes = ((utils.isArray(bidSizes) && utils.isArray(bidSizes[0])) ? bidSizes : [bidSizes])
         bidSizes = bidSizes.filter(size => utils.isArray(size))
         const processedSizes = bidSizes.map(size => ({w: parseInt(size[0], 10), h: parseInt(size[1], 10)}))
+        const floorInfo = (bid.getFloor && typeof bid.getFloor === 'function') ? bid.getFloor({
+          currency: 'USD',
+          mediaType: 'banner',
+          size: '*'
+        }) : {}
+        floorInfo.floor = floorInfo.floor || utils.getBidIdParameter('bidfloor', bid.params)
+
         const imp = {
           adunitcode: bid.adUnitCode,
           id: bid.bidId,
@@ -62,7 +69,7 @@ export const spec = {
             h: 1,
           },
           tagid: String(utils.getBidIdParameter('tagid', bid.params)),
-          bidfloor: utils.getBidIdParameter('bidfloor', bid.params)
+          bidfloor: floorInfo.floor
         }
 
         const segmentsString = utils.getBidIdParameter('segments', bid.params)
diff --git a/test/spec/modules/sovrnBidAdapter_spec.js b/test/spec/modules/sovrnBidAdapter_spec.js
index 2bb5cdbdf3c..84a0069c0b4 100644
--- a/test/spec/modules/sovrnBidAdapter_spec.js
+++ b/test/spec/modules/sovrnBidAdapter_spec.js
@@ -4,11 +4,26 @@ import {newBidder} from 'src/adapters/bidderFactory.js';
 
 const ENDPOINT = `https://ap.lijit.com/rtb/bid?src=$$REPO_AND_VERSION$$`;
 
+const adUnitBidRequest = {
+  'bidder': 'sovrn',
+  'params': {
+    'tagid': '403370'
+  },
+  'adUnitCode': 'adunit-code',
+  'sizes': [
+    [300, 250],
+    [300, 600]
+  ],
+  'bidId': '30b31c1838de1e',
+  'bidderRequestId': '22edbae2733bf6',
+  'auctionId': '1d1a030790a475',
+}
+
 describe('sovrnBidAdapter', function() {
   const adapter = newBidder(spec);
 
   describe('isBidRequestValid', function () {
-    let bid = {
+    const bid = {
       'bidder': 'sovrn',
       'params': {
         'tagid': '403370'
@@ -296,12 +311,32 @@ describe('sovrnBidAdapter', function() {
         'bidId': '30b31c1838de1e',
         'bidderRequestId': '22edbae2733bf6',
         'auctionId': '1d1a030790a475'
-      }];
+      }]
       const request = spec.buildRequests(segmentsRequests, bidderRequest)
       const payload = JSON.parse(request.data)
       expect(payload.imp[0].ext.deals[0]).to.equal('test1')
       expect(payload.imp[0].ext.deals[1]).to.equal('test2')
     })
+    it('should use the floor provided from the floor module if present', function() {
+      const floorBid = {...adUnitBidRequest, getFloor: () => ({currency: 'USD', floor: 1.10})}
+      floorBid.params = {
+        tagid: 1234,
+        bidfloor: 2.00
+      }
+      const request = spec.buildRequests([floorBid], bidderRequest)
+      const payload = JSON.parse(request.data)
+      expect(payload.imp[0].bidfloor).to.equal(1.10)
+    })
+    it('should use the floor from the param if there is no floor from the floor module', function() {
+      const floorBid = {...adUnitBidRequest, getFloor: () => ({})}
+      floorBid.params = {
+        tagid: 1234,
+        bidfloor: 2.00
+      }
+      const request = spec.buildRequests([floorBid], bidderRequest)
+      const payload = JSON.parse(request.data)
+      expect(payload.imp[0].bidfloor).to.equal(2.00)
+    })
   });
 
   describe('interpretResponse', function () {

From 22a6c9a442b8d2fd51a54140c64792fdfce27423 Mon Sep 17 00:00:00 2001
From: Mark <markaconrad@users.noreply.github.com>
Date: Thu, 14 Jan 2021 04:02:48 -0500
Subject: [PATCH 148/304] Lotame panorama id glv (#6185)

* Add the root domain check method as a global method added for use modules

* Add a date suffix to keep the test cookie random

* Per review, moved the findRootDomain method to utils out of the userId modules

* More the domain method back the user module but attach it to the submodule so that userId modules can have access to it

* Remove the storageManager as it is no longer used in utils

* Add the GVLID to the lotamePanoramaIdSystem

* Use the GVL ID in the storage manager as well
---
 modules/lotamePanoramaIdSystem.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/modules/lotamePanoramaIdSystem.js b/modules/lotamePanoramaIdSystem.js
index 5c3a9a16b3a..9b3fc1f5019 100644
--- a/modules/lotamePanoramaIdSystem.js
+++ b/modules/lotamePanoramaIdSystem.js
@@ -16,8 +16,9 @@ const MODULE_NAME = 'lotamePanoramaId';
 const NINE_MONTHS_MS = 23328000 * 1000;
 const DAYS_TO_CACHE = 7;
 const DAY_MS = 60 * 60 * 24 * 1000;
+const GVLID = 95;
 
-export const storage = getStorageManager(null, MODULE_NAME);
+export const storage = getStorageManager(GVLID, MODULE_NAME);
 
 /**
  * Set the Lotame First Party Profile ID in the first party namespace
@@ -141,13 +142,18 @@ function clearLotameCache(key) {
 }
 /** @type {Submodule} */
 export const lotamePanoramaIdSubmodule = {
-
   /**
    * used to link submodule with config
    * @type {string}
    */
   name: MODULE_NAME,
 
+  /**
+   * Vendor id of Lotame
+   * @type {Number}
+   */
+  gvlid: GVLID,
+
   /**
    * Decode the stored id value for passing to bid requests
    * @function decode
@@ -156,7 +162,7 @@ export const lotamePanoramaIdSubmodule = {
    * @returns {(Object|undefined)}
    */
   decode(value, config) {
-    return utils.isStr(value) ? { 'lotamePanoramaId': value } : undefined;
+    return utils.isStr(value) ? { lotamePanoramaId: value } : undefined;
   },
 
   /**
@@ -174,7 +180,7 @@ export const lotamePanoramaIdSubmodule = {
 
     if (!refreshNeeded) {
       return {
-        id: localCache.data
+        id: localCache.data,
       };
     }
 
@@ -183,7 +189,7 @@ export const lotamePanoramaIdSubmodule = {
     const resolveIdFunction = function (callback) {
       let queryParams = {};
       if (storedUserId) {
-        queryParams.fp = storedUserId
+        queryParams.fp = storedUserId;
       }
 
       if (consentData && utils.isBoolean(consentData.gdprApplies)) {
@@ -233,7 +239,7 @@ export const lotamePanoramaIdSubmodule = {
         undefined,
         {
           method: 'GET',
-          withCredentials: true
+          withCredentials: true,
         }
       );
     };

From 321690a0e75de3fddcb49578b11f263b32b03cc7 Mon Sep 17 00:00:00 2001
From: Galphimbl <sashatkachov91@gmail.com>
Date: Thu, 14 Jan 2021 18:34:17 +0200
Subject: [PATCH 149/304] Admixer bid adapter: add fpd (#6190)

* Migrating to Prebid 1.0

* Migrating to Prebid 1.0

* Fix spec

* add gdpr and usp

* remove changes in gdpr_hello_world.html

* Update gdpr_hello_world.html

add spaces

* add user syncs

* remove comments

* tests

* add fpd to request

Co-authored-by: atkachov <atkachov91@admixer.ua>
---
 modules/admixerBidAdapter.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/admixerBidAdapter.js b/modules/admixerBidAdapter.js
index 765b3d0f127..d2a6f9a639e 100644
--- a/modules/admixerBidAdapter.js
+++ b/modules/admixerBidAdapter.js
@@ -21,6 +21,7 @@ export const spec = {
   buildRequests: function (validRequest, bidderRequest) {
     const payload = {
       imps: [],
+      fpd: config.getConfig('fpd')
     };
     let endpointUrl;
     if (bidderRequest) {

From 83dcf46352342b1f19e3fbe8739fb0509e3ae291 Mon Sep 17 00:00:00 2001
From: Veronica Kim <43146383+vkimcm@users.noreply.github.com>
Date: Thu, 14 Jan 2021 18:58:53 -0500
Subject: [PATCH 150/304] Add Adomain Targeting Key and Default Targeting Keys
 (#6116)

* Add Adomain Targeting Key

* add default targeting key

Co-authored-by: Veronica Kim <vkim@vkim-mac.lan>
---
 src/auction.js                   | 11 +++++++++++
 src/constants.json               | 13 +++++++++++++
 src/targeting.js                 |  3 ++-
 test/spec/auctionmanager_spec.js | 16 ++++++++++++++++
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/auction.js b/src/auction.js
index c94e3adc9a7..15c6b50ce71 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -626,6 +626,16 @@ export const getPriceByGranularity = (granularity) => {
   }
 }
 
+/**
+ * This function returns a function to get first advertiser domain from bid response meta
+ * @returns {function}
+ */
+export const getAdvertiserDomain = () => {
+  return (bid) => {
+    return (bid.meta && bid.meta.advertiserDomains && bid.meta.advertiserDomains.length > 0) ? bid.meta.advertiserDomains[0] : '';
+  }
+}
+
 /**
  * @param {string} mediaType
  * @param {string} bidderCode
@@ -662,6 +672,7 @@ export function getStandardBidderSettings(mediaType, bidderCode, bidReq) {
       createKeyVal(TARGETING_KEYS.DEAL, 'dealId'),
       createKeyVal(TARGETING_KEYS.SOURCE, 'source'),
       createKeyVal(TARGETING_KEYS.FORMAT, 'mediaType'),
+      createKeyVal(TARGETING_KEYS.ADOMAIN, getAdvertiserDomain()),
     ]
   }
 
diff --git a/src/constants.json b/src/constants.json
index 92b1dc6cc34..4025e084682 100644
--- a/src/constants.json
+++ b/src/constants.json
@@ -59,6 +59,19 @@
     "CUSTOM": "custom"
   },
   "TARGETING_KEYS": {
+    "BIDDER": "hb_bidder",
+    "AD_ID": "hb_adid",
+    "PRICE_BUCKET": "hb_pb",
+    "SIZE": "hb_size",
+    "DEAL": "hb_deal",
+    "SOURCE": "hb_source",
+    "FORMAT": "hb_format",
+    "UUID": "hb_uuid",
+    "CACHE_ID": "hb_cache_id",
+    "CACHE_HOST": "hb_cache_host",
+    "ADOMAIN" : "hb_adomain"
+  },
+  "DEFAULT_TARGETING_KEYS": {
     "BIDDER": "hb_bidder",
     "AD_ID": "hb_adid",
     "PRICE_BUCKET": "hb_pb",
diff --git a/src/targeting.js b/src/targeting.js
index 1c1a97a7016..aa80ce6fd5d 100644
--- a/src/targeting.js
+++ b/src/targeting.js
@@ -250,7 +250,8 @@ export function newTargeting(auctionManager) {
       });
     });
 
-    const allowedKeys = config.getConfig('targetingControls.allowTargetingKeys');
+    const defaultKeys = Object.keys(Object.assign({}, CONSTANTS.DEFAULT_TARGETING_KEYS, CONSTANTS.NATIVE_KEYS));
+    const allowedKeys = config.getConfig('targetingControls.allowTargetingKeys') || defaultKeys;
     if (Array.isArray(allowedKeys) && allowedKeys.length > 0) {
       targeting = getAllowedTargetingKeyValues(targeting, allowedKeys);
     }
diff --git a/test/spec/auctionmanager_spec.js b/test/spec/auctionmanager_spec.js
index a50eba5e585..69e34c4a07a 100644
--- a/test/spec/auctionmanager_spec.js
+++ b/test/spec/auctionmanager_spec.js
@@ -143,6 +143,9 @@ describe('auctionmanager.js', function () {
       adId: '1adId',
       source: 'client',
       mediaType: 'banner',
+      meta: {
+        advertiserDomains: ['adomain']
+      }
     };
 
     /* return the expected response for a given bid, filter by keys if given */
@@ -154,6 +157,7 @@ describe('auctionmanager.js', function () {
       expected[ CONSTANTS.TARGETING_KEYS.SIZE ] = bid.getSize();
       expected[ CONSTANTS.TARGETING_KEYS.SOURCE ] = bid.source;
       expected[ CONSTANTS.TARGETING_KEYS.FORMAT ] = bid.mediaType;
+      expected[ CONSTANTS.TARGETING_KEYS.ADOMAIN ] = bid.meta.advertiserDomains[0];
       if (bid.mediaType === 'video') {
         expected[ CONSTANTS.TARGETING_KEYS.UUID ] = bid.videoCacheKey;
         expected[ CONSTANTS.TARGETING_KEYS.CACHE_ID ] = bid.videoCacheKey;
@@ -239,6 +243,12 @@ describe('auctionmanager.js', function () {
                 return bidResponse.mediaType;
               }
             },
+            {
+              key: CONSTANTS.TARGETING_KEYS.ADOMAIN,
+              val: function (bidResponse) {
+                return bidResponse.meta.advertiserDomains[0];
+              }
+            }
           ]
 
         }
@@ -309,6 +319,12 @@ describe('auctionmanager.js', function () {
               val: function (bidResponse) {
                 return bidResponse.videoCacheKey;
               }
+            },
+            {
+              key: CONSTANTS.TARGETING_KEYS.ADOMAIN,
+              val: function (bidResponse) {
+                return bidResponse.meta.advertiserDomains[0];
+              }
             }
           ]
 

From fb1858eb577b6e053b8d31ee5fcd47b2b6b8ab62 Mon Sep 17 00:00:00 2001
From: Denis Logachov <denis@adkernel.com>
Date: Fri, 15 Jan 2021 10:01:13 +0200
Subject: [PATCH 151/304] Adkernel: torchad alias (#6191)

---
 modules/adkernelBidAdapter.js                | 2 +-
 test/spec/modules/adkernelBidAdapter_spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
index c34902eda46..1b238f8d1c4 100644
--- a/modules/adkernelBidAdapter.js
+++ b/modules/adkernelBidAdapter.js
@@ -52,7 +52,7 @@ const NATIVE_INDEX = NATIVE_MODEL.reduce((acc, val, idx) => {
 export const spec = {
 
   code: 'adkernel',
-  aliases: ['headbidding', 'adsolut', 'oftmediahb', 'audiencemedia', 'waardex_ak', 'roqoon', 'andbeyond', 'adbite', 'houseofpubs'],
+  aliases: ['headbidding', 'adsolut', 'oftmediahb', 'audiencemedia', 'waardex_ak', 'roqoon', 'andbeyond', 'adbite', 'houseofpubs', 'torchad'],
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   /**
diff --git a/test/spec/modules/adkernelBidAdapter_spec.js b/test/spec/modules/adkernelBidAdapter_spec.js
index 4d3dca7f344..0bc14c877ab 100644
--- a/test/spec/modules/adkernelBidAdapter_spec.js
+++ b/test/spec/modules/adkernelBidAdapter_spec.js
@@ -556,7 +556,7 @@ describe('Adkernel adapter', function () {
 
   describe('adapter configuration', () => {
     it('should have aliases', () => {
-      expect(spec.aliases).to.have.lengthOf(9);
+      expect(spec.aliases).to.have.lengthOf(10);
     });
   });
 

From 5aad74a9af9bf4033a8ef9a0ac02686b34c98280 Mon Sep 17 00:00:00 2001
From: Gena <wertixvost@gmail.com>
Date: Fri, 15 Jan 2021 11:31:02 +0200
Subject: [PATCH 152/304] New feature: PBS anti alias (#6150)

* PBS anti alias

* lint

* lint

* update test

* update test

* Unit tests + dynamic aliasing

* test bidder factory
---
 modules/adtelligentBidAdapter.js              | 16 ++++-
 modules/prebidServerBidAdapter/index.js       |  7 ++-
 src/adapterManager.js                         |  3 +-
 src/adapters/bidderFactory.js                 |  4 +-
 .../modules/adtelligentBidAdapter_spec.js     | 12 ++--
 .../modules/prebidServerBidAdapter_spec.js    | 61 +++++++++++++++++++
 test/spec/unit/core/bidderFactory_spec.js     | 22 +++++++
 7 files changed, 115 insertions(+), 10 deletions(-)

diff --git a/modules/adtelligentBidAdapter.js b/modules/adtelligentBidAdapter.js
index b2e37767a1e..0964de397d1 100644
--- a/modules/adtelligentBidAdapter.js
+++ b/modules/adtelligentBidAdapter.js
@@ -18,10 +18,10 @@ const HOST_GETTERS = {
   appaloosa: function () {
     return 'ghb.hb.appaloosa.media';
   },
-  onefiftytwomedia: function() {
+  onefiftytwomedia: function () {
     return 'ghb.ads.152media.com';
   },
-  mediafuse: function() {
+  mediafuse: function () {
     return 'ghb.hbmp.mediafuse.com';
   }
 
@@ -40,7 +40,12 @@ const syncsCache = {};
 export const spec = {
   code: BIDDER_CODE,
   gvlid: 410,
-  aliases: ['onefiftytwomedia', 'selectmedia', 'appaloosa', 'mediafuse'],
+  aliases: ['onefiftytwomedia', 'selectmedia', 'appaloosa',
+    {
+      code: 'mediafuse',
+      skipPbsAliasing: true
+    }
+  ],
   supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid: function (bid) {
     return !!utils.deepAccess(bid, 'params.aid');
@@ -203,6 +208,11 @@ function prepareBidRequests(bidReq) {
     'AdType': mediaType,
     'Sizes': utils.parseSizesInput(sizes).join(',')
   };
+
+  bidReqParams.PlacementId = bidReq.adUnitCode;
+  if (bidReq.params.vpb_placement_id) {
+    bidReqParams.PlacementId = bidReq.params.vpb_placement_id;
+  }
   if (mediaType === VIDEO) {
     const context = utils.deepAccess(bidReq, 'mediaTypes.video.context');
     if (context === ADPOD) {
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index d90572d1093..3bf2ef76623 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -492,7 +492,12 @@ const OPEN_RTB_PROTOCOL = {
 
         // check for and store valid aliases to add to the request
         if (adapterManager.aliasRegistry[bid.bidder]) {
-          aliases[bid.bidder] = adapterManager.aliasRegistry[bid.bidder];
+          const bidder = adapterManager.bidderRegistry[bid.bidder];
+          // adding alias only if alias source bidder exists and alias isn't configured to be standalone
+          // pbs adapter
+          if (bidder && !bidder.getSpec().skipPbsAliasing) {
+            aliases[bid.bidder] = adapterManager.aliasRegistry[bid.bidder];
+          }
         }
       });
 
diff --git a/src/adapterManager.js b/src/adapterManager.js
index 5124ae99694..aa67fd333c2 100644
--- a/src/adapterManager.js
+++ b/src/adapterManager.js
@@ -453,7 +453,8 @@ adapterManager.aliasBidAdapter = function (bidderCode, alias, options) {
         } else {
           let spec = bidAdaptor.getSpec();
           let gvlid = options && options.gvlid;
-          newAdapter = newBidder(Object.assign({}, spec, { code: alias, gvlid }));
+          let skipPbsAliasing = options && options.skipPbsAliasing;
+          newAdapter = newBidder(Object.assign({}, spec, { code: alias, gvlid, skipPbsAliasing }));
           _aliasRegistry[alias] = bidderCode;
         }
         adapterManager.registerBidAdapter(newAdapter, alias, {
diff --git a/src/adapters/bidderFactory.js b/src/adapters/bidderFactory.js
index 3b6260efc88..27dcc9c0115 100644
--- a/src/adapters/bidderFactory.js
+++ b/src/adapters/bidderFactory.js
@@ -155,12 +155,14 @@ export function registerBidder(spec) {
     spec.aliases.forEach(alias => {
       let aliasCode = alias;
       let gvlid;
+      let skipPbsAliasing;
       if (isPlainObject(alias)) {
         aliasCode = alias.code;
         gvlid = alias.gvlid;
+        skipPbsAliasing = alias.skipPbsAliasing
       }
       adapterManager.aliasRegistry[aliasCode] = spec.code;
-      putBidder(Object.assign({}, spec, { code: aliasCode, gvlid }));
+      putBidder(Object.assign({}, spec, { code: aliasCode, gvlid, skipPbsAliasing }));
     });
   }
 }
diff --git a/test/spec/modules/adtelligentBidAdapter_spec.js b/test/spec/modules/adtelligentBidAdapter_spec.js
index 5c1e4a38d03..7a0d704d7c2 100644
--- a/test/spec/modules/adtelligentBidAdapter_spec.js
+++ b/test/spec/modules/adtelligentBidAdapter_spec.js
@@ -294,7 +294,8 @@ describe('adtelligentBidAdapter', () => {
         CallbackId: '84ab500420319d',
         AdType: 'video',
         Aid: 12345,
-        Sizes: '480x360,640x480'
+        Sizes: '480x360,640x480',
+        PlacementId: 'adunit-code'
       };
       expect(data.BidRequests[0]).to.deep.equal(eq);
     });
@@ -306,7 +307,8 @@ describe('adtelligentBidAdapter', () => {
         CallbackId: '84ab500420319d',
         AdType: 'display',
         Aid: 12345,
-        Sizes: '300x250'
+        Sizes: '300x250',
+        PlacementId: 'adunit-code'
       };
 
       expect(data.BidRequests[0]).to.deep.equal(eq);
@@ -318,12 +320,14 @@ describe('adtelligentBidAdapter', () => {
         CallbackId: '84ab500420319d',
         AdType: 'display',
         Aid: 12345,
-        Sizes: '300x250'
+        Sizes: '300x250',
+        PlacementId: 'adunit-code'
       }, {
         CallbackId: '84ab500420319d',
         AdType: 'video',
         Aid: 12345,
-        Sizes: '480x360,640x480'
+        Sizes: '480x360,640x480',
+        PlacementId: 'adunit-code'
       }]
 
       expect(bidRequests.BidRequests).to.deep.equal(expectedBidReqs);
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index d069bb74944..9b17875c117 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -1015,6 +1015,67 @@ describe('S2S Adapter', function () {
       });
     });
 
+    it('skips pbs alias when skipPbsAliasing is enabled in adapter', function() {
+      const s2sConfig = Object.assign({}, CONFIG, {
+        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+      });
+      config.setConfig({ s2sConfig: s2sConfig });
+
+      const aliasBidder = {
+        bidder: 'mediafuse',
+        params: { aid: 123 }
+      };
+
+      const request = utils.deepClone(REQUEST);
+      request.ad_units[0].bids = [aliasBidder];
+
+      adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(requestBid.ext).to.deep.equal({
+        prebid: {
+          auctiontimestamp: 1510852447530,
+          targeting: {
+            includebidderkeys: false,
+            includewinners: true
+          }
+        }
+      });
+    });
+
+    it('skips dynamic aliases to request when skipPbsAliasing enabled', function () {
+      const s2sConfig = Object.assign({}, CONFIG, {
+        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+      });
+      config.setConfig({ s2sConfig: s2sConfig });
+
+      const alias = 'foobar_1';
+      const aliasBidder = {
+        bidder: alias,
+        params: { aid: 123456 }
+      };
+
+      const request = utils.deepClone(REQUEST);
+      request.ad_units[0].bids = [aliasBidder];
+
+      // TODO: stub this
+      $$PREBID_GLOBAL$$.aliasBidder('appnexus', alias, { skipPbsAliasing: true });
+      adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(requestBid.ext).to.deep.equal({
+        prebid: {
+          auctiontimestamp: 1510852447530,
+          targeting: {
+            includebidderkeys: false,
+            includewinners: true
+          }
+        }
+      });
+    });
+
     it('converts appnexus params to expected format for PBS', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
         endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
diff --git a/test/spec/unit/core/bidderFactory_spec.js b/test/spec/unit/core/bidderFactory_spec.js
index 692cf9a6475..a7e8a0d7871 100644
--- a/test/spec/unit/core/bidderFactory_spec.js
+++ b/test/spec/unit/core/bidderFactory_spec.js
@@ -673,6 +673,28 @@ describe('registerBidder', function () {
     expect(registerBidAdapterStub.getCall(2).args[0].getSpec().gvlid).to.equal(2);
     expect(registerBidAdapterStub.getCall(3).args[0].getSpec().gvlid).to.equal(undefined);
   })
+
+  it('should register alias with skipPbsAliasing', function() {
+    const aliases = [
+      {
+        code: 'foo',
+        skipPbsAliasing: true
+      },
+      {
+        code: 'bar',
+        skipPbsAliasing: false
+      },
+      {
+        code: 'baz'
+      }
+    ]
+    const thisSpec = Object.assign(newEmptySpec(), { aliases: aliases });
+    registerBidder(thisSpec);
+
+    expect(registerBidAdapterStub.getCall(1).args[0].getSpec().skipPbsAliasing).to.equal(true);
+    expect(registerBidAdapterStub.getCall(2).args[0].getSpec().skipPbsAliasing).to.equal(false);
+    expect(registerBidAdapterStub.getCall(3).args[0].getSpec().skipPbsAliasing).to.equal(undefined);
+  })
 })
 
 describe('validate bid response: ', function () {

From c40f4ea2c38c579fab27d8b92cc78059a4926486 Mon Sep 17 00:00:00 2001
From: yegorWaardex <59033363+yegorWaardex@users.noreply.github.com>
Date: Fri, 15 Jan 2021 12:14:27 +0200
Subject: [PATCH 153/304] Waardex Bid Adapter: Add video support, refactor code
 (#6149)

* Add video support, refactor code

* Add zoneId, refactor

Co-authored-by: yegorheiz <yegorheiz@gmail.com>
---
 modules/waardexBidAdapter.js                | 431 ++++++++++++--------
 modules/waardexBidAdapter.md                | 107 +++--
 test/spec/modules/waardexBidAdapter_spec.js | 338 +++++++++++----
 3 files changed, 590 insertions(+), 286 deletions(-)

diff --git a/modules/waardexBidAdapter.js b/modules/waardexBidAdapter.js
index b9114d4f1bf..a5ba4fb0298 100644
--- a/modules/waardexBidAdapter.js
+++ b/modules/waardexBidAdapter.js
@@ -1,217 +1,294 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import * as utils from '../src/utils.js';
 
-const domain = 'hb.justbidit.xyz';
-const httpsPort = 8843;
-const path = '/prebid';
+const ENDPOINT = `https://hb.justbidit.xyz:8843/prebid`;
+const BIDDER_CODE = 'waardex';
 
-const ENDPOINT = `https://${domain}:${httpsPort}${path}`;
+const isBidRequestValid = bid => {
+  if (!bid.bidId) {
+    utils.logError(BIDDER_CODE + ': bid.bidId should be non-empty');
+    return false;
+  }
 
-const BIDDER_CODE = 'waardex';
+  if (!bid.params) {
+    utils.logError(BIDDER_CODE + ': bid.params should be non-empty');
+    return false;
+  }
 
-/**
- * @param {Array} requestSizes
- *
- * @returns {Array}
- * */
-function transformSizes(requestSizes) {
-  let sizes = [];
-  if (
-    Array.isArray(requestSizes) &&
-    !Array.isArray(requestSizes[0])
-  ) {
-    sizes[0] = {
-      width: parseInt(requestSizes[0], 10) || 0,
-      height: parseInt(requestSizes[1], 10) || 0,
-    };
-  } else if (
-    Array.isArray(requestSizes) &&
-    Array.isArray(requestSizes[0])
-  ) {
-    sizes = requestSizes.map(item => {
-      return {
-        width: parseInt(item[0], 10) || 0,
-        height: parseInt(item[1], 10) || 0,
-      }
-    });
+  if (!+bid.params.zoneId) {
+    utils.logError(BIDDER_CODE + ': bid.params.zoneId should be non-empty Number');
+    return false;
   }
-  return sizes;
-}
 
-/**
- * @param {Object} banner
- * @param {Array<Array[Number]>} banner.sizes
- *
- * @returns {Object}
- * */
-function createBannerObject(banner) {
-  return {
-    sizes: transformSizes(banner.sizes),
-  };
-}
-
-/**
- * @param {Array} validBidRequests
- *
- * @returns {Object}
- * */
-function buildBidRequests(validBidRequests) {
-  return validBidRequests.map((validBidRequest) => {
-    const params = validBidRequest.params;
-
-    const item = {
-      bidId: validBidRequest.bidId,
-      bidfloor: parseFloat(params.bidfloor) || 0,
-      position: parseInt(params.position) || 1,
-      instl: parseInt(params.instl) || 0,
-    };
-    if (validBidRequest.mediaTypes[BANNER]) {
-      item[BANNER] = createBannerObject(validBidRequest.mediaTypes[BANNER]);
+  if (bid.mediaTypes && bid.mediaTypes.video) {
+    if (!bid.mediaTypes.video.playerSize) {
+      utils.logError(BIDDER_CODE + ': bid.mediaTypes.video.playerSize should be non-empty');
+      return false;
+    }
+
+    if (!utils.isArray(bid.mediaTypes.video.playerSize)) {
+      utils.logError(BIDDER_CODE + ': bid.mediaTypes.video.playerSize should be an Array');
+      return false;
     }
-    return item;
-  });
-}
-
-/**
- * @param {Object} bidderRequest
- * @param {String} bidderRequest.userAgent
- * @param {String} bidderRequest.refererInfo
- * @param {String} bidderRequest.uspConsent
- * @param {Object} bidderRequest.gdprConsent
- * @param {String} bidderRequest.gdprConsent.consentString
- * @param {String} bidderRequest.gdprConsent.gdprApplies
- *
- * @returns {Object} - {
- *   ua: string,
- *   language: string,
- *   [referer]: string,
- *   [us_privacy]: string,
- *   [consent_string]: string,
- *   [consent_required]: string,
- *   [coppa]: boolean,
- * }
- * */
-function getCommonBidsData(bidderRequest) {
+
+    if (!bid.mediaTypes.video.playerSize[0]) {
+      utils.logError(BIDDER_CODE + ': bid.mediaTypes.video.playerSize should be non-empty');
+      return false;
+    }
+
+    if (!utils.isArray(bid.mediaTypes.video.playerSize[0])) {
+      utils.logError(BIDDER_CODE + ': bid.mediaTypes.video.playerSize should be non-empty Array');
+      return false;
+    }
+  }
+
+  return true;
+};
+
+const buildRequests = (validBidRequests, bidderRequest) => {
+  const dataToSend = {
+    ...getCommonBidsData(bidderRequest),
+    bidRequests: getBidRequestsToSend(validBidRequests)
+  };
+
+  let zoneId = '';
+  if (validBidRequests[0] && validBidRequests[0].params && +validBidRequests[0].params.zoneId) {
+    zoneId = +validBidRequests[0].params.zoneId;
+  }
+
+  return {method: 'POST', url: `${ENDPOINT}?pubId=${zoneId}`, data: dataToSend};
+};
+
+const getCommonBidsData = bidderRequest => {
   const payload = {
     ua: navigator.userAgent || '',
     language: navigator.language && navigator.language.indexOf('-') !== -1 ? navigator.language.split('-')[0] : '',
-
   };
+
   if (bidderRequest && bidderRequest.refererInfo) {
     payload.referer = encodeURIComponent(bidderRequest.refererInfo.referer);
   }
+
   if (bidderRequest && bidderRequest.uspConsent) {
     payload.us_privacy = bidderRequest.uspConsent;
   }
+
   if (bidderRequest && bidderRequest.gdprConsent) {
     payload.gdpr_consent = {
       consent_string: bidderRequest.gdprConsent.consentString,
       consent_required: bidderRequest.gdprConsent.gdprApplies,
     }
   }
+
   payload.coppa = !!config.getConfig('coppa');
 
   return payload;
-}
-
-/**
- * this function checks either bid response is valid or noе
- *
- * @param {Object} bid
- * @param {string} bid.requestId
- * @param {number} bid.cpm
- * @param {string} bid.creativeId
- * @param {number} bid.ttl
- * @param {string} bid.currency
- * @param {number} bid.width
- * @param {number} bid.height
- * @param {string} bid.ad
- *
- * @returns {boolean}
- * */
-function isBidValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
-    return false;
+};
+
+const getBidRequestsToSend = validBidRequests => {
+  return validBidRequests.map(getBidRequestToSend);
+};
+
+const getBidRequestToSend = validBidRequest => {
+  const result = {
+    bidId: validBidRequest.bidId,
+    bidfloor: parseFloat(validBidRequest.params.bidfloor) || 0,
+    position: parseInt(validBidRequest.params.position) || 1,
+    instl: parseInt(validBidRequest.params.instl) || 0,
+  };
+
+  if (validBidRequest.mediaTypes[BANNER]) {
+    result[BANNER] = createBannerObject(validBidRequest.mediaTypes[BANNER]);
   }
 
-  return Boolean(bid.width && bid.height && bid.ad);
-}
-
-/**
- * @param {Object} serverBid
- *
- * @returns {Object|null}
- * */
-function createBid(serverBid) {
-  const bid = {
-    requestId: serverBid.id,
-    cpm: serverBid.price,
+  if (validBidRequest.mediaTypes[VIDEO]) {
+    result[VIDEO] = createVideoObject(validBidRequest.mediaTypes[VIDEO], validBidRequest.params);
+  }
+
+  return result;
+};
+
+const createBannerObject = banner => {
+  return {
+    sizes: transformSizes(banner.sizes),
+  };
+};
+
+const transformSizes = requestSizes => {
+  let result = [];
+
+  if (Array.isArray(requestSizes) && !Array.isArray(requestSizes[0])) {
+    result[0] = {
+      width: parseInt(requestSizes[0], 10) || 0,
+      height: parseInt(requestSizes[1], 10) || 0,
+    };
+  } else if (Array.isArray(requestSizes) && Array.isArray(requestSizes[0])) {
+    result = requestSizes.map(item => {
+      return {
+        width: parseInt(item[0], 10) || 0,
+        height: parseInt(item[1], 10) || 0,
+      }
+    });
+  }
+
+  return result;
+};
+
+const createVideoObject = (videoMediaTypes, videoParams) => {
+  return {
+    w: utils.deepAccess(videoMediaTypes, 'playerSize')[0][0],
+    h: utils.deepAccess(videoMediaTypes, 'playerSize')[0][1],
+    mimes: utils.getBidIdParameter('mimes', videoParams) || ['application/javascript', 'video/mp4', 'video/webm'],
+    minduration: utils.getBidIdParameter('minduration', videoParams) || 0,
+    maxduration: utils.getBidIdParameter('maxduration', videoParams) || 500,
+    protocols: utils.getBidIdParameter('protocols', videoParams) || [2, 3, 5, 6],
+    startdelay: utils.getBidIdParameter('startdelay', videoParams) || 0,
+    placement: utils.getBidIdParameter('placement', videoParams) || videoMediaTypes.context === 'outstream' ? 3 : 1,
+    skip: utils.getBidIdParameter('skip', videoParams) || 1,
+    skipafter: utils.getBidIdParameter('skipafter', videoParams) || 0,
+    minbitrate: utils.getBidIdParameter('minbitrate', videoParams) || 0,
+    maxbitrate: utils.getBidIdParameter('maxbitrate', videoParams) || 3500,
+    delivery: utils.getBidIdParameter('delivery', videoParams) || [2],
+    playbackmethod: utils.getBidIdParameter('playbackmethod', videoParams) || [1, 2, 3, 4],
+    api: utils.getBidIdParameter('api', videoParams) || [2],
+    linearity: utils.getBidIdParameter('linearity', videoParams) || 1
+  };
+};
+
+const interpretResponse = (serverResponse, bidRequest) => {
+  try {
+    const responseBody = serverResponse.body;
+
+    if (!responseBody.seatbid || !responseBody.seatbid[0]) {
+      return [];
+    }
+
+    return responseBody.seatbid[0].bid
+      .map(openRtbBid => {
+        const hbRequestBid = getHbRequestBid(openRtbBid, bidRequest.data);
+        if (!hbRequestBid) return;
+
+        const hbRequestMediaType = getHbRequestMediaType(hbRequestBid);
+        if (!hbRequestMediaType) return;
+
+        return mapOpenRtbToHbBid(openRtbBid, hbRequestMediaType, hbRequestBid);
+      })
+      .filter(x => x);
+  } catch (e) {
+    return [];
+  }
+};
+
+const getHbRequestBid = (openRtbBid, bidRequest) => {
+  return bidRequest.bidRequests.find(x => x.bidId === openRtbBid.impid);
+};
+
+const getHbRequestMediaType = hbRequestBid => {
+  if (hbRequestBid.banner) return BANNER;
+  if (hbRequestBid.video) return VIDEO;
+  return null;
+};
+
+const mapOpenRtbToHbBid = (openRtbBid, mediaType, hbRequestBid) => {
+  let bid = null;
+
+  if (mediaType === BANNER) {
+    bid = mapOpenRtbBannerToHbBid(openRtbBid, hbRequestBid);
+  }
+
+  if (mediaType === VIDEO) {
+    bid = mapOpenRtbVideoToHbBid(openRtbBid, hbRequestBid);
+  }
+
+  return isBidValid(bid) ? bid : null;
+};
+
+const mapOpenRtbBannerToHbBid = (openRtbBid, hbRequestBid) => {
+  return {
+    mediaType: BANNER,
+    requestId: hbRequestBid.bidId,
+    cpm: openRtbBid.price,
     currency: 'USD',
-    width: serverBid.w,
-    height: serverBid.h,
-    creativeId: serverBid.crid,
+    width: openRtbBid.w,
+    height: openRtbBid.h,
+    creativeId: openRtbBid.crid,
     netRevenue: true,
     ttl: 3000,
-    ad: serverBid.adm,
-    dealId: serverBid.dealid,
+    ad: openRtbBid.adm,
+    dealId: openRtbBid.dealid,
     meta: {
-      cid: serverBid.cid,
-      adomain: serverBid.adomain,
-      mediaType: serverBid.ext.mediaType
+      cid: openRtbBid.cid,
+      adomain: openRtbBid.adomain,
+      mediaType: openRtbBid.ext && openRtbBid.ext.mediaType
     },
   };
+};
 
-  return isBidValid(bid) ? bid : null;
-}
+const mapOpenRtbVideoToHbBid = (openRtbBid, hbRequestBid) => {
+  return {
+    mediaType: VIDEO,
+    requestId: hbRequestBid.bidId,
+    cpm: openRtbBid.price,
+    currency: 'USD',
+    width: hbRequestBid.video.w,
+    height: hbRequestBid.video.h,
+    ad: openRtbBid.adm,
+    ttl: 3000,
+    creativeId: openRtbBid.crid,
+    netRevenue: true,
+    vastUrl: getVastUrl(openRtbBid),
+    // An impression tracking URL to serve with video Ad
+    // Optional; only usable with vastUrl and requires prebid cache to be enabled
+    // Example: "https://vid.exmpale.com/imp/134"
+    // For now we don't need this field
+    // vastImpUrl: null,
+    vastXml: openRtbBid.adm,
+    dealId: openRtbBid.dealid,
+    meta: {
+      cid: openRtbBid.cid,
+      adomain: openRtbBid.adomain,
+      networkId: null,
+      networkName: null,
+      agencyId: null,
+      agencyName: null,
+      advertiserId: null,
+      advertiserName: null,
+      advertiserDomains: null,
+      brandId: null,
+      brandName: null,
+      primaryCatId: null,
+      secondaryCatIds: null,
+      mediaType: 'video',
+    },
+  }
+};
 
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
-
-  isBidRequestValid: (bid) => Boolean(bid.bidId && bid.params && +bid.params.zoneId),
-
-  /**
-   * @param {Object[]} validBidRequests -  array of valid bid requests
-   * @param {Object} bidderRequest - an array of valid bid requests
-   *
-   * */
-  buildRequests(validBidRequests, bidderRequest) {
-    const payload = getCommonBidsData(bidderRequest);
-    payload.bidRequests = buildBidRequests(validBidRequests);
-
-    let zoneId = '';
-    if (validBidRequests[0] && validBidRequests[0].params && +validBidRequests[0].params.zoneId) {
-      zoneId = +validBidRequests[0].params.zoneId;
-    }
+const getVastUrl = openRtbBid => {
+  const adm = (openRtbBid.adm || '').trim();
 
-    const url = `${ENDPOINT}?pubId=${zoneId}`;
+  if (adm.startsWith('http')) {
+    return adm;
+  } else {
+    return null
+  }
+};
 
-    return {
-      method: 'POST',
-      url,
-      data: payload
-    };
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   */
-  interpretResponse(serverResponse, bidRequest) {
-    const bids = [];
-    serverResponse = serverResponse.body;
-
-    if (serverResponse.seatbid && serverResponse.seatbid[0]) {
-      const oneSeatBid = serverResponse.seatbid[0];
-      oneSeatBid.bid.forEach(serverBid => {
-        const bid = createBid(serverBid);
-        if (bid) {
-          bids.push(bid);
-        }
-      });
-    }
-    return bids;
-  },
-}
+const isBidValid = bid => {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
+    return false;
+  }
+
+  return Boolean(bid.width && bid.height && bid.ad);
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+};
 
 registerBidder(spec);
diff --git a/modules/waardexBidAdapter.md b/modules/waardexBidAdapter.md
index 44ee720d31a..8eade8409f4 100644
--- a/modules/waardexBidAdapter.md
+++ b/modules/waardexBidAdapter.md
@@ -10,51 +10,84 @@ Maintainer: info@prebid.org
 
 Connects to Waardex exchange for bids.
 
-Waardex bid adapter supports Banner.
+Waardex bid adapter supports Banner and Video.
 
 # Test Parameters
-
-```
-
+## Banner
+```javascript
 var sizes = [
     [300, 250]
 ];
 var PREBID_TIMEOUT = 5000;
 var FAILSAFE_TIMEOUT = 5000;
 
-var adUnits = [{
-  code: '/19968336/header-bid-tag-0',
-  mediaTypes: {
-    banner: {
-        sizes: sizes,
-    },
-  },
-  bids: [{
-    bidder: 'waardex',
-    params: {
-        placementId: 13144370,
-        position: 1,  // add position openrtb
-        bidfloor: 0.5,
-        instl: 0,     // 1 - full screen
-        pubId: 1,
+var adUnits = [
+    {
+        code: '/19968336/header-bid-tag-0',
+        mediaTypes: {
+            banner: {
+                sizes: sizes
+            }
+        },
+        bids: [
+            {
+                bidder: 'waardex',
+                params: {
+                    bidfloor: 1.5,
+                    position: 1,
+                    instl: 1,
+                    zoneId: 1
+                }
+            }
+        ]
     }
-  }]
-},{
-    code: '/19968336/header-bid-tag-1',
-    mediaTypes: {
-        banner: {
-            sizes: sizes,
+];
+```
+
+## Video
+
+```javascript
+const PREBID_TIMEOUT = 1000;
+const FAILSAFE_TIMEOUT = 3000;
+
+const sizes = [
+    [640, 480]
+];
+
+const adUnits = [
+    {
+        code: 'video1',
+        mediaTypes: {
+            video: {
+                context: 'instream',
+                playerSize: sizes[0]
+            }
         },
-    },
-    bids: [{
-        bidder: 'waardex',
-        params: {
-            placementId: 333333333333,
-            position: 1,  // add position openrtb
-            bidfloor: 0.5,
-            instl: 0,     // 1 - full screen
-            pubId: 1,
-        }
-    }]
-}];
+        bids: [
+            {
+                bidder: 'waardex',
+                params: {
+                    bidfloor: 1.5,
+                    position: 1,
+                    instl: 1,
+                    zoneId: 1,
+                    mimes: ['video/x-ms-wmv', 'video/mp4'],
+                    minduration: 2,
+                    maxduration: 10,
+                    protocols: ['VAST 1.0', 'VAST 2.0'],
+                    startdelay: -1,
+                    placement: 1,
+                    skip: 1,
+                    skipafter: 2,
+                    minbitrate: 0,
+                    maxbitrate: 0,
+                    delivery: [1, 2, 3],
+                    playbackmethod: [1, 2],
+                    api: [1, 2, 3, 4, 5, 6],
+                    linearity: 1,
+                }
+            }
+        ]
+    }
+]
 ```
diff --git a/test/spec/modules/waardexBidAdapter_spec.js b/test/spec/modules/waardexBidAdapter_spec.js
index 8732b2bd51f..73094dd72a0 100644
--- a/test/spec/modules/waardexBidAdapter_spec.js
+++ b/test/spec/modules/waardexBidAdapter_spec.js
@@ -1,51 +1,201 @@
 import {expect} from 'chai';
 import {spec} from '../../../modules/waardexBidAdapter.js';
-import { auctionManager } from 'src/auctionManager.js';
-import { deepClone } from 'src/utils.js';
+import {auctionManager} from 'src/auctionManager.js';
+import {deepClone} from 'src/utils.js';
 
 describe('waardexBidAdapter', () => {
-  const validBid = {
-    bidId: '112435ry',
-    bidder: 'waardex',
-    params: {
-      placementId: 1,
-      traffic: 'banner',
-      zoneId: 1,
-    }
-  };
-
   describe('isBidRequestValid', () => {
-    it('Should return true. bidId and params such as placementId and zoneId are present', () => {
-      expect(spec.isBidRequestValid(validBid)).to.be.true;
+    it('should return true. bidId and params such as placementId and zoneId are present', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        }
+      });
+
+      expect(result).to.be.true;
+    });
+
+    it('should return false. bidId is not present in bid object', () => {
+      const result = spec.isBidRequestValid({
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        }
+      });
+
+      expect(result).to.be.false;
+    });
+
+    it('should return false. zoneId is not present in bid.params object', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+        }
+      });
+
+      expect(result).to.be.false;
+    });
+
+    it('should return true when mediaTypes field is empty', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        }
+      });
+
+      expect(result).to.be.true;
     });
-    it('Should return false. bidId is not present in bid object', () => {
-      const invalidBid = deepClone(validBid);
-      delete invalidBid.bidId;
-      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+
+    it('should return false when mediaTypes.video.playerSize field is empty', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        },
+        mediaTypes: {
+          video: {}
+        }
+      });
+
+      expect(result).to.be.false;
     });
-    it('Should return false. zoneId is not present in bid.params object', () => {
-      const invalidBid = deepClone(validBid);
-      delete invalidBid.params.zoneId;
-      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+
+    it('should return false when mediaTypes.video.playerSize field is not an array', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        },
+        mediaTypes: {
+          video: {
+            playerSize: 'not-array'
+          }
+        }
+      });
+
+      expect(result).to.be.false;
+    });
+
+    it('should return false when mediaTypes.video.playerSize field is an empty array', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        },
+        mediaTypes: {
+          video: {
+            playerSize: []
+          }
+        }
+      });
+
+      expect(result).to.be.false;
+    });
+
+    it('should return false when mediaTypes.video.playerSize field is empty array', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        },
+        mediaTypes: {
+          video: {
+            playerSize: []
+          }
+        }
+      });
+
+      expect(result).to.be.false;
+    });
+
+    it('should return true when mediaTypes.video.playerSize field is non-empty array', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        },
+        mediaTypes: {
+          video: {
+            playerSize: [[640, 400]]
+          }
+        }
+      });
+
+      expect(result).to.be.true;
     });
   });
 
   describe('buildRequests', () => {
     let getAdUnitsStub;
-    const validBidRequests = [{
-      bidId: 'fergr675ujgh',
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 600], [300, 250]]
-        }
-      },
-      params: {
-        bidfloor: 1.5,
-        position: 1,
-        instl: 1,
-        zoneId: 100
+    const validBidRequests = [
+      {
+        bidId: 'fergr675ujgh',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 600], [300, 250]]
+          }
+        },
+        params: {
+          bidfloor: 1.5,
+          position: 1,
+          instl: 1,
+          zoneId: 100
+        },
       },
-    }];
+      {
+        bidId: 'unique-bid-id-2',
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            playerSize: [[640, 400]]
+          }
+        },
+        params: {
+          mimes: ['video/x-ms-wmv', 'video/mp4'],
+          minduration: 2,
+          maxduration: 10,
+          protocols: ['VAST 1.0', 'VAST 2.0'],
+          startdelay: -1,
+          placement: 1,
+          skip: 1,
+          skipafter: 2,
+          minbitrate: 0,
+          maxbitrate: 0,
+          delivery: [1, 2, 3],
+          playbackmethod: [1, 2],
+          api: [1, 2, 3, 4, 5, 6],
+          linearity: 1,
+        }
+      }
+    ];
 
     const bidderRequest = {
       refererInfo: {
@@ -57,12 +207,13 @@ describe('waardexBidAdapter', () => {
     afterEach(() => getAdUnitsStub.restore());
 
     it('should return valid build request object', () => {
-      const request = spec.buildRequests(validBidRequests, bidderRequest);
       const {
         data: payload,
         url,
         method,
-      } = request;
+      } = spec.buildRequests(validBidRequests, bidderRequest);
+
+      const ENDPOINT = `https://hb.justbidit.xyz:8843/prebid?pubId=${validBidRequests[0].params.zoneId}`;
 
       expect(payload.bidRequests[0]).deep.equal({
         bidId: validBidRequests[0].bidId,
@@ -82,7 +233,6 @@ describe('waardexBidAdapter', () => {
           ],
         }
       });
-      const ENDPOINT = `https://hb.justbidit.xyz:8843/prebid?pubId=${validBidRequests[0].params.zoneId}`;
       expect(url).to.equal(ENDPOINT);
       expect(method).to.equal('POST');
     });
@@ -91,44 +241,88 @@ describe('waardexBidAdapter', () => {
   describe('interpretResponse', () => {
     const serverResponse = {
       body: {
-        seatbid: [{
-          bid: [{
-            id: 'someId',
-            price: 3.3,
-            w: 250,
-            h: 300,
-            crid: 'dspCreativeIdHere',
-            adm: 'html markup here',
-            dealId: '123456789',
-            cid: 'dsp campaign id',
-            adomain: 'advertisers domain',
-            ext: {
-              mediaType: 'banner',
-            },
-          }],
-        }],
+        seatbid: [
+          {
+            bid: [
+              {
+                'id': 'ec90d4ee25433c0875c56f59acc12109',
+                'adm': 'banner should be here',
+                'w': 300,
+                'h': 250,
+                'price': 0.15827000000000002,
+                'nurl': 'http://n63.justbidit.xyz?w=n&p=${AUCTION_PRICE}&t=b&uq=eb31018b3da8965dde414c0006b1fb31',
+                'impid': 'unique-bid-id-1',
+                'adomain': [
+                  'www.kraeuterhaus.de'
+                ],
+                'cat': [
+                  'IAB24'
+                ],
+                'attr': [
+                  4
+                ],
+                'iurl': 'https://rtb.bsmartdata.com/preview.php?id=13',
+                'cid': '286557fda4585dc1c7f98b773de92509',
+                'crid': 'dd2b5a1f3f1fc5e63b042ebf4b00ca80'
+              },
+            ],
+          }
+        ],
       },
     };
 
+    const request = {
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome/86.0.4240.198 Safari/537.36',
+      'language': 'en',
+      'referer': 'https%3A%2F%2Fwww.google.com%2F%3Fsome_param%3Dsome_value',
+      'coppa': false,
+      'data': {
+        'bidRequests': [
+          {
+            'bidId': 'unique-bid-id-1',
+            'bidfloor': 0.1,
+            'position': 1,
+            'instl': 1,
+            'banner': {
+              'sizes': [
+                {
+                  'width': 300,
+                  'height': 600
+                },
+                {
+                  'width': 300,
+                  'height': 250
+                }
+              ]
+            }
+          },
+        ]
+      }
+    };
+
     it('bid response is valid', () => {
-      const result = spec.interpretResponse(serverResponse);
-      const expected = [{
-        requestId: serverResponse.body.seatbid[0].bid[0].id,
-        cpm: serverResponse.body.seatbid[0].bid[0].price,
-        currency: 'USD',
-        width: serverResponse.body.seatbid[0].bid[0].w,
-        height: serverResponse.body.seatbid[0].bid[0].h,
-        creativeId: serverResponse.body.seatbid[0].bid[0].crid,
-        netRevenue: true,
-        ttl: 3000,
-        ad: serverResponse.body.seatbid[0].bid[0].adm,
-        dealId: serverResponse.body.seatbid[0].bid[0].dealid,
-        meta: {
-          cid: serverResponse.body.seatbid[0].bid[0].cid,
-          adomain: serverResponse.body.seatbid[0].bid[0].adomain,
-          mediaType: serverResponse.body.seatbid[0].bid[0].ext.mediaType,
-        },
-      }];
+      const result = spec.interpretResponse(serverResponse, request);
+
+      const expected = [
+        {
+          requestId: 'unique-bid-id-1',
+          cpm: serverResponse.body.seatbid[0].bid[0].price,
+          currency: 'USD',
+          width: serverResponse.body.seatbid[0].bid[0].w,
+          height: serverResponse.body.seatbid[0].bid[0].h,
+          mediaType: 'banner',
+          creativeId: serverResponse.body.seatbid[0].bid[0].crid,
+          netRevenue: true,
+          ttl: 3000,
+          ad: serverResponse.body.seatbid[0].bid[0].adm,
+          dealId: serverResponse.body.seatbid[0].bid[0].dealid,
+          meta: {
+            cid: serverResponse.body.seatbid[0].bid[0].cid,
+            adomain: serverResponse.body.seatbid[0].bid[0].adomain,
+            mediaType: (serverResponse.body.seatbid[0].bid[0].ext || {}).mediaType,
+          },
+        }
+      ];
       expect(result).deep.equal(expected);
     });
 

From 8ddef8fdb677c9b0fc1ff8f35a57de4f18794602 Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Mon, 18 Jan 2021 14:16:28 +0100
Subject: [PATCH 154/304] ID5 User Id Module: move id5's user id extension to
 the uids array (#6193)

* move id5's user id extension to the uids array to better conform to conventions

* update location of id5 ext in spotx bid adapter
---
 modules/rubiconBidAdapter.js                     |  2 +-
 modules/spotxBidAdapter.js                       |  6 +++---
 modules/userId/eids.js                           |  2 +-
 modules/userId/eids.md                           | 10 +++++-----
 test/spec/modules/eids_spec.js                   | 11 +++++++----
 test/spec/modules/id5IdSystem_spec.js            | 11 +++++++----
 test/spec/modules/nobidBidAdapter_spec.js        | 12 ++++++------
 test/spec/modules/prebidServerBidAdapter_spec.js |  2 +-
 test/spec/modules/spotxBidAdapter_spec.js        |  6 +++---
 9 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index e439f7fd2a4..2981bd4f3fa 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -516,7 +516,7 @@ export const spec = {
           } else if (eid.source === 'sharedid.org') {
             data['eid_sharedid.org'] = `${eid.uids[0].id}^${eid.uids[0].atype}^${(eid.uids[0].ext && eid.uids[0].ext.third) || ''}`;
           } else if (eid.source === 'id5-sync.com') {
-            data['eid_id5-sync.com'] = `${eid.uids[0].id}^${eid.uids[0].atype}^${(eid.ext && eid.ext.linkType) || ''}`;
+            data['eid_id5-sync.com'] = `${eid.uids[0].id}^${eid.uids[0].atype}^${(eid.uids[0].ext && eid.uids[0].ext.linkType) || ''}`;
           } else {
             // add anything else with this generic format
             data[`eid_${eid.source}`] = `${eid.uids[0].id}^${eid.uids[0].atype || ''}`;
diff --git a/modules/spotxBidAdapter.js b/modules/spotxBidAdapter.js
index 6104fce1d97..5ed3884e977 100644
--- a/modules/spotxBidAdapter.js
+++ b/modules/spotxBidAdapter.js
@@ -245,9 +245,9 @@ export const spec = {
           {
             source: 'id5-sync.com',
             uids: [{
-              id: bid.userId.id5id.uid
-            }],
-            ext: bid.userId.id5id.ext || {}
+              id: bid.userId.id5id.uid,
+              ext: bid.userId.id5id.ext || {}
+            }]
           }
         )
       }
diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index d714d09962d..65fa159502c 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -35,7 +35,7 @@ const USER_IDS_CONFIG = {
     },
     source: 'id5-sync.com',
     atype: 1,
-    getEidExt: function(data) {
+    getUidExt: function(data) {
       if (data.ext) {
         return data.ext;
       }
diff --git a/modules/userId/eids.md b/modules/userId/eids.md
index fecf7e888bf..a189c257ba9 100644
--- a/modules/userId/eids.md
+++ b/modules/userId/eids.md
@@ -33,11 +33,11 @@ userIdAsEids = [
         source: 'id5-sync.com',
         uids: [{
             id: 'some-random-id-value',
-            atype: 1
-        },
-        ext: {
-            linkType: 2,
-            abTestingControlGroup: false
+            atype: 1,
+            ext: {
+                linkType: 2,
+                abTestingControlGroup: false
+            }
         }]
     },
 
diff --git a/test/spec/modules/eids_spec.js b/test/spec/modules/eids_spec.js
index 26dbad2f153..61fa0e846a5 100644
--- a/test/spec/modules/eids_spec.js
+++ b/test/spec/modules/eids_spec.js
@@ -57,10 +57,13 @@ describe('eids array generation for known sub-modules', function() {
       expect(newEids.length).to.equal(1);
       expect(newEids[0]).to.deep.equal({
         source: 'id5-sync.com',
-        uids: [{ id: 'some-random-id-value', atype: 1 }],
-        ext: {
-          linkType: 0
-        }
+        uids: [{
+          id: 'some-random-id-value',
+          atype: 1,
+          ext: {
+            linkType: 0
+          }
+        }]
       });
     });
   });
diff --git a/test/spec/modules/id5IdSystem_spec.js b/test/spec/modules/id5IdSystem_spec.js
index 1b13059a7f8..24f50db9980 100644
--- a/test/spec/modules/id5IdSystem_spec.js
+++ b/test/spec/modules/id5IdSystem_spec.js
@@ -297,10 +297,13 @@ describe('ID5 ID System', function() {
             expect(bid.userId.id5id.uid).to.equal(ID5_STORED_ID);
             expect(bid.userIdAsEids[0]).to.deep.equal({
               source: ID5_SOURCE,
-              uids: [{ id: ID5_STORED_ID, atype: 1 }],
-              ext: {
-                linkType: ID5_STORED_LINK_TYPE
-              }
+              uids: [{
+                id: ID5_STORED_ID,
+                atype: 1,
+                ext: {
+                  linkType: ID5_STORED_LINK_TYPE
+                }
+              }]
             });
           });
         });
diff --git a/test/spec/modules/nobidBidAdapter_spec.js b/test/spec/modules/nobidBidAdapter_spec.js
index e67d3b41f1d..8dc15fbc89e 100644
--- a/test/spec/modules/nobidBidAdapter_spec.js
+++ b/test/spec/modules/nobidBidAdapter_spec.js
@@ -257,12 +257,12 @@ describe('Nobid Adapter', function () {
             'uids': [
               {
                 'id': 'ID5_ID',
-                'atype': 1
+                'atype': 1,
+                'ext': {
+                  'linkType': 0
+                }
               }
-            ],
-            'ext': {
-              'linkType': 0
-            }
+            ]
           },
           {
             'source': 'adserver.org',
@@ -284,7 +284,7 @@ describe('Nobid Adapter', function () {
       refererInfo: {referer: REFERER}
     }
 
-    it('should criteo eid', function () {
+    it('should get user ids from eids', function () {
       const request = spec.buildRequests(bidRequests, bidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.sid).to.exist.and.to.equal(2);
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 9b17875c117..17c0fc290c6 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -1268,7 +1268,7 @@ describe('S2S Adapter', function () {
       expect(requestBid.user.ext.eids.filter(eid => eid.source === 'liveintent.com')[0].ext.segments[1]).is.equal('segB');
       expect(requestBid.user.ext.eids.filter(eid => eid.source === 'id5-sync.com')).is.not.empty;
       expect(requestBid.user.ext.eids.filter(eid => eid.source === 'id5-sync.com')[0].uids[0].id).is.equal('11111');
-      expect(requestBid.user.ext.eids.filter(eid => eid.source === 'id5-sync.com')[0].ext.linkType).is.equal('some-link-type');
+      expect(requestBid.user.ext.eids.filter(eid => eid.source === 'id5-sync.com')[0].uids[0].ext.linkType).is.equal('some-link-type');
       // LiveRamp should exist
       expect(requestBid.user.ext.eids.filter(eid => eid.source === 'liveramp.com')[0].uids[0].id).is.equal('0000-1111-2222-3333');
     });
diff --git a/test/spec/modules/spotxBidAdapter_spec.js b/test/spec/modules/spotxBidAdapter_spec.js
index 798fb3eec10..fb5ce63f543 100644
--- a/test/spec/modules/spotxBidAdapter_spec.js
+++ b/test/spec/modules/spotxBidAdapter_spec.js
@@ -204,9 +204,9 @@ describe('the spotx adapter', function () {
         eids: [{
           source: 'id5-sync.com',
           uids: [{
-            id: 'id5id_1'
-          }],
-          ext: {}
+            id: 'id5id_1',
+            ext: {}
+          }]
         },
         {
           source: 'adserver.org',

From 2f82760da91f15ec8ad2f8e91d60ba345065fb28 Mon Sep 17 00:00:00 2001
From: Maurice Roach <maurice.roach@tapad.com>
Date: Mon, 18 Jan 2021 10:34:03 -0500
Subject: [PATCH 155/304] Add tapad id submodule (#6167)

* Add tapad id submodule

* clean and add specs
---
 modules/.submodules.json                |  3 +-
 modules/tapadIdSystem.js                | 61 +++++++++++++++++++++++
 modules/userId/eids.js                  |  4 ++
 modules/userId/eids.md                  |  7 +++
 test/spec/modules/eids_spec.js          | 12 +++++
 test/spec/modules/tapadIdSystem_spec.js | 65 +++++++++++++++++++++++++
 test/spec/modules/userId_spec.js        | 58 ++++++++++++++++------
 7 files changed, 195 insertions(+), 15 deletions(-)
 create mode 100644 modules/tapadIdSystem.js
 create mode 100644 test/spec/modules/tapadIdSystem_spec.js

diff --git a/modules/.submodules.json b/modules/.submodules.json
index 4e02391129a..fc69dd276a3 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -19,7 +19,8 @@
     "idxIdSystem",
     "fabrickIdSystem",
     "verizonMediaIdSystem",
-    "pubProvidedIdSystem"
+    "pubProvidedIdSystem",
+    "tapadIdSystem"
   ],
   "adpod": [
     "freeWheelAdserverVideo",
diff --git a/modules/tapadIdSystem.js b/modules/tapadIdSystem.js
new file mode 100644
index 00000000000..e4dfe304585
--- /dev/null
+++ b/modules/tapadIdSystem.js
@@ -0,0 +1,61 @@
+import { uspDataHandler } from '../src/adapterManager.js';
+import { submodule } from '../src/hook.js';
+import * as ajax from '../src/ajax.js'
+import * as utils from '../src/utils.js';
+
+export const graphUrl = 'https://realtime-graph-access-zxvhwknfeq-uc.a.run.app/v1/graph';
+
+export const tapadIdSubmodule = {
+  name: 'tapadId',
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @returns {{tapadId: string} | undefined}
+   */
+  decode(id) {
+    return { tapadId: id };
+  },
+  /*
+   * @function
+   * @summary initiate Real Time Graph
+   * @param {SubmoduleParams} [configParams]
+   * @param {ConsentData} [consentData]
+   * @returns {IdResponse }}
+   */
+  getId(config) {
+    const uspData = uspDataHandler.getConsentData();
+    if (uspData && uspData !== '1---') {
+      return { id: undefined };
+    }
+    const configParams = config.params || {};
+
+    if (configParams.companyId == null || isNaN(Number(configParams.companyId))) {
+      utils.logMessage('Please provide a valid Company Id. Contact prebid@tapad.com for assistance.');
+    }
+
+    return {
+      callback: (complete) => {
+        ajax.ajaxBuilder(10000)(
+          `${graphUrl}?company_id=${configParams.companyId}&tapad_id_type=TAPAD_ID`,
+          {
+            success: (response) => {
+              const responseJson = JSON.parse(response);
+              if (responseJson.hasOwnProperty('tapadId')) {
+                complete(responseJson.tapadId);
+              }
+            },
+            error: (_, e) => {
+              if (e.status === 404) {
+                complete(undefined);
+              }
+              if (e.status === 403) {
+                utils.logMessage('Invalid Company Id. Contact prebid@tapad.com for assistance.');
+              }
+            }
+          }
+        );
+      }
+    }
+  }
+}
+submodule('userId', tapadIdSubmodule);
diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index 65fa159502c..27665de4136 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -168,6 +168,10 @@ const USER_IDS_CONFIG = {
   'fabrickId': {
     source: 'neustar.biz',
     atype: 1
+  },
+  'tapadId': {
+    source: 'tapad.com',
+    atype: 1
   }
 };
 
diff --git a/modules/userId/eids.md b/modules/userId/eids.md
index a189c257ba9..b69c4b9bd5e 100644
--- a/modules/userId/eids.md
+++ b/modules/userId/eids.md
@@ -141,6 +141,13 @@ userIdAsEids = [
             id: 'some-random-id-value',
             atype: 1
         }]
+    },
+    {
+        source: 'tapad.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
     }
 ]
 ```
diff --git a/test/spec/modules/eids_spec.js b/test/spec/modules/eids_spec.js
index 61fa0e846a5..659e5257e90 100644
--- a/test/spec/modules/eids_spec.js
+++ b/test/spec/modules/eids_spec.js
@@ -172,6 +172,18 @@ describe('eids array generation for known sub-modules', function() {
     });
   });
 
+  it('tapadId', function() {
+    const userId = {
+      tapadId: 'some-random-id-value'
+    };
+    const newEids = createEidsArray(userId);
+    expect(newEids.length).to.equal(1);
+    expect(newEids[0]).to.deep.equal({
+      source: 'tapad.com',
+      uids: [{id: 'some-random-id-value', atype: 1}]
+    });
+  });
+
   it('NetId', function() {
     const userId = {
       netId: 'some-random-id-value'
diff --git a/test/spec/modules/tapadIdSystem_spec.js b/test/spec/modules/tapadIdSystem_spec.js
new file mode 100644
index 00000000000..bc31f1d37ba
--- /dev/null
+++ b/test/spec/modules/tapadIdSystem_spec.js
@@ -0,0 +1,65 @@
+import { tapadIdSubmodule, graphUrl } from 'modules/tapadIdSystem.js';
+import * as utils from 'src/utils.js';
+
+import { server } from 'test/mocks/xhr.js';
+
+describe('TapadIdSystem', function () {
+  describe('getId', function() {
+    const config = { params: { companyId: 12345 } };
+    it('should call to real time graph endpoint and handle valid response', function() {
+      const callbackSpy = sinon.spy();
+      const callback = tapadIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+
+      const request = server.requests[0];
+      expect(request.url).to.eq(`${graphUrl}?company_id=12345&tapad_id_type=TAPAD_ID`);
+
+      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ tapadId: 'your-tapad-id' }));
+      expect(callbackSpy.lastCall.lastArg).to.eq('your-tapad-id');
+    });
+
+    it('should remove stored tapadId if not found', function() {
+      const callbackSpy = sinon.spy();
+      const callback = tapadIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+
+      const request = server.requests[0];
+
+      request.respond(404);
+      expect(callbackSpy.lastCall.lastArg).to.be.undefined;
+    });
+
+    it('should log message with invalid company id', function() {
+      const logMessageSpy = sinon.spy(utils, 'logMessage');
+      const callbackSpy = sinon.spy();
+      const callback = tapadIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+
+      const request = server.requests[0];
+
+      request.respond(403);
+      expect(logMessageSpy.lastCall.lastArg).to.eq('Invalid Company Id. Contact prebid@tapad.com for assistance.');
+      logMessageSpy.restore();
+    });
+
+    it('should log message if company id not given', function() {
+      const logMessageSpy = sinon.spy(utils, 'logMessage');
+      const callbackSpy = sinon.spy();
+      const callback = tapadIdSubmodule.getId({}).callback;
+      callback(callbackSpy);
+
+      expect(logMessageSpy.lastCall.lastArg).to.eq('Please provide a valid Company Id. Contact prebid@tapad.com for assistance.');
+      logMessageSpy.restore();
+    });
+
+    it('should log message if company id is incorrect format', function() {
+      const logMessageSpy = sinon.spy(utils, 'logMessage');
+      const callbackSpy = sinon.spy();
+      const callback = tapadIdSubmodule.getId({ params: { companyId: 'notANumber' } }).callback;
+      callback(callbackSpy);
+
+      expect(logMessageSpy.lastCall.lastArg).to.eq('Please provide a valid Company Id. Contact prebid@tapad.com for assistance.');
+      logMessageSpy.restore();
+    });
+  });
+})
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index 9ada17d7460..ed592c0cba5 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -38,6 +38,7 @@ import {sharedIdSubmodule} from 'modules/sharedIdSystem.js';
 import {haloIdSubmodule} from 'modules/haloIdSystem.js';
 import {pubProvidedIdSubmodule} from 'modules/pubProvidedIdSystem.js';
 import {criteoIdSubmodule} from 'modules/criteoIdSystem.js';
+import {tapadIdSubmodule} from 'modules/tapadIdSystem.js';
 
 let assert = require('chai').assert;
 let expect = require('chai').expect;
@@ -456,7 +457,7 @@ describe('User ID', function () {
     });
 
     it('handles config with no usersync object', function () {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule]);
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, tapadIdSubmodule]);
       init(config);
       config.setConfig({});
       // usersync is undefined, and no logInfo message for 'User ID - usersync config updated'
@@ -464,14 +465,14 @@ describe('User ID', function () {
     });
 
     it('handles config with empty usersync object', function () {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule]);
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, tapadIdSubmodule]);
       init(config);
       config.setConfig({userSync: {}});
       expect(typeof utils.logInfo.args[0]).to.equal('undefined');
     });
 
     it('handles config with usersync and userIds that are empty objs', function () {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule]);
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, tapadIdSubmodule]);
       init(config);
       config.setConfig({
         userSync: {
@@ -482,7 +483,7 @@ describe('User ID', function () {
     });
 
     it('handles config with usersync and userIds with empty names or that dont match a submodule.name', function () {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule]);
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, tapadIdSubmodule]);
       init(config);
       config.setConfig({
         userSync: {
@@ -499,15 +500,15 @@ describe('User ID', function () {
     });
 
     it('config with 1 configurations should create 1 submodules', function () {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule]);
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, tapadIdSubmodule]);
       init(config);
       config.setConfig(getConfigMock(['unifiedId', 'unifiedid', 'cookie']));
 
       expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 1 submodules');
     });
 
-    it('config with 13 configurations should result in 13 submodules add', function () {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, liveIntentIdSubmodule, britepoolIdSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, haloIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule]);
+    it('config with 14 configurations should result in 14 submodules add', function () {
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, liveIntentIdSubmodule, britepoolIdSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, haloIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, tapadIdSubmodule]);
       init(config);
       config.setConfig({
         userSync: {
@@ -547,14 +548,17 @@ describe('User ID', function () {
             name: 'zeotapIdPlus'
           }, {
             name: 'criteo'
+          }, {
+            name: 'tapadId',
+            storage: {name: 'tapad_id', type: 'cookie'}
           }]
         }
       });
-      expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 13 submodules');
+      expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 14 submodules');
     });
 
     it('config syncDelay updates module correctly', function () {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, haloIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule]);
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, haloIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, tapadIdSubmodule]);
       init(config);
       config.setConfig({
         userSync: {
@@ -569,7 +573,7 @@ describe('User ID', function () {
     });
 
     it('config auctionDelay updates module correctly', function () {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, haloIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule]);
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, haloIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, tapadIdSubmodule]);
       init(config);
       config.setConfig({
         userSync: {
@@ -584,7 +588,7 @@ describe('User ID', function () {
     });
 
     it('config auctionDelay defaults to 0 if not a number', function () {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, haloIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule]);
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, haloIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, tapadIdSubmodule]);
       init(config);
       config.setConfig({
         userSync: {
@@ -986,6 +990,29 @@ describe('User ID', function () {
       }, {adUnits});
     });
 
+    it('test hook from tapadIdModule cookie', function (done) {
+      coreStorage.setCookie('tapad_id', 'test-tapad-id', (new Date(Date.now() + 100000).toUTCString()));
+
+      setSubmoduleRegistry([tapadIdSubmodule]);
+      init(config);
+      config.setConfig(getConfigMock(['tapadId', 'tapad_id', 'cookie']));
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.tapadId');
+            expect(bid.userId.tapadId).to.equal('test-tapad-id');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'tapad.com',
+              uids: [{id: 'test-tapad-id', atype: 1}]
+            });
+          });
+        })
+        coreStorage.setCookie('tapad_id', '', EXPIRED_COOKIE_DATE);
+        done();
+      }, {adUnits});
+    });
+
     it('test hook from liveIntentId html5', function (done) {
       // simulate existing browser local storage values
       localStorage.setItem('_li_pbid', JSON.stringify({'unifiedId': 'random-ls-identifier'}));
@@ -1483,7 +1510,7 @@ describe('User ID', function () {
       coreStorage.setCookie('haloId', JSON.stringify({'haloId': 'testHaloId'}), (new Date(Date.now() + 5000).toUTCString()));
       coreStorage.setCookie('storage_criteo', JSON.stringify({'criteoId': 'test_bidid'}), (new Date(Date.now() + 5000).toUTCString()));
 
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, britepoolIdSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, haloIdSubmodule, criteoIdSubmodule]);
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, britepoolIdSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, haloIdSubmodule, criteoIdSubmodule, tapadIdSubmodule]);
       init(config);
       config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie'],
         ['unifiedId', 'unifiedid', 'cookie'],
@@ -1495,7 +1522,8 @@ describe('User ID', function () {
         ['intentIqId', 'intentIqId', 'cookie'],
         ['zeotapIdPlus', 'IDP', 'cookie'],
         ['haloId', 'haloId', 'cookie'],
-        ['criteo', 'storage_criteo', 'cookie']));
+        ['criteo', 'storage_criteo', 'cookie'],
+        ['tapadId', 'tapad_id', 'cookie']));
 
       requestBidsHook(function () {
         adUnits.forEach(unit => {
@@ -1588,6 +1616,7 @@ describe('User ID', function () {
       attachIdSystem(zeotapIdPlusSubmodule);
       attachIdSystem(haloIdSubmodule);
       attachIdSystem(criteoIdSubmodule);
+      attachIdSystem(tapadIdSubmodule);
 
       config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie'],
         ['unifiedId', 'unifiedid', 'cookie'],
@@ -1599,7 +1628,8 @@ describe('User ID', function () {
         ['intentIqId', 'intentIqId', 'cookie'],
         ['zeotapIdPlus', 'IDP', 'cookie'],
         ['haloId', 'haloId', 'cookie'],
-        ['criteo', 'storage_criteo', 'cookie']));
+        ['criteo', 'storage_criteo', 'cookie'],
+        ['tapadId', 'tapad_id', 'cookie']));
 
       requestBidsHook(function () {
         adUnits.forEach(unit => {

From 66fcb8c0ce83d404d5e913cfb05c73dcc5e4c6d9 Mon Sep 17 00:00:00 2001
From: supportGothamad <75782642+supportGothamad@users.noreply.github.com>
Date: Mon, 18 Jan 2021 18:42:20 +0200
Subject: [PATCH 156/304] GothamAds prebid adapter (#6180)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* init new pull request with GothamAds prebid adapter

* new optional params (#6148)

* Add the root domain check method as a util method added for use mod… (#6124)

* Add the root domain check method as a global method added for use modules

* Add a date suffix to keep the test cookie random

* Per review, moved the findRootDomain method to utils out of the userId modules

* More the domain method back the user module but attach it to the submodule so that userId modules can have access to it

* Remove the storageManager as it is no longer used in utils

* fix includes and find references in various files (#6183)

* Fix typo in mediaforce bid adapter (#6181)

* add mediaforce bid adapter

* make use of unused variable language

* Added native support for Mediaforce Bid Adapter

* Fix test endpoint url for Mediaforce Bid Adapter

* cleanup

* Added the ability to send multiple bids in one ad request for mediaforce bid adapter

* Fixes after review for mediaforce bid adapter

* Fix typo in mediaforce bid adapter

Co-authored-by: ksanksana <little.grey.goblin@gmail.com>

* Prebid JS Native Phase 2 update: (#5411)

* Prebid JS Native Phase 2 update:

1) Key Suppression for Native keys with sendTargetingKeys set to false at nativeParams.sendTargetingKeys or within asset i.e. nativeParams.image.sendTargetingKeys. Logic as follows:
   - If nativeParams.sendTargetingKeys set to false but asset has sendTargetingKeys set to true then add the KV
   - Else if nativeParams.sendTargetingKeys is set to true and asset does not have sendTargetingKeys defined or it is set to true then add KV
   - Else if nativeParams.sendTargetingKeys is not defined and asset does not have sendTargetingKeys defined or it is set
 to true then add KV
   If no conditions met then key is suppressed
2) Adds rendererUrl or adTemplate to the bid object for easy retrieval if assets requested from creative
3) Adds new logic to receiveMessage function in secureCreatives.js to answer data.action of 'allAssetRequest' with all available assets on the bid that have a value
4) Adds new native keys to constants.json

* Update to simplify send asset logic

* Fixed asset location typo

* Update to include message listener for native resize and update adObject for auction to include creative height and trigger resize

Co-authored-by: Michael Moschovas <mmoschovas@NY-Moschovas.local>

* Improve __uspapi behavior in iframe (#6072)

* align locator + fix remove listener

* update comment

Co-authored-by: Reinout Stevens <reinout@crazygames.com>

* Prebid 4.22.0 Release

* Increment pre version

* Sovrn: Add Support for Floor Module (#6155)

* EX-2549 Pass segments parameter as imp.ext.dealids array

* EX-2549 Address Jon's feedback

* EX-2549 Reworked the solution

* EX-2549 Blackbird compatibility

* EX-2549 Address Jon's comments

* EX-2549 Addressed upstream PR comments

* added floor module support

* added function check

* rerun test

Co-authored-by: Egor Gordeev <egordeev@lineate.com>
Co-authored-by: Egor Gordeev <48566506+egsgordeev@users.noreply.github.com>

* Lotame panorama id glv (#6185)

* Add the root domain check method as a global method added for use modules

* Add a date suffix to keep the test cookie random

* Per review, moved the findRootDomain method to utils out of the userId modules

* More the domain method back the user module but attach it to the submodule so that userId modules can have access to it

* Remove the storageManager as it is no longer used in utils

* Add the GVLID to the lotamePanoramaIdSystem

* Use the GVL ID in the storage manager as well

* Admixer bid adapter: add fpd (#6190)

* Migrating to Prebid 1.0

* Migrating to Prebid 1.0

* Fix spec

* add gdpr and usp

* remove changes in gdpr_hello_world.html

* Update gdpr_hello_world.html

add spaces

* add user syncs

* remove comments

* tests

* add fpd to request

Co-authored-by: atkachov <atkachov91@admixer.ua>

* Add Adomain Targeting Key and Default Targeting Keys (#6116)

* Add Adomain Targeting Key

* add default targeting key

Co-authored-by: Veronica Kim <vkim@vkim-mac.lan>

* Adkernel: torchad alias (#6191)

* New feature: PBS anti alias (#6150)

* PBS anti alias

* lint

* lint

* update test

* update test

* Unit tests + dynamic aliasing

* test bidder factory

* Waardex Bid Adapter: Add video support, refactor code (#6149)

* Add video support, refactor code

* Add zoneId, refactor

Co-authored-by: yegorheiz <yegorheiz@gmail.com>

* init new pull request with GothamAds prebid adapter

Co-authored-by: Drilon Kastrati <drilon@gjirafa.com>
Co-authored-by: Mark <markaconrad@users.noreply.github.com>
Co-authored-by: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com>
Co-authored-by: Niksok <belnamtar@mail.ru>
Co-authored-by: ksanksana <little.grey.goblin@gmail.com>
Co-authored-by: mmoschovas <63253416+mmoschovas@users.noreply.github.com>
Co-authored-by: Michael Moschovas <mmoschovas@NY-Moschovas.local>
Co-authored-by: Reinout Stevens <reinout@reinoutstevens.be>
Co-authored-by: Reinout Stevens <reinout@crazygames.com>
Co-authored-by: Scott Menzer <scott@id5.io>
Co-authored-by: John Rosendahl <jrosendahl@gmail.com>
Co-authored-by: Egor Gordeev <egordeev@lineate.com>
Co-authored-by: Egor Gordeev <48566506+egsgordeev@users.noreply.github.com>
Co-authored-by: Galphimbl <sashatkachov91@gmail.com>
Co-authored-by: atkachov <atkachov91@admixer.ua>
Co-authored-by: Veronica Kim <43146383+vkimcm@users.noreply.github.com>
Co-authored-by: Veronica Kim <vkim@vkim-mac.lan>
Co-authored-by: Denis Logachov <denis@adkernel.com>
Co-authored-by: Gena <wertixvost@gmail.com>
Co-authored-by: yegorWaardex <59033363+yegorWaardex@users.noreply.github.com>
Co-authored-by: yegorheiz <yegorheiz@gmail.com>
---
 modules/gothamadsBidAdapter.js                | 307 +++++++++++++++
 modules/gothamadsBidAdapter.md                | 104 +++++
 test/spec/modules/gothamadsBidAdapter_spec.js | 369 ++++++++++++++++++
 3 files changed, 780 insertions(+)
 create mode 100644 modules/gothamadsBidAdapter.js
 create mode 100644 modules/gothamadsBidAdapter.md
 create mode 100644 test/spec/modules/gothamadsBidAdapter_spec.js

diff --git a/modules/gothamadsBidAdapter.js b/modules/gothamadsBidAdapter.js
new file mode 100644
index 00000000000..f2d2a9f5261
--- /dev/null
+++ b/modules/gothamadsBidAdapter.js
@@ -0,0 +1,307 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+import {config} from '../src/config.js';
+
+const BIDDER_CODE = 'gothamads';
+const ACCOUNTID_MACROS = '[account_id]';
+const URL_ENDPOINT = `https://us-e-node1.gothamads.com/bid?pass=${ACCOUNTID_MACROS}&integration=prebidjs`;
+const NATIVE_ASSET_IDS = { 0: 'title', 2: 'icon', 3: 'image', 5: 'sponsoredBy', 4: 'body', 1: 'cta' };
+const NATIVE_PARAMS = {
+  title: {
+    id: 0,
+    name: 'title'
+  },
+  icon: {
+    id: 2,
+    type: 1,
+    name: 'img'
+  },
+  image: {
+    id: 3,
+    type: 3,
+    name: 'img'
+  },
+  sponsoredBy: {
+    id: 5,
+    name: 'data',
+    type: 1
+  },
+  body: {
+    id: 4,
+    name: 'data',
+    type: 2
+  },
+  cta: {
+    id: 1,
+    type: 12,
+    name: 'data'
+  }
+};
+const NATIVE_VERSION = '1.2';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: (bid) => {
+    return Boolean(bid.params.accountId) && Boolean(bid.params.placementId)
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: (validBidRequests, bidderRequest) => {
+    if (validBidRequests && validBidRequests.length === 0) return []
+    let accuontId = validBidRequests[0].params.accountId;
+    const endpointURL = URL_ENDPOINT.replace(ACCOUNTID_MACROS, accuontId);
+
+    let winTop = window;
+    let location;
+    try {
+      location = new URL(bidderRequest.refererInfo.referer)
+      winTop = window.top;
+    } catch (e) {
+      location = winTop.location;
+      utils.logMessage(e);
+    };
+
+    let bids = [];
+    for (let bidRequest of validBidRequests) {
+      let impObject = prepareImpObject(bidRequest);
+      let data = {
+        id: bidRequest.bidId,
+        test: config.getConfig('debug') ? 1 : 0,
+        cur: ['USD'],
+        device: {
+          w: winTop.screen.width,
+          h: winTop.screen.height,
+          language: (navigator && navigator.language) ? navigator.language.indexOf('-') != -1 ? navigator.language.split('-')[0] : navigator.language : '',
+        },
+        site: {
+          page: location.pathname,
+          host: location.host
+        },
+        source: {
+          tid: bidRequest.transactionId
+        },
+        tmax: bidRequest.timeout,
+        imp: [impObject],
+      };
+      bids.push(data)
+    }
+    return {
+      method: 'POST',
+      url: endpointURL,
+      data: bids
+    };
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: (serverResponse) => {
+    if (!serverResponse || !serverResponse.body) return []
+    let GothamAdskResponse = serverResponse.body;
+
+    let bids = [];
+    for (let response of GothamAdskResponse) {
+      let mediaType = response.seatbid[0].bid[0].ext && response.seatbid[0].bid[0].ext.mediaType ? response.seatbid[0].bid[0].ext.mediaType : BANNER;
+
+      let bid = {
+        requestId: response.id,
+        cpm: response.seatbid[0].bid[0].price,
+        width: response.seatbid[0].bid[0].w,
+        height: response.seatbid[0].bid[0].h,
+        ttl: response.ttl || 1200,
+        currency: response.cur || 'USD',
+        netRevenue: true,
+        creativeId: response.seatbid[0].bid[0].crid,
+        dealId: response.seatbid[0].bid[0].dealid,
+        mediaType: mediaType
+      };
+
+      switch (mediaType) {
+        case VIDEO:
+          bid.vastXml = response.seatbid[0].bid[0].adm
+          bid.vastUrl = response.seatbid[0].bid[0].ext.vastUrl
+          break
+        case NATIVE:
+          bid.native = parseNative(response.seatbid[0].bid[0].adm)
+          break
+        default:
+          bid.ad = response.seatbid[0].bid[0].adm
+      }
+
+      bids.push(bid);
+    }
+
+    return bids;
+  },
+};
+
+/**
+ * Determine type of request
+ *
+ * @param bidRequest
+ * @param type
+ * @returns {boolean}
+ */
+const checkRequestType = (bidRequest, type) => {
+  return (typeof utils.deepAccess(bidRequest, `mediaTypes.${type}`) !== 'undefined');
+}
+
+const parseNative = admObject => {
+  const { assets, link, imptrackers, jstracker } = admObject.native;
+  const result = {
+    clickUrl: link.url,
+    clickTrackers: link.clicktrackers || undefined,
+    impressionTrackers: imptrackers || undefined,
+    javascriptTrackers: jstracker ? [ jstracker ] : undefined
+  };
+  assets.forEach(asset => {
+    const kind = NATIVE_ASSET_IDS[asset.id];
+    const content = kind && asset[NATIVE_PARAMS[kind].name];
+    if (content) {
+      result[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
+    }
+  });
+
+  return result;
+}
+
+const prepareImpObject = (bidRequest) => {
+  let impObject = {
+    id: bidRequest.transactionId,
+    secure: 1,
+    ext: {
+      placementId: bidRequest.params.placementId
+    }
+  };
+  if (checkRequestType(bidRequest, BANNER)) {
+    impObject.banner = addBannerParameters(bidRequest);
+  }
+  if (checkRequestType(bidRequest, VIDEO)) {
+    impObject.video = addVideoParameters(bidRequest);
+  }
+  if (checkRequestType(bidRequest, NATIVE)) {
+    impObject.native = {
+      ver: NATIVE_VERSION,
+      request: addNativeParameters(bidRequest)
+    };
+  }
+  return impObject
+};
+
+const addNativeParameters = bidRequest => {
+  let impObject = {
+    id: bidRequest.transactionId,
+    ver: NATIVE_VERSION,
+  };
+
+  const assets = utils._map(bidRequest.mediaTypes.native, (bidParams, key) => {
+    const props = NATIVE_PARAMS[key];
+    const asset = {
+      required: bidParams.required & 1,
+    };
+    if (props) {
+      asset.id = props.id;
+      let wmin, hmin;
+      let aRatios = bidParams.aspect_ratios;
+
+      if (aRatios && aRatios[0]) {
+        aRatios = aRatios[0];
+        wmin = aRatios.min_width || 0;
+        hmin = aRatios.ratio_height * wmin / aRatios.ratio_width | 0;
+      }
+
+      if (bidParams.sizes) {
+        const sizes = flatten(bidParams.sizes);
+        wmin = sizes[0];
+        hmin = sizes[1];
+      }
+
+      asset[props.name] = {}
+
+      if (bidParams.len) asset[props.name]['len'] = bidParams.len;
+      if (props.type) asset[props.name]['type'] = props.type;
+      if (wmin) asset[props.name]['wmin'] = wmin;
+      if (hmin) asset[props.name]['hmin'] = hmin;
+
+      return asset;
+    }
+  }).filter(Boolean);
+
+  impObject.assets = assets;
+  return impObject
+}
+
+const addBannerParameters = (bidRequest) => {
+  let bannerObject = {};
+  const size = parseSizes(bidRequest, 'banner');
+  bannerObject.w = size[0];
+  bannerObject.h = size[1];
+  return bannerObject;
+};
+
+const parseSizes = (bid, mediaType) => {
+  let mediaTypes = bid.mediaTypes;
+  if (mediaType === 'video') {
+    let size = [];
+    if (mediaTypes.video && mediaTypes.video.w && mediaTypes.video.h) {
+      size = [
+        mediaTypes.video.w,
+        mediaTypes.video.h
+      ];
+    } else if (Array.isArray(utils.deepAccess(bid, 'mediaTypes.video.playerSize')) && bid.mediaTypes.video.playerSize.length === 1) {
+      size = bid.mediaTypes.video.playerSize[0];
+    } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0 && Array.isArray(bid.sizes[0]) && bid.sizes[0].length > 1) {
+      size = bid.sizes[0];
+    }
+    return size;
+  }
+  let sizes = [];
+  if (Array.isArray(mediaTypes.banner.sizes)) {
+    sizes = mediaTypes.banner.sizes[0];
+  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
+    sizes = bid.sizes
+  } else {
+    utils.logWarn('no sizes are setup or found');
+  }
+
+  return sizes
+}
+
+const addVideoParameters = (bidRequest) => {
+  let videoObj = {};
+  let supportParamsList = ['mimes', 'minduration', 'maxduration', 'protocols', 'startdelay', 'placement', 'skip', 'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity']
+
+  for (let param of supportParamsList) {
+    if (bidRequest.mediaTypes.video[param] !== undefined) {
+      videoObj[param] = bidRequest.mediaTypes.video[param];
+    }
+  }
+
+  const size = parseSizes(bidRequest, 'video');
+  videoObj.w = size[0];
+  videoObj.h = size[1];
+  return videoObj;
+}
+
+const flatten = arr => {
+  return [].concat(...arr);
+}
+
+registerBidder(spec);
diff --git a/modules/gothamadsBidAdapter.md b/modules/gothamadsBidAdapter.md
new file mode 100644
index 00000000000..3105dff6c6c
--- /dev/null
+++ b/modules/gothamadsBidAdapter.md
@@ -0,0 +1,104 @@
+# Overview
+
+```
+Module Name: GothamAds SSP Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: support@gothamads.com
+```
+
+# Description
+
+Module that connects to GothamAds SSP demand sources
+
+# Test Parameters
+```
+    var adUnits = [{
+                code: 'placementId',
+                      mediaTypes: {
+                          banner: {
+                              sizes: [[300, 250], [300,600]]
+                              }
+                              },
+                bids: [{
+                        bidder: 'gothamads',
+                        params: {
+                                placementId: 'hash',
+                            accountId: 'accountId'
+                        }
+                    }]
+                },
+                {
+                    code: 'native_example',
+                    // sizes: [[1, 1]],
+                    mediaTypes: {
+                      native: {
+                        title: {
+                          required: true,
+                          len: 800
+                        },
+                        image: {
+                          required: true,
+                            len: 80
+                        },
+                        sponsoredBy: {
+                            required: true
+                        },
+                        clickUrl: {
+                            required: true
+                        },
+                        privacyLink: {
+                            required: false
+                        },
+                        body: {
+                            required: true
+                        },
+                        icon: {
+                            required: true,
+                            sizes: [50, 50]
+                        }
+                    }
+
+                    },
+                    bids: [    {
+                            bidder: 'gothamads',
+                            params: {
+                                    placementId: 'hash',
+                            accountId: 'accountId'
+                            }
+                        }]
+            }, 
+            {
+    code: 'video1',
+    sizes: [640,480],
+    mediaTypes: { video: {
+      minduration:0,
+                maxduration:999,
+                boxingallowed:1,
+                skip:0,
+                mimes:[
+                    'application/javascript',
+                    'video/mp4'
+                ],
+                w:1920,
+                h:1080,
+                protocols:[
+                    2
+                ],
+                linearity:1,
+                api:[
+                    1,
+                    2
+                ]
+    } },
+    bids: [
+    {
+                bidder: 'gothamads',
+                params: {
+                        placementId: 'hash',
+                    accountId: 'accountId'
+                }
+            }
+    ]
+  }
+            ];
+```
\ No newline at end of file
diff --git a/test/spec/modules/gothamadsBidAdapter_spec.js b/test/spec/modules/gothamadsBidAdapter_spec.js
new file mode 100644
index 00000000000..c638e7a0e3e
--- /dev/null
+++ b/test/spec/modules/gothamadsBidAdapter_spec.js
@@ -0,0 +1,369 @@
+import { expect } from 'chai';
+import { spec } from 'modules/gothamadsBidAdapter.js';
+
+const NATIVE_BID_REQUEST = {
+  code: 'native_example',
+  mediaTypes: {
+    native: {
+      title: {
+        required: true,
+        len: 800
+      },
+      image: {
+        required: true,
+        len: 80
+      },
+      sponsoredBy: {
+        required: true
+      },
+      clickUrl: {
+        required: true
+      },
+      privacyLink: {
+        required: false
+      },
+      body: {
+        required: true
+      },
+      icon: {
+        required: true,
+        sizes: [50, 50]
+      }
+    }
+  },
+  bidder: 'gothamads',
+  params: {
+    placementId: 'hash',
+    accountId: 'accountId'
+  },
+  timeout: 1000
+
+};
+
+const BANNER_BID_REQUEST = {
+  code: 'banner_example',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250], [300, 600]]
+    }
+  },
+  bidder: 'gothamads',
+  params: {
+    placementId: 'hash',
+    accountId: 'accountId'
+  },
+  timeout: 1000,
+
+}
+
+const bidRequest = {
+  refererInfo: {
+    referer: 'test.com'
+  }
+}
+
+const VIDEO_BID_REQUEST = {
+  code: 'video1',
+  sizes: [640, 480],
+  mediaTypes: { video: {
+    minduration: 0,
+    maxduration: 999,
+    boxingallowed: 1,
+    skip: 0,
+    mimes: [
+      'application/javascript',
+      'video/mp4'
+    ],
+    w: 1920,
+    h: 1080,
+    protocols: [
+      2
+    ],
+    linearity: 1,
+    api: [
+      1,
+      2
+    ]
+  }
+  },
+
+  bidder: 'gothamads',
+  params: {
+    placementId: 'hash',
+    accountId: 'accountId'
+  },
+  timeout: 1000
+
+}
+
+const BANNER_BID_RESPONSE = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: 'admcode',
+      crid: 'crid',
+      ext: {
+        mediaType: 'banner'
+      }
+    }],
+  }],
+};
+
+const VIDEO_BID_RESPONSE = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: 'admcode',
+      crid: 'crid',
+      ext: {
+        mediaType: 'video',
+        vastUrl: 'http://example.vast',
+      }
+    }],
+  }],
+};
+
+let imgData = {
+  url: `https://example.com/image`,
+  w: 1200,
+  h: 627
+};
+
+const NATIVE_BID_RESPONSE = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: { native:
+          {
+            assets: [
+              {id: 0, title: 'dummyText'},
+              {id: 3, image: imgData},
+              {
+                id: 5,
+                data: {value: 'organization.name'}
+              }
+            ],
+            link: {url: 'example.com'},
+            imptrackers: ['tracker1.com', 'tracker2.com', 'tracker3.com'],
+            jstracker: 'tracker1.com'
+          }
+      },
+      crid: 'crid',
+      ext: {
+        mediaType: 'native'
+      }
+    }],
+  }],
+};
+
+describe('GothamAdsAdapter', function() {
+  describe('isBidRequestValid', function() {
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(NATIVE_BID_REQUEST)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, NATIVE_BID_REQUEST);
+      delete bid.params;
+      bid.params = {
+        'IncorrectParam': 0
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('build Native Request', function () {
+    const request = spec.buildRequests([NATIVE_BID_REQUEST], bidRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://us-e-node1.gothamads.com/bid?pass=accountId&integration=prebidjs');
+    });
+
+    it('Returns empty data if no valid requests are passed', function () {
+      let serverRequest = spec.buildRequests([]);
+      expect(serverRequest).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('build Banner Request', function () {
+    const request = spec.buildRequests([BANNER_BID_REQUEST]);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://us-e-node1.gothamads.com/bid?pass=accountId&integration=prebidjs');
+    });
+  });
+
+  describe('build Video Request', function () {
+    const request = spec.buildRequests([VIDEO_BID_REQUEST]);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://us-e-node1.gothamads.com/bid?pass=accountId&integration=prebidjs');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('Empty response must return empty array', function() {
+      const emptyResponse = null;
+      let response = spec.interpretResponse(emptyResponse);
+
+      expect(response).to.be.an('array').that.is.empty;
+    })
+
+    it('Should interpret banner response', function () {
+      const bannerResponse = {
+        body: [BANNER_BID_RESPONSE]
+      }
+
+      const expectedBidResponse = {
+        requestId: BANNER_BID_RESPONSE.id,
+        cpm: BANNER_BID_RESPONSE.seatbid[0].bid[0].price,
+        width: BANNER_BID_RESPONSE.seatbid[0].bid[0].w,
+        height: BANNER_BID_RESPONSE.seatbid[0].bid[0].h,
+        ttl: BANNER_BID_RESPONSE.ttl || 1200,
+        currency: BANNER_BID_RESPONSE.cur || 'USD',
+        netRevenue: true,
+        creativeId: BANNER_BID_RESPONSE.seatbid[0].bid[0].crid,
+        dealId: BANNER_BID_RESPONSE.seatbid[0].bid[0].dealid,
+        mediaType: 'banner',
+        ad: BANNER_BID_RESPONSE.seatbid[0].bid[0].adm
+      }
+
+      let bannerResponses = spec.interpretResponse(bannerResponse);
+
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.ad).to.equal(expectedBidResponse.ad);
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+
+    it('Should interpret video response', function () {
+      const videoResponse = {
+        body: [VIDEO_BID_RESPONSE]
+      }
+
+      const expectedBidResponse = {
+        requestId: VIDEO_BID_RESPONSE.id,
+        cpm: VIDEO_BID_RESPONSE.seatbid[0].bid[0].price,
+        width: VIDEO_BID_RESPONSE.seatbid[0].bid[0].w,
+        height: VIDEO_BID_RESPONSE.seatbid[0].bid[0].h,
+        ttl: VIDEO_BID_RESPONSE.ttl || 1200,
+        currency: VIDEO_BID_RESPONSE.cur || 'USD',
+        netRevenue: true,
+        creativeId: VIDEO_BID_RESPONSE.seatbid[0].bid[0].crid,
+        dealId: VIDEO_BID_RESPONSE.seatbid[0].bid[0].dealid,
+        mediaType: 'video',
+        vastXml: VIDEO_BID_RESPONSE.seatbid[0].bid[0].adm,
+        vastUrl: VIDEO_BID_RESPONSE.seatbid[0].bid[0].ext.vastUrl
+      }
+
+      let videoResponses = spec.interpretResponse(videoResponse);
+
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'vastXml', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.vastXml).to.equal(expectedBidResponse.vastXml)
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+
+    it('Should interpret native response', function () {
+      const nativeResponse = {
+        body: [NATIVE_BID_RESPONSE]
+      }
+
+      const expectedBidResponse = {
+        requestId: NATIVE_BID_RESPONSE.id,
+        cpm: NATIVE_BID_RESPONSE.seatbid[0].bid[0].price,
+        width: NATIVE_BID_RESPONSE.seatbid[0].bid[0].w,
+        height: NATIVE_BID_RESPONSE.seatbid[0].bid[0].h,
+        ttl: NATIVE_BID_RESPONSE.ttl || 1200,
+        currency: NATIVE_BID_RESPONSE.cur || 'USD',
+        netRevenue: true,
+        creativeId: NATIVE_BID_RESPONSE.seatbid[0].bid[0].crid,
+        dealId: NATIVE_BID_RESPONSE.seatbid[0].bid[0].dealid,
+        mediaType: 'native',
+        native: {clickUrl: NATIVE_BID_RESPONSE.seatbid[0].bid[0].adm.native.link.url}
+      }
+
+      let nativeResponses = spec.interpretResponse(nativeResponse);
+
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'native', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.native.clickUrl).to.equal(expectedBidResponse.native.clickUrl)
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+  });
+})

From 1729dd34b22f02ab86c2df7ff0d2a6ecd89b83e9 Mon Sep 17 00:00:00 2001
From: Hai Lee <lx@adtrue.com>
Date: Tue, 19 Jan 2021 00:04:50 +0700
Subject: [PATCH 157/304] add AdTrue bid adapter (#6166)

* add AdTrue bid adapter

* add AdTrue Bid Adapter unit tests

* add AdTrue Bid Adapter unit tests

* add AdTrue bid adapter

* add AdTrue Bid Adapter unit tests

* add AdTrue Bid Adapter unit tests

* add AdTrue bid adapter
---
 modules/adtrueBidAdapter.js                | 637 +++++++++++++++++++++
 modules/adtrueBidAdapter.md                |  36 ++
 test/spec/modules/adtrueBidAdapter_spec.js | 370 ++++++++++++
 3 files changed, 1043 insertions(+)
 create mode 100644 modules/adtrueBidAdapter.js
 create mode 100644 modules/adtrueBidAdapter.md
 create mode 100644 test/spec/modules/adtrueBidAdapter_spec.js

diff --git a/modules/adtrueBidAdapter.js b/modules/adtrueBidAdapter.js
new file mode 100644
index 00000000000..fa83f9f29f7
--- /dev/null
+++ b/modules/adtrueBidAdapter.js
@@ -0,0 +1,637 @@
+import * as utils from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import {getStorageManager} from '../src/storageManager.js';
+
+const storage = getStorageManager();
+const BIDDER_CODE = 'adtrue';
+const ADTRUE_CURRENCY = 'USD';
+const ENDPOINT_URL = 'https://hb.adtrue.com/prebid/auction';
+const LOG_WARN_PREFIX = 'AdTrue: ';
+const AUCTION_TYPE = 1;
+const UNDEFINED = undefined;
+const DEFAULT_WIDTH = 0;
+const DEFAULT_HEIGHT = 0;
+const NET_REVENUE = false;
+const USER_SYNC_URL_IFRAME = 'https://hb.adtrue.com/prebid/usersync?t=iframe&p=';
+const USER_SYNC_URL_IMAGE = 'https://hb.adtrue.com/prebid/usersync?t=img&p=';
+let publisherId = 0;
+let NATIVE_ASSET_ID_TO_KEY_MAP = {};
+const DATA_TYPES = {
+  'NUMBER': 'number',
+  'STRING': 'string',
+  'BOOLEAN': 'boolean',
+  'ARRAY': 'array',
+  'OBJECT': 'object'
+};
+const VIDEO_CUSTOM_PARAMS = {
+  'mimes': DATA_TYPES.ARRAY,
+  'minduration': DATA_TYPES.NUMBER,
+  'maxduration': DATA_TYPES.NUMBER,
+  'startdelay': DATA_TYPES.NUMBER,
+  'playbackmethod': DATA_TYPES.ARRAY,
+  'api': DATA_TYPES.ARRAY,
+  'protocols': DATA_TYPES.ARRAY,
+  'w': DATA_TYPES.NUMBER,
+  'h': DATA_TYPES.NUMBER,
+  'battr': DATA_TYPES.ARRAY,
+  'linearity': DATA_TYPES.NUMBER,
+  'placement': DATA_TYPES.NUMBER,
+  'minbitrate': DATA_TYPES.NUMBER,
+  'maxbitrate': DATA_TYPES.NUMBER
+}
+
+const NATIVE_ASSETS = {
+  'TITLE': {ID: 1, KEY: 'title', TYPE: 0},
+  'IMAGE': {ID: 2, KEY: 'image', TYPE: 0},
+  'ICON': {ID: 3, KEY: 'icon', TYPE: 0},
+  'SPONSOREDBY': {ID: 4, KEY: 'sponsoredBy', TYPE: 1}, // please note that type of SPONSORED is also 1
+  'BODY': {ID: 5, KEY: 'body', TYPE: 2}, // please note that type of DESC is also set to 2
+  'CLICKURL': {ID: 6, KEY: 'clickUrl', TYPE: 0},
+  'VIDEO': {ID: 7, KEY: 'video', TYPE: 0},
+  'EXT': {ID: 8, KEY: 'ext', TYPE: 0},
+  'DATA': {ID: 9, KEY: 'data', TYPE: 0},
+  'LOGO': {ID: 10, KEY: 'logo', TYPE: 0},
+  'SPONSORED': {ID: 11, KEY: 'sponsored', TYPE: 1}, // please note that type of SPONSOREDBY is also set to 1
+  'DESC': {ID: 12, KEY: 'data', TYPE: 2}, // please note that type of BODY is also set to 2
+  'RATING': {ID: 13, KEY: 'rating', TYPE: 3},
+  'LIKES': {ID: 14, KEY: 'likes', TYPE: 4},
+  'DOWNLOADS': {ID: 15, KEY: 'downloads', TYPE: 5},
+  'PRICE': {ID: 16, KEY: 'price', TYPE: 6},
+  'SALEPRICE': {ID: 17, KEY: 'saleprice', TYPE: 7},
+  'PHONE': {ID: 18, KEY: 'phone', TYPE: 8},
+  'ADDRESS': {ID: 19, KEY: 'address', TYPE: 9},
+  'DESC2': {ID: 20, KEY: 'desc2', TYPE: 10},
+  'DISPLAYURL': {ID: 21, KEY: 'displayurl', TYPE: 11},
+  'CTA': {ID: 22, KEY: 'cta', TYPE: 12}
+};
+
+function _getDomainFromURL(url) {
+  let anchor = document.createElement('a');
+  anchor.href = url;
+  return anchor.hostname;
+}
+
+function _parseSlotParam(paramName, paramValue) {
+  switch (paramName) {
+    case 'reserve':
+      return parseFloat(paramValue) || UNDEFINED;
+    default:
+      return paramValue;
+  }
+}
+
+let platform = (function getPlatform() {
+  var ua = navigator.userAgent;
+  if (ua.indexOf('Android') > -1 || ua.indexOf('Adr') > -1) {
+    return 'Android'
+  }
+  if (ua.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) {
+    return 'iOS'
+  }
+  return 'windows'
+})();
+
+function _generateGUID() {
+  var d = new Date().getTime();
+  var guid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+    var r = (d + Math.random() * 16) % 16 | 0;
+    d = Math.floor(d / 16);
+    return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+  })
+  return guid;
+}
+
+function _isMobile() {
+  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent);
+}
+
+function _isConnectedTV() {
+  return (/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(navigator.userAgent);
+}
+
+function _parseAdSlot(bid) {
+  bid.params.width = 0;
+  bid.params.height = 0;
+  // check if size is mentioned in sizes array. in that case do not check for @ in adslot
+  if (bid.hasOwnProperty('mediaTypes') &&
+    bid.mediaTypes.hasOwnProperty(BANNER) &&
+    bid.mediaTypes.banner.hasOwnProperty('sizes')) {
+    var i = 0;
+    var sizeArray = [];
+    for (; i < bid.mediaTypes.banner.sizes.length; i++) {
+      if (bid.mediaTypes.banner.sizes[i].length === 2) { // sizes[i].length will not be 2 in case where size is set as fluid, we want to skip that entry
+        sizeArray.push(bid.mediaTypes.banner.sizes[i]);
+      }
+    }
+    bid.mediaTypes.banner.sizes = sizeArray;
+    if (bid.mediaTypes.banner.sizes.length >= 1) {
+      // set the first size in sizes array in bid.params.width and bid.params.height. These will be sent as primary size.
+      // The rest of the sizes will be sent in format array.
+      bid.params.width = bid.mediaTypes.banner.sizes[0][0];
+      bid.params.height = bid.mediaTypes.banner.sizes[0][1];
+      bid.mediaTypes.banner.sizes = bid.mediaTypes.banner.sizes.splice(1, bid.mediaTypes.banner.sizes.length - 1);
+    }
+  }
+}
+
+function _initConf(refererInfo) {
+  return {
+    pageURL: (refererInfo && refererInfo.referer) ? refererInfo.referer : window.location.href,
+    refURL: window.document.referrer
+  };
+}
+
+function _getLanguage() {
+  const language = navigator.language ? 'language' : 'userLanguage';
+  return navigator[language].split('-')[0];
+}
+
+function _createOrtbTemplate(conf) {
+  var guid;
+  if (storage.getDataFromLocalStorage('adtrue_user_id') == null) {
+    storage.setDataInLocalStorage('adtrue_user_id', _generateGUID())
+  }
+  guid = storage.getDataFromLocalStorage('adtrue_user_id')
+
+  return {
+    id: '' + new Date().getTime(),
+    at: AUCTION_TYPE,
+    cur: [ADTRUE_CURRENCY],
+    imp: [],
+    site: {
+      page: conf.pageURL,
+      ref: conf.refURL,
+      publisher: {}
+    },
+    device: {
+      ip: '',
+      ua: navigator.userAgent,
+      os: platform,
+      js: 1,
+      dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
+      h: screen.height,
+      w: screen.width,
+      language: _getLanguage(),
+      devicetype: _isMobile() ? 1 : _isConnectedTV() ? 3 : 2,
+      geo: {
+        country: '{country_code}',
+        type: 0,
+        ipservice: 1,
+        region: '',
+        city: '',
+      },
+    },
+    user: {
+      id: guid
+    },
+    ext: {}
+  };
+}
+
+function _checkParamDataType(key, value, datatype) {
+  var errMsg = 'Ignoring param key: ' + key + ', expects ' + datatype + ', found ' + typeof value;
+  var functionToExecute;
+  switch (datatype) {
+    case DATA_TYPES.BOOLEAN:
+      functionToExecute = utils.isBoolean;
+      break;
+    case DATA_TYPES.NUMBER:
+      functionToExecute = utils.isNumber;
+      break;
+    case DATA_TYPES.STRING:
+      functionToExecute = utils.isStr;
+      break;
+    case DATA_TYPES.ARRAY:
+      functionToExecute = utils.isArray;
+      break;
+  }
+  if (functionToExecute(value)) {
+    return value;
+  }
+  utils.logWarn(LOG_WARN_PREFIX + errMsg);
+  return UNDEFINED;
+}
+
+function _parseNativeResponse(bid, newBid) {
+  newBid.native = {};
+  if (bid.hasOwnProperty('adm')) {
+    var adm = '';
+    try {
+      adm = JSON.parse(bid.adm.replace(/\\/g, ''));
+    } catch (ex) {
+      // utils.logWarn(LOG_WARN_PREFIX + 'Error: Cannot parse native reponse for ad response: ' + newBid.adm);
+      return;
+    }
+    if (adm && adm.native && adm.native.assets && adm.native.assets.length > 0) {
+      newBid.mediaType = NATIVE;
+      for (let i = 0, len = adm.native.assets.length; i < len; i++) {
+        switch (adm.native.assets[i].id) {
+          case NATIVE_ASSETS.TITLE.ID:
+            newBid.native.title = adm.native.assets[i].title && adm.native.assets[i].title.text;
+            break;
+          case NATIVE_ASSETS.IMAGE.ID:
+            newBid.native.image = {
+              url: adm.native.assets[i].img && adm.native.assets[i].img.url,
+              height: adm.native.assets[i].img && adm.native.assets[i].img.h,
+              width: adm.native.assets[i].img && adm.native.assets[i].img.w,
+            };
+            break;
+          case NATIVE_ASSETS.ICON.ID:
+            newBid.native.icon = {
+              url: adm.native.assets[i].img && adm.native.assets[i].img.url,
+              height: adm.native.assets[i].img && adm.native.assets[i].img.h,
+              width: adm.native.assets[i].img && adm.native.assets[i].img.w,
+            };
+            break;
+          case NATIVE_ASSETS.SPONSOREDBY.ID:
+          case NATIVE_ASSETS.BODY.ID:
+          case NATIVE_ASSETS.LIKES.ID:
+          case NATIVE_ASSETS.DOWNLOADS.ID:
+          case NATIVE_ASSETS.PRICE:
+          case NATIVE_ASSETS.SALEPRICE.ID:
+          case NATIVE_ASSETS.PHONE.ID:
+          case NATIVE_ASSETS.ADDRESS.ID:
+          case NATIVE_ASSETS.DESC2.ID:
+          case NATIVE_ASSETS.CTA.ID:
+          case NATIVE_ASSETS.RATING.ID:
+          case NATIVE_ASSETS.DISPLAYURL.ID:
+            newBid.native[NATIVE_ASSET_ID_TO_KEY_MAP[adm.native.assets[i].id]] = adm.native.assets[i].data && adm.native.assets[i].data.value;
+            break;
+        }
+      }
+      newBid.native.clickUrl = adm.native.link && adm.native.link.url;
+      newBid.native.clickTrackers = (adm.native.link && adm.native.link.clicktrackers) || [];
+      newBid.native.impressionTrackers = adm.native.imptrackers || [];
+      newBid.native.jstracker = adm.native.jstracker || [];
+      if (!newBid.width) {
+        newBid.width = DEFAULT_WIDTH;
+      }
+      if (!newBid.height) {
+        newBid.height = DEFAULT_HEIGHT;
+      }
+    }
+  }
+}
+
+function _createBannerRequest(bid) {
+  var sizes = bid.mediaTypes.banner.sizes;
+  var format = [];
+  var bannerObj;
+  if (sizes !== UNDEFINED && utils.isArray(sizes)) {
+    bannerObj = {};
+    if (!bid.params.width && !bid.params.height) {
+      if (sizes.length === 0) {
+        // i.e. since bid.params does not have width or height, and length of sizes is 0, need to ignore this banner imp
+        bannerObj = UNDEFINED;
+        utils.logWarn(LOG_WARN_PREFIX + 'Error: mediaTypes.banner.size missing for adunit: ' + bid.params.adUnit + '. Ignoring the banner impression in the adunit.');
+        return bannerObj;
+      } else {
+        bannerObj.w = parseInt(sizes[0][0], 10);
+        bannerObj.h = parseInt(sizes[0][1], 10);
+        sizes = sizes.splice(1, sizes.length - 1);
+      }
+    } else {
+      bannerObj.w = bid.params.width;
+      bannerObj.h = bid.params.height;
+    }
+    if (sizes.length > 0) {
+      format = [];
+      sizes.forEach(function (size) {
+        if (size.length > 1) {
+          format.push({w: size[0], h: size[1]});
+        }
+      });
+      if (format.length > 0) {
+        bannerObj.format = format;
+      }
+    }
+    bannerObj.pos = 0;
+    bannerObj.topframe = utils.inIframe() ? 0 : 1;
+  } else {
+    utils.logWarn(LOG_WARN_PREFIX + 'Error: mediaTypes.banner.size missing for adunit: ' + bid.params.adUnit + '. Ignoring the banner impression in the adunit.');
+    bannerObj = UNDEFINED;
+  }
+  return bannerObj;
+}
+
+function _createVideoRequest(bid) {
+  var videoData = bid.params.video;
+  var videoObj;
+
+  if (videoData !== UNDEFINED) {
+    videoObj = {};
+    for (var key in VIDEO_CUSTOM_PARAMS) {
+      if (videoData.hasOwnProperty(key)) {
+        videoObj[key] = _checkParamDataType(key, videoData[key], VIDEO_CUSTOM_PARAMS[key]);
+      }
+    }
+    // read playersize and assign to h and w.
+    if (utils.isArray(bid.mediaTypes.video.playerSize[0])) {
+      videoObj.w = parseInt(bid.mediaTypes.video.playerSize[0][0], 10);
+      videoObj.h = parseInt(bid.mediaTypes.video.playerSize[0][1], 10);
+    } else if (utils.isNumber(bid.mediaTypes.video.playerSize[0])) {
+      videoObj.w = parseInt(bid.mediaTypes.video.playerSize[0], 10);
+      videoObj.h = parseInt(bid.mediaTypes.video.playerSize[1], 10);
+    }
+    if (bid.params.video.hasOwnProperty('skippable')) {
+      videoObj.ext = {
+        'video_skippable': bid.params.video.skippable ? 1 : 0
+      };
+    }
+  } else {
+    videoObj = UNDEFINED;
+    utils.logWarn(LOG_WARN_PREFIX + 'Error: Video config params missing for adunit: ' + bid.params.adUnit + ' with mediaType set as video. Ignoring video impression in the adunit.');
+  }
+  return videoObj;
+}
+
+function _checkMediaType(adm, newBid) {
+  var admStr = '';
+  var videoRegex = new RegExp(/VAST\s+version/);
+  newBid.mediaType = BANNER;
+  if (videoRegex.test(adm)) {
+    newBid.mediaType = VIDEO;
+  } else {
+    try {
+      admStr = JSON.parse(adm.replace(/\\/g, ''));
+      if (admStr && admStr.native) {
+        newBid.mediaType = NATIVE;
+      }
+    } catch (e) {
+      utils.logWarn(LOG_WARN_PREFIX + 'Error: Cannot parse native reponse for ad response: ' + adm);
+    }
+  }
+}
+
+function _createImpressionObject(bid, conf) {
+  var impObj = {};
+  var bannerObj;
+  var videoObj;
+  var sizes = bid.hasOwnProperty('sizes') ? bid.sizes : [];
+  var mediaTypes = '';
+  var format = [];
+
+  impObj = {
+    id: bid.bidId,
+    tagid: String(bid.params.zoneId || undefined),
+    bidfloor: _parseSlotParam('reserve', bid.params.reserve),
+    secure: 1,
+    ext: {},
+    bidfloorcur: ADTRUE_CURRENCY
+  };
+
+  if (bid.hasOwnProperty('mediaTypes')) {
+    for (mediaTypes in bid.mediaTypes) {
+      switch (mediaTypes) {
+        case BANNER:
+          bannerObj = _createBannerRequest(bid);
+          if (bannerObj !== UNDEFINED) {
+            impObj.banner = bannerObj;
+          }
+          break;
+        case VIDEO:
+          videoObj = _createVideoRequest(bid);
+          if (videoObj !== UNDEFINED) {
+            impObj.video = videoObj;
+          }
+          break;
+      }
+    }
+  } else {
+    // mediaTypes is not present, so this is a banner only impression
+    // this part of code is required for older testcases with no 'mediaTypes' to run succesfully.
+    bannerObj = {
+      pos: 0,
+      w: bid.params.width,
+      h: bid.params.height,
+      topframe: utils.inIframe() ? 0 : 1
+    };
+    if (utils.isArray(sizes) && sizes.length > 1) {
+      sizes = sizes.splice(1, sizes.length - 1);
+      sizes.forEach(size => {
+        format.push({
+          w: size[0],
+          h: size[1]
+        });
+      });
+      bannerObj.format = format;
+    }
+    impObj.banner = bannerObj;
+  }
+
+  return impObj.hasOwnProperty(BANNER) ||
+  impObj.hasOwnProperty(NATIVE) ||
+  impObj.hasOwnProperty(VIDEO) ? impObj : UNDEFINED;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: ['banner', 'video'],
+
+  isBidRequestValid: function (bid) {
+    if (bid && bid.params) {
+      if (!bid.params.zoneId) {
+        utils.logWarn(LOG_WARN_PREFIX + 'Error: missing zoneId');
+        return false;
+      }
+      if (!bid.params.publisherId) {
+        utils.logWarn(LOG_WARN_PREFIX + 'Error: missing publisherId');
+        return false;
+      }
+      return true;
+    }
+    return false;
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let refererInfo;
+    if (bidderRequest && bidderRequest.refererInfo) {
+      refererInfo = bidderRequest.refererInfo;
+    }
+    let conf = _initConf(refererInfo);
+    let payload = _createOrtbTemplate(conf);
+    let bidCurrency = '';
+    let bid;
+    validBidRequests.forEach(originalBid => {
+      bid = utils.deepClone(originalBid);
+      _parseAdSlot(bid);
+
+      conf.zoneId = conf.zoneId || bid.params.zoneId;
+      conf.pubId = conf.pubId || bid.params.publisherId;
+
+      conf.transactionId = bid.transactionId;
+      if (bidCurrency === '') {
+        bidCurrency = bid.params.currency || UNDEFINED;
+      } else if (bid.params.hasOwnProperty('currency') && bidCurrency !== bid.params.currency) {
+        utils.logWarn(LOG_WARN_PREFIX + 'Currency specifier ignored. Only one currency permitted.');
+      }
+      bid.params.currency = bidCurrency;
+
+      var impObj = _createImpressionObject(bid, conf);
+      if (impObj) {
+        payload.imp.push(impObj);
+      }
+    });
+    if (payload.imp.length == 0) {
+      return;
+    }
+    publisherId = conf.pubId.trim();
+
+    payload.site.publisher.id = conf.pubId.trim();
+    payload.ext.wrapper = {};
+
+    payload.ext.wrapper.transactionId = conf.transactionId;
+    payload.ext.wrapper.wiid = conf.wiid || bidderRequest.auctionId;
+    payload.ext.wrapper.wp = 'pbjs';
+
+    payload.user.geo = {};
+    payload.device.geo = payload.user.geo;
+    payload.site.page = conf.pageURL;
+    payload.site.domain = _getDomainFromURL(payload.site.page);
+
+    if (typeof config.getConfig('content') === 'object') {
+      payload.site.content = config.getConfig('content');
+    }
+
+    if (typeof config.getConfig('device') === 'object') {
+      payload.device = Object.assign(payload.device, config.getConfig('device'));
+    }
+
+    utils.deepSetValue(payload, 'source.tid', conf.transactionId);
+
+    // test bids
+    if (window.location.href.indexOf('adtrueTest=true') !== -1) {
+      payload.test = 1;
+    }
+    // adding schain object
+    if (validBidRequests[0].schain) {
+      utils.deepSetValue(payload, 'source.ext.schain', validBidRequests[0].schain);
+    }
+
+    // Attaching GDPR Consent Params
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      utils.deepSetValue(payload, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      utils.deepSetValue(payload, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+    }
+
+    // CCPA
+    if (bidderRequest && bidderRequest.uspConsent) {
+      utils.deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+
+    // coppa compliance
+    if (config.getConfig('coppa') === true) {
+      utils.deepSetValue(payload, 'regs.coppa', 1);
+    }
+
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: JSON.stringify(payload),
+      bidderRequests: bidderRequest
+    };
+  },
+  interpretResponse: function (serverResponses, bidderRequest) {
+    const bidResponses = [];
+    var respCur = ADTRUE_CURRENCY;
+    let parsedRequest = JSON.parse(bidderRequest.data);
+    let parsedReferrer = parsedRequest.site && parsedRequest.site.ref ? parsedRequest.site.ref : '';
+    try {
+      if (serverResponses.body && serverResponses.body.seatbid && utils.isArray(serverResponses.body.seatbid)) {
+        // Supporting multiple bid responses for same adSize
+        respCur = serverResponses.body.cur || respCur;
+        serverResponses.body.seatbid.forEach(seatbidder => {
+          seatbidder.bid &&
+          utils.isArray(seatbidder.bid) &&
+          seatbidder.bid.forEach(bid => {
+            let newBid = {
+              requestId: bid.impid,
+              cpm: (parseFloat(bid.price) || 0).toFixed(2),
+              width: bid.w,
+              height: bid.h,
+              creativeId: bid.crid || bid.id,
+              dealId: bid.dealid,
+              currency: respCur,
+              netRevenue: NET_REVENUE,
+              ttl: 300,
+              referrer: parsedReferrer,
+              ad: bid.adm,
+              partnerImpId: bid.id || '' // partner impression Id
+            };
+            if (parsedRequest.imp && parsedRequest.imp.length > 0) {
+              parsedRequest.imp.forEach(req => {
+                if (bid.impid === req.id) {
+                  _checkMediaType(bid.adm, newBid);
+                  switch (newBid.mediaType) {
+                    case BANNER:
+                      break;
+                    case VIDEO:
+                      break;
+                    case NATIVE:
+                      _parseNativeResponse(bid, newBid);
+                      break;
+                  }
+                }
+              });
+            }
+
+            newBid.meta = {};
+            if (bid.ext && bid.ext.dspid) {
+              newBid.meta.networkId = bid.ext.dspid;
+            }
+            if (bid.ext && bid.ext.advid) {
+              newBid.meta.buyerId = bid.ext.advid;
+            }
+            if (bid.adomain && bid.adomain.length > 0) {
+              newBid.meta.advertiserDomains = bid.adomain;
+              newBid.meta.clickUrl = bid.adomain[0];
+            }
+
+            // adserverTargeting
+            if (seatbidder.ext && seatbidder.ext.buyid) {
+              newBid.adserverTargeting = {
+                'hb_buyid_adtrue': seatbidder.ext.buyid
+              };
+            }
+
+            bidResponses.push(newBid);
+          });
+        });
+      }
+    } catch (error) {
+      utils.logError(error);
+    }
+    return bidResponses;
+  },
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
+    let syncurl = '' + publisherId;
+
+    if (gdprConsent) {
+      syncurl += '&gdpr=' + (gdprConsent.gdprApplies ? 1 : 0);
+      syncurl += '&gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || '');
+    }
+    if (uspConsent) {
+      syncurl += '&us_privacy=' + encodeURIComponent(uspConsent);
+    }
+
+    // coppa compliance
+    if (config.getConfig('coppa') === true) {
+      syncurl += '&coppa=1';
+    }
+
+    if (syncOptions.iframeEnabled) {
+      return [{
+        type: 'iframe',
+        url: USER_SYNC_URL_IFRAME + syncurl
+      }];
+    } else {
+      return [{
+        type: 'image',
+        url: USER_SYNC_URL_IMAGE + syncurl
+      }];
+    }
+  }
+};
+registerBidder(spec);
diff --git a/modules/adtrueBidAdapter.md b/modules/adtrueBidAdapter.md
new file mode 100644
index 00000000000..6d0c6f2c125
--- /dev/null
+++ b/modules/adtrueBidAdapter.md
@@ -0,0 +1,36 @@
+# Overview
+
+```
+Module Name: AdTrue Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: ssp@adtrue.com
+```
+
+# Description
+
+Connects to AdTrue exchange for bids.
+AdTrue bid adapter supports Banner currently.
+
+# Test Parameters
+```
+var adUnits = [
+  {
+    code: 'banner-div',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]]
+      }
+    },
+    bids: [
+      {
+          bidder: 'adtrue',
+          params: {
+              zoneId: '21423', // required, Zone Id provided by AdTrue
+              publisherId: '1491', // required, Publisher Id provided by AdTrue  
+              reserve: 0.1         // optional  
+          }
+      }
+    ]
+  }
+];
+```
diff --git a/test/spec/modules/adtrueBidAdapter_spec.js b/test/spec/modules/adtrueBidAdapter_spec.js
new file mode 100644
index 00000000000..a7732d6aeb7
--- /dev/null
+++ b/test/spec/modules/adtrueBidAdapter_spec.js
@@ -0,0 +1,370 @@
+import {expect} from 'chai'
+import {spec} from 'modules/adtrueBidAdapter.js'
+import {newBidder} from 'src/adapters/bidderFactory.js'
+import * as utils from '../../../src/utils.js';
+import {config} from 'src/config.js';
+
+describe('AdTrueBidAdapter', function () {
+  const adapter = newBidder(spec)
+  let bidRequests;
+  let bidResponses;
+  beforeEach(function () {
+    bidRequests = [
+      {
+        bidder: 'adtrue',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        params: {
+          publisherId: '1212',
+          zoneId: '21423',
+          reserve: 0.2
+        },
+        placementCode: 'adunit-code-1',
+        sizes: [[300, 250]],
+        bidId: '23acc48ad47af5',
+        requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+        bidderRequestId: '1c56ad30b9b8ca8',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+        schain: {
+          'ver': '1.0',
+          'complete': 1,
+          'nodes': [
+            {
+              'asi': 'indirectseller.com',
+              'sid': '00001',
+              'hp': 1
+            },
+
+            {
+              'asi': 'indirectseller-2.com',
+              'sid': '00002',
+              'hp': 2
+            }
+          ]
+        }
+      }
+    ];
+    bidResponses = {
+      'body': {
+        'id': '1610681506302',
+        'seatbid': [
+          {
+            'bid': [
+              {
+                'id': '1',
+                'impid': '201fb513ca24e9',
+                'price': 2.880000114440918,
+                'burl': 'https://hb.adtrue.com/prebid/win-notify?impid=1610681506302&wp=${AUCTION_PRICE}',
+                'adm': '<a href=\'https://adtrue.com?ref=pbjs\' target=\'_blank\'><img src=\'http://cdn.adtrue.com/img/prebid_sample_300x250.jpg?v=1.2\' style=\' width: 300px; \' /></a>',
+                'adid': '1610681506302',
+                'adomain': [
+                  'adtrue.com'
+                ],
+                'cid': 'f6l0r6n',
+                'crid': 'abc77au4',
+                'attr': [],
+                'w': 300,
+                'h': 250
+              }
+            ],
+            'seat': 'adtrue',
+            'group': 0
+          }
+        ],
+        'bidid': '1610681506302',
+        'cur': 'USD'
+      }
+    };
+  });
+
+  describe('.code', function () {
+    it('should return a bidder code of adtrue', function () {
+      expect(spec.code).to.equal('adtrue')
+    })
+  })
+
+  describe('inherited functions', function () {
+    it('should exist and be a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function')
+    })
+  })
+  describe('implementation', function () {
+    describe('Bid validations', function () {
+      it('valid bid case', function () {
+        let validBid = {
+            bidder: 'adtrue',
+            params: {
+              zoneId: '21423',
+              publisherId: '1212'
+            }
+          },
+          isValid = spec.isBidRequestValid(validBid);
+        expect(isValid).to.equal(true);
+      });
+      it('invalid bid case: publisherId not passed', function () {
+        let validBid = {
+            bidder: 'adtrue',
+            params: {
+              zoneId: '21423'
+            }
+          },
+          isValid = spec.isBidRequestValid(validBid);
+        expect(isValid).to.equal(false);
+      });
+      it('valid bid case: zoneId is not passed', function () {
+        let validBid = {
+            bidder: 'adtrue',
+            params: {
+              publisherId: '1212'
+            }
+          },
+          isValid = spec.isBidRequestValid(validBid);
+        expect(isValid).to.equal(false);
+      });
+      it('should return false if there are no params', () => {
+        const bid = {
+          'bidder': 'adtrue',
+          'adUnitCode': 'adunit-code',
+          'mediaTypes': {
+            banner: {
+              sizes: [[300, 250]]
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+      it('should return false if there is no publisherId param', () => {
+        const bid = {
+          'bidder': 'adtrue',
+          'adUnitCode': 'adunit-code',
+          params: {
+            zoneId: '21423',
+          },
+          'mediaTypes': {
+            banner: {
+              sizes: [[300, 250]]
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+      it('should return false if there is no zoneId param', () => {
+        const bid = {
+          'bidder': 'adtrue',
+          'adUnitCode': 'adunit-code',
+          params: {
+            publisherId: '1212',
+          },
+          'mediaTypes': {
+            banner: {
+              sizes: [[300, 250]]
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+      it('should return true if the bid is valid', () => {
+        const bid = {
+          'bidder': 'adtrue',
+          'adUnitCode': 'adunit-code',
+          params: {
+            zoneId: '21423',
+            publisherId: '1212',
+          },
+          'mediaTypes': {
+            banner: {
+              sizes: [[300, 250]]
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      });
+    });
+    describe('Request formation', function () {
+      it('buildRequests function should not modify original bidRequests object', function () {
+        let originalBidRequests = utils.deepClone(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        expect(bidRequests).to.deep.equal(originalBidRequests);
+      });
+
+      it('Endpoint/method checking', function () {
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        expect(request.url).to.equal('https://hb.adtrue.com/prebid/auction');
+        expect(request.method).to.equal('POST');
+      });
+
+      it('test flag not sent when adtrueTest=true is absent in page url', function () {
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.test).to.equal(undefined);
+      });
+      it('Request params check', function () {
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.at).to.equal(1); // auction  type
+        expect(data.cur[0]).to.equal('USD'); // currency
+        expect(data.site.domain).to.be.a('string'); // domain should be set
+        expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
+        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.source.tid).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.imp[0].id).to.equal(bidRequests[0].bidId); // Prebid bid id is passed as id
+        expect(data.imp[0].bidfloor).to.equal(bidRequests[0].params.reserve); // reverse
+        expect(data.imp[0].tagid).to.equal(bidRequests[0].params.zoneId); // zoneId
+        expect(data.imp[0].banner.w).to.equal(300); // width
+        expect(data.imp[0].banner.h).to.equal(250); // height
+        expect(data.source.ext.schain).to.deep.equal(bidRequests[0].schain);
+      });
+      it('Request params check with GDPR Consent', function () {
+        let bidRequest = {
+          gdprConsent: {
+            consentString: 'kjfdniwjnifwenrif3',
+            gdprApplies: true
+          }
+        };
+        let request = spec.buildRequests(bidRequests, bidRequest);
+        let data = JSON.parse(request.data);
+        expect(data.user.ext.consent).to.equal('kjfdniwjnifwenrif3');
+        expect(data.at).to.equal(1); // auction type
+        expect(data.cur[0]).to.equal('USD'); // currency
+        expect(data.site.domain).to.be.a('string'); // domain should be set
+        expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
+        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.source.tid).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.imp[0].id).to.equal(bidRequests[0].bidId); // Prebid bid id is passed as id
+        expect(data.imp[0].bidfloor).to.equal(parseFloat(bidRequests[0].params.reserve)); // reverse
+        expect(data.imp[0].tagid).to.equal(bidRequests[0].params.zoneId); // zoneId
+        expect(data.imp[0].banner.w).to.equal(300); // width
+        expect(data.imp[0].banner.h).to.equal(250); // height
+        expect(data.source.ext.schain).to.deep.equal(bidRequests[0].schain);
+      });
+      it('Request params check with USP/CCPA Consent', function () {
+        let bidRequest = {
+          uspConsent: '1NYN'
+        };
+        let request = spec.buildRequests(bidRequests, bidRequest);
+        let data = JSON.parse(request.data);
+        expect(data.regs.ext.us_privacy).to.equal('1NYN');// USP/CCPAs
+        expect(data.at).to.equal(1); // auction type
+        expect(data.cur[0]).to.equal('USD'); // currency
+        expect(data.site.domain).to.be.a('string'); // domain should be set
+        expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
+        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.source.tid).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.imp[0].id).to.equal(bidRequests[0].bidId); // Prebid bid id is passed as id
+        expect(data.imp[0].bidfloor).to.equal(parseFloat(bidRequests[0].params.reserve)); // reverse
+        expect(data.imp[0].tagid).to.equal(bidRequests[0].params.zoneId); // zoneId
+        expect(data.imp[0].banner.w).to.equal(300); // width
+        expect(data.imp[0].banner.h).to.equal(250); // height
+        expect(data.source.ext.schain).to.deep.equal(bidRequests[0].schain);
+      });
+
+      it('should NOT include coppa flag in bid request if coppa config is not present', () => {
+        const request = spec.buildRequests(bidRequests, {});
+        let data = JSON.parse(request.data);
+        if (data.regs) {
+          // in case GDPR is set then data.regs will exist
+          expect(data.regs.coppa).to.equal(undefined);
+        } else {
+          expect(data.regs).to.equal(undefined);
+        }
+      });
+      it('should include coppa flag in bid request if coppa is set to true', () => {
+        let sandbox = sinon.sandbox.create();
+        sandbox.stub(config, 'getConfig').callsFake(key => {
+          const config = {
+            'coppa': true
+          };
+          return config[key];
+        });
+        const request = spec.buildRequests(bidRequests, {});
+        let data = JSON.parse(request.data);
+        expect(data.regs.coppa).to.equal(1);
+        sandbox.restore();
+      });
+      it('should NOT include coppa flag in bid request if coppa is set to false', () => {
+        let sandbox = sinon.sandbox.create();
+        sandbox.stub(config, 'getConfig').callsFake(key => {
+          const config = {
+            'coppa': false
+          };
+          return config[key];
+        });
+        const request = spec.buildRequests(bidRequests, {});
+        let data = JSON.parse(request.data);
+        if (data.regs) {
+          // in case GDPR is set then data.regs will exist
+          expect(data.regs.coppa).to.equal(undefined);
+        } else {
+          expect(data.regs).to.equal(undefined);
+        }
+        sandbox.restore();
+      });
+    });
+  });
+  describe('Response checking', function () {
+    it('should check for valid response values', function () {
+      let request = spec.buildRequests(bidRequests, {
+        auctionId: 'new-auction-id'
+      });
+      let data = JSON.parse(request.data);
+      let response = spec.interpretResponse(bidResponses, request);
+      expect(response).to.be.an('array').with.length.above(0);
+      expect(response[0].requestId).to.equal(bidResponses.body.seatbid[0].bid[0].impid);
+      expect(response[0].width).to.equal(bidResponses.body.seatbid[0].bid[0].w);
+      expect(response[0].height).to.equal(bidResponses.body.seatbid[0].bid[0].h);
+      if (bidResponses.body.seatbid[0].bid[0].crid) {
+        expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].crid);
+      } else {
+        expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
+      }
+      expect(response[0].currency).to.equal('USD');
+      expect(response[0].ttl).to.equal(300);
+      expect(response[0].meta.clickUrl).to.equal('adtrue.com');
+      expect(response[0].meta.advertiserDomains[0]).to.equal('adtrue.com');
+      expect(response[0].ad).to.equal(bidResponses.body.seatbid[0].bid[0].adm);
+      expect(response[0].partnerImpId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
+    });
+  });
+  describe('getUserSyncs', function () {
+    let USER_SYNC_URL_IFRAME = 'https://hb.adtrue.com/prebid/usersync?t=iframe&p=1212';
+    let USER_SYNC_URL_IMAGE = 'https://hb.adtrue.com/prebid/usersync?t=img&p=1212';
+    let sandbox;
+    beforeEach(function () {
+      sandbox = sinon.sandbox.create();
+    });
+    afterEach(function () {
+      sandbox.restore();
+    });
+    it('execute as per config', function () {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, undefined, undefined)).to.deep.equal([{
+        type: 'iframe', url: USER_SYNC_URL_IFRAME
+      }]);
+      expect(spec.getUserSyncs({iframeEnabled: false}, {}, undefined, undefined)).to.deep.equal([{
+        type: 'image', url: USER_SYNC_URL_IMAGE
+      }]);
+    });
+  });
+});

From 90b2b61ad53c0b7a3596ad98beea4cb986a45f4a Mon Sep 17 00:00:00 2001
From: Filip Stamenkovic <ficadub@gmail.com>
Date: Tue, 19 Jan 2021 15:46:19 +0100
Subject: [PATCH 158/304] Waardex Bid Adapter: use find function from core-js
 (#6200)

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

diff --git a/modules/waardexBidAdapter.js b/modules/waardexBidAdapter.js
index a5ba4fb0298..1558ea39cd1 100644
--- a/modules/waardexBidAdapter.js
+++ b/modules/waardexBidAdapter.js
@@ -2,6 +2,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
 import * as utils from '../src/utils.js';
+import find from 'core-js-pure/features/array/find.js';
 
 const ENDPOINT = `https://hb.justbidit.xyz:8843/prebid`;
 const BIDDER_CODE = 'waardex';
@@ -182,7 +183,7 @@ const interpretResponse = (serverResponse, bidRequest) => {
 };
 
 const getHbRequestBid = (openRtbBid, bidRequest) => {
-  return bidRequest.bidRequests.find(x => x.bidId === openRtbBid.impid);
+  return find(bidRequest.bidRequests, x => x.bidId === openRtbBid.impid);
 };
 
 const getHbRequestMediaType = hbRequestBid => {

From 4faaf470d37dcdb32e8ef6b4f72b3e0a6680d3a3 Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Wed, 20 Jan 2021 06:28:43 -0800
Subject: [PATCH 159/304] Price Floors: use standard cpmAdjustment (#6194)

* use standard cpmAdjustment

* spaces
---
 modules/priceFloors.js                |  2 +-
 test/spec/modules/priceFloors_spec.js | 35 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/modules/priceFloors.js b/modules/priceFloors.js
index 7c8834c2ae2..3555fedbf3a 100644
--- a/modules/priceFloors.js
+++ b/modules/priceFloors.js
@@ -141,7 +141,7 @@ function generatePossibleEnumerations(arrayOfFields, delimiter) {
  * @summary If a the input bidder has a registered cpmadjustment it returns the input CPM after being adjusted
  */
 export function getBiddersCpmAdjustment(bidderName, inputCpm, bid = {}) {
-  const adjustmentFunction = utils.deepAccess(getGlobal(), `bidderSettings.${bidderName}.bidCpmAdjustment`);
+  const adjustmentFunction = utils.deepAccess(getGlobal(), `bidderSettings.${bidderName}.bidCpmAdjustment`) || utils.deepAccess(getGlobal(), 'bidderSettings.standard.bidCpmAdjustment');
   if (adjustmentFunction) {
     return parseFloat(adjustmentFunction(inputCpm, {...bid, cpm: inputCpm}));
   }
diff --git a/test/spec/modules/priceFloors_spec.js b/test/spec/modules/priceFloors_spec.js
index 984d6da1cb9..548d2789d3e 100644
--- a/test/spec/modules/priceFloors_spec.js
+++ b/test/spec/modules/priceFloors_spec.js
@@ -1316,6 +1316,41 @@ describe('the price floors module', function () {
           floor: 1.3334 // 1.3334 * 0.75 = 1.000005 which is the floor (we cut off getFloor at 4 decimal points)
         });
       });
+
+      it('should use standard cpmAdjustment if no bidder cpmAdjustment', function () {
+        getGlobal().bidderSettings = {
+          rubicon: {
+            bidCpmAdjustment: function (bidCpm, bidResponse) {
+              return bidResponse.cpm * 0.5;
+            },
+          },
+          standard: {
+            bidCpmAdjustment: function (bidCpm, bidResponse) {
+              return bidResponse.cpm * 0.75;
+            },
+          }
+        };
+        _floorDataForAuction[bidRequest.auctionId] = utils.deepClone(basicFloorConfig);
+        _floorDataForAuction[bidRequest.auctionId].data.values = { '*': 1.0 };
+        let appnexusBid = {
+          ...bidRequest,
+          bidder: 'appnexus'
+        };
+
+        // the conversion should be what the bidder would need to return in order to match the actual floor
+        // rubicon
+        expect(bidRequest.getFloor()).to.deep.equal({
+          currency: 'USD',
+          floor: 2.0 // a 2.0 bid after rubicons cpm adjustment would be 1.0 and thus is the floor after adjust
+        });
+
+        // appnexus
+        expect(appnexusBid.getFloor()).to.deep.equal({
+          currency: 'USD',
+          floor: 1.3334 // 1.3334 * 0.75 = 1.000005 which is the floor (we cut off getFloor at 4 decimal points)
+        });
+      });
+
       it('should work when cpmAdjust function uses bid object', function () {
         getGlobal().bidderSettings = {
           rubicon: {

From e33c62d652e1f7fde5d11cbc178724c709230e9c Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Wed, 20 Jan 2021 07:15:41 -0800
Subject: [PATCH 160/304] move wrapper details into wrapper object (#6184)

---
 modules/rubiconAnalyticsAdapter.js            |  8 +++--
 .../modules/rubiconAnalyticsAdapter_spec.js   | 32 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index 670adc9fe6d..c4d388f9277 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -162,13 +162,17 @@ function sendMessage(auctionId, bidWonId) {
   let message = {
     eventTimeMillis: Date.now(),
     integration: rubiConf.int_type || DEFAULT_INTEGRATION,
-    ruleId: rubiConf.rule_name,
     version: '$prebid.version$',
     referrerUri: referrer,
     referrerHostname: rubiconAdapter.referrerHostname || getHostNameFromReferer(referrer),
     channel: 'web',
-    wrapperName: rubiConf.wrapperName
   };
+  if (rubiConf.wrapperName || rubiConf.rule_name) {
+    message.wrapper = {
+      name: rubiConf.wrapperName,
+      rule: rubiConf.rule_name
+    }
+  }
   if (auctionCache && !auctionCache.sent) {
     let adUnitMap = Object.keys(auctionCache.bids).reduce((adUnits, bidId) => {
       let bid = auctionCache.bids[bidId];
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index 78792ff2ce7..ffa7dd3c810 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -532,7 +532,9 @@ const ANALYTICS_MESSAGE = {
       'bidwonStatus': 'success'
     }
   ],
-  'wrapperName': '10000_fakewrapper_test'
+  'wrapper': {
+    'name': '10000_fakewrapper_test'
+  }
 };
 
 function performStandardAuction(gptEvents) {
@@ -1678,6 +1680,34 @@ describe('rubicon analytics adapter', function () {
     });
   });
 
+  describe('wrapper details passed in', () => {
+    it('should correctly pass in the wrapper details if provided', () => {
+      config.setConfig({rubicon: {
+        wrapperName: '1001_wrapperName',
+        rule_name: 'na-mobile'
+      }});
+
+      rubiconAnalyticsAdapter.enableAnalytics({
+        options: {
+          endpoint: '//localhost:9999/event',
+          accountId: 1001
+        }
+      });
+
+      performStandardAuction();
+
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message.wrapper).to.deep.equal({
+        name: '1001_wrapperName',
+        rule: 'na-mobile'
+      });
+
+      rubiconAnalyticsAdapter.disableAnalytics();
+    });
+  });
+
   it('getHostNameFromReferer correctly grabs hostname from an input URL', function () {
     let inputUrl = 'https://www.prebid.org/some/path?pbjs_debug=true';
     expect(getHostNameFromReferer(inputUrl)).to.equal('www.prebid.org');

From 884b8145595f035114c7115983a0f5d2bc2942c7 Mon Sep 17 00:00:00 2001
From: Tucker <72400387+MenelikTucker-districtm@users.noreply.github.com>
Date: Wed, 20 Jan 2021 12:14:48 -0500
Subject: [PATCH 161/304] Fallback to utilize ad unit code if dmx id is not
 provide and increased TTL value (#6178)

* allow users to be sent to dmx even when gdpr is configured in prebid

* Change default ttl value

Change default ttl value for banner and video

* optional dmxid - fallback to use ad unit code

Co-authored-by: steve-a-districtm <56413795+steve-a-districtm@users.noreply.github.com>
---
 modules/districtmDMXBidAdapter.js                | 4 ++--
 test/spec/modules/districtmDmxBidAdapter_spec.js | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/districtmDMXBidAdapter.js b/modules/districtmDMXBidAdapter.js
index 60f6b9b64b1..b5969d4ed1e 100644
--- a/modules/districtmDMXBidAdapter.js
+++ b/modules/districtmDMXBidAdapter.js
@@ -22,7 +22,7 @@ export const spec = {
   supportedFormat: [BANNER, VIDEO],
   supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid(bid) {
-    return !!(bid.params.dmxid && bid.params.memberid);
+    return !!(bid.params.memberid);
   },
   interpretResponse(response, bidRequest) {
     response = response.body || {};
@@ -152,7 +152,7 @@ export const spec = {
     let tosendtags = bidRequest.map(dmx => {
       var obj = {};
       obj.id = dmx.bidId;
-      obj.tagid = String(dmx.params.dmxid);
+      obj.tagid = String(dmx.params.dmxid || dmx.adUnitCode);
       obj.secure = 1;
       obj.bidfloor = getFloor(dmx);
       if (dmx.mediaTypes && dmx.mediaTypes.video) {
diff --git a/test/spec/modules/districtmDmxBidAdapter_spec.js b/test/spec/modules/districtmDmxBidAdapter_spec.js
index 5d1f299dad5..90c18c6a84f 100644
--- a/test/spec/modules/districtmDmxBidAdapter_spec.js
+++ b/test/spec/modules/districtmDmxBidAdapter_spec.js
@@ -687,17 +687,16 @@ describe('DistrictM Adaptor', function () {
 
   describe(`isBidRequestValid test response`, function () {
     let params = {
-      dmxid: 10001,
+      dmxid: 10001, // optional
       memberid: 10003,
     };
     it(`function should return true`, function () {
       expect(districtm.isBidRequestValid({ params })).to.be.equal(true);
     });
     it(`function should return false`, function () {
-      expect(districtm.isBidRequestValid({ params: { memberid: 12345 } })).to.be.equal(false);
+      expect(districtm.isBidRequestValid({ params: {} })).to.be.equal(false);
     });
-    it(`expect to have two property available dmxid and memberid`, function () {
-      expect(params).to.have.property('dmxid');
+    it(`expect to have memberid`, function () {
       expect(params).to.have.property('memberid');
     });
   });

From 962d306533dfd70a1b777843e65194c7a80342ba Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Wed, 20 Jan 2021 09:26:15 -0800
Subject: [PATCH 162/304] Rubicon analytics Adapter: Add logic to send batched
 message when slots render (#6188)

* adding logic to wait for slots to render before message

* Test updates
---
 modules/rubiconAnalyticsAdapter.js            | 64 ++++++++++----
 .../modules/rubiconAnalyticsAdapter_spec.js   | 87 +++++++++++++++++--
 2 files changed, 123 insertions(+), 28 deletions(-)

diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index c4d388f9277..af5228b8b92 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -458,24 +458,45 @@ function updateRpaCookie() {
   return decodedRpaCookie;
 }
 
+const gamEventFunctions = {
+  'slotOnload': (auctionId, bid) => {
+    cache.auctions[auctionId].gamHasRendered[bid.adUnit.adUnitCode] = true;
+  },
+  'slotRenderEnded': (auctionId, bid, event) => {
+    if (event.isEmpty) {
+      cache.auctions[auctionId].gamHasRendered[bid.adUnit.adUnitCode] = true;
+    }
+    bid.adUnit.gam = utils.pick(event, [
+      // these come in as `null` from Gpt, which when stringified does not get removed
+      // so set explicitly to undefined when not a number
+      'advertiserId', advertiserId => utils.isNumber(advertiserId) ? advertiserId : undefined,
+      'creativeId', creativeId => utils.isNumber(creativeId) ? creativeId : undefined,
+      'lineItemId', lineItemId => utils.isNumber(lineItemId) ? lineItemId : undefined,
+      'adSlot', () => event.slot.getAdUnitPath(),
+      'isSlotEmpty', () => event.isEmpty || undefined
+    ]);
+  }
+}
+
 function subscribeToGamSlots() {
-  window.googletag.pubads().addEventListener('slotRenderEnded', event => {
-    const isMatchingAdSlot = utils.isAdUnitCodeMatchingSlot(event.slot);
-    // loop through auctions and adUnits and mark the info
-    Object.keys(cache.auctions).forEach(auctionId => {
-      (Object.keys(cache.auctions[auctionId].bids) || []).forEach(bidId => {
-        let bid = cache.auctions[auctionId].bids[bidId];
-        // if this slot matches this bids adUnit, add the adUnit info
-        if (isMatchingAdSlot(bid.adUnit.adUnitCode)) {
-          bid.adUnit.gam = utils.pick(event, [
-            // these come in as `null` from Gpt, which when stringified does not get removed
-            // so set explicitly to undefined when not a number
-            'advertiserId', advertiserId => utils.isNumber(advertiserId) ? advertiserId : undefined,
-            'creativeId', creativeId => utils.isNumber(creativeId) ? creativeId : undefined,
-            'lineItemId', lineItemId => utils.isNumber(lineItemId) ? lineItemId : undefined,
-            'adSlot', () => event.slot.getAdUnitPath(),
-            'isSlotEmpty', () => event.isEmpty || undefined
-          ]);
+  ['slotOnload', 'slotRenderEnded'].forEach(eventName => {
+    window.googletag.pubads().addEventListener(eventName, event => {
+      const isMatchingAdSlot = utils.isAdUnitCodeMatchingSlot(event.slot);
+      // loop through auctions and adUnits and mark the info
+      Object.keys(cache.auctions).forEach(auctionId => {
+        (Object.keys(cache.auctions[auctionId].bids) || []).forEach(bidId => {
+          let bid = cache.auctions[auctionId].bids[bidId];
+          // if this slot matches this bids adUnit, add the adUnit info
+          if (isMatchingAdSlot(bid.adUnit.adUnitCode)) {
+            // mark this adUnit as having been rendered by gam
+            gamEventFunctions[eventName](auctionId, bid, event);
+          }
+        });
+        // Now if all adUnits have gam rendered, send the payload
+        if (rubiConf.waitForGamSlots && !cache.auctions[auctionId].sent && Object.keys(cache.auctions[auctionId].gamHasRendered).every(adUnitCode => cache.auctions[auctionId].gamHasRendered[adUnitCode])) {
+          clearTimeout(cache.timeouts[auctionId]);
+          delete cache.timeouts[auctionId];
+          sendMessage.call(rubiconAdapter, auctionId);
         }
       });
     });
@@ -542,6 +563,7 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
         ]);
         cacheEntry.bids = {};
         cacheEntry.bidsWon = {};
+        cacheEntry.gamHasRendered = {};
         cacheEntry.referrer = utils.deepAccess(args, 'bidderRequests.0.refererInfo.referer');
         const floorData = utils.deepAccess(args, 'bidderRequests.0.bids.0.floorData');
         if (floorData) {
@@ -561,6 +583,10 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
           // mark adUnits we expect bidWon events for
           cache.auctions[args.auctionId].bidsWon[bid.adUnitCode] = false;
 
+          if (rubiConf.waitForGamSlots) {
+            cache.auctions[args.auctionId].gamHasRendered[bid.adUnitCode] = false;
+          }
+
           memo[bid.bidId] = utils.pick(bid, [
             'bidder', bidder => bidder.toLowerCase(),
             'bidId',
@@ -706,7 +732,7 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
         // check if this BID_WON missed the boat, if so send by itself
         if (auctionCache.sent === true) {
           sendMessage.call(this, args.auctionId, args.requestId);
-        } else if (Object.keys(auctionCache.bidsWon).reduce((memo, adUnitCode) => {
+        } else if (!rubiConf.waitForGamSlots && Object.keys(auctionCache.bidsWon).reduce((memo, adUnitCode) => {
           // only send if we've received bidWon events for all adUnits in auction
           memo = memo && auctionCache.bidsWon[adUnitCode];
           return memo;
@@ -721,7 +747,7 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
         // start timer to send batched payload just in case we don't hear any BID_WON events
         cache.timeouts[args.auctionId] = setTimeout(() => {
           sendMessage.call(this, args.auctionId);
-        }, SEND_TIMEOUT);
+        }, rubiConf.analyticsBatchTimeout || SEND_TIMEOUT);
         break;
       case BID_TIMEOUT:
         args.forEach(badBid => {
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index ffa7dd3c810..4bb2f6e217c 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -1359,12 +1359,13 @@ describe('rubicon analytics adapter', function () {
       });
     });
     describe('with googletag enabled', function () {
-      let gptSlot0, gptSlot1, gptEvent0, gptEvent1;
+      let gptSlot0, gptSlot1;
+      let gptSlotRenderEnded0, gptSlotRenderEnded1;
+      let gptslotOnload0, gptslotOnload1;
       beforeEach(function () {
         mockGpt.enable();
         gptSlot0 = mockGpt.makeSlot({code: '/19968336/header-bid-tag-0'});
-        gptSlot1 = mockGpt.makeSlot({code: '/19968336/header-bid-tag1'});
-        gptEvent0 = {
+        gptSlotRenderEnded0 = {
           eventName: 'slotRenderEnded',
           params: {
             slot: gptSlot0,
@@ -1374,7 +1375,19 @@ describe('rubicon analytics adapter', function () {
             lineItemId: 3333
           }
         };
-        gptEvent1 = {
+        gptslotOnload0 = {
+          eventName: 'slotOnload',
+          params: {
+            slot: gptSlot0,
+            isEmpty: false,
+            advertiserId: 1111,
+            creativeId: 2222,
+            lineItemId: 3333
+          }
+        };
+
+        gptSlot1 = mockGpt.makeSlot({code: '/19968336/header-bid-tag1'});
+        gptSlotRenderEnded1 = {
           eventName: 'slotRenderEnded',
           params: {
             slot: gptSlot1,
@@ -1384,6 +1397,16 @@ describe('rubicon analytics adapter', function () {
             lineItemId: 6666
           }
         };
+        gptslotOnload1 = {
+          eventName: 'slotOnload',
+          params: {
+            slot: gptSlot1,
+            isEmpty: false,
+            advertiserId: 1111,
+            creativeId: 2222,
+            lineItemId: 3333
+          }
+        };
       });
 
       afterEach(function () {
@@ -1391,7 +1414,7 @@ describe('rubicon analytics adapter', function () {
       });
 
       it('should add necessary gam information if gpt is enabled and slotRender event emmited', function () {
-        performStandardAuction([gptEvent0, gptEvent1]);
+        performStandardAuction([gptSlotRenderEnded0, gptSlotRenderEnded1]);
         expect(server.requests.length).to.equal(1);
         let request = server.requests[0];
         let message = JSON.parse(request.requestBody);
@@ -1414,7 +1437,7 @@ describe('rubicon analytics adapter', function () {
       });
 
       it('should handle empty gam renders', function () {
-        performStandardAuction([gptEvent0, {
+        performStandardAuction([gptSlotRenderEnded0, {
           eventName: 'slotRenderEnded',
           params: {
             slot: gptSlot1,
@@ -1441,7 +1464,7 @@ describe('rubicon analytics adapter', function () {
       });
 
       it('should still add gam ids if falsy', function () {
-        performStandardAuction([gptEvent0, {
+        performStandardAuction([gptSlotRenderEnded0, {
           eventName: 'slotRenderEnded',
           params: {
             slot: gptSlot1,
@@ -1472,14 +1495,60 @@ describe('rubicon analytics adapter', function () {
         expect(message).to.deep.equal(expectedMessage);
       });
 
-      it('should handle empty gam renders', function () {
-        performStandardAuction([gptEvent0, gptEvent1]);
+      it('should correctly set adUnit for associated slots', function () {
+        performStandardAuction([gptSlotRenderEnded0, gptSlotRenderEnded1]);
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.auctions[0].adUnits[0].gam = {
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        };
+        expectedMessage.auctions[0].adUnits[1].gam = {
+          advertiserId: 4444,
+          creativeId: 5555,
+          lineItemId: 6666,
+          adSlot: '/19968336/header-bid-tag1'
+        };
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should send request when waitForGamSlots is present but no bidWons are sent', function () {
+        config.setConfig({
+          rubicon: {
+            waitForGamSlots: true
+          }
+        });
+        events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+        events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+        events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+        events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
+        events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+        events.emit(AUCTION_END, MOCK.AUCTION_END);
+        events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+
+        // should not send if just slotRenderEnded is emmitted for both
+        mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+        mockGpt.emitEvent(gptSlotRenderEnded1.eventName, gptSlotRenderEnded1.params);
+
+        expect(server.requests.length).to.equal(0);
+
+        // now emit slotOnload and it should send
+        mockGpt.emitEvent(gptslotOnload0.eventName, gptslotOnload0.params);
+        mockGpt.emitEvent(gptslotOnload1.eventName, gptslotOnload1.params);
+
         expect(server.requests.length).to.equal(1);
         let request = server.requests[0];
         let message = JSON.parse(request.requestBody);
         validate(message);
 
         let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        delete expectedMessage.bidsWon; // should not be any of these
         expectedMessage.auctions[0].adUnits[0].gam = {
           advertiserId: 1111,
           creativeId: 2222,

From 0eedc8408b7c2c1e2b60afd1faee78cbec524fdd Mon Sep 17 00:00:00 2001
From: Eric Harper <eharper@rubiconproject.com>
Date: Wed, 20 Jan 2021 15:48:29 -0500
Subject: [PATCH 163/304] Prebid 4.0.23 Release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 57f7a629d19..0060952ab63 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.23.0-pre",
+  "version": "4.23.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 2a62f6ce298b21e39dd787dceedd157dc26cbd9b Mon Sep 17 00:00:00 2001
From: Eric Harper <eharper@rubiconproject.com>
Date: Wed, 20 Jan 2021 16:09:05 -0500
Subject: [PATCH 164/304] Increment pre version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0060952ab63..3169db867ce 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.23.0",
+  "version": "4.24.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 7877972235d264b0c0413288a3f32fb1972a1d7f Mon Sep 17 00:00:00 2001
From: Mike Marcus <mike@lotame.com>
Date: Thu, 21 Jan 2021 05:47:42 -0500
Subject: [PATCH 165/304] Lotame: added change to fall back to the TCF cookies
 when no data is present in the consentData object. (#6192)

---
 modules/lotamePanoramaIdSystem.js             |  19 +-
 .../modules/lotamePanoramaIdSystem_spec.js    | 174 +++++++++++++++++-
 2 files changed, 185 insertions(+), 8 deletions(-)

diff --git a/modules/lotamePanoramaIdSystem.js b/modules/lotamePanoramaIdSystem.js
index 9b3fc1f5019..8efbfd55bbd 100644
--- a/modules/lotamePanoramaIdSystem.js
+++ b/modules/lotamePanoramaIdSystem.js
@@ -192,11 +192,22 @@ export const lotamePanoramaIdSubmodule = {
         queryParams.fp = storedUserId;
       }
 
-      if (consentData && utils.isBoolean(consentData.gdprApplies)) {
-        queryParams.gdpr_applies = consentData.gdprApplies;
-        if (consentData.gdprApplies) {
-          queryParams.gdpr_consent = consentData.consentString;
+      let consentString;
+      if (consentData) {
+        if (utils.isBoolean(consentData.gdprApplies)) {
+          queryParams.gdpr_applies = consentData.gdprApplies;
         }
+        consentString = consentData.consentString;
+      }
+      // If no consent string, try to read it from 1st party cookies
+      if (!consentString) {
+        consentString = getFromStorage('eupubconsent-v2');
+      }
+      if (!consentString) {
+        consentString = getFromStorage('euconsent-v2');
+      }
+      if (consentString) {
+        queryParams.gdpr_consent = consentString;
       }
       const url = utils.buildUrl({
         protocol: 'https',
diff --git a/test/spec/modules/lotamePanoramaIdSystem_spec.js b/test/spec/modules/lotamePanoramaIdSystem_spec.js
index c6d3383374a..adefa56127a 100644
--- a/test/spec/modules/lotamePanoramaIdSystem_spec.js
+++ b/test/spec/modules/lotamePanoramaIdSystem_spec.js
@@ -440,10 +440,176 @@ describe('LotameId', function() {
     });
   });
 
-  it('should retrieve the id when decode is called', function() {
-    var id = lotamePanoramaIdSubmodule.decode('1234');
-    expect(id).to.be.eql({
-      'lotamePanoramaId': '1234'
+  describe('when gdpr applies and falls back to eupubconsent cookie', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+    let consentData = {
+      gdprApplies: true,
+      consentString: undefined
+    };
+
+    beforeEach(function () {
+      getCookieStub
+        .withArgs('eupubconsent-v2')
+        .returns('consentGiven');
+
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}, consentData).callback;
+      submoduleCallback(callBackSpy);
+
+      // the contents of the response don't matter for this
+      request = server.requests[0];
+      request.respond(200, responseHeader, '');
+    });
+
+    it('should call the remote server when getId is called', function () {
+      expect(callBackSpy.calledOnce).to.be.true;
+    });
+
+    it('should pass the gdpr consent string back', function() {
+      expect(request.url).to.be.eq(
+        'https://id.crwdcntrl.net/id?gdpr_applies=true&gdpr_consent=consentGiven'
+      );
+    });
+  });
+
+  describe('when gdpr applies and falls back to euconsent cookie', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+    let consentData = {
+      gdprApplies: true,
+      consentString: undefined
+    };
+
+    beforeEach(function () {
+      getCookieStub
+        .withArgs('euconsent-v2')
+        .returns('consentGiven');
+
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}, consentData).callback;
+      submoduleCallback(callBackSpy);
+
+      // the contents of the response don't matter for this
+      request = server.requests[0];
+      request.respond(200, responseHeader, '');
+    });
+
+    it('should call the remote server when getId is called', function () {
+      expect(callBackSpy.calledOnce).to.be.true;
+    });
+
+    it('should pass the gdpr consent string back', function() {
+      expect(request.url).to.be.eq(
+        'https://id.crwdcntrl.net/id?gdpr_applies=true&gdpr_consent=consentGiven'
+      );
+    });
+  });
+
+  describe('when gdpr applies but no consent string is available', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+    let consentData = {
+      gdprApplies: true,
+      consentString: undefined
+    };
+
+    beforeEach(function () {
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}, consentData).callback;
+      submoduleCallback(callBackSpy);
+
+      // the contents of the response don't matter for this
+      request = server.requests[0];
+      request.respond(200, responseHeader, '');
+    });
+
+    it('should call the remote server when getId is called', function () {
+      expect(callBackSpy.calledOnce).to.be.true;
+    });
+
+    it('should not include the gdpr consent string on the url', function() {
+      expect(request.url).to.be.eq(
+        'https://id.crwdcntrl.net/id?gdpr_applies=true'
+      );
+    });
+  });
+
+  describe('when no consentData and falls back to eupubconsent cookie', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+    let consentData;
+
+    beforeEach(function () {
+      getCookieStub
+        .withArgs('eupubconsent-v2')
+        .returns('consentGiven');
+
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}, consentData).callback;
+      submoduleCallback(callBackSpy);
+
+      // the contents of the response don't matter for this
+      request = server.requests[0];
+      request.respond(200, responseHeader, '');
+    });
+
+    it('should call the remote server when getId is called', function () {
+      expect(callBackSpy.calledOnce).to.be.true;
+    });
+
+    it('should pass the gdpr consent string back', function() {
+      expect(request.url).to.be.eq(
+        'https://id.crwdcntrl.net/id?gdpr_consent=consentGiven'
+      );
+    });
+  });
+
+  describe('when no consentData and falls back to euconsent cookie', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+    let consentData;
+
+    beforeEach(function () {
+      getCookieStub
+        .withArgs('euconsent-v2')
+        .returns('consentGiven');
+
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}, consentData).callback;
+      submoduleCallback(callBackSpy);
+
+      // the contents of the response don't matter for this
+      request = server.requests[0];
+      request.respond(200, responseHeader, '');
+    });
+
+    it('should call the remote server when getId is called', function () {
+      expect(callBackSpy.calledOnce).to.be.true;
+    });
+
+    it('should pass the gdpr consent string back', function() {
+      expect(request.url).to.be.eq(
+        'https://id.crwdcntrl.net/id?gdpr_consent=consentGiven'
+      );
+    });
+  });
+
+  describe('when no consentData and no cookies', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+    let consentData;
+
+    beforeEach(function () {
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}, consentData).callback;
+      submoduleCallback(callBackSpy);
+
+      // the contents of the response don't matter for this
+      request = server.requests[0];
+      request.respond(200, responseHeader, '');
+    });
+
+    it('should call the remote server when getId is called', function () {
+      expect(callBackSpy.calledOnce).to.be.true;
+    });
+
+    it('should pass the gdpr consent string back', function() {
+      expect(request.url).to.be.eq('https://id.crwdcntrl.net/id');
     });
   });
 });

From e8b8be53bbadb8e5d8e2666c6f09a2eeb46e4539 Mon Sep 17 00:00:00 2001
From: Mark <markaconrad@users.noreply.github.com>
Date: Thu, 21 Jan 2021 11:31:16 -0500
Subject: [PATCH 166/304] Lotame panorama id system updates (#6187)

* Add the root domain check method as a global method added for use modules

* Add a date suffix to keep the test cookie random

* Per review, moved the findRootDomain method to utils out of the userId modules

* More the domain method back the user module but attach it to the submodule so that userId modules can have access to it

* Remove the storageManager as it is no longer used in utils

* lotamePanoramaIdSubmodule: Add root cookie domain to all cookie writes

* lotamePanoramaIdSubmodule: Don't update profile id storage for a particular error

* lotamePanoramaIdSystem: Switch to indexOf instead of includes to support IE 11
---
 modules/lotamePanoramaIdSystem.js             |  40 +++++--
 .../modules/lotamePanoramaIdSystem_spec.js    | 113 ++++++++++++++++++
 2 files changed, 146 insertions(+), 7 deletions(-)

diff --git a/modules/lotamePanoramaIdSystem.js b/modules/lotamePanoramaIdSystem.js
index 8efbfd55bbd..6d36687b4e8 100644
--- a/modules/lotamePanoramaIdSystem.js
+++ b/modules/lotamePanoramaIdSystem.js
@@ -16,9 +16,11 @@ const MODULE_NAME = 'lotamePanoramaId';
 const NINE_MONTHS_MS = 23328000 * 1000;
 const DAYS_TO_CACHE = 7;
 const DAY_MS = 60 * 60 * 24 * 1000;
+const MISSING_CORE_CONSENT = 111;
 const GVLID = 95;
 
 export const storage = getStorageManager(GVLID, MODULE_NAME);
+let cookieDomain;
 
 /**
  * Set the Lotame First Party Profile ID in the first party namespace
@@ -27,7 +29,14 @@ export const storage = getStorageManager(GVLID, MODULE_NAME);
 function setProfileId(profileId) {
   if (storage.cookiesAreEnabled()) {
     let expirationDate = new Date(utils.timestamp() + NINE_MONTHS_MS).toUTCString();
-    storage.setCookie(KEY_PROFILE, profileId, expirationDate, 'Lax', undefined, undefined);
+    storage.setCookie(
+      KEY_PROFILE,
+      profileId,
+      expirationDate,
+      'Lax',
+      cookieDomain,
+      undefined
+    );
   }
   if (storage.hasLocalStorage()) {
     storage.setDataInLocalStorage(KEY_PROFILE, profileId, undefined);
@@ -89,7 +98,7 @@ function saveLotameCache(
         value,
         expirationDate,
         'Lax',
-        undefined,
+        cookieDomain,
         undefined
       );
     }
@@ -116,7 +125,7 @@ function getLotameLocalCache() {
   try {
     const rawExpiry = getFromStorage(KEY_EXPIRY);
     if (utils.isStr(rawExpiry)) {
-      cache.expiryTimestampMs = parseInt(rawExpiry, 0);
+      cache.expiryTimestampMs = parseInt(rawExpiry, 10);
     }
   } catch (error) {
     utils.logError(error);
@@ -133,7 +142,14 @@ function clearLotameCache(key) {
   if (key) {
     if (storage.cookiesAreEnabled()) {
       let expirationDate = new Date(0).toUTCString();
-      storage.setCookie(key, '', expirationDate, 'Lax', undefined, undefined);
+      storage.setCookie(
+        key,
+        '',
+        expirationDate,
+        'Lax',
+        cookieDomain,
+        undefined
+      );
     }
     if (storage.hasLocalStorage()) {
       storage.removeDataFromLocalStorage(key, undefined);
@@ -174,6 +190,7 @@ export const lotamePanoramaIdSubmodule = {
    * @returns {IdResponse|undefined}
    */
   getId(config, consentData, cacheIdObj) {
+    cookieDomain = lotamePanoramaIdSubmodule.findRootDomain();
     let localCache = getLotameLocalCache();
 
     let refreshNeeded = Date.now() > localCache.expiryTimestampMs;
@@ -222,10 +239,17 @@ export const lotamePanoramaIdSubmodule = {
           if (response) {
             try {
               let responseObj = JSON.parse(response);
-              saveLotameCache(KEY_EXPIRY, responseObj.expiry_ts);
+              const shouldUpdateProfileId = !(
+                utils.isArray(responseObj.errors) &&
+                responseObj.errors.indexOf(MISSING_CORE_CONSENT) !== -1
+              );
+
+              saveLotameCache(KEY_EXPIRY, responseObj.expiry_ts, responseObj.expiry_ts);
 
               if (utils.isStr(responseObj.profile_id)) {
-                setProfileId(responseObj.profile_id);
+                if (shouldUpdateProfileId) {
+                  setProfileId(responseObj.profile_id);
+                }
 
                 if (utils.isStr(responseObj.core_id)) {
                   saveLotameCache(
@@ -238,7 +262,9 @@ export const lotamePanoramaIdSubmodule = {
                   clearLotameCache(KEY_ID);
                 }
               } else {
-                clearLotameCache(KEY_PROFILE);
+                if (shouldUpdateProfileId) {
+                  clearLotameCache(KEY_PROFILE);
+                }
                 clearLotameCache(KEY_ID);
               }
             } catch (error) {
diff --git a/test/spec/modules/lotamePanoramaIdSystem_spec.js b/test/spec/modules/lotamePanoramaIdSystem_spec.js
index adefa56127a..5bbec1ec26f 100644
--- a/test/spec/modules/lotamePanoramaIdSystem_spec.js
+++ b/test/spec/modules/lotamePanoramaIdSystem_spec.js
@@ -612,4 +612,117 @@ describe('LotameId', function() {
       expect(request.url).to.be.eq('https://id.crwdcntrl.net/id');
     });
   });
+
+  describe('with an empty cache, ignore profile id for error 111', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+
+    beforeEach(function () {
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}).callback;
+      submoduleCallback(callBackSpy);
+
+      request = server.requests[0];
+
+      request.respond(
+        200,
+        responseHeader,
+        JSON.stringify({
+          profile_id: '4ec137245858469eb94a4e248f238694',
+          expiry_ts: 10,
+          errors: [111],
+          core_id:
+            'ca22992567e3cd4d116a5899b88a55d0d857a23610db939ae6ac13ba2335d87a',
+        })
+      );
+    });
+
+    it('should not save the first party id', function () {
+      sinon.assert.neverCalledWith(
+        setLocalStorageStub,
+        '_cc_id',
+        '4ec137245858469eb94a4e248f238694'
+      );
+      sinon.assert.neverCalledWith(
+        setCookieStub,
+        '_cc_id',
+        '4ec137245858469eb94a4e248f238694'
+      );
+    });
+
+    it('should save the expiry', function () {
+      sinon.assert.calledWith(setLocalStorageStub, 'panoramaId_expiry', 10);
+
+      sinon.assert.calledWith(setCookieStub, 'panoramaId_expiry', 10);
+    });
+
+    it('should save the id', function () {
+      sinon.assert.calledWith(
+        setLocalStorageStub,
+        'panoramaId',
+        'ca22992567e3cd4d116a5899b88a55d0d857a23610db939ae6ac13ba2335d87a'
+      );
+
+      sinon.assert.calledWith(
+        setCookieStub,
+        'panoramaId',
+        'ca22992567e3cd4d116a5899b88a55d0d857a23610db939ae6ac13ba2335d87a'
+      );
+    });
+  });
+
+  describe('receives an optout request with an error 111', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+
+    beforeEach(function () {
+      getCookieStub.withArgs('panoramaId_expiry').returns('1000');
+      getCookieStub
+        .withArgs('panoramaId')
+        .returns(
+          'ca22992567e3cd4d116a5899b88a55d0d857a23610db939ae6ac13ba2335d87d'
+        );
+
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}).callback;
+      submoduleCallback(callBackSpy);
+
+      request = server.requests[0];
+
+      request.respond(
+        200,
+        responseHeader,
+        JSON.stringify({
+          errors: [111],
+          expiry_ts: Date.now() + 30 * 24 * 60 * 60 * 1000,
+        })
+      );
+    });
+
+    it('should call the remote server when getId is called', function () {
+      expect(callBackSpy.calledOnce).to.be.true;
+    });
+
+    it('should clear the panorama id', function () {
+      sinon.assert.calledWith(removeFromLocalStorageStub, 'panoramaId');
+
+      sinon.assert.calledWith(
+        setCookieStub,
+        'panoramaId',
+        '',
+        'Thu, 01 Jan 1970 00:00:00 GMT',
+        'Lax'
+      );
+    });
+
+    it('should not clear the profile id', function () {
+      sinon.assert.neverCalledWith(removeFromLocalStorageStub, '_cc_id');
+
+      sinon.assert.neverCalledWith(
+        setCookieStub,
+        '_cc_id',
+        '',
+        'Thu, 01 Jan 1970 00:00:00 GMT',
+        'Lax'
+      );
+    });
+  });
 });

From 6fc10173dd4ff2872ed39b6cf92b5ecfccf04e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rok=20Su=C5=A1nik?= <rsusnik@outbrain.com>
Date: Thu, 21 Jan 2021 22:37:24 +0100
Subject: [PATCH 167/304] support outbrain alias in zemanta adapter (#6203)

---
 modules/zemantaBidAdapter.js                |  7 +++---
 test/spec/modules/zemantaBidAdapter_spec.js | 28 +++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/modules/zemantaBidAdapter.js b/modules/zemantaBidAdapter.js
index aa7a24985e0..d0ac64e48e4 100644
--- a/modules/zemantaBidAdapter.js
+++ b/modules/zemantaBidAdapter.js
@@ -23,10 +23,11 @@ const NATIVE_PARAMS = {
 
 export const spec = {
   code: BIDDER_CODE,
+  aliases: ['outbrain'],
   supportedMediaTypes: [ NATIVE, BANNER ],
   isBidRequestValid: (bid) => {
     return (
-      !!config.getConfig('zemanta.bidderUrl') &&
+      (!!config.getConfig('zemanta.bidderUrl') || !!config.getConfig('outbrain.bidderUrl')) &&
       !!utils.deepAccess(bid, 'params.publisher.id') &&
       !!(bid.nativeParams || bid.sizes)
     );
@@ -37,7 +38,7 @@ export const spec = {
     const test = setOnAny(validBidRequests, 'params.test');
     const publisher = setOnAny(validBidRequests, 'params.publisher');
     const cur = CURRENCY;
-    const endpointUrl = config.getConfig('zemanta.bidderUrl');
+    const endpointUrl = config.getConfig('zemanta.bidderUrl') || config.getConfig('outbrain.bidderUrl');
     const timeout = bidderRequest.timeout;
 
     const imps = validBidRequests.map((bid, id) => {
@@ -136,7 +137,7 @@ export const spec = {
   },
   getUserSyncs: (syncOptions) => {
     const syncs = [];
-    const syncUrl = config.getConfig('zemanta.usersyncUrl');
+    const syncUrl = config.getConfig('zemanta.usersyncUrl') || config.getConfig('outbrain.usersyncUrl');
     if (syncOptions.pixelEnabled && syncUrl) {
       syncs.push({
         type: 'image',
diff --git a/test/spec/modules/zemantaBidAdapter_spec.js b/test/spec/modules/zemantaBidAdapter_spec.js
index ab685890620..0284abd41fd 100644
--- a/test/spec/modules/zemantaBidAdapter_spec.js
+++ b/test/spec/modules/zemantaBidAdapter_spec.js
@@ -99,6 +99,24 @@ describe('Zemanta Adapter', function () {
         }
         expect(spec.isBidRequestValid(bid)).to.equal(false)
       })
+      it('should succeed with outbrain config', function () {
+        const bid = {
+          bidder: 'zemanta',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...nativeBidRequestParams,
+        }
+        config.resetConfig()
+        config.setConfig({
+          outbrain: {
+            bidderUrl: 'https://bidder-url.com',
+          }
+        })
+        expect(spec.isBidRequestValid(bid)).to.equal(true)
+      })
       it('should fail if bidder url is not set', function () {
         const bid = {
           bidder: 'zemanta',
@@ -460,6 +478,16 @@ describe('Zemanta Adapter', function () {
       const ret = spec.getUserSyncs({pixelEnabled: true})
       expect(ret).to.deep.equal([{type: 'image', url: 'https://usersync-url.com'}])
     })
+    it('should return user sync if pixel enabled with outbrain config', function () {
+      config.resetConfig()
+      config.setConfig({
+        outbrain: {
+          usersyncUrl: 'https://usersync-url.com',
+        }
+      })
+      const ret = spec.getUserSyncs({pixelEnabled: true})
+      expect(ret).to.deep.equal([{type: 'image', url: 'https://usersync-url.com'}])
+    })
 
     it('should not return user sync if pixel disabled', function () {
       const ret = spec.getUserSyncs({pixelEnabled: false})

From a72109e605ab57e19238a5c512e562c580bf4d9a Mon Sep 17 00:00:00 2001
From: BertiBauer <14088844+BertiBauer@users.noreply.github.com>
Date: Thu, 21 Jan 2021 22:46:10 +0100
Subject: [PATCH 168/304] Yieldlab Adapter: Change URI of outstream renderer
 (#6211)

* Change OUTSTREAMPLAYER_URL

* Change OUTSTREAMPLAYER_URL
---
 modules/yieldlabBidAdapter.js                | 2 +-
 test/spec/modules/yieldlabBidAdapter_spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/yieldlabBidAdapter.js b/modules/yieldlabBidAdapter.js
index f36e3a8257b..9c1c54cfb2b 100644
--- a/modules/yieldlabBidAdapter.js
+++ b/modules/yieldlabBidAdapter.js
@@ -8,7 +8,7 @@ const ENDPOINT = 'https://ad.yieldlab.net'
 const BIDDER_CODE = 'yieldlab'
 const BID_RESPONSE_TTL_SEC = 300
 const CURRENCY_CODE = 'EUR'
-const OUTSTREAMPLAYER_URL = 'https://ad2.movad.net/dynamic.ad?a=o193092&ma_loadEvent=ma-start-event'
+const OUTSTREAMPLAYER_URL = 'https://ad.adition.com/dynamic.ad?a=o193092&ma_loadEvent=ma-start-event'
 
 export const spec = {
   code: BIDDER_CODE,
diff --git a/test/spec/modules/yieldlabBidAdapter_spec.js b/test/spec/modules/yieldlabBidAdapter_spec.js
index 72f70ca0208..6dde671578c 100644
--- a/test/spec/modules/yieldlabBidAdapter_spec.js
+++ b/test/spec/modules/yieldlabBidAdapter_spec.js
@@ -257,7 +257,7 @@ describe('yieldlabBidAdapter', function () {
       const result = spec.interpretResponse({body: [VIDEO_RESPONSE]}, {validBidRequests: [OUTSTREAM_REQUEST], queryParams: REQPARAMS})
 
       expect(result[0].renderer.id).to.equal('2d925f27f5079f')
-      expect(result[0].renderer.url).to.equal('https://ad2.movad.net/dynamic.ad?a=o193092&ma_loadEvent=ma-start-event')
+      expect(result[0].renderer.url).to.equal('https://ad.adition.com/dynamic.ad?a=o193092&ma_loadEvent=ma-start-event')
       expect(result[0].width).to.equal(640)
       expect(result[0].height).to.equal(480)
     })

From a79d7d867a424e91643ed2914224fa2f2127a057 Mon Sep 17 00:00:00 2001
From: bjorn-lw <32431346+bjorn-lw@users.noreply.github.com>
Date: Thu, 21 Jan 2021 23:12:25 +0100
Subject: [PATCH 169/304] Livewrapped: GVL id (#6208)

* Livewrapped bid and analytics adapter

* Fixed some tests for browser compatibility

* Fixed some tests for browser compatibility

* Changed analytics adapter code name

* Fix double quote in debug message

* modified how gdpr is being passed

* Added support for Publisher Common ID Module

* Corrections for ttr in analytics

* ANalytics updates

* Auction start time stamp changed

* Detect recovered ad blocked requests
Make it possible to pass dynamic parameters to adapter

* Collect info on ad units receiving any valid bid

* Support for ID5
Pass metadata from adapter

* Typo in test + eids on wrong level

* Fix for Prebid 3.0

* Fix get referer

* http -> https in tests

* Native support

* Read sizes from mediatype.banner

* Revert accidental commit

* Support native data collection + minor refactorings

* Set analytics endpoint

* Support for app parameters

* Fix issue where adunits with bids were not counted on reload

* Send debug info from adapter to external debugger

* SChain support

* Send GDPR data in analytics request

* video support

Video support

* Report back floor via analytic

* Send auction id and adunit/bidder connection id

* Criteo id support

* Updated example

* livewrapped Analytics Adapter info file

* Livewrapped gvlid
---
 modules/livewrappedBidAdapter.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/livewrappedBidAdapter.js b/modules/livewrappedBidAdapter.js
index 512fc775d95..f3e9709cd11 100644
--- a/modules/livewrappedBidAdapter.js
+++ b/modules/livewrappedBidAdapter.js
@@ -14,6 +14,7 @@ const VERSION = '1.4';
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, NATIVE, VIDEO],
+  gvlid: 919,
 
   /**
    * Determines whether or not the given bid request is valid.

From 892fd938c5d9134d12470bf69b33310a322c9167 Mon Sep 17 00:00:00 2001
From: Kajan Umakanthan <umakajan@umakajan.com>
Date: Thu, 21 Jan 2021 14:53:46 -0800
Subject: [PATCH 170/304] IX Bid Adapter: Multiformat support, video adunit
 param, IXdiags (#6177)

* Multiformat support, video adunit param, IXdiags

* Lint fixing

* IE fix [cant handle includes]

* updated ixdiag count and validation logic

Co-authored-by: Ix-Prebid-Support <ix-prebid-support@indexexchange.com>
---
 modules/ixBidAdapter.js                | 135 ++++++++++++++--
 modules/ixBidAdapter.md                |   2 +-
 test/spec/modules/ixBidAdapter_spec.js | 208 ++++++++++++++++++++++++-
 3 files changed, 328 insertions(+), 17 deletions(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index cb37e4735c5..97341fbfd78 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -44,12 +44,20 @@ function bidToBannerImp(bid) {
  */
 function bidToVideoImp(bid) {
   const imp = bidToImp(bid);
+  const videoAdUnitRef = utils.deepAccess(bid, 'mediaTypes.video');
+  const context = utils.deepAccess(bid, 'mediaTypes.video.context');
+  const videoAdUnitWhitelist = [
+    'mimes', 'minduration', 'maxduration', 'protocols', 'protocol',
+    'startdelay', 'placement', 'linearity', 'skip', 'skipmin',
+    'skipafter', 'sequence', 'battr', 'maxextended', 'minbitrate',
+    'maxbitrate', 'boxingallowed', 'playbackmethod', 'playbackend',
+    'delivery', 'pos', 'companionad', 'api', 'companiontype', 'ext'
+  ];
 
   imp.video = utils.deepClone(bid.params.video)
   imp.video.w = bid.params.size[0];
   imp.video.h = bid.params.size[1];
 
-  const context = utils.deepAccess(bid, 'mediaTypes.video.context');
   if (context) {
     if (context === 'instream') {
       imp.video.placement = 1;
@@ -60,6 +68,12 @@ function bidToVideoImp(bid) {
     }
   }
 
+  for (let adUnitProperty in videoAdUnitRef) {
+    if (videoAdUnitWhitelist.indexOf(adUnitProperty) !== -1 && !imp.video.hasOwnProperty(adUnitProperty)) {
+      imp.video[adUnitProperty] = videoAdUnitRef[adUnitProperty];
+    }
+  }
+
   return imp;
 }
 
@@ -285,6 +299,12 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
   r.ext.source = 'prebid';
   r.ext.ixdiag = {};
 
+  // getting ixdiags for adunits of the video, outstream & multi format (MF) style
+  let ixdiag = buildIXDiag(validBidRequests);
+  for (var key in ixdiag) {
+    r.ext.ixdiag[key] = ixdiag[key];
+  }
+
   // if an schain is provided, send it along
   if (validBidRequests[0].schain) {
     r.source = {
@@ -382,7 +402,7 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
     data: payload
   };
 
-  const BASE_REQ_SIZE = new Blob([`${request.url}${utils.parseQueryStringParameters({...request.data, r: JSON.stringify(r)})}`]).size;
+  const BASE_REQ_SIZE = new Blob([`${request.url}${utils.parseQueryStringParameters({ ...request.data, r: JSON.stringify(r) })}`]).size;
   let currReqSize = BASE_REQ_SIZE;
 
   const MAX_REQ_SIZE = 8000;
@@ -466,6 +486,66 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
 
   return requests;
 }
+
+/**
+ * Calculates IX diagnostics values and packages them into an object
+ *
+ * @param {array} validBidRequests  The valid bid requests from prebid
+ * @return {Object} IX diag values for ad units
+ */
+function buildIXDiag(validBidRequests) {
+  var adUnitMap = validBidRequests
+    .map(bidRequest => bidRequest.transactionId)
+    .filter((value, index, arr) => arr.indexOf(value) === index)
+
+  var ixdiag = {
+    mfu: 0,
+    bu: 0,
+    iu: 0,
+    nu: 0,
+    ou: 0,
+    allU: 0,
+    ren: false
+  };
+
+  // create ad unit map and collect the required diag properties
+  for (let i = 0; i < adUnitMap.length; i++) {
+    var bid = validBidRequests.filter(bidRequest => bidRequest.transactionId === adUnitMap[i])[0];
+
+    if (utils.deepAccess(bid, 'mediaTypes')) {
+      if (Object.keys(bid.mediaTypes).length > 1) {
+        ixdiag.mfu++;
+      }
+
+      if (utils.deepAccess(bid, 'mediaTypes.native')) {
+        ixdiag.nu++;
+      }
+
+      if (utils.deepAccess(bid, 'mediaTypes.banner')) {
+        ixdiag.bu++;
+      }
+
+      if (utils.deepAccess(bid, 'mediaTypes.video.context') === 'outstream') {
+        ixdiag.ou++;
+        // renderer only needed for outstream
+
+        const hasRenderer = typeof (utils.deepAccess(bid, 'renderer') || utils.deepAccess(bid, 'mediaTypes.video.renderer')) === 'object';
+
+        // if any one ad unit is missing renderer, set ren status to false in diag
+        ixdiag.ren = ixdiag.ren && hasRenderer ? (utils.deepAccess(ixdiag, 'ren')) : hasRenderer;
+      }
+
+      if (utils.deepAccess(bid, 'mediaTypes.video.context') === 'instream') {
+        ixdiag.iu++;
+      }
+
+      ixdiag.allU++;
+    }
+  }
+
+  return ixdiag;
+}
+
 /**
  *
  * @param {Object} impressions containing ixImps and possibly missingImps
@@ -525,7 +605,8 @@ function updateMissingSizes(validBidRequest, missingBannerSizes, imp) {
     if (utils.deepAccess(validBidRequest, 'mediaTypes.banner.sizes')) {
       let sizeList = utils.deepClone(validBidRequest.mediaTypes.banner.sizes);
       removeFromSizes(sizeList, validBidRequest.params.size);
-      let newAdUnitEntry = { 'missingSizes': sizeList,
+      let newAdUnitEntry = {
+        'missingSizes': sizeList,
         'impression': imp
       };
       missingBannerSizes[transactionID] = newAdUnitEntry;
@@ -560,32 +641,57 @@ export const spec = {
    * @return {boolean}     True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: function (bid) {
+    const paramsVideoRef = utils.deepAccess(bid, 'params.video');
+    const paramsSize = utils.deepAccess(bid, 'params.size');
+    const mediaTypeBannerSizes = utils.deepAccess(bid, 'mediaTypes.banner.sizes');
+    const mediaTypeVideoRef = utils.deepAccess(bid, 'mediaTypes.video');
+    const mediaTypeVideoPlayerSize = utils.deepAccess(bid, 'mediaTypes.video.playerSize');
+    const hasBidFloor = bid.params.hasOwnProperty('bidFloor');
+    const hasBidFloorCur = bid.params.hasOwnProperty('bidFloorCur');
+
     if (!isValidSize(bid.params.size)) {
       utils.logError('ix bidder params: bid size has invalid format.');
       return false;
     }
 
-    if (!includesSize(bid.sizes, bid.params.size)) {
-      utils.logError('ix bidder params: bid size is not included in ad unit sizes.');
+    if (bid.hasOwnProperty('mediaType') && !(utils.contains(SUPPORTED_AD_TYPES, bid.mediaType))) {
       return false;
     }
 
-    if (bid.hasOwnProperty('mediaType') && !(utils.contains(SUPPORTED_AD_TYPES, bid.mediaType))) {
+    if (bid.hasOwnProperty('mediaTypes') && !(mediaTypeBannerSizes || mediaTypeVideoPlayerSize)) {
       return false;
     }
 
-    if (bid.hasOwnProperty('mediaTypes') && !(utils.deepAccess(bid, 'mediaTypes.banner.sizes') || utils.deepAccess(bid, 'mediaTypes.video.playerSize'))) {
+    if (!includesSize(bid.sizes, paramsSize) && !((mediaTypeVideoPlayerSize && includesSize(mediaTypeVideoPlayerSize, paramsSize)) ||
+     (mediaTypeBannerSizes && includesSize(mediaTypeBannerSizes, paramsSize)))) {
+      utils.logError('ix bidder params: bid size is not included in ad unit sizes or player size.');
       return false;
     }
 
+    if (mediaTypeVideoRef && paramsVideoRef) {
+      const requiredIXParams = ['mimes', 'minduration', 'maxduration', 'protocols'];
+      let isParamsLevelValid = true;
+      for (let property of requiredIXParams) {
+        if (!mediaTypeVideoRef.hasOwnProperty(property) && !paramsVideoRef.hasOwnProperty(property)) {
+          const isProtocolsValid = (property === 'protocols' && (mediaTypeVideoRef.hasOwnProperty('protocol') || paramsVideoRef.hasOwnProperty('protocol')));
+          if (isProtocolsValid) {
+            continue;
+          }
+          utils.logError('ix bidder params: ' + property + ' is not included in either the adunit or params level');
+          isParamsLevelValid = false;
+        }
+      }
+
+      if (!isParamsLevelValid) {
+        return false;
+      }
+    }
+
     if (typeof bid.params.siteId !== 'string' && typeof bid.params.siteId !== 'number') {
       utils.logError('ix bidder params: siteId must be string or number value.');
       return false;
     }
 
-    const hasBidFloor = bid.params.hasOwnProperty('bidFloor');
-    const hasBidFloorCur = bid.params.hasOwnProperty('bidFloorCur');
-
     if (hasBidFloor || hasBidFloorCur) {
       if (!(hasBidFloor && hasBidFloorCur && isValidBidFloorParams(bid.params.bidFloor, bid.params.bidFloorCur))) {
         utils.logError('ix bidder params: bidFloor / bidFloorCur parameter has invalid format.');
@@ -616,7 +722,7 @@ export const spec = {
       detectMissingSizes: true,
     };
 
-    const ixConfig = {...DEFAULT_IX_CONFIG, ...config.getConfig('ix')};
+    const ixConfig = { ...DEFAULT_IX_CONFIG, ...config.getConfig('ix') };
 
     for (let i = 0; i < validBidRequests.length; i++) {
       validBidRequest = validBidRequests[i];
@@ -631,11 +737,10 @@ export const spec = {
           }
 
           videoImps[validBidRequest.transactionId].ixImps.push(bidToVideoImp(validBidRequest));
-        } else {
-          utils.logError('Bid size is not included in video playerSize')
         }
       }
-      if (validBidRequest.mediaType === BANNER || utils.deepAccess(validBidRequest, 'mediaTypes.banner') ||
+      if (validBidRequest.mediaType === BANNER ||
+          (utils.deepAccess(validBidRequest, 'mediaTypes.banner') && includesSize(utils.deepAccess(validBidRequest, 'mediaTypes.banner.sizes'), validBidRequest.params.size)) ||
           (!validBidRequest.mediaType && !validBidRequest.mediaTypes)) {
         let imp = bidToBannerImp(validBidRequest);
 
@@ -726,7 +831,7 @@ export const spec = {
    * @param {Boolean} isOpenRtb boolean to check openrtb2 protocol
    * @return {Object} params bid params
    */
-  transformBidParams: function(params, isOpenRtb) {
+  transformBidParams: function (params, isOpenRtb) {
     return utils.convertTypes({
       'siteID': 'number'
     }, params);
diff --git a/modules/ixBidAdapter.md b/modules/ixBidAdapter.md
index 5b9903c91d2..c358b19a0a2 100644
--- a/modules/ixBidAdapter.md
+++ b/modules/ixBidAdapter.md
@@ -87,7 +87,7 @@ object are detailed here.
 | --- | --- | --- | ---
 | siteId | Required | String | An IX-specific identifier that is associated with a specific size on this ad unit. This is similar to a placement ID or an ad unit ID that some other modules have. Examples: `'3723'`, `'6482'`, `'3639'`
 | size | Required | Number[] | The single size associated with the site ID. It should be one of the sizes listed in the ad unit under `adUnits[].sizes` or `adUnits[].mediaTypes.video.playerSize`. Examples: `[300, 250]`, `[300, 600]`
-| video | Required | Hash | The video object will serve as the properties of the video ad. You can create any field under the video object that is mentioned in the `OpenRTB Spec v2.5`. Some fields like `mimes, protocols, minduration, maxduration` are required.
+| video | Required | Hash | The video object will serve as the properties of the video ad. You can create any field under the video object that is mentioned in the `OpenRTB Spec v2.5`. Some fields like `mimes, protocols, minduration, maxduration` are required. Properties not defined at this level, will be pulled from the Adunit level.
 | video.mimes | Required | String[] | Array list of content MIME types supported. Popular MIME types include, but are not limited to, `"video/x-ms- wmv"` for Windows Media and `"video/x-flv"` for Flash Video.
 |video.minduration| Required | Integer | Minimum video ad duration in seconds.
 |video.maxduration| Required | Integer | Maximum video ad duration in seconds.
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index 7ac4bd94f9d..edbcc5725ac 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -126,7 +126,9 @@ describe('IndexexchangeAdapter', function () {
             'video/mp4',
             'video/webm'
           ],
-          minduration: 0
+          minduration: 0,
+          maxduration: 60,
+          protocols: [2]
         },
         size: [400, 100]
       },
@@ -146,6 +148,68 @@ describe('IndexexchangeAdapter', function () {
     }
   ];
 
+  const DEFAULT_MULTIFORMAT_BANNER_VALID_BID = [
+    {
+      bidder: 'ix',
+      params: {
+        siteId: '123',
+        size: [300, 250]
+      },
+      sizes: [[300, 250], [300, 600]],
+      mediaTypes: {
+        video: {
+          context: 'outstream',
+          playerSize: [[400, 100]]
+        },
+        banner: {
+          sizes: [[300, 250], [300, 600]]
+        }
+      },
+      adUnitCode: 'div-gpt-ad-1460505748562-0',
+      transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
+      bidId: '1a2b3c4e',
+      bidderRequestId: '11a22b33c44e',
+      auctionId: '1aa2bb3cc4de',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
+
+  const DEFAULT_MULTIFORMAT_VIDEO_VALID_BID = [
+    {
+      bidder: 'ix',
+      params: {
+        siteId: '456',
+        video: {
+          skippable: false,
+          mimes: [
+            'video/mp4',
+            'video/webm'
+          ],
+          minduration: 0,
+          maxduration: 60,
+          protocols: [1]
+        },
+        size: [400, 100]
+      },
+      sizes: [[300, 250], [300, 600]],
+      mediaTypes: {
+        video: {
+          context: 'outstream',
+          playerSize: [[400, 100]]
+        },
+        banner: {
+          sizes: [[300, 250], [300, 600]]
+        }
+      },
+      adUnitCode: 'div-gpt-ad-1460505748562-0',
+      transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
+      bidId: '1a2b3c4e',
+      bidderRequestId: '11a22b33c44e',
+      auctionId: '1aa2bb3cc4de',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
+
   const DEFAULT_BANNER_BID_RESPONSE = {
     cur: 'USD',
     id: '11a22b33c44d',
@@ -436,6 +500,16 @@ describe('IndexexchangeAdapter', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
 
+    it('should return true for banner bid when there are multiple mediaTypes (banner, outstream)', function () {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0]);
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true for video bid when there are multiple mediaTypes (banner, outstream)', function () {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
     it('should return false when there is only bidFloor', function () {
       const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
       bid.params.bidFloor = 50;
@@ -461,6 +535,43 @@ describe('IndexexchangeAdapter', function () {
       bid.params.bidFloorCur = 70;
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
+
+    it('should return false when required video properties are missing on both adunit & param levels', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.params.video.mimes;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return true when required video properties are at the adunit level', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.params.video.mimes;
+      bid.mediaTypes.video.mimes = ['video/mp4'];
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true if protocols exists but protocol doesn\'t', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+      delete bid.params.video.protocols;
+      bid.mediaTypes.video.protocols = 1;
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true if protocol exists but protocols doesn\'t', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.params.video.protocols;
+      bid.params.video.protocol = 1;
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+      delete bid.params.video.protocol;
+      bid.mediaTypes.video.protocol = 1;
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false if both protocol/protocols are missing', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.params.video.protocols;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
   });
 
   describe('buildRequestsIdentity', function () {
@@ -1292,6 +1403,101 @@ describe('IndexexchangeAdapter', function () {
       expect(impression.video.placement).to.exist;
       expect(impression.video.placement).to.equal(4);
     });
+
+    it('should not override video properties if they are already configured at the params video level', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.context = 'outstream';
+      bid.mediaTypes.video.protocols = [1];
+      bid.mediaTypes.video.mimes = ['video/override'];
+      const request = spec.buildRequests([bid])[0];
+      const impression = JSON.parse(request.data.r).imp[0];
+
+      expect(impression.video.protocols[0]).to.equal(2);
+      expect(impression.video.mimes[0]).to.not.equal('video/override');
+    });
+
+    it('should not add video adunit level properties in imp object if they are not whitelisted', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.context = 'outstream';
+      bid.mediaTypes.video.random = true;
+      const request = spec.buildRequests([bid])[0];
+      const impression = JSON.parse(request.data.r).imp[0];
+
+      expect(impression.video.random).to.not.exist;
+    });
+
+    it('should add whitelisted adunit level video properties in imp object if they are not configured at params level', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.context = 'outstream';
+      delete bid.params.video.protocols;
+      delete bid.params.video.mimes;
+      bid.mediaTypes.video.protocols = [6];
+      bid.mediaTypes.video.mimes = ['video/mp4'];
+      bid.mediaTypes.video.api = 2;
+      const request = spec.buildRequests([bid])[0];
+      const impression = JSON.parse(request.data.r).imp[0];
+
+      expect(impression.video.protocols[0]).to.equal(6);
+      expect(impression.video.api).to.equal(2);
+      expect(impression.video.mimes[0]).to.equal('video/mp4');
+    });
+  });
+
+  describe('buildRequestMultiFormat', function () {
+    describe('only banner bidder params set', function () {
+      const request = spec.buildRequests(DEFAULT_MULTIFORMAT_BANNER_VALID_BID)
+
+      const bannerImp = JSON.parse(request[0].data.r).imp[0];
+      expect(JSON.parse(request[0].data.r).imp).to.have.lengthOf(2);
+      expect(JSON.parse(request[0].data.v)).to.equal(BANNER_ENDPOINT_VERSION);
+      expect(bannerImp.id).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].bidId);
+      expect(bannerImp.banner).to.exist;
+      expect(bannerImp.banner.w).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].params.size[0]);
+      expect(bannerImp.banner.h).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].params.size[1]);
+    });
+
+    describe('only video bidder params set', function () {
+      const request = spec.buildRequests(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID);
+
+      const videoImp = JSON.parse(request[0].data.r).imp[0];
+      expect(JSON.parse(request[0].data.r).imp).to.have.lengthOf(1);
+      expect(JSON.parse(request[0].data.v)).to.equal(VIDEO_ENDPOINT_VERSION);
+      expect(videoImp.id).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].bidId);
+      expect(videoImp.video).to.exist;
+      expect(videoImp.video.w).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].params.size[0]);
+      expect(videoImp.video.h).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].params.size[1]);
+    });
+    describe('both banner and video bidder params set', function () {
+      const request = spec.buildRequests([DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0], DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]]);
+
+      it('should return valid banner and video requests', function () {
+        const bannerImp = JSON.parse(request[0].data.r).imp[0];
+        expect(JSON.parse(request[0].data.r).imp).to.have.lengthOf(2);
+        expect(JSON.parse(request[0].data.v)).to.equal(BANNER_ENDPOINT_VERSION);
+        expect(bannerImp.id).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].bidId);
+        expect(bannerImp.banner).to.exist;
+        expect(bannerImp.banner.w).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].params.size[0]);
+        expect(bannerImp.banner.h).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].params.size[1]);
+
+        const videoImp = JSON.parse(request[1].data.r).imp[0];
+        expect(JSON.parse(request[1].data.r).imp).to.have.lengthOf(1);
+        expect(JSON.parse(request[1].data.v)).to.equal(VIDEO_ENDPOINT_VERSION);
+        expect(videoImp.id).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].bidId);
+        expect(videoImp.video).to.exist;
+        expect(videoImp.video.w).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].params.size[0]);
+        expect(videoImp.video.h).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].params.size[1]);
+      });
+
+      it('should contain all correct IXdiag properties', function () {
+        const diagObj = JSON.parse(request[0].data.r).ext.ixdiag;
+        expect(diagObj.iu).to.equal(0);
+        expect(diagObj.nu).to.equal(0);
+        expect(diagObj.ou).to.equal(1);
+        expect(diagObj.ren).to.equal(false);
+        expect(diagObj.mfu).to.equal(1);
+        expect(diagObj.allU).to.equal(1);
+      });
+    });
   });
 
   describe('interpretResponse', function () {

From f5587db94f2c52dab2b5e994b821c7332c76dcb9 Mon Sep 17 00:00:00 2001
From: Bill Newman <huddled.masses1650@gmail.com>
Date: Fri, 22 Jan 2021 14:58:42 +0200
Subject: [PATCH 171/304] Colossus Adapter: bidfloor support (#6199)

* add video&native traffic colossus ssp

* Native obj validation

* Native obj validation #2

* Added size field in requests

* fixed test

* fix merge conflicts

* move to 3.0

* move to 3.0

* fix IE11 new URL issue

* fix IE11 new URL issue

* fix IE11 new URL issue

* https for 3.0

* add https test

* add ccp and schain features

* fix test

* sync with upstream, fix conflicts

* Update colossussspBidAdapter.js

remove commented code

* Update colossussspBidAdapter.js

lint fix

* identity extensions

* identity extensions

* fix

* fix

* fix

* fix

* fix

* add tests for user ids

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* add gdpr support

* add gdpr support

* id5id support

* Update colossussspBidAdapter.js

add bidfloor parameter

* Update colossussspBidAdapter.js

check bidfloor

* Update colossussspBidAdapter.js

* Update colossussspBidAdapter.js

* Update colossussspBidAdapter.js

* Update colossussspBidAdapter_spec.js

* use floor module

* Revert "use floor module"

This reverts commit f0c5c248627567e669d8eed4f2bb9a26a857e2ad.

* use floor module

Co-authored-by: Vladislav Isaiko <vladis@smartyads.com>
Co-authored-by: Aiholkin <artem.iholkin@smartyads.com>
---
 modules/colossussspBidAdapter.js              | 29 ++++++++++++-------
 .../modules/colossussspBidAdapter_spec.js     |  4 +--
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/modules/colossussspBidAdapter.js b/modules/colossussspBidAdapter.js
index a3beb723528..1afb343566d 100644
--- a/modules/colossussspBidAdapter.js
+++ b/modules/colossussspBidAdapter.js
@@ -56,15 +56,8 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: (validBidRequests, bidderRequest) => {
-    let winTop = window;
-    let location;
-    try {
-      location = new URL(bidderRequest.refererInfo.referer)
-      winTop = window.top;
-    } catch (e) {
-      location = winTop.location;
-      utils.logMessage(e);
-    };
+    const winTop = utils.getWindowTop();
+    const location = winTop.location;
     let placements = [];
     let request = {
       'deviceWidth': winTop.screen.width,
@@ -94,15 +87,29 @@ export const spec = {
         bidId: bid.bidId,
         sizes: bid.mediaTypes[traff].sizes,
         traffic: traff,
-        eids: []
+        eids: [],
+        floor: {}
       };
+      if (typeof bid.getFloor === 'function') {
+        let tmpFloor = {};
+        for (let size of placement.sizes) {
+          tmpFloor = bid.getFloor({
+            currency: 'USD',
+            mediaType: traff,
+            size: size
+          });
+          if (tmpFloor) {
+            placement.floor[`${size[0]}x${size[1]}`] = tmpFloor.floor;
+          }
+        }
+      }
       if (bid.schain) {
         placement.schain = bid.schain;
       }
       if (bid.userId) {
         getUserId(placement.eids, bid.userId.britepoolid, 'britepool.com');
         getUserId(placement.eids, bid.userId.idl_env, 'identityLink');
-        getUserId(placement.eids, utils.deepAccess(bid, 'userId.id5id.uid'), 'id5-sync.com', utils.deepAccess(bid, 'userId.id5id.ext'));
+        getUserId(placement.eids, bid.userId.id5id, 'id5-sync.com')
         getUserId(placement.eids, bid.userId.tdid, 'adserver.org', {
           rtiPartner: 'TDID'
         });
diff --git a/test/spec/modules/colossussspBidAdapter_spec.js b/test/spec/modules/colossussspBidAdapter_spec.js
index a10a7590677..f6e24d07c63 100644
--- a/test/spec/modules/colossussspBidAdapter_spec.js
+++ b/test/spec/modules/colossussspBidAdapter_spec.js
@@ -88,12 +88,13 @@ describe('ColossussspAdapter', function () {
       let placements = data['placements'];
       for (let i = 0; i < placements.length; i++) {
         let placement = placements[i];
-        expect(placement).to.have.all.keys('placementId', 'eids', 'bidId', 'traffic', 'sizes', 'schain');
+        expect(placement).to.have.all.keys('placementId', 'eids', 'bidId', 'traffic', 'sizes', 'schain', 'floor');
         expect(placement.schain).to.be.an('object')
         expect(placement.placementId).to.be.a('number');
         expect(placement.bidId).to.be.a('string');
         expect(placement.traffic).to.be.a('string');
         expect(placement.sizes).to.be.an('array');
+        expect(placement.floor).to.be.an('object');
       }
     });
     it('Returns empty data if no valid requests are passed', function () {
@@ -126,7 +127,6 @@ describe('ColossussspAdapter', function () {
           expect(v.uids).to.be.an('array');
           expect(v.uids.length).to.be.equal(1)
           expect(v.uids[0]).to.have.property('id')
-          expect(v.uids[0].id).to.be.oneOf(['britepoolid123', 'idl_env123', 'tdid123', 'id5id123'])
         }
       }
     });

From 680541838b87652fbe6e3cc2beb2dd25642c394a Mon Sep 17 00:00:00 2001
From: Dan Bogdan <43830380+EMXDigital@users.noreply.github.com>
Date: Fri, 22 Jan 2021 10:13:09 -0800
Subject: [PATCH 172/304] EMX revised issue with schain forwarding (#6080)

* adding ccpa support for emx_digital adapter

* emx_digital ccpa compliance: lint fix

* emx 3.0 compliance update

* fix outstream renderer issue, update test spec

* refactor formatVideoResponse function to use core-js/find

* Add support for schain forwarding

* Resolved issue with Schain object location

Co-authored-by: Nick Colletti <nick.colletti@emxdigital.com>
Co-authored-by: Nick Colletti <gnomish@gmail.com>
Co-authored-by: Kiyoshi Hara <Kiyoshi.Hara@emxdigital.com>
Co-authored-by: Dan Bogdan <daniel.bogdan@emxdigital.com>
Co-authored-by: Jherez Taylor <jherez.taylor@emxdigital.com>
Co-authored-by: EMXDigital <emxdigital@emxdigital.com>
Co-authored-by: Rakesh Balakrishnan <Rakesh.Balakrishnan@emxdigital.com>
---
 modules/emx_digitalBidAdapter.js                | 6 +++---
 test/spec/modules/emx_digitalBidAdapter_spec.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/emx_digitalBidAdapter.js b/modules/emx_digitalBidAdapter.js
index 72da18d5691..41a5af6d703 100644
--- a/modules/emx_digitalBidAdapter.js
+++ b/modules/emx_digitalBidAdapter.js
@@ -158,11 +158,11 @@ export const emxAdapter = {
 
     return emxData;
   },
-  getSupplyChain: (bidRequests, emxData) => {
-    if (bidRequests.schain) {
+  getSupplyChain: (bidderRequest, emxData) => {
+    if (bidderRequest.bids[0] && bidderRequest.bids[0].schain) {
       emxData.source = {
         ext: {
-          schain: bidRequests.schain
+          schain: bidderRequest.bids[0].schain
         }
       };
     }
diff --git a/test/spec/modules/emx_digitalBidAdapter_spec.js b/test/spec/modules/emx_digitalBidAdapter_spec.js
index 39e56638ece..855ffa0a0b7 100644
--- a/test/spec/modules/emx_digitalBidAdapter_spec.js
+++ b/test/spec/modules/emx_digitalBidAdapter_spec.js
@@ -370,7 +370,7 @@ describe('emx_digital Adapter', function () {
 
     it('should add schain object to request', function() {
       const schainBidderRequest = utils.deepClone(bidderRequest);
-      schainBidderRequest.schain = {
+      schainBidderRequest.bids[0].schain = {
         'complete': 1,
         'ver': '1.0',
         'nodes': [
@@ -386,7 +386,7 @@ describe('emx_digital Adapter', function () {
       expect(request.source.ext.schain).to.exist;
       expect(request.source.ext.schain).to.have.property('complete', 1);
       expect(request.source.ext.schain).to.have.property('ver', '1.0');
-      expect(request.source.ext.schain.nodes[0].asi).to.equal(schainBidderRequest.schain.nodes[0].asi);
+      expect(request.source.ext.schain.nodes[0].asi).to.equal(schainBidderRequest.bids[0].schain.nodes[0].asi);
     });
   });
 

From 817f06e1c84a523540234e2eca3d6368304f5e15 Mon Sep 17 00:00:00 2001
From: oasis <2394426+bmwcmw@users.noreply.github.com>
Date: Mon, 25 Jan 2021 18:23:31 +0100
Subject: [PATCH 173/304] Criteo: Re-enable ad building when mediation is off
 and remove enableSendAllBids condition (#5900)

---
 modules/criteoBidAdapter.js                |  21 ++--
 test/spec/modules/criteoBidAdapter_spec.js | 126 +++++++++++++--------
 2 files changed, 85 insertions(+), 62 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 3dabe911884..8f654dbe873 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -79,10 +79,6 @@ export const spec = {
     if (publisherTagAvailable()) {
       // eslint-disable-next-line no-undef
       const adapter = new Criteo.PubTag.Adapters.Prebid(PROFILE_ID_PUBLISHERTAG, ADAPTER_VERSION, bidRequests, bidderRequest, '$prebid.version$');
-      const enableSendAllBids = config.getConfig('enableSendAllBids');
-      if (adapter.setEnableSendAllBids && typeof adapter.setEnableSendAllBids === 'function' && typeof enableSendAllBids === 'boolean') {
-        adapter.setEnableSendAllBids(enableSendAllBids);
-      }
       url = adapter.buildCdbUrl();
       data = adapter.buildCdbRequest();
     } else {
@@ -133,8 +129,6 @@ export const spec = {
         if (slot.native) {
           if (bidRequest.params.nativeCallback) {
             bid.ad = createNativeAd(bidId, slot.native, bidRequest.params.nativeCallback);
-          } else if (config.getConfig('enableSendAllBids') === true) {
-            return;
           } else {
             bid.native = createPrebidNativeAd(slot.native);
             bid.mediaType = NATIVE;
@@ -253,12 +247,14 @@ function buildCdbUrl(context) {
 
 function checkNativeSendId(bidRequest) {
   return !(bidRequest.nativeParams &&
-    ((bidRequest.nativeParams.image && bidRequest.nativeParams.image.sendId !== true) ||
-      (bidRequest.nativeParams.icon && bidRequest.nativeParams.icon.sendId !== true) ||
-      (bidRequest.nativeParams.clickUrl && bidRequest.nativeParams.clickUrl.sendId !== true) ||
-      (bidRequest.nativeParams.displayUrl && bidRequest.nativeParams.displayUrl.sendId !== true) ||
-      (bidRequest.nativeParams.privacyLink && bidRequest.nativeParams.privacyLink.sendId !== true) ||
-      (bidRequest.nativeParams.privacyIcon && bidRequest.nativeParams.privacyIcon.sendId !== true)));
+    (
+      (bidRequest.nativeParams.image && ((bidRequest.nativeParams.image.sendId !== true || bidRequest.nativeParams.image.sendTargetingKeys === true))) ||
+        (bidRequest.nativeParams.icon && ((bidRequest.nativeParams.icon.sendId !== true || bidRequest.nativeParams.icon.sendTargetingKeys === true))) ||
+        (bidRequest.nativeParams.clickUrl && ((bidRequest.nativeParams.clickUrl.sendId !== true || bidRequest.nativeParams.clickUrl.sendTargetingKeys === true))) ||
+        (bidRequest.nativeParams.displayUrl && ((bidRequest.nativeParams.displayUrl.sendId !== true || bidRequest.nativeParams.displayUrl.sendTargetingKeys === true))) ||
+        (bidRequest.nativeParams.privacyLink && ((bidRequest.nativeParams.privacyLink.sendId !== true || bidRequest.nativeParams.privacyLink.sendTargetingKeys === true))) ||
+        (bidRequest.nativeParams.privacyIcon && ((bidRequest.nativeParams.privacyIcon.sendId !== true || bidRequest.nativeParams.privacyIcon.sendTargetingKeys === true)))
+    ));
 }
 
 /**
@@ -416,6 +412,7 @@ function hasValidVideoMediaType(bidRequest) {
  */
 function createPrebidNativeAd(payload) {
   return {
+    sendTargetingKeys: false, // no key is added to KV by default
     title: payload.products[0].title,
     body: payload.products[0].description,
     sponsoredBy: payload.advertiser.description,
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index c5068d11d31..e91d3b10abb 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -992,6 +992,7 @@ describe('The Criteo bidding adapter', function () {
             zoneid: 123,
             native: {
               'products': [{
+                'sendTargetingKeys': false,
                 'title': 'Product title',
                 'description': 'Product desc',
                 'price': '100',
@@ -1027,7 +1028,6 @@ describe('The Criteo bidding adapter', function () {
           native: true,
         }]
       };
-      config.setConfig({'enableSendAllBids': false});
       const bids = spec.interpretResponse(response, request);
       expect(bids).to.have.lengthOf(1);
       expect(bids[0].requestId).to.equal('test-bidId');
@@ -1036,61 +1036,87 @@ describe('The Criteo bidding adapter', function () {
       expect(bids[0].mediaType).to.equal(NATIVE);
     });
 
-    it('should not parse bid response with native when enableSendAllBids is true', function () {
-      const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            bidId: 'abc123',
-            cpm: 1.23,
-            width: 728,
-            height: 90,
-            zoneid: 123,
-            native: {}
-          }],
-        },
-      };
-      const request = {
-        bidRequests: [{
-          adUnitCode: 'test-requestId',
-          bidId: 'test-bidId',
+    it('should warn only once if sendTargetingKeys set to true on required fields for native bidRequest', () => {
+      const bidderRequest = { };
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-123',
+          transactionId: 'transaction-123',
+          sizes: [[728, 90]],
           params: {
             zoneId: 123,
+            publisherSubId: '123',
+            nativeCallback: function() {}
           },
-          native: true,
-        }]
-      };
-      config.setConfig({'enableSendAllBids': true});
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(0);
-    });
-
-    it('should not parse bid response with native when enableSendAllBids is not set', function () {
-      const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            bidId: 'abc123',
-            cpm: 1.23,
-            width: 728,
-            height: 90,
-            zoneid: 123,
-            native: {}
-          }],
         },
-      };
-      const request = {
-        bidRequests: [{
-          adUnitCode: 'test-requestId',
-          bidId: 'test-bidId',
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-456',
+          transactionId: 'transaction-456',
+          sizes: [[728, 90]],
           params: {
-            zoneId: 123,
+            zoneId: 456,
+            publisherSubId: '456',
+            nativeCallback: function() {}
           },
-          native: true,
-        }]
-      };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(0);
+        },
+      ];
+
+      const nativeParamsWithSendTargetingKeys = [
+        {
+          nativeParams: {
+            image: {
+              sendTargetingKeys: true
+            },
+          }
+        },
+        {
+          nativeParams: {
+            icon: {
+              sendTargetingKeys: true
+            },
+          }
+        },
+        {
+          nativeParams: {
+            clickUrl: {
+              sendTargetingKeys: true
+            },
+          }
+        },
+        {
+          nativeParams: {
+            displayUrl: {
+              sendTargetingKeys: true
+            },
+          }
+        },
+        {
+          nativeParams: {
+            privacyLink: {
+              sendTargetingKeys: true
+            },
+          }
+        },
+        {
+          nativeParams: {
+            privacyIcon: {
+              sendTargetingKeys: true
+            },
+          }
+        }
+      ];
+
+      utilsMock.expects('logWarn')
+        .withArgs('Criteo: all native assets containing URL should be sent as placeholders with sendId(icon, image, clickUrl, displayUrl, privacyLink, privacyIcon)')
+        .exactly(nativeParamsWithSendTargetingKeys.length * bidRequests.length);
+      nativeParamsWithSendTargetingKeys.forEach(nativeParams => {
+        let transformedBidRequests = {...bidRequests};
+        transformedBidRequests = [Object.assign(transformedBidRequests[0], nativeParams), Object.assign(transformedBidRequests[1], nativeParams)];
+        spec.buildRequests(transformedBidRequests, bidderRequest);
+      });
+      utilsMock.verify();
     });
 
     it('should properly parse a bid response with a zoneId passed as a string', function () {

From 534db98701381175b5935e826d2a70c3b7938d38 Mon Sep 17 00:00:00 2001
From: Karim Mourra <karim@jwplayer.com>
Date: Mon, 25 Jan 2021 15:29:06 -0500
Subject: [PATCH 174/304] typo and var name improvement (#6217)

Co-authored-by: karimJWP <karimJWP@github.com>
---
 src/adapterManager.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/adapterManager.js b/src/adapterManager.js
index aa67fd333c2..d5c07b847cc 100644
--- a/src/adapterManager.js
+++ b/src/adapterManager.js
@@ -399,18 +399,18 @@ function isTestingServerOnly() {
 };
 
 function getSupportedMediaTypes(bidderCode) {
-  let result = [];
-  if (includes(adapterManager.videoAdapters, bidderCode)) result.push('video');
-  if (includes(nativeAdapters, bidderCode)) result.push('native');
-  return result;
+  let supportedMediaTypes = [];
+  if (includes(adapterManager.videoAdapters, bidderCode)) supportedMediaTypes.push('video');
+  if (includes(nativeAdapters, bidderCode)) supportedMediaTypes.push('native');
+  return supportedMediaTypes;
 }
 
 adapterManager.videoAdapters = []; // added by adapterLoader for now
 
-adapterManager.registerBidAdapter = function (bidAdaptor, bidderCode, {supportedMediaTypes = []} = {}) {
-  if (bidAdaptor && bidderCode) {
-    if (typeof bidAdaptor.callBids === 'function') {
-      _bidderRegistry[bidderCode] = bidAdaptor;
+adapterManager.registerBidAdapter = function (bidAdapter, bidderCode, {supportedMediaTypes = []} = {}) {
+  if (bidAdapter && bidderCode) {
+    if (typeof bidAdapter.callBids === 'function') {
+      _bidderRegistry[bidderCode] = bidAdapter;
 
       if (includes(supportedMediaTypes, 'video')) {
         adapterManager.videoAdapters.push(bidderCode);
@@ -422,7 +422,7 @@ adapterManager.registerBidAdapter = function (bidAdaptor, bidderCode, {supported
       utils.logError('Bidder adaptor error for bidder code: ' + bidderCode + 'bidder must implement a callBids() function');
     }
   } else {
-    utils.logError('bidAdaptor or bidderCode not specified');
+    utils.logError('bidAdapter or bidderCode not specified');
   }
 };
 
@@ -430,8 +430,8 @@ adapterManager.aliasBidAdapter = function (bidderCode, alias, options) {
   let existingAlias = _bidderRegistry[alias];
 
   if (typeof existingAlias === 'undefined') {
-    let bidAdaptor = _bidderRegistry[bidderCode];
-    if (typeof bidAdaptor === 'undefined') {
+    let bidAdapter = _bidderRegistry[bidderCode];
+    if (typeof bidAdapter === 'undefined') {
       // check if alias is part of s2sConfig and allow them to register if so (as base bidder may be s2s-only)
       const s2sConfig = config.getConfig('s2sConfig');
       const s2sBidders = s2sConfig && s2sConfig.bidders;
@@ -447,11 +447,11 @@ adapterManager.aliasBidAdapter = function (bidderCode, alias, options) {
         let supportedMediaTypes = getSupportedMediaTypes(bidderCode);
         // Have kept old code to support backward compatibilitiy.
         // Remove this if loop when all adapters are supporting bidderFactory. i.e When Prebid.js is 1.0
-        if (bidAdaptor.constructor.prototype != Object.prototype) {
-          newAdapter = new bidAdaptor.constructor();
+        if (bidAdapter.constructor.prototype != Object.prototype) {
+          newAdapter = new bidAdapter.constructor();
           newAdapter.setBidderCode(alias);
         } else {
-          let spec = bidAdaptor.getSpec();
+          let spec = bidAdapter.getSpec();
           let gvlid = options && options.gvlid;
           let skipPbsAliasing = options && options.skipPbsAliasing;
           newAdapter = newBidder(Object.assign({}, spec, { code: alias, gvlid, skipPbsAliasing }));

From 86bdc0372bb07f74fd1eb325ab7f898cba228c0f Mon Sep 17 00:00:00 2001
From: SKOCHERI <37454420+SKOCHERI@users.noreply.github.com>
Date: Tue, 26 Jan 2021 03:35:14 -0800
Subject: [PATCH 175/304] Updating send json userids to endpoint in idLibrary
 (#6219)

* Updating send json userids

* Updating send json userids

* Updating send json userids

* Updating string user ids to json

Co-authored-by: skocheri <skocheri@rubiconproject.com>
---
 modules/idLibrary.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/idLibrary.js b/modules/idLibrary.js
index 988f3417b30..0d8616c3f88 100644
--- a/modules/idLibrary.js
+++ b/modules/idLibrary.js
@@ -200,10 +200,10 @@ function postData() {
     logInfo('No user ids');
     return;
   }
-  logInfo('Users' + JSON.stringify(userIds));
+  logInfo('Users' + userIds);
   const syncPayload = {};
   syncPayload.hid = MD5(email).toString();
-  syncPayload.uids = JSON.stringify(userIds);
+  syncPayload.uids = userIds;
   const payloadString = JSON.stringify(syncPayload);
   logInfo(payloadString);
   ajax(conf.url, syncCallback(), payloadString, {method: 'POST', withCredentials: true});

From ce829e86ca1bde95efb39fbed7d80edc44b75bb8 Mon Sep 17 00:00:00 2001
From: Neelanjan Sen <14229985+Fawke@users.noreply.github.com>
Date: Tue, 26 Jan 2021 18:08:21 +0530
Subject: [PATCH 176/304] appnexus bid adapter - fix outstream render issue
 with smart ad server (#6215)

---
 modules/appnexusBidAdapter.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index be4df7f55bb..a3cabe62d39 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -999,9 +999,22 @@ function hidedfpContainer(elementId) {
   }
 }
 
+function hideSASIframe(elementId) {
+  try {
+    // find script tag with id 'sas_script'. This ensures it only works if you're using Smart Ad Server.
+    const el = document.getElementById(elementId).querySelectorAll("script[id^='sas_script']");
+    if (el[0].nextSibling && el[0].nextSibling.localName === 'iframe') {
+      el[0].nextSibling.style.setProperty('display', 'none');
+    }
+  } catch (e) {
+    // element not found!
+  }
+}
+
 function outstreamRender(bid) {
-  // push to render queue because ANOutstreamVideo may not be loaded yet
   hidedfpContainer(bid.adUnitCode);
+  hideSASIframe(bid.adUnitCode);
+  // push to render queue because ANOutstreamVideo may not be loaded yet
   bid.renderer.push(() => {
     window.ANOutstreamVideo.renderAd({
       tagId: bid.adResponse.tag_id,

From 869d79d2666ac49c51bc66ff3b57ff11fad26ccf Mon Sep 17 00:00:00 2001
From: Maurice Roach <maurice.roach@tapad.com>
Date: Tue, 26 Jan 2021 11:45:47 -0500
Subject: [PATCH 177/304] add md file for tapadIdSystem (#6223)

---
 modules/tapadIdSystem.md | 43 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 modules/tapadIdSystem.md

diff --git a/modules/tapadIdSystem.md b/modules/tapadIdSystem.md
new file mode 100644
index 00000000000..4bab1b4689d
--- /dev/null
+++ b/modules/tapadIdSystem.md
@@ -0,0 +1,43 @@
+### Tapad ID
+
+Tapad's ID module provides access to a universal identifier that publishers, ad tech platforms and advertisers can use for data collection and collation without reliance on third-party cookies.
+Tapad's ID module is free to use and promotes collaboration across the industry by facilitating interoperability between DSPs, SSPs and publishers.
+
+To register as an authorized user of the Tapad ID module, or for more information, documentation and access to Tapad’s Terms and Conditions please contact  [prebid@tapad.com](mailto:prebid@tapad.com).
+
+Tapad’s Privacy landing page containing links to region-specific Privacy Notices may be found here: [https://tapad.com/privacy.html](https://tapad.com/privacy.html).
+
+Add it to your Prebid.js package with:
+
+
+`gulp build --modules=userId,tapadIdSystem`
+
+#### Tapad ID Configuration
+
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | `"tapadId"` | `"tapadId"` |
+| params | Required | Object | Details for Tapad initialization. | |
+| params.company_id | Required | Number | Tapad Company Id provided by Tapad | 1234567890 |
+
+#### Tapad ID Example
+
+```js
+pbjs.setConfig({
+    userSync: {
+        userIds: [
+            {
+                name: "tapadId",
+                params: {
+                    companyId: 1234567890
+                },
+                storage: {
+                    type: "cookie",
+                    name: "tapad_id",
+                    expires: 1
+                }
+            }
+        ]
+    }
+});
+```

From dfed405b73331de154f3321be7a0a5968acbc29c Mon Sep 17 00:00:00 2001
From: Julian Hollmann <julian.hollmann@googlemail.com>
Date: Tue, 26 Jan 2021 17:59:51 +0100
Subject: [PATCH 178/304] Implement glomex bid adapter (#6209)

* Implement glomexBidAdapter

* Implement glomexBidAdapter with tests and docs

Co-authored-by: Herb Dombrowski <32455795+hrb-d@users.noreply.github.com>
---
 modules/glomexBidAdapter.js                |  86 +++++++++++++
 modules/glomexBidAdapter.md                |  32 +++++
 test/spec/modules/glomexBidAdapter_spec.js | 133 +++++++++++++++++++++
 3 files changed, 251 insertions(+)
 create mode 100644 modules/glomexBidAdapter.js
 create mode 100644 modules/glomexBidAdapter.md
 create mode 100644 test/spec/modules/glomexBidAdapter_spec.js

diff --git a/modules/glomexBidAdapter.js b/modules/glomexBidAdapter.js
new file mode 100644
index 00000000000..8de3d3724ce
--- /dev/null
+++ b/modules/glomexBidAdapter.js
@@ -0,0 +1,86 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js'
+import find from 'core-js-pure/features/array/find.js'
+import { BANNER } from '../src/mediaTypes.js'
+
+const ENDPOINT = 'https://prebid.mes.glomex.cloud/request-bid'
+const BIDDER_CODE = 'glomex'
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function (bid) {
+    if (bid && bid.params && bid.params.integrationId) {
+      return true
+    }
+    return false
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest = {}) {
+    const refererInfo = bidderRequest.refererInfo || {};
+    const gdprConsent = bidderRequest.gdprConsent || {};
+
+    return {
+      method: 'POST',
+      url: `${ENDPOINT}`,
+      data: {
+        auctionId: bidderRequest.auctionId,
+        refererInfo: {
+          isAmp: refererInfo.isAmp,
+          numIframes: refererInfo.numIframes,
+          reachedTop: refererInfo.reachedTop,
+          referer: refererInfo.referer
+        },
+        gdprConsent: {
+          consentString: gdprConsent.consentString,
+          gdprApplies: gdprConsent.gdprApplies
+        },
+        bidRequests: validBidRequests.map(({ params, sizes, bidId, adUnitCode }) => ({
+          bidId,
+          adUnitCode,
+          params,
+          sizes
+        }))
+      },
+      options: {
+        withCredentials: false,
+        contentType: 'application/json'
+      },
+      validBidRequests: validBidRequests,
+    }
+  },
+
+  interpretResponse: function (serverResponse, originalBidRequest) {
+    const bidResponses = []
+
+    originalBidRequest.validBidRequests.forEach(function (bidRequest) {
+      if (!serverResponse.body) {
+        return
+      }
+
+      const matchedBid = find(serverResponse.body.bids, function (bid) {
+        return String(bidRequest.bidId) === String(bid.id)
+      })
+
+      if (matchedBid) {
+        const bidResponse = {
+          requestId: bidRequest.bidId,
+          cpm: matchedBid.cpm,
+          width: matchedBid.width,
+          height: matchedBid.height,
+          creativeId: matchedBid.creativeId,
+          dealId: matchedBid.dealId,
+          currency: matchedBid.currency,
+          netRevenue: matchedBid.netRevenue,
+          ttl: matchedBid.ttl,
+          ad: matchedBid.ad
+        }
+
+        bidResponses.push(bidResponse)
+      }
+    })
+    return bidResponses
+  }
+};
+
+registerBidder(spec)
diff --git a/modules/glomexBidAdapter.md b/modules/glomexBidAdapter.md
new file mode 100644
index 00000000000..d52ed88ff16
--- /dev/null
+++ b/modules/glomexBidAdapter.md
@@ -0,0 +1,32 @@
+# Overview
+
+```
+Module Name: Glomex Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: integration-squad@services.glomex.com
+```
+
+# Description
+
+Module to use the Glomex Player with prebid.js
+
+# Test Parameters
+```
+    var adUnits = [
+           {
+                code: "banner",
+                mediaTypes: {
+                    banner: {
+                        sizes: [[640, 360]]
+                    }
+                },
+                bids: [{
+                   bidder: "glomex",
+                   params: {
+                       integrationId: '4059a11hkdzuf65i',
+                       playlistId: 'v-bdui4dz7vjq9'
+                   }
+                }]
+           }
+       ];
+```
diff --git a/test/spec/modules/glomexBidAdapter_spec.js b/test/spec/modules/glomexBidAdapter_spec.js
new file mode 100644
index 00000000000..b43623928f7
--- /dev/null
+++ b/test/spec/modules/glomexBidAdapter_spec.js
@@ -0,0 +1,133 @@
+import { expect } from 'chai'
+import { spec } from 'modules/glomexBidAdapter.js'
+import { newBidder } from 'src/adapters/bidderFactory.js'
+
+const REQUEST = {
+  bidder: 'glomex',
+  params: {
+    integrationId: 'abcdefg',
+    playlistId: 'defghjk'
+  },
+  bidderRequestId: '143346cf0f1732',
+  auctionId: '2e41f65424c87c',
+  adUnitCode: 'adunit-code',
+  bidId: '2d925f27f5079f',
+  sizes: [640, 360]
+}
+
+const BIDDER_REQUEST = {
+  auctionId: '2d921234f5079f',
+  refererInfo: {
+    isAmp: true,
+    numIframes: 0,
+    reachedTop: true,
+    referer: 'https://glomex.com'
+  },
+  gdprConsent: {
+    gdprApplies: true,
+    consentString: 'CO5asbJO5asbJE-AAAENAACAAAAAAAAAAAYgAAAAAAAA.IAAA'
+  }
+}
+
+const RESPONSE = {
+  bids: [
+    {
+      id: '2d925f27f5079f',
+      cpm: 3.5,
+      width: 640,
+      height: 360,
+      creativeId: 'creative-1j75x4ln1kk6m1ius',
+      dealId: 'deal-1j75x4ln1kk6m1iut',
+      currency: 'EUR',
+      netRevenue: true,
+      ttl: 300,
+      ad: '<ad />'
+    }
+  ]
+}
+describe('glomexBidAdapter', function () {
+  const adapter = newBidder(spec)
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function')
+    })
+  })
+
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      const request = {
+        'params': {
+          'integrationId': 'abcdefg'
+        }
+      }
+      expect(spec.isBidRequestValid(request)).to.equal(true)
+    })
+
+    it('should return false when required params are not passed', function () {
+      expect(spec.isBidRequestValid({})).to.equal(false)
+    })
+  })
+
+  describe('buildRequests', function () {
+    const bidRequests = [REQUEST]
+    const request = spec.buildRequests(bidRequests, BIDDER_REQUEST)
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      expect(request.method).to.equal('POST')
+    })
+
+    it('returns a list of valid requests', function () {
+      expect(request.validBidRequests).to.eql([REQUEST])
+    })
+
+    it('sends params.integrationId', function () {
+      expect(request.validBidRequests[0].params.integrationId).to.eql(REQUEST.params.integrationId)
+    })
+
+    it('sends params.playlistId', function () {
+      expect(request.validBidRequests[0].params.playlistId).to.eql(REQUEST.params.playlistId)
+    })
+
+    it('sends refererInfo', function () {
+      expect(request.data.refererInfo).to.eql(BIDDER_REQUEST.refererInfo)
+    })
+
+    it('sends gdprConsent', function () {
+      expect(request.data.gdprConsent).to.eql(BIDDER_REQUEST.gdprConsent)
+    })
+
+    it('sends the auctionId', function () {
+      expect(request.data.auctionId).to.eql(BIDDER_REQUEST.auctionId)
+    })
+  })
+
+  describe('interpretResponse', function () {
+    it('handles nobid responses', function () {
+      expect(spec.interpretResponse({body: {}}, {validBidRequests: []}).length).to.equal(0)
+      expect(spec.interpretResponse({body: []}, {validBidRequests: []}).length).to.equal(0)
+    })
+
+    it('handles the server response', function () {
+      const result = spec.interpretResponse(
+        {
+          body: RESPONSE
+        },
+        {
+          validBidRequests: [REQUEST]
+        }
+      )
+
+      expect(result[0].requestId).to.equal('2d925f27f5079f')
+      expect(result[0].cpm).to.equal(3.5)
+      expect(result[0].width).to.equal(640)
+      expect(result[0].height).to.equal(360)
+      expect(result[0].creativeId).to.equal('creative-1j75x4ln1kk6m1ius')
+      expect(result[0].dealId).to.equal('deal-1j75x4ln1kk6m1iut')
+      expect(result[0].currency).to.equal('EUR')
+      expect(result[0].netRevenue).to.equal(true)
+      expect(result[0].ttl).to.equal(300)
+      expect(result[0].ad).to.equal('<ad />')
+    })
+  })
+})

From 40d335a582cb59e30b0fb6ed29491d2505ef75ca Mon Sep 17 00:00:00 2001
From: Karim Mourra <karim@jwplayer.com>
Date: Tue, 26 Jan 2021 14:34:13 -0500
Subject: [PATCH 179/304] JW Player RTD Module - Limit scope to adUnits
 supporting instream video (#6227)

* checks if media type is video and jwtargeting is present

* adds early return

* adds tests for jwtargeting with banner or outtream

Co-authored-by: karimJWP <karimJWP@github.com>
---
 modules/jwplayerRtdProvider.js                | 21 +++++---
 test/spec/modules/jwplayerRtdProvider_spec.js | 50 ++++++++++++++-----
 2 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/modules/jwplayerRtdProvider.js b/modules/jwplayerRtdProvider.js
index 197c3c192c8..a29c4ce5fa7 100644
--- a/modules/jwplayerRtdProvider.js
+++ b/modules/jwplayerRtdProvider.js
@@ -146,6 +146,11 @@ function enrichBidRequest(bidReqConfig, onDone) {
 export function enrichAdUnits(adUnits) {
   const fpdFallback = config.getConfig('fpd.context.data.jwTargeting');
   adUnits.forEach(adUnit => {
+    const jwTargeting = extractPublisherParams(adUnit, fpdFallback);
+    if (!jwTargeting || !Object.keys(jwTargeting).length) {
+      return;
+    }
+
     const onVatResponse = function (vat) {
       if (!vat) {
         return;
@@ -153,25 +158,29 @@ export function enrichAdUnits(adUnits) {
       const targeting = formatTargetingResponse(vat);
       addTargetingToBids(adUnit.bids, targeting);
     };
-
-    const jwTargeting = extractPublisherParams(adUnit, fpdFallback);
     loadVat(jwTargeting, onVatResponse);
   });
 }
 
+function supportsInstreamVideo(mediaTypes) {
+  const video = mediaTypes && mediaTypes.video;
+  return video && video.context === 'instream';
+}
+
 export function extractPublisherParams(adUnit, fallback) {
   let adUnitTargeting;
   try {
     adUnitTargeting = adUnit.fpd.context.data.jwTargeting;
   } catch (e) {}
-  return Object.assign({}, fallback, adUnitTargeting);
-}
 
-function loadVat(params, onCompletion) {
-  if (!params || !Object.keys(params).length) {
+  if (!adUnitTargeting && !supportsInstreamVideo(adUnit.mediaTypes)) {
     return;
   }
 
+  return Object.assign({}, fallback, adUnitTargeting);
+}
+
+function loadVat(params, onCompletion) {
   const { playerID, mediaID } = params;
   if (pendingRequests[mediaID] !== undefined) {
     loadVatForPendingRequest(playerID, mediaID, onCompletion);
diff --git a/test/spec/modules/jwplayerRtdProvider_spec.js b/test/spec/modules/jwplayerRtdProvider_spec.js
index 48b432b6bb4..f7beb6ba486 100644
--- a/test/spec/modules/jwplayerRtdProvider_spec.js
+++ b/test/spec/modules/jwplayerRtdProvider_spec.js
@@ -413,19 +413,43 @@ describe('jwplayerRtdProvider', function() {
   });
 
   describe(' Extract Publisher Params', function () {
-    it('should default to config', function () {
-      const config = { mediaID: 'test' };
+    const config = { mediaID: 'test' };
 
-      const adUnit1 = { fpd: { context: {} } };
-      const targeting1 = extractPublisherParams(adUnit1, config);
-      expect(targeting1).to.deep.equal(config);
+    it('should exclude adUnits that do not support instream video and do not specify jwTargeting', function () {
+      const oustreamAdUnit = { mediaTypes: { video: { context: 'outstream' } } };
+      const oustreamTargeting = extractPublisherParams(oustreamAdUnit, config);
+      expect(oustreamTargeting).to.be.undefined;
 
-      const adUnit2 = { fpd: { context: { data: { jwTargeting: {} } } } };
-      const targeting2 = extractPublisherParams(adUnit2, config);
-      expect(targeting2).to.deep.equal(config);
+      const bannerAdUnit = { mediaTypes: { banner: {} } };
+      const bannerTargeting = extractPublisherParams(bannerAdUnit, config);
+      expect(bannerTargeting).to.be.undefined;
 
-      const targeting3 = extractPublisherParams(null, config);
-      expect(targeting3).to.deep.equal(config);
+      const targeting = extractPublisherParams({}, config);
+      expect(targeting).to.be.undefined;
+    });
+
+    it('should include ad unit when media type is video and is instream', function () {
+      const adUnit = { mediaTypes: { video: { context: 'instream' } } };
+      const targeting = extractPublisherParams(adUnit, config);
+      expect(targeting).to.deep.equal(config);
+    });
+
+    it('should include banner ad units that specify jwTargeting', function() {
+      const adUnit = { mediaTypes: { banner: {} }, fpd: { context: { data: { jwTargeting: {} } } } };
+      const targeting = extractPublisherParams(adUnit, config);
+      expect(targeting).to.deep.equal(config);
+    });
+
+    it('should include outstream ad units that specify jwTargeting', function() {
+      const adUnit = { mediaTypes: { video: { context: 'outstream' } }, fpd: { context: { data: { jwTargeting: {} } } } };
+      const targeting = extractPublisherParams(adUnit, config);
+      expect(targeting).to.deep.equal(config);
+    });
+
+    it('should fallback to config when empty jwTargeting is defined in ad unit', function () {
+      const adUnit = { fpd: { context: { data: { jwTargeting: {} } } } };
+      const targeting = extractPublisherParams(adUnit, config);
+      expect(targeting).to.deep.equal(config);
     });
 
     it('should prioritize adUnit properties ', function () {
@@ -450,9 +474,9 @@ describe('jwplayerRtdProvider', function() {
       expect(targeting).to.have.property('playerID', expectedPlayerID);
     });
 
-    it('should return empty object when Publisher Params are absent', function () {
-      const targeting = extractPublisherParams(null, null);
-      expect(targeting).to.deep.equal({});
+    it('should return undefined when Publisher Params are absent', function () {
+      const targeting = extractPublisherParams({}, null);
+      expect(targeting).to.be.undefined;
     })
   });
 

From 7970f51b51c7a359eeb88e84900eca1d55f476df Mon Sep 17 00:00:00 2001
From: oasis <2394426+bmwcmw@users.noreply.github.com>
Date: Tue, 26 Jan 2021 22:08:39 +0100
Subject: [PATCH 180/304] Criteo: Increment adapter version (#6218)

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

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 8f654dbe873..e3a6b9eaa12 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -8,7 +8,7 @@ import { verify } from 'criteo-direct-rsa-validate/build/verify.js';
 import { getStorageManager } from '../src/storageManager.js';
 
 const GVLID = 91;
-export const ADAPTER_VERSION = 32;
+export const ADAPTER_VERSION = 33;
 const BIDDER_CODE = 'criteo';
 const CDB_ENDPOINT = 'https://bidder.criteo.com/cdb';
 const PROFILE_ID_INLINE = 207;

From eefd2af9aea26da4ef93e929b39e3ab331647584 Mon Sep 17 00:00:00 2001
From: nllerandi3lift <75995508+nllerandi3lift@users.noreply.github.com>
Date: Tue, 26 Jan 2021 23:16:17 -0500
Subject: [PATCH 181/304] Triplelift Bid Adapter: Support for video floors
 (#6229)

* adds support for getFloor of video mediaTypes

* adds test for calling getFloor with correct mediaType

* checks that _getFloor converts string floors to float

Co-authored-by: Brandon Ling <51931757+blingster7@users.noreply.github.com>
---
 modules/tripleliftBidAdapter.js               |  4 +-
 .../spec/modules/tripleliftBidAdapter_spec.js | 51 +++++++++++++++++--
 2 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/modules/tripleliftBidAdapter.js b/modules/tripleliftBidAdapter.js
index 4679c1faf62..f97165f3d1c 100644
--- a/modules/tripleliftBidAdapter.js
+++ b/modules/tripleliftBidAdapter.js
@@ -174,8 +174,8 @@ function _getFloor (bid) {
   if (typeof bid.getFloor === 'function') {
     const floorInfo = bid.getFloor({
       currency: 'USD',
-      mediaType: 'banner',
-      size: _sizes(bid.sizes)
+      mediaType: _isInstreamBidRequest(bid) ? 'video' : 'banner',
+      size: '*'
     });
     if (typeof floorInfo === 'object' &&
     floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
diff --git a/test/spec/modules/tripleliftBidAdapter_spec.js b/test/spec/modules/tripleliftBidAdapter_spec.js
index 82578424027..c5d00f4db2b 100644
--- a/test/spec/modules/tripleliftBidAdapter_spec.js
+++ b/test/spec/modules/tripleliftBidAdapter_spec.js
@@ -597,13 +597,54 @@ describe('triplelift adapter', function () {
       expect(payload.ext).to.deep.equal(undefined);
     });
     it('should get floor from floors module if available', function() {
-      const floorInfo = {
-        currency: 'USD',
-        floor: 1.99
-      };
+      let floorInfo;
       bidRequests[0].getFloor = () => floorInfo;
-      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+
+      // standard float response; expected functionality of floors module
+      floorInfo = { currency: 'USD', floor: 1.99 };
+      let request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.imp[0].floor).to.equal(1.99);
+
+      // if string response, convert to float
+      floorInfo = { currency: 'USD', floor: '1.99' };
+      request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.imp[0].floor).to.equal(1.99);
+    });
+    it('should call getFloor with the correct parameters based on mediaType', function() {
+      bidRequests.forEach(request => {
+        request.getFloor = () => {};
+        sinon.spy(request, 'getFloor')
+      });
+
+      tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+
+      // banner
+      expect(bidRequests[0].getFloor.calledWith({
+        currency: 'USD',
+        mediaType: 'banner',
+        size: '*'
+      })).to.be.true;
+
+      // instream
+      expect(bidRequests[1].getFloor.calledWith({
+        currency: 'USD',
+        mediaType: 'video',
+        size: '*'
+      })).to.be.true;
+
+      // banner and incomplete video (POST will only include banner)
+      expect(bidRequests[3].getFloor.calledWith({
+        currency: 'USD',
+        mediaType: 'banner',
+        size: '*'
+      })).to.be.true;
+
+      // banner and instream (POST will only include video)
+      expect(bidRequests[5].getFloor.calledWith({
+        currency: 'USD',
+        mediaType: 'video',
+        size: '*'
+      })).to.be.true;
     });
     it('should send global config fpd if kvps are available', function() {
       const sens = null;

From 819176c94c9948bf12a4886d77bc7e6b2e501a44 Mon Sep 17 00:00:00 2001
From: mamatic <52153441+mamatic@users.noreply.github.com>
Date: Wed, 27 Jan 2021 11:40:13 +0100
Subject: [PATCH 182/304] ATS Analytics: Send additional analytics data (#6145)

* ATS-analytics - add new way to detect browser and add envelope_source

* ATS-analytics - implement preflight logic

* ATS-analytics - change analytics prod url

* ATS-analytics - fix LGTM and add console log to atsAnalyticsAdapter test

* ATS-analytics - fix internet explorer 11 bug

* ATS-analytics - add logs on parseBrowser function

* ATS-analytics - try check with indexOf function

* ATS-analytics - fix sinon restore for ie11

* ATS-analytics - fix sinon restore for ie11

* ATS-analytics - try to fix sinon restore for ie11

* ATS-analytics - try to fix sinon restore for ie11

* ATS-analytics - refactor unit tests for userAgent

* [ATS-Analytics] - Added semicolons

Co-authored-by: Nemanja Rajkovic <n.rajkovic@levi9.com>
---
 modules/atsAnalyticsAdapter.js                | 329 ++++++++++++++----
 modules/atsAnalyticsAdapter.md                |   1 -
 modules/identityLinkIdSystem.js               |  20 +-
 test/spec/modules/atsAnalyticsAdapter_spec.js |  84 ++---
 4 files changed, 302 insertions(+), 132 deletions(-)

diff --git a/modules/atsAnalyticsAdapter.js b/modules/atsAnalyticsAdapter.js
index a5bb3797bbf..3e618692725 100644
--- a/modules/atsAnalyticsAdapter.js
+++ b/modules/atsAnalyticsAdapter.js
@@ -3,26 +3,230 @@ import CONSTANTS from '../src/constants.json';
 import adaptermanager from '../src/adapterManager.js';
 import * as utils from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
+import {getStorageManager} from '../src/storageManager.js';
+
+export const storage = getStorageManager();
 
 const analyticsType = 'endpoint';
+// dev endpoints
+// const preflightUrl = 'https://analytics-check.publishersite.xyz/check/';
+// export const analyticsUrl = 'https://analyticsv2.publishersite.xyz';
+
+const preflightUrl = 'https://check.analytics.rlcdn.com/check/';
+export const analyticsUrl = 'https://analytics.rlcdn.com';
 
 let handlerRequest = [];
 let handlerResponse = [];
-let host = '';
+
+let atsAnalyticsAdapterVersion = 1;
+
+let browsersList = [
+  /* Googlebot */
+  {
+    test: /googlebot/i,
+    name: 'Googlebot'
+  },
+
+  /* Opera < 13.0 */
+  {
+    test: /opera/i,
+    name: 'Opera',
+  },
+
+  /* Opera > 13.0 */
+  {
+    test: /opr\/|opios/i,
+    name: 'Opera'
+  },
+  {
+    test: /SamsungBrowser/i,
+    name: 'Samsung Internet for Android',
+  },
+  {
+    test: /Whale/i,
+    name: 'NAVER Whale Browser',
+  },
+  {
+    test: /MZBrowser/i,
+    name: 'MZ Browser'
+  },
+  {
+    test: /focus/i,
+    name: 'Focus',
+  },
+  {
+    test: /swing/i,
+    name: 'Swing',
+  },
+  {
+    test: /coast/i,
+    name: 'Opera Coast',
+  },
+  {
+    test: /opt\/\d+(?:.?_?\d+)+/i,
+    name: 'Opera Touch',
+  },
+  {
+    test: /yabrowser/i,
+    name: 'Yandex Browser',
+  },
+  {
+    test: /ucbrowser/i,
+    name: 'UC Browser',
+  },
+  {
+    test: /Maxthon|mxios/i,
+    name: 'Maxthon',
+  },
+  {
+    test: /epiphany/i,
+    name: 'Epiphany',
+  },
+  {
+    test: /puffin/i,
+    name: 'Puffin',
+  },
+  {
+    test: /sleipnir/i,
+    name: 'Sleipnir',
+  },
+  {
+    test: /k-meleon/i,
+    name: 'K-Meleon',
+  },
+  {
+    test: /micromessenger/i,
+    name: 'WeChat',
+  },
+  {
+    test: /qqbrowser/i,
+    name: (/qqbrowserlite/i).test(window.navigator.userAgent) ? 'QQ Browser Lite' : 'QQ Browser',
+  },
+  {
+    test: /msie|trident/i,
+    name: 'Internet Explorer',
+  },
+  {
+    test: /\sedg\//i,
+    name: 'Microsoft Edge',
+  },
+  {
+    test: /edg([ea]|ios)/i,
+    name: 'Microsoft Edge',
+  },
+  {
+    test: /vivaldi/i,
+    name: 'Vivaldi',
+  },
+  {
+    test: /seamonkey/i,
+    name: 'SeaMonkey',
+  },
+  {
+    test: /sailfish/i,
+    name: 'Sailfish',
+  },
+  {
+    test: /silk/i,
+    name: 'Amazon Silk',
+  },
+  {
+    test: /phantom/i,
+    name: 'PhantomJS',
+  },
+  {
+    test: /slimerjs/i,
+    name: 'SlimerJS',
+  },
+  {
+    test: /blackberry|\bbb\d+/i,
+    name: 'BlackBerry',
+  },
+  {
+    test: /(web|hpw)[o0]s/i,
+    name: 'WebOS Browser',
+  },
+  {
+    test: /bada/i,
+    name: 'Bada',
+  },
+  {
+    test: /tizen/i,
+    name: 'Tizen',
+  },
+  {
+    test: /qupzilla/i,
+    name: 'QupZilla',
+  },
+  {
+    test: /firefox|iceweasel|fxios/i,
+    name: 'Firefox',
+  },
+  {
+    test: /electron/i,
+    name: 'Electron',
+  },
+  {
+    test: /MiuiBrowser/i,
+    name: 'Miui',
+  },
+  {
+    test: /chromium/i,
+    name: 'Chromium',
+  },
+  {
+    test: /chrome|crios|crmo/i,
+    name: 'Chrome',
+  },
+  {
+    test: /GSA/i,
+    name: 'Google Search',
+  },
+
+  /* Android Browser */
+  {
+    test: /android/i,
+    name: 'Android Browser',
+  },
+
+  /* PlayStation 4 */
+  {
+    test: /playstation 4/i,
+    name: 'PlayStation 4',
+  },
+
+  /* Safari */
+  {
+    test: /safari|applewebkit/i,
+    name: 'Safari',
+  },
+];
+
+function setSamplingCookie(samplRate) {
+  let now = new Date();
+  now.setTime(now.getTime() + 3600000);
+  storage.setCookie('_lr_sampling_rate', samplRate, now.toUTCString());
+}
+
+let listOfSupportedBrowsers = ['Safari', 'Chrome', 'Firefox', 'Microsoft Edge'];
 
 function bidRequestedHandler(args) {
+  let envelopeSourceCookieValue = storage.getCookie('_lr_env_src_ats');
+  let envelopeSource = envelopeSourceCookieValue === 'true';
   let requests;
   requests = args.bids.map(function(bid) {
     return {
+      envelope_source: envelopeSource,
       has_envelope: bid.userId ? !!bid.userId.idl_env : false,
       bidder: bid.bidder,
       bid_id: bid.bidId,
       auction_id: args.auctionId,
-      user_browser: checkUserBrowser(),
+      user_browser: parseBrowser(),
       user_platform: navigator.platform,
       auction_start: new Date(args.auctionStart).toJSON(),
       domain: window.location.hostname,
       pid: atsAnalyticsAdapter.context.pid,
+      adapter_version: atsAnalyticsAdapterVersion
     };
   });
   return requests;
@@ -38,58 +242,44 @@ function bidResponseHandler(args) {
   };
 }
 
-export function checkUserBrowser() {
-  let firefox = browserIsFirefox();
-  let chrome = browserIsChrome();
-  let edge = browserIsEdge();
-  let safari = browserIsSafari();
-  if (firefox) {
-    return firefox;
-  } if (chrome) {
-    return chrome;
-  } if (edge) {
-    return edge;
-  } if (safari) {
-    return safari;
-  } else {
-    return 'Unknown'
+export function parseBrowser() {
+  let ua = atsAnalyticsAdapter.getUserAgent();
+  try {
+    let result = browsersList.filter(function(obj) {
+      return obj.test.test(ua);
+    });
+    let browserName = result && result.length ? result[0].name : '';
+    return (listOfSupportedBrowsers.indexOf(browserName) >= 0) ? browserName : 'Unknown';
+  } catch (err) {
+    utils.logError('ATS Analytics - Error while checking user browser!', err);
   }
 }
 
-export function browserIsFirefox() {
-  if (typeof InstallTrigger !== 'undefined') {
-    return 'Firefox';
-  } else {
-    return false;
+function sendDataToAnalytic () {
+  // send data to ats analytic endpoint
+  try {
+    let dataToSend = {'Data': atsAnalyticsAdapter.context.events};
+    let strJSON = JSON.stringify(dataToSend);
+    utils.logInfo('ATS Analytics - tried to send analytics data!');
+    ajax(analyticsUrl, function () {
+    }, strJSON, {method: 'POST', contentType: 'application/json'});
+  } catch (err) {
+    utils.logError('ATS Analytics - request encounter an error: ', err);
   }
 }
 
-export function browserIsIE() {
-  return !!document.documentMode;
-}
-
-export function browserIsEdge() {
-  if (!browserIsIE() && !!window.StyleMedia) {
-    return 'Edge';
-  } else {
-    return false;
-  }
-}
-
-export function browserIsChrome() {
-  if ((!!window.chrome && (!!window.chrome.webstore || !!window.chrome.runtime)) || (/Android/i.test(navigator.userAgent) && !!window.chrome)) {
-    return 'Chrome';
-  } else {
-    return false;
-  }
-}
-
-export function browserIsSafari() {
-  if (window.safari !== undefined) {
-    return 'Safari'
-  } else {
-    return false;
-  }
+// preflight request, to check did publisher have permission to send data to analytics endpoint
+function preflightRequest (envelopeSourceCookieValue) {
+  ajax(preflightUrl + atsAnalyticsAdapter.context.pid, function (data) {
+    let samplingRateObject = JSON.parse(data);
+    utils.logInfo('ATS Analytics - Sampling Rate: ', samplingRateObject);
+    let samplingRate = samplingRateObject['samplingRate'];
+    setSamplingCookie(samplingRate);
+    let samplingRateNumber = Number(samplingRate);
+    if (data && samplingRate && atsAnalyticsAdapter.shouldFireRequest(samplingRateNumber) && envelopeSourceCookieValue != null) {
+      sendDataToAnalytic();
+    }
+  }, undefined, { method: 'GET', crossOrigin: true });
 }
 
 function callHandler(evtype, args) {
@@ -117,7 +307,6 @@ function callHandler(evtype, args) {
 
 let atsAnalyticsAdapter = Object.assign(adapter(
   {
-    host,
     analyticsType
   }),
 {
@@ -126,16 +315,19 @@ let atsAnalyticsAdapter = Object.assign(adapter(
       callHandler(eventType, args);
     }
     if (eventType === CONSTANTS.EVENTS.AUCTION_END) {
-      if (atsAnalyticsAdapter.shouldFireRequest()) {
-        // send data to ats analytic endpoint
-        try {
-          let dataToSend = {'Data': atsAnalyticsAdapter.context.events};
-          let strJSON = JSON.stringify(dataToSend);
-          utils.logInfo('atsAnalytics tried to send analytics data!');
-          ajax(atsAnalyticsAdapter.context.host, function () {
-          }, strJSON, {method: 'POST', contentType: 'application/json'});
-        } catch (err) {
+      let envelopeSourceCookieValue = storage.getCookie('_lr_env_src_ats');
+      try {
+        utils.logInfo('ATS Analytics - preflight request!');
+        let samplingRateCookie = storage.getCookie('_lr_sampling_rate');
+        if (!samplingRateCookie) {
+          preflightRequest(envelopeSourceCookieValue);
+        } else {
+          if (atsAnalyticsAdapter.shouldFireRequest(parseInt(samplingRateCookie)) && envelopeSourceCookieValue != null) {
+            sendDataToAnalytic();
+          }
         }
+      } catch (err) {
+        utils.logError('ATS Analytics - preflight request encounter an error: ', err);
       }
     }
   }
@@ -145,26 +337,23 @@ let atsAnalyticsAdapter = Object.assign(adapter(
 atsAnalyticsAdapter.originEnableAnalytics = atsAnalyticsAdapter.enableAnalytics;
 
 // add check to not fire request every time, but instead to send 1/10 events
-atsAnalyticsAdapter.shouldFireRequest = function () {
-  return (Math.floor((Math.random() * 11)) === 10);
-}
+atsAnalyticsAdapter.shouldFireRequest = function (samplingRate) {
+  let shouldFireRequestValue = (Math.floor((Math.random() * samplingRate + 1)) === samplingRate);
+  utils.logInfo('ATS Analytics - Should Fire Request: ', shouldFireRequestValue);
+  return shouldFireRequestValue;
+};
 
+atsAnalyticsAdapter.getUserAgent = function () {
+  return window.navigator.userAgent;
+};
 // override enableAnalytics so we can get access to the config passed in from the page
 atsAnalyticsAdapter.enableAnalytics = function (config) {
   if (!config.options.pid) {
-    utils.logError('Publisher ID (pid) option is not defined. Analytics won\'t work');
+    utils.logError('ATS Analytics - Publisher ID (pid) option is not defined. Analytics won\'t work');
     return;
   }
-
-  if (!config.options.host) {
-    utils.logError('Host option is not defined. Analytics won\'t work');
-    return;
-  }
-
-  host = config.options.host;
   atsAnalyticsAdapter.context = {
     events: [],
-    host: config.options.host,
     pid: config.options.pid
   };
   let initOptions = config.options;
diff --git a/modules/atsAnalyticsAdapter.md b/modules/atsAnalyticsAdapter.md
index 560ad237aa0..7c634f39ae2 100644
--- a/modules/atsAnalyticsAdapter.md
+++ b/modules/atsAnalyticsAdapter.md
@@ -17,7 +17,6 @@ Analytics adapter for Authenticated Traffic Solution(ATS), provided by LiveRamp.
   provider: 'atsAnalytics',
   options: {
      pid: '999', // publisher ID
-     host: 'https://example.com' // host is provided to publisher
   }
 }
 ```
diff --git a/modules/identityLinkIdSystem.js b/modules/identityLinkIdSystem.js
index 33dd74380ac..716929db70a 100644
--- a/modules/identityLinkIdSystem.js
+++ b/modules/identityLinkIdSystem.js
@@ -43,7 +43,7 @@ export const identityLinkSubmodule = {
   getId(config, consentData) {
     const configParams = (config && config.params) || {};
     if (!configParams || typeof configParams.pid !== 'string') {
-      utils.logError('identityLink submodule requires partner id to be defined');
+      utils.logError('identityLink: requires partner id to be defined');
       return;
     }
     const hasGdpr = (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) ? 1 : 0;
@@ -51,7 +51,7 @@ export const identityLinkSubmodule = {
     const tcfPolicyV2 = utils.deepAccess(consentData, 'vendorData.tcfPolicyVersion') === 2;
     // use protocol relative urls for http or https
     if (hasGdpr && (!gdprConsentString || gdprConsentString === '')) {
-      utils.logInfo('Consent string is required to call envelope API.');
+      utils.logInfo('identityLink: Consent string is required to call envelope API.');
       return;
     }
     const url = `https://api.rlcdn.com/api/identity/envelope?pid=${configParams.pid}${hasGdpr ? (tcfPolicyV2 ? '&ct=4&cv=' : '&ct=1&cv=') + gdprConsentString : ''}`;
@@ -60,10 +60,11 @@ export const identityLinkSubmodule = {
       // Check ats during callback so it has a chance to initialise.
       // If ats library is available, use it to retrieve envelope. If not use standard third party endpoint
       if (window.ats) {
-        utils.logInfo('ATS exists!');
+        utils.logInfo('identityLink: ATS exists!');
         window.ats.retrieveEnvelope(function (envelope) {
           if (envelope) {
-            utils.logInfo('An envelope can be retrieved from ATS!');
+            utils.logInfo('identityLink: An envelope can be retrieved from ATS!');
+            setEnvelopeSource(true);
             callback(JSON.parse(envelope).envelope);
           } else {
             getEnvelope(url, callback);
@@ -92,14 +93,15 @@ function getEnvelope(url, callback) {
       callback((responseObj && responseObj.envelope) ? responseObj.envelope : '');
     },
     error: error => {
-      utils.logInfo(`identityLink: ID fetch encountered an error`, error);
+      utils.logInfo(`identityLink: identityLink: ID fetch encountered an error`, error);
       callback();
     }
   };
 
   if (!storage.getCookie('_lr_retry_request')) {
     setRetryCookie();
-    utils.logInfo('A 3P retrieval is attempted!');
+    utils.logInfo('identityLink: A 3P retrieval is attempted!');
+    setEnvelopeSource(false);
     ajax(url, callbacks, undefined, { method: 'GET', withCredentials: true });
   }
 }
@@ -110,4 +112,10 @@ function setRetryCookie() {
   storage.setCookie('_lr_retry_request', 'true', now.toUTCString());
 }
 
+function setEnvelopeSource(src) {
+  let now = new Date();
+  now.setTime(now.getTime() + 2592000000);
+  storage.setCookie('_lr_env_src_ats', src, now.toUTCString());
+}
+
 submodule('userId', identityLinkSubmodule);
diff --git a/test/spec/modules/atsAnalyticsAdapter_spec.js b/test/spec/modules/atsAnalyticsAdapter_spec.js
index 84206337fad..59b9105925a 100644
--- a/test/spec/modules/atsAnalyticsAdapter_spec.js
+++ b/test/spec/modules/atsAnalyticsAdapter_spec.js
@@ -2,27 +2,38 @@ import atsAnalyticsAdapter from '../../../modules/atsAnalyticsAdapter.js';
 import { expect } from 'chai';
 import adapterManager from 'src/adapterManager.js';
 import {server} from '../../mocks/xhr.js';
-import {checkUserBrowser, browserIsChrome, browserIsEdge, browserIsSafari, browserIsFirefox} from '../../../modules/atsAnalyticsAdapter.js';
+import {parseBrowser} from '../../../modules/atsAnalyticsAdapter.js';
+import {getStorageManager} from '../../../src/storageManager.js';
+import {analyticsUrl} from '../../../modules/atsAnalyticsAdapter.js';
+
 let events = require('src/events');
 let constants = require('src/constants.json');
 
+export const storage = getStorageManager();
+
 describe('ats analytics adapter', function () {
   beforeEach(function () {
     sinon.stub(events, 'getEvents').returns([]);
+    storage.setCookie('_lr_env_src_ats', 'true', 'Thu, 01 Jan 1970 00:00:01 GMT');
   });
 
   afterEach(function () {
     events.getEvents.restore();
+    atsAnalyticsAdapter.getUserAgent.restore();
     atsAnalyticsAdapter.disableAnalytics();
   });
 
   describe('track', function () {
     it('builds and sends request and response data', function () {
       sinon.stub(atsAnalyticsAdapter, 'shouldFireRequest').returns(true);
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit/536.25 (KHTML, like Gecko) Version/6.0 Safari/536.25');
+      let now = new Date();
+      now.setTime(now.getTime() + 3600000);
+      storage.setCookie('_lr_env_src_ats', 'true', now.toUTCString());
+      storage.setCookie('_lr_sampling_rate', '10', now.toUTCString());
 
       let initOptions = {
-        pid: '10433394',
-        host: 'https://example.com/dev',
+        pid: '10433394'
       };
       let auctionTimestamp = 1496510254326;
 
@@ -74,13 +85,15 @@ describe('ats analytics adapter', function () {
       let expectedAfterBid = {
         'Data': [{
           'has_envelope': true,
+          'adapter_version': 1,
           'bidder': 'appnexus',
           'bid_id': '30c77d079cdf17',
           'auction_id': 'a5b849e5-87d7-4205-8300-d063084fcfb7',
-          'user_browser': checkUserBrowser(),
+          'user_browser': parseBrowser(),
           'user_platform': navigator.platform,
           'auction_start': '2020-02-03T14:14:25.161Z',
           'domain': window.location.hostname,
+          'envelope_source': true,
           'pid': '10433394',
           'response_time_stamp': '2020-02-03T14:23:11.978Z',
           'currency': 'USD',
@@ -132,76 +145,37 @@ describe('ats analytics adapter', function () {
       events.emit(constants.EVENTS.AUCTION_END, {});
 
       let requests = server.requests.filter(req => {
-        return req.url.indexOf(initOptions.host) > -1;
+        return req.url.indexOf(analyticsUrl) > -1;
       });
+
       expect(requests.length).to.equal(1);
 
       let realAfterBid = JSON.parse(requests[0].requestBody);
-
       // Step 6: assert real data after bid and expected data
       expect(realAfterBid['Data']).to.deep.equal(expectedAfterBid['Data']);
 
-      // check that the host and publisher ID is configured via options
-      expect(atsAnalyticsAdapter.context.host).to.equal(initOptions.host);
+      // check that the publisher ID is configured via options
       expect(atsAnalyticsAdapter.context.pid).to.equal(initOptions.pid);
     })
-    it('check browser is not safari', function () {
-      window.safari = undefined;
-      let browser = browserIsSafari();
-      expect(browser).to.equal(false);
-    })
     it('check browser is safari', function () {
-      window.safari = {};
-      let browser = browserIsSafari();
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit/536.25 (KHTML, like Gecko) Version/6.0 Safari/536.25');
+      let browser = parseBrowser();
       expect(browser).to.equal('Safari');
     })
-    it('check browser is not chrome', function () {
-      window.chrome = {
-        app: undefined,
-        webstore: undefined,
-        runtime: undefined
-      };
-      let browser = browserIsChrome();
-      expect(browser).to.equal(false);
-    })
     it('check browser is chrome', function () {
-      window.chrome = {
-        app: {},
-        webstore: {},
-        runtime: {}
-      };
-      let browser = browserIsChrome();
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (iPhone; CPU iPhone OS 13_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/80.0.3987.95 Mobile/15E148 Safari/604.1');
+      let browser = parseBrowser();
       expect(browser).to.equal('Chrome');
     })
     it('check browser is edge', function () {
-      Object.defineProperty(window, 'StyleMedia', {
-        value: {},
-        writable: true
-      });
-      Object.defineProperty(document, 'documentMode', {
-        value: undefined,
-        writable: true
-      });
-      let browser = browserIsEdge();
-      expect(browser).to.equal('Edge');
-    })
-    it('check browser is not edge', function () {
-      Object.defineProperty(document, 'documentMode', {
-        value: {},
-        writable: true
-      });
-      let browser = browserIsEdge();
-      expect(browser).to.equal(false);
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43');
+      let browser = parseBrowser();
+      expect(browser).to.equal('Microsoft Edge');
     })
     it('check browser is firefox', function () {
-      global.InstallTrigger = {};
-      let browser = browserIsFirefox();
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (iPhone; CPU OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/23.0  Mobile/15E148 Safari/605.1.15');
+      let browser = parseBrowser();
       expect(browser).to.equal('Firefox');
     })
-    it('check browser is not firefox', function () {
-      global.InstallTrigger = undefined;
-      let browser = browserIsFirefox();
-      expect(browser).to.equal(false);
-    })
   })
 })

From fdd646b379e475a861f847cb51adf34b951b7dba Mon Sep 17 00:00:00 2001
From: Ryan Schweitzer <50628828+r-schweitzer@users.noreply.github.com>
Date: Wed, 27 Jan 2021 12:37:17 +0100
Subject: [PATCH 183/304] Feature: Multiple Prebid Servers (#5992)

* adjusted for multiple prebid servers and added and adjusted units tests

* removed exra param

* fixed unit test

* adjusted testing module to work with mutliple configs
---
 modules/prebidServerBidAdapter/index.js       |  208 ++-
 modules/s2sTesting.js                         |   37 +-
 src/adapterManager.js                         |  297 +--
 src/prebid.js                                 |   18 +-
 test/fixtures/fixtures.js                     |    8 +-
 .../modules/prebidServerBidAdapter_spec.js    |  267 +--
 test/spec/modules/s2sTesting_spec.js          |   82 +-
 test/spec/unit/core/adapterManager_spec.js    | 1617 ++++++++++++-----
 8 files changed, 1705 insertions(+), 829 deletions(-)

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 3bf2ef76623..8fb512ff7e2 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -16,16 +16,21 @@ import find from 'core-js-pure/features/array/find.js';
 const getConfig = config.getConfig;
 
 const TYPE = S2S.SRC;
-let _synced = false;
+let _syncCount = 0;
 const DEFAULT_S2S_TTL = 60;
 const DEFAULT_S2S_CURRENCY = 'USD';
 const DEFAULT_S2S_NETREVENUE = true;
 
-let _s2sConfig;
+let _s2sConfigs;
 
 /**
  * @typedef {Object} AdapterOptions
  * @summary s2sConfig parameter that adds arguments to resulting OpenRTB payload that goes to Prebid Server
+ * @property {string} adapter
+ * @property {boolean} enabled
+ * @property {string} endpoint
+ * @property {string} syncEndpoint
+ * @property {number} timeout
  * @example
  * // example of multiple bidder configuration
  * pbjs.setConfig({
@@ -40,11 +45,24 @@ let _s2sConfig;
 
 /**
  * @typedef {Object} S2SDefaultConfig
- * @property {boolean} enabled
- * @property {number} timeout
- * @property {number} maxBids
- * @property {string} adapter
- * @property {AdapterOptions} adapterOptions
+ * @summary Base config properties for server to server header bidding
+ * @property {string} [adapter='prebidServer'] adapter code to use for S2S
+ * @property {boolean} [enabled=false] enables S2S bidding
+ * @property {number} [timeout=1000] timeout for S2S bidders - should be lower than `pbjs.requestBids({timeout})`
+ * @property {number} [maxBids=1]
+ * @property {AdapterOptions} [adapterOptions] adds arguments to resulting OpenRTB payload to Prebid Server
+ * @property {Object} [syncUrlModifier]
+ */
+
+/**
+ * @typedef {S2SDefaultConfig} S2SConfig
+ * @summary Configuration for server to server header bidding
+ * @property {string[]} bidders bidders to request S2S
+ * @property {string} endpoint endpoint to contact
+ * @property {string} [defaultVendor] used as key to select the bidder's default config from ßprebidServer/config.js
+ * @property {boolean} [cacheMarkup] whether to cache the adm result
+ * @property {string} [syncEndpoint] endpoint URL for syncing cookies
+ * @property {Object} [extPrebid] properties will be merged into request.ext.prebid
  */
 
 /**
@@ -64,30 +82,19 @@ config.setDefaults({
 });
 
 /**
- * Set config for server to server header bidding
- * @typedef {Object} options - required
- * @property {boolean} enabled enables S2S bidding
- * @property {string[]} bidders bidders to request S2S
- * @property {string} endpoint endpoint to contact
- *  === optional params below ===
- * @property {number} [timeout] timeout for S2S bidders - should be lower than `pbjs.requestBids({timeout})`
- * @property {number} [defaultTtl] ttl for S2S bidders when pbs does not return a ttl on the response - defaults to 60`
- * @property {boolean} [cacheMarkup] whether to cache the adm result
- * @property {string} [adapter] adapter code to use for S2S
- * @property {string} [syncEndpoint] endpoint URL for syncing cookies
- * @property {Object} [extPrebid] properties will be merged into request.ext.prebid
- * @property {AdapterOptions} [adapterOptions] adds arguments to resulting OpenRTB payload to Prebid Server
+ * @param {S2SConfig} option
+ * @return {boolean}
  */
-function setS2sConfig(options) {
-  if (options.defaultVendor) {
-    let vendor = options.defaultVendor;
-    let optionKeys = Object.keys(options);
+function updateConfigDefaultVendor(option) {
+  if (option.defaultVendor) {
+    let vendor = option.defaultVendor;
+    let optionKeys = Object.keys(option);
     if (S2S_VENDORS[vendor]) {
       // vendor keys will be set if either: the key was not specified by user
       // or if the user did not set their own distinct value (ie using the system default) to override the vendor
       Object.keys(S2S_VENDORS[vendor]).forEach((vendorKey) => {
-        if (s2sDefaultConfig[vendorKey] === options[vendorKey] || !includes(optionKeys, vendorKey)) {
-          options[vendorKey] = S2S_VENDORS[vendor][vendorKey];
+        if (s2sDefaultConfig[vendorKey] === option[vendorKey] || !includes(optionKeys, vendorKey)) {
+          option[vendorKey] = S2S_VENDORS[vendor][vendorKey];
         }
       });
     } else {
@@ -95,9 +102,14 @@ function setS2sConfig(options) {
       return false;
     }
   }
+}
 
-  let keys = Object.keys(options);
-
+/**
+ * @param {S2SConfig} option
+ * @return {boolean}
+ */
+function validateConfigRequiredProps(option) {
+  const keys = Object.keys(option);
   if (['accountId', 'bidders', 'endpoint'].filter(key => {
     if (!includes(keys, key)) {
       utils.logError(key + ' missing in server to server config');
@@ -105,10 +117,43 @@ function setS2sConfig(options) {
     }
     return false;
   }).length > 0) {
+    return false;
+  }
+}
+
+/**
+ * @param {(S2SConfig[]|S2SConfig)} options
+ */
+function setS2sConfig(options) {
+  if (!options) {
     return;
   }
+  const normalizedOptions = Array.isArray(options) ? options : [options];
+
+  const activeBidders = [];
+  const optionsValid = normalizedOptions.every((option, i, array) => {
+    const updateSuccess = updateConfigDefaultVendor(option);
+    if (updateSuccess !== false) {
+      const valid = validateConfigRequiredProps(option);
+      if (valid !== false) {
+        if (Array.isArray(option['bidders'])) {
+          array[i]['bidders'] = option['bidders'].filter(bidder => {
+            if (activeBidders.indexOf(bidder) === -1) {
+              activeBidders.push(bidder);
+              return true;
+            }
+            return false;
+          });
+        }
+        return true;
+      }
+    }
+    return false;
+  });
 
-  _s2sConfig = options;
+  if (optionsValid) {
+    return _s2sConfigs = normalizedOptions;
+  }
 }
 getConfig('s2sConfig', ({s2sConfig}) => setS2sConfig(s2sConfig));
 
@@ -116,25 +161,25 @@ getConfig('s2sConfig', ({s2sConfig}) => setS2sConfig(s2sConfig));
  * resets the _synced variable back to false, primiarily used for testing purposes
 */
 export function resetSyncedStatus() {
-  _synced = false;
+  _syncCount = 0;
 }
 
 /**
  * @param  {Array} bidderCodes list of bidders to request user syncs for.
  */
-function queueSync(bidderCodes, gdprConsent, uspConsent) {
-  if (_synced) {
+function queueSync(bidderCodes, gdprConsent, uspConsent, s2sConfig) {
+  if (_s2sConfigs.length === _syncCount) {
     return;
   }
-  _synced = true;
+  _syncCount++;
 
   const payload = {
     uuid: utils.generateUUID(),
     bidders: bidderCodes,
-    account: _s2sConfig.accountId
+    account: s2sConfig.accountId
   };
 
-  let userSyncLimit = _s2sConfig.userSyncLimit;
+  let userSyncLimit = s2sConfig.userSyncLimit;
   if (utils.isNumber(userSyncLimit) && userSyncLimit > 0) {
     payload['limit'] = userSyncLimit;
   }
@@ -156,11 +201,11 @@ function queueSync(bidderCodes, gdprConsent, uspConsent) {
   }
 
   const jsonPayload = JSON.stringify(payload);
-  ajax(_s2sConfig.syncEndpoint,
+  ajax(s2sConfig.syncEndpoint,
     (response) => {
       try {
         response = JSON.parse(response);
-        doAllSyncs(response.bidder_status);
+        doAllSyncs(response.bidder_status, s2sConfig);
       } catch (e) {
         utils.logError(e);
       }
@@ -172,16 +217,16 @@ function queueSync(bidderCodes, gdprConsent, uspConsent) {
     });
 }
 
-function doAllSyncs(bidders) {
+function doAllSyncs(bidders, s2sConfig) {
   if (bidders.length === 0) {
     return;
   }
 
   const thisSync = bidders.pop();
   if (thisSync.no_cookie) {
-    doPreBidderSync(thisSync.usersync.type, thisSync.usersync.url, thisSync.bidder, utils.bind.call(doAllSyncs, null, bidders));
+    doPreBidderSync(thisSync.usersync.type, thisSync.usersync.url, thisSync.bidder, utils.bind.call(doAllSyncs, null, bidders, s2sConfig), s2sConfig);
   } else {
-    doAllSyncs(bidders);
+    doAllSyncs(bidders, s2sConfig);
   }
 }
 
@@ -192,10 +237,11 @@ function doAllSyncs(bidders) {
  * @param {string} url the url to sync
  * @param {string} bidder name of bidder doing sync for
  * @param {function} done an exit callback; to signify this pixel has either: finished rendering or something went wrong
+ * @param {S2SConfig} s2sConfig
  */
-function doPreBidderSync(type, url, bidder, done) {
-  if (_s2sConfig.syncUrlModifier && typeof _s2sConfig.syncUrlModifier[bidder] === 'function') {
-    const newSyncUrl = _s2sConfig.syncUrlModifier[bidder](type, url, bidder);
+function doPreBidderSync(type, url, bidder, done, s2sConfig) {
+  if (s2sConfig.syncUrlModifier && typeof s2sConfig.syncUrlModifier[bidder] === 'function') {
+    const newSyncUrl = s2sConfig.syncUrlModifier[bidder](type, url, bidder);
     doBidderSync(type, newSyncUrl, bidder, done)
   } else {
     doBidderSync(type, url, bidder, done)
@@ -240,13 +286,13 @@ function doClientSideSyncs(bidders) {
   });
 }
 
-function _appendSiteAppDevice(request, pageUrl) {
+function _appendSiteAppDevice(request, pageUrl, accountId) {
   if (!request) return;
 
   // ORTB specifies app OR site
   if (typeof config.getConfig('app') === 'object') {
     request.app = config.getConfig('app');
-    request.app.publisher = {id: _s2sConfig.accountId}
+    request.app.publisher = {id: accountId}
   } else {
     request.site = {};
     if (utils.isPlainObject(config.getConfig('site'))) {
@@ -254,7 +300,7 @@ function _appendSiteAppDevice(request, pageUrl) {
     }
     // set publisher.id if not already defined
     if (!utils.deepAccess(request.site, 'publisher.id')) {
-      utils.deepSetValue(request.site, 'publisher.id', _s2sConfig.accountId);
+      utils.deepSetValue(request.site, 'publisher.id', accountId);
     }
     // set site.page if not already defined
     if (!request.site.page) {
@@ -409,7 +455,7 @@ export function resetWurlMap() {
 }
 
 const OPEN_RTB_PROTOCOL = {
-  buildRequest(s2sBidRequest, bidRequests, adUnits) {
+  buildRequest(s2sBidRequest, bidRequests, adUnits, s2sConfig) {
     let imps = [];
     let aliases = {};
     const firstBidRequest = bidRequests[0];
@@ -555,11 +601,11 @@ const OPEN_RTB_PROTOCOL = {
         if (adapter && adapter.getSpec().transformBidParams) {
           bid.params = adapter.getSpec().transformBidParams(bid.params, true);
         }
-        acc[bid.bidder] = (_s2sConfig.adapterOptions && _s2sConfig.adapterOptions[bid.bidder]) ? Object.assign({}, bid.params, _s2sConfig.adapterOptions[bid.bidder]) : bid.params;
+        acc[bid.bidder] = (s2sConfig.adapterOptions && s2sConfig.adapterOptions[bid.bidder]) ? Object.assign({}, bid.params, s2sConfig.adapterOptions[bid.bidder]) : bid.params;
         return acc;
       }, {});
 
-      const imp = { id: adUnit.code, ext, secure: _s2sConfig.secure };
+      const imp = { id: adUnit.code, ext, secure: s2sConfig.secure };
 
       /**
        * Prebid AdSlot
@@ -601,7 +647,7 @@ const OPEN_RTB_PROTOCOL = {
     const request = {
       id: s2sBidRequest.tid,
       source: {tid: s2sBidRequest.tid},
-      tmax: _s2sConfig.timeout,
+      tmax: s2sConfig.timeout,
       imp: imps,
       test: getConfig('debug') ? 1 : 0,
       ext: {
@@ -619,8 +665,8 @@ const OPEN_RTB_PROTOCOL = {
     };
 
     // s2sConfig video.ext.prebid is passed through openrtb to PBS
-    if (_s2sConfig.extPrebid && typeof _s2sConfig.extPrebid === 'object') {
-      request.ext.prebid = Object.assign(request.ext.prebid, _s2sConfig.extPrebid);
+    if (s2sConfig.extPrebid && typeof s2sConfig.extPrebid === 'object') {
+      request.ext.prebid = Object.assign(request.ext.prebid, s2sConfig.extPrebid);
     }
 
     /**
@@ -635,7 +681,7 @@ const OPEN_RTB_PROTOCOL = {
       request.cur = [adServerCur[0]];
     }
 
-    _appendSiteAppDevice(request, firstBidRequest.refererInfo.referer);
+    _appendSiteAppDevice(request, bidRequests[0].refererInfo.referer, s2sConfig.accountId);
 
     // pass schain object if it is present
     const schain = utils.deepAccess(bidRequests, '0.bids.0.schain');
@@ -690,7 +736,7 @@ const OPEN_RTB_PROTOCOL = {
     return request;
   },
 
-  interpretResponse(response, bidderRequests) {
+  interpretResponse(response, bidderRequests, s2sConfig) {
     const bids = [];
 
     [['errors', 'serverErrors'], ['responsetimemillis', 'serverResponseTimeMs']]
@@ -847,8 +893,8 @@ const OPEN_RTB_PROTOCOL = {
           bidObject.meta = bidObject.meta || {};
           if (bid.adomain) { bidObject.meta.advertiserDomains = bid.adomain; }
 
-          const configTtl = _s2sConfig.defaultTtl || DEFAULT_S2S_TTL;
           // the OpenRTB location for "TTL" as understood by Prebid.js is "exp" (expiration).
+          const configTtl = s2sConfig.defaultTtl || DEFAULT_S2S_TTL;
           bidObject.ttl = (bid.exp) ? bid.exp : configTtl;
           bidObject.netRevenue = (bid.netRevenue) ? bid.netRevenue : DEFAULT_S2S_NETREVENUE;
 
@@ -897,37 +943,39 @@ export function PrebidServer() {
       .reduce(utils.flatten)
       .filter(utils.uniques);
 
-    if (_s2sConfig && _s2sConfig.syncEndpoint) {
-      let gdprConsent, uspConsent;
-      if (Array.isArray(bidRequests) && bidRequests.length > 0) {
-        gdprConsent = bidRequests[0].gdprConsent;
-        uspConsent = bidRequests[0].uspConsent;
-      }
+    if (Array.isArray(_s2sConfigs)) {
+      if (s2sBidRequest.s2sConfig && s2sBidRequest.s2sConfig.syncEndpoint) {
+        let gdprConsent, uspConsent;
+        if (Array.isArray(bidRequests) && bidRequests.length > 0) {
+          gdprConsent = bidRequests[0].gdprConsent;
+          uspConsent = bidRequests[0].uspConsent;
+        }
 
-      let syncBidders = _s2sConfig.bidders
-        .map(bidder => adapterManager.aliasRegistry[bidder] || bidder)
-        .filter((bidder, index, array) => (array.indexOf(bidder) === index));
+        let syncBidders = s2sBidRequest.s2sConfig.bidders
+          .map(bidder => adapterManager.aliasRegistry[bidder] || bidder)
+          .filter((bidder, index, array) => (array.indexOf(bidder) === index));
 
-      queueSync(syncBidders, gdprConsent, uspConsent);
-    }
+        queueSync(syncBidders, gdprConsent, uspConsent, s2sBidRequest.s2sConfig);
+      }
 
-    const request = OPEN_RTB_PROTOCOL.buildRequest(s2sBidRequest, bidRequests, validAdUnits);
-    const requestJson = request && JSON.stringify(request);
-    if (request && requestJson) {
-      ajax(
-        _s2sConfig.endpoint,
-        {
-          success: response => handleResponse(response, requestedBidders, bidRequests, addBidResponse, done),
-          error: done
-        },
-        requestJson,
-        { contentType: 'text/plain', withCredentials: true }
-      );
+      const request = OPEN_RTB_PROTOCOL.buildRequest(s2sBidRequest, bidRequests, validAdUnits, s2sBidRequest.s2sConfig);
+      const requestJson = request && JSON.stringify(request);
+      if (request && requestJson) {
+        ajax(
+          s2sBidRequest.s2sConfig.endpoint,
+          {
+            success: response => handleResponse(response, requestedBidders, bidRequests, addBidResponse, done, s2sBidRequest.s2sConfig),
+            error: done
+          },
+          requestJson,
+          { contentType: 'text/plain', withCredentials: true }
+        );
+      }
     }
   };
 
   /* Notify Prebid of bid responses so bids can get in the auction */
-  function handleResponse(response, requestedBidders, bidderRequests, addBidResponse, done) {
+  function handleResponse(response, requestedBidders, bidderRequests, addBidResponse, done, s2sConfig) {
     let result;
     let bids = [];
 
@@ -937,7 +985,7 @@ export function PrebidServer() {
       bids = OPEN_RTB_PROTOCOL.interpretResponse(
         result,
         bidderRequests,
-        requestedBidders
+        s2sConfig
       );
 
       bids.forEach(({adUnit, bid}) => {
diff --git a/modules/s2sTesting.js b/modules/s2sTesting.js
index 98b3b86671c..1f2bb473174 100644
--- a/modules/s2sTesting.js
+++ b/modules/s2sTesting.js
@@ -1,4 +1,3 @@
-import { config } from '../src/config.js';
 import { setS2STestingModule } from '../src/adapterManager.js';
 
 let s2sTesting = {};
@@ -9,39 +8,31 @@ const CLIENT = 'client';
 s2sTesting.SERVER = SERVER;
 s2sTesting.CLIENT = CLIENT;
 
-var testing = false; // whether testing is turned on
-var bidSource = {}; // store bidder sources determined from s2sConfing bidderControl
+s2sTesting.bidSource = {}; // store bidder sources determined from s2sConfig bidderControl
 s2sTesting.globalRand = Math.random(); // if 10% of bidderA and 10% of bidderB should be server-side, make it the same 10%
 
-// load s2sConfig
-config.getConfig('s2sConfig', config => {
-  testing = config.s2sConfig && config.s2sConfig.testing;
-  s2sTesting.calculateBidSources(config.s2sConfig);
-});
-
-s2sTesting.getSourceBidderMap = function(adUnits = []) {
+s2sTesting.getSourceBidderMap = function(adUnits = [], allS2SBidders = []) {
   var sourceBidders = {[SERVER]: {}, [CLIENT]: {}};
 
-  // bail if testing is not turned on
-  if (!testing) {
-    return {[SERVER]: [], [CLIENT]: []};
-  }
-
   adUnits.forEach((adUnit) => {
     // if any adUnit bidders specify a bidSource, include them
     (adUnit.bids || []).forEach((bid) => {
+      // When a s2sConfig does not have testing=true and did not calc bid sources
+      if (allS2SBidders.indexOf(bid.bidder) > -1 && !s2sTesting.bidSource[bid.bidder]) {
+        s2sTesting.bidSource[bid.bidder] = SERVER;
+      }
       // calculate the source once and store on bid object
       bid.calcSource = bid.calcSource || s2sTesting.getSource(bid.bidSource);
       // if no bidSource at bid level, default to bidSource from bidder
-      bid.finalSource = bid.calcSource || bidSource[bid.bidder] || CLIENT; // default to client
+      bid.finalSource = bid.calcSource || s2sTesting.bidSource[bid.bidder] || CLIENT; // default to client
       // add bidder to sourceBidders data structure
       sourceBidders[bid.finalSource][bid.bidder] = true;
     });
   });
 
   // make sure all bidders in bidSource are in sourceBidders
-  Object.keys(bidSource).forEach((bidder) => {
-    sourceBidders[bidSource[bidder]][bidder] = true;
+  Object.keys(s2sTesting.bidSource).forEach((bidder) => {
+    sourceBidders[s2sTesting.bidSource[bidder]][bidder] = true;
   });
 
   // return map of source => array of bidders
@@ -53,18 +44,14 @@ s2sTesting.getSourceBidderMap = function(adUnits = []) {
 
 /**
  * @function calculateBidSources determines the source for each s2s bidder based on bidderControl weightings.  these can be overridden at the adUnit level
- * @param s2sConfig server-to-server configuration
+ * @param s2sConfigs server-to-server configuration
  */
 s2sTesting.calculateBidSources = function(s2sConfig = {}) {
-  // bail if testing is not turned on
-  if (!testing) {
-    return;
-  }
-  bidSource = {}; // reset bid sources
   // calculate bid source (server/client) for each s2s bidder
+
   var bidderControl = s2sConfig.bidderControl || {};
   (s2sConfig.bidders || []).forEach((bidder) => {
-    bidSource[bidder] = s2sTesting.getSource(bidderControl[bidder] && bidderControl[bidder].bidSource) || SERVER; // default to server
+    s2sTesting.bidSource[bidder] = s2sTesting.getSource(bidderControl[bidder] && bidderControl[bidder].bidSource) || SERVER; // default to server
   });
 };
 
diff --git a/src/adapterManager.js b/src/adapterManager.js
index d5c07b847cc..9c3ef7ac1d1 100644
--- a/src/adapterManager.js
+++ b/src/adapterManager.js
@@ -22,9 +22,11 @@ let adapterManager = {};
 let _bidderRegistry = adapterManager.bidderRegistry = {};
 let _aliasRegistry = adapterManager.aliasRegistry = {};
 
-let _s2sConfig = {};
+let _s2sConfigs = [];
 config.getConfig('s2sConfig', config => {
-  _s2sConfig = config.s2sConfig;
+  if (config && config.s2sConfig) {
+    _s2sConfigs = Array.isArray(config.s2sConfig) ? config.s2sConfig : [config.s2sConfig];
+  }
 });
 
 var _analyticsRegistry = {};
@@ -118,15 +120,15 @@ function getBids({bidderCode, auctionId, bidderRequestId, adUnits, labels, src})
 
 const hookedGetBids = hook('sync', getBids, 'getBids');
 
-function getAdUnitCopyForPrebidServer(adUnits) {
-  let adaptersServerSide = _s2sConfig.bidders;
+function getAdUnitCopyForPrebidServer(adUnits, s2sConfig) {
+  let adaptersServerSide = s2sConfig.bidders;
   let adUnitsCopy = utils.deepClone(adUnits);
 
   adUnitsCopy.forEach((adUnit) => {
     // filter out client side bids
     adUnit.bids = adUnit.bids.filter((bid) => {
       return includes(adaptersServerSide, bid.bidder) &&
-        (!doingS2STesting() || bid.finalSource !== s2sTestingModule.CLIENT);
+        (!doingS2STesting(s2sConfig) || bid.finalSource !== s2sTestingModule.CLIENT);
     }).map((bid) => {
       bid.bid_id = utils.getUniqueIdentifierStr();
       return bid;
@@ -145,7 +147,7 @@ function getAdUnitCopyForClientAdapters(adUnits) {
   // filter out s2s bids
   adUnitsClientCopy.forEach((adUnit) => {
     adUnit.bids = adUnit.bids.filter((bid) => {
-      return !doingS2STesting() || bid.finalSource !== s2sTestingModule.SERVER;
+      return !clientTestAdapters.length || bid.finalSource !== s2sTestingModule.SERVER;
     })
   });
 
@@ -177,6 +179,21 @@ export let uspDataHandler = {
   }
 };
 
+// export for testing
+export let clientTestAdapters = [];
+export const allS2SBidders = [];
+
+export function getAllS2SBidders() {
+  adapterManager.s2STestingEnabled = false;
+  _s2sConfigs.forEach(s2sConfig => {
+    if (s2sConfig && s2sConfig.enabled) {
+      if (s2sConfig.bidders && s2sConfig.bidders.length) {
+        allS2SBidders.push(...s2sConfig.bidders);
+      }
+    }
+  })
+}
+
 adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, auctionId, cbTimeout, labels) {
   /**
    * emit and pass adunits for external modification
@@ -184,8 +201,6 @@ adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, a
    */
   events.emit(CONSTANTS.EVENTS.BEFORE_REQUEST_BIDS, adUnits);
 
-  let bidRequests = [];
-
   let bidderCodes = getBidderCodes(adUnits);
   if (config.getConfig('bidderSequence') === RANDOM) {
     bidderCodes = shuffle(bidderCodes);
@@ -193,70 +208,86 @@ adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, a
   const refererInfo = getRefererInfo();
 
   let clientBidderCodes = bidderCodes;
-  let clientTestAdapters = [];
-
-  if (_s2sConfig.enabled) {
-    // if s2sConfig.bidderControl testing is turned on
-    if (doingS2STesting()) {
-      // get all adapters doing client testing
-      const bidderMap = s2sTestingModule.getSourceBidderMap(adUnits);
-      clientTestAdapters = bidderMap[s2sTestingModule.CLIENT];
-    }
-
-    // these are called on the s2s adapter
-    let adaptersServerSide = _s2sConfig.bidders;
 
-    // don't call these client side (unless client request is needed for testing)
-    clientBidderCodes = bidderCodes.filter(elm =>
-      !includes(adaptersServerSide, elm) || includes(clientTestAdapters, elm)
-    );
+  let bidRequests = [];
 
-    const adUnitsContainServerRequests = adUnits => Boolean(
-      find(adUnits, adUnit => find(adUnit.bids, bid => (
-        bid.bidSource ||
-        (_s2sConfig.bidderControl && _s2sConfig.bidderControl[bid.bidder])
-      ) && bid.finalSource === s2sTestingModule.SERVER))
-    );
+  if (allS2SBidders.length === 0) {
+    getAllS2SBidders();
+  }
 
-    if (isTestingServerOnly() && adUnitsContainServerRequests(adUnits)) {
-      clientBidderCodes.length = 0;
+  _s2sConfigs.forEach(s2sConfig => {
+    if (s2sConfig && s2sConfig.enabled) {
+      if (doingS2STesting(s2sConfig)) {
+        s2sTestingModule.calculateBidSources(s2sConfig);
+        const bidderMap = s2sTestingModule.getSourceBidderMap(adUnits, allS2SBidders);
+        // get all adapters doing client testing
+        bidderMap[s2sTestingModule.CLIENT].forEach(bidder => {
+          if (!includes(clientTestAdapters, bidder)) {
+            clientTestAdapters.push(bidder);
+          }
+        })
+      }
     }
+  })
 
-    let adUnitsS2SCopy = getAdUnitCopyForPrebidServer(adUnits);
-    let tid = utils.generateUUID();
-    adaptersServerSide.forEach(bidderCode => {
-      const bidderRequestId = utils.getUniqueIdentifierStr();
-      const bidderRequest = {
-        bidderCode,
-        auctionId,
-        bidderRequestId,
-        tid,
-        bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': utils.deepClone(adUnitsS2SCopy), labels, src: CONSTANTS.S2S.SRC}),
-        auctionStart: auctionStart,
-        timeout: _s2sConfig.timeout,
-        src: CONSTANTS.S2S.SRC,
-        refererInfo
-      };
-      if (bidderRequest.bids.length !== 0) {
-        bidRequests.push(bidderRequest);
+  // don't call these client side (unless client request is needed for testing)
+  clientBidderCodes = bidderCodes.filter(bidderCode => {
+    return !includes(allS2SBidders, bidderCode) || includes(clientTestAdapters, bidderCode)
+  });
+
+  // these are called on the s2s adapter
+  let adaptersServerSide = allS2SBidders;
+
+  const adUnitsContainServerRequests = (adUnits, s2sConfig) => Boolean(
+    find(adUnits, adUnit => find(adUnit.bids, bid => (
+      bid.bidSource ||
+      (s2sConfig.bidderControl && s2sConfig.bidderControl[bid.bidder])
+    ) && bid.finalSource === s2sTestingModule.SERVER))
+  );
+
+  _s2sConfigs.forEach(s2sConfig => {
+    if (s2sConfig && s2sConfig.enabled) {
+      if ((isTestingServerOnly(s2sConfig) && adUnitsContainServerRequests(adUnits, s2sConfig))) {
+        utils.logWarn('testServerOnly: True.  All client requests will be suppressed.');
+        clientBidderCodes.length = 0;
       }
-    });
 
-    // update the s2sAdUnits object and remove all bids that didn't pass sizeConfig/label checks from getBids()
-    // this is to keep consistency and only allow bids/adunits that passed the checks to go to pbs
-    adUnitsS2SCopy.forEach((adUnitCopy) => {
-      let validBids = adUnitCopy.bids.filter((adUnitBid) => {
-        return find(bidRequests, request => {
-          return find(request.bids, (reqBid) => reqBid.bidId === adUnitBid.bid_id);
-        });
+      let adUnitsS2SCopy = getAdUnitCopyForPrebidServer(adUnits, s2sConfig);
+      let tid = utils.generateUUID();
+      adaptersServerSide.forEach(bidderCode => {
+        const bidderRequestId = utils.getUniqueIdentifierStr();
+        const bidderRequest = {
+          bidderCode,
+          auctionId,
+          bidderRequestId,
+          tid,
+          bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': utils.deepClone(adUnitsS2SCopy), labels, src: CONSTANTS.S2S.SRC}),
+          auctionStart: auctionStart,
+          timeout: s2sConfig.timeout,
+          src: CONSTANTS.S2S.SRC,
+          refererInfo
+        };
+        if (bidderRequest.bids.length !== 0) {
+          bidRequests.push(bidderRequest);
+        }
       });
-      adUnitCopy.bids = validBids;
-    });
 
-    bidRequests.forEach(request => {
-      request.adUnitsS2SCopy = adUnitsS2SCopy.filter(adUnitCopy => adUnitCopy.bids.length > 0);
-    });
-  }
+      // update the s2sAdUnits object and remove all bids that didn't pass sizeConfig/label checks from getBids()
+      // this is to keep consistency and only allow bids/adunits that passed the checks to go to pbs
+      adUnitsS2SCopy.forEach((adUnitCopy) => {
+        let validBids = adUnitCopy.bids.filter((adUnitBid) =>
+          find(bidRequests, request =>
+            find(request.bids, (reqBid) => reqBid.bidId === adUnitBid.bid_id)));
+        adUnitCopy.bids = validBids;
+      });
+
+      bidRequests.forEach(request => {
+        if (request.adUnitsS2SCopy === undefined) {
+          request.adUnitsS2SCopy = adUnitsS2SCopy.filter(adUnitCopy => adUnitCopy.bids.length > 0);
+        }
+      });
+    }
+  })
 
   // client adapters
   let adUnitsClientCopy = getAdUnitCopyForClientAdapters(adUnits);
@@ -306,56 +337,74 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
     return partitions;
   }, [[], []]);
 
-  if (serverBidRequests.length) {
-    // s2s should get the same client side timeout as other client side requests.
-    const s2sAjax = ajaxBuilder(requestBidsTimeout, requestCallbacks ? {
-      request: requestCallbacks.request.bind(null, 's2s'),
-      done: requestCallbacks.done
-    } : undefined);
-    let adaptersServerSide = _s2sConfig.bidders;
-    const s2sAdapter = _bidderRegistry[_s2sConfig.adapter];
-    let tid = serverBidRequests[0].tid;
-    let adUnitsS2SCopy = serverBidRequests[0].adUnitsS2SCopy;
-
-    if (s2sAdapter) {
-      let s2sBidRequest = {tid, 'ad_units': adUnitsS2SCopy};
-      if (s2sBidRequest.ad_units.length) {
-        let doneCbs = serverBidRequests.map(bidRequest => {
-          bidRequest.start = timestamp();
-          return doneCb.bind(bidRequest);
-        });
-
-        // only log adapters that actually have adUnit bids
-        let allBidders = s2sBidRequest.ad_units.reduce((adapters, adUnit) => {
-          return adapters.concat((adUnit.bids || []).reduce((adapters, bid) => { return adapters.concat(bid.bidder) }, []));
-        }, []);
-        utils.logMessage(`CALLING S2S HEADER BIDDERS ==== ${adaptersServerSide.filter(adapter => {
-          return includes(allBidders, adapter);
-        }).join(',')}`);
-
-        // fire BID_REQUESTED event for each s2s bidRequest
-        serverBidRequests.forEach(bidRequest => {
-          events.emit(CONSTANTS.EVENTS.BID_REQUESTED, bidRequest);
-        });
+  var uniqueServerBidRequests = [];
+  serverBidRequests.forEach(serverBidRequest => {
+    var index = -1;
+    for (var i = 0; i < uniqueServerBidRequests.length; ++i) {
+      if (serverBidRequest.tid === uniqueServerBidRequests[i].tid) {
+        index = i;
+        break;
+      }
+    }
+    if (index <= -1) {
+      uniqueServerBidRequests.push(serverBidRequest);
+    }
+  });
 
-        // make bid requests
-        s2sAdapter.callBids(
-          s2sBidRequest,
-          serverBidRequests,
-          function(adUnitCode, bid) {
-            let bidderRequest = getBidderRequest(serverBidRequests, bid.bidderCode, adUnitCode);
-            if (bidderRequest) {
-              addBidResponse.call(bidderRequest, adUnitCode, bid)
-            }
-          },
-          () => doneCbs.forEach(done => done()),
-          s2sAjax
-        );
+  let counter = 0
+  _s2sConfigs.forEach((s2sConfig) => {
+    if (s2sConfig && uniqueServerBidRequests[counter] && includes(s2sConfig.bidders, uniqueServerBidRequests[counter].bidderCode)) {
+      // s2s should get the same client side timeout as other client side requests.
+      const s2sAjax = ajaxBuilder(requestBidsTimeout, requestCallbacks ? {
+        request: requestCallbacks.request.bind(null, 's2s'),
+        done: requestCallbacks.done
+      } : undefined);
+      let adaptersServerSide = s2sConfig.bidders;
+      const s2sAdapter = _bidderRegistry[s2sConfig.adapter];
+      let tid = uniqueServerBidRequests[counter].tid;
+      let adUnitsS2SCopy = uniqueServerBidRequests[counter].adUnitsS2SCopy;
+
+      let uniqueServerRequests = serverBidRequests.filter(serverBidRequest => serverBidRequest.tid === tid)
+
+      if (s2sAdapter) {
+        let s2sBidRequest = {tid, 'ad_units': adUnitsS2SCopy, s2sConfig};
+        if (s2sBidRequest.ad_units.length) {
+          let doneCbs = uniqueServerRequests.map(bidRequest => {
+            bidRequest.start = timestamp();
+            return doneCb.bind(bidRequest);
+          });
+
+          // only log adapters that actually have adUnit bids
+          let allBidders = s2sBidRequest.ad_units.reduce((adapters, adUnit) => {
+            return adapters.concat((adUnit.bids || []).reduce((adapters, bid) => adapters.concat(bid.bidder), []));
+          }, []);
+          utils.logMessage(`CALLING S2S HEADER BIDDERS ==== ${adaptersServerSide.filter(adapter => includes(allBidders, adapter)).join(',')}`);
+
+          // fire BID_REQUESTED event for each s2s bidRequest
+          uniqueServerRequests.forEach(bidRequest => {
+            events.emit(CONSTANTS.EVENTS.BID_REQUESTED, bidRequest);
+          });
+
+          // make bid requests
+          s2sAdapter.callBids(
+            s2sBidRequest,
+            serverBidRequests,
+            (adUnitCode, bid) => {
+              let bidderRequest = getBidderRequest(serverBidRequests, bid.bidderCode, adUnitCode);
+              if (bidderRequest) {
+                addBidResponse.call(bidderRequest, adUnitCode, bid)
+              }
+            },
+            () => doneCbs.forEach(done => done()),
+            s2sAjax
+          );
+        }
+      } else {
+        utils.logError('missing ' + s2sConfig.adapter);
       }
-    } else {
-      utils.logError('missing ' + _s2sConfig.adapter);
+      counter++
     }
-  }
+  });
 
   // handle client adapter requests
   clientBidRequests.forEach(bidRequest => {
@@ -390,12 +439,12 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
   });
 };
 
-function doingS2STesting() {
-  return _s2sConfig && _s2sConfig.enabled && _s2sConfig.testing && s2sTestingModule;
+function doingS2STesting(s2sConfig) {
+  return s2sConfig && s2sConfig.enabled && s2sConfig.testing && s2sTestingModule;
 }
 
-function isTestingServerOnly() {
-  return Boolean(doingS2STesting() && _s2sConfig.testServerOnly);
+function isTestingServerOnly(s2sConfig) {
+  return Boolean(doingS2STesting(s2sConfig) && s2sConfig.testServerOnly);
 };
 
 function getSupportedMediaTypes(bidderCode) {
@@ -433,14 +482,20 @@ adapterManager.aliasBidAdapter = function (bidderCode, alias, options) {
     let bidAdapter = _bidderRegistry[bidderCode];
     if (typeof bidAdapter === 'undefined') {
       // check if alias is part of s2sConfig and allow them to register if so (as base bidder may be s2s-only)
-      const s2sConfig = config.getConfig('s2sConfig');
-      const s2sBidders = s2sConfig && s2sConfig.bidders;
-
-      if (!(s2sBidders && includes(s2sBidders, alias))) {
+      const nonS2SAlias = [];
+      _s2sConfigs.forEach(s2sConfig => {
+        if (s2sConfig.bidders && s2sConfig.bidders.length) {
+          const s2sBidders = s2sConfig && s2sConfig.bidders;
+          if (!(s2sConfig && includes(s2sBidders, alias))) {
+            nonS2SAlias.push(bidderCode);
+          } else {
+            _aliasRegistry[alias] = bidderCode;
+          }
+        }
+      });
+      nonS2SAlias.forEach(bidderCode => {
         utils.logError('bidderCode "' + bidderCode + '" is not an existing bidder.', 'adapterManager.aliasBidAdapter');
-      } else {
-        _aliasRegistry[alias] = bidderCode;
-      }
+      })
     } else {
       try {
         let newAdapter;
diff --git a/src/prebid.js b/src/prebid.js
index 0f72ca878e5..3452107effd 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -488,6 +488,18 @@ $$PREBID_GLOBAL$$.requestBids = hook('async', function ({ bidsBackHandler, timeo
 
   utils.logInfo('Invoking $$PREBID_GLOBAL$$.requestBids', arguments);
 
+  let _s2sConfigs = [];
+  const s2sBidders = [];
+  config.getConfig('s2sConfig', config => {
+    if (config && config.s2sConfig) {
+      _s2sConfigs = Array.isArray(config.s2sConfig) ? config.s2sConfig : [config.s2sConfig];
+    }
+  });
+
+  _s2sConfigs.forEach(s2sConfig => {
+    s2sBidders.push(...s2sConfig.bidders);
+  });
+
   adUnits = checkAdUnitSetup(adUnits);
 
   if (adUnitCodes && adUnitCodes.length) {
@@ -512,11 +524,7 @@ $$PREBID_GLOBAL$$.requestBids = hook('async', function ({ bidsBackHandler, timeo
     const allBidders = adUnit.bids.map(bid => bid.bidder);
     const bidderRegistry = adapterManager.bidderRegistry;
 
-    const s2sConfig = config.getConfig('s2sConfig');
-    const s2sBidders = s2sConfig && s2sConfig.bidders;
-    const bidders = (s2sBidders) ? allBidders.filter(bidder => {
-      return !includes(s2sBidders, bidder);
-    }) : allBidders;
+    const bidders = (s2sBidders) ? allBidders.filter(bidder => !includes(s2sBidders, bidder)) : allBidders;
 
     adUnit.transactionId = utils.generateUUID();
 
diff --git a/test/fixtures/fixtures.js b/test/fixtures/fixtures.js
index 2a0a7638fc4..908382f8daa 100644
--- a/test/fixtures/fixtures.js
+++ b/test/fixtures/fixtures.js
@@ -676,7 +676,13 @@ export function getAdUnits() {
           'bidder': 'appnexus',
           'params': {
             'placementId': '543221',
-            'test': 'me'
+          }
+        },
+        {
+          'bidder': 'pubmatic',
+          'params': {
+            'publisherId': 1234567,
+            'adSlot': '1234567@728x90'
           }
         }
       ]
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 17c0fc290c6..f17cd3ab14f 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -26,6 +26,7 @@ const REQUEST = {
   'secure': 0,
   'url': '',
   'prebid_version': '0.30.0-pre',
+  's2sConfig': CONFIG,
   'ad_units': [
     {
       'code': 'div-gpt-ad-1460505748561-0',
@@ -80,6 +81,7 @@ const VIDEO_REQUEST = {
   'secure': 0,
   'url': '',
   'prebid_version': '1.4.0-pre',
+  's2sConfig': CONFIG,
   'ad_units': [
     {
       'code': 'div-gpt-ad-1460505748561-0',
@@ -110,6 +112,7 @@ const OUTSTREAM_VIDEO_REQUEST = {
   'secure': 0,
   'url': '',
   'prebid_version': '1.4.0-pre',
+  's2sConfig': CONFIG,
   'ad_units': [
     {
       'code': 'div-gpt-ad-1460505748561-0',
@@ -162,7 +165,7 @@ const OUTSTREAM_VIDEO_REQUEST = {
         }
       }
     }
-  ]
+  ],
 };
 
 let BID_REQUESTS;
@@ -497,11 +500,9 @@ describe('S2S Adapter', function () {
       resetSyncedStatus();
     });
 
-    it('should not add outstream without renderer', function () {
-      let ortb2Config = utils.deepClone(CONFIG);
-      ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
+    it('should not add outstrean without renderer', function () {
+      config.setConfig({ s2sConfig: CONFIG });
 
-      config.setConfig({ s2sConfig: ortb2Config });
       adapter.callBids(OUTSTREAM_VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
@@ -535,10 +536,7 @@ describe('S2S Adapter', function () {
       });
 
       it('adds gdpr consent information to ortb2 request depending on presence of module', function () {
-        let ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-
-        let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: ortb2Config };
+        let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: CONFIG };
         config.setConfig(consentConfig);
 
         let gdprBidRequest = utils.deepClone(BID_REQUESTS);
@@ -564,10 +562,7 @@ describe('S2S Adapter', function () {
       });
 
       it('adds additional consent information to ortb2 request depending on presence of module', function () {
-        let ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-
-        let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: ortb2Config };
+        let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: CONFIG };
         config.setConfig(consentConfig);
 
         let gdprBidRequest = utils.deepClone(BID_REQUESTS);
@@ -608,7 +603,10 @@ describe('S2S Adapter', function () {
           gdprApplies: true
         };
 
-        adapter.callBids(REQUEST, gdprBidRequest, addBidResponse, done, ajax);
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = cookieSyncConfig;
+
+        adapter.callBids(s2sBidRequest, gdprBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.gdpr).is.equal(1);
@@ -624,13 +622,16 @@ describe('S2S Adapter', function () {
         let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: cookieSyncConfig };
         config.setConfig(consentConfig);
 
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = cookieSyncConfig;
+
         let gdprBidRequest = utils.deepClone(BID_REQUESTS);
         gdprBidRequest[0].gdprConsent = {
           consentString: 'xyz789abcc',
           gdprApplies: false
         };
 
-        adapter.callBids(REQUEST, gdprBidRequest, addBidResponse, done, ajax);
+        adapter.callBids(s2sBidRequest, gdprBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.gdpr).is.equal(0);
@@ -650,7 +651,10 @@ describe('S2S Adapter', function () {
           gdprApplies: undefined
         };
 
-        adapter.callBids(REQUEST, gdprBidRequest, addBidResponse, done, ajax);
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = cookieSyncConfig;
+
+        adapter.callBids(s2sBidRequest, gdprBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.gdpr).is.undefined;
@@ -664,9 +668,7 @@ describe('S2S Adapter', function () {
       });
 
       it('is added to ortb2 request when in bidRequest', function () {
-        let ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        config.setConfig({ s2sConfig: ortb2Config });
+        config.setConfig({ s2sConfig: CONFIG });
 
         let uspBidRequest = utils.deepClone(BID_REQUESTS);
         uspBidRequest[0].uspConsent = '1NYN';
@@ -693,7 +695,10 @@ describe('S2S Adapter', function () {
         let uspBidRequest = utils.deepClone(BID_REQUESTS);
         uspBidRequest[0].uspConsent = '1YNN';
 
-        adapter.callBids(REQUEST, uspBidRequest, addBidResponse, done, ajax);
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = cookieSyncConfig;
+
+        adapter.callBids(s2sBidRequest, uspBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.us_privacy).is.equal('1YNN');
@@ -708,9 +713,7 @@ describe('S2S Adapter', function () {
       });
 
       it('is added to ortb2 request when in bidRequest', function () {
-        let ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        config.setConfig({ s2sConfig: ortb2Config });
+        config.setConfig({ s2sConfig: CONFIG });
 
         let consentBidRequest = utils.deepClone(BID_REQUESTS);
         consentBidRequest[0].uspConsent = '1NYN';
@@ -748,7 +751,10 @@ describe('S2S Adapter', function () {
           gdprApplies: true
         };
 
-        adapter.callBids(REQUEST, consentBidRequest, addBidResponse, done, ajax);
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = cookieSyncConfig
+
+        adapter.callBids(s2sBidRequest, consentBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.us_privacy).is.equal('1YNN');
@@ -806,11 +812,8 @@ describe('S2S Adapter', function () {
     });
 
     it('adds debugging value from storedAuctionResponse to OpenRTB', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-      });
       const _config = {
-        s2sConfig: s2sConfig,
+        s2sConfig: CONFIG,
         device: { ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC' },
         app: { bundle: 'com.test.app' }
       };
@@ -827,12 +830,8 @@ describe('S2S Adapter', function () {
     });
 
     it('adds device.w and device.h even if the config lacks a device object', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-      });
-
       const _config = {
-        s2sConfig: s2sConfig,
+        s2sConfig: CONFIG,
         app: { bundle: 'com.test.app' },
       };
 
@@ -850,12 +849,8 @@ describe('S2S Adapter', function () {
     });
 
     it('adds native request for OpenRTB', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-      });
-
       const _config = {
-        s2sConfig: s2sConfig
+        s2sConfig: CONFIG
       };
 
       config.setConfig(_config);
@@ -909,12 +904,8 @@ describe('S2S Adapter', function () {
     });
 
     it('adds site if app is not present', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-      });
-
       const _config = {
-        s2sConfig: s2sConfig,
+        s2sConfig: CONFIG,
         site: {
           publisher: {
             id: '1234',
@@ -949,10 +940,7 @@ describe('S2S Adapter', function () {
     });
 
     it('adds appnexus aliases to request', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-      });
-      config.setConfig({ s2sConfig: s2sConfig });
+      config.setConfig({ s2sConfig: CONFIG });
 
       const aliasBidder = {
         bidder: 'brealtime',
@@ -981,10 +969,7 @@ describe('S2S Adapter', function () {
     });
 
     it('adds dynamic aliases to request', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-      });
-      config.setConfig({ s2sConfig: s2sConfig });
+      config.setConfig({ s2sConfig: CONFIG });
 
       const alias = 'foobar';
       const aliasBidder = {
@@ -1110,10 +1095,13 @@ describe('S2S Adapter', function () {
       cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
       cookieSyncConfig.userSyncLimit = 1;
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = cookieSyncConfig;
+
       config.setConfig({ s2sConfig: cookieSyncConfig });
 
       let bidRequest = utils.deepClone(BID_REQUESTS);
-      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
       let requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.bidders).to.contain('appnexus').and.to.have.lengthOf(1);
@@ -1126,8 +1114,11 @@ describe('S2S Adapter', function () {
       cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
       config.setConfig({ s2sConfig: cookieSyncConfig });
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = cookieSyncConfig;
+
       let bidRequest = utils.deepClone(BID_REQUESTS);
-      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
       let requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.bidders).to.contain('appnexus').and.to.have.lengthOf(1);
@@ -1138,8 +1129,11 @@ describe('S2S Adapter', function () {
       config.resetConfig();
       config.setConfig({ s2sConfig: cookieSyncConfig });
 
+      const s2sBidRequest2 = utils.deepClone(REQUEST);
+      s2sBidRequest2.s2sConfig = cookieSyncConfig;
+
       bidRequest = utils.deepClone(BID_REQUESTS);
-      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest2, bidRequest, addBidResponse, done, ajax);
       requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.bidders).to.contain('appnexus').and.to.have.lengthOf(1);
@@ -1149,7 +1143,6 @@ describe('S2S Adapter', function () {
 
     it('adds s2sConfig adapterOptions to request for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         adapterOptions: {
           appnexus: {
             key: 'value'
@@ -1162,8 +1155,11 @@ describe('S2S Adapter', function () {
         app: { bundle: 'com.test.app' },
       };
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
       expect(requestBid.imp[0].ext.appnexus).to.haveOwnProperty('key');
       expect(requestBid.imp[0].ext.appnexus.key).to.be.equal('value')
@@ -1171,7 +1167,6 @@ describe('S2S Adapter', function () {
 
     describe('config site value is added to the oRTB request', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         adapterOptions: {
           appnexus: {
             key: 'value'
@@ -1183,6 +1178,9 @@ describe('S2S Adapter', function () {
         ip: '75.97.0.47'
       };
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
       it('and overrides publisher and page', function () {
         config.setConfig({
           s2sConfig: s2sConfig,
@@ -1193,7 +1191,8 @@ describe('S2S Adapter', function () {
           },
           device: device
         });
-        adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+        adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
         const requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.site).to.exist.and.to.be.a('object');
@@ -1211,7 +1210,8 @@ describe('S2S Adapter', function () {
           },
           device: device
         });
-        adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+        adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
 
         const requestBid = JSON.parse(server.requests[0].requestBody);
         expect(requestBid.site).to.exist.and.to.be.a('object');
@@ -1223,10 +1223,7 @@ describe('S2S Adapter', function () {
     });
 
     it('when userId is defined on bids, it\'s properties should be copied to user.ext.tpid properties', function () {
-      let ortb2Config = utils.deepClone(CONFIG);
-      ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-
-      let consentConfig = { s2sConfig: ortb2Config };
+      let consentConfig = { s2sConfig: CONFIG };
       config.setConfig(consentConfig);
 
       let userIdBidRequest = utils.deepClone(BID_REQUESTS);
@@ -1274,11 +1271,8 @@ describe('S2S Adapter', function () {
     });
 
     it('when config \'currency.adServerCurrency\' value is an array: ORTB has property \'cur\' value set to a single item array', function () {
-      let s2sConfig = utils.deepClone(CONFIG);
-      s2sConfig.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
       config.setConfig({
         currency: { adServerCurrency: ['USD', 'GB', 'UK', 'AU'] },
-        s2sConfig: s2sConfig
       });
 
       const bidRequests = utils.deepClone(BID_REQUESTS);
@@ -1289,11 +1283,8 @@ describe('S2S Adapter', function () {
     });
 
     it('when config \'currency.adServerCurrency\' value is a string: ORTB has property \'cur\' value set to a single item array', function () {
-      let s2sConfig = utils.deepClone(CONFIG);
-      s2sConfig.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
       config.setConfig({
         currency: { adServerCurrency: 'NZ' },
-        s2sConfig: s2sConfig
       });
 
       const bidRequests = utils.deepClone(BID_REQUESTS);
@@ -1304,9 +1295,7 @@ describe('S2S Adapter', function () {
     });
 
     it('when config \'currency.adServerCurrency\' is unset: ORTB should not define a \'cur\' property', function () {
-      let s2sConfig = utils.deepClone(CONFIG);
-      s2sConfig.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-      config.setConfig({ s2sConfig: s2sConfig });
+      config.setConfig({ s2sConfig: CONFIG });
 
       const bidRequests = utils.deepClone(BID_REQUESTS);
       adapter.callBids(REQUEST, bidRequests, addBidResponse, done, ajax);
@@ -1317,7 +1306,6 @@ describe('S2S Adapter', function () {
 
     it('always add ext.prebid.targeting.includebidderkeys: false for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         adapterOptions: {
           appnexus: {
             key: 'value'
@@ -1331,7 +1319,11 @@ describe('S2S Adapter', function () {
       };
 
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.ext.prebid.targeting).to.haveOwnProperty('includebidderkeys');
@@ -1340,7 +1332,6 @@ describe('S2S Adapter', function () {
 
     it('always add ext.prebid.targeting.includewinners: true for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         adapterOptions: {
           appnexus: {
             key: 'value'
@@ -1352,9 +1343,12 @@ describe('S2S Adapter', function () {
         device: { ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC' },
         app: { bundle: 'com.test.app' },
       };
-
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.ext.prebid.targeting).to.haveOwnProperty('includewinners');
@@ -1363,7 +1357,6 @@ describe('S2S Adapter', function () {
 
     it('adds s2sConfig video.ext.prebid to request for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         extPrebid: {
           foo: 'bar'
         }
@@ -1374,8 +1367,11 @@ describe('S2S Adapter', function () {
         app: { bundle: 'com.test.app' },
       };
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid).to.haveOwnProperty('ext');
@@ -1392,7 +1388,6 @@ describe('S2S Adapter', function () {
 
     it('overrides request.ext.prebid properties using s2sConfig video.ext.prebid values for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         extPrebid: {
           targeting: {
             includewinners: false,
@@ -1406,8 +1401,11 @@ describe('S2S Adapter', function () {
         app: { bundle: 'com.test.app' },
       };
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid).to.haveOwnProperty('ext');
@@ -1423,7 +1421,6 @@ describe('S2S Adapter', function () {
 
     it('overrides request.ext.prebid properties using s2sConfig video.ext.prebid values for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         extPrebid: {
           cache: {
             vastxml: 'vastxml-set-though-extPrebid.cache.vastXml'
@@ -1440,8 +1437,11 @@ describe('S2S Adapter', function () {
         app: { bundle: 'com.test.app' },
       };
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid).to.haveOwnProperty('ext');
@@ -1529,9 +1529,7 @@ describe('S2S Adapter', function () {
 
     describe('pbAdSlot config', function () {
       it('should not send \"imp.ext.context.data.pbadslot\" if \"fpd.context\" is undefined', function () {
-        const ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        const consentConfig = { s2sConfig: ortb2Config };
+        const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
 
@@ -1544,9 +1542,7 @@ describe('S2S Adapter', function () {
       });
 
       it('should not send \"imp.ext.context.data.pbadslot\" if \"fpd.context.pbAdSlot\" is undefined', function () {
-        const ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        const consentConfig = { s2sConfig: ortb2Config };
+        const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
         bidRequest.ad_units[0].fpd = {};
@@ -1560,9 +1556,7 @@ describe('S2S Adapter', function () {
       });
 
       it('should not send \"imp.ext.context.data.pbadslot\" if \"fpd.context.pbAdSlot\" is empty string', function () {
-        const ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        const consentConfig = { s2sConfig: ortb2Config };
+        const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
         bidRequest.ad_units[0].fpd = {
@@ -1580,9 +1574,7 @@ describe('S2S Adapter', function () {
       });
 
       it('should send \"imp.ext.context.data.pbadslot\" if \"fpd.context.pbAdSlot\" value is a non-empty string', function () {
-        const ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        const consentConfig = { s2sConfig: ortb2Config };
+        const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
         bidRequest.ad_units[0].fpd = {
@@ -1603,9 +1595,7 @@ describe('S2S Adapter', function () {
 
     describe('GAM ad unit config', function () {
       it('should not send \"imp.ext.context.data.adserver.adslot\" if \"fpd.context\" is undefined', function () {
-        const ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        const consentConfig = { s2sConfig: ortb2Config };
+        const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
 
@@ -1618,9 +1608,7 @@ describe('S2S Adapter', function () {
       });
 
       it('should not send \"imp.ext.context.data.adserver.adslot\" if \"fpd.context.adserver.adSlot\" is undefined', function () {
-        const ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        const consentConfig = { s2sConfig: ortb2Config };
+        const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
         bidRequest.ad_units[0].fpd = {};
@@ -1634,9 +1622,7 @@ describe('S2S Adapter', function () {
       });
 
       it('should not send \"imp.ext.context.data.adserver.adslot\" if \"fpd.context.adserver.adSlot\" is empty string', function () {
-        const ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        const consentConfig = { s2sConfig: ortb2Config };
+        const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
         bidRequest.ad_units[0].fpd = {
@@ -1656,9 +1642,7 @@ describe('S2S Adapter', function () {
       });
 
       it('should send both \"adslot\" and \"name\" from \"imp.ext.context.data.adserver\" if \"fpd.context.adserver.adSlot\" and \"fpd.context.adserver.name\" values are non-empty strings', function () {
-        const ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        const consentConfig = { s2sConfig: ortb2Config };
+        const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
         bidRequest.ad_units[0].fpd = {
@@ -1831,10 +1815,7 @@ describe('S2S Adapter', function () {
       };
       sinon.stub(adapterManager, 'getBidAdapter').returns(rubiconAdapter);
 
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-      });
-      config.setConfig({ s2sConfig });
+      config.setConfig({ CONFIG });
 
       adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB));
@@ -1845,10 +1826,7 @@ describe('S2S Adapter', function () {
     });
 
     it('handles OpenRTB responses and call BIDDER_DONE', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-      });
-      config.setConfig({ s2sConfig });
+      config.setConfig({ CONFIG });
 
       adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB));
@@ -1874,12 +1852,13 @@ describe('S2S Adapter', function () {
 
     it('respects defaultTtl', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         defaultTtl: 30
       });
-      config.setConfig({ s2sConfig });
 
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB));
 
       sinon.assert.calledOnce(events.emit);
@@ -1895,7 +1874,10 @@ describe('S2S Adapter', function () {
       });
       config.setConfig({ s2sConfig });
 
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB_VIDEO));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -1923,7 +1905,10 @@ describe('S2S Adapter', function () {
         }
       });
 
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -1948,7 +1933,11 @@ describe('S2S Adapter', function () {
       cacheResponse.seatbid.forEach(item => {
         item.bid[0].ext.prebid.targeting = targetingTestData
       });
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -1974,7 +1963,11 @@ describe('S2S Adapter', function () {
           hb_cache_path: '/cache'
         }
       });
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -2001,7 +1994,10 @@ describe('S2S Adapter', function () {
           hb_cache_path: '/cache'
         }
       });
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -2027,7 +2023,11 @@ describe('S2S Adapter', function () {
           hb_bidid: '1234567890',
         }
       });
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -2047,7 +2047,10 @@ describe('S2S Adapter', function () {
       config.setConfig({ s2sConfig });
       const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
 
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -2067,7 +2070,10 @@ describe('S2S Adapter', function () {
       });
       config.setConfig({ s2sConfig });
 
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB_NATIVE));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -2368,10 +2374,11 @@ describe('S2S Adapter', function () {
       s2sConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
       s2sConfig.bidders = ['appnexus', 'rubicon-alias'];
 
-      const request = utils.deepClone(REQUEST);
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
 
       // Add another bidder, `rubicon-alias`
-      request.ad_units[0].bids.push({
+      s2sBidRequest.ad_units[0].bids.push({
         bidder: 'rubicon-alias',
         params: {
           accoundId: 14062,
@@ -2383,8 +2390,6 @@ describe('S2S Adapter', function () {
       // create an alias for the Rubicon Bid Adapter
       adapterManager.aliasBidAdapter('rubicon', 'rubicon-alias');
 
-      config.setConfig({ s2sConfig });
-
       const bidRequest = utils.deepClone(BID_REQUESTS);
       bidRequest.push({
         'bidderCode': 'rubicon-alias',
@@ -2428,7 +2433,7 @@ describe('S2S Adapter', function () {
         'src': 's2s'
       });
 
-      adapter.callBids(request, bidRequest, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
       expect(requestBid.bidders).to.deep.equal(['appnexus', 'rubicon']);
diff --git a/test/spec/modules/s2sTesting_spec.js b/test/spec/modules/s2sTesting_spec.js
index 5c7f3004dee..273f6747e52 100644
--- a/test/spec/modules/s2sTesting_spec.js
+++ b/test/spec/modules/s2sTesting_spec.js
@@ -1,5 +1,4 @@
 import s2sTesting from 'modules/s2sTesting.js';
-import { config } from 'src/config.js';
 
 var expect = require('chai').expect;
 
@@ -78,26 +77,16 @@ describe('s2sTesting', function () {
       beforeEach(function () {
         // set random number for testing
         s2sTesting.globalRand = 0.7;
-      });
-
-      it('does not work if testing is "false"', function () {
-        config.setConfig({s2sConfig: {
-          bidders: ['rubicon'],
-          testing: false,
-          bidderControl: {rubicon: {bidSource: {server: 1, client: 1}}}
-        }});
-        expect(s2sTesting.getSourceBidderMap()).to.eql({
-          server: [],
-          client: []
-        });
+        s2sTesting.bidSource = {};
       });
 
       it('sets one client bidder', function () {
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon'],
-          testing: true,
           bidderControl: {rubicon: {bidSource: {server: 1, client: 1}}}
-        }});
+        };
+
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           server: [],
           client: ['rubicon']
@@ -105,11 +94,11 @@ describe('s2sTesting', function () {
       });
 
       it('sets one server bidder', function () {
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon'],
-          testing: true,
           bidderControl: {rubicon: {bidSource: {server: 4, client: 1}}}
-        }});
+        }
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           server: ['rubicon'],
           client: []
@@ -117,10 +106,10 @@ describe('s2sTesting', function () {
       });
 
       it('defaults to server', function () {
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon'],
-          testing: true
-        }});
+        }
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           server: ['rubicon'],
           client: []
@@ -128,13 +117,14 @@ describe('s2sTesting', function () {
       });
 
       it('sets two bidders', function () {
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon', 'appnexus'],
-          testing: true,
           bidderControl: {
             rubicon: {bidSource: {server: 3, client: 1}},
             appnexus: {bidSource: {server: 1, client: 1}}
-          }}});
+          }
+        }
+        s2sTesting.calculateBidSources(s2sConfig);
         var serverClientBidders = s2sTesting.getSourceBidderMap();
         expect(serverClientBidders.server).to.eql(['rubicon']);
         expect(serverClientBidders.client).to.have.members(['appnexus']);
@@ -143,33 +133,37 @@ describe('s2sTesting', function () {
       it('sends both bidders to same source when weights are the same', function () {
         s2sTesting.globalRand = 0.01;
 
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon', 'appnexus'],
-          testing: true,
           bidderControl: {
             rubicon: {bidSource: {server: 1, client: 99}},
             appnexus: {bidSource: {server: 1, client: 99}}
-          }}});
+          }
+        }
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           client: ['rubicon', 'appnexus'],
           server: []
         });
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           client: ['rubicon', 'appnexus'],
           server: []
         });
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           client: ['rubicon', 'appnexus'],
           server: []
         });
 
-        config.setConfig({s2sConfig: {
+        const s2sConfig2 = {
           bidders: ['rubicon', 'appnexus'],
-          testing: true,
           bidderControl: {
             rubicon: {bidSource: {server: 99, client: 1}},
             appnexus: {bidSource: {server: 99, client: 1}}
-          }}});
+          }
+        }
+        s2sTesting.calculateBidSources(s2sConfig2);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           server: ['rubicon', 'appnexus'],
           client: []
@@ -186,11 +180,12 @@ describe('s2sTesting', function () {
     });
 
     describe('setting source through adUnits', function () {
+      const s2sConfig3 = {testing: true};
+
       beforeEach(function () {
-        // reset s2sconfig bid sources
-        config.setConfig({s2sConfig: {testing: true}});
         // set random number for testing
         s2sTesting.globalRand = 0.7;
+        s2sTesting.bidSource = {};
       });
 
       it('sets one bidder source from one adUnit', function () {
@@ -199,7 +194,8 @@ describe('s2sTesting', function () {
             {bidder: 'rubicon', bidSource: {server: 4, client: 1}}
           ]}
         ];
-        expect(s2sTesting.getSourceBidderMap(adUnits)).to.eql({
+
+        expect(s2sTesting.getSourceBidderMap(adUnits, [])).to.eql({
           server: ['rubicon'],
           client: []
         });
@@ -212,7 +208,7 @@ describe('s2sTesting', function () {
             {bidder: 'rubicon', bidSource: {server: 1, client: 1}}
           ]}
         ];
-        expect(s2sTesting.getSourceBidderMap(adUnits)).to.eql({
+        expect(s2sTesting.getSourceBidderMap(adUnits, [])).to.eql({
           server: [],
           client: ['rubicon']
         });
@@ -227,7 +223,7 @@ describe('s2sTesting', function () {
             {bidder: 'rubicon', bidSource: {}}
           ]}
         ];
-        expect(s2sTesting.getSourceBidderMap(adUnits)).to.eql({
+        expect(s2sTesting.getSourceBidderMap(adUnits, [])).to.eql({
           server: [],
           client: ['rubicon']
         });
@@ -243,7 +239,7 @@ describe('s2sTesting', function () {
             {bidder: 'appnexus', bidSource: {server: 3, client: 1}}
           ]}
         ];
-        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits);
+        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits, []);
         expect(serverClientBidders.server).to.eql(['appnexus']);
         expect(serverClientBidders.client).to.have.members(['rubicon']);
         // should have saved the source on the bid
@@ -264,7 +260,7 @@ describe('s2sTesting', function () {
             {bidder: 'bidder3', bidSource: {client: 1}}
           ]}
         ];
-        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits);
+        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits, []);
         expect(serverClientBidders.server).to.have.members(['rubicon']);
         expect(serverClientBidders.server).to.not.have.members(['appnexus', 'bidder3']);
         expect(serverClientBidders.client).to.have.members(['rubicon', 'appnexus', 'bidder3']);
@@ -287,7 +283,7 @@ describe('s2sTesting', function () {
             {bidder: 'bidder3', calcSource: 'server', bidSource: {client: 1}}
           ]}
         ];
-        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits);
+        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits, []);
 
         expect(serverClientBidders.server).to.have.members(['appnexus', 'bidder3']);
         expect(serverClientBidders.server).to.not.have.members(['rubicon']);
@@ -305,8 +301,6 @@ describe('s2sTesting', function () {
 
     describe('setting source through s2sconfig and adUnits', function () {
       beforeEach(function () {
-        // reset s2sconfig bid sources
-        config.setConfig({s2sConfig: {testing: true}});
         // set random number for testing
         s2sTesting.globalRand = 0.7;
       });
@@ -321,15 +315,15 @@ describe('s2sTesting', function () {
         ];
 
         // set rubicon: client and appnexus: server
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon', 'appnexus'],
           testing: true,
           bidderControl: {
             rubicon: {bidSource: {server: 2, client: 1}},
             appnexus: {bidSource: {server: 1}}
           }
-        }});
-
+        }
+        s2sTesting.calculateBidSources(s2sConfig);
         var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits);
         expect(serverClientBidders.server).to.have.members(['rubicon', 'appnexus']);
         expect(serverClientBidders.client).to.have.members(['rubicon', 'appnexus']);
diff --git a/test/spec/unit/core/adapterManager_spec.js b/test/spec/unit/core/adapterManager_spec.js
index 9ccdd6aef59..00a0579e676 100644
--- a/test/spec/unit/core/adapterManager_spec.js
+++ b/test/spec/unit/core/adapterManager_spec.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import adapterManager, { gdprDataHandler } from 'src/adapterManager.js';
+import adapterManager, { allS2SBidders, clientTestAdapters, gdprDataHandler } from 'src/adapterManager.js';
 import {
   getAdUnits,
   getServerTestingConfig,
@@ -25,6 +25,17 @@ const CONFIG = {
   bidders: ['appnexus'],
   accountId: 'abc'
 };
+
+const CONFIG2 = {
+  enabled: true,
+  endpoint: 'https://prebid-server.rubiconproject.com/openrtb2/auction',
+  timeout: 1000,
+  maxBids: 1,
+  adapter: 'prebidServer',
+  bidders: ['pubmatic'],
+  accountId: 'def'
+}
+
 var prebidServerAdapterMock = {
   bidder: 'prebidServer',
   callBids: sinon.stub()
@@ -43,6 +54,11 @@ var rubiconAdapterMock = {
   callBids: sinon.stub()
 };
 
+var pubmaticAdapterMock = {
+  bidder: 'rubicon',
+  callBids: sinon.stub()
+};
+
 var badAdapterMock = {
   bidder: 'badBidder',
   callBids: sinon.stub().throws(Error('some fake error'))
@@ -82,6 +98,7 @@ describe('adapterManager tests', function () {
       adapterManager.bidderRegistry['appnexus'] = appnexusAdapterMock;
       adapterManager.bidderRegistry['rubicon'] = rubiconAdapterMock;
       adapterManager.bidderRegistry['badBidder'] = badAdapterMock;
+      adapterManager.bidderRegistry['badBidder'] = badAdapterMock;
     });
 
     afterEach(function () {
@@ -394,144 +411,144 @@ describe('adapterManager tests', function () {
       prebidServerAdapterMock.callBids.reset();
     });
 
-    it('invokes callBids on the S2S adapter', function () {
-      let bidRequests = [{
-        'bidderCode': 'appnexus',
-        'auctionId': '1863e370099523',
-        'bidderRequestId': '2946b569352ef2',
-        'tid': '34566b569352ef2',
-        'timeout': 1000,
-        'src': 's2s',
-        'adUnitsS2SCopy': [
-          {
-            'code': '/19968336/header-bid-tag1',
-            'sizes': [
-              {
-                'w': 728,
-                'h': 90
+    const bidRequests = [{
+      'bidderCode': 'appnexus',
+      'auctionId': '1863e370099523',
+      'bidderRequestId': '2946b569352ef2',
+      'tid': '34566b569352ef2',
+      'timeout': 1000,
+      'src': 's2s',
+      'adUnitsS2SCopy': [
+        {
+          'code': '/19968336/header-bid-tag1',
+          'sizes': [
+            {
+              'w': 728,
+              'h': 90
+            },
+            {
+              'w': 970,
+              'h': 90
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'appnexus',
+              'params': {
+                'placementId': '543221',
+                'test': 'me'
               },
-              {
-                'w': 970,
-                'h': 90
-              }
-            ],
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': '543221',
-                  'test': 'me'
-                },
-                'adUnitCode': '/19968336/header-bid-tag1',
-                'sizes': [
-                  [
-                    728,
-                    90
-                  ],
-                  [
-                    970,
-                    90
-                  ]
+              'adUnitCode': '/19968336/header-bid-tag1',
+              'sizes': [
+                [
+                  728,
+                  90
                 ],
-                'bidId': '68136e1c47023d',
-                'bidderRequestId': '55e24a66bed717',
-                'auctionId': '1ff753bd4ae5cb',
-                'startTime': 1463510220995,
-                'status': 1,
-                'bid_id': '68136e1c47023d'
-              }
-            ]
-          },
-          {
-            'code': '/19968336/header-bid-tag-0',
-            'sizes': [
-              {
-                'w': 300,
-                'h': 250
+                [
+                  970,
+                  90
+                ]
+              ],
+              'bidId': '68136e1c47023d',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220995,
+              'status': 1,
+              'bid_id': '68136e1c47023d'
+            }
+          ]
+        },
+        {
+          'code': '/19968336/header-bid-tag-0',
+          'sizes': [
+            {
+              'w': 300,
+              'h': 250
+            },
+            {
+              'w': 300,
+              'h': 600
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'appnexus',
+              'params': {
+                'placementId': '5324321'
               },
-              {
-                'w': 300,
-                'h': 600
-              }
-            ],
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': '5324321'
-                },
-                'adUnitCode': '/19968336/header-bid-tag-0',
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
+              'adUnitCode': '/19968336/header-bid-tag-0',
+              'sizes': [
+                [
+                  300,
+                  250
                 ],
-                'bidId': '7e5d6af25ed188',
-                'bidderRequestId': '55e24a66bed717',
-                'auctionId': '1ff753bd4ae5cb',
-                'startTime': 1463510220996,
-                'bid_id': '7e5d6af25ed188'
-              }
-            ]
-          }
-        ],
-        'bids': [
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': '4799418',
-              'test': 'me'
-            },
-            'adUnitCode': '/19968336/header-bid-tag1',
-            'sizes': [
-              [
-                728,
-                90
+                [
+                  300,
+                  600
+                ]
               ],
-              [
-                970,
-                90
-              ]
+              'bidId': '7e5d6af25ed188',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220996,
+              'bid_id': '7e5d6af25ed188'
+            }
+          ]
+        }
+      ],
+      'bids': [
+        {
+          'bidder': 'appnexus',
+          'params': {
+            'placementId': '4799418',
+            'test': 'me'
+          },
+          'adUnitCode': '/19968336/header-bid-tag1',
+          'sizes': [
+            [
+              728,
+              90
             ],
-            'bidId': '392b5a6b05d648',
-            'bidderRequestId': '2946b569352ef2',
-            'auctionId': '1863e370099523',
-            'startTime': 1462918897462,
-            'status': 1,
-            'transactionId': 'fsafsa'
+            [
+              970,
+              90
+            ]
+          ],
+          'bidId': '392b5a6b05d648',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897462,
+          'status': 1,
+          'transactionId': 'fsafsa'
+        },
+        {
+          'bidder': 'appnexus',
+          'params': {
+            'placementId': '4799418'
           },
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': '4799418'
-            },
-            'adUnitCode': '/19968336/header-bid-tag-0',
-            'sizes': [
-              [
-                300,
-                250
-              ],
-              [
-                300,
-                600
-              ]
+          'adUnitCode': '/19968336/header-bid-tag-0',
+          'sizes': [
+            [
+              300,
+              250
             ],
-            'bidId': '4dccdc37746135',
-            'bidderRequestId': '2946b569352ef2',
-            'auctionId': '1863e370099523',
-            'startTime': 1462918897463,
-            'status': 1,
-            'transactionId': 'fsafsa'
-          }
-        ],
-        'start': 1462918897460
-      }];
+            [
+              300,
+              600
+            ]
+          ],
+          'bidId': '4dccdc37746135',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897463,
+          'status': 1,
+          'transactionId': 'fsafsa'
+        }
+      ],
+      'start': 1462918897460
+    }];
 
+    it('invokes callBids on the S2S adapter', function () {
       adapterManager.callBids(
         getAdUnits(),
         bidRequests,
@@ -559,143 +576,6 @@ describe('adapterManager tests', function () {
         ]
       });
 
-      let bidRequests = [{
-        'bidderCode': 'appnexus',
-        'auctionId': '1863e370099523',
-        'bidderRequestId': '2946b569352ef2',
-        'tid': '34566b569352ef2',
-        'src': 's2s',
-        'timeout': 1000,
-        'adUnitsS2SCopy': [
-          {
-            'code': '/19968336/header-bid-tag1',
-            'sizes': [
-              {
-                'w': 728,
-                'h': 90
-              },
-              {
-                'w': 970,
-                'h': 90
-              }
-            ],
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': '543221',
-                  'test': 'me'
-                },
-                'adUnitCode': '/19968336/header-bid-tag1',
-                'sizes': [
-                  [
-                    728,
-                    90
-                  ],
-                  [
-                    970,
-                    90
-                  ]
-                ],
-                'bidId': '68136e1c47023d',
-                'bidderRequestId': '55e24a66bed717',
-                'auctionId': '1ff753bd4ae5cb',
-                'startTime': 1463510220995,
-                'status': 1,
-                'bid_id': '378a8914450b334'
-              }
-            ]
-          },
-          {
-            'code': '/19968336/header-bid-tag-0',
-            'sizes': [
-              {
-                'w': 300,
-                'h': 250
-              },
-              {
-                'w': 300,
-                'h': 600
-              }
-            ],
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': '5324321'
-                },
-                'adUnitCode': '/19968336/header-bid-tag-0',
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ],
-                'bidId': '7e5d6af25ed188',
-                'bidderRequestId': '55e24a66bed717',
-                'auctionId': '1ff753bd4ae5cb',
-                'startTime': 1463510220996,
-                'bid_id': '387d9d9c32ca47c'
-              }
-            ]
-          }
-        ],
-        'bids': [
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': '4799418',
-              'test': 'me'
-            },
-            'adUnitCode': '/19968336/header-bid-tag1',
-            'sizes': [
-              [
-                728,
-                90
-              ],
-              [
-                970,
-                90
-              ]
-            ],
-            'bidId': '392b5a6b05d648',
-            'bidderRequestId': '2946b569352ef2',
-            'auctionId': '1863e370099523',
-            'startTime': 1462918897462,
-            'status': 1,
-            'transactionId': 'fsafsa'
-          },
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': '4799418'
-            },
-            'adUnitCode': '/19968336/header-bid-tag-0',
-            'sizes': [
-              [
-                300,
-                250
-              ],
-              [
-                300,
-                600
-              ]
-            ],
-            'bidId': '4dccdc37746135',
-            'bidderRequestId': '2946b569352ef2',
-            'auctionId': '1863e370099523',
-            'startTime': 1462918897463,
-            'status': 1,
-            'transactionId': 'fsafsa'
-          }
-        ],
-        'start': 1462918897460
-      }];
-
       adapterManager.callBids(
         adUnits,
         bidRequests,
@@ -749,133 +629,483 @@ describe('adapterManager tests', function () {
     });
   }); // end s2s tests
 
-  describe('s2sTesting', function () {
-    let doneStub = sinon.stub();
-    let ajaxStub = sinon.stub();
-
-    function getTestAdUnits() {
-      // copy adUnits
-      // return JSON.parse(JSON.stringify(getAdUnits()));
-      return utils.deepClone(getAdUnits()).map(adUnit => {
-        adUnit.bids = adUnit.bids.filter(bid => includes(['adequant', 'appnexus', 'rubicon'], bid.bidder));
-        return adUnit;
-      })
-    }
-
-    function callBids(adUnits = getTestAdUnits()) {
-      let bidRequests = adapterManager.makeBidRequests(adUnits, 1111, 2222, 1000);
-      adapterManager.callBids(adUnits, bidRequests, doneStub, ajaxStub);
-    }
-
-    function checkServerCalled(numAdUnits, numBids) {
-      sinon.assert.calledOnce(prebidServerAdapterMock.callBids);
-      let requestObj = prebidServerAdapterMock.callBids.firstCall.args[0];
-      expect(requestObj.ad_units.length).to.equal(numAdUnits);
-      for (let i = 0; i < numAdUnits; i++) {
-        expect(requestObj.ad_units[i].bids.filter((bid) => {
-          return bid.bidder === 'appnexus' || bid.bidder === 'adequant';
-        }).length).to.equal(numBids);
-      }
-    }
-
-    function checkClientCalled(adapter, numBids) {
-      sinon.assert.calledOnce(adapter.callBids);
-      expect(adapter.callBids.firstCall.args[0].bids.length).to.equal(numBids);
-    }
-
-    let TESTING_CONFIG = utils.deepClone(CONFIG);
-    Object.assign(TESTING_CONFIG, {
-      bidders: ['appnexus', 'adequant'],
-      testing: true
-    });
-    let stubGetSourceBidderMap;
-
+  describe('Multiple S2S tests', function () {
     beforeEach(function () {
-      config.setConfig({s2sConfig: TESTING_CONFIG});
+      config.setConfig({s2sConfig: [CONFIG, CONFIG2]});
       adapterManager.bidderRegistry['prebidServer'] = prebidServerAdapterMock;
-      adapterManager.bidderRegistry['adequant'] = adequantAdapterMock;
-      adapterManager.bidderRegistry['appnexus'] = appnexusAdapterMock;
-      adapterManager.bidderRegistry['rubicon'] = rubiconAdapterMock;
-
-      stubGetSourceBidderMap = sinon.stub(s2sTesting, 'getSourceBidderMap');
-
       prebidServerAdapterMock.callBids.reset();
-      adequantAdapterMock.callBids.reset();
-      appnexusAdapterMock.callBids.reset();
-      rubiconAdapterMock.callBids.reset();
     });
 
     afterEach(function () {
-      config.setConfig({s2sConfig: {}});
-      s2sTesting.getSourceBidderMap.restore();
-    });
-
-    it('calls server adapter if no sources defined', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: [], [s2sTesting.SERVER]: []});
-      callBids();
-
-      // server adapter
-      checkServerCalled(2, 2);
-
-      // appnexus
-      sinon.assert.notCalled(appnexusAdapterMock.callBids);
-
-      // adequant
-      sinon.assert.notCalled(adequantAdapterMock.callBids);
-    });
-
-    it('calls client adapter if one client source defined', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus'], [s2sTesting.SERVER]: []});
-      callBids();
-
-      // server adapter
-      checkServerCalled(2, 2);
-
-      // appnexus
-      checkClientCalled(appnexusAdapterMock, 2);
-
-      // adequant
-      sinon.assert.notCalled(adequantAdapterMock.callBids);
-    });
-
-    it('calls client adapters if client sources defined', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
-      callBids();
-
-      // server adapter
-      checkServerCalled(2, 2);
-
-      // appnexus
-      checkClientCalled(appnexusAdapterMock, 2);
-
-      // adequant
-      checkClientCalled(adequantAdapterMock, 2);
-    });
-
-    it('calls client adapters if client sources defined', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
-      callBids();
-
-      // server adapter
-      checkServerCalled(2, 2);
-
-      // appnexus
-      checkClientCalled(appnexusAdapterMock, 2);
-
-      // adequant
-      checkClientCalled(adequantAdapterMock, 2);
+      allS2SBidders.length = 0;
     });
 
-    it('does not call server adapter for bidders that go to client', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
-      var adUnits = getTestAdUnits();
-      adUnits[0].bids[0].finalSource = s2sTesting.CLIENT;
-      adUnits[0].bids[1].finalSource = s2sTesting.CLIENT;
-      adUnits[1].bids[0].finalSource = s2sTesting.CLIENT;
-      adUnits[1].bids[1].finalSource = s2sTesting.CLIENT;
-      callBids(adUnits);
-
-      // server adapter
+    const bidRequests = [{
+      'bidderCode': 'appnexus',
+      'auctionId': '1863e370099523',
+      'bidderRequestId': '2946b569352ef2',
+      'tid': '34566b569352ef2',
+      'timeout': 1000,
+      'src': 's2s',
+      'adUnitsS2SCopy': [
+        {
+          'code': '/19968336/header-bid-tag1',
+          'sizes': [
+            {
+              'w': 728,
+              'h': 90
+            },
+            {
+              'w': 970,
+              'h': 90
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'appnexus',
+              'params': {
+                'placementId': '543221',
+                'test': 'me'
+              },
+              'adUnitCode': '/19968336/header-bid-tag1',
+              'sizes': [
+                [
+                  728,
+                  90
+                ],
+                [
+                  970,
+                  90
+                ]
+              ],
+              'bidId': '68136e1c47023d',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220995,
+              'status': 1,
+              'bid_id': '68136e1c47023d'
+            }
+          ]
+        },
+        {
+          'code': '/19968336/header-bid-tag-0',
+          'sizes': [
+            {
+              'w': 300,
+              'h': 250
+            },
+            {
+              'w': 300,
+              'h': 600
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'appnexus',
+              'params': {
+                'placementId': '5324321'
+              },
+              'adUnitCode': '/19968336/header-bid-tag-0',
+              'sizes': [
+                [
+                  300,
+                  250
+                ],
+                [
+                  300,
+                  600
+                ]
+              ],
+              'bidId': '7e5d6af25ed188',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220996,
+              'bid_id': '7e5d6af25ed188'
+            }
+          ]
+        }
+      ],
+      'bids': [
+        {
+          'bidder': 'appnexus',
+          'params': {
+            'placementId': '4799418',
+            'test': 'me'
+          },
+          'adUnitCode': '/19968336/header-bid-tag1',
+          'sizes': [
+            [
+              728,
+              90
+            ],
+            [
+              970,
+              90
+            ]
+          ],
+          'bidId': '392b5a6b05d648',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897462,
+          'status': 1,
+          'transactionId': 'fsafsa'
+        },
+        {
+          'bidder': 'appnexus',
+          'params': {
+            'placementId': '4799418'
+          },
+          'adUnitCode': '/19968336/header-bid-tag-0',
+          'sizes': [
+            [
+              300,
+              250
+            ],
+            [
+              300,
+              600
+            ]
+          ],
+          'bidId': '4dccdc37746135',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897463,
+          'status': 1,
+          'transactionId': 'fsafsa'
+        }
+      ],
+      'start': 1462918897460
+    },
+    {
+      'bidderCode': 'pubmatic',
+      'auctionId': '1863e370099523',
+      'bidderRequestId': '2946b569352ef2',
+      'tid': '2342342342lfi23',
+      'timeout': 1000,
+      'src': 's2s',
+      'adUnitsS2SCopy': [
+        {
+          'code': '/19968336/header-bid-tag1',
+          'sizes': [
+            {
+              'w': 728,
+              'h': 90
+            },
+            {
+              'w': 970,
+              'h': 90
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'pubmatic',
+              'params': {
+                'placementId': '543221',
+                'test': 'me'
+              },
+              'adUnitCode': '/19968336/header-bid-tag1',
+              'sizes': [
+                [
+                  728,
+                  90
+                ],
+                [
+                  970,
+                  90
+                ]
+              ],
+              'bidId': '68136e1c47023d',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220995,
+              'status': 1,
+              'bid_id': '68136e1c47023d'
+            }
+          ]
+        },
+        {
+          'code': '/19968336/header-bid-tag-0',
+          'sizes': [
+            {
+              'w': 300,
+              'h': 250
+            },
+            {
+              'w': 300,
+              'h': 600
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'pubmatic',
+              'params': {
+                'placementId': '5324321'
+              },
+              'adUnitCode': '/19968336/header-bid-tag-0',
+              'sizes': [
+                [
+                  300,
+                  250
+                ],
+                [
+                  300,
+                  600
+                ]
+              ],
+              'bidId': '7e5d6af25ed188',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220996,
+              'bid_id': '7e5d6af25ed188'
+            }
+          ]
+        }
+      ],
+      'bids': [
+        {
+          'bidder': 'pubmatic',
+          'params': {
+            'placementId': '4799418',
+            'test': 'me'
+          },
+          'adUnitCode': '/19968336/header-bid-tag1',
+          'sizes': [
+            [
+              728,
+              90
+            ],
+            [
+              970,
+              90
+            ]
+          ],
+          'bidId': '392b5a6b05d648',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897462,
+          'status': 1,
+          'transactionId': '4r42r23r23'
+        },
+        {
+          'bidder': 'pubmatic',
+          'params': {
+            'placementId': '4799418'
+          },
+          'adUnitCode': '/19968336/header-bid-tag-0',
+          'sizes': [
+            [
+              300,
+              250
+            ],
+            [
+              300,
+              600
+            ]
+          ],
+          'bidId': '4dccdc37746135',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897463,
+          'status': 1,
+          'transactionId': '4r42r23r23'
+        }
+      ],
+      'start': 1462918897460
+    }];
+
+    it('invokes callBids on the S2S adapter', function () {
+      adapterManager.callBids(
+        getAdUnits(),
+        bidRequests,
+        () => {},
+        () => () => {}
+      );
+      sinon.assert.calledTwice(prebidServerAdapterMock.callBids);
+    });
+
+    // Enable this test when prebidServer adapter is made 1.0 compliant
+    it('invokes callBids with only s2s bids', function () {
+      const adUnits = getAdUnits();
+      // adUnit without appnexus bidder
+      adUnits.push({
+        'code': '123',
+        'sizes': [300, 250],
+        'bids': [
+          {
+            'bidder': 'adequant',
+            'params': {
+              'publisher_id': '1234567',
+              'bidfloor': 0.01
+            }
+          }
+        ]
+      });
+
+      adapterManager.callBids(
+        adUnits,
+        bidRequests,
+        () => {},
+        () => () => {}
+      );
+      const requestObj = prebidServerAdapterMock.callBids.firstCall.args[0];
+      expect(requestObj.ad_units.length).to.equal(2);
+      sinon.assert.calledTwice(prebidServerAdapterMock.callBids);
+    });
+
+    describe('BID_REQUESTED event', function () {
+      // function to count BID_REQUESTED events
+      let cnt, count = () => cnt++;
+
+      beforeEach(function () {
+        prebidServerAdapterMock.callBids.reset();
+        cnt = 0;
+        events.on(CONSTANTS.EVENTS.BID_REQUESTED, count);
+      });
+
+      afterEach(function () {
+        events.off(CONSTANTS.EVENTS.BID_REQUESTED, count);
+      });
+
+      it('should fire for s2s requests', function () {
+        let adUnits = utils.deepClone(getAdUnits()).map(adUnit => {
+          adUnit.bids = adUnit.bids.filter(bid => includes(['appnexus', 'pubmatic'], bid.bidder));
+          return adUnit;
+        })
+        let bidRequests = adapterManager.makeBidRequests(adUnits, 1111, 2222, 1000);
+        adapterManager.callBids(adUnits, bidRequests, () => {}, () => {});
+        expect(cnt).to.equal(2);
+        sinon.assert.calledTwice(prebidServerAdapterMock.callBids);
+      });
+
+      it('should fire for simultaneous s2s and client requests', function () {
+        adapterManager.bidderRegistry['adequant'] = adequantAdapterMock;
+        let adUnits = utils.deepClone(getAdUnits()).map(adUnit => {
+          adUnit.bids = adUnit.bids.filter(bid => includes(['adequant', 'appnexus', 'pubmatic'], bid.bidder));
+          return adUnit;
+        })
+        let bidRequests = adapterManager.makeBidRequests(adUnits, 1111, 2222, 1000);
+        adapterManager.callBids(adUnits, bidRequests, () => {}, () => {});
+        expect(cnt).to.equal(3);
+        sinon.assert.calledTwice(prebidServerAdapterMock.callBids);
+        sinon.assert.calledOnce(adequantAdapterMock.callBids);
+        adequantAdapterMock.callBids.reset();
+        delete adapterManager.bidderRegistry['adequant'];
+      });
+    });
+  }); // end multiple s2s tests
+
+  describe('s2sTesting', function () {
+    let doneStub = sinon.stub();
+    let ajaxStub = sinon.stub();
+
+    function getTestAdUnits() {
+      // copy adUnits
+      // return JSON.parse(JSON.stringify(getAdUnits()));
+      return utils.deepClone(getAdUnits()).map(adUnit => {
+        adUnit.bids = adUnit.bids.filter(bid => includes(['adequant', 'appnexus', 'rubicon'], bid.bidder));
+        return adUnit;
+      })
+    }
+
+    function callBids(adUnits = getTestAdUnits()) {
+      let bidRequests = adapterManager.makeBidRequests(adUnits, 1111, 2222, 1000);
+      adapterManager.callBids(adUnits, bidRequests, doneStub, ajaxStub);
+    }
+
+    function checkServerCalled(numAdUnits, numBids) {
+      sinon.assert.calledOnce(prebidServerAdapterMock.callBids);
+      let requestObj = prebidServerAdapterMock.callBids.firstCall.args[0];
+      expect(requestObj.ad_units.length).to.equal(numAdUnits);
+      for (let i = 0; i < numAdUnits; i++) {
+        expect(requestObj.ad_units[i].bids.filter((bid) => {
+          return bid.bidder === 'appnexus' || bid.bidder === 'adequant';
+        }).length).to.equal(numBids);
+      }
+    }
+
+    function checkClientCalled(adapter, numBids) {
+      sinon.assert.calledOnce(adapter.callBids);
+      expect(adapter.callBids.firstCall.args[0].bids.length).to.equal(numBids);
+    }
+
+    let TESTING_CONFIG = utils.deepClone(CONFIG);
+    Object.assign(TESTING_CONFIG, {
+      bidders: ['appnexus', 'adequant'],
+      testing: true
+    });
+    let stubGetSourceBidderMap;
+
+    beforeEach(function () {
+      config.setConfig({s2sConfig: TESTING_CONFIG});
+      adapterManager.bidderRegistry['prebidServer'] = prebidServerAdapterMock;
+      adapterManager.bidderRegistry['adequant'] = adequantAdapterMock;
+      adapterManager.bidderRegistry['appnexus'] = appnexusAdapterMock;
+      adapterManager.bidderRegistry['rubicon'] = rubiconAdapterMock;
+
+      stubGetSourceBidderMap = sinon.stub(s2sTesting, 'getSourceBidderMap');
+
+      prebidServerAdapterMock.callBids.reset();
+      adequantAdapterMock.callBids.reset();
+      appnexusAdapterMock.callBids.reset();
+      rubiconAdapterMock.callBids.reset();
+    });
+
+    afterEach(function () {
+      s2sTesting.getSourceBidderMap.restore();
+    });
+
+    it('calls server adapter if no sources defined', function () {
+      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: [], [s2sTesting.SERVER]: []});
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 2);
+
+      // appnexus
+      sinon.assert.notCalled(appnexusAdapterMock.callBids);
+
+      // adequant
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+    });
+
+    it('calls client adapter if one client source defined', function () {
+      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus'], [s2sTesting.SERVER]: []});
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 2);
+
+      // appnexus
+      checkClientCalled(appnexusAdapterMock, 2);
+
+      // adequant
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+    });
+
+    it('calls client adapters if client sources defined', function () {
+      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 2);
+
+      // appnexus
+      checkClientCalled(appnexusAdapterMock, 2);
+
+      // adequant
+      checkClientCalled(adequantAdapterMock, 2);
+    });
+
+    it('does not call server adapter for bidders that go to client', function () {
+      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
+      var adUnits = getTestAdUnits();
+      adUnits[0].bids[0].finalSource = s2sTesting.CLIENT;
+      adUnits[0].bids[1].finalSource = s2sTesting.CLIENT;
+      adUnits[1].bids[0].finalSource = s2sTesting.CLIENT;
+      adUnits[1].bids[1].finalSource = s2sTesting.CLIENT;
+      callBids(adUnits);
+
+      // server adapter
       sinon.assert.notCalled(prebidServerAdapterMock.callBids);
 
       // appnexus
@@ -885,61 +1115,389 @@ describe('adapterManager tests', function () {
       checkClientCalled(adequantAdapterMock, 2);
     });
 
-    it('does not call client adapters for bidders that go to server', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
-      var adUnits = getTestAdUnits();
-      adUnits[0].bids[0].finalSource = s2sTesting.SERVER;
-      adUnits[0].bids[1].finalSource = s2sTesting.SERVER;
-      adUnits[1].bids[0].finalSource = s2sTesting.SERVER;
-      adUnits[1].bids[1].finalSource = s2sTesting.SERVER;
-      callBids(adUnits);
+    it('does not call client adapters for bidders that go to server', function () {
+      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
+      var adUnits = getTestAdUnits();
+      adUnits[0].bids[0].finalSource = s2sTesting.SERVER;
+      adUnits[0].bids[1].finalSource = s2sTesting.SERVER;
+      adUnits[1].bids[0].finalSource = s2sTesting.SERVER;
+      adUnits[1].bids[1].finalSource = s2sTesting.SERVER;
+      callBids(adUnits);
+
+      // server adapter
+      checkServerCalled(2, 2);
+
+      // appnexus
+      sinon.assert.notCalled(appnexusAdapterMock.callBids);
+
+      // adequant
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+    });
+
+    it('calls client and server adapters for bidders that go to both', function () {
+      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
+      var adUnits = getTestAdUnits();
+      // adUnits[0].bids[0].finalSource = s2sTesting.BOTH;
+      // adUnits[0].bids[1].finalSource = s2sTesting.BOTH;
+      // adUnits[1].bids[0].finalSource = s2sTesting.BOTH;
+      // adUnits[1].bids[1].finalSource = s2sTesting.BOTH;
+      callBids(adUnits);
+
+      // server adapter
+      checkServerCalled(2, 2);
+
+      // appnexus
+      checkClientCalled(appnexusAdapterMock, 2);
+
+      // adequant
+      checkClientCalled(adequantAdapterMock, 2);
+    });
+
+    it('makes mixed client/server adapter calls for mixed bidder sources', function () {
+      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
+      var adUnits = getTestAdUnits();
+      adUnits[0].bids[0].finalSource = s2sTesting.CLIENT;
+      adUnits[0].bids[1].finalSource = s2sTesting.CLIENT;
+      adUnits[1].bids[0].finalSource = s2sTesting.SERVER;
+      adUnits[1].bids[1].finalSource = s2sTesting.SERVER;
+      callBids(adUnits);
+
+      // server adapter
+      checkServerCalled(1, 2);
+
+      // appnexus
+      checkClientCalled(appnexusAdapterMock, 1);
+
+      // adequant
+      checkClientCalled(adequantAdapterMock, 1);
+    });
+  });
+
+  describe('Multiple Server s2sTesting', function () {
+    let doneStub = sinon.stub();
+    let ajaxStub = sinon.stub();
+
+    function getTestAdUnits() {
+      // copy adUnits
+      return utils.deepClone(getAdUnits()).map(adUnit => {
+        adUnit.bids = adUnit.bids.filter(bid => {
+          return includes(['adequant', 'appnexus', 'pubmatic', 'rubicon'],
+            bid.bidder);
+        });
+        return adUnit;
+      })
+    }
+
+    function callBids(adUnits = getTestAdUnits()) {
+      let bidRequests = adapterManager.makeBidRequests(adUnits, 1111, 2222, 1000);
+      adapterManager.callBids(adUnits, bidRequests, doneStub, ajaxStub);
+    }
+
+    function checkServerCalled(numAdUnits, firstConfigNumBids, secondConfigNumBids) {
+      let requestObjects = [];
+      let configBids;
+      if (firstConfigNumBids === 0 || secondConfigNumBids === 0) {
+        configBids = Math.max(firstConfigNumBids, secondConfigNumBids)
+        sinon.assert.calledOnce(prebidServerAdapterMock.callBids);
+        let requestObj1 = prebidServerAdapterMock.callBids.firstCall.args[0];
+        requestObjects.push(requestObj1)
+      } else {
+        sinon.assert.calledTwice(prebidServerAdapterMock.callBids);
+        let requestObj1 = prebidServerAdapterMock.callBids.firstCall.args[0];
+        let requestObj2 = prebidServerAdapterMock.callBids.secondCall.args[0];
+        requestObjects.push(requestObj1, requestObj2);
+      }
+
+      requestObjects.forEach((requestObj, index) => {
+        const numBids = configBids !== undefined ? configBids : index === 0 ? firstConfigNumBids : secondConfigNumBids
+        expect(requestObj.ad_units.length).to.equal(numAdUnits);
+        for (let i = 0; i < numAdUnits; i++) {
+          expect(requestObj.ad_units[i].bids.filter((bid) => {
+            return bid.bidder === 'appnexus' || bid.bidder === 'adequant' || bid.bidder === 'pubmatic';
+          }).length).to.equal(numBids);
+        }
+      })
+    }
+
+    function checkClientCalled(adapter, numBids) {
+      sinon.assert.calledOnce(adapter.callBids);
+      expect(adapter.callBids.firstCall.args[0].bids.length).to.equal(numBids);
+    }
+
+    beforeEach(function () {
+      allS2SBidders.length = 0;
+      clientTestAdapters.length = 0
+
+      adapterManager.bidderRegistry['prebidServer'] = prebidServerAdapterMock;
+      adapterManager.bidderRegistry['adequant'] = adequantAdapterMock;
+      adapterManager.bidderRegistry['appnexus'] = appnexusAdapterMock;
+      adapterManager.bidderRegistry['rubicon'] = rubiconAdapterMock;
+      adapterManager.bidderRegistry['pubmatic'] = pubmaticAdapterMock;
+
+      prebidServerAdapterMock.callBids.reset();
+      adequantAdapterMock.callBids.reset();
+      appnexusAdapterMock.callBids.reset();
+      rubiconAdapterMock.callBids.reset();
+      pubmaticAdapterMock.callBids.reset();
+    });
+
+    it('calls server adapter if no sources defined for config where testing is true, ' +
+    'calls client adapter for second config where testing is false', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        testing: true,
+      });
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 2, 1);
+
+      // appnexus
+      sinon.assert.notCalled(appnexusAdapterMock.callBids);
+
+      // adequant
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+
+      // pubmatic
+      sinon.assert.notCalled(pubmaticAdapterMock.callBids);
+
+      // rubicon
+      sinon.assert.called(rubiconAdapterMock.callBids);
+    });
+
+    it('calls client adapter if one client source defined for config where testing is true, ' +
+    'calls client adapter for second config where testing is false', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        bidderControl: {
+          appnexus: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true,
+      });
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 1, 1);
+
+      // appnexus
+      checkClientCalled(appnexusAdapterMock, 2);
+
+      // adequant
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+
+      // pubmatic
+      sinon.assert.notCalled(pubmaticAdapterMock.callBids);
+
+      // rubicon
+      checkClientCalled(rubiconAdapterMock, 1);
+    });
+
+    it('calls client adapters if client sources defined in first config and server in second config', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        bidderControl: {
+          appnexus: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+          adequant: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true,
+      });
+
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 0, 1);
+
+      // appnexus
+      checkClientCalled(appnexusAdapterMock, 2);
+
+      // adequant
+      checkClientCalled(adequantAdapterMock, 2);
+
+      // pubmatic
+      sinon.assert.notCalled(pubmaticAdapterMock.callBids);
+
+      // rubicon
+      checkClientCalled(rubiconAdapterMock, 1);
+    });
+
+    it('does not call server adapter for bidders that go to client when both configs are set to client', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        bidderControl: {
+          appnexus: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+          adequant: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true,
+      });
 
-      // server adapter
-      checkServerCalled(2, 2);
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        bidderControl: {
+          pubmatic: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+      callBids();
+
+      sinon.assert.notCalled(prebidServerAdapterMock.callBids);
 
       // appnexus
-      sinon.assert.notCalled(appnexusAdapterMock.callBids);
+      checkClientCalled(appnexusAdapterMock, 2);
 
       // adequant
-      sinon.assert.notCalled(adequantAdapterMock.callBids);
+      checkClientCalled(adequantAdapterMock, 2);
+
+      // pubmatic
+      checkClientCalled(pubmaticAdapterMock, 2);
+
+      // rubicon
+      checkClientCalled(rubiconAdapterMock, 1);
     });
 
-    it('calls client and server adapters for bidders that go to both', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
-      var adUnits = getTestAdUnits();
-      // adUnits[0].bids[0].finalSource = s2sTesting.BOTH;
-      // adUnits[0].bids[1].finalSource = s2sTesting.BOTH;
-      // adUnits[1].bids[0].finalSource = s2sTesting.BOTH;
-      // adUnits[1].bids[1].finalSource = s2sTesting.BOTH;
-      callBids(adUnits);
+    it('does not call client adapters for bidders in either config when testServerOnly if true in first config', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        testServerOnly: true,
+        bidderControl: {
+          appnexus: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+          adequant: {
+            bidSource: { server: 100, client: 0 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true,
+      });
+
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        bidderControl: {
+          pubmatic: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          }
+        },
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+      callBids();
 
       // server adapter
-      checkServerCalled(2, 2);
+      checkServerCalled(2, 1, 0);
 
       // appnexus
-      checkClientCalled(appnexusAdapterMock, 2);
+      sinon.assert.notCalled(appnexusAdapterMock.callBids);
 
       // adequant
-      checkClientCalled(adequantAdapterMock, 2);
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+
+      // pubmatic
+      sinon.assert.notCalled(pubmaticAdapterMock.callBids);
+
+      // rubicon
+      sinon.assert.notCalled(rubiconAdapterMock.callBids);
     });
 
-    it('makes mixed client/server adapter calls for mixed bidder sources', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
-      var adUnits = getTestAdUnits();
-      adUnits[0].bids[0].finalSource = s2sTesting.CLIENT;
-      adUnits[0].bids[1].finalSource = s2sTesting.CLIENT;
-      adUnits[1].bids[0].finalSource = s2sTesting.SERVER;
-      adUnits[1].bids[1].finalSource = s2sTesting.SERVER;
-      callBids(adUnits);
+    it('does not call client adapters for bidders in either config when testServerOnly if true in second config', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        bidderControl: {
+          appnexus: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+          adequant: {
+            bidSource: { server: 100, client: 0 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true,
+      });
+
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        testServerOnly: true,
+        bidderControl: {
+          pubmatic: {
+            bidSource: { server: 100, client: 0 },
+            includeSourceKvp: true,
+          }
+        },
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+      callBids();
 
       // server adapter
-      checkServerCalled(1, 2);
+      checkServerCalled(2, 1, 1);
 
       // appnexus
-      checkClientCalled(appnexusAdapterMock, 1);
+      sinon.assert.notCalled(appnexusAdapterMock.callBids);
 
       // adequant
-      checkClientCalled(adequantAdapterMock, 1);
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+
+      // pubmatic
+      sinon.assert.notCalled(pubmaticAdapterMock.callBids);
+
+      // rubicon
+      sinon.assert.notCalled(rubiconAdapterMock.callBids);
     });
   });
 
@@ -988,6 +1546,27 @@ describe('adapterManager tests', function () {
         expect(adapterManager.aliasRegistry).to.have.property('s2sAlias');
       });
 
+      it('should allow an alias if alias is part of s2sConfig.bidders for multiple s2sConfigs', function () {
+        let testS2sConfig = utils.deepClone(CONFIG);
+        testS2sConfig.bidders = ['s2sAlias'];
+        config.setConfig({s2sConfig: [
+          testS2sConfig, {
+            enabled: true,
+            endpoint: 'rp-pbs-endpoint-test.com',
+            timeout: 500,
+            maxBids: 1,
+            adapter: 'prebidServer',
+            bidders: ['s2sRpAlias'],
+            accountId: 'def'
+          }
+        ]});
+
+        adapterManager.aliasBidAdapter('s2sBidder', 's2sAlias');
+        expect(adapterManager.aliasRegistry).to.have.property('s2sAlias');
+        adapterManager.aliasBidAdapter('s2sBidder', 's2sRpAlias');
+        expect(adapterManager.aliasRegistry).to.have.property('s2sRpAlias');
+      });
+
       it('should throw an error if alias + bidder are unknown and not part of s2sConfig.bidders', function () {
         let testS2sConfig = utils.deepClone(CONFIG);
         testS2sConfig.bidders = ['s2sAlias'];
@@ -1003,6 +1582,7 @@ describe('adapterManager tests', function () {
   describe('makeBidRequests', function () {
     let adUnits;
     beforeEach(function () {
+      allS2SBidders.length = 0
       adUnits = utils.deepClone(getAdUnits()).map(adUnit => {
         adUnit.bids = adUnit.bids.filter(bid => includes(['appnexus', 'rubicon'], bid.bidder));
         return adUnit;
@@ -1054,6 +1634,8 @@ describe('adapterManager tests', function () {
 
     describe('sizeMapping', function () {
       beforeEach(function () {
+        allS2SBidders.length = 0;
+        clientTestAdapters.length = 0;
         sinon.stub(window, 'matchMedia').callsFake(() => ({matches: true}));
       });
 
@@ -1187,7 +1769,7 @@ describe('adapterManager tests', function () {
           []
         );
 
-          // only valid sizes as specified in size config should show up in bidRequests
+        // only valid sizes as specified in size config should show up in bidRequests
         bidRequests.forEach(bidRequest => {
           bidRequest.bids.forEach(bid => {
             bid.sizes.forEach(size => {
@@ -1294,9 +1876,13 @@ describe('adapterManager tests', function () {
     describe('s2sTesting - testServerOnly', () => {
       beforeEach(() => {
         config.setConfig({ s2sConfig: getServerTestingConfig(CONFIG) });
+        allS2SBidders.length = 0
+        s2sTesting.bidSource = {};
       });
 
-      afterEach(() => config.resetConfig());
+      afterEach(() => {
+        config.resetConfig();
+      });
 
       const makeBidRequests = ads => {
         let bidRequests = adapterManager.makeBidRequests(
@@ -1413,5 +1999,192 @@ describe('adapterManager tests', function () {
         }
       );
     });
+
+    describe('Multiple s2sTesting - testServerOnly', () => {
+      beforeEach(() => {
+        config.setConfig({s2sConfig: [getServerTestingConfig(CONFIG), CONFIG2]});
+      });
+
+      afterEach(() => {
+        config.resetConfig()
+        allS2SBidders.length = 0;
+        s2sTesting.bidSource = {};
+      });
+
+      const makeBidRequests = ads => {
+        let bidRequests = adapterManager.makeBidRequests(
+          ads, 1111, 2222, 1000
+        );
+
+        bidRequests.sort((a, b) => {
+          if (a.bidderCode < b.bidderCode) return -1;
+          if (a.bidderCode > b.bidderCode) return 1;
+          return 0;
+        });
+
+        return bidRequests;
+      };
+
+      const removeAdUnitsBidSource = adUnits => adUnits.map(adUnit => {
+        const newAdUnit = { ...adUnit };
+        newAdUnit.bids = newAdUnit.bids.map(bid => {
+          if (bid.bidSource) delete bid.bidSource;
+          return bid;
+        });
+        return newAdUnit;
+      });
+
+      it('suppresses all client bids if there are server bids resulting from bidSource at the adUnit Level', () => {
+        let ads = getServerTestingsAds();
+        ads.push({
+          code: 'test_div_5',
+          sizes: [[300, 250]],
+          bids: [{ bidder: 'pubmatic' }]
+        })
+        const bidRequests = makeBidRequests(ads);
+
+        expect(bidRequests).lengthOf(3);
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[0].bids[0].bidder).equals('openx');
+        expect(bidRequests[0].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[1].bids[0].bidder).equals('pubmatic');
+        expect(bidRequests[1].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[2].bids[0].bidder).equals('rubicon');
+        expect(bidRequests[2].bids[0].finalSource).equals('server');
+      });
+
+      it('should not surpress client side bids if testServerOnly is true in one config, ' +
+      ',bidderControl resolves to server in another config' +
+      'and there are no bid with bidSource at the adUnit Level', () => {
+        let testConfig1 = utils.deepClone(getServerTestingConfig(CONFIG));
+        let testConfig2 = utils.deepClone(CONFIG2);
+        testConfig1.testServerOnly = false;
+        testConfig2.testServerOnly = true;
+        testConfig2.testing = true;
+        testConfig2.bidderControl = {
+          'pubmatic': {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+        };
+        config.setConfig({s2sConfig: [testConfig1, testConfig2]});
+
+        let ads = [
+          {
+            code: 'test_div_1',
+            sizes: [[300, 250]],
+            bids: [{ bidder: 'adequant' }]
+          },
+          {
+            code: 'test_div_2',
+            sizes: [[300, 250]],
+            bids: [{ bidder: 'openx' }]
+          },
+          {
+            code: 'test_div_3',
+            sizes: [[300, 250]],
+            bids: [{ bidder: 'pubmatic' }]
+          },
+        ];
+        const bidRequests = makeBidRequests(ads);
+
+        expect(bidRequests).lengthOf(3);
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[0].bids[0].bidder).equals('adequant');
+        expect(bidRequests[0].bids[0].finalSource).equals('client');
+
+        expect(bidRequests[1].bids).lengthOf(1);
+        expect(bidRequests[1].bids[0].bidder).equals('openx');
+        expect(bidRequests[1].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[2].bids).lengthOf(1);
+        expect(bidRequests[2].bids[0].bidder).equals('pubmatic');
+        expect(bidRequests[2].bids[0].finalSource).equals('client');
+      });
+
+      // todo: update description
+      it('suppresses all, and only, client bids if there are bids resulting from bidSource at the adUnit Level', () => {
+        const ads = getServerTestingsAds();
+
+        // change this adUnit to be server based
+        ads[1].bids[1].bidSource.client = 0;
+        ads[1].bids[1].bidSource.server = 100;
+
+        const bidRequests = makeBidRequests(ads);
+
+        expect(bidRequests).lengthOf(3);
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[0].bids[0].bidder).equals('appnexus');
+        expect(bidRequests[0].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[1].bids).lengthOf(1);
+        expect(bidRequests[1].bids[0].bidder).equals('openx');
+        expect(bidRequests[1].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[2].bids).lengthOf(1);
+        expect(bidRequests[2].bids[0].bidder).equals('rubicon');
+        expect(bidRequests[2].bids[0].finalSource).equals('server');
+      });
+
+      // we have a server call now
+      it('does not suppress client bids if no "test case" bids result in a server bid', () => {
+        const ads = getServerTestingsAds();
+
+        // change this adUnit to be client based
+        ads[0].bids[0].bidSource.client = 100;
+        ads[0].bids[0].bidSource.server = 0;
+
+        const bidRequests = makeBidRequests(ads);
+
+        expect(bidRequests).lengthOf(4);
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[0].bids[0].bidder).equals('adequant');
+        expect(bidRequests[0].bids[0].finalSource).equals('client');
+
+        expect(bidRequests[1].bids).lengthOf(2);
+        expect(bidRequests[1].bids[0].bidder).equals('appnexus');
+        expect(bidRequests[1].bids[0].finalSource).equals('client');
+        expect(bidRequests[1].bids[1].bidder).equals('appnexus');
+        expect(bidRequests[1].bids[1].finalSource).equals('client');
+
+        expect(bidRequests[2].bids).lengthOf(1);
+        expect(bidRequests[2].bids[0].bidder).equals('openx');
+        expect(bidRequests[2].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[3].bids).lengthOf(2);
+        expect(bidRequests[3].bids[0].bidder).equals('rubicon');
+        expect(bidRequests[3].bids[0].finalSource).equals('client');
+        expect(bidRequests[3].bids[1].bidder).equals('rubicon');
+        expect(bidRequests[3].bids[1].finalSource).equals('client');
+      });
+
+      it(
+        'should surpress client side bids if no ad unit bidSources are set, ' +
+        'but bidderControl resolves to server',
+        () => {
+          const ads = removeAdUnitsBidSource(getServerTestingsAds());
+
+          const bidRequests = makeBidRequests(ads);
+
+          expect(bidRequests).lengthOf(2);
+
+          expect(bidRequests[0].bids).lengthOf(1);
+          expect(bidRequests[0].bids[0].bidder).equals('openx');
+          expect(bidRequests[0].bids[0].finalSource).equals('server');
+
+          expect(bidRequests[1].bids).lengthOf(2);
+          expect(bidRequests[1].bids[0].bidder).equals('rubicon');
+          expect(bidRequests[1].bids[0].finalSource).equals('server');
+        }
+      );
+    });
   });
 });

From 62907bd6420f019a4548ad1294baff8f37613d71 Mon Sep 17 00:00:00 2001
From: Ignat Khaylov <ignat@ignat.one>
Date: Wed, 27 Jan 2021 17:53:20 +0300
Subject: [PATCH 184/304] Between multirequests (#6214)

* added multirequests

* const endpoint

Co-authored-by: Ignat Khaylov <khaylov@betweenx.com>
---
 modules/betweenBidAdapter.js                | 12 +++++++++---
 test/spec/modules/betweenBidAdapter_spec.js | 18 +++++++++---------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/modules/betweenBidAdapter.js b/modules/betweenBidAdapter.js
index 0ed05717391..f445c9dfd5d 100644
--- a/modules/betweenBidAdapter.js
+++ b/modules/betweenBidAdapter.js
@@ -3,6 +3,7 @@ import { getAdUnitSizes, parseSizesInput } from '../src/utils.js';
 import { getRefererInfo } from '../src/refererDetection.js';
 
 const BIDDER_CODE = 'between';
+const ENDPOINT = 'https://ads.betweendigital.com/adjson?t=prebid';
 
 export const spec = {
   code: BIDDER_CODE,
@@ -30,7 +31,7 @@ export const spec = {
 
     validBidRequests.forEach(i => {
       let params = {
-        sizes: parseSizesInput(getAdUnitSizes(i)).join('%2C'),
+        sizes: parseSizesInput(getAdUnitSizes(i)),
         jst: 'hb',
         ord: Math.random() * 10000000000000000,
         tz: getTz(),
@@ -74,9 +75,14 @@ export const spec = {
         }
       }
 
-      requests.push({method: 'GET', url: 'https://ads.betweendigital.com/adjson', data: params})
+      requests.push({data: params})
     })
-    return requests;
+    return {
+      method: 'POST',
+      url: ENDPOINT,
+      data: JSON.stringify(requests)
+    }
+    // return requests;
   },
   /**
    * Unpack the response from the server into a list of bids.
diff --git a/test/spec/modules/betweenBidAdapter_spec.js b/test/spec/modules/betweenBidAdapter_spec.js
index 94db41ba014..44a8d2cc733 100644
--- a/test/spec/modules/betweenBidAdapter_spec.js
+++ b/test/spec/modules/betweenBidAdapter_spec.js
@@ -20,7 +20,7 @@ describe('betweenBidAdapterTests', function () {
       sizes: [[240, 400]]
     }]
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
     expect(req_data.bidid).to.equal('bid1234');
   });
   it('validate itu param', function() {
@@ -37,7 +37,7 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data.itu).to.equal('https://something.url');
   });
@@ -55,7 +55,7 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data.cur).to.equal('THX');
   });
@@ -73,7 +73,7 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data.subid).to.equal(1138);
   });
@@ -91,7 +91,7 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data.click3rd).to.equal('https://something.url');
   });
@@ -111,7 +111,7 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data['pubside_macro[param]']).to.equal('%26test%3Dtset');
   });
@@ -134,7 +134,7 @@ describe('betweenBidAdapterTests', function () {
     }
 
     let request = spec.buildRequests(bidRequestData, bidderRequest);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data.gdprApplies).to.equal(bidderRequest.gdprConsent.gdprApplies);
     expect(req_data.consentString).to.equal(bidderRequest.gdprConsent.consentString);
@@ -217,8 +217,8 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
-    expect(req_data.sizes).to.deep.equal('970x250%2C240x400%2C728x90');
+    expect(req_data.sizes).to.deep.equal(['970x250', '240x400', '728x90'])
   });
 });

From ea9b0b05a3c28b02d75fecd781484bf9452ba751 Mon Sep 17 00:00:00 2001
From: robertrmartinez <rrmartinez1552@gmail.com>
Date: Wed, 27 Jan 2021 13:22:45 -0800
Subject: [PATCH 185/304] Prebid 4.24.0 Release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3169db867ce..61e4ca06d1a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.24.0-pre",
+  "version": "4.24.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 6896e5318434c9f8ac66b94c094eccb5d6628bce Mon Sep 17 00:00:00 2001
From: robertrmartinez <rrmartinez1552@gmail.com>
Date: Wed, 27 Jan 2021 13:49:59 -0800
Subject: [PATCH 186/304] Increment pre version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 61e4ca06d1a..0d23415dca0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.24.0",
+  "version": "4.25.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 438b0b0c62f91fbf1ecea928083f068da221f94c Mon Sep 17 00:00:00 2001
From: Liza Kobrazova <lizakobrazova@gmail.com>
Date: Thu, 28 Jan 2021 01:43:51 +0300
Subject: [PATCH 187/304] Fix astraoneBidAdapter (#6230)

* Fix astraoneBidAdapter

* Fix examples; update astraoneBidAdapter description

* Fix astraoneBidAdapter_spec

* Remove integration examples

* Rename gbt to gpt
---
 modules/astraoneBidAdapter.js                |  17 +-
 modules/astraoneBidAdapter.md                | 292 ++++++++++---------
 test/spec/modules/astraoneBidAdapter_spec.js |  34 ++-
 3 files changed, 173 insertions(+), 170 deletions(-)

diff --git a/modules/astraoneBidAdapter.js b/modules/astraoneBidAdapter.js
index 7e98c1022d2..2fec3892d27 100644
--- a/modules/astraoneBidAdapter.js
+++ b/modules/astraoneBidAdapter.js
@@ -31,7 +31,9 @@ function buildBid(bidData) {
     creativeId: bidData.content.seanceId,
     currency: bidData.currency,
     netRevenue: true,
-    mediaType: BANNER,
+    meta: {
+      mediaType: BANNER,
+    },
     ttl: TTL,
     content: bidData.content
   };
@@ -62,7 +64,7 @@ function wrapAd(bid, bidData) {
                 parentDocument.style.height = "100%";
                 parentDocument.style.width = "100%";
             }
-            var _html = "${encodeURIComponent(JSON.stringify(bid))}";
+            var _html = "${encodeURIComponent(JSON.stringify({...bid, content: bidData.content}))}";
             window._ao_ssp.registerInImage(JSON.parse(decodeURIComponent(_html)));
         </script>
     </body>
@@ -126,14 +128,9 @@ export const spec = {
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
   interpretResponse: function(serverResponse) {
-    const serverBody = serverResponse.body;
-    if (serverBody && utils.isArray(serverBody)) {
-      return utils._map(serverBody, function(bid) {
-        return buildBid(bid);
-      });
-    } else {
-      return [];
-    }
+    const bids = serverResponse.body && serverResponse.body.bids;
+
+    return Array.isArray(bids) ? bids.map(bid => buildBid(bid)) : []
   }
 
 }
diff --git a/modules/astraoneBidAdapter.md b/modules/astraoneBidAdapter.md
index a7eaeeef5a4..e090cfe1e54 100644
--- a/modules/astraoneBidAdapter.md
+++ b/modules/astraoneBidAdapter.md
@@ -18,17 +18,17 @@ About us: https://astraone.io
 var adUnits = [{
     code: 'test-div',
     mediaTypes: {
-        banner: {
-            sizes: [1, 1]
-        }
+      banner: {
+        sizes: [1, 1],
+      }
     },
     bids: [{
-        bidder: "astraone",
-        params: {
-            placement: "inImage",
-            placeId: "5af45ad34d506ee7acad0c26",
-            imageUrl: "https://creative.astraone.io/files/default_image-1-600x400.jpg"
-        }
+      bidder: "astraone",
+      params: {
+        placement: "inImage",
+        placeId: "5f477bf94d506ebe2c4240f3",
+        imageUrl: "https://creative.astraone.io/files/default_image-1-600x400.jpg"
+      }
     }]
 }];
 ```
@@ -39,66 +39,69 @@ var adUnits = [{
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta charset="UTF-8">
-	<title>Prebid.js Banner Example</title>
-	<script async src="prebid.js"></script>
-	<style>
-        .banner-block {
-            position: absolute;
-            width: 100%;
-            height: 100%;
-            top: 0;
-            left: 0;
-            z-index: 1;
-            border: none;
-            overflow: hidden;
+  <meta charset="UTF-8">
+  <title>Prebid.js Banner Example</title>
+  <script src="../../../build/dev/prebid.js"></script>
+  <style>
+    .banner-block {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      top: 0;
+      left: 0;
+      z-index: 1;
+      border: none;
+      overflow: hidden;
+    }
+  </style>
+  <script>
+    var adUnits = [{
+      code: 'test-div',
+      mediaTypes: {
+        banner: {
+          sizes: [1, 1],
         }
-    </style>
-    <script>
-        var adUnits = [{
-            code: 'test-div',
-            sizes: [1, 1],
-            bids: [{
-                bidder: "astraone",
-                params: {
-                    placement: "inImage",
-                    placeId: "5af45ad34d506ee7acad0c26",
-                    imageUrl: "https://creative.astraone.io/files/default_image-1-600x400.jpg"
-                }
-            }]
-        }];
-
-        var pbjs = pbjs || {};
-        pbjs.que = pbjs.que || [];
-
-        pbjs.que.push(function() {
-            pbjs.addAdUnits(adUnits);
-            pbjs.requestBids({
-                bidsBackHandler: function (e) {
-                    if (pbjs.adserverRequestSent) return;
-                    pbjs.adserverRequestSent = true;
-
-                    var params = pbjs.getAdserverTargetingForAdUnitCode("test-div");
-                    var iframe = document.getElementById('test-div');
-
-                    if (params && params['hb_adid']) {
-                        iframe.parentElement.style.position = "relative";
-                        iframe.style.display = "block";
-                        pbjs.renderAd(iframe.contentDocument, params['hb_adid']);
-                    }
-                }
-            });
-        });
-    </script>
+      },
+      bids: [{
+        bidder: "astraone",
+        params: {
+          placement: "inImage",
+          placeId: "5f477bf94d506ebe2c4240f3",
+          imageUrl: "https://creative.astraone.io/files/default_image-1-600x400.jpg"
+        }
+      }]
+    }];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    pbjs.que.push(function() {
+      pbjs.addAdUnits(adUnits);
+      pbjs.requestBids({
+        bidsBackHandler: function (e) {
+          if (pbjs.adserverRequestSent) return;
+          pbjs.adserverRequestSent = true;
+          var params = pbjs.getAdserverTargetingForAdUnitCode("test-div");
+          var iframe = document.getElementById('test-div');
+
+          if (params && params['hb_adid']) {
+            iframe.parentElement.style.position = "relative";
+            iframe.style.display = "block";
+            pbjs.renderAd(iframe.contentDocument, params['hb_adid']);
+          }
+        }
+      });
+    });
+  </script>
 </head>
 
 <body>
-	<h2>Prebid.js InImage Banner Test</h2>
+<h2>Prebid.js InImage Banner Test</h2>
 
-	<div style="width: 600px;">
-        <img src="https://creative.astraone.io/files/default_image-1-600x400.jpg" />
-        <iframe id='test-div' class="banner-block" style="display: none;"></iframe>
-    </div>
+<div style="width: 600px;">
+  <img src="https://creative.astraone.io/files/default_image-1-600x400.jpg" width="100%" />
+  <iframe id='test-div' class="banner-block" style="display: none;"></iframe>
+</div>
 </body>
 
 </html>
@@ -109,90 +112,91 @@ var adUnits = [{
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta charset="UTF-8">
-	<title>Prebid.js Banner Example</title>
-	<script async src="prebid.js"></script>
-	<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
-	<style>
-		.banner-block {
-			position: absolute;
-			width: 100%;
-			height: 100%;
-			top: 0;
-			left: 0;
-			z-index: 1;
-			border: none;
-			overflow: hidden;
-		}
-		.banner-block div {
-			width: 100%;
-			height: 100%;
-		}
-	</style>
-	<script>
-		var pbjs = pbjs || {};
-		pbjs.que = pbjs.que || [];
-
-		var adUnits = [{
-			code: 'div-gpt-ad-1574864639578-0',
-			mediaTypes: {
-				banner: {
-					sizes: [1, 1]
-				}
-			},
-			bids: [{
-				bidder: "astraone",
-				params: {
-					placement: "inImage",
-					placeId: "5af45ad34d506ee7acad0c26",
-					imageUrl: "https://creative.astraone.io/files/default_image-1-600x400.jpg"
-				}
-			}]
-		}];
-
-		var googletag = googletag || {};
-		googletag.cmd = googletag.cmd || [];
-
-		googletag.cmd.push(() => {
-			googletag.pubads().disableInitialLoad();
-		});
-
-		pbjs.que.push(() => {
-			pbjs.addAdUnits(adUnits);
-			pbjs.requestBids({ bidsBackHandler: sendAdServerRequest });
-		});
-
-		function sendAdServerRequest() {
-			googletag.cmd.push(() => {
-				pbjs.que.push(() => {
-					pbjs.setTargetingForGPTAsync('div-gpt-ad-1574864639578-0');
-					googletag.pubads().refresh();
-				});
-			});
-		}
-
-		googletag.cmd.push(() => {
-			googletag
-				.defineSlot('/21877108735/rtb-pbjs', [1, 1], 'div-gpt-ad-1574864639578-0')
-				.addService(googletag.pubads());
-
-			googletag.pubads().enableSingleRequest();
-			googletag.enableServices();
-		});
-	</script>
+  <meta charset="UTF-8">
+  <title>Prebid.js Banner gpt Example</title>
+  <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+  <script async src="../../../build/dev/prebid.js"></script>
+  <style>
+    .banner-block {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      top: 0;
+      left: 0;
+      z-index: 1;
+      border: none;
+      overflow: hidden;
+    }
+    .banner-block div {
+      width: 100%;
+      height: 100%;
+    }
+  </style>
+  <script>
+    var sizes = [1, 1];
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    var adUnits = [{
+      code: 'div-gpt-ad-1574864639578-0',
+      mediaTypes: {
+        banner: {
+          sizes: sizes,
+        }
+      },
+      bids: [{
+        bidder: "astraone",
+        params: {
+          placement: "inImage",
+          placeId: "5f477bf94d506ebe2c4240f3",
+          imageUrl: "https://creative.astraone.io/files/default_image-1-600x400.jpg"
+        }
+      }]
+    }];
+
+    var googletag = googletag || {};
+    googletag.cmd = googletag.cmd || [];
+
+    googletag.cmd.push(() => {
+      googletag.pubads().disableInitialLoad();
+    });
+
+    pbjs.que.push(() => {
+      pbjs.addAdUnits(adUnits);
+      pbjs.requestBids({ bidsBackHandler: sendAdServerRequest });
+    });
+
+    function sendAdServerRequest() {
+      googletag.cmd.push(() => {
+        pbjs.que.push(() => {
+          pbjs.setTargetingForGPTAsync('div-gpt-ad-1574864639578-0');
+          googletag.pubads().refresh();
+        });
+      });
+    }
+
+    googletag.cmd.push(() => {
+      googletag
+        .defineSlot('/21877108735/rtb-pbjs', sizes, 'div-gpt-ad-1574864639578-0')
+        .addService(googletag.pubads());
+
+      googletag.pubads().enableSingleRequest();
+      googletag.enableServices();
+    });
+  </script>
 </head>
 <body>
-	<h2>Prebid.js Banner Ad Unit Test</h2>
+<h2>Prebid.js InImage Banner gpt Test</h2>
 
-	<div style="width: 600px; position: relative">
-		<img src="https://creative.astraone.io/files/default_image-1-600x400.jpg" />
+<div style="width: 600px; position: relative">
+  <img src="https://creative.astraone.io/files/default_image-1-600x400.jpg" />
 
-		<div id='div-gpt-ad-1574864639578-0' class="banner-block">
-			<script>
-				googletag.cmd.push(() => { googletag.display('div-gpt-ad-1574864639578-0'); });
-			</script>
-		</div>
-	</div>
+  <div id='div-gpt-ad-1574864639578-0' class="banner-block">
+    <script>
+      googletag.cmd.push(() => { googletag.display('div-gpt-ad-1574864639578-0'); });
+    </script>
+  </div>
+</div>
 </body>
 </html>
 ```
diff --git a/test/spec/modules/astraoneBidAdapter_spec.js b/test/spec/modules/astraoneBidAdapter_spec.js
index e422f64b570..0e545081869 100644
--- a/test/spec/modules/astraoneBidAdapter_spec.js
+++ b/test/spec/modules/astraoneBidAdapter_spec.js
@@ -14,7 +14,7 @@ function getSlotConfigs(mediaTypes, params) {
 
 describe('AstraOne Adapter', function() {
   describe('isBidRequestValid method', function() {
-    const PLACE_ID = '5af45ad34d506ee7acad0c26';
+    const PLACE_ID = '5f477bf94d506ebe2c4240f3';
     const IMAGE_URL = 'https://creative.astraone.io/files/default_image-1-600x400.jpg';
 
     describe('returns true', function() {
@@ -176,21 +176,23 @@ describe('AstraOne Adapter', function() {
       describe('the bid is a banner', function() {
         it('should return a banner bid', function() {
           const serverResponse = {
-            body: [
-              {
-                bidId: '2df8c0733f284e',
-                price: 0.5,
-                currency: 'USD',
-                content: {
-                  content: 'html',
-                  actionUrls: {},
-                  seanceId: '123123'
-                },
-                width: 100,
-                height: 100,
-                ttl: 360
-              }
-            ]
+            body: {
+              bids: [
+                {
+                  bidId: '2df8c0733f284e',
+                  price: 0.5,
+                  currency: 'USD',
+                  content: {
+                    content: 'html',
+                    actionUrls: {},
+                    seanceId: '123123'
+                  },
+                  width: 100,
+                  height: 100,
+                  ttl: 360
+                }
+              ]
+            }
           }
           const bids = spec.interpretResponse(serverResponse)
           expect(bids.length).to.equal(1)

From b7ec359ca242ceab4cd0c7e37307247974126e51 Mon Sep 17 00:00:00 2001
From: Steve Alliance <steve.alliance@gmail.com>
Date: Thu, 28 Jan 2021 03:14:49 -0500
Subject: [PATCH 188/304] update banner ttl (#6228)

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

diff --git a/modules/districtmDMXBidAdapter.js b/modules/districtmDMXBidAdapter.js
index b5969d4ed1e..f01c3c2ce9f 100644
--- a/modules/districtmDMXBidAdapter.js
+++ b/modules/districtmDMXBidAdapter.js
@@ -39,7 +39,7 @@ export const spec = {
               nBid.requestId = nBid.impid;
               nBid.width = nBid.w || width;
               nBid.height = nBid.h || height;
-              nBid.ttl = 360;
+              nBid.ttl = 300;
               nBid.mediaType = bid.mediaTypes && bid.mediaTypes.video ? 'video' : 'banner';
               if (nBid.mediaType) {
                 nBid.vastXml = cleanVast(nBid.adm, nBid.nurl);

From 4f2af660066308f166b10da2c11220205f45ab3b Mon Sep 17 00:00:00 2001
From: bretg <bgorsline@gmail.com>
Date: Thu, 28 Jan 2021 09:31:36 -0500
Subject: [PATCH 189/304] browsi: updating test parameters (#6048)

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

diff --git a/modules/browsiRtdProvider.md b/modules/browsiRtdProvider.md
index 0dd8c1d7609..9eed4b2b2d4 100644
--- a/modules/browsiRtdProvider.md
+++ b/modules/browsiRtdProvider.md
@@ -19,9 +19,9 @@ Configuration example for using RTD module with `browsi` provider
                 "name": "browsi",
                 "waitForIt": "true"
                 "params": {
-                    "url": "testUrl.com",
-                    "siteKey": "testKey",
-                    "pubKey": "testPub",
+                    "url": "yield-manager.browsiprod.com",
+                    "siteKey": "browsidemo",
+                    "pubKey": "browsidemo"
                     "keyName":"bv"
                 }  
             }]

From 5f56b1875bb3072fee3645f7c582bfbb3d4b980a Mon Sep 17 00:00:00 2001
From: Amanda Dillon <41923726+agdillon@users.noreply.github.com>
Date: Thu, 28 Jan 2021 08:23:51 -0700
Subject: [PATCH 190/304] SpotX Bid Adapter: default to 4/3 aspect ratio when
 response doesn't contain w or h (#6159)

* Default to 4/3 aspect ratio when response doesn't contain w or h

* SpotX bid adapter: reorder tests and remove extra assertions
---
 modules/spotxBidAdapter.js                | 46 +++++++++++------------
 test/spec/modules/spotxBidAdapter_spec.js | 43 +++++++++++++++++++--
 2 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/modules/spotxBidAdapter.js b/modules/spotxBidAdapter.js
index 5ed3884e977..c85a836435e 100644
--- a/modules/spotxBidAdapter.js
+++ b/modules/spotxBidAdapter.js
@@ -51,7 +51,7 @@ export const spec = {
           return false;
         }
         if (!utils.getBidIdParameter('slot', bid.params.outstream_options)) {
-          utils.logError(BIDDER_CODE + ': please define parameters slot outstream_options object in the configuration.');
+          utils.logError(BIDDER_CODE + ': please define parameter slot in outstream_options object in the configuration.');
           return false;
         }
       }
@@ -382,7 +382,7 @@ export const spec = {
                 }
               });
             } catch (err) {
-              utils.logWarn('Prebid Error calling setRender or setEve,tHandlers on renderer', err);
+              utils.logWarn('Prebid Error calling setRender or setEventHandlers on renderer', err);
             }
             bid.renderer = renderer;
           }
@@ -408,7 +408,7 @@ function createOutstreamScript(bid) {
   dataSpotXParams['data-spotx_content_page_url'] = bid.renderer.config.content_page_url;
   dataSpotXParams['data-spotx_ad_unit'] = 'incontent';
 
-  utils.logMessage('[SPOTX][renderer] Default beahavior');
+  utils.logMessage('[SPOTX][renderer] Default behavior');
   if (utils.getBidIdParameter('ad_mute', bid.renderer.config.outstream_options)) {
     dataSpotXParams['data-spotx_ad_mute'] = '1';
   }
@@ -419,30 +419,26 @@ function createOutstreamScript(bid) {
 
   const playersizeAutoAdapt = utils.getBidIdParameter('playersize_auto_adapt', bid.renderer.config.outstream_options);
   if (playersizeAutoAdapt && utils.isBoolean(playersizeAutoAdapt) && playersizeAutoAdapt === true) {
-    if (bid.width && utils.isNumber(bid.width) && bid.height && utils.isNumber(bid.height)) {
-      const ratio = bid.width / bid.height;
-      const slotClientWidth = window.document.getElementById(slot).clientWidth;
-      let playerWidth = bid.renderer.config.player_width;
-      let playerHeight = bid.renderer.config.player_height;
-      let contentWidth = 0;
-      let contentHeight = 0;
-      if (slotClientWidth < playerWidth) {
-        playerWidth = slotClientWidth;
-        playerHeight = playerWidth / ratio;
-      }
-      if (ratio <= 1) {
-        contentWidth = Math.round(playerHeight * ratio);
-        contentHeight = playerHeight;
-      } else {
-        contentWidth = playerWidth;
-        contentHeight = Math.round(playerWidth / ratio);
-      }
-
-      dataSpotXParams['data-spotx_content_width'] = '' + contentWidth;
-      dataSpotXParams['data-spotx_content_height'] = '' + contentHeight;
+    const ratio = bid.width && utils.isNumber(bid.width) && bid.height && utils.isNumber(bid.height) ? bid.width / bid.height : 4 / 3;
+    const slotClientWidth = window.document.getElementById(slot).clientWidth;
+    let playerWidth = bid.renderer.config.player_width;
+    let playerHeight = bid.renderer.config.player_height;
+    let contentWidth = 0;
+    let contentHeight = 0;
+    if (slotClientWidth < playerWidth) {
+      playerWidth = slotClientWidth;
+      playerHeight = playerWidth / ratio;
+    }
+    if (ratio <= 1) {
+      contentWidth = Math.round(playerHeight * ratio);
+      contentHeight = playerHeight;
     } else {
-      utils.logWarn('[SPOTX][renderer] PlayerSize auto adapt: bid.width and bid.height are incorrect');
+      contentWidth = playerWidth;
+      contentHeight = Math.round(playerWidth / ratio);
     }
+
+    dataSpotXParams['data-spotx_content_width'] = '' + contentWidth;
+    dataSpotXParams['data-spotx_content_height'] = '' + contentHeight;
   }
 
   const customOverride = utils.getBidIdParameter('custom_override', bid.renderer.config.outstream_options);
diff --git a/test/spec/modules/spotxBidAdapter_spec.js b/test/spec/modules/spotxBidAdapter_spec.js
index fb5ce63f543..927599ac986 100644
--- a/test/spec/modules/spotxBidAdapter_spec.js
+++ b/test/spec/modules/spotxBidAdapter_spec.js
@@ -488,7 +488,7 @@ describe('the spotx adapter', function () {
     });
   });
 
-  describe('oustreamRender', function() {
+  describe('outstreamRender', function() {
     var serverResponse, bidderRequestObj;
 
     beforeEach(function() {
@@ -545,7 +545,7 @@ describe('the spotx adapter', function () {
     it('should attempt to insert the EASI script', function() {
       var scriptTag;
       sinon.stub(window.document, 'getElementById').returns({
-        appendChild: sinon.stub().callsFake(function(script) { scriptTag = script })
+        appendChild: sinon.stub().callsFake(function(script) { scriptTag = script; })
       });
       var responses = spec.interpretResponse(serverResponse, bidderRequestObj);
 
@@ -573,7 +573,7 @@ describe('the spotx adapter', function () {
         nodeName: 'IFRAME',
         contentDocument: {
           body: {
-            appendChild: sinon.stub().callsFake(function(script) { scriptTag = script })
+            appendChild: sinon.stub().callsFake(function(script) { scriptTag = script; })
           }
         }
       });
@@ -598,5 +598,42 @@ describe('the spotx adapter', function () {
       expect(scriptTag.getAttribute('data-spotx_content_height')).to.equal('300');
       window.document.getElementById.restore();
     });
+
+    it('should adjust width and height to match slot clientWidth if playersize_auto_adapt is used', function() {
+      var scriptTag;
+      sinon.stub(window.document, 'getElementById').returns({
+        clientWidth: 200,
+        appendChild: sinon.stub().callsFake(function(script) { scriptTag = script; })
+      });
+      var responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+
+      responses[0].renderer.render(responses[0]);
+
+      expect(scriptTag.getAttribute('type')).to.equal('text/javascript');
+      expect(scriptTag.getAttribute('src')).to.equal('https://js.spotx.tv/easi/v1/12345.js');
+      expect(scriptTag.getAttribute('data-spotx_content_width')).to.equal('200');
+      expect(scriptTag.getAttribute('data-spotx_content_height')).to.equal('150');
+      window.document.getElementById.restore();
+    });
+
+    it('should use a default 4/3 ratio if playersize_auto_adapt is used and response does not contain width or height', function() {
+      delete serverResponse.body.seatbid[0].bid[0].w;
+      delete serverResponse.body.seatbid[0].bid[0].h;
+
+      var scriptTag;
+      sinon.stub(window.document, 'getElementById').returns({
+        clientWidth: 200,
+        appendChild: sinon.stub().callsFake(function(script) { scriptTag = script; })
+      });
+      var responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+
+      responses[0].renderer.render(responses[0]);
+
+      expect(scriptTag.getAttribute('type')).to.equal('text/javascript');
+      expect(scriptTag.getAttribute('src')).to.equal('https://js.spotx.tv/easi/v1/12345.js');
+      expect(scriptTag.getAttribute('data-spotx_content_width')).to.equal('200');
+      expect(scriptTag.getAttribute('data-spotx_content_height')).to.equal('150');
+      window.document.getElementById.restore();
+    });
   });
 });

From a926dee9e108ca4b8792ba8992a9bca7c2f42781 Mon Sep 17 00:00:00 2001
From: YerkovichM <48519843+YerkovichM@users.noreply.github.com>
Date: Thu, 28 Jan 2021 18:22:54 +0200
Subject: [PATCH 191/304] Extended ID permissions supported by bidder (#6112)

* User id bidder permission scheme

* styling

* prebidServer support

* -

* fix

* prebidServerBidAdapter take eidPermissions directly from userId module

* -

* unit tests

* -

* -

* update

* -

* -

* changed pbjs_bidders to pbjsBidders

* changed pbjsBidders to bidders
ext.prebid.data.eidPermissions to ext.prebid.data.eidpermissions

* rerun circleci

* rerun circleci

* omitting eidPermission entry if 'bidders' is not configured

Co-authored-by: myerkovich <myerkovich@rubiconproject.com>
Co-authored-by: Marko Yerkovich <marko_yerkovich@MacBook-Pro-Marko.local>
---
 integrationExamples/gpt/userId_example.html   |   1 +
 modules/prebidServerBidAdapter/index.js       |  17 ++-
 modules/userId/eids.js                        |  22 ++++
 modules/userId/index.js                       |  47 +++++--
 plugins/eslint/validateImports.js             |   3 +-
 .../modules/prebidServerBidAdapter_spec.js    |  46 ++++---
 test/spec/modules/userId_spec.js              | 117 +++++++++++++++++-
 7 files changed, 212 insertions(+), 41 deletions(-)

diff --git a/integrationExamples/gpt/userId_example.html b/integrationExamples/gpt/userId_example.html
index fa9b1e3b5fd..71299a4a6e1 100644
--- a/integrationExamples/gpt/userId_example.html
+++ b/integrationExamples/gpt/userId_example.html
@@ -236,6 +236,7 @@
                         },
                         {
                         name: "sharedId",
+                        // bidders: ["rubicon", "sampleBidders"], // to allow this ID for specific bidders
                         params: {
                             syncTime: 60 // in seconds, default is 24 hours
                         },
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 8fb512ff7e2..7274912efb5 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -12,6 +12,7 @@ import includes from 'core-js-pure/features/array/includes.js';
 import { S2S_VENDORS } from './config.js';
 import { ajax } from '../../src/ajax.js';
 import find from 'core-js-pure/features/array/find.js';
+import { getEidPermissions } from '../userId/index.js';
 
 const getConfig = config.getConfig;
 
@@ -455,7 +456,7 @@ export function resetWurlMap() {
 }
 
 const OPEN_RTB_PROTOCOL = {
-  buildRequest(s2sBidRequest, bidRequests, adUnits, s2sConfig) {
+  buildRequest(s2sBidRequest, bidRequests, adUnits, s2sConfig, requestedBidders) {
     let imps = [];
     let aliases = {};
     const firstBidRequest = bidRequests[0];
@@ -700,6 +701,18 @@ const OPEN_RTB_PROTOCOL = {
       utils.deepSetValue(request, 'user.ext.eids', bidUserIdAsEids);
     }
 
+    const eidPermissions = getEidPermissions();
+    if (utils.isArray(eidPermissions) && eidPermissions.length > 0) {
+      if (requestedBidders && utils.isArray(requestedBidders)) {
+        eidPermissions.forEach(i => {
+          if (i.bidders) {
+            i.bidders = i.bidders.filter(bidder => requestedBidders.includes(bidder))
+          }
+        });
+      }
+      utils.deepSetValue(request, 'ext.prebid.data.eidpermissions', eidPermissions);
+    }
+
     if (bidRequests) {
       if (firstBidRequest.gdprConsent) {
         // note - gdprApplies & consentString may be undefined in certain use-cases for consentManagement module
@@ -958,7 +971,7 @@ export function PrebidServer() {
         queueSync(syncBidders, gdprConsent, uspConsent, s2sBidRequest.s2sConfig);
       }
 
-      const request = OPEN_RTB_PROTOCOL.buildRequest(s2sBidRequest, bidRequests, validAdUnits, s2sBidRequest.s2sConfig);
+      const request = OPEN_RTB_PROTOCOL.buildRequest(s2sBidRequest, bidRequests, validAdUnits, s2sBidRequest.s2sConfig, requestedBidders);
       const requestJson = request && JSON.stringify(request);
       if (request && requestJson) {
         ajax(
diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index 27665de4136..80750ccaae8 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -224,3 +224,25 @@ export function createEidsArray(bidRequestUserId) {
   }
   return eids;
 }
+
+/**
+ * @param {SubmoduleContainer[]} submodules
+ */
+export function buildEidPermissions(submodules) {
+  let eidPermissions = [];
+  submodules.filter(i => utils.isPlainObject(i.idObj) && Object.keys(i.idObj).length)
+    .forEach(i => {
+      Object.keys(i.idObj).forEach(key => {
+        if (utils.deepAccess(i, 'config.bidders') && Array.isArray(i.config.bidders) &&
+          utils.deepAccess(USER_IDS_CONFIG, key + '.source')) {
+          eidPermissions.push(
+            {
+              source: USER_IDS_CONFIG[key].source,
+              bidders: i.config.bidders
+            }
+          );
+        }
+      });
+    });
+  return eidPermissions;
+}
diff --git a/modules/userId/index.js b/modules/userId/index.js
index 9294311de69..8f7d2a36699 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -136,7 +136,7 @@ import { getGlobal } from '../../src/prebidGlobal.js';
 import { gdprDataHandler } from '../../src/adapterManager.js';
 import CONSTANTS from '../../src/constants.json';
 import { module, hook } from '../../src/hook.js';
-import { createEidsArray } from './eids.js';
+import { createEidsArray, buildEidPermissions } from './eids.js';
 import { getCoreStorageManager } from '../../src/storageManager.js';
 
 const MODULE_NAME = 'User ID';
@@ -214,6 +214,10 @@ export function setStoredValue(submodule, value) {
   }
 }
 
+export function getEidPermissions() {
+  return buildEidPermissions(initializedSubmodules);
+}
+
 /**
  * @param {SubmoduleStorage} storage
  * @param {String|undefined} key optional key of the value
@@ -433,6 +437,26 @@ function getCombinedSubmoduleIds(submodules) {
   return combinedSubmoduleIds;
 }
 
+/**
+ * This function will create a combined object for bidder with allowed subModule Ids
+ * @param {SubmoduleContainer[]} submodules
+ * @param {string} bidder
+ */
+function getCombinedSubmoduleIdsForBidder(submodules, bidder) {
+  if (!Array.isArray(submodules) || !submodules.length || !bidder) {
+    return {};
+  }
+  return submodules
+    .filter(i => !i.config.bidders || !utils.isArray(i.config.bidders) || i.config.bidders.includes(bidder))
+    .filter(i => utils.isPlainObject(i.idObj) && Object.keys(i.idObj).length)
+    .reduce((carry, i) => {
+      Object.keys(i.idObj).forEach(key => {
+        carry[key] = i.idObj[key];
+      });
+      return carry;
+    }, {});
+}
+
 /**
  * @param {AdUnit[]} adUnits
  * @param {SubmoduleContainer[]} submodules
@@ -441,19 +465,18 @@ function addIdDataToAdUnitBids(adUnits, submodules) {
   if ([adUnits].some(i => !Array.isArray(i) || !i.length)) {
     return;
   }
-  const combinedSubmoduleIds = getCombinedSubmoduleIds(submodules);
-  const combinedSubmoduleIdsAsEids = createEidsArray(combinedSubmoduleIds);
-  if (Object.keys(combinedSubmoduleIds).length) {
-    adUnits.forEach(adUnit => {
-      if (adUnit.bids && utils.isArray(adUnit.bids)) {
-        adUnit.bids.forEach(bid => {
+  adUnits.forEach(adUnit => {
+    if (adUnit.bids && utils.isArray(adUnit.bids)) {
+      adUnit.bids.forEach(bid => {
+        const combinedSubmoduleIds = getCombinedSubmoduleIdsForBidder(submodules, bid.bidder);
+        if (Object.keys(combinedSubmoduleIds).length) {
           // create a User ID object on the bid,
           bid.userId = combinedSubmoduleIds;
-          bid.userIdAsEids = combinedSubmoduleIdsAsEids;
-        });
-      }
-    });
-  }
+          bid.userIdAsEids = createEidsArray(combinedSubmoduleIds);
+        }
+      });
+    }
+  });
 }
 
 /**
diff --git a/plugins/eslint/validateImports.js b/plugins/eslint/validateImports.js
index a39bf9b26d5..53f4ace8381 100644
--- a/plugins/eslint/validateImports.js
+++ b/plugins/eslint/validateImports.js
@@ -26,7 +26,8 @@ function flagErrors(context, node, importPath) {
     if (
       path.dirname(absImportPath) === absModulePath || (
         absImportPath.startsWith(absModulePath) &&
-        path.basename(absImportPath) === 'index.js'
+        path.basename(absImportPath) === 'index.js' &&
+        path.basename(absFileDir) !== 'prebidServerBidAdapter'
       )
     ) {
       context.report(node, `import "${importPath}" cannot require module entry point`);
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index f17cd3ab14f..4652bbb63f7 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -953,17 +953,15 @@ describe('S2S Adapter', function () {
       adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
-
-      expect(requestBid.ext).to.deep.equal({
-        prebid: {
-          aliases: {
-            brealtime: 'appnexus'
-          },
-          auctiontimestamp: 1510852447530,
-          targeting: {
-            includebidderkeys: false,
-            includewinners: true
-          }
+      expect(requestBid.ext).to.haveOwnProperty('prebid');
+      expect(requestBid.ext.prebid).to.deep.include({
+        aliases: {
+          brealtime: 'appnexus'
+        },
+        auctiontimestamp: 1510852447530,
+        targeting: {
+          includebidderkeys: false,
+          includewinners: true
         }
       });
     });
@@ -985,17 +983,15 @@ describe('S2S Adapter', function () {
       adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
-
-      expect(requestBid.ext).to.deep.equal({
-        prebid: {
-          aliases: {
-            [alias]: 'appnexus'
-          },
-          auctiontimestamp: 1510852447530,
-          targeting: {
-            includebidderkeys: false,
-            includewinners: true
-          }
+      expect(requestBid.ext).to.haveOwnProperty('prebid');
+      expect(requestBid.ext.prebid).to.deep.include({
+        aliases: {
+          [alias]: 'appnexus'
+        },
+        auctiontimestamp: 1510852447530,
+        targeting: {
+          includebidderkeys: false,
+          includewinners: true
         }
       });
     });
@@ -1376,7 +1372,7 @@ describe('S2S Adapter', function () {
 
       expect(requestBid).to.haveOwnProperty('ext');
       expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.equal({
+      expect(requestBid.ext.prebid).to.deep.include({
         auctiontimestamp: 1510852447530,
         foo: 'bar',
         targeting: {
@@ -1410,7 +1406,7 @@ describe('S2S Adapter', function () {
 
       expect(requestBid).to.haveOwnProperty('ext');
       expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.equal({
+      expect(requestBid.ext.prebid).to.deep.include({
         auctiontimestamp: 1510852447530,
         targeting: {
           includewinners: false,
@@ -1446,7 +1442,7 @@ describe('S2S Adapter', function () {
 
       expect(requestBid).to.haveOwnProperty('ext');
       expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.equal({
+      expect(requestBid.ext.prebid).to.deep.include({
         auctiontimestamp: 1510852447530,
         cache: {
           vastxml: 'vastxml-set-though-extPrebid.cache.vastXml'
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index ed592c0cba5..1ae023ae947 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -2,6 +2,7 @@ import {
   attachIdSystem,
   auctionDelay,
   coreStorage,
+  getEidPermissions,
   init,
   requestBidsHook,
   setStoredConsentData,
@@ -70,7 +71,7 @@ describe('User ID', function () {
       code,
       mediaTypes: {banner: {}, native: {}},
       sizes: [[300, 200], [300, 600]],
-      bids: [{bidder: 'sampleBidder', params: {placementId: 'banner-only-bidder'}}]
+      bids: [{bidder: 'sampleBidder', params: {placementId: 'banner-only-bidder'}}, {bidder: 'anotherSampleBidder', params: {placementId: 'banner-only-bidder'}}]
     };
   }
 
@@ -1196,6 +1197,120 @@ describe('User ID', function () {
       }, {adUnits});
     });
 
+    it('eidPermissions fun with bidders', function (done) {
+      coreStorage.setCookie('sharedid', JSON.stringify({
+        'id': 'test222',
+        'ts': 1590525289611
+      }), (new Date(Date.now() + 5000).toUTCString()));
+
+      setSubmoduleRegistry([sharedIdSubmodule]);
+      init(config);
+      config.setConfig({
+        userSync: {
+          syncDelay: 0,
+          userIds: [
+            {
+              name: 'sharedId',
+              bidders: [
+                'sampleBidder'
+              ],
+              storage: {
+                type: 'cookie',
+                name: 'sharedid',
+                expires: 28
+              }
+            }
+          ]
+        }
+      });
+
+      requestBidsHook(function () {
+        const eidPermissions = getEidPermissions();
+        expect(eidPermissions).to.deep.equal(
+          [
+            {source: 'sharedid.org', bidders: ['sampleBidder']}
+          ]
+        );
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            if (bid.bidder === 'sampleBidder') {
+              expect(bid).to.have.deep.nested.property('userId.sharedid');
+              expect(bid.userId.sharedid.id).to.equal('test222');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'sharedid.org',
+                uids: [
+                  {
+                    id: 'test222',
+                    atype: 1,
+                    ext: {
+                      third: 'test222'
+                    }
+                  }
+                ]
+              });
+            }
+            if (bid.bidder === 'anotherSampleBidder') {
+              expect(bid).to.not.have.deep.nested.property('userId.sharedid');
+              expect(bid).to.not.have.property('userIdAsEids');
+            }
+          });
+        });
+        coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
+        done();
+      }, {adUnits});
+    });
+
+    it('eidPermissions fun without bidders', function (done) {
+      coreStorage.setCookie('sharedid', JSON.stringify({
+        'id': 'test222',
+        'ts': 1590525289611
+      }), (new Date(Date.now() + 5000).toUTCString()));
+
+      setSubmoduleRegistry([sharedIdSubmodule]);
+      init(config);
+      config.setConfig({
+        userSync: {
+          syncDelay: 0,
+          userIds: [
+            {
+              name: 'sharedId',
+              storage: {
+                type: 'cookie',
+                name: 'sharedid',
+                expires: 28
+              }
+            }
+          ]
+        }
+      });
+
+      requestBidsHook(function () {
+        const eidPermissions = getEidPermissions();
+        expect(eidPermissions).to.deep.equal(
+          []
+        );
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.sharedid');
+            expect(bid.userId.sharedid.id).to.equal('test222');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'sharedid.org',
+              uids: [
+                {
+                  id: 'test222',
+                  atype: 1,
+                  ext: {
+                    third: 'test222'
+                  }
+                }]
+            });
+          });
+        });
+        coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
+        done();
+      }, {adUnits});
+    });
+
     it('test hook from pubProvidedId config params', function (done) {
       setSubmoduleRegistry([pubProvidedIdSubmodule]);
       init(config);

From 524efda0ec579d82ee29848b77bd829aead76107 Mon Sep 17 00:00:00 2001
From: samuel-palmer-relevant-digital
 <77437973+samuel-palmer-relevant-digital@users.noreply.github.com>
Date: Thu, 28 Jan 2021 17:27:43 +0100
Subject: [PATCH 192/304] Relevant Yield analytics adapter (#6195)

---
 modules/relevantAnalyticsAdapter.js           | 33 ++++++++++++++
 modules/relevantAnalyticsAdapter.md           | 13 ++++++
 .../modules/relevantAnalyticsAdapter_spec.js  | 43 +++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 modules/relevantAnalyticsAdapter.js
 create mode 100644 modules/relevantAnalyticsAdapter.md
 create mode 100644 test/spec/modules/relevantAnalyticsAdapter_spec.js

diff --git a/modules/relevantAnalyticsAdapter.js b/modules/relevantAnalyticsAdapter.js
new file mode 100644
index 00000000000..5917262c810
--- /dev/null
+++ b/modules/relevantAnalyticsAdapter.js
@@ -0,0 +1,33 @@
+import adapter from '../src/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+
+const relevantAnalytics = adapter({ analyticsType: 'bundle', handler: 'on' });
+
+const { enableAnalytics: orgEnableAnalytics } = relevantAnalytics;
+
+Object.assign(relevantAnalytics, {
+  /**
+   * Save event in the global array that will be consumed later by the Relevant Yield library
+   */
+  track: ({ eventType: ev, args }) => {
+    window.relevantDigital.pbEventLog.push({ ev, args, ts: new Date() });
+  },
+
+  /**
+   * Before forwarding the call to the original enableAnalytics function -
+   * create (if needed) the global array that is used to pass events to the Relevant Yield library
+   * by the 'track' function above.
+   */
+  enableAnalytics: function(...args) {
+    window.relevantDigital = window.relevantDigital || {};
+    window.relevantDigital.pbEventLog = window.relevantDigital.pbEventLog || [];
+    return orgEnableAnalytics.call(this, ...args);
+  },
+});
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: relevantAnalytics,
+  code: 'relevant',
+});
+
+export default relevantAnalytics;
diff --git a/modules/relevantAnalyticsAdapter.md b/modules/relevantAnalyticsAdapter.md
new file mode 100644
index 00000000000..e6383fa77e1
--- /dev/null
+++ b/modules/relevantAnalyticsAdapter.md
@@ -0,0 +1,13 @@
+# Overview
+
+Module Name: Relevant Yield Analytics Adapter
+
+Module Type: Analytics Adapter
+
+Maintainer: [support@relevant-digital.com](mailto:support@relevant-digital.com)
+
+# Description
+
+Analytics adapter to be used with [Relevant Yield](https://www.relevant-digital.com/relevantyield)
+
+Contact [sales@relevant-digital.com](mailto:sales@relevant-digital.com) for information.
diff --git a/test/spec/modules/relevantAnalyticsAdapter_spec.js b/test/spec/modules/relevantAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..3e31db2d7dc
--- /dev/null
+++ b/test/spec/modules/relevantAnalyticsAdapter_spec.js
@@ -0,0 +1,43 @@
+import relevantAnalytics from '../../../modules/relevantAnalyticsAdapter.js';
+import adapterManager from 'src/adapterManager';
+import events from 'src/events';
+import constants from 'src/constants.json'
+import { expect } from 'chai';
+
+describe('Relevant Analytics Adapter', () => {
+  beforeEach(() => {
+    adapterManager.enableAnalytics({
+      provider: 'relevant'
+    });
+  });
+
+  afterEach(() => {
+    relevantAnalytics.disableAnalytics();
+  });
+
+  it('should pass all events to the global array', () => {
+    // Given
+    const testEvents = [
+      { ev: constants.EVENTS.AUCTION_INIT, args: { test: 1 } },
+      { ev: constants.EVENTS.BID_REQUESTED, args: { test: 2 } },
+    ];
+
+    // When
+    testEvents.forEach(({ ev, args }) => (
+      events.emit(ev, args)
+    ));
+
+    // Then
+    const eventQueue = (window.relevantDigital || {}).pbEventLog;
+    expect(eventQueue).to.be.an('array');
+    expect(eventQueue.length).to.be.at.least(testEvents.length);
+
+    // The last events should be our test events
+    const myEvents = eventQueue.slice(-testEvents.length);
+    testEvents.forEach(({ ev, args }, idx) => {
+      const actualEvent = myEvents[idx];
+      expect(actualEvent.ev).to.eql(ev);
+      expect(actualEvent.args).to.eql(args);
+    });
+  });
+});

From 136ad4cee32bda212ceee67d92afe494ecbd16d8 Mon Sep 17 00:00:00 2001
From: pm-shashank-jain <40654031+pm-shashank-jain@users.noreply.github.com>
Date: Thu, 28 Jan 2021 23:34:31 +0530
Subject: [PATCH 193/304] Pubmatic:  fix issue where using an adUnit outstream
 renderer throws an error (#6152)

---
 modules/pubmaticBidAdapter.js | 4 ++--
 modules/pubmaticBidAdapter.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index b5514ab0344..c70ecb4af27 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -861,8 +861,8 @@ export const spec = {
             utils.logError(`${LOG_WARN_PREFIX}: no context specified in bid. Rejecting bid: `, bid);
             return false;
           }
-          if (bid.mediaTypes[VIDEO].context === 'outstream' && !utils.isStr(bid.params.outstreamAU)) {
-            utils.logError(`${LOG_WARN_PREFIX}: for "outstream" bids outstreamAU is required. Rejecting bid: `, bid);
+          if (bid.mediaTypes[VIDEO].context === 'outstream' && !utils.isStr(bid.params.outstreamAU) && !bid.hasOwnProperty('renderer') && !bid.mediaTypes[VIDEO].hasOwnProperty('renderer')) {
+            utils.logError(`${LOG_WARN_PREFIX}: for "outstream" bids either outstreamAU parameter must be provided or ad unit supplied renderer is required. Rejecting bid: `, bid);
             return false;
           }
         } else {
diff --git a/modules/pubmaticBidAdapter.md b/modules/pubmaticBidAdapter.md
index 0ef89a22cbd..a34df148630 100644
--- a/modules/pubmaticBidAdapter.md
+++ b/modules/pubmaticBidAdapter.md
@@ -25,7 +25,7 @@ var adUnits = [
       bidder: 'pubmatic',
       params: {
         publisherId: '156209',               // required, must be wrapped in quotes
-        oustreamAU: 'renderer_test_pubmatic',   // required if mediaTypes-> video-> context is 'outstream'. This value can be get by BlueBillyWig Team.
+        oustreamAU: 'renderer_test_pubmatic',   // required if mediaTypes-> video-> context is 'outstream' and optional if renderer is defined in adUnits or in mediaType video. This value can be get by BlueBillyWig Team.
         adSlot: 'pubmatic_test2',            // optional
         pmzoneid: 'zone1, zone11',           // optional
         lat: '40.712775',                    // optional

From f61311769823d0431cd90a05c125d88905c0555e Mon Sep 17 00:00:00 2001
From: ardit-baloku <77985953+ardit-baloku@users.noreply.github.com>
Date: Fri, 29 Jan 2021 11:51:51 +0100
Subject: [PATCH 194/304] Malltv Bid Adapter : added data object as a param
 (#6232)

* Updated malltv adapter

* Updated markdown

* Added test for malltvBidAdapter
---
 modules/malltvBidAdapter.js                |  7 ++-
 modules/malltvBidAdapter.md                | 63 +++++++++++++++-------
 test/spec/modules/malltvBidAdapter_spec.js | 30 +++++++++--
 3 files changed, 74 insertions(+), 26 deletions(-)

diff --git a/modules/malltvBidAdapter.js b/modules/malltvBidAdapter.js
index 776e3f6458b..7deffe6c07a 100644
--- a/modules/malltvBidAdapter.js
+++ b/modules/malltvBidAdapter.js
@@ -31,6 +31,7 @@ export const spec = {
     let bidderRequestId = '';
     let url = '';
     let contents = [];
+    let data = {};
 
     let placements = validBidRequests.map(bidRequest => {
       if (!propertyId) { propertyId = bidRequest.params.propertyId; }
@@ -38,7 +39,8 @@ export const spec = {
       if (!storageId && bidRequest.params) { storageId = bidRequest.params.storageId || ''; }
       if (!bidderRequestId) { bidderRequestId = bidRequest.bidderRequestId; }
       if (!url && bidderRequest) { url = bidderRequest.refererInfo.referer; }
-      if (!contents.length && bidRequest.params.contents && bidRequest.params.contents.length) { contents = bidRequest.params.contents }
+      if (!contents.length && bidRequest.params.contents && bidRequest.params.contents.length) { contents = bidRequest.params.contents; }
+      if (Object.keys(data).length === 0 && bidRequest.params.data && Object.keys(bidRequest.params.data).length !== 0) { data = bidRequest.params.data; }
 
       let adUnitId = bidRequest.adUnitCode;
       let placementId = bidRequest.params.placementId;
@@ -61,7 +63,8 @@ export const spec = {
       url: url,
       requestid: bidderRequestId,
       placements: placements,
-      contents: contents
+      contents: contents,
+      data: data
     }
 
     return [{
diff --git a/modules/malltvBidAdapter.md b/modules/malltvBidAdapter.md
index 3d419fa0916..e32eb54f90f 100644
--- a/modules/malltvBidAdapter.md
+++ b/modules/malltvBidAdapter.md
@@ -1,45 +1,68 @@
 # Overview
-Module Name: MallTV Bidder Adapter Module 
-Type: Bidder Adapter 
-Maintainer: drilon@gjirafa.com
+Module Name: MallTV Bidder Adapter Module
+
+Type: Bidder Adapter
+
+Maintainer: arditb@gjirafa.com
 
 # Description
 MallTV Bidder Adapter for Prebid.js.
 
 # Test Parameters
+```js
 var adUnits = [
     {
         code: 'test-div',
         mediaTypes: {
             banner: {
-                sizes: [[300, 250], [300, 300]]
+                sizes: [
+                    [300, 250],
+                    [300, 300]
+                ]
             }
         },
-        bids: [
-            {
-                 bidder: 'malltv',
-                 params: {
-                    propertyId: '105134',
-                    placementId: '846832'
+        bids: [{
+            bidder: 'malltv',
+            params: {
+                propertyId: '105134',  //Required
+                placementId: '846832', //Required
+                data: {                //Optional
+                    catalogs: [{
+                        catalogId: 9,
+                        items: ["193", "4", "1"]
+                    }],
+                    inventory: {
+                        category: ["tech"],
+                        query: ["iphone 12"]
+                    }
                 }
             }
-        ]
+        }]
     },
     {
         code: 'test-div',
         mediaTypes: {
-             video: {
+            video: {
                 context: 'instream'
-             }
+            }
         },
-        bids: [
-            {
-                 bidder: 'malltv',
-                 params: {
-                    propertyId: '105134',
-                    placementId: '846841'
+        bids: [{
+            bidder: 'malltv',
+            params: {
+                propertyId: '105134',  //Required
+                placementId: '846832', //Required
+                data: {                //Optional
+                    catalogs: [{
+                        catalogId: 9,
+                        items: ["193", "4", "1"]
+                    }],
+                    inventory: {
+                        category: ["tech"],
+                        query: ["iphone 12"]
+                    }
                 }
             }
-        ]
+        }]
     }
 ];
+```
diff --git a/test/spec/modules/malltvBidAdapter_spec.js b/test/spec/modules/malltvBidAdapter_spec.js
index e1e9ad867e7..ffe08ad1a5e 100644
--- a/test/spec/modules/malltvBidAdapter_spec.js
+++ b/test/spec/modules/malltvBidAdapter_spec.js
@@ -34,9 +34,7 @@ describe('malltvAdapterTest', () => {
     it('bidRequest without propertyId or placementId', () => {
       expect(spec.isBidRequestValid({
         bidder: 'malltv',
-        params: {
-          propertyId: '{propertyId}',
-        }
+        params: {}
       })).to.equal(false);
     });
   });
@@ -46,7 +44,17 @@ describe('malltvAdapterTest', () => {
       'bidder': 'malltv',
       'params': {
         'propertyId': '{propertyId}',
-        'placementId': '{placementId}'
+        'placementId': '{placementId}',
+        'data': {
+          'catalogs': [{
+            'catalogId': 1,
+            'items': ['1', '2', '3']
+          }],
+          'inventory': {
+            'category': ['category1', 'category2'],
+            'query': ['query']
+          }
+        }
       },
       'adUnitCode': 'hb-leaderboard',
       'transactionId': 'b6b889bb-776c-48fd-bc7b-d11a1cf0425e',
@@ -86,6 +94,20 @@ describe('malltvAdapterTest', () => {
         expect(requestItem.data.placements[0].sizes).to.equal('300x250');
       });
     });
+
+    it('bidRequest data param', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach((requestItem) => {
+        expect(requestItem.data.data).to.exist;
+        expect(requestItem.data.data.catalogs).to.exist;
+        expect(requestItem.data.data.inventory).to.exist;
+        expect(requestItem.data.data.catalogs.length).to.equal(1);
+        expect(requestItem.data.data.catalogs[0].items.length).to.equal(3);
+        expect(Object.keys(requestItem.data.data.inventory).length).to.equal(2);
+        expect(requestItem.data.data.inventory.category.length).to.equal(2);
+        expect(requestItem.data.data.inventory.query.length).to.equal(1);
+      });
+    });
   });
 
   describe('interpretResponse', () => {

From 25dd35c99f404390242133b84245bb5cafeb7d7b Mon Sep 17 00:00:00 2001
From: msm0504 <51493331+msm0504@users.noreply.github.com>
Date: Mon, 1 Feb 2021 06:27:04 -0500
Subject: [PATCH 195/304] support setting coopSync in s2sConfig (#6213)

Co-authored-by: Mark Monday <mmonday@rubiconproject.com>
---
 modules/prebidServerBidAdapter/index.js       |  4 +++
 .../modules/prebidServerBidAdapter_spec.js    | 31 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 7274912efb5..cb059b809b7 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -201,6 +201,10 @@ function queueSync(bidderCodes, gdprConsent, uspConsent, s2sConfig) {
     payload.us_privacy = uspConsent;
   }
 
+  if (typeof _s2sConfig.coopSync === 'boolean') {
+    payload.coopSync = _s2sConfig.coopSync;
+  }
+
   const jsonPayload = JSON.stringify(payload);
   ajax(s2sConfig.syncEndpoint,
     (response) => {
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 4652bbb63f7..7ebb570823a 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -2434,5 +2434,36 @@ describe('S2S Adapter', function () {
       const requestBid = JSON.parse(server.requests[0].requestBody);
       expect(requestBid.bidders).to.deep.equal(['appnexus', 'rubicon']);
     });
+
+    it('should add cooperative sync flag to cookie_sync request if property is present', function () {
+      let cookieSyncConfig = utils.deepClone(CONFIG);
+      cookieSyncConfig.coopSync = false;
+      cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+
+      let consentConfig = { s2sConfig: cookieSyncConfig };
+      config.setConfig(consentConfig);
+
+      let bidRequest = utils.deepClone(BID_REQUESTS);
+
+      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
+      let requestBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(requestBid.coopSync).to.equal(false);
+    });
+
+    it('should not add cooperative sync flag to cookie_sync request if property is not present', function () {
+      let cookieSyncConfig = utils.deepClone(CONFIG);
+      cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+
+      let consentConfig = { s2sConfig: cookieSyncConfig };
+      config.setConfig(consentConfig);
+
+      let bidRequest = utils.deepClone(BID_REQUESTS);
+
+      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
+      let requestBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(requestBid.coopSync).to.be.undefined;
+    });
   });
 });

From e60d10b89e2380c949c3e1d6b388d8f460107f79 Mon Sep 17 00:00:00 2001
From: bretg <bgorsline@gmail.com>
Date: Mon, 1 Feb 2021 14:00:12 -0500
Subject: [PATCH 196/304] Revert "support setting coopSync in s2sConfig
 (#6213)" (#6249)

This reverts commit 25dd35c99f404390242133b84245bb5cafeb7d7b.
---
 modules/prebidServerBidAdapter/index.js       |  4 ---
 .../modules/prebidServerBidAdapter_spec.js    | 31 -------------------
 2 files changed, 35 deletions(-)

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index cb059b809b7..7274912efb5 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -201,10 +201,6 @@ function queueSync(bidderCodes, gdprConsent, uspConsent, s2sConfig) {
     payload.us_privacy = uspConsent;
   }
 
-  if (typeof _s2sConfig.coopSync === 'boolean') {
-    payload.coopSync = _s2sConfig.coopSync;
-  }
-
   const jsonPayload = JSON.stringify(payload);
   ajax(s2sConfig.syncEndpoint,
     (response) => {
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 7ebb570823a..4652bbb63f7 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -2434,36 +2434,5 @@ describe('S2S Adapter', function () {
       const requestBid = JSON.parse(server.requests[0].requestBody);
       expect(requestBid.bidders).to.deep.equal(['appnexus', 'rubicon']);
     });
-
-    it('should add cooperative sync flag to cookie_sync request if property is present', function () {
-      let cookieSyncConfig = utils.deepClone(CONFIG);
-      cookieSyncConfig.coopSync = false;
-      cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
-
-      let consentConfig = { s2sConfig: cookieSyncConfig };
-      config.setConfig(consentConfig);
-
-      let bidRequest = utils.deepClone(BID_REQUESTS);
-
-      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
-      let requestBid = JSON.parse(server.requests[0].requestBody);
-
-      expect(requestBid.coopSync).to.equal(false);
-    });
-
-    it('should not add cooperative sync flag to cookie_sync request if property is not present', function () {
-      let cookieSyncConfig = utils.deepClone(CONFIG);
-      cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
-
-      let consentConfig = { s2sConfig: cookieSyncConfig };
-      config.setConfig(consentConfig);
-
-      let bidRequest = utils.deepClone(BID_REQUESTS);
-
-      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
-      let requestBid = JSON.parse(server.requests[0].requestBody);
-
-      expect(requestBid.coopSync).to.be.undefined;
-    });
   });
 });

From 802cfd0b7f221508ebb99682acea04e424dc4460 Mon Sep 17 00:00:00 2001
From: bretg <bgorsline@gmail.com>
Date: Tue, 2 Feb 2021 14:08:40 -0500
Subject: [PATCH 197/304] pbsBidAdapter: change order of client syncs (#6248)

* pbsBidAdapter: change order cookie_syncs

Prebid Server places cookie-sync URLs in a specific order. PBJS was pulling them off in reverse order.

* moving comment

* reverting coopSync
---
 modules/prebidServerBidAdapter/index.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 7274912efb5..04aedb63ae6 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -223,10 +223,14 @@ function doAllSyncs(bidders, s2sConfig) {
     return;
   }
 
-  const thisSync = bidders.pop();
+  // pull the syncs off the list in the order that prebid server sends them
+  const thisSync = bidders.shift();
+
+  // if PBS reports this bidder doesn't have an ID, then call the sync and recurse to the next sync entry
   if (thisSync.no_cookie) {
     doPreBidderSync(thisSync.usersync.type, thisSync.usersync.url, thisSync.bidder, utils.bind.call(doAllSyncs, null, bidders, s2sConfig), s2sConfig);
   } else {
+    // bidder already has an ID, so just recurse to the next sync entry
     doAllSyncs(bidders, s2sConfig);
   }
 }

From 99c1256f53cf95ed75f2d85ac2a249d801836ae9 Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Tue, 2 Feb 2021 22:05:38 +0100
Subject: [PATCH 198/304] pass a flag back to ID5 servers if abTesting was
 enabled by the publisher for monitoring usage of the feature (#6170)

---
 modules/id5IdSystem.js                | 16 ++++++++++-
 test/spec/modules/id5IdSystem_spec.js | 41 +++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/modules/id5IdSystem.js b/modules/id5IdSystem.js
index 45ddc85da5f..baa2ff954dc 100644
--- a/modules/id5IdSystem.js
+++ b/modules/id5IdSystem.js
@@ -58,7 +58,7 @@ export const id5IdSubmodule = {
     }
 
     // check for A/B testing configuration and hide ID if in Control Group
-    let abConfig = (config && config.params && config.params.abTesting) || { enabled: false };
+    let abConfig = getAbTestingConfig(config);
     let controlGroup = false;
     if (
       abConfig.enabled === true &&
@@ -130,6 +130,10 @@ export const id5IdSubmodule = {
       'v': '$prebid.version$'
     };
 
+    if (getAbTestingConfig(config).enabled === true) {
+      utils.deepSetValue(data, 'features.ab', 1);
+    }
+
     const resp = function (callback) {
       const callbacks = {
         success: response => {
@@ -282,4 +286,14 @@ export function storeInLocalStorage(key, value, expDays) {
   storage.setDataInLocalStorage(`${key}`, value);
 }
 
+/**
+ * gets the existing abTesting config or generates a default config with abTesting off
+ *
+ * @param {SubmoduleConfig|undefined} config
+ * @returns {(Object|undefined)}
+ */
+function getAbTestingConfig(config) {
+  return (config && config.params && config.params.abTesting) || { enabled: false };
+}
+
 submodule('userId', id5IdSubmodule);
diff --git a/test/spec/modules/id5IdSystem_spec.js b/test/spec/modules/id5IdSystem_spec.js
index 24f50db9980..59fa8977fc8 100644
--- a/test/spec/modules/id5IdSystem_spec.js
+++ b/test/spec/modules/id5IdSystem_spec.js
@@ -238,6 +238,47 @@ describe('ID5 ID System', function() {
       expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(0);
     });
 
+    it('should call the ID5 server with ab feature = 1 when abTesting is turned on', function () {
+      let id5Config = getId5FetchConfig();
+      id5Config.params.abTesting = { enabled: true, controlGroupPct: 10 }
+
+      let submoduleCallback = id5IdSubmodule.getId(id5Config, undefined, ID5_STORED_OBJ).callback;
+      submoduleCallback(callbackSpy);
+
+      let request = server.requests[0];
+      let requestBody = JSON.parse(request.requestBody);
+      expect(requestBody.features.ab).to.eq(1);
+
+      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+    });
+
+    it('should call the ID5 server without ab feature when abTesting is turned off', function () {
+      let id5Config = getId5FetchConfig();
+      id5Config.params.abTesting = { enabled: false, controlGroupPct: 10 }
+
+      let submoduleCallback = id5IdSubmodule.getId(id5Config, undefined, ID5_STORED_OBJ).callback;
+      submoduleCallback(callbackSpy);
+
+      let request = server.requests[0];
+      let requestBody = JSON.parse(request.requestBody);
+      expect(requestBody.features).to.be.undefined;
+
+      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+    });
+
+    it('should call the ID5 server without ab feature when when abTesting is not set', function () {
+      let id5Config = getId5FetchConfig();
+
+      let submoduleCallback = id5IdSubmodule.getId(id5Config, undefined, ID5_STORED_OBJ).callback;
+      submoduleCallback(callbackSpy);
+
+      let request = server.requests[0];
+      let requestBody = JSON.parse(request.requestBody);
+      expect(requestBody.features).to.be.undefined;
+
+      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+    });
+
     it('should store the privacy object from the ID5 server response', function () {
       let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, ID5_STORED_OBJ).callback;
       submoduleCallback(callbackSpy);

From 62e2169ec72c17ee3e7eb70e8a1263c961bf5d1a Mon Sep 17 00:00:00 2001
From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com>
Date: Wed, 3 Feb 2021 00:18:09 -0500
Subject: [PATCH 199/304] appneuxs Bid Adapter - add support for identitylink
 userId (#6245)

---
 modules/appnexusBidAdapter.js                | 46 +++++++++-----------
 test/spec/modules/appnexusBidAdapter_spec.js |  8 +++-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index a3cabe62d39..6feec56e919 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -240,34 +240,17 @@ export const spec = {
       });
     }
 
-    const criteoId = utils.deepAccess(bidRequests[0], `userId.criteoId`);
-    let eids = [];
-    if (criteoId) {
-      eids.push({
-        source: 'criteo.com',
-        id: criteoId
-      });
-    }
+    if (bidRequests[0].userId) {
+      let eids = [];
 
-    const netidId = utils.deepAccess(bidRequests[0], `userId.netId`);
-    if (netidId) {
-      eids.push({
-        source: 'netid.de',
-        id: netidId
-      });
-    }
-
-    const tdid = utils.deepAccess(bidRequests[0], `userId.tdid`);
-    if (tdid) {
-      eids.push({
-        source: 'adserver.org',
-        id: tdid,
-        rti_partner: 'TDID'
-      });
-    }
+      addUserId(eids, utils.deepAccess(bidRequests[0], `userId.criteoId`), 'criteo.com', null);
+      addUserId(eids, utils.deepAccess(bidRequests[0], `userId.netId`), 'netid.de', null);
+      addUserId(eids, utils.deepAccess(bidRequests[0], `userId.idl_env`), 'liveramp.com', null);
+      addUserId(eids, utils.deepAccess(bidRequests[0], `userId.tdid`), 'adserver.org', 'TDID');
 
-    if (eids.length) {
-      payload.eids = eids;
+      if (eids.length) {
+        payload.eids = eids;
+      }
     }
 
     if (tags[0].publisher_id) {
@@ -1042,4 +1025,15 @@ function parseMediaType(rtbBid) {
   }
 }
 
+function addUserId(eids, id, source, rti) {
+  if (id) {
+    if (rti) {
+      eids.push({ source, id, rti_partner: rti });
+    } else {
+      eids.push({ source, id });
+    }
+  }
+  return eids;
+}
+
 registerBidder(spec);
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index 81ff5daeaeb..3a3f4effcb8 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -827,7 +827,8 @@ describe('AppNexusAdapter', function () {
         userId: {
           tdid: 'sample-userid',
           criteoId: 'sample-criteo-userid',
-          netId: 'sample-netId-userid'
+          netId: 'sample-netId-userid',
+          idl_env: 'sample-idl-userid'
         }
       });
 
@@ -848,6 +849,11 @@ describe('AppNexusAdapter', function () {
         source: 'netid.de',
         id: 'sample-netId-userid',
       });
+
+      expect(payload.eids).to.deep.include({
+        source: 'liveramp.com',
+        id: 'sample-idl-userid'
+      })
     });
 
     it('should populate iab_support object at the root level if omid support is detected', function () {

From 6a8f95341ec9a3acb29bb3cf0d7433f5006cfa93 Mon Sep 17 00:00:00 2001
From: Patrick McCann <patmmccann@gmail.com>
Date: Wed, 3 Feb 2021 00:37:38 -0500
Subject: [PATCH 200/304] Update britepoolIdSystem.md (#6254)

Eliot from Britepool says you can set just the api key without any params (eg ssid or hash)
---
 modules/britepoolIdSystem.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/britepoolIdSystem.md b/modules/britepoolIdSystem.md
index a15f601aee3..72edbe2324b 100644
--- a/modules/britepoolIdSystem.md
+++ b/modules/britepoolIdSystem.md
@@ -4,7 +4,7 @@ BritePool User ID Module. For assistance setting up your module please contact u
 
 ### Prebid Params
 
-Individual params may be set for the BritePool User ID Submodule. At least one identifier must be set in the params.
+Individual params may be set for the BritePool User ID Submodule. 
 ```
 pbjs.setConfig({
     userSync: {

From c95427605699cdd262280de4697229f7d2a1f43e Mon Sep 17 00:00:00 2001
From: Kotaro Shikata <lim.0.ctyl@gmail.com>
Date: Wed, 3 Feb 2021 14:41:28 +0900
Subject: [PATCH 201/304] UNICORN Adapter - accept multiple formats (#6255)

* enable multiple formats
add version

* add banner w/h

* fix w/h & spec
---
 modules/unicornBidAdapter.js                | 18 ++++++--
 test/spec/modules/unicornBidAdapter_spec.js | 51 +++++++++++++++------
 2 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/modules/unicornBidAdapter.js b/modules/unicornBidAdapter.js
index 33e60ad2789..2d4b5b53966 100644
--- a/modules/unicornBidAdapter.js
+++ b/modules/unicornBidAdapter.js
@@ -8,6 +8,7 @@ const BIDDER_CODE = 'unicorn';
 const UNICORN_ENDPOINT = 'https://ds.uncn.jp/pb/0/bid.json';
 const UNICORN_DEFAULT_CURRENCY = 'JPY';
 const UNICORN_PB_COOKIE_KEY = '__pb_unicorn_aud';
+const UNICORN_PB_VERSION = '1.0';
 
 /**
  * Placement ID and Account ID are required.
@@ -47,12 +48,12 @@ function buildOpenRtbBidRequestPayload(validBidRequests, bidderRequest) {
     bidderRequest
   );
   const imp = validBidRequests.map(br => {
-    const sizes = utils.parseSizesInput(br.sizes)[0];
     return {
       id: br.bidId,
       banner: {
-        w: sizes.split('x')[0],
-        h: sizes.split('x')[1]
+        format: makeFormat(br.sizes),
+        w: br.sizes[0][0],
+        h: br.sizes[0][1],
       },
       tagid: utils.deepAccess(br, 'params.placementId') || br.adUnitCode,
       secure: 1,
@@ -84,7 +85,8 @@ function buildOpenRtbBidRequestPayload(validBidRequests, bidderRequest) {
     source: {
       ext: {
         stype: 'prebid_uncn',
-        bidder: BIDDER_CODE
+        bidder: BIDDER_CODE,
+        prebid_version: UNICORN_PB_VERSION
       }
     },
     ext: {
@@ -138,6 +140,14 @@ const getUid = () => {
   }
 };
 
+/**
+ * Make imp.banner.format
+ * @param {Array<Number>} arr
+ */
+const makeFormat = arr => arr.map((s) => {
+  return { w: s[0], h: s[1] };
+});
+
 export const spec = {
   code: BIDDER_CODE,
   aliases: ['uncn'],
diff --git a/test/spec/modules/unicornBidAdapter_spec.js b/test/spec/modules/unicornBidAdapter_spec.js
index 4c56c37700b..dcd446b2bb0 100644
--- a/test/spec/modules/unicornBidAdapter_spec.js
+++ b/test/spec/modules/unicornBidAdapter_spec.js
@@ -11,12 +11,12 @@ const bidRequests = [
     },
     mediaTypes: {
       banner: {
-        sizes: [[300, 250]]
+        sizes: [[300, 250], [336, 280]]
       }
     },
     adUnitCode: '/19968336/header-bid-tag-0',
     transactionId: 'ea0aa332-a6e1-4474-8180-83720e6b87bc',
-    sizes: [[300, 250]],
+    sizes: [[300, 250], [336, 280]],
     bidId: '226416e6e6bf41',
     bidderRequestId: '1f41cbdcbe58d5',
     auctionId: '77987c3a-9be9-4e43-985a-26fc91d84724',
@@ -81,12 +81,12 @@ const validBidRequests = [
     },
     mediaTypes: {
       banner: {
-        sizes: [[300, 250]]
+        sizes: [[300, 250], [336, 280]]
       }
     },
     adUnitCode: '/19968336/header-bid-tag-0',
     transactionId: 'fbf94ccf-f377-4201-a662-32c2feb8ab6d',
-    sizes: [[300, 250]],
+    sizes: [[300, 250], [336, 280]],
     bidId: '2fb90842443e24',
     bidderRequestId: '123ae4cc3eeb7e',
     auctionId: 'c594a888-6744-46c6-8b0e-d188e40e83ef',
@@ -156,12 +156,12 @@ const bidderRequest = {
       },
       mediaTypes: {
         banner: {
-          sizes: [[300, 250]]
+          sizes: [[300, 250], [336, 280]]
         }
       },
       adUnitCode: '/19968336/header-bid-tag-0',
       transactionId: 'fbf94ccf-f377-4201-a662-32c2feb8ab6d',
-      sizes: [[300, 250]],
+      sizes: [[300, 250], [336, 280]],
       bidId: '2fb90842443e24',
       bidderRequestId: '123ae4cc3eeb7e',
       auctionId: 'c594a888-6744-46c6-8b0e-d188e40e83ef',
@@ -234,8 +234,18 @@ const openRTBRequest = {
     {
       id: '216255f234b602',
       banner: {
-        w: '300',
-        h: '250'
+        w: 300,
+        h: 250,
+        format: [
+          {
+            w: 300,
+            h: 250
+          },
+          {
+            w: 336,
+            h: 280
+          }
+        ]
       },
       secure: 1,
       bidfloor: 0,
@@ -244,8 +254,14 @@ const openRTBRequest = {
     {
       id: '31e2b28ced2475',
       banner: {
-        w: '300',
-        h: '250'
+        w: 300,
+        h: 250,
+        format: [
+          {
+            w: 300,
+            h: 250
+          }
+        ]
       },
       secure: 1,
       bidfloor: 0,
@@ -254,8 +270,14 @@ const openRTBRequest = {
     {
       id: '40a333e047a9bd',
       banner: {
-        w: '300',
-        h: '250'
+        w: 300,
+        h: 250,
+        format: [
+          {
+            w: 300,
+            h: 250
+          }
+        ]
       },
       secure: 1,
       bidfloor: 0,
@@ -287,7 +309,8 @@ const openRTBRequest = {
   source: {
     ext: {
       stype: 'prebid_uncn',
-      bidder: 'unicorn'
+      bidder: 'unicorn',
+      prebid_version: '1.0'
     }
   }
 };
@@ -378,7 +401,7 @@ const request = {
   method: 'POST',
   url: 'https://ds.uncn.jp/pb/0/bid.json',
   data:
-    '{"id":"5ebea288-f13a-4754-be6d-4ade66c68877","at":1,"imp":[{"id":"216255f234b602","banner":{"w":"300","h":"250"},"secure":1,"bidfloor":0,"tagid":"/19968336/header-bid-tag-0"},{"id":"31e2b28ced2475","banner":{"w":"300","h":"250"},"secure":1,"bidfloor":0"tagid":"/19968336/header-bid-tag-1"},{"id":"40a333e047a9bd","banner":{"w":"300","h":"250"},"secure":1,"bidfloor":0,"tagid":"/19968336/header-bid-tag-2"}],"cur":"JPY","site":{"id":"uni-corn.net","publisher":{"id":12345},"domain":"uni-corn.net","page":"https://uni-corn.net/","ref":"https://uni-corn.net/"},"device":{"language":"ja","ua":"Mozilla/5.0 (Linux; Android 8.0.0; ONEPLUS A5000) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.93 Mobile Safari/537.36"},"user":{"id":"69d9e1c2-801e-4901-a665-fad467550fec"},"bcat":[],"source":{"ext":{"stype":"prebid_uncn","bidder":"unicorn"}}}'
+    '{"id":"5ebea288-f13a-4754-be6d-4ade66c68877","at":1,"imp":[{"id":"216255f234b602","banner":{"w":300,"h":250},"format":[{"w":300,"h":250},{"w":336,"h":280}],"secure":1,"bidfloor":0,"tagid":"/19968336/header-bid-tag-0"},{"id":"31e2b28ced2475","banner":{"w":"300","h":"250"},"format":[{"w":"300","h":"250"}],"secure":1,"bidfloor":0"tagid":"/19968336/header-bid-tag-1"},{"id":"40a333e047a9bd","banner":{"w":300,"h":250},"format":[{"w":300,"h":250}],"secure":1,"bidfloor":0,"tagid":"/19968336/header-bid-tag-2"}],"cur":"JPY","site":{"id":"uni-corn.net","publisher":{"id":12345},"domain":"uni-corn.net","page":"https://uni-corn.net/","ref":"https://uni-corn.net/"},"device":{"language":"ja","ua":"Mozilla/5.0 (Linux; Android 8.0.0; ONEPLUS A5000) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.93 Mobile Safari/537.36"},"user":{"id":"69d9e1c2-801e-4901-a665-fad467550fec"},"bcat":[],"source":{"ext":{"stype":"prebid_uncn","bidder":"unicorn","prebid_version":"1.0"}}}'
 };
 
 const interpretedBids = [

From 8c0c7ab844c3ffff41fcc8350f9a98cb71d99c92 Mon Sep 17 00:00:00 2001
From: mamatic <52153441+mamatic@users.noreply.github.com>
Date: Wed, 3 Feb 2021 06:46:59 +0100
Subject: [PATCH 202/304] ATS-analytics - add comment clarifying ownership of
 atsAnalytics (#6257)

---
 modules/atsAnalyticsAdapter.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/atsAnalyticsAdapter.js b/modules/atsAnalyticsAdapter.js
index 3e618692725..31e46dead89 100644
--- a/modules/atsAnalyticsAdapter.js
+++ b/modules/atsAnalyticsAdapter.js
@@ -7,6 +7,11 @@ import {getStorageManager} from '../src/storageManager.js';
 
 export const storage = getStorageManager();
 
+/**
+ * Analytics adapter for - https://liveramp.com
+ * Maintainer - prebid@liveramp.com
+ */
+
 const analyticsType = 'endpoint';
 // dev endpoints
 // const preflightUrl = 'https://analytics-check.publishersite.xyz/check/';

From 951f1e459cd5c619ab077dfc7981bb32e611ae6d Mon Sep 17 00:00:00 2001
From: Ian Flournoy <ian@parrable.com>
Date: Wed, 3 Feb 2021 00:52:59 -0500
Subject: [PATCH 203/304] [ParrableIdSystem] Ensure base64 payload is url-safe
 (#6258)

* Added url safe base64 encoding

* Added url safe base64 encoding test

Co-authored-by: Victor <victorigualada@gmail.com>
---
 modules/parrableIdSystem.js                | 11 ++++++++++-
 test/spec/modules/parrableIdSystem_spec.js | 13 +++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/modules/parrableIdSystem.js b/modules/parrableIdSystem.js
index 7587962c62b..9aa2b251f2c 100644
--- a/modules/parrableIdSystem.js
+++ b/modules/parrableIdSystem.js
@@ -70,6 +70,15 @@ function isValidConfig(configParams) {
   return true;
 }
 
+function encodeBase64UrlSafe(base64) {
+  const ENC = {
+    '+': '-',
+    '/': '_',
+    '=': '.'
+  };
+  return base64.replace(/[+/=]/g, (m) => ENC[m]);
+}
+
 function readCookie() {
   const parrableIdStr = storage.getCookie(PARRABLE_COOKIE_NAME);
   if (parrableIdStr) {
@@ -182,7 +191,7 @@ function fetchId(configParams) {
   };
 
   const searchParams = {
-    data: btoa(JSON.stringify(data)),
+    data: encodeBase64UrlSafe(btoa(JSON.stringify(data))),
     _rand: Math.random()
   };
 
diff --git a/test/spec/modules/parrableIdSystem_spec.js b/test/spec/modules/parrableIdSystem_spec.js
index 5e62af9b2fa..6d0748b592d 100644
--- a/test/spec/modules/parrableIdSystem_spec.js
+++ b/test/spec/modules/parrableIdSystem_spec.js
@@ -136,6 +136,19 @@ describe('Parrable ID System', function() {
         expect(server.requests[0].url).to.contain('us_privacy=' + uspString);
       });
 
+      it('xhr base64 safely encodes url data object', function() {
+        const urlSafeBase64EncodedData = '-_.';
+        const btoaStub = sinon.stub(window, 'btoa').returns('+/=');
+        let getIdResult = parrableIdSubmodule.getId(P_CONFIG_MOCK);
+
+        getIdResult.callback(callbackSpy);
+
+        let request = server.requests[0];
+        let queryParams = utils.parseQS(request.url.split('?')[1]);
+        expect(queryParams.data).to.equal(urlSafeBase64EncodedData);
+        btoaStub.restore();
+      });
+
       it('should log an error and continue to callback if ajax request errors', function () {
         let callBackSpy = sinon.spy();
         let submoduleCallback = parrableIdSubmodule.getId({ params: {partner: 'prebid'} }).callback;

From 17ce37606611012726576150bd1f185295f0032e Mon Sep 17 00:00:00 2001
From: Rich Audience <integrations@richaudience.com>
Date: Wed, 3 Feb 2021 06:57:21 +0100
Subject: [PATCH 204/304] Keywords + Screen resolution + CPU Core (#6259)

Co-authored-by: sgimenez <sergi.gimenez@richaudience.com>
---
 modules/richaudienceBidAdapter.js                | 13 ++++++++++++-
 modules/richaudienceBidAdapter.md                |  1 +
 test/spec/modules/richaudienceBidAdapter_spec.js |  7 +++++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/modules/richaudienceBidAdapter.js b/modules/richaudienceBidAdapter.js
index a6b4202fc91..07de3e40594 100755
--- a/modules/richaudienceBidAdapter.js
+++ b/modules/richaudienceBidAdapter.js
@@ -49,7 +49,10 @@ export const spec = {
         timeout: config.getConfig('bidderTimeout'),
         user: raiSetEids(bid),
         demand: raiGetDemandType(bid),
-        videoData: raiGetVideoInfo(bid)
+        videoData: raiGetVideoInfo(bid),
+        scr_rsl: raiGetResolution(),
+        cpuc: (typeof window.navigator != 'undefined' ? window.navigator.hardwareConcurrency : null),
+        kws: (!utils.isEmpty(bid.params.keywords) ? bid.params.keywords : null)
       };
 
       REFERER = (typeof bidderRequest.refererInfo.referer != 'undefined' ? encodeURIComponent(bidderRequest.refererInfo.referer) : null)
@@ -242,3 +245,11 @@ function renderAd(bid) {
 
   window.raParams(raPlayerHB, raOutstreamHBPassback, true);
 }
+
+function raiGetResolution() {
+  let resolution = '';
+  if (typeof window.screen != 'undefined') {
+    resolution = window.screen.width + 'x' + window.screen.height;
+  }
+  return resolution;
+}
diff --git a/modules/richaudienceBidAdapter.md b/modules/richaudienceBidAdapter.md
index 932cdb8f8de..fbf59a0208a 100644
--- a/modules/richaudienceBidAdapter.md
+++ b/modules/richaudienceBidAdapter.md
@@ -39,6 +39,7 @@ Please reach out to your account manager for more information.
                             "pid":"ADb1f40rmo",
                             "supplyType":"site",
                             "bidfloor":0.40,
+                            "keywords": "bici=scott;coche=audi;coche=mercedes;"
                         }
                     }]
                 }
diff --git a/test/spec/modules/richaudienceBidAdapter_spec.js b/test/spec/modules/richaudienceBidAdapter_spec.js
index 90723fb863f..3b9f07b6efc 100644
--- a/test/spec/modules/richaudienceBidAdapter_spec.js
+++ b/test/spec/modules/richaudienceBidAdapter_spec.js
@@ -4,7 +4,6 @@ import {
   spec
 } from 'modules/richaudienceBidAdapter.js';
 import {config} from 'src/config.js';
-import * as utils from 'src/utils.js';
 
 describe('Richaudience adapter tests', function () {
   var DEFAULT_PARAMS_NEW_SIZES = [{
@@ -20,7 +19,8 @@ describe('Richaudience adapter tests', function () {
     params: {
       bidfloor: 0.5,
       pid: 'ADb1f40rmi',
-      supplyType: 'site'
+      supplyType: 'site',
+      keywords: 'coche=mercedes;coche=audi'
     },
     auctionId: '0cb3144c-d084-4686-b0d6-f5dbe917c563',
     bidRequestsCount: 1,
@@ -240,6 +240,9 @@ describe('Richaudience adapter tests', function () {
     expect(requestContent).to.have.property('transactionId').and.to.equal('29df2112-348b-4961-8863-1b33684d95e6');
     expect(requestContent).to.have.property('timeout').and.to.equal(3000);
     expect(requestContent).to.have.property('numIframes').and.to.equal(0);
+    expect(typeof requestContent.scr_rsl === 'string')
+    expect(typeof requestContent.cpuc === 'number')
+    expect(requestContent).to.have.property('kws').and.to.equal('coche=mercedes;coche=audi');
   })
 
   it('Verify build request to prebid video inestream', function() {

From 3e99b0dc100d23d50eba7f10b0c62ad334b1284b Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Wed, 3 Feb 2021 04:17:03 -0800
Subject: [PATCH 205/304] Rubicon Analytics: Fire event once gptSlots render
 (#6241)

* Once all gam slots are back fire event

* push to cmd queue
---
 modules/rubiconAnalyticsAdapter.js            | 71 +++++++++----------
 .../modules/rubiconAnalyticsAdapter_spec.js   | 27 -------
 2 files changed, 33 insertions(+), 65 deletions(-)

diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index af5228b8b92..644a7d24e16 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -458,47 +458,35 @@ function updateRpaCookie() {
   return decodedRpaCookie;
 }
 
-const gamEventFunctions = {
-  'slotOnload': (auctionId, bid) => {
-    cache.auctions[auctionId].gamHasRendered[bid.adUnit.adUnitCode] = true;
-  },
-  'slotRenderEnded': (auctionId, bid, event) => {
-    if (event.isEmpty) {
-      cache.auctions[auctionId].gamHasRendered[bid.adUnit.adUnitCode] = true;
-    }
-    bid.adUnit.gam = utils.pick(event, [
-      // these come in as `null` from Gpt, which when stringified does not get removed
-      // so set explicitly to undefined when not a number
-      'advertiserId', advertiserId => utils.isNumber(advertiserId) ? advertiserId : undefined,
-      'creativeId', creativeId => utils.isNumber(creativeId) ? creativeId : undefined,
-      'lineItemId', lineItemId => utils.isNumber(lineItemId) ? lineItemId : undefined,
-      'adSlot', () => event.slot.getAdUnitPath(),
-      'isSlotEmpty', () => event.isEmpty || undefined
-    ]);
-  }
-}
-
 function subscribeToGamSlots() {
-  ['slotOnload', 'slotRenderEnded'].forEach(eventName => {
-    window.googletag.pubads().addEventListener(eventName, event => {
-      const isMatchingAdSlot = utils.isAdUnitCodeMatchingSlot(event.slot);
-      // loop through auctions and adUnits and mark the info
-      Object.keys(cache.auctions).forEach(auctionId => {
-        (Object.keys(cache.auctions[auctionId].bids) || []).forEach(bidId => {
-          let bid = cache.auctions[auctionId].bids[bidId];
-          // if this slot matches this bids adUnit, add the adUnit info
-          if (isMatchingAdSlot(bid.adUnit.adUnitCode)) {
-            // mark this adUnit as having been rendered by gam
-            gamEventFunctions[eventName](auctionId, bid, event);
-          }
-        });
-        // Now if all adUnits have gam rendered, send the payload
-        if (rubiConf.waitForGamSlots && !cache.auctions[auctionId].sent && Object.keys(cache.auctions[auctionId].gamHasRendered).every(adUnitCode => cache.auctions[auctionId].gamHasRendered[adUnitCode])) {
-          clearTimeout(cache.timeouts[auctionId]);
-          delete cache.timeouts[auctionId];
-          sendMessage.call(rubiconAdapter, auctionId);
+  window.googletag.pubads().addEventListener('slotRenderEnded', event => {
+    const isMatchingAdSlot = utils.isAdUnitCodeMatchingSlot(event.slot);
+    // loop through auctions and adUnits and mark the info
+    Object.keys(cache.auctions).forEach(auctionId => {
+      (Object.keys(cache.auctions[auctionId].bids) || []).forEach(bidId => {
+        let bid = cache.auctions[auctionId].bids[bidId];
+        // if this slot matches this bids adUnit, add the adUnit info
+        if (isMatchingAdSlot(bid.adUnit.adUnitCode)) {
+          // mark this adUnit as having been rendered by gam
+          cache.auctions[auctionId].gamHasRendered[bid.adUnit.adUnitCode] = true;
+
+          bid.adUnit.gam = utils.pick(event, [
+            // these come in as `null` from Gpt, which when stringified does not get removed
+            // so set explicitly to undefined when not a number
+            'advertiserId', advertiserId => utils.isNumber(advertiserId) ? advertiserId : undefined,
+            'creativeId', creativeId => utils.isNumber(creativeId) ? creativeId : undefined,
+            'lineItemId', lineItemId => utils.isNumber(lineItemId) ? lineItemId : undefined,
+            'adSlot', () => event.slot.getAdUnitPath(),
+            'isSlotEmpty', () => event.isEmpty || undefined
+          ]);
         }
       });
+      // Now if all adUnits have gam rendered, send the payload
+      if (rubiConf.waitForGamSlots && !cache.auctions[auctionId].sent && Object.keys(cache.auctions[auctionId].gamHasRendered).every(adUnitCode => cache.auctions[auctionId].gamHasRendered[adUnitCode])) {
+        clearTimeout(cache.timeouts[auctionId]);
+        delete cache.timeouts[auctionId];
+        sendMessage.call(rubiconAdapter, auctionId);
+      }
     });
   });
 }
@@ -576,6 +564,13 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
         if (!cache.gpt.registered && utils.isGptPubadsDefined()) {
           subscribeToGamSlots();
           cache.gpt.registered = true;
+        } else if (!cache.gpt.registered) {
+          cache.gpt.registered = true;
+          let googletag = window.googletag || {};
+          googletag.cmd = googletag.cmd || [];
+          googletag.cmd.push(function() {
+            subscribeToGamSlots();
+          });
         }
         break;
       case BID_REQUESTED:
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index 4bb2f6e217c..d8eb4fb0bdc 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -1361,7 +1361,6 @@ describe('rubicon analytics adapter', function () {
     describe('with googletag enabled', function () {
       let gptSlot0, gptSlot1;
       let gptSlotRenderEnded0, gptSlotRenderEnded1;
-      let gptslotOnload0, gptslotOnload1;
       beforeEach(function () {
         mockGpt.enable();
         gptSlot0 = mockGpt.makeSlot({code: '/19968336/header-bid-tag-0'});
@@ -1375,16 +1374,6 @@ describe('rubicon analytics adapter', function () {
             lineItemId: 3333
           }
         };
-        gptslotOnload0 = {
-          eventName: 'slotOnload',
-          params: {
-            slot: gptSlot0,
-            isEmpty: false,
-            advertiserId: 1111,
-            creativeId: 2222,
-            lineItemId: 3333
-          }
-        };
 
         gptSlot1 = mockGpt.makeSlot({code: '/19968336/header-bid-tag1'});
         gptSlotRenderEnded1 = {
@@ -1397,16 +1386,6 @@ describe('rubicon analytics adapter', function () {
             lineItemId: 6666
           }
         };
-        gptslotOnload1 = {
-          eventName: 'slotOnload',
-          params: {
-            slot: gptSlot1,
-            isEmpty: false,
-            advertiserId: 1111,
-            creativeId: 2222,
-            lineItemId: 3333
-          }
-        };
       });
 
       afterEach(function () {
@@ -1536,12 +1515,6 @@ describe('rubicon analytics adapter', function () {
         mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
         mockGpt.emitEvent(gptSlotRenderEnded1.eventName, gptSlotRenderEnded1.params);
 
-        expect(server.requests.length).to.equal(0);
-
-        // now emit slotOnload and it should send
-        mockGpt.emitEvent(gptslotOnload0.eventName, gptslotOnload0.params);
-        mockGpt.emitEvent(gptslotOnload1.eventName, gptslotOnload1.params);
-
         expect(server.requests.length).to.equal(1);
         let request = server.requests[0];
         let message = JSON.parse(request.requestBody);

From d1900a9bb0070880890e0ab60311a8ad29ce60ab Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Wed, 3 Feb 2021 04:19:04 -0800
Subject: [PATCH 206/304] New dimension for tracking name of the matching
 adUnit pattern (#6252)

---
 modules/rubiconAnalyticsAdapter.js            |  6 ++--
 .../modules/rubiconAnalyticsAdapter_spec.js   | 29 +++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index 644a7d24e16..679e86aa0a0 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -185,7 +185,8 @@ function sendMessage(auctionId, bidWonId) {
           'dimensions',
           'adserverTargeting', () => stringProperties(cache.targeting[bid.adUnit.adUnitCode] || {}),
           'gam',
-          'pbAdSlot'
+          'pbAdSlot',
+          'pattern'
         ]);
         adUnit.bids = [];
         adUnit.status = 'no-bid'; // default it to be no bid
@@ -651,7 +652,8 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
                   return {adSlot: bid.fpd.context.adServer.adSlot}
                 }
               },
-              'pbAdSlot', () => utils.deepAccess(bid, 'fpd.context.pbAdSlot')
+              'pbAdSlot', () => utils.deepAccess(bid, 'fpd.context.pbAdSlot'),
+              'pattern', () => utils.deepAccess(bid, 'fpd.context.aupName')
             ])
           ]);
           return memo;
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index d8eb4fb0bdc..16d25ec400c 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -1669,6 +1669,35 @@ describe('rubicon analytics adapter', function () {
       expect(timedOutBid).to.not.have.property('bidResponse');
     });
 
+    it('should pass aupName as pattern', function () {
+      let bidRequest = utils.deepClone(MOCK.BID_REQUESTED);
+      bidRequest.bids[0].fpd = {
+        context: {
+          aupName: '1234/mycoolsite/*&gpt_leaderboard&deviceType=mobile'
+        }
+      };
+      bidRequest.bids[1].fpd = {
+        context: {
+          aupName: '1234/mycoolsite/*&gpt_skyscraper&deviceType=mobile'
+        }
+      };
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, bidRequest);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+
+      clock.tick(SEND_TIMEOUT + 1000);
+
+      expect(server.requests.length).to.equal(1);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+      expect(message.auctions[0].adUnits[0].pattern).to.equal('1234/mycoolsite/*&gpt_leaderboard&deviceType=mobile');
+      expect(message.auctions[0].adUnits[1].pattern).to.equal('1234/mycoolsite/*&gpt_skyscraper&deviceType=mobile');
+    });
+
     it('should successfully convert bid price to USD in parseBidResponse', function () {
       // Set the rates
       setConfig({

From f704369adf1aece9ad6fa887bd7135e944107f74 Mon Sep 17 00:00:00 2001
From: mefjush <mefjush@gmail.com>
Date: Wed, 3 Feb 2021 14:26:47 +0100
Subject: [PATCH 207/304] Adhese Bid Adapter: Per adunit targets (#6256)

* adpod category support test

* Revert "adpod category support test"
---
 modules/adheseBidAdapter.js                | 13 +++++++++----
 test/spec/modules/adheseBidAdapter_spec.js | 14 ++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/modules/adheseBidAdapter.js b/modules/adheseBidAdapter.js
index 80758668a95..5510db62950 100644
--- a/modules/adheseBidAdapter.js
+++ b/modules/adheseBidAdapter.js
@@ -22,15 +22,19 @@ export const spec = {
     }
     const { gdprConsent, refererInfo } = bidderRequest;
 
-    const targets = validBidRequests.map(bid => bid.params.data).reduce(mergeTargets, {});
     const gdprParams = (gdprConsent && gdprConsent.consentString) ? { xt: [gdprConsent.consentString] } : {};
     const refererParams = (refererInfo && refererInfo.referer) ? { xf: [base64urlEncode(refererInfo.referer)] } : {};
     const id5Params = (getId5Id(validBidRequests)) ? { x5: [getId5Id(validBidRequests)] } : {};
-    const slots = validBidRequests.map(bid => ({ slotname: bidToSlotName(bid) }));
+    const commonParams = { ...gdprParams, ...refererParams, ...id5Params };
+
+    const slots = validBidRequests.map(bid => ({
+      slotname: bidToSlotName(bid),
+      parameters: cleanTargets(bid.params.data)
+    }));
 
     const payload = {
       slots: slots,
-      parameters: { ...targets, ...gdprParams, ...refererParams, ...id5Params }
+      parameters: commonParams
     }
 
     const account = getAccount(validBidRequests);
@@ -110,7 +114,8 @@ function adResponse(bid, ad) {
   return bidResponse;
 }
 
-function mergeTargets(targets, target) {
+function cleanTargets(target) {
+  const targets = {};
   if (target) {
     Object.keys(target).forEach(function (key) {
       const val = target[key];
diff --git a/test/spec/modules/adheseBidAdapter_spec.js b/test/spec/modules/adheseBidAdapter_spec.js
index 4d888db269d..0089a403749 100644
--- a/test/spec/modules/adheseBidAdapter_spec.js
+++ b/test/spec/modules/adheseBidAdapter_spec.js
@@ -74,31 +74,33 @@ describe('AdheseAdapter', function () {
     it('should include requested slots', function () {
       let req = spec.buildRequests([ minimalBid() ], bidderRequest);
 
-      expect(JSON.parse(req.data).slots).to.deep.include({ 'slotname': '_main_page_-leaderboard' });
+      expect(JSON.parse(req.data).slots[0].slotname).to.equal('_main_page_-leaderboard');
     });
 
     it('should include all extra bid params', function () {
       let req = spec.buildRequests([ bidWithParams({ 'ag': '25' }) ], bidderRequest);
 
-      expect(JSON.parse(req.data).parameters).to.deep.include({ 'ag': [ '25' ] });
+      expect(JSON.parse(req.data).slots[0].parameters).to.deep.include({ 'ag': [ '25' ] });
     });
 
-    it('should include duplicate bid params once', function () {
+    it('should assign bid params per slot', function () {
       let req = spec.buildRequests([ bidWithParams({ 'ag': '25' }), bidWithParams({ 'ag': '25', 'ci': 'gent' }) ], bidderRequest);
 
-      expect(JSON.parse(req.data).parameters).to.deep.include({'ag': ['25']}).and.to.deep.include({ 'ci': [ 'gent' ] });
+      expect(JSON.parse(req.data).slots[0].parameters).to.deep.include({ 'ag': [ '25' ] }).and.not.to.deep.include({ 'ci': [ 'gent' ] });
+      expect(JSON.parse(req.data).slots[1].parameters).to.deep.include({ 'ag': [ '25' ] }).and.to.deep.include({ 'ci': [ 'gent' ] });
     });
 
     it('should split multiple target values', function () {
       let req = spec.buildRequests([ bidWithParams({ 'ci': 'london' }), bidWithParams({ 'ci': 'gent' }) ], bidderRequest);
 
-      expect(JSON.parse(req.data).parameters).to.deep.include({ 'ci': [ 'london', 'gent' ] });
+      expect(JSON.parse(req.data).slots[0].parameters).to.deep.include({ 'ci': [ 'london' ] });
+      expect(JSON.parse(req.data).slots[1].parameters).to.deep.include({ 'ci': [ 'gent' ] });
     });
 
     it('should filter out empty params', function () {
       let req = spec.buildRequests([ bidWithParams({ 'aa': [], 'bb': null, 'cc': '', 'dd': [ '', '' ], 'ee': [ 0, 1, null ], 'ff': 0, 'gg': [ 'x', 'y', '' ] }) ], bidderRequest);
 
-      let params = JSON.parse(req.data).parameters;
+      let params = JSON.parse(req.data).slots[0].parameters;
       expect(params).to.not.have.any.keys('aa', 'bb', 'cc', 'dd');
       expect(params).to.deep.include({ 'ee': [ 0, 1 ], 'ff': [ 0 ], 'gg': [ 'x', 'y' ] });
     });

From 97e5351c2ed0900557bc09277cce33a4db1a4678 Mon Sep 17 00:00:00 2001
From: ardit-baloku <77985953+ardit-baloku@users.noreply.github.com>
Date: Wed, 3 Feb 2021 15:03:46 +0100
Subject: [PATCH 208/304] Gjirafa Bid Adapter: added data object as a param
 (#6231)

* Added data parameter to gjirafaBidAdapter

* Updated gjirafaBidAdapter markdown

* Added test for gjirafaBidAdapter
---
 modules/gjirafaBidAdapter.js                |  7 ++-
 modules/gjirafaBidAdapter.md                | 62 ++++++++++++++-------
 test/spec/modules/gjirafaBidAdapter_spec.js | 30 ++++++++--
 3 files changed, 73 insertions(+), 26 deletions(-)

diff --git a/modules/gjirafaBidAdapter.js b/modules/gjirafaBidAdapter.js
index fc1232436b4..77589cd9071 100644
--- a/modules/gjirafaBidAdapter.js
+++ b/modules/gjirafaBidAdapter.js
@@ -31,6 +31,7 @@ export const spec = {
     let bidderRequestId = '';
     let url = '';
     let contents = [];
+    let data = {};
 
     let placements = validBidRequests.map(bidRequest => {
       if (!propertyId) { propertyId = bidRequest.params.propertyId; }
@@ -38,7 +39,8 @@ export const spec = {
       if (!storageId && bidRequest.params) { storageId = bidRequest.params.storageId || ''; }
       if (!bidderRequestId) { bidderRequestId = bidRequest.bidderRequestId; }
       if (!url && bidderRequest) { url = bidderRequest.refererInfo.referer; }
-      if (!contents.length && bidRequest.params.contents && bidRequest.params.contents.length) { contents = bidRequest.params.contents }
+      if (!contents.length && bidRequest.params.contents && bidRequest.params.contents.length) { contents = bidRequest.params.contents; }
+      if (Object.keys(data).length === 0 && bidRequest.params.data && Object.keys(bidRequest.params.data).length !== 0) { data = bidRequest.params.data; }
 
       let adUnitId = bidRequest.adUnitCode;
       let placementId = bidRequest.params.placementId;
@@ -61,7 +63,8 @@ export const spec = {
       url: url,
       requestid: bidderRequestId,
       placements: placements,
-      contents: contents
+      contents: contents,
+      data: data
     }
 
     return [{
diff --git a/modules/gjirafaBidAdapter.md b/modules/gjirafaBidAdapter.md
index deb06e74a27..fb4960d61f6 100644
--- a/modules/gjirafaBidAdapter.md
+++ b/modules/gjirafaBidAdapter.md
@@ -1,45 +1,67 @@
 # Overview
-Module Name: Gjirafa Bidder Adapter Module 
-Type: Bidder Adapter 
-Maintainer: drilon@gjirafa.com
+Module Name: Gjirafa Bidder Adapter Module
+
+Type: Bidder Adapter
+
+Maintainer: arditb@gjirafa.com
 
 # Description
 Gjirafa Bidder Adapter for Prebid.js.
 
 # Test Parameters
+```js
 var adUnits = [
     {
         code: 'test-div',
         mediaTypes: {
             banner: {
-                sizes: [[728, 90]]
+                sizes: [
+                    [728, 90]
+                ]
             }
         },
-        bids: [
-            {
-                 bidder: 'gjirafa',
-                 params: {
-                    propertyId: '105227',
-                    placementId: '846841'
+        bids: [{
+            bidder: 'gjirafa',
+            params: {
+                propertyId: '105227',   //Required
+                placementId: '846841',  //Required
+                data: {                 //Optional
+                    catalogs: [{
+                        catalogId: 9,
+                        items: ["193", "4", "1"]
+                    }],
+                    inventory: {
+                        category: ["tech"],
+                        query: ["iphone 12"]
+                    }
                 }
             }
-        ]
+        }]
     },
     {
         code: 'test-div',
         mediaTypes: {
-             video: {
+            video: {
                 context: 'instream'
-             }
+            }
         },
-        bids: [
-            {
-                 bidder: 'gjirafa',
-                 params: {
-                    propertyId: '105227',
-                    placementId: '846836'
+        bids: [{
+            bidder: 'gjirafa',
+            params: {
+                propertyId: '105227',  //Required
+                placementId: '846836', //Required
+                data: {                //Optional
+                    catalogs: [{
+                        catalogId: 9,
+                        items: ["193", "4", "1"]
+                    }],
+                    inventory: {
+                        category: ["tech"],
+                        query: ["iphone 12"]
+                    }
                 }
             }
-        ]
+        }]
     }
 ];
+```
diff --git a/test/spec/modules/gjirafaBidAdapter_spec.js b/test/spec/modules/gjirafaBidAdapter_spec.js
index db9b82e0a10..f0fb01f4398 100644
--- a/test/spec/modules/gjirafaBidAdapter_spec.js
+++ b/test/spec/modules/gjirafaBidAdapter_spec.js
@@ -34,9 +34,7 @@ describe('gjirafaAdapterTest', () => {
     it('bidRequest without propertyId or placementId', () => {
       expect(spec.isBidRequestValid({
         bidder: 'gjirafa',
-        params: {
-          propertyId: '{propertyId}',
-        }
+        params: {}
       })).to.equal(false);
     });
   });
@@ -46,7 +44,17 @@ describe('gjirafaAdapterTest', () => {
       'bidder': 'gjirafa',
       'params': {
         'propertyId': '{propertyId}',
-        'placementId': '{placementId}'
+        'placementId': '{placementId}',
+        'data': {
+          'catalogs': [{
+            'catalogId': 1,
+            'items': ['1', '2', '3']
+          }],
+          'inventory': {
+            'category': ['category1', 'category2'],
+            'query': ['query']
+          }
+        }
       },
       'adUnitCode': 'hb-leaderboard',
       'transactionId': 'b6b889bb-776c-48fd-bc7b-d11a1cf0425e',
@@ -86,6 +94,20 @@ describe('gjirafaAdapterTest', () => {
         expect(requestItem.data.placements[0].sizes).to.equal('728x90');
       });
     });
+
+    it('bidRequest data param', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach((requestItem) => {
+        expect(requestItem.data.data).to.exist;
+        expect(requestItem.data.data.catalogs).to.exist;
+        expect(requestItem.data.data.inventory).to.exist;
+        expect(requestItem.data.data.catalogs.length).to.equal(1);
+        expect(requestItem.data.data.catalogs[0].items.length).to.equal(3);
+        expect(Object.keys(requestItem.data.data.inventory).length).to.equal(2);
+        expect(requestItem.data.data.inventory.category.length).to.equal(2);
+        expect(requestItem.data.data.inventory.query.length).to.equal(1);
+      });
+    });
   });
 
   describe('interpretResponse', () => {

From f8d42badebf950b7749f46de7ade1ce99a295fbe Mon Sep 17 00:00:00 2001
From: Catalin Ciocov <catalin.ciocov@gmail.com>
Date: Wed, 3 Feb 2021 17:28:25 +0200
Subject: [PATCH 209/304] Fix a TypeError when message event source is not
 available (#6224)

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

diff --git a/modules/inskinBidAdapter.js b/modules/inskinBidAdapter.js
index 2a55b5280db..3951e27c870 100644
--- a/modules/inskinBidAdapter.js
+++ b/modules/inskinBidAdapter.js
@@ -188,7 +188,7 @@ export const spec = {
 
         const id = 'ism_tag_' + Math.floor((Math.random() * 10e16));
         window[id] = {
-          plr_AdSlot: e.source.frameElement,
+          plr_AdSlot: e.source && e.source.frameElement,
           bidId: e.data.bidId,
           bidPrice: bidsMap[e.data.bidId].price,
           serverResponse

From 5504f12a3a29dc8f44a147443dca72fc9c214edc Mon Sep 17 00:00:00 2001
From: harpere <ericsbiz@yahoo.com>
Date: Wed, 3 Feb 2021 13:10:41 -0500
Subject: [PATCH 210/304] fix broken tests due to "encoded" base64 logic
 (#6268)

---
 test/spec/modules/parrableIdSystem_spec.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/test/spec/modules/parrableIdSystem_spec.js b/test/spec/modules/parrableIdSystem_spec.js
index 6d0748b592d..046ab3a4005 100644
--- a/test/spec/modules/parrableIdSystem_spec.js
+++ b/test/spec/modules/parrableIdSystem_spec.js
@@ -80,6 +80,15 @@ describe('Parrable ID System', function() {
       let logErrorStub;
       let callbackSpy = sinon.spy();
 
+      let decodeBase64UrlSafe = function (encBase64) {
+        const DEC = {
+          '-': '+',
+          '_': '/',
+          '.': '='
+        };
+        return encBase64.replace(/[-_.]/g, (m) => DEC[m]);
+      }
+
       beforeEach(function() {
         logErrorStub = sinon.stub(utils, 'logError');
         callbackSpy.resetHistory();
@@ -98,7 +107,7 @@ describe('Parrable ID System', function() {
 
         let request = server.requests[0];
         let queryParams = utils.parseQS(request.url.split('?')[1]);
-        let data = JSON.parse(atob(queryParams.data));
+        let data = JSON.parse(atob(decodeBase64UrlSafe(queryParams.data)));
 
         expect(getIdResult.callback).to.be.a('function');
         expect(request.url).to.contain('h.parrable.com');

From eed6db7cfa79e92ff030ca1154c04ce0b818fa96 Mon Sep 17 00:00:00 2001
From: Denis Logachov <denis@adkernel.com>
Date: Wed, 3 Feb 2021 20:19:45 +0200
Subject: [PATCH 211/304] Adkernel Bid Adapter: stringads alias added (#6262)

* Adkernel: stringads alias
---
 modules/adkernelBidAdapter.js                | 2 +-
 test/spec/modules/adkernelBidAdapter_spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
index 1b238f8d1c4..20ed65fe2e2 100644
--- a/modules/adkernelBidAdapter.js
+++ b/modules/adkernelBidAdapter.js
@@ -52,7 +52,7 @@ const NATIVE_INDEX = NATIVE_MODEL.reduce((acc, val, idx) => {
 export const spec = {
 
   code: 'adkernel',
-  aliases: ['headbidding', 'adsolut', 'oftmediahb', 'audiencemedia', 'waardex_ak', 'roqoon', 'andbeyond', 'adbite', 'houseofpubs', 'torchad'],
+  aliases: ['headbidding', 'adsolut', 'oftmediahb', 'audiencemedia', 'waardex_ak', 'roqoon', 'andbeyond', 'adbite', 'houseofpubs', 'torchad', 'stringads'],
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   /**
diff --git a/test/spec/modules/adkernelBidAdapter_spec.js b/test/spec/modules/adkernelBidAdapter_spec.js
index 0bc14c877ab..4454aa00a71 100644
--- a/test/spec/modules/adkernelBidAdapter_spec.js
+++ b/test/spec/modules/adkernelBidAdapter_spec.js
@@ -556,7 +556,7 @@ describe('Adkernel adapter', function () {
 
   describe('adapter configuration', () => {
     it('should have aliases', () => {
-      expect(spec.aliases).to.have.lengthOf(10);
+      expect(spec.aliases).to.have.lengthOf(11);
     });
   });
 

From 4d1e906c6a627fc7f249f8e8b9d2f2dd390963ec Mon Sep 17 00:00:00 2001
From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com>
Date: Wed, 3 Feb 2021 14:33:17 -0500
Subject: [PATCH 212/304] Revert "Extended ID permissions supported by bidder
 (#6112)" (#6269)

This reverts commit a926dee9e108ca4b8792ba8992a9bca7c2f42781.
---
 integrationExamples/gpt/userId_example.html   |   1 -
 modules/prebidServerBidAdapter/index.js       |  17 +--
 modules/userId/eids.js                        |  22 ----
 modules/userId/index.js                       |  47 ++-----
 plugins/eslint/validateImports.js             |   3 +-
 .../modules/prebidServerBidAdapter_spec.js    |  46 +++----
 test/spec/modules/userId_spec.js              | 117 +-----------------
 7 files changed, 41 insertions(+), 212 deletions(-)

diff --git a/integrationExamples/gpt/userId_example.html b/integrationExamples/gpt/userId_example.html
index 71299a4a6e1..fa9b1e3b5fd 100644
--- a/integrationExamples/gpt/userId_example.html
+++ b/integrationExamples/gpt/userId_example.html
@@ -236,7 +236,6 @@
                         },
                         {
                         name: "sharedId",
-                        // bidders: ["rubicon", "sampleBidders"], // to allow this ID for specific bidders
                         params: {
                             syncTime: 60 // in seconds, default is 24 hours
                         },
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 04aedb63ae6..d878b520c78 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -12,7 +12,6 @@ import includes from 'core-js-pure/features/array/includes.js';
 import { S2S_VENDORS } from './config.js';
 import { ajax } from '../../src/ajax.js';
 import find from 'core-js-pure/features/array/find.js';
-import { getEidPermissions } from '../userId/index.js';
 
 const getConfig = config.getConfig;
 
@@ -460,7 +459,7 @@ export function resetWurlMap() {
 }
 
 const OPEN_RTB_PROTOCOL = {
-  buildRequest(s2sBidRequest, bidRequests, adUnits, s2sConfig, requestedBidders) {
+  buildRequest(s2sBidRequest, bidRequests, adUnits, s2sConfig) {
     let imps = [];
     let aliases = {};
     const firstBidRequest = bidRequests[0];
@@ -705,18 +704,6 @@ const OPEN_RTB_PROTOCOL = {
       utils.deepSetValue(request, 'user.ext.eids', bidUserIdAsEids);
     }
 
-    const eidPermissions = getEidPermissions();
-    if (utils.isArray(eidPermissions) && eidPermissions.length > 0) {
-      if (requestedBidders && utils.isArray(requestedBidders)) {
-        eidPermissions.forEach(i => {
-          if (i.bidders) {
-            i.bidders = i.bidders.filter(bidder => requestedBidders.includes(bidder))
-          }
-        });
-      }
-      utils.deepSetValue(request, 'ext.prebid.data.eidpermissions', eidPermissions);
-    }
-
     if (bidRequests) {
       if (firstBidRequest.gdprConsent) {
         // note - gdprApplies & consentString may be undefined in certain use-cases for consentManagement module
@@ -975,7 +962,7 @@ export function PrebidServer() {
         queueSync(syncBidders, gdprConsent, uspConsent, s2sBidRequest.s2sConfig);
       }
 
-      const request = OPEN_RTB_PROTOCOL.buildRequest(s2sBidRequest, bidRequests, validAdUnits, s2sBidRequest.s2sConfig, requestedBidders);
+      const request = OPEN_RTB_PROTOCOL.buildRequest(s2sBidRequest, bidRequests, validAdUnits, s2sBidRequest.s2sConfig);
       const requestJson = request && JSON.stringify(request);
       if (request && requestJson) {
         ajax(
diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index 80750ccaae8..27665de4136 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -224,25 +224,3 @@ export function createEidsArray(bidRequestUserId) {
   }
   return eids;
 }
-
-/**
- * @param {SubmoduleContainer[]} submodules
- */
-export function buildEidPermissions(submodules) {
-  let eidPermissions = [];
-  submodules.filter(i => utils.isPlainObject(i.idObj) && Object.keys(i.idObj).length)
-    .forEach(i => {
-      Object.keys(i.idObj).forEach(key => {
-        if (utils.deepAccess(i, 'config.bidders') && Array.isArray(i.config.bidders) &&
-          utils.deepAccess(USER_IDS_CONFIG, key + '.source')) {
-          eidPermissions.push(
-            {
-              source: USER_IDS_CONFIG[key].source,
-              bidders: i.config.bidders
-            }
-          );
-        }
-      });
-    });
-  return eidPermissions;
-}
diff --git a/modules/userId/index.js b/modules/userId/index.js
index 8f7d2a36699..9294311de69 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -136,7 +136,7 @@ import { getGlobal } from '../../src/prebidGlobal.js';
 import { gdprDataHandler } from '../../src/adapterManager.js';
 import CONSTANTS from '../../src/constants.json';
 import { module, hook } from '../../src/hook.js';
-import { createEidsArray, buildEidPermissions } from './eids.js';
+import { createEidsArray } from './eids.js';
 import { getCoreStorageManager } from '../../src/storageManager.js';
 
 const MODULE_NAME = 'User ID';
@@ -214,10 +214,6 @@ export function setStoredValue(submodule, value) {
   }
 }
 
-export function getEidPermissions() {
-  return buildEidPermissions(initializedSubmodules);
-}
-
 /**
  * @param {SubmoduleStorage} storage
  * @param {String|undefined} key optional key of the value
@@ -437,26 +433,6 @@ function getCombinedSubmoduleIds(submodules) {
   return combinedSubmoduleIds;
 }
 
-/**
- * This function will create a combined object for bidder with allowed subModule Ids
- * @param {SubmoduleContainer[]} submodules
- * @param {string} bidder
- */
-function getCombinedSubmoduleIdsForBidder(submodules, bidder) {
-  if (!Array.isArray(submodules) || !submodules.length || !bidder) {
-    return {};
-  }
-  return submodules
-    .filter(i => !i.config.bidders || !utils.isArray(i.config.bidders) || i.config.bidders.includes(bidder))
-    .filter(i => utils.isPlainObject(i.idObj) && Object.keys(i.idObj).length)
-    .reduce((carry, i) => {
-      Object.keys(i.idObj).forEach(key => {
-        carry[key] = i.idObj[key];
-      });
-      return carry;
-    }, {});
-}
-
 /**
  * @param {AdUnit[]} adUnits
  * @param {SubmoduleContainer[]} submodules
@@ -465,18 +441,19 @@ function addIdDataToAdUnitBids(adUnits, submodules) {
   if ([adUnits].some(i => !Array.isArray(i) || !i.length)) {
     return;
   }
-  adUnits.forEach(adUnit => {
-    if (adUnit.bids && utils.isArray(adUnit.bids)) {
-      adUnit.bids.forEach(bid => {
-        const combinedSubmoduleIds = getCombinedSubmoduleIdsForBidder(submodules, bid.bidder);
-        if (Object.keys(combinedSubmoduleIds).length) {
+  const combinedSubmoduleIds = getCombinedSubmoduleIds(submodules);
+  const combinedSubmoduleIdsAsEids = createEidsArray(combinedSubmoduleIds);
+  if (Object.keys(combinedSubmoduleIds).length) {
+    adUnits.forEach(adUnit => {
+      if (adUnit.bids && utils.isArray(adUnit.bids)) {
+        adUnit.bids.forEach(bid => {
           // create a User ID object on the bid,
           bid.userId = combinedSubmoduleIds;
-          bid.userIdAsEids = createEidsArray(combinedSubmoduleIds);
-        }
-      });
-    }
-  });
+          bid.userIdAsEids = combinedSubmoduleIdsAsEids;
+        });
+      }
+    });
+  }
 }
 
 /**
diff --git a/plugins/eslint/validateImports.js b/plugins/eslint/validateImports.js
index 53f4ace8381..a39bf9b26d5 100644
--- a/plugins/eslint/validateImports.js
+++ b/plugins/eslint/validateImports.js
@@ -26,8 +26,7 @@ function flagErrors(context, node, importPath) {
     if (
       path.dirname(absImportPath) === absModulePath || (
         absImportPath.startsWith(absModulePath) &&
-        path.basename(absImportPath) === 'index.js' &&
-        path.basename(absFileDir) !== 'prebidServerBidAdapter'
+        path.basename(absImportPath) === 'index.js'
       )
     ) {
       context.report(node, `import "${importPath}" cannot require module entry point`);
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 4652bbb63f7..f17cd3ab14f 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -953,15 +953,17 @@ describe('S2S Adapter', function () {
       adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
-      expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.include({
-        aliases: {
-          brealtime: 'appnexus'
-        },
-        auctiontimestamp: 1510852447530,
-        targeting: {
-          includebidderkeys: false,
-          includewinners: true
+
+      expect(requestBid.ext).to.deep.equal({
+        prebid: {
+          aliases: {
+            brealtime: 'appnexus'
+          },
+          auctiontimestamp: 1510852447530,
+          targeting: {
+            includebidderkeys: false,
+            includewinners: true
+          }
         }
       });
     });
@@ -983,15 +985,17 @@ describe('S2S Adapter', function () {
       adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
-      expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.include({
-        aliases: {
-          [alias]: 'appnexus'
-        },
-        auctiontimestamp: 1510852447530,
-        targeting: {
-          includebidderkeys: false,
-          includewinners: true
+
+      expect(requestBid.ext).to.deep.equal({
+        prebid: {
+          aliases: {
+            [alias]: 'appnexus'
+          },
+          auctiontimestamp: 1510852447530,
+          targeting: {
+            includebidderkeys: false,
+            includewinners: true
+          }
         }
       });
     });
@@ -1372,7 +1376,7 @@ describe('S2S Adapter', function () {
 
       expect(requestBid).to.haveOwnProperty('ext');
       expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.include({
+      expect(requestBid.ext.prebid).to.deep.equal({
         auctiontimestamp: 1510852447530,
         foo: 'bar',
         targeting: {
@@ -1406,7 +1410,7 @@ describe('S2S Adapter', function () {
 
       expect(requestBid).to.haveOwnProperty('ext');
       expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.include({
+      expect(requestBid.ext.prebid).to.deep.equal({
         auctiontimestamp: 1510852447530,
         targeting: {
           includewinners: false,
@@ -1442,7 +1446,7 @@ describe('S2S Adapter', function () {
 
       expect(requestBid).to.haveOwnProperty('ext');
       expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.include({
+      expect(requestBid.ext.prebid).to.deep.equal({
         auctiontimestamp: 1510852447530,
         cache: {
           vastxml: 'vastxml-set-though-extPrebid.cache.vastXml'
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index 1ae023ae947..ed592c0cba5 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -2,7 +2,6 @@ import {
   attachIdSystem,
   auctionDelay,
   coreStorage,
-  getEidPermissions,
   init,
   requestBidsHook,
   setStoredConsentData,
@@ -71,7 +70,7 @@ describe('User ID', function () {
       code,
       mediaTypes: {banner: {}, native: {}},
       sizes: [[300, 200], [300, 600]],
-      bids: [{bidder: 'sampleBidder', params: {placementId: 'banner-only-bidder'}}, {bidder: 'anotherSampleBidder', params: {placementId: 'banner-only-bidder'}}]
+      bids: [{bidder: 'sampleBidder', params: {placementId: 'banner-only-bidder'}}]
     };
   }
 
@@ -1197,120 +1196,6 @@ describe('User ID', function () {
       }, {adUnits});
     });
 
-    it('eidPermissions fun with bidders', function (done) {
-      coreStorage.setCookie('sharedid', JSON.stringify({
-        'id': 'test222',
-        'ts': 1590525289611
-      }), (new Date(Date.now() + 5000).toUTCString()));
-
-      setSubmoduleRegistry([sharedIdSubmodule]);
-      init(config);
-      config.setConfig({
-        userSync: {
-          syncDelay: 0,
-          userIds: [
-            {
-              name: 'sharedId',
-              bidders: [
-                'sampleBidder'
-              ],
-              storage: {
-                type: 'cookie',
-                name: 'sharedid',
-                expires: 28
-              }
-            }
-          ]
-        }
-      });
-
-      requestBidsHook(function () {
-        const eidPermissions = getEidPermissions();
-        expect(eidPermissions).to.deep.equal(
-          [
-            {source: 'sharedid.org', bidders: ['sampleBidder']}
-          ]
-        );
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            if (bid.bidder === 'sampleBidder') {
-              expect(bid).to.have.deep.nested.property('userId.sharedid');
-              expect(bid.userId.sharedid.id).to.equal('test222');
-              expect(bid.userIdAsEids[0]).to.deep.equal({
-                source: 'sharedid.org',
-                uids: [
-                  {
-                    id: 'test222',
-                    atype: 1,
-                    ext: {
-                      third: 'test222'
-                    }
-                  }
-                ]
-              });
-            }
-            if (bid.bidder === 'anotherSampleBidder') {
-              expect(bid).to.not.have.deep.nested.property('userId.sharedid');
-              expect(bid).to.not.have.property('userIdAsEids');
-            }
-          });
-        });
-        coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
-        done();
-      }, {adUnits});
-    });
-
-    it('eidPermissions fun without bidders', function (done) {
-      coreStorage.setCookie('sharedid', JSON.stringify({
-        'id': 'test222',
-        'ts': 1590525289611
-      }), (new Date(Date.now() + 5000).toUTCString()));
-
-      setSubmoduleRegistry([sharedIdSubmodule]);
-      init(config);
-      config.setConfig({
-        userSync: {
-          syncDelay: 0,
-          userIds: [
-            {
-              name: 'sharedId',
-              storage: {
-                type: 'cookie',
-                name: 'sharedid',
-                expires: 28
-              }
-            }
-          ]
-        }
-      });
-
-      requestBidsHook(function () {
-        const eidPermissions = getEidPermissions();
-        expect(eidPermissions).to.deep.equal(
-          []
-        );
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.sharedid');
-            expect(bid.userId.sharedid.id).to.equal('test222');
-            expect(bid.userIdAsEids[0]).to.deep.equal({
-              source: 'sharedid.org',
-              uids: [
-                {
-                  id: 'test222',
-                  atype: 1,
-                  ext: {
-                    third: 'test222'
-                  }
-                }]
-            });
-          });
-        });
-        coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
-        done();
-      }, {adUnits});
-    });
-
     it('test hook from pubProvidedId config params', function (done) {
       setSubmoduleRegistry([pubProvidedIdSubmodule]);
       init(config);

From a4c6efae61ca4966d0f8eacfd700c83c45cde0f1 Mon Sep 17 00:00:00 2001
From: Eric Harper <eharper@rubiconproject.com>
Date: Wed, 3 Feb 2021 15:14:49 -0500
Subject: [PATCH 213/304] Prebid 4.25.0 Release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0d23415dca0..ceea005dfe6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.25.0-pre",
+  "version": "4.25.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 6cbb15e0248ed1e887ab2131b03e670443632cff Mon Sep 17 00:00:00 2001
From: Eric Harper <eharper@rubiconproject.com>
Date: Wed, 3 Feb 2021 15:51:29 -0500
Subject: [PATCH 214/304] Increment pre version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ceea005dfe6..d8b6af04379 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.25.0",
+  "version": "4.26.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 28cbd2940a8cebb75987527168220e0a0d6b5a80 Mon Sep 17 00:00:00 2001
From: Skylinar <53079123+Skylinar@users.noreply.github.com>
Date: Thu, 4 Feb 2021 07:34:34 +0100
Subject: [PATCH 215/304] smartxBidAdapter: new Feature - Made Out-Stream
 Player configurable (#6239)

* Add smartclipBidAdapter

* smartxBidAdapter.js - removed unused variables, removed debug, added window before the outstream related functions

* - made outstream player configurable

* remove wrong named files

* camelcase

* fix

Co-authored-by: smartclip AdTechnology <adtech@smartclip.com>
Co-authored-by: Gino Cirlini <adtech@smartclip.tv>
---
 modules/smartxBidAdapter.js                | 50 ++++++++++++++++++----
 modules/smartxBidAdapter.md                | 34 ++++++++++-----
 test/spec/modules/smartxBidAdapter_spec.js |  2 +-
 3 files changed, 67 insertions(+), 19 deletions(-)

diff --git a/modules/smartxBidAdapter.js b/modules/smartxBidAdapter.js
index 4409e4e9dfb..804b25d1afc 100644
--- a/modules/smartxBidAdapter.js
+++ b/modules/smartxBidAdapter.js
@@ -328,16 +328,49 @@ export const spec = {
 }
 
 function createOutstreamScript(bid) {
-  // const slot = utils.getBidIdParameter('slot', bid.renderer.config.outstream_options);
+  // for SmartPlay 4.12
+  function scPrebidClose(ele, completeCollapsed) {
+    if (completeCollapsed) {
+      document.getElementById(ele.id).style.display = 'none';
+    }
+  }
+
+  const confMinAdWidth = utils.getBidIdParameter('minAdWidth', bid.renderer.config.outstream_options) || 290;
+  const confMaxAdWidth = utils.getBidIdParameter('maxAdWidth', bid.renderer.config.outstream_options) || 900;
+  const confStartOpen = utils.getBidIdParameter('startOpen', bid.renderer.config.outstream_options) || 'false';
+  const confEndingScreen = utils.getBidIdParameter('endingScreen', bid.renderer.config.outstream_options) || 'true';
+  const confHeaderText = utils.getBidIdParameter('headerText', bid.renderer.config.outstream_options) || '';
+  const confSkipOffset = utils.getBidIdParameter('skipOffset', bid.renderer.config.outstream_options) || 0;
+  const confDesiredBitrate = utils.getBidIdParameter('desiredBitrate', bid.renderer.config.outstream_options) || 1600;
+  const elementId = utils.getBidIdParameter('slot', bid.renderer.config.outstream_options) || bid.adUnitCode;
+
+  // for SmartPlay 4.12
+  let initCollapsed = true;
+  let completeCollapsed = true;
+  if (confStartOpen === 'true') {
+    initCollapsed = false;
+  }
+  if (confEndingScreen === 'true') {
+    completeCollapsed = false;
+  }
+
   utils.logMessage('[SMARTX][renderer] Handle SmartX outstream renderer');
-  const elementId = bid.adUnitCode;
+
   let smartPlayObj = {
-    minAdWidth: 290,
-    maxAdWidth: 900,
-    elementLocator: {
-      allowInViewport: false,
-      minimumElementWidth: 290,
-      scanPixelsBelowViewport: 800
+    minAdWidth: confMinAdWidth,
+    maxAdWidth: confMaxAdWidth,
+    headerText: confHeaderText,
+    skipOffset: confSkipOffset,
+    behaviourMatrix: {
+      init: {
+        'collapsed': initCollapsed
+      },
+      complete: {
+        'collapsed': completeCollapsed
+      }
+    },
+    environmentVars: {
+      desiredBitrate: confDesiredBitrate,
     },
     onStartCallback: function (m, n) {
       try {
@@ -351,6 +384,7 @@ function createOutstreamScript(bid) {
     },
     onEndCallback: function (m, n) {
       try {
+        scPrebidClose(n, completeCollapsed); // for SmartPlay 4.12
         window.sc_smartIntxtEnd(n);
       } catch (f) {}
     },
diff --git a/modules/smartxBidAdapter.md b/modules/smartxBidAdapter.md
index a53af839e2b..082a36f3dde 100644
--- a/modules/smartxBidAdapter.md
+++ b/modules/smartxBidAdapter.md
@@ -29,11 +29,18 @@ This adapter requires setup and approval from the smartclip team.
                 publisherId: '11986',
                 siteId: '22860',
                 bidfloor: 0.3,
-                bidfloorcur: "EUR",
+                bidfloorcur: 'EUR',
                 at: 2,
-                cur: ["EUR"],
+                cur: ['EUR'],
                 outstream_options: {
-                    slot: 'video1'
+                    slot: 'video1',
+                    minAdWidth: 290,
+                    maxAdWidth: 900,
+                    headerText: '',
+                    skipOffset: 0,
+                    startOpen: 'true',
+                    endingScreen: 'true',
+                    desiredBitrate: 1600,
                 },
             }
         }],
@@ -57,11 +64,18 @@ This adapter requires setup and approval from the smartclip team.
                 publisherId: '11986',
                 siteId: '22860',
                 bidfloor: 0.3,
-                bidfloorcur: "EUR",
+                bidfloorcur: 'EUR',
                 at: 2,
-                cur: ["EUR"],
+                cur: ['EUR'],
                 outstream_options: {
-                    slot: 'video1'
+                    slot: 'video1',
+                    minAdWidth: 290,
+                    maxAdWidth: 900,
+                    headerText: '',
+                    skipOffset: 0,
+                    startOpen: 'true',
+                    endingScreen: 'true',
+                    desiredBitrate: 1600,
                 },
                 user: {
                     data: [{
@@ -104,9 +118,9 @@ This adapter requires setup and approval from the smartclip team.
                 publisherId: '11986',
                 siteId: '22860',
                 bidfloor: 0.3,
-                bidfloorcur: "EUR",
+                bidfloorcur: 'EUR',
                 at: 2,
-                cur: ["EUR"]
+                cur: ['EUR']
             }
         }],
     }];
@@ -129,9 +143,9 @@ This adapter requires setup and approval from the smartclip team.
                 publisherId: '11986',
                 siteId: '22860',
                 bidfloor: 0.3,
-                bidfloorcur: "EUR",
+                bidfloorcur: 'EUR',
                 at: 2,
-                cur: ["EUR"],
+                cur: ['EUR'],
                 user: {
                     data: [{
                             id: 'emq',
diff --git a/test/spec/modules/smartxBidAdapter_spec.js b/test/spec/modules/smartxBidAdapter_spec.js
index efc6abcc5fa..82c6642bd74 100644
--- a/test/spec/modules/smartxBidAdapter_spec.js
+++ b/test/spec/modules/smartxBidAdapter_spec.js
@@ -493,7 +493,7 @@ describe('The smartx adapter', function () {
       };
     });
 
-    it('should attempt to insert the EASI script', function () {
+    it('should attempt to insert the script', function () {
       var scriptTag;
       sinon.stub(window.document, 'getElementById').returns({
         appendChild: sinon.stub().callsFake(function (script) {

From 11a925d5fb13c48b369155ff4a33ed397b3c5c66 Mon Sep 17 00:00:00 2001
From: SKOCHERI <37454420+SKOCHERI@users.noreply.github.com>
Date: Wed, 3 Feb 2021 22:47:02 -0800
Subject: [PATCH 216/304] Idl1 (#6242)

* Renaming idLibrary to idImportLibrary

* Renaming idLibrary to idImportLibrary

Co-authored-by: skocheri <skocheri@rubiconproject.com>
---
 modules/{idLibrary.js => idImportLibrary.js}       |  2 +-
 modules/{idLibrary.md => idImportLibrary.md}       |  4 ++--
 .../{idLibrary_spec.js => idImportLibrary_spec.js} | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename modules/{idLibrary.js => idImportLibrary.js} (98%)
 rename modules/{idLibrary.md => idImportLibrary.md} (94%)
 rename test/spec/modules/{idLibrary_spec.js => idImportLibrary_spec.js} (82%)

diff --git a/modules/idLibrary.js b/modules/idImportLibrary.js
similarity index 98%
rename from modules/idLibrary.js
rename to modules/idImportLibrary.js
index 0d8616c3f88..2a3a86cf270 100644
--- a/modules/idLibrary.js
+++ b/modules/idImportLibrary.js
@@ -240,4 +240,4 @@ export function setConfig(config) {
   associateIds();
 }
 
-config.getConfig('idLibrary', config => setConfig(config.idLibrary));
+config.getConfig('idImportLibrary', config => setConfig(config.idImportLibrary));
diff --git a/modules/idLibrary.md b/modules/idImportLibrary.md
similarity index 94%
rename from modules/idLibrary.md
rename to modules/idImportLibrary.md
index 28d40c389f3..3dd78ee25d8 100644
--- a/modules/idLibrary.md
+++ b/modules/idImportLibrary.md
@@ -1,4 +1,4 @@
-# ID Library
+# ID Import Library
 
 ## Configuration Options
 
@@ -13,7 +13,7 @@
 
 ```javascript
 pbjs.setConfig({
-    idLibrary: {
+    idImportLibrary: {
         target: 'username',
         url: 'https://example.com',
         debounce: 250,
diff --git a/test/spec/modules/idLibrary_spec.js b/test/spec/modules/idImportLibrary_spec.js
similarity index 82%
rename from test/spec/modules/idLibrary_spec.js
rename to test/spec/modules/idImportLibrary_spec.js
index 682c2df1e44..699c2c43a94 100644
--- a/test/spec/modules/idLibrary_spec.js
+++ b/test/spec/modules/idImportLibrary_spec.js
@@ -1,5 +1,5 @@
 import * as utils from 'src/utils.js';
-import * as idlibrary from 'modules/idLibrary.js';
+import * as idImportlibrary from 'modules/idImportLibrary.js';
 
 var expect = require('chai').expect;
 
@@ -20,7 +20,7 @@ describe('currency', function () {
     utils.logInfo.restore();
     utils.logError.restore();
     fakeCurrencyFileServer.restore();
-    idlibrary.setConfig({});
+    idImportlibrary.setConfig({});
   });
 
   describe('setConfig', function () {
@@ -35,26 +35,26 @@ describe('currency', function () {
     });
 
     it('results when no config available', function () {
-      idlibrary.setConfig({});
+      idImportlibrary.setConfig({});
       sinon.assert.called(utils.logError);
     });
     it('results with config available', function () {
-      idlibrary.setConfig({ 'url': 'URL' });
+      idImportlibrary.setConfig({ 'url': 'URL' });
       sinon.assert.called(utils.logInfo);
     });
     it('results with config default debounce ', function () {
       let config = { 'url': 'URL' }
-      idlibrary.setConfig(config);
+      idImportlibrary.setConfig(config);
       expect(config.debounce).to.be.equal(250);
     });
     it('results with config default fullscan ', function () {
       let config = { 'url': 'URL' }
-      idlibrary.setConfig(config);
+      idImportlibrary.setConfig(config);
       expect(config.fullscan).to.be.equal(false);
     });
     it('results with config fullscan ', function () {
       let config = { 'url': 'URL', 'fullscan': true }
-      idlibrary.setConfig(config);
+      idImportlibrary.setConfig(config);
       expect(config.fullscan).to.be.equal(true);
     });
   });

From 4e1be70d08f2b8e9c038abc1f74c486289f7182f Mon Sep 17 00:00:00 2001
From: Nepomuk Seiler <muuki88@users.noreply.github.com>
Date: Thu, 4 Feb 2021 08:02:27 +0100
Subject: [PATCH 217/304] Add the trade desk gvlid (#6263)

UnifiedId only works with a vendor exception in the gdpr enforcement module.
However this is not okay as the unifiedId matching endpoint doesn't take the consent into account and
cookies are being dropped even without consent.
---
 modules/unifiedIdSystem.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/unifiedIdSystem.js b/modules/unifiedIdSystem.js
index 3db4003c424..bc033f37992 100644
--- a/modules/unifiedIdSystem.js
+++ b/modules/unifiedIdSystem.js
@@ -18,6 +18,10 @@ export const unifiedIdSubmodule = {
    * @type {string}
    */
   name: MODULE_NAME,
+  /**
+   * required for the gdpr enforcement module
+   */
+  gvlid: 21,
   /**
    * decode the stored id value for passing to bid requests
    * @function

From cca20295cd6d217422e0af2c5ce311523a0a9cf6 Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Thu, 4 Feb 2021 03:47:15 -0800
Subject: [PATCH 218/304] pick up wrapper family detail (#6272)

---
 modules/rubiconAnalyticsAdapter.js                | 3 ++-
 test/spec/modules/rubiconAnalyticsAdapter_spec.js | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index 679e86aa0a0..f216cbd6235 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -167,9 +167,10 @@ function sendMessage(auctionId, bidWonId) {
     referrerHostname: rubiconAdapter.referrerHostname || getHostNameFromReferer(referrer),
     channel: 'web',
   };
-  if (rubiConf.wrapperName || rubiConf.rule_name) {
+  if (rubiConf.wrapperName) {
     message.wrapper = {
       name: rubiConf.wrapperName,
+      family: rubiConf.wrapperFamily,
       rule: rubiConf.rule_name
     }
   }
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index 16d25ec400c..71e5446ed06 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -1754,7 +1754,8 @@ describe('rubicon analytics adapter', function () {
   describe('wrapper details passed in', () => {
     it('should correctly pass in the wrapper details if provided', () => {
       config.setConfig({rubicon: {
-        wrapperName: '1001_wrapperName',
+        wrapperName: '1001_wrapperName_exp.4',
+        wrapperFamily: '1001_wrapperName',
         rule_name: 'na-mobile'
       }});
 
@@ -1771,7 +1772,8 @@ describe('rubicon analytics adapter', function () {
       const request = server.requests[0];
       const message = JSON.parse(request.requestBody);
       expect(message.wrapper).to.deep.equal({
-        name: '1001_wrapperName',
+        name: '1001_wrapperName_exp.4',
+        family: '1001_wrapperName',
         rule: 'na-mobile'
       });
 

From da13bdaa09b1725519e38cecaf55d75270c6fb2c Mon Sep 17 00:00:00 2001
From: Adprime <64427228+Adprime@users.noreply.github.com>
Date: Thu, 4 Feb 2021 16:24:51 -0500
Subject: [PATCH 219/304] Add user sync (#6244)

* initial

* fix

* remove redundant language mod, use player sizes in video traff

* test modify

* fix

* Adding Tests

* add keywords param

* log

* log

* log

* fix

* add idl

* add idl

* fix test

* lint

* lint

* fix

* lint

* lint

* lint

* lint

* add sync

* fix

Co-authored-by: Aigolkin1991 <Aigolkin1991@gmail.com>
Co-authored-by: Aiholkin <artem.iholkin@smartyads.com>
---
 modules/adprimeBidAdapter.js                | 20 ++++++++++++++++++++
 test/spec/modules/adprimeBidAdapter_spec.js | 10 ++++++++++
 2 files changed, 30 insertions(+)

diff --git a/modules/adprimeBidAdapter.js b/modules/adprimeBidAdapter.js
index 50303b82979..12d0410a821 100644
--- a/modules/adprimeBidAdapter.js
+++ b/modules/adprimeBidAdapter.js
@@ -4,6 +4,7 @@ import * as utils from '../src/utils.js';
 
 const BIDDER_CODE = 'adprime';
 const AD_URL = 'https://delta.adprime.com/?c=o&m=multi';
+const SYNC_URL = 'https://delta.adprime.com/?c=rtb&m=sync';
 
 function isBidResponseValid(bid) {
   if (!bid.requestId || !bid.cpm || !bid.creativeId ||
@@ -104,6 +105,25 @@ export const spec = {
     }
     return response;
   },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncUrl = SYNC_URL
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+    return [{
+      type: 'image',
+      url: syncUrl
+    }];
+  }
+
 };
 
 registerBidder(spec);
diff --git a/test/spec/modules/adprimeBidAdapter_spec.js b/test/spec/modules/adprimeBidAdapter_spec.js
index fe05634baae..8627941dc80 100644
--- a/test/spec/modules/adprimeBidAdapter_spec.js
+++ b/test/spec/modules/adprimeBidAdapter_spec.js
@@ -284,4 +284,14 @@ describe('AdprimebBidAdapter', function () {
       expect(serverResponses).to.be.an('array').that.is.empty;
     });
   });
+  describe('getUserSyncs', function () {
+    let userSync = spec.getUserSyncs();
+    it('Returns valid URL and type', function () {
+      expect(userSync).to.be.an('array').with.lengthOf(1);
+      expect(userSync[0].type).to.exist;
+      expect(userSync[0].url).to.exist;
+      expect(userSync[0].type).to.be.equal('image');
+      expect(userSync[0].url).to.be.equal('https://delta.adprime.com/?c=rtb&m=sync');
+    });
+  });
 });

From 1cd714f53b48a327c5b134915c965ca982638357 Mon Sep 17 00:00:00 2001
From: shikharsharma-zeotap <shikhar.sharma@zeotap.com>
Date: Fri, 5 Feb 2021 03:01:29 +0530
Subject: [PATCH 220/304] Zeotap id plus gvlid (#6260)

* Add gvlid for ZeotapIdPlus module

* Pass gvlid and module name to storage manager

* add testcases to zeotapIdPlusIdSystem

* remove unwanted code
---
 modules/zeotapIdPlusIdSystem.js               | 20 ++++--
 .../spec/modules/zeotapIdPlusIdSystem_spec.js | 64 ++++++++++++++++++-
 2 files changed, 79 insertions(+), 5 deletions(-)

diff --git a/modules/zeotapIdPlusIdSystem.js b/modules/zeotapIdPlusIdSystem.js
index d800286b00e..8f26cc827d6 100644
--- a/modules/zeotapIdPlusIdSystem.js
+++ b/modules/zeotapIdPlusIdSystem.js
@@ -9,23 +9,35 @@ import {submodule} from '../src/hook.js';
 import { getStorageManager } from '../src/storageManager.js';
 
 const ZEOTAP_COOKIE_NAME = 'IDP';
-export const storage = getStorageManager();
+const ZEOTAP_VENDOR_ID = 301;
+const ZEOTAP_MODULE_NAME = 'zeotapIdPlus';
 
 function readCookie() {
-  return storage.cookiesAreEnabled ? storage.getCookie(ZEOTAP_COOKIE_NAME) : null;
+  return storage.cookiesAreEnabled() ? storage.getCookie(ZEOTAP_COOKIE_NAME) : null;
 }
 
 function readFromLocalStorage() {
-  return storage.localStorageIsEnabled ? storage.getDataFromLocalStorage(ZEOTAP_COOKIE_NAME) : null;
+  return storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(ZEOTAP_COOKIE_NAME) : null;
 }
 
+export function getStorage() {
+  return getStorageManager(ZEOTAP_VENDOR_ID, ZEOTAP_MODULE_NAME);
+}
+
+export const storage = getStorage();
+
 /** @type {Submodule} */
 export const zeotapIdPlusSubmodule = {
   /**
    * used to link submodule with config
    * @type {string}
    */
-  name: 'zeotapIdPlus',
+  name: ZEOTAP_MODULE_NAME,
+  /**
+   * Vendor ID of Zeotap
+   * @type {Number}
+   */
+  gvlid: ZEOTAP_VENDOR_ID,
   /**
    * decode the stored id value for passing to bid requests
    * @function
diff --git a/test/spec/modules/zeotapIdPlusIdSystem_spec.js b/test/spec/modules/zeotapIdPlusIdSystem_spec.js
index 4f9e691f12e..9de6fa843bc 100644
--- a/test/spec/modules/zeotapIdPlusIdSystem_spec.js
+++ b/test/spec/modules/zeotapIdPlusIdSystem_spec.js
@@ -2,7 +2,8 @@ import { expect } from 'chai';
 import find from 'core-js-pure/features/array/find.js';
 import { config } from 'src/config.js';
 import { init, requestBidsHook, setSubmoduleRegistry } from 'modules/userId/index.js';
-import { storage, zeotapIdPlusSubmodule } from 'modules/zeotapIdPlusIdSystem.js';
+import { storage, getStorage, zeotapIdPlusSubmodule } from 'modules/zeotapIdPlusIdSystem.js';
+import * as storageManager from 'src/storageManager.js';
 
 const ZEOTAP_COOKIE_NAME = 'IDP';
 const ZEOTAP_COOKIE = 'THIS-IS-A-DUMMY-COOKIE';
@@ -43,6 +44,67 @@ function unsetLocalStorage() {
 }
 
 describe('Zeotap ID System', function() {
+  describe('Zeotap Module invokes StorageManager with appropriate arguments', function() {
+    let getStorageManagerSpy;
+
+    beforeEach(function() {
+      getStorageManagerSpy = sinon.spy(storageManager, 'getStorageManager');
+    });
+
+    it('when a stored Zeotap ID exists it is added to bids', function() {
+      let store = getStorage();
+      expect(getStorageManagerSpy.calledOnce).to.be.true;
+      sinon.assert.calledWith(getStorageManagerSpy, 301, 'zeotapIdPlus');
+    });
+  });
+
+  describe('test method: getId calls storage methods to fetch ID', function() {
+    let cookiesAreEnabledStub;
+    let getCookieStub;
+    let localStorageIsEnabledStub;
+    let getDataFromLocalStorageStub;
+
+    beforeEach(() => {
+      cookiesAreEnabledStub = sinon.stub(storage, 'cookiesAreEnabled');
+      getCookieStub = sinon.stub(storage, 'getCookie');
+      localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+      getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    });
+
+    afterEach(() => {
+      storage.cookiesAreEnabled.restore();
+      storage.getCookie.restore();
+      storage.localStorageIsEnabled.restore();
+      storage.getDataFromLocalStorage.restore();
+      unsetCookie();
+      unsetLocalStorage();
+    });
+
+    it('should check if cookies are enabled', function() {
+      let id = zeotapIdPlusSubmodule.getId();
+      expect(cookiesAreEnabledStub.calledOnce).to.be.true;
+    });
+
+    it('should call getCookie if cookies are enabled', function() {
+      cookiesAreEnabledStub.returns(true);
+      let id = zeotapIdPlusSubmodule.getId();
+      expect(cookiesAreEnabledStub.calledOnce).to.be.true;
+      expect(getCookieStub.calledOnce).to.be.true;
+      sinon.assert.calledWith(getCookieStub, 'IDP');
+    });
+
+    it('should check for localStorage if cookies are disabled', function() {
+      cookiesAreEnabledStub.returns(false);
+      localStorageIsEnabledStub.returns(true)
+      let id = zeotapIdPlusSubmodule.getId();
+      expect(cookiesAreEnabledStub.calledOnce).to.be.true;
+      expect(getCookieStub.called).to.be.false;
+      expect(localStorageIsEnabledStub.calledOnce).to.be.true;
+      expect(getDataFromLocalStorageStub.calledOnce).to.be.true;
+      sinon.assert.calledWith(getDataFromLocalStorageStub, 'IDP');
+    });
+  });
+
   describe('test method: getId', function() {
     afterEach(() => {
       unsetCookie();

From da1a6e9b284a088439b0b5442fcb252dad42d585 Mon Sep 17 00:00:00 2001
From: nyakove <43004249+nyakove@users.noreply.github.com>
Date: Thu, 4 Feb 2021 23:39:00 +0200
Subject: [PATCH 221/304] adWMG adapter: add new parameter, fix minor bugs
 (#6265)

* Support floorCPM parameter, fix some minor bugs

* fix space-in-parens circleci error

* example fix

* clean usersync URL

* spaces

* spaces

* add new unit tests, compatibility with IE11

* remove logInfo

Co-authored-by: Mikhail Dykun <m.dykun@wmgroup.us>
---
 modules/adWMGBidAdapter.js                |  8 +++--
 modules/adWMGBidAdapter.md                |  9 ++---
 test/spec/modules/adWMGBidAdapter_spec.js | 40 +++++++++++++++++++++++
 3 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/modules/adWMGBidAdapter.js b/modules/adWMGBidAdapter.js
index 3a0a8a22274..87c40db51e6 100644
--- a/modules/adWMGBidAdapter.js
+++ b/modules/adWMGBidAdapter.js
@@ -113,14 +113,18 @@ export const spec = {
     return bidResponses;
   },
   getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    if (gdprConsent) {
+    if (gdprConsent && SYNC_ENDPOINT.indexOf('gdpr') === -1) {
       SYNC_ENDPOINT = utils.tryAppendQueryString(SYNC_ENDPOINT, 'gdpr', (gdprConsent.gdprApplies ? 1 : 0));
     }
 
-    if (gdprConsent && typeof gdprConsent.consentString === 'string') {
+    if (gdprConsent && typeof gdprConsent.consentString === 'string' && SYNC_ENDPOINT.indexOf('gdpr_consent') === -1) {
       SYNC_ENDPOINT = utils.tryAppendQueryString(SYNC_ENDPOINT, 'gdpr_consent', gdprConsent.consentString);
     }
 
+    if (SYNC_ENDPOINT.slice(-1) === '&') {
+      SYNC_ENDPOINT = SYNC_ENDPOINT.slice(0, -1);
+    }
+
     /*     if (uspConsent) {
       SYNC_ENDPOINT = utils.tryAppendQueryString(SYNC_ENDPOINT, 'us_privacy', uspConsent);
     } */
diff --git a/modules/adWMGBidAdapter.md b/modules/adWMGBidAdapter.md
index 8c277b803db..ec5541e6168 100644
--- a/modules/adWMGBidAdapter.md
+++ b/modules/adWMGBidAdapter.md
@@ -12,10 +12,11 @@ Module that connects to adWMG demand sources to fetch bids. Supports 'banner' ad
 
 # Bid Parameters
 
-| Key | Required | Example | Description |
-| --- | -------- | ------- | ----------- |
-| `publisherId` | yes | `'5cebea3c9eea646c7b623d5e'` | publisher ID from WMG Dashboard |
-| `IABCategories` | no | `['IAB1', 'IAB5']` | IAB ad categories for adUnit |
+| Key             | Required | Example                      | Description                     |
+| --------------- | -------- | -----------------------------| ------------------------------- |
+| `publisherId`   | yes      | `'5cebea3c9eea646c7b623d5e'` | publisher ID from WMG Dashboard |
+| `IABCategories` | no       | `['IAB1', 'IAB5']`           | IAB ad categories for adUnit    |
+| `floorCPM`      | no       | `0.5`                        | Floor price for adUnit          |
 
 
 # Test Parameters
diff --git a/test/spec/modules/adWMGBidAdapter_spec.js b/test/spec/modules/adWMGBidAdapter_spec.js
index 5c2364d454c..1f881897fd8 100644
--- a/test/spec/modules/adWMGBidAdapter_spec.js
+++ b/test/spec/modules/adWMGBidAdapter_spec.js
@@ -288,5 +288,45 @@ describe('adWMGBidAdapter', function () {
       expect(syncs[0].url).includes('gdpr=1');
       expect(syncs[0].url).includes(`gdpr_consent=${gdprConsent.consentString}`);
     });
+
+    it('should not add GDPR consent params twice', function() {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': true
+      };
+      const gdprConsent = {
+        consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      };
+      const gdprConsent2 = {
+        consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_7_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      };
+      const serverResponse = {};
+      let syncs = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent);
+      syncs = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent2);
+      expect(syncs[0].url.match(/gdpr/g).length).to.equal(2); // gdpr + gdpr_consent
+      expect(syncs[0].url.match(/gdpr_consent/g).length).to.equal(1);
+    });
+
+    it('should delete \'&\' symbol at the end of usersync URL', function() {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': true
+      };
+      const gdprConsent = {
+        consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      };
+      const serverResponse = {};
+      let syncs = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent);
+      expect(syncs[0].url.slice(-1)).to.not.equal('&');
+    });
   });
 });

From 0a333497fe3d2cff6be93cb6cc465eaef3eb23a3 Mon Sep 17 00:00:00 2001
From: Ian Flournoy <ian@flournoy.us>
Date: Thu, 4 Feb 2021 17:02:02 -0500
Subject: [PATCH 222/304] [ParrableIdSystem] Supply iframe state to backend
 (#6278)

* Add iframe detection

* Remove forgotten .only

Co-authored-by: Victor <victorigualada@gmail.com>
---
 modules/parrableIdSystem.js                | 3 ++-
 test/spec/modules/parrableIdSystem_spec.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/parrableIdSystem.js b/modules/parrableIdSystem.js
index 9aa2b251f2c..32543e3863b 100644
--- a/modules/parrableIdSystem.js
+++ b/modules/parrableIdSystem.js
@@ -187,7 +187,8 @@ function fetchId(configParams) {
   const data = {
     eid,
     trackers: configParams.partner.split(','),
-    url: refererInfo.referer
+    url: refererInfo.referer,
+    isIframe: utils.inIframe(),
   };
 
   const searchParams = {
diff --git a/test/spec/modules/parrableIdSystem_spec.js b/test/spec/modules/parrableIdSystem_spec.js
index 046ab3a4005..f4f485affe9 100644
--- a/test/spec/modules/parrableIdSystem_spec.js
+++ b/test/spec/modules/parrableIdSystem_spec.js
@@ -116,7 +116,8 @@ describe('Parrable ID System', function() {
         expect(data).to.deep.equal({
           eid: P_COOKIE_EID,
           trackers: P_CONFIG_MOCK.params.partner.split(','),
-          url: getRefererInfo().referer
+          url: getRefererInfo().referer,
+          isIframe: true
         });
 
         server.requests[0].respond(200,

From 8f776608ac1adcd2f909db78cdd67c73f8fa0515 Mon Sep 17 00:00:00 2001
From: Harshad Mane <harshad.mane@pubmatic.com>
Date: Fri, 5 Feb 2021 11:48:58 -0800
Subject: [PATCH 223/304] Bid Viewability Module (#6206)

* introducing a new event, bidViewable

* new module: bidViewability

* details in bidViewability.md
---
 modules/bidViewability.js                  |  97 +++++++
 modules/bidViewability.md                  |  49 ++++
 src/adapterManager.js                      |   4 +
 src/constants.json                         |   3 +-
 test/spec/modules/bidViewability_spec.js   | 297 +++++++++++++++++++++
 test/spec/unit/core/adapterManager_spec.js |  32 +++
 6 files changed, 481 insertions(+), 1 deletion(-)
 create mode 100644 modules/bidViewability.js
 create mode 100644 modules/bidViewability.md
 create mode 100644 test/spec/modules/bidViewability_spec.js

diff --git a/modules/bidViewability.js b/modules/bidViewability.js
new file mode 100644
index 00000000000..c3b72cda8d4
--- /dev/null
+++ b/modules/bidViewability.js
@@ -0,0 +1,97 @@
+// This module, when included, will trigger a BID_VIEWABLE event which can be consumed by Bidders and Analytics adapters
+// GPT API is used to find when a bid is viewable, https://developers.google.com/publisher-tag/reference#googletag.events.impressionviewableevent
+// Does not work with other than GPT integration
+
+import { config } from '../src/config.js';
+import * as events from '../src/events.js';
+import { EVENTS } from '../src/constants.json';
+import { logWarn, isFn, triggerPixel } from '../src/utils.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+import adapterManager, { gdprDataHandler, uspDataHandler } from '../src/adapterManager.js';
+import find from 'core-js-pure/features/array/find.js';
+
+const MODULE_NAME = 'bidViewability';
+const CONFIG_ENABLED = 'enabled';
+const CONFIG_FIRE_PIXELS = 'firePixels';
+const CONFIG_CUSTOM_MATCH = 'customMatchFunction';
+const BID_VURL_ARRAY = 'vurls';
+const GPT_IMPRESSION_VIEWABLE_EVENT = 'impressionViewable';
+
+export let isBidAdUnitCodeMatchingSlot = (bid, slot) => {
+  return (slot.getAdUnitPath() === bid.adUnitCode || slot.getSlotElementId() === bid.adUnitCode);
+}
+
+export let getMatchingWinningBidForGPTSlot = (globalModuleConfig, slot) => {
+  return find(getGlobal().getAllWinningBids(),
+    // supports custom match function from config
+    bid => isFn(globalModuleConfig[CONFIG_CUSTOM_MATCH])
+      ? globalModuleConfig[CONFIG_CUSTOM_MATCH](bid, slot)
+      : isBidAdUnitCodeMatchingSlot(bid, slot)
+  ) || null;
+};
+
+export let fireViewabilityPixels = (globalModuleConfig, bid) => {
+  if (globalModuleConfig[CONFIG_FIRE_PIXELS] === true && bid.hasOwnProperty(BID_VURL_ARRAY)) {
+    let queryParams = {};
+
+    const gdprConsent = gdprDataHandler.getConsentData();
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') { queryParams.gdpr = Number(gdprConsent.gdprApplies); }
+      if (gdprConsent.consentString) { queryParams.gdpr_consent = gdprConsent.consentString; }
+      if (gdprConsent.addtlConsent) { queryParams.addtl_consent = gdprConsent.addtlConsent; }
+    }
+
+    const uspConsent = uspDataHandler.getConsentData();
+    if (uspConsent) { queryParams.us_privacy = uspConsent; }
+
+    bid[BID_VURL_ARRAY].forEach(url => {
+      // add '?' if not present in URL
+      if (Object.keys(queryParams).length > 0 && url.indexOf('?') === -1) {
+        url += '?';
+      }
+      // append all query params, `&key=urlEncoded(value)`
+      url += Object.keys(queryParams).reduce((prev, key) => prev += `&${key}=${encodeURIComponent(queryParams[key])}`, '');
+      triggerPixel(url)
+    });
+  }
+};
+
+export let logWinningBidNotFound = (slot) => {
+  logWarn(`bid details could not be found for ${slot.getSlotElementId()}, probable reasons: a non-prebid bid is served OR check the prebid.AdUnit.code to GPT.AdSlot relation.`);
+};
+
+export let impressionViewableHandler = (globalModuleConfig, slot, event) => {
+  let respectiveBid = getMatchingWinningBidForGPTSlot(globalModuleConfig, slot);
+  if (respectiveBid === null) {
+    logWinningBidNotFound(slot);
+  } else {
+    // if config is enabled AND VURL array is present then execute each pixel
+    fireViewabilityPixels(globalModuleConfig, respectiveBid);
+    // trigger respective bidder's onBidViewable handler
+    adapterManager.callBidViewableBidder(respectiveBid.bidder, respectiveBid);
+    // emit the BID_VIEWABLE event with bid details, this event can be consumed by bidders and analytics pixels
+    events.emit(EVENTS.BID_VIEWABLE, respectiveBid);
+  }
+};
+
+export let init = () => {
+  events.on(EVENTS.AUCTION_INIT, () => {
+    // read the config for the module
+    const globalModuleConfig = config.getConfig(MODULE_NAME) || {};
+    // do nothing if module-config.enabled is not set to true
+    // this way we are adding a way for bidders to know (using pbjs.getConfig('bidViewability').enabled === true) whether this module is added in build and is enabled
+    if (globalModuleConfig[CONFIG_ENABLED] !== true) {
+      return;
+    }
+    // add the GPT event listener
+    window.googletag = window.googletag || {};
+    window.googletag.cmd = window.googletag.cmd || [];
+    window.googletag.cmd.push(() => {
+      window.googletag.pubads().addEventListener(GPT_IMPRESSION_VIEWABLE_EVENT, function(event) {
+        impressionViewableHandler(globalModuleConfig, event.slot, event);
+      });
+    });
+  });
+}
+
+init()
diff --git a/modules/bidViewability.md b/modules/bidViewability.md
new file mode 100644
index 00000000000..78a1539fb1a
--- /dev/null
+++ b/modules/bidViewability.md
@@ -0,0 +1,49 @@
+# Overview
+
+Module Name: bidViewability
+
+Purpose: Track when a bid is viewable
+
+Maintainer: harshad.mane@pubmatic.com
+
+# Description
+- This module, when included, will trigger a BID_VIEWABLE event which can be consumed by Analytics adapters, bidders will need to implement `onBidViewable` method to capture this event
+- Bidderes can check if this module is part of the final build and whether it is enabled or not by accessing ```pbjs.getConfig('bidViewability')```
+- GPT API is used to find when a bid is viewable, https://developers.google.com/publisher-tag/reference#googletag.events.impressionviewableevent . This event is fired when an impression becomes viewable, according to the Active View criteria.
+Refer: https://support.google.com/admanager/answer/4524488
+- The module does not work with adserver other than GAM with GPT integration
+- Logic used to find a matching pbjs-bid for a GPT slot is ``` (slot.getAdUnitPath() === bid.adUnitCode || slot.getSlotElementId() === bid.adUnitCode) ``` this logic can be changed by using param ```customMatchFunction```
+- When a rendered PBJS bid is viewable the module will trigger BID_VIEWABLE event, which can be consumed by bidders and analytics adapters
+- For the viewable bid if ```bid.vurls type array``` param is and module config ``` firePixels: true ``` is set then the URLs mentioned in bid.vurls will be executed. Please note that GDPR and USP related parameters will be added to the given URLs
+
+# Params
+- enabled [required] [type: boolean, default: false], when set to true, the module will emit BID_VIEWABLE when applicable
+- firePixels [optional] [type: boolean], when set to true, will fire the urls mentioned in bid.vurls which should be array of urls
+- customMatchFunction [optional] [type: function(bid, slot)], when passed this function will be used to `find` the matching winning bid for the GPT slot. Default value is ` (bid, slot) => (slot.getAdUnitPath() === bid.adUnitCode || slot.getSlotElementId() === bid.adUnitCode) `
+
+# Example of consuming BID_VIEWABLE event
+```
+	pbjs.onEvent('bidViewable', function(bid){
+		console.log('got bid details in bidViewable event', bid);
+	});
+
+```
+
+# Example of using config
+```
+	pbjs.setConfig({
+        bidViewability: {
+            enabled: true,
+            firePixels: true,
+            customMatchFunction: function(bid, slot){
+                console.log('using custom match function....');
+                return bid.adUnitCode === slot.getAdUnitPath();
+            }
+        }
+    });
+```
+
+# Please Note:
+- Doesn't seems to work with Instream Video, https://docs.prebid.org/dev-docs/examples/instream-banner-mix.html as GPT's impressionViewable event is not triggered for instream-video-creative
+- Works with Banner, Outsteam, Native creatives
+
diff --git a/src/adapterManager.js b/src/adapterManager.js
index 9c3ef7ac1d1..cb84607e130 100644
--- a/src/adapterManager.js
+++ b/src/adapterManager.js
@@ -606,4 +606,8 @@ adapterManager.callSetTargetingBidder = function(bidder, bid) {
   tryCallBidderMethod(bidder, 'onSetTargeting', bid);
 };
 
+adapterManager.callBidViewableBidder = function(bidder, bid) {
+  tryCallBidderMethod(bidder, 'onBidViewable', bid);
+};
+
 export default adapterManager;
diff --git a/src/constants.json b/src/constants.json
index 4025e084682..e6b9687f911 100644
--- a/src/constants.json
+++ b/src/constants.json
@@ -38,7 +38,8 @@
     "ADD_AD_UNITS": "addAdUnits",
     "AD_RENDER_FAILED": "adRenderFailed",
     "TCF2_ENFORCEMENT": "tcf2Enforcement",
-    "AUCTION_DEBUG": "auctionDebug"
+    "AUCTION_DEBUG": "auctionDebug",
+    "BID_VIEWABLE": "bidViewable"
   },
   "AD_RENDER_FAILED_REASON" : {
     "PREVENT_WRITING_ON_MAIN_DOCUMENT": "preventWritingOnMainDocument",
diff --git a/test/spec/modules/bidViewability_spec.js b/test/spec/modules/bidViewability_spec.js
new file mode 100644
index 00000000000..211dec090a5
--- /dev/null
+++ b/test/spec/modules/bidViewability_spec.js
@@ -0,0 +1,297 @@
+import * as bidViewability from 'modules/bidViewability.js';
+import { config } from 'src/config.js';
+import * as events from 'src/events.js';
+import * as utils from 'src/utils.js';
+import * as sinon from 'sinon';
+import {expect, spy} from 'chai';
+import * as prebidGlobal from 'src/prebidGlobal.js';
+import { EVENTS } from 'src/constants.json';
+import adapterManager, { gdprDataHandler, uspDataHandler } from 'src/adapterManager.js';
+import parse from 'url-parse';
+
+const GPT_SLOT = {
+  getAdUnitPath() {
+    return '/harshad/Jan/2021/';
+  },
+
+  getSlotElementId() {
+    return 'DIV-1';
+  }
+};
+
+const PBJS_WINNING_BID = {
+  'adUnitCode': '/harshad/Jan/2021/',
+  'bidderCode': 'pubmatic',
+  'bidder': 'pubmatic',
+  'width': 300,
+  'height': 250,
+  'statusMessage': 'Bid available',
+  'adId': 'id',
+  'requestId': 1024,
+  'source': 'client',
+  'no_bid': false,
+  'cpm': '1.1495',
+  'ttl': 180,
+  'creativeId': 'id',
+  'netRevenue': true,
+  'currency': 'USD',
+  'vurls': [
+    'https://domain-1.com/end-point?a=1',
+    'https://domain-2.com/end-point/',
+    'https://domain-3.com/end-point?a=1'
+  ]
+};
+
+describe('#bidViewability', function() {
+  let gptSlot;
+  let pbjsWinningBid;
+
+  beforeEach(function() {
+    gptSlot = Object.assign({}, GPT_SLOT);
+    pbjsWinningBid = Object.assign({}, PBJS_WINNING_BID);
+  });
+
+  describe('isBidAdUnitCodeMatchingSlot', function() {
+    it('match found by GPT Slot getAdUnitPath', function() {
+      expect(bidViewability.isBidAdUnitCodeMatchingSlot(pbjsWinningBid, gptSlot)).to.equal(true);
+    });
+
+    it('match found by GPT Slot getSlotElementId', function() {
+      pbjsWinningBid.adUnitCode = 'DIV-1';
+      expect(bidViewability.isBidAdUnitCodeMatchingSlot(pbjsWinningBid, gptSlot)).to.equal(true);
+    });
+
+    it('match not found', function() {
+      pbjsWinningBid.adUnitCode = 'DIV-10';
+      expect(bidViewability.isBidAdUnitCodeMatchingSlot(pbjsWinningBid, gptSlot)).to.equal(false);
+    });
+  });
+
+  describe('getMatchingWinningBidForGPTSlot', function() {
+    let winningBidsArray;
+    let sandbox
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      // mocking winningBidsArray
+      winningBidsArray = [];
+      sandbox.stub(prebidGlobal, 'getGlobal').returns({
+        getAllWinningBids: function (number) {
+          return winningBidsArray;
+        }
+      });
+    });
+
+    afterEach(function() {
+      sandbox.restore();
+    })
+
+    it('should find a match by using customMatchFunction provided in config', function() {
+      // Needs config to be passed with customMatchFunction
+      let bidViewabilityConfig = {
+        customMatchFunction(bid, slot) {
+          return ('AD-' + slot.getAdUnitPath()) === bid.adUnitCode;
+        }
+      };
+      let newWinningBid = Object.assign({}, PBJS_WINNING_BID, {adUnitCode: 'AD-' + PBJS_WINNING_BID.adUnitCode});
+      // Needs pbjs.getWinningBids to be implemented with match
+      winningBidsArray.push(newWinningBid);
+      let wb = bidViewability.getMatchingWinningBidForGPTSlot(bidViewabilityConfig, gptSlot);
+      expect(wb).to.deep.equal(newWinningBid);
+    });
+
+    it('should NOT find a match by using customMatchFunction provided in config', function() {
+      // Needs config to be passed with customMatchFunction
+      let bidViewabilityConfig = {
+        customMatchFunction(bid, slot) {
+          return ('AD-' + slot.getAdUnitPath()) === bid.adUnitCode;
+        }
+      };
+      // Needs pbjs.getWinningBids to be implemented without match; winningBidsArray is set to empty in beforeEach
+      let wb = bidViewability.getMatchingWinningBidForGPTSlot(bidViewabilityConfig, gptSlot);
+      expect(wb).to.equal(null);
+    });
+
+    it('should find a match by using default matching function', function() {
+      // Needs config to be passed without customMatchFunction
+      // Needs pbjs.getWinningBids to be implemented with match
+      winningBidsArray.push(PBJS_WINNING_BID);
+      let wb = bidViewability.getMatchingWinningBidForGPTSlot({}, gptSlot);
+      expect(wb).to.deep.equal(PBJS_WINNING_BID);
+    });
+
+    it('should NOT find a match by using default matching function', function() {
+      // Needs config to be passed without customMatchFunction
+      // Needs pbjs.getWinningBids to be implemented without match; winningBidsArray is set to empty in beforeEach
+      let wb = bidViewability.getMatchingWinningBidForGPTSlot({}, gptSlot);
+      expect(wb).to.equal(null);
+    });
+  });
+
+  describe('fireViewabilityPixels', function() {
+    let sandbox;
+    let triggerPixelSpy;
+
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      triggerPixelSpy = sandbox.spy(utils, ['triggerPixel']);
+    });
+
+    afterEach(function() {
+      sandbox.restore();
+    });
+
+    it('DO NOT fire pixels if NOT mentioned in module config', function() {
+      let moduleConfig = {};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      expect(triggerPixelSpy.callCount).to.equal(0);
+    });
+
+    it('fire pixels if mentioned in module config', function() {
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0]).to.equal(url);
+      });
+    });
+
+    it('USP: should include the us_privacy key when USP Consent is available', function () {
+      let uspDataHandlerStub = sinon.stub(uspDataHandler, 'getConsentData');
+      uspDataHandlerStub.returns('1YYY');
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0].indexOf(url)).to.equal(0);
+        const testurl = parse(call.args[0]);
+        const queryObject = utils.parseQS(testurl.query);
+        expect(queryObject.us_privacy).to.equal('1YYY');
+      });
+      uspDataHandlerStub.restore();
+    });
+
+    it('USP: should not include the us_privacy key when USP Consent is not available', function () {
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0].indexOf(url)).to.equal(0);
+        const testurl = parse(call.args[0]);
+        const queryObject = utils.parseQS(testurl.query);
+        expect(queryObject.us_privacy).to.equal(undefined);
+      });
+    });
+
+    it('GDPR: should include the GDPR keys when GDPR Consent is available', function() {
+      let gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
+      gdprDataHandlerStub.returns({
+        gdprApplies: true,
+        consentString: 'consent',
+        addtlConsent: 'moreConsent'
+      });
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0].indexOf(url)).to.equal(0);
+        const testurl = parse(call.args[0]);
+        const queryObject = utils.parseQS(testurl.query);
+        expect(queryObject.gdpr).to.equal('1');
+        expect(queryObject.gdpr_consent).to.equal('consent');
+        expect(queryObject.addtl_consent).to.equal('moreConsent');
+      });
+      gdprDataHandlerStub.restore();
+    });
+
+    it('GDPR: should not include the GDPR keys when GDPR Consent is not available', function () {
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0].indexOf(url)).to.equal(0);
+        const testurl = parse(call.args[0]);
+        const queryObject = utils.parseQS(testurl.query);
+        expect(queryObject.gdpr).to.equal(undefined);
+        expect(queryObject.gdpr_consent).to.equal(undefined);
+        expect(queryObject.addtl_consent).to.equal(undefined);
+      });
+    });
+
+    it('GDPR: should only include the GDPR keys for GDPR Consent fields with values', function () {
+      let gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
+      gdprDataHandlerStub.returns({
+        gdprApplies: true,
+        consentString: 'consent'
+      });
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0].indexOf(url)).to.equal(0);
+        const testurl = parse(call.args[0]);
+        const queryObject = utils.parseQS(testurl.query);
+        expect(queryObject.gdpr).to.equal('1');
+        expect(queryObject.gdpr_consent).to.equal('consent');
+        expect(queryObject.addtl_consent).to.equal(undefined);
+      });
+      gdprDataHandlerStub.restore();
+    })
+  });
+
+  describe('impressionViewableHandler', function() {
+    let sandbox;
+    let triggerPixelSpy;
+    let eventsEmitSpy;
+    let logWinningBidNotFoundSpy;
+    let callBidViewableBidderSpy;
+    let winningBidsArray;
+
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      triggerPixelSpy = sandbox.spy(utils, ['triggerPixel']);
+      eventsEmitSpy = sandbox.spy(events, ['emit']);
+      callBidViewableBidderSpy = sandbox.spy(adapterManager, ['callBidViewableBidder']);
+      // mocking winningBidsArray
+      winningBidsArray = [];
+      sandbox.stub(prebidGlobal, 'getGlobal').returns({
+        getAllWinningBids: function (number) {
+          return winningBidsArray;
+        }
+      });
+    });
+
+    afterEach(function() {
+      sandbox.restore();
+    })
+
+    it('matching winning bid is found', function() {
+      let moduleConfig = {
+        firePixels: true
+      };
+      winningBidsArray.push(PBJS_WINNING_BID);
+      bidViewability.impressionViewableHandler(moduleConfig, GPT_SLOT, null);
+      // fire pixels should be called
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0]).to.equal(url);
+      });
+      // adapterManager.callBidViewableBidder is called with required args
+      let call = callBidViewableBidderSpy.getCall(0);
+      expect(call.args[0]).to.equal(PBJS_WINNING_BID.bidder);
+      expect(call.args[1]).to.deep.equal(PBJS_WINNING_BID);
+      // EVENTS.BID_VIEWABLE is triggered
+      call = eventsEmitSpy.getCall(0);
+      expect(call.args[0]).to.equal(EVENTS.BID_VIEWABLE);
+      expect(call.args[1]).to.deep.equal(PBJS_WINNING_BID);
+    });
+
+    it('matching winning bid is NOT found', function() {
+      // fire pixels should NOT be called
+      expect(triggerPixelSpy.callCount).to.equal(0);
+      // adapterManager.callBidViewableBidder is NOT called
+      expect(callBidViewableBidderSpy.callCount).to.equal(0);
+      // EVENTS.BID_VIEWABLE is NOT triggered
+      expect(eventsEmitSpy.callCount).to.equal(0);
+    });
+  });
+});
diff --git a/test/spec/unit/core/adapterManager_spec.js b/test/spec/unit/core/adapterManager_spec.js
index 00a0579e676..25b2307b943 100644
--- a/test/spec/unit/core/adapterManager_spec.js
+++ b/test/spec/unit/core/adapterManager_spec.js
@@ -404,6 +404,38 @@ describe('adapterManager tests', function () {
     });
   }); // end onSetTargeting
 
+  describe('onBidViewable', function () {
+    var criteoSpec = { onBidViewable: sinon.stub() }
+    var criteoAdapter = {
+      bidder: 'criteo',
+      getSpec: function() { return criteoSpec; }
+    }
+    before(function () {
+      config.setConfig({s2sConfig: { enabled: false }});
+    });
+
+    beforeEach(function () {
+      adapterManager.bidderRegistry['criteo'] = criteoAdapter;
+    });
+
+    afterEach(function () {
+      delete adapterManager.bidderRegistry['criteo'];
+    });
+
+    it('should call spec\'s onBidViewable callback when callBidViewableBidder is called', function () {
+      const bids = [
+        {bidder: 'criteo', params: {placementId: 'id'}},
+      ];
+      const adUnits = [{
+        code: 'adUnit-code',
+        sizes: [[728, 90]],
+        bids
+      }];
+      adapterManager.callBidViewableBidder(bids[0].bidder, bids[0]);
+      sinon.assert.called(criteoSpec.onBidViewable);
+    });
+  }); // end onBidViewable
+
   describe('S2S tests', function () {
     beforeEach(function () {
       config.setConfig({s2sConfig: CONFIG});

From 8d464b6715bf5995bb9ea455bf370cee61f743e7 Mon Sep 17 00:00:00 2001
From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com>
Date: Fri, 5 Feb 2021 15:05:10 -0500
Subject: [PATCH 224/304] disable webdriver tests in trionBidAdapter spec
 (#6280)

---
 test/spec/modules/trionBidAdapter_spec.js | 82 +++++++++++------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/test/spec/modules/trionBidAdapter_spec.js b/test/spec/modules/trionBidAdapter_spec.js
index 596e8a3e2d9..ae329b4a028 100644
--- a/test/spec/modules/trionBidAdapter_spec.js
+++ b/test/spec/modules/trionBidAdapter_spec.js
@@ -146,47 +146,47 @@ describe('Trion adapter tests', function () {
       expect(bidUrlParams).to.include(getPublisherUrl());
     });
 
-    describe('webdriver', function () {
-      let originalWD;
-
-      beforeEach(function () {
-        originalWD = window.navigator.webdriver;
-      });
-
-      afterEach(function () {
-        window.navigator['__defineGetter__']('webdriver', function () {
-          return originalWD;
-        });
-      });
-
-      describe('is present', function () {
-        beforeEach(function () {
-          window.navigator['__defineGetter__']('webdriver', function () {
-            return 1;
-          });
-        });
-
-        it('when there is non human traffic', function () {
-          let bidRequests = spec.buildRequests(TRION_BID_REQUEST);
-          let bidUrlParams = bidRequests[0].data;
-          expect(bidUrlParams).to.include('tr_wd=1');
-        });
-      });
-
-      describe('is not present', function () {
-        beforeEach(function () {
-          window.navigator['__defineGetter__']('webdriver', function () {
-            return 0;
-          });
-        });
-
-        it('when there is not non human traffic', function () {
-          let bidRequests = spec.buildRequests(TRION_BID_REQUEST);
-          let bidUrlParams = bidRequests[0].data;
-          expect(bidUrlParams).to.include('tr_wd=0');
-        });
-      });
-    });
+    // describe('webdriver', function () {
+    //   let originalWD;
+
+    //   beforeEach(function () {
+    //     originalWD = window.navigator.webdriver;
+    //   });
+
+    //   afterEach(function () {
+    //     window.navigator['__defineGetter__']('webdriver', function () {
+    //       return originalWD;
+    //     });
+    //   });
+
+    //   describe('is present', function () {
+    //     beforeEach(function () {
+    //       window.navigator['__defineGetter__']('webdriver', function () {
+    //         return 1;
+    //       });
+    //     });
+
+    //     it('when there is non human traffic', function () {
+    //       let bidRequests = spec.buildRequests(TRION_BID_REQUEST);
+    //       let bidUrlParams = bidRequests[0].data;
+    //       expect(bidUrlParams).to.include('tr_wd=1');
+    //     });
+    //   });
+
+    //   describe('is not present', function () {
+    //     beforeEach(function () {
+    //       window.navigator['__defineGetter__']('webdriver', function () {
+    //         return 0;
+    //       });
+    //     });
+
+    //     it('when there is not non human traffic', function () {
+    //       let bidRequests = spec.buildRequests(TRION_BID_REQUEST);
+    //       let bidUrlParams = bidRequests[0].data;
+    //       expect(bidUrlParams).to.include('tr_wd=0');
+    //     });
+    //   });
+    // });
 
     describe('document', function () {
       let originalHD;

From ccd570bf76e13cc753f39ffe20465bfcdbb5f820 Mon Sep 17 00:00:00 2001
From: Ian Flournoy <ian@flournoy.us>
Date: Fri, 5 Feb 2021 15:08:30 -0500
Subject: [PATCH 225/304] [ParrableIdSystem] Supply Prebid library version to
 backend (#6279)

* Add prebid version to data object

* Renamed prebid to prebidVersion

* Fix missing coma

Co-authored-by: Victor <victorigualada@gmail.com>
---
 modules/parrableIdSystem.js                | 3 ++-
 test/spec/modules/parrableIdSystem_spec.js | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/parrableIdSystem.js b/modules/parrableIdSystem.js
index 32543e3863b..237708aec57 100644
--- a/modules/parrableIdSystem.js
+++ b/modules/parrableIdSystem.js
@@ -188,7 +188,8 @@ function fetchId(configParams) {
     eid,
     trackers: configParams.partner.split(','),
     url: refererInfo.referer,
-    isIframe: utils.inIframe(),
+    prebidVersion: '$prebid.version$',
+    isIframe: utils.inIframe()
   };
 
   const searchParams = {
diff --git a/test/spec/modules/parrableIdSystem_spec.js b/test/spec/modules/parrableIdSystem_spec.js
index f4f485affe9..9db5df2a518 100644
--- a/test/spec/modules/parrableIdSystem_spec.js
+++ b/test/spec/modules/parrableIdSystem_spec.js
@@ -117,6 +117,7 @@ describe('Parrable ID System', function() {
           eid: P_COOKIE_EID,
           trackers: P_CONFIG_MOCK.params.partner.split(','),
           url: getRefererInfo().referer,
+          prebidVersion: '$prebid.version$',
           isIframe: true
         });
 

From 86516aba8a6341cd6a82393c15438d0d73446d38 Mon Sep 17 00:00:00 2001
From: Ian Flournoy <ian@flournoy.us>
Date: Fri, 5 Feb 2021 15:11:36 -0500
Subject: [PATCH 226/304] [ParrableIdSystem] Accept list of partners as an
 array or string (#6277)

* Accept partners as an array and fallthrough partner if no partners

* Ensure that Parrable data object decodes with urlsafe base64 in tests

* Fixed tests caused by typo in config property

* Fix failing test due to accessing unexisting property 'partner'

Co-authored-by: Victor <victorigualada@gmail.com>
---
 modules/parrableIdSystem.js                |  8 +-
 test/spec/modules/parrableIdSystem_spec.js | 89 ++++++++++++++++------
 2 files changed, 72 insertions(+), 25 deletions(-)

diff --git a/modules/parrableIdSystem.js b/modules/parrableIdSystem.js
index 237708aec57..afaf794513e 100644
--- a/modules/parrableIdSystem.js
+++ b/modules/parrableIdSystem.js
@@ -60,7 +60,7 @@ function isValidConfig(configParams) {
     utils.logError('User ID - parrableId submodule requires configParams');
     return false;
   }
-  if (!configParams.partner) {
+  if (!configParams.partners && !configParams.partner) {
     utils.logError('User ID - parrableId submodule requires partner list');
     return false;
   }
@@ -183,10 +183,14 @@ function fetchId(configParams) {
   const eid = (parrableId) ? parrableId.eid : null;
   const refererInfo = getRefererInfo();
   const uspString = uspDataHandler.getConsentData();
+  const partners = configParams.partners || configParams.partner
+  const trackers = typeof partners === 'string'
+    ? partners.split(',')
+    : partners;
 
   const data = {
     eid,
-    trackers: configParams.partner.split(','),
+    trackers,
     url: refererInfo.referer,
     prebidVersion: '$prebid.version$',
     isIframe: utils.inIframe()
diff --git a/test/spec/modules/parrableIdSystem_spec.js b/test/spec/modules/parrableIdSystem_spec.js
index 9db5df2a518..5a10529778c 100644
--- a/test/spec/modules/parrableIdSystem_spec.js
+++ b/test/spec/modules/parrableIdSystem_spec.js
@@ -18,7 +18,7 @@ const P_XHR_EID = '01.1588030911.test-new-eid'
 const P_CONFIG_MOCK = {
   name: 'parrableId',
   params: {
-    partner: 'parrable_test_partner_123,parrable_test_partner_456'
+    partners: 'parrable_test_partner_123,parrable_test_partner_456'
   }
 };
 
@@ -74,21 +74,21 @@ function removeParrableCookie() {
   storage.setCookie(P_COOKIE_NAME, '', EXPIRED_COOKIE_DATE);
 }
 
+function decodeBase64UrlSafe(encBase64) {
+  const DEC = {
+    '-': '+',
+    '_': '/',
+    '.': '='
+  };
+  return encBase64.replace(/[-_.]/g, (m) => DEC[m]);
+}
+
 describe('Parrable ID System', function() {
   describe('parrableIdSystem.getId()', function() {
     describe('response callback function', function() {
       let logErrorStub;
       let callbackSpy = sinon.spy();
 
-      let decodeBase64UrlSafe = function (encBase64) {
-        const DEC = {
-          '-': '+',
-          '_': '/',
-          '.': '='
-        };
-        return encBase64.replace(/[-_.]/g, (m) => DEC[m]);
-      }
-
       beforeEach(function() {
         logErrorStub = sinon.stub(utils, 'logError');
         callbackSpy.resetHistory();
@@ -115,7 +115,7 @@ describe('Parrable ID System', function() {
         expect(queryParams).to.not.have.property('us_privacy');
         expect(data).to.deep.equal({
           eid: P_COOKIE_EID,
-          trackers: P_CONFIG_MOCK.params.partner.split(','),
+          trackers: P_CONFIG_MOCK.params.partners.split(','),
           url: getRefererInfo().referer,
           prebidVersion: '$prebid.version$',
           isIframe: true
@@ -162,7 +162,7 @@ describe('Parrable ID System', function() {
 
       it('should log an error and continue to callback if ajax request errors', function () {
         let callBackSpy = sinon.spy();
-        let submoduleCallback = parrableIdSubmodule.getId({ params: {partner: 'prebid'} }).callback;
+        let submoduleCallback = parrableIdSubmodule.getId({ params: {partners: 'prebid'} }).callback;
         submoduleCallback(callBackSpy);
         let request = server.requests[0];
         expect(request.url).to.contain('h.parrable.com');
@@ -237,7 +237,7 @@ describe('Parrable ID System', function() {
 
     it('permits an impression when no timezoneFilter is configured', function() {
       expect(parrableIdSubmodule.getId({ params: {
-        partner: 'prebid-test',
+        partners: 'prebid-test',
       } })).to.have.property('callback');
     });
 
@@ -249,7 +249,7 @@ describe('Parrable ID System', function() {
       writeParrableCookie({ eid: P_COOKIE_EID });
 
       expect(parrableIdSubmodule.getId({ params: {
-        partner: 'prebid-test',
+        partners: 'prebid-test',
         timezoneFilter: {
           blockedZones: [ blockedZone ]
         }
@@ -265,7 +265,7 @@ describe('Parrable ID System', function() {
       Intl.DateTimeFormat.returns({ resolvedOptions });
 
       expect(parrableIdSubmodule.getId({ params: {
-        partner: 'prebid-test',
+        partners: 'prebid-test',
         timezoneFilter: {
           allowedZones: [ allowedZone ]
         }
@@ -279,7 +279,7 @@ describe('Parrable ID System', function() {
       Intl.DateTimeFormat.returns({ resolvedOptions });
 
       expect(parrableIdSubmodule.getId({ params: {
-        partner: 'prebid-test',
+        partners: 'prebid-test',
         timezoneFilter: {
           blockedZones: [ blockedZone ]
         }
@@ -293,7 +293,7 @@ describe('Parrable ID System', function() {
       Intl.DateTimeFormat.returns({ resolvedOptions });
 
       expect(parrableIdSubmodule.getId({ params: {
-        partner: 'prebid-test',
+        partners: 'prebid-test',
         timezoneFilter: {
           blockedZones: [ blockedZone ]
         }
@@ -307,7 +307,7 @@ describe('Parrable ID System', function() {
       Intl.DateTimeFormat.returns({ resolvedOptions });
 
       expect(parrableIdSubmodule.getId({ params: {
-        partner: 'prebid-test',
+        partners: 'prebid-test',
         timezoneFilter: {
           allowedZones: [ timezone ],
           blockedZones: [ timezone ]
@@ -337,7 +337,7 @@ describe('Parrable ID System', function() {
       writeParrableCookie({ eid: P_COOKIE_EID });
 
       expect(parrableIdSubmodule.getId({ params: {
-        partner: 'prebid-test',
+        partners: 'prebid-test',
         timezoneFilter: {
           blockedOffsets: [ blockedOffset ]
         }
@@ -351,7 +351,7 @@ describe('Parrable ID System', function() {
       Date.prototype.getTimezoneOffset.returns(allowedOffset * 60);
 
       expect(parrableIdSubmodule.getId({ params: {
-        partner: 'prebid-test',
+        partners: 'prebid-test',
         timezoneFilter: {
           allowedOffsets: [ allowedOffset ]
         }
@@ -365,7 +365,7 @@ describe('Parrable ID System', function() {
       Date.prototype.getTimezoneOffset.returns(allowedOffset * 60);
 
       expect(parrableIdSubmodule.getId({ params: {
-        partner: 'prebid-test',
+        partners: 'prebid-test',
         timezoneFilter: {
           blockedOffsets: [ blockedOffset ]
         }
@@ -378,7 +378,7 @@ describe('Parrable ID System', function() {
       Date.prototype.getTimezoneOffset.returns(blockedOffset * 60);
 
       expect(parrableIdSubmodule.getId({ params: {
-        partner: 'prebid-test',
+        partners: 'prebid-test',
         timezoneFilter: {
           blockedOffsets: [ blockedOffset ]
         }
@@ -391,7 +391,7 @@ describe('Parrable ID System', function() {
       Date.prototype.getTimezoneOffset.returns(offset * 60);
 
       expect(parrableIdSubmodule.getId({ params: {
-        partner: 'prebid-test',
+        partners: 'prebid-test',
         timezoneFilter: {
           allowedOffset: [ offset ],
           blockedOffsets: [ offset ]
@@ -468,4 +468,47 @@ describe('Parrable ID System', function() {
       }, { adUnits });
     });
   });
+
+  describe('partners parsing', () => {
+    let callbackSpy = sinon.spy();
+
+    const partnersTestCase = [
+      {
+        name: '"partners" as an array',
+        config: { params: { partners: ['parrable_test_partner_123', 'parrable_test_partner_456'] } },
+        expected: ['parrable_test_partner_123', 'parrable_test_partner_456']
+      },
+      {
+        name: '"partners" as a string list',
+        config: { params: { partners: 'parrable_test_partner_123,parrable_test_partner_456' } },
+        expected: ['parrable_test_partner_123', 'parrable_test_partner_456']
+      },
+      {
+        name: '"partners" as a string',
+        config: { params: { partners: 'parrable_test_partner_123' } },
+        expected: ['parrable_test_partner_123']
+      },
+      {
+        name: '"partner" as a string list',
+        config: { params: { partner: 'parrable_test_partner_123,parrable_test_partner_456' } },
+        expected: ['parrable_test_partner_123', 'parrable_test_partner_456']
+      },
+      {
+        name: '"partner" as string',
+        config: { params: { partner: 'parrable_test_partner_123' } },
+        expected: ['parrable_test_partner_123']
+      },
+    ];
+    partnersTestCase.forEach(testCase => {
+      it(`accepts config property ${testCase.name}`, () => {
+        parrableIdSubmodule.getId(testCase.config).callback(callbackSpy);
+
+        let request = server.requests[0];
+        let queryParams = utils.parseQS(request.url.split('?')[1]);
+        let data = JSON.parse(atob(decodeBase64UrlSafe(queryParams.data)));
+
+        expect(data.trackers).to.deep.equal(testCase.expected);
+      });
+    });
+  });
 });

From b7dcdf9e412bff45b374fb4ce21d3ebd25652ece Mon Sep 17 00:00:00 2001
From: mmoschovas <63253416+mmoschovas@users.noreply.github.com>
Date: Sun, 7 Feb 2021 10:56:12 -0500
Subject: [PATCH 227/304] Rubicon Bid Adapter FPD Update (#6122)

* Update to consolidate applying FPD to both banner and video requests. FPD will be merged using global defined FPD, ad unit FPD, and rubicon bidder param FPD. Validation logic with warning logs added

* Refectored last push to:
1) Correct keywords bug
2) Revise error which looked for FPD in (user/context).ext.data as opposed to (user/context).data
3) General code cleanup

* Consolidated other FPD data logic into new function

* 1. Update to move pbadslot and adserver data into imp[] as opposed to parent.
2. Update to convert keywords passed through RP params to string if array found

* Removed unnecessary conditional

* Changed conditional to check for undefined type

* Update to consolidate several lines of duplicate code into one location
---
 modules/rubiconBidAdapter.js                | 160 ++++++++++----------
 test/spec/modules/rubiconBidAdapter_spec.js |  63 +++++---
 2 files changed, 117 insertions(+), 106 deletions(-)

diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index 2981bd4f3fa..395b7a693b2 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -254,46 +254,7 @@ export const spec = {
         utils.deepSetValue(data, 'source.ext.schain', bidRequest.schain);
       }
 
-      const siteData = Object.assign({}, bidRequest.params.inventory, config.getConfig('fpd.context'));
-      const userData = Object.assign({}, bidRequest.params.visitor, config.getConfig('fpd.user'));
-      if (!utils.isEmpty(siteData) || !utils.isEmpty(userData)) {
-        const bidderData = {
-          bidders: [ bidderRequest.bidderCode ],
-          config: {
-            fpd: {}
-          }
-        };
-
-        if (!utils.isEmpty(siteData)) {
-          bidderData.config.fpd.site = siteData;
-        }
-
-        if (!utils.isEmpty(userData)) {
-          bidderData.config.fpd.user = userData;
-        }
-
-        utils.deepSetValue(data, 'ext.prebid.bidderconfig.0', bidderData);
-      }
-
-      /**
-       * Prebid AdSlot
-       * @type {(string|undefined)}
-       */
-      const pbAdSlot = utils.deepAccess(bidRequest, 'fpd.context.pbAdSlot');
-      if (typeof pbAdSlot === 'string' && pbAdSlot) {
-        utils.deepSetValue(data.imp[0].ext, 'context.data.pbadslot', pbAdSlot);
-      }
-
-      /**
-       * Copy GAM AdUnit and Name to imp
-       */
-      ['name', 'adSlot'].forEach(name => {
-        /** @type {(string|undefined)} */
-        const value = utils.deepAccess(bidRequest, `fpd.context.adserver.${name}`);
-        if (typeof value === 'string' && value) {
-          utils.deepSetValue(data.imp[0].ext, `context.data.adserver.${name.toLowerCase()}`, value);
-        }
-      });
+      applyFPD(bidRequest, VIDEO, data);
 
       // if storedAuctionResponse has been set, pass SRID
       if (bidRequest.storedAuctionResponse) {
@@ -547,49 +508,7 @@ export const spec = {
       data['us_privacy'] = encodeURIComponent(bidderRequest.uspConsent);
     }
 
-    // visitor properties
-    const visitorData = Object.assign({}, params.visitor, config.getConfig('fpd.user'));
-    Object.keys(visitorData).forEach((key) => {
-      if (visitorData[key] != null && key !== 'keywords') {
-        data[`tg_v.${key}`] = typeof visitorData[key] === 'object' && !Array.isArray(visitorData[key])
-          ? JSON.stringify(visitorData[key])
-          : visitorData[key].toString(); // initialize array;
-      }
-    });
-
-    // inventory properties
-    const inventoryData = Object.assign({}, params.inventory, config.getConfig('fpd.context'));
-    Object.keys(inventoryData).forEach((key) => {
-      if (inventoryData[key] != null && key !== 'keywords') {
-        data[`tg_i.${key}`] = typeof inventoryData[key] === 'object' && !Array.isArray(inventoryData[key])
-          ? JSON.stringify(inventoryData[key])
-          : inventoryData[key].toString();
-      }
-    });
-
-    // keywords
-    const keywords = (params.keywords || []).concat(
-      utils.deepAccess(config.getConfig('fpd.user'), 'keywords') || [],
-      utils.deepAccess(config.getConfig('fpd.context'), 'keywords') || []);
-    data.kw = Array.isArray(keywords) && keywords.length ? keywords.join(',') : '';
-
-    /**
-     * Prebid AdSlot
-     * @type {(string|undefined)}
-     */
-    const pbAdSlot = utils.deepAccess(bidRequest, 'fpd.context.pbAdSlot');
-    if (typeof pbAdSlot === 'string' && pbAdSlot) {
-      data['tg_i.pbadslot'] = pbAdSlot.replace(/^\/+/, '');
-    }
-
-    /**
-     * GAM Ad Unit
-     * @type {(string|undefined)}
-     */
-    const gamAdUnit = utils.deepAccess(bidRequest, 'fpd.context.adServer.adSlot');
-    if (typeof gamAdUnit === 'string' && gamAdUnit) {
-      data['tg_i.dfp_ad_unit_code'] = gamAdUnit.replace(/^\/+/, '');
-    }
+    applyFPD(bidRequest, BANNER, data);
 
     if (config.getConfig('coppa') === true) {
       data['coppa'] = 1;
@@ -949,6 +868,81 @@ function addVideoParameters(data, bidRequest) {
   data.imp[0].video.h = size[1]
 }
 
+function applyFPD(bidRequest, mediaType, data) {
+  const bidFpd = {
+    user: {...bidRequest.params.visitor},
+    context: {...bidRequest.params.inventory}
+  };
+
+  if (bidRequest.params.keywords) bidFpd.context.keywords = (utils.isArray(bidRequest.params.keywords)) ? bidRequest.params.keywords.join(',') : bidRequest.params.keywords;
+
+  let fpd = utils.mergeDeep({}, config.getConfig('fpd') || {}, bidRequest.fpd || {}, bidFpd);
+
+  const map = {user: {banner: 'tg_v.', code: 'user'}, context: {banner: 'tg_i.', code: 'site'}, adserver: 'dfp_ad_unit_code'};
+  let obj = {};
+  let impData = {};
+  let keywords = [];
+  const validate = function(prop, key) {
+    if (typeof prop === 'object' && !Array.isArray(prop)) {
+      utils.logWarn('Rubicon: Filtered FPD key: ', key, ': Expected value to be string, integer, or an array of strings/ints');
+    } else if (typeof prop !== 'undefined') {
+      return (Array.isArray(prop)) ? prop.filter(value => {
+        if (typeof value !== 'object' && typeof value !== 'undefined') return value.toString();
+
+        utils.logWarn('Rubicon: Filtered value: ', value, 'for key', key, ': Expected value to be string, integer, or an array of strings/ints');
+      }).toString() : prop.toString();
+    }
+  };
+
+  Object.keys(fpd).filter(value => fpd[value] && map[value] && typeof fpd[value] === 'object').forEach((type) => {
+    obj[map[type].code] = Object.keys(fpd[type]).filter(value => typeof fpd[type][value] !== 'undefined').reduce((result, key) => {
+      if (key === 'keywords') {
+        if (!Array.isArray(fpd[type][key]) && mediaType === BANNER) fpd[type][key] = [fpd[type][key]]
+
+        result[key] = fpd[type][key];
+
+        if (mediaType === BANNER) keywords = keywords.concat(fpd[type][key]);
+      } else if (key === 'data') {
+        utils.mergeDeep(result, {ext: {data: fpd[type][key]}});
+      } else if (key === 'adServer' || key === 'pbAdSlot') {
+        (key === 'adServer') ? ['name', 'adSlot'].forEach(name => {
+          const value = validate(fpd[type][key][name]);
+          if (value) utils.deepSetValue(impData, `adserver.${name.toLowerCase()}`, value.replace(/^\/+/, ''))
+        }) : impData[key.toLowerCase()] = fpd[type][key].replace(/^\/+/, '')
+      } else {
+        utils.mergeDeep(result, {ext: {data: {[key]: fpd[type][key]}}});
+      }
+
+      return result;
+    }, {});
+
+    if (mediaType === BANNER) {
+      let duplicate = (typeof obj[map[type].code].ext === 'object' && obj[map[type].code].ext.data) || {};
+
+      Object.keys(duplicate).forEach((key) => {
+        const val = (key === 'adserver') ? duplicate.adserver.adslot : validate(duplicate[key], key);
+
+        if (val) data[(map[key]) ? `${map[type][BANNER]}${map[key]}` : `${map[type][BANNER]}${key}`] = val;
+      });
+    }
+  });
+
+  Object.keys(impData).forEach((key) => {
+    if (mediaType === BANNER) {
+      (map[key]) ? data[`tg_i.${map[key]}`] = impData[key].adslot : data[`tg_i.${key.toLowerCase()}`] = impData[key];
+    } else {
+      utils.mergeDeep(data.imp[0], {ext: {context: {data: {[key]: impData[key]}}}});
+    }
+  });
+
+  if (mediaType === BANNER) {
+    let kw = validate(keywords, 'keywords');
+    if (kw) data.kw = kw;
+  } else {
+    utils.mergeDeep(data, obj);
+  }
+}
+
 /**
  * @param sizes
  * @returns {*}
diff --git a/test/spec/modules/rubiconBidAdapter_spec.js b/test/spec/modules/rubiconBidAdapter_spec.js
index 6944034a787..8c25d97dada 100644
--- a/test/spec/modules/rubiconBidAdapter_spec.js
+++ b/test/spec/modules/rubiconBidAdapter_spec.js
@@ -826,16 +826,22 @@ describe('the rubicon adapter', function () {
             });
           });
 
-          it('should use first party data from getConfig over the bid params, if present', () => {
+          it('should merge first party data from getConfig with the bid params, if present', () => {
             const context = {
-              keywords: ['e', 'f'],
-              rating: '4-star'
+              keywords: 'e,f',
+              rating: '4-star',
+              data: {
+                page: 'home'
+              }
             };
             const user = {
-              keywords: ['d'],
               gender: 'M',
               yob: '1984',
-              geo: {country: 'ca'}
+              geo: {country: 'ca'},
+              keywords: 'd',
+              data: {
+                age: 40
+              }
             };
 
             sandbox.stub(config, 'getConfig').callsFake(key => {
@@ -849,14 +855,15 @@ describe('the rubicon adapter', function () {
             });
 
             const expectedQuery = {
-              'kw': 'a,b,c,d,e,f',
+              'kw': 'a,b,c,d',
               'tg_v.ucat': 'new',
               'tg_v.lastsearch': 'iphone',
               'tg_v.likes': 'sports,video games',
               'tg_v.gender': 'M',
+              'tg_v.age': '40',
               'tg_v.yob': '1984',
-              'tg_v.geo': '{"country":"ca"}',
-              'tg_i.rating': '4-star',
+              'tg_i.rating': '5-star',
+              'tg_i.page': 'home',
               'tg_i.prodtype': 'tech,mobile',
             };
 
@@ -1865,11 +1872,17 @@ describe('the rubicon adapter', function () {
           createVideoBidderRequest();
 
           const context = {
-            keywords: ['e', 'f'],
+            data: {
+              page: 'home'
+            },
+            keywords: 'e,f',
             rating: '4-star'
           };
           const user = {
-            keywords: ['d'],
+            data: {
+              age: 31
+            },
+            keywords: 'd',
             gender: 'M',
             yob: '1984',
             geo: {country: 'ca'}
@@ -1885,18 +1898,22 @@ describe('the rubicon adapter', function () {
             return utils.deepAccess(config, key);
           });
 
-          const expected = [{
-            bidders: ['rubicon'],
-            config: {
-              fpd: {
-                site: Object.assign({}, bidderRequest.bids[0].params.inventory, context),
-                user: Object.assign({}, bidderRequest.bids[0].params.visitor, user)
-              }
-            }
-          }];
-
           const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          expect(request.data.ext.prebid.bidderconfig).to.deep.equal(expected);
+
+          const expected = {
+            site: Object.assign({}, context, context.data, bidderRequest.bids[0].params.inventory),
+            user: Object.assign({}, user, user.data, bidderRequest.bids[0].params.visitor)
+          };
+
+          delete expected.site.data;
+          delete expected.user.data;
+          delete expected.site.keywords;
+          delete expected.user.keywords;
+
+          expect(request.data.site.keywords).to.deep.equal('a,b,c');
+          expect(request.data.user.keywords).to.deep.equal('d');
+          expect(request.data.site.ext.data).to.deep.equal(expected.site);
+          expect(request.data.user.ext.data).to.deep.equal(expected.user);
         });
 
         it('should include storedAuctionResponse in video bid request', function () {
@@ -1935,7 +1952,7 @@ describe('the rubicon adapter', function () {
           createVideoBidderRequest();
           bidderRequest.bids[0].fpd = {
             context: {
-              adserver: {
+              adServer: {
                 adSlot: '1234567890',
                 name: 'adServerName1'
               }
@@ -2079,7 +2096,7 @@ describe('the rubicon adapter', function () {
         it('should not fail if keywords param is not an array', function () {
           bidderRequest.bids[0].params.keywords = 'a,b,c';
           const slotParams = spec.createSlotParams(bidderRequest.bids[0], bidderRequest);
-          expect(slotParams.kw).to.equal('');
+          expect(slotParams.kw).to.equal('a,b,c');
         });
       });
 

From 2640d0806a9b28a7e21e44dc46aeccbf83fdd0fd Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Mon, 8 Feb 2021 12:08:19 +0100
Subject: [PATCH 228/304] ID5 User Id Module: update a/b testing to be user
 based not request based (#6281)

* convert A/B testing to be user-based, rather than request-based

* update docs to say a/b testing is user based, not request based
---
 modules/id5IdSystem.js                | 51 ++++++++++-----
 modules/id5IdSystem.md                |  4 +-
 test/spec/modules/id5IdSystem_spec.js | 91 ++++++++++++++++++++-------
 3 files changed, 105 insertions(+), 41 deletions(-)

diff --git a/modules/id5IdSystem.js b/modules/id5IdSystem.js
index baa2ff954dc..bf2365b938c 100644
--- a/modules/id5IdSystem.js
+++ b/modules/id5IdSystem.js
@@ -18,6 +18,7 @@ const NB_EXP_DAYS = 30;
 export const ID5_STORAGE_NAME = 'id5id';
 export const ID5_PRIVACY_STORAGE_NAME = `${ID5_STORAGE_NAME}_privacy`;
 const LOCAL_STORAGE = 'html5';
+const ABTEST_RESOLUTION = 10000;
 
 // order the legacy cookie names in reverse priority order so the last
 // cookie in the array is the most preferred to use
@@ -58,27 +59,18 @@ export const id5IdSubmodule = {
     }
 
     // check for A/B testing configuration and hide ID if in Control Group
-    let abConfig = getAbTestingConfig(config);
-    let controlGroup = false;
-    if (
-      abConfig.enabled === true &&
-      (!utils.isNumber(abConfig.controlGroupPct) ||
-        abConfig.controlGroupPct < 0 ||
-        abConfig.controlGroupPct > 1)
-    ) {
+    const abConfig = getAbTestingConfig(config);
+    const controlGroup = isInControlGroup(universalUid, abConfig.controlGroupPct);
+    if (abConfig.enabled === true && typeof controlGroup === 'undefined') {
       // A/B Testing is enabled, but configured improperly, so skip A/B testing
       utils.logError('User ID - ID5 submodule: A/B Testing controlGroupPct must be a number >= 0 and <= 1! Skipping A/B Testing');
-    } else if (
-      abConfig.enabled === true &&
-      Math.random() < abConfig.controlGroupPct
-    ) {
+    } else if (abConfig.enabled === true && controlGroup === true) {
       // A/B Testing is enabled and user is in the Control Group, so do not share the ID5 ID
-      utils.logInfo('User ID - ID5 submodule: A/B Testing Enabled - request is in the Control Group, so the ID5 ID is NOT exposed');
+      utils.logInfo('User ID - ID5 submodule: A/B Testing Enabled - user is in the Control Group, so the ID5 ID is NOT exposed');
       universalUid = linkType = 0;
-      controlGroup = true;
     } else if (abConfig.enabled === true) {
       // A/B Testing is enabled but user is not in the Control Group, so ID5 ID is shared
-      utils.logInfo('User ID - ID5 submodule: A/B Testing Enabled - request is NOT in the Control Group, so the ID5 ID is exposed');
+      utils.logInfo('User ID - ID5 submodule: A/B Testing Enabled - user is NOT in the Control Group, so the ID5 ID is exposed');
     }
 
     let responseObj = {
@@ -91,7 +83,7 @@ export const id5IdSubmodule = {
     };
 
     if (abConfig.enabled === true) {
-      utils.deepSetValue(responseObj, 'id5id.ext.abTestingControlGroup', controlGroup);
+      utils.deepSetValue(responseObj, 'id5id.ext.abTestingControlGroup', (typeof controlGroup === 'undefined' ? false : controlGroup));
     }
 
     return responseObj;
@@ -296,4 +288,31 @@ function getAbTestingConfig(config) {
   return (config && config.params && config.params.abTesting) || { enabled: false };
 }
 
+/**
+ * Return a consistant random number between 0 and ABTEST_RESOLUTION-1 for this user
+ * Falls back to plain random if no user provided
+ * @param {string} userId
+ * @returns {number}
+ */
+function abTestBucket(userId) {
+  if (userId) {
+    return ((utils.cyrb53Hash(userId) % ABTEST_RESOLUTION) + ABTEST_RESOLUTION) % ABTEST_RESOLUTION;
+  } else {
+    return Math.floor(Math.random() * ABTEST_RESOLUTION);
+  }
+}
+
+/**
+ * Return a consistant boolean if this user is within the control group ratio provided
+ * @param {string} userId
+ * @param {number} controlGroupPct - Ratio [0,1] of users expected to be in the control group
+ * @returns {boolean}
+ */
+export function isInControlGroup(userId, controlGroupPct) {
+  if (!utils.isNumber(controlGroupPct) || controlGroupPct < 0 || controlGroupPct > 1) {
+    return undefined;
+  }
+  return abTestBucket(userId) < controlGroupPct * ABTEST_RESOLUTION;
+}
+
 submodule('userId', id5IdSubmodule);
diff --git a/modules/id5IdSystem.md b/modules/id5IdSystem.md
index 6b2192834fa..6a662361492 100644
--- a/modules/id5IdSystem.md
+++ b/modules/id5IdSystem.md
@@ -1,6 +1,6 @@
 # ID5 Universal ID
 
-The ID5 Universal ID is a shared, neutral identifier that publishers and ad tech platforms can use to recognise users even in environments where 3rd party cookies are not available. The ID5 Universal ID is designed to respect users' privacy choices and publishers’ preferences throughout the advertising value chain. For more information about the ID5 Universal ID and detailed integration docs, please visit [our documentation](https://console.id5.io/docs/public/prebid). We also recommend that you sign up for our [release notes](https://id5.io/universal-id/release-notes) to stay up-to-date with any changes to the implementation of the ID5 Universal ID in Prebid.
+The ID5 Universal ID is a shared, neutral identifier that publishers and ad tech platforms can use to recognise users even in environments where 3rd party cookies are not available. The ID5 Universal ID is designed to respect users' privacy choices and publishers’ preferences throughout the advertising value chain. For more information about the ID5 Universal ID and detailed integration docs, please visit [our documentation](https://wiki.id5.io/x/BIAZ). We also recommend that you sign up for our [release notes](https://id5.io/universal-id/release-notes) to stay up-to-date with any changes to the implementation of the ID5 Universal ID in Prebid.
 
 ## ID5 Universal ID Registration
 
@@ -65,4 +65,4 @@ pbjs.setConfig({
 
 Publishers may want to test the value of the ID5 ID with their downstream partners. While there are various ways to do this, A/B testing is a standard approach. Instead of publishers manually enabling or disabling the ID5 User ID Module based on their control group settings (which leads to fewer calls to ID5, reducing our ability to recognize the user), we have baked this in to our module directly.
 
-To turn on A/B Testing, simply edit the configuration (see above table) to enable it and set what percentage of requests you would like to set for the control group. The control group is the set of requests where an ID5 ID will not be exposed in to bid adapters or in the various user id functions available on the `pbjs` global. An additional value of `ext.abTestingControlGroup` will be set to `true` or `false` that can be used to inform reporting systems that the request was in the control group or not. It's important to note that the control group is request based, and not user based. In other words, from one page view to another, a user may be in or out of the control group.
+To turn on A/B Testing, simply edit the configuration (see above table) to enable it and set what percentage of users you would like to set for the control group. The control group is the set of user where an ID5 ID will not be exposed in to bid adapters or in the various user id functions available on the `pbjs` global. An additional value of `ext.abTestingControlGroup` will be set to `true` or `false` that can be used to inform reporting systems that the user was in the control group or not. It's important to note that the control group is user based, and not request based. In other words, from one page view to another, a user will always be in or out of the control group.
diff --git a/test/spec/modules/id5IdSystem_spec.js b/test/spec/modules/id5IdSystem_spec.js
index 59fa8977fc8..7f104ff403d 100644
--- a/test/spec/modules/id5IdSystem_spec.js
+++ b/test/spec/modules/id5IdSystem_spec.js
@@ -7,7 +7,8 @@ import {
   expDaysStr,
   nbCacheName,
   getNbFromCache,
-  storeNbInCache
+  storeNbInCache,
+  isInControlGroup
 } from 'modules/id5IdSystem.js';
 import { init, requestBidsHook, setSubmoduleRegistry, coreStorage } from 'modules/userId/index.js';
 import { config } from 'src/config.js';
@@ -477,6 +478,9 @@ describe('ID5 ID System', function() {
         { enabled: true, controlGroupPct: true }
       ];
       testInvalidAbTestingConfigsWithError.forEach((testAbTestingConfig) => {
+        it('should be undefined if ratio is invalid', () => {
+          expect(isInControlGroup('userId', testAbTestingConfig.controlGroupPct)).to.be.undefined;
+        });
         it('should error if config is invalid, and always return an ID', function () {
           testConfig.params.abTesting = testAbTestingConfig;
           let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
@@ -493,6 +497,9 @@ describe('ID5 ID System', function() {
         { enabled: false, controlGroupPct: true }
       ];
       testInvalidAbTestingConfigsWithoutError.forEach((testAbTestingConfig) => {
+        it('should be undefined if ratio is invalid', () => {
+          expect(isInControlGroup('userId', testAbTestingConfig.controlGroupPct)).to.be.undefined;
+        });
         it('should not error if config is invalid but A/B testing is off, and always return an ID', function () {
           testConfig.params.abTesting = testAbTestingConfig;
           let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
@@ -509,6 +516,9 @@ describe('ID5 ID System', function() {
         { enabled: true, controlGroupPct: 1 }
       ];
       testValidConfigs.forEach((testAbTestingConfig) => {
+        it('should not be undefined if ratio is valid', () => {
+          expect(isInControlGroup('userId', testAbTestingConfig.controlGroupPct)).to.not.be.undefined;
+        });
         it('should not error if config is valid', function () {
           testConfig.params.abTesting = testAbTestingConfig;
           id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
@@ -555,34 +565,69 @@ describe('ID5 ID System', function() {
         randStub.restore();
       });
 
-      it('should expose ID when A/B testing is off', function () {
-        testConfig.params.abTesting = {
-          enabled: false,
-          controlGroupPct: 0.5
-        };
+      describe('IsInControlGroup', function () {
+        it('Nobody is in a 0% control group', function () {
+          expect(isInControlGroup('dsdndskhsdks', 0)).to.be.false;
+          expect(isInControlGroup('3erfghyuijkm', 0)).to.be.false;
+          expect(isInControlGroup('', 0)).to.be.false;
+          expect(isInControlGroup(undefined, 0)).to.be.false;
+        });
 
-        let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
-        expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOff);
-      });
+        it('Everybody is in a 100% control group', function () {
+          expect(isInControlGroup('dsdndskhsdks', 1)).to.be.true;
+          expect(isInControlGroup('3erfghyuijkm', 1)).to.be.true;
+          expect(isInControlGroup('', 1)).to.be.true;
+          expect(isInControlGroup(undefined, 1)).to.be.true;
+        });
 
-      it('should expose ID when not in control group', function () {
-        testConfig.params.abTesting = {
-          enabled: true,
-          controlGroupPct: 0.1
-        };
+        it('Being in the control group must be consistant', function () {
+          const inControlGroup = isInControlGroup('dsdndskhsdks', 0.5);
+          expect(inControlGroup === isInControlGroup('dsdndskhsdks', 0.5)).to.be.true;
+          expect(inControlGroup === isInControlGroup('dsdndskhsdks', 0.5)).to.be.true;
+          expect(inControlGroup === isInControlGroup('dsdndskhsdks', 0.5)).to.be.true;
+        });
 
-        let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
-        expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOn);
+        it('Control group ratio must be within a 10% error on a large sample', function () {
+          let nbInControlGroup = 0;
+          const sampleSize = 100;
+          for (let i = 0; i < sampleSize; i++) {
+            nbInControlGroup = nbInControlGroup + (isInControlGroup('R$*df' + i, 0.5) ? 1 : 0);
+          }
+          expect(nbInControlGroup).to.be.greaterThan(sampleSize / 2 - sampleSize / 10);
+          expect(nbInControlGroup).to.be.lessThan(sampleSize / 2 + sampleSize / 10);
+        });
       });
 
-      it('should not expose ID when in control group', function () {
-        testConfig.params.abTesting = {
-          enabled: true,
-          controlGroupPct: 0.5
-        };
+      describe('Decode', function() {
+        it('should expose ID when A/B testing is off', function () {
+          testConfig.params.abTesting = {
+            enabled: false,
+            controlGroupPct: 0.5
+          };
 
-        let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
-        expect(decoded).to.deep.equal(expectedDecodedObjectWithoutIdAbOn);
+          let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+          expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOff);
+        });
+
+        it('should expose ID when no one is in control group', function () {
+          testConfig.params.abTesting = {
+            enabled: true,
+            controlGroupPct: 0
+          };
+
+          let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+          expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOn);
+        });
+
+        it('should not expose ID when everyone is in control group', function () {
+          testConfig.params.abTesting = {
+            enabled: true,
+            controlGroupPct: 1
+          };
+
+          let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+          expect(decoded).to.deep.equal(expectedDecodedObjectWithoutIdAbOn);
+        });
       });
     });
   });

From 727bf206f4e7c50215a3ae6ae2920cb304336953 Mon Sep 17 00:00:00 2001
From: bjorn-lw <32431346+bjorn-lw@users.noreply.github.com>
Date: Mon, 8 Feb 2021 15:32:53 +0100
Subject: [PATCH 229/304] Shared ID gdpr support (#6275)

* SharedId gdpr support

* Reverted commented locally failing tests
---
 modules/id5IdSystem.js                   |  3 +-
 modules/pubCommonIdSystem.js             | 20 +++++++--
 modules/sharedIdSystem.js                | 21 +++++++--
 modules/userId/index.js                  |  3 +-
 test/spec/modules/sharedIdSystem_spec.js | 55 ++++++++++++++++++++++++
 test/spec/modules/userId_spec.js         | 53 +++++++++++++++++++++++
 6 files changed, 145 insertions(+), 10 deletions(-)
 create mode 100644 test/spec/modules/sharedIdSystem_spec.js

diff --git a/modules/id5IdSystem.js b/modules/id5IdSystem.js
index bf2365b938c..6dade7d01f0 100644
--- a/modules/id5IdSystem.js
+++ b/modules/id5IdSystem.js
@@ -166,10 +166,11 @@ export const id5IdSubmodule = {
    *  It's permissible to return neither, one, or both fields.
    * @function extendId
    * @param {SubmoduleConfig} config
+   * @param {ConsentData|undefined} consentData
    * @param {Object} cacheIdObj - existing id, if any
    * @return {(IdResponse|function(callback:function))} A response object that contains id and/or callback.
    */
-  extendId(config, cacheIdObj) {
+  extendId(config, consentData, cacheIdObj) {
     const partnerId = (config && config.params && config.params.partner) || 0;
     incrementNb(partnerId);
     return cacheIdObj;
diff --git a/modules/pubCommonIdSystem.js b/modules/pubCommonIdSystem.js
index cb0c07cefa8..339029120a8 100644
--- a/modules/pubCommonIdSystem.js
+++ b/modules/pubCommonIdSystem.js
@@ -136,6 +136,17 @@ function handleResponse(pubcid, callback, config) {
   }
 }
 
+/**
+ * Builds and returns the shared Id URL with attached consent data if applicable
+ * @param {Object} consentData
+ * @return {string}
+ */
+function sharedIdUrl(consentData) {
+  if (!consentData || typeof consentData.gdprApplies !== 'boolean' || !consentData.gdprApplies) return SHAREDID_URL;
+
+  return `${SHAREDID_URL}?gdpr=1&gdpr_consent=${consentData.consentString}`
+}
+
 /**
  * Wraps pixelCallback in order to call sharedid sync
  * @param {string} pubcid Pubcommon id value
@@ -144,12 +155,12 @@ function handleResponse(pubcid, callback, config) {
  * @return {function(...[*]=)}
  */
 
-function getIdCallback(pubcid, pixelCallback, config) {
+function getIdCallback(pubcid, pixelCallback, config, consentData) {
   return function (callback) {
     if (typeof pixelCallback === 'function') {
       pixelCallback();
     }
-    ajax(SHAREDID_URL, handleResponse(pubcid, callback, config), undefined, {method: 'GET', withCredentials: true});
+    ajax(sharedIdUrl(consentData), handleResponse(pubcid, callback, config), undefined, {method: 'GET', withCredentials: true});
   }
 }
 
@@ -227,7 +238,7 @@ export const pubCommonIdSubmodule = {
     }
 
     const pixelCallback = this.makeCallback(pixelUrl, newId);
-    const combinedCallback = enableSharedId ? getIdCallback(newId, pixelCallback, config) : pixelCallback;
+    const combinedCallback = enableSharedId ? getIdCallback(newId, pixelCallback, config, consentData) : pixelCallback;
 
     return {id: newId, callback: combinedCallback};
   },
@@ -247,10 +258,11 @@ export const pubCommonIdSubmodule = {
    *
    * @function
    * @param {SubmoduleParams} [config]
+   * @param {ConsentData|undefined} consentData
    * @param {Object} storedId existing id
    * @returns {IdResponse|undefined}
    */
-  extendId: function(config = {}, storedId) {
+  extendId: function(config = {}, consentData, storedId) {
     const {params: {extend = false, pixelUrl, enableSharedId = SHAREDID_DEFAULT_STATE} = {}} = config;
 
     if (extend) {
diff --git a/modules/sharedIdSystem.js b/modules/sharedIdSystem.js
index 49cac46f1df..762454af5fa 100644
--- a/modules/sharedIdSystem.js
+++ b/modules/sharedIdSystem.js
@@ -276,6 +276,17 @@ function detectPrng(root) {
   return () => Math.random();
 }
 
+/**
+ * Builds and returns the shared Id URL with attached consent data if applicable
+ * @param {Object} consentData
+ * @return {string}
+ */
+function sharedIdUrl(consentData) {
+  if (!consentData || typeof consentData.gdprApplies !== 'boolean' || !consentData.gdprApplies) return ID_SVC;
+
+  return `${ID_SVC}?gdpr=1&gdpr_consent=${consentData.consentString}`
+}
+
 /** @type {Submodule} */
 export const sharedIdSubmodule = {
   /**
@@ -303,12 +314,13 @@ export const sharedIdSubmodule = {
    * performs action to obtain id and return a value.
    * @function
    * @param {SubmoduleConfig} [config]
+   * @param {ConsentData|undefined} consentData
    * @returns {sharedId}
    */
-  getId(config) {
+  getId(config, consentData) {
     const resp = function (callback) {
       utils.logInfo('SharedId: Sharedid doesnt exists, new cookie creation');
-      ajax(ID_SVC, idGenerationCallback(callback), undefined, {method: 'GET', withCredentials: true});
+      ajax(sharedIdUrl(consentData), idGenerationCallback(callback), undefined, {method: 'GET', withCredentials: true});
     };
     return {callback: resp};
   },
@@ -316,10 +328,11 @@ export const sharedIdSubmodule = {
   /**
    * performs actions even if the id exists and returns a value
    * @param config
+   * @param consentData
    * @param storedId
    * @returns {{callback: *}}
    */
-  extendId(config, storedId) {
+  extendId(config, consentData, storedId) {
     const configParams = (config && config.params) || {};
     utils.logInfo('SharedId: Existing shared id ' + storedId.id);
     const resp = function (callback) {
@@ -329,7 +342,7 @@ export const sharedIdSubmodule = {
         const sharedIdPayload = {};
         sharedIdPayload.sharedId = storedId.id;
         const payloadString = JSON.stringify(sharedIdPayload);
-        ajax(ID_SVC, existingIdCallback(storedId, callback), payloadString, {method: 'POST', withCredentials: true});
+        ajax(sharedIdUrl(consentData), existingIdCallback(storedId, callback), payloadString, {method: 'POST', withCredentials: true});
       }
     };
     return {callback: resp};
diff --git a/modules/userId/index.js b/modules/userId/index.js
index 9294311de69..da2c7b225fa 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -28,6 +28,7 @@
  *  It's permissible to return neither, one, or both fields.
  * @name Submodule#extendId
  * @param {SubmoduleConfig} config
+ * @param {ConsentData|undefined} consentData
  * @param {Object} storedId - existing id, if any
  * @return {(IdResponse|function(callback:function))} A response object that contains id and/or callback.
  */
@@ -621,7 +622,7 @@ function populateSubmoduleId(submodule, consentData, storedConsentData, forceRef
       response = submodule.submodule.getId(submodule.config, consentData, storedId);
     } else if (typeof submodule.submodule.extendId === 'function') {
       // If the id exists already, give submodule a chance to decide additional actions that need to be taken
-      response = submodule.submodule.extendId(submodule.config, storedId);
+      response = submodule.submodule.extendId(submodule.config, consentData, storedId);
     }
 
     if (utils.isPlainObject(response)) {
diff --git a/test/spec/modules/sharedIdSystem_spec.js b/test/spec/modules/sharedIdSystem_spec.js
new file mode 100644
index 00000000000..904d6fe1c78
--- /dev/null
+++ b/test/spec/modules/sharedIdSystem_spec.js
@@ -0,0 +1,55 @@
+import {
+  sharedIdSubmodule,
+} from 'modules/sharedIdSystem.js';
+import { server } from 'test/mocks/xhr.js';
+
+let expect = require('chai').expect;
+
+describe('SharedId System', function() {
+  const SHAREDID_RESPONSE = {sharedId: 'testsharedid'};
+
+  describe('Xhr Requests from getId()', function() {
+    let callbackSpy = sinon.spy();
+
+    beforeEach(function() {
+      callbackSpy.resetHistory();
+    });
+
+    afterEach(function () {
+
+    });
+
+    it('should call shared id endpoint without consent data and handle a valid response', function () {
+      let submoduleCallback = sharedIdSubmodule.getId(undefined, undefined).callback;
+      submoduleCallback(callbackSpy);
+
+      let request = server.requests[0];
+      expect(request.url).to.equal('https://id.sharedid.org/id');
+      expect(request.withCredentials).to.be.true;
+
+      request.respond(200, {}, JSON.stringify(SHAREDID_RESPONSE));
+
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(callbackSpy.lastCall.lastArg.id).to.equal(SHAREDID_RESPONSE.sharedId);
+    });
+
+    it('should call shared id endpoint with consent data and handle a valid response', function () {
+      let consentData = {
+        gdprApplies: true,
+        consentString: 'abc12345234',
+      };
+
+      let submoduleCallback = sharedIdSubmodule.getId(undefined, consentData).callback;
+      submoduleCallback(callbackSpy);
+
+      let request = server.requests[0];
+      expect(request.url).to.equal('https://id.sharedid.org/id?gdpr=1&gdpr_consent=abc12345234');
+      expect(request.withCredentials).to.be.true;
+
+      request.respond(200, {}, JSON.stringify(SHAREDID_RESPONSE));
+
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(callbackSpy.lastCall.lastArg.id).to.equal(SHAREDID_RESPONSE.sharedId);
+    });
+  });
+});
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index ed592c0cba5..0fcf03dde67 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -2037,6 +2037,8 @@ describe('User ID', function () {
       coreStorage.setCookie('pubcid_sharedid', '', EXPIRED_COOKIE_DATE);
       coreStorage.setCookie('unifiedid', '', EXPIRED_COOKIE_DATE);
       coreStorage.setCookie('_parrable_eid', '', EXPIRED_COOKIE_DATE);
+      resetConsentData();
+      delete window.__tcfapi;
     });
 
     it('pubcid callback with url', function () {
@@ -2171,6 +2173,57 @@ describe('User ID', function () {
       expect(server.requests[0].url).to.equal('https://id.sharedid.org/id');
       expect(coreStorage.getCookie('pubcid_sharedid')).to.be.null;
     });
+
+    it('verify sharedid called with consent data when gdpr applies', function () {
+      let adUnits = [getAdUnitMock()];
+      let customCfg = getConfigMock(['pubCommonId', 'pubcid', 'cookie']);
+      let consentConfig = {
+        cmpApi: 'iab',
+        timeout: 7500,
+        allowAuctionWithoutConsent: false
+      };
+      customCfg = addConfig(customCfg, 'params', {pixelUrl: '/any/pubcid/url', enableSharedId: true});
+
+      server.respondWith('https://id.sharedid.org/id?gdpr=1&gdpr_consent=abc12345234', function(xhr) {
+        xhr.respond(200, {}, '{"sharedId":"testsharedid"}');
+      });
+      server.respondImmediately = true;
+
+      let testConsentData = {
+        tcString: 'abc12345234',
+        gdprApplies: true,
+        purposeOneTreatment: false,
+        eventStatus: 'tcloaded',
+        vendor: {consents: {887: true}},
+        purpose: {
+          consents: {
+            1: true
+          }
+        }
+      };
+
+      window.__tcfapi = function () { };
+      sinon.stub(window, '__tcfapi').callsFake((...args) => {
+        args[2](testConsentData, true);
+      });
+
+      setSubmoduleRegistry([pubCommonIdSubmodule]);
+      init(config);
+      config.setConfig(customCfg);
+      setConsentConfig(consentConfig);
+
+      consentManagementRequestBidsHook(() => {
+      }, {});
+      requestBidsHook((config) => {
+      }, {adUnits});
+
+      expect(utils.triggerPixel.called).to.be.false;
+      events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
+      expect(utils.triggerPixel.getCall(0).args[0]).to.include('/any/pubcid/url');
+
+      expect(server.requests[0].url).to.equal('https://id.sharedid.org/id?gdpr=1&gdpr_consent=abc12345234');
+      expect(coreStorage.getCookie('pubcid_sharedid')).to.equal('testsharedid');
+    });
   });
 
   describe('Set cookie behavior', function () {

From ab9a8d276867182ff2fd191b6cd25c6182d55f55 Mon Sep 17 00:00:00 2001
From: Lemma Dev <54662130+lemmadev@users.noreply.github.com>
Date: Mon, 8 Feb 2021 22:05:21 +0530
Subject: [PATCH 230/304] Lemma:set mediaType key value (#6006)

* lemmaBidAdapter.js

Added lemma bid adapter file

* lemmaBidAdapter.md

Added lemma bid adapter md file

* lemmaBidAdapter_spec.js

Added lemma bid adapter test spec file

* Update lemmaBidAdapter.js

Fixed automated code review alert comparison between inconvertible types

* Update lemmaBidAdapter.js

Fixed review changes

* Update lemmaBidAdapter.md

Correct parameter value.

* Update lemmaBidAdapter.js

Lemma Bid Adapter - v3.0 compliance

* Update lemmaBidAdapter_spec.js

Lemma Bid Adapter - v3.0 compliance

* Update lemmaBidAdapter.md

Lemma Bid Adapter - v3.0 compliance

* Update lemmaBidAdapter.js

Added user sync support into bid adapter.

* updated include modules file extension.

updated include modules js file extension.

* Update lemmaBidAdapter_spec.js

Added unit test for user sync feature.

* Update lemmaBidAdapter.js

Fixed format error.

* Update lemmaBidAdapter_spec.js

Fixed format error and typo error.

* Set mediaType key value into bid object

Set mediaType key value into the bid object.

* Update lemmaBidAdapter.js

remove duplicate function

* Update lemmaBidAdapter.js

Remove non supported code.

* Update lemmaBidAdapter_spec.js

Remove GDPR test cases.
---
 modules/lemmaBidAdapter.js                | 27 +++++++++--------------
 test/spec/modules/lemmaBidAdapter_spec.js | 18 ---------------
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/modules/lemmaBidAdapter.js b/modules/lemmaBidAdapter.js
index 5941802f97d..926761e5ab2 100644
--- a/modules/lemmaBidAdapter.js
+++ b/modules/lemmaBidAdapter.js
@@ -62,18 +62,6 @@ export var spec = {
   },
   getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent) => {
     let syncurl = USER_SYNC + 'pid=' + pubId;
-
-    // Attaching GDPR Consent Params in UserSync url
-    if (gdprConsent) {
-      syncurl += '&gdpr=' + (gdprConsent.gdprApplies ? 1 : 0);
-      syncurl += '&gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || '');
-    }
-
-    // CCPA
-    if (uspConsent) {
-      syncurl += '&us_privacy=' + encodeURIComponent(uspConsent);
-    }
-
     if (syncOptions.iframeEnabled) {
       return [{
         type: 'iframe',
@@ -122,9 +110,9 @@ function parseRTBResponse(request, response) {
             newBid.dealId = bid.dealid;
           }
           if (req.imp && req.imp.length > 0) {
-            newBid.mediaType = req.mediaType;
             req.imp.forEach(robj => {
               if (bid.impid === robj.id) {
+                _checkMediaType(bid.adm, newBid);
                 switch (newBid.mediaType) {
                   case BANNER:
                     break;
@@ -277,10 +265,6 @@ function _getDeviceObject(request) {
 
 function setOtherParams(request, ortbRequest) {
   var params = request && request.params ? request.params : null;
-  if (request && request.gdprConsent) {
-    ortbRequest.regs = { ext: { gdpr: request.gdprConsent.gdprApplies ? 1 : 0 } };
-    ortbRequest.user = { ext: { consent: request.gdprConsent.consentString } };
-  }
   if (params) {
     ortbRequest.tmax = params.tmax;
     ortbRequest.bcat = params.bcat;
@@ -424,4 +408,13 @@ function parse(rawResp) {
   return null;
 }
 
+function _checkMediaType(adm, newBid) {
+  // Create a regex here to check the strings
+  var videoRegex = new RegExp(/VAST.*version/);
+  if (videoRegex.test(adm)) {
+    newBid.mediaType = VIDEO;
+  } else {
+    newBid.mediaType = BANNER;
+  }
+}
 registerBidder(spec);
diff --git a/test/spec/modules/lemmaBidAdapter_spec.js b/test/spec/modules/lemmaBidAdapter_spec.js
index a00c25d126c..a22f5650e50 100644
--- a/test/spec/modules/lemmaBidAdapter_spec.js
+++ b/test/spec/modules/lemmaBidAdapter_spec.js
@@ -346,24 +346,6 @@ describe('lemmaBidAdapter', function() {
           type: 'iframe', url: syncurl_iframe
         }]);
       });
-
-      it('CCPA/USP', function() {
-        expect(spec.getUserSyncs({ iframeEnabled: true }, {}, undefined, '1NYN')).to.deep.equal([{
-          type: 'iframe', url: `${syncurl_iframe}&us_privacy=1NYN`
-        }]);
-      });
-
-      it('GDPR', function() {
-        expect(spec.getUserSyncs({ iframeEnabled: true }, {}, { gdprApplies: true, consentString: 'foo' }, undefined)).to.deep.equal([{
-          type: 'iframe', url: `${syncurl_iframe}&gdpr=1&gdpr_consent=foo`
-        }]);
-        expect(spec.getUserSyncs({ iframeEnabled: true }, {}, { gdprApplies: false, consentString: 'foo' }, undefined)).to.deep.equal([{
-          type: 'iframe', url: `${syncurl_iframe}&gdpr=0&gdpr_consent=foo`
-        }]);
-        expect(spec.getUserSyncs({ iframeEnabled: true }, {}, { gdprApplies: true, consentString: undefined }, undefined)).to.deep.equal([{
-          type: 'iframe', url: `${syncurl_iframe}&gdpr=1&gdpr_consent=`
-        }]);
-      });
     });
   });
 });

From 19b4885892a14a8177c3b45284351b3492b1b8ad Mon Sep 17 00:00:00 2001
From: ix-certification <adapter-certification-eng@indexexchange.com>
Date: Mon, 8 Feb 2021 11:41:28 -0500
Subject: [PATCH 231/304] added support for addtlConsent (#6005)

Co-authored-by: Ix-Prebid-Support <ix-prebid-support@indexexchange.com>
---
 modules/ixBidAdapter.js                |  6 ++++++
 test/spec/modules/ixBidAdapter_spec.js | 27 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 97341fbfd78..48a2e741c5a 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -341,6 +341,12 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
         r.user.ext = {
           consent: gdprConsent.consentString || ''
         };
+
+        if (gdprConsent.hasOwnProperty('addtlConsent') && gdprConsent.addtlConsent) {
+          r.user.ext.consented_providers_settings = {
+            consented_providers: gdprConsent.addtlConsent
+          }
+        }
       }
     }
 
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index edbcc5725ac..fca3f8f992e 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -1772,5 +1772,32 @@ describe('IndexexchangeAdapter', function () {
       expect(requestWithConsent.regs.ext.gdpr).to.equal(1);
       expect(requestWithConsent.regs.ext.us_privacy).to.equal('1YYN');
     });
+
+    it('should contain `consented_providers_settings.consented_providers` & consent on user.ext when both are provided', function () {
+      const options = {
+        gdprConsent: {
+          consentString: '3huaa11=qu3198ae',
+          addtlConsent: '1~1.35.41.101',
+        }
+      };
+
+      const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
+      const requestWithConsent = JSON.parse(validBidWithConsent[0].data.r);
+      expect(requestWithConsent.user.ext.consented_providers_settings.consented_providers).to.equal('1~1.35.41.101');
+      expect(requestWithConsent.user.ext.consent).to.equal('3huaa11=qu3198ae');
+    });
+
+    it('should not contain `consented_providers_settings.consented_providers` on user.ext when consent is not provided', function () {
+      const options = {
+        gdprConsent: {
+          addtlConsent: '1~1.35.41.101',
+        }
+      };
+
+      const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
+      const requestWithConsent = JSON.parse(validBidWithConsent[0].data.r);
+      expect(utils.deepAccess(requestWithConsent, 'user.ext.consented_providers_settings')).to.not.exist;
+      expect(utils.deepAccess(requestWithConsent, 'user.ext.consent')).to.not.exist;
+    });
   });
 });

From 1654d53b8c7676d652c3bd35c74ca7c5413bf3a7 Mon Sep 17 00:00:00 2001
From: Missena <78362128+dev-missena@users.noreply.github.com>
Date: Mon, 8 Feb 2021 22:49:01 +0100
Subject: [PATCH 232/304] Add bid adapter for Missena (#6247)

* adds support for getFloor of video mediaTypes

* adds test for calling getFloor with correct mediaType

* checks that _getFloor converts string floors to float

* Add bid adapter for Missena

* Use publisher demo token in tests

* Add Missena global vendor ID to spec

* Use apiKey in the current bidRequest

* Add referer info to payload

Co-authored-by: Nick Llerandi <nllerandi@triplelift.com>
Co-authored-by: Brandon Ling <51931757+blingster7@users.noreply.github.com>
Co-authored-by: Brandon Ling <bling@triplelift.com>
---
 modules/missenaBidAdapter.js                |  94 ++++++++++++++
 modules/missenaBidAdapter.md                |  70 +++++++++++
 test/spec/modules/missenaBidAdapter_spec.js | 131 ++++++++++++++++++++
 3 files changed, 295 insertions(+)
 create mode 100644 modules/missenaBidAdapter.js
 create mode 100644 modules/missenaBidAdapter.md
 create mode 100644 test/spec/modules/missenaBidAdapter_spec.js

diff --git a/modules/missenaBidAdapter.js b/modules/missenaBidAdapter.js
new file mode 100644
index 00000000000..2b1d6bdb118
--- /dev/null
+++ b/modules/missenaBidAdapter.js
@@ -0,0 +1,94 @@
+import * as utils from '../src/utils.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'missena';
+const ENDPOINT_URL = 'https://bid.missena.io/';
+
+export const spec = {
+  aliases: [BIDDER_CODE],
+  code: BIDDER_CODE,
+  gvlid: 687,
+  supportedMediaTypes: [BANNER],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    return typeof bid == 'object' && !!bid.params.apiKey;
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    return validBidRequests.map((bidRequest) => {
+      const payload = {
+        request_id: bidRequest.bidId,
+        timeout: bidderRequest.timeout,
+      };
+
+      if (bidderRequest && bidderRequest.refererInfo) {
+        payload.referer = bidderRequest.refererInfo.referer;
+        payload.referer_canonical = bidderRequest.refererInfo.canonicalUrl;
+      }
+
+      if (bidderRequest && bidderRequest.gdprConsent) {
+        payload.consent_string = bidderRequest.gdprConsent.consentString;
+        payload.consent_required = bidderRequest.gdprConsent.gdprApplies;
+      }
+
+      return {
+        method: 'POST',
+        url:
+          ENDPOINT_URL +
+          '?' +
+          utils.formatQS({
+            t: bidRequest.params.apiKey,
+          }),
+        data: JSON.stringify(payload),
+      };
+    });
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    const bidResponses = [];
+    const response = serverResponse.body;
+
+    if (response && !response.timeout && !!response.ad) {
+      bidResponses.push(response);
+    }
+
+    return bidResponses;
+  },
+
+  /**
+   * Register bidder specific code, which will execute if bidder timed out after an auction
+   * @param {data} Containing timeout specific data
+   */
+  onTimeout: function onTimeout(timeoutData) {
+    utils.logInfo('Missena - Timeout from adapter', timeoutData);
+  },
+
+  /**
+   * Register bidder specific code, which@ will execute if a bid from this bidder won the auction
+   * @param {Bid} The bid that won the auction
+   */
+  onBidWon: function (bid) {
+    utils.logInfo('Missena - Bid won', bid);
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/missenaBidAdapter.md b/modules/missenaBidAdapter.md
new file mode 100644
index 00000000000..d5fcacf04ab
--- /dev/null
+++ b/modules/missenaBidAdapter.md
@@ -0,0 +1,70 @@
+# Overview
+
+```
+Module Name:  Missena Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: jney@missena.com
+```
+
+## Introduction
+
+Connects to Missena for bids.
+
+**Note:** this adapter doesn't support SafeFrame.
+
+Useful resources:
+
+- [README](../README.md#Build)
+- [https://docs.prebid.org/dev-docs/bidder-adaptor.html](https://docs.prebid.org/dev-docs/bidder-adaptor.html)
+
+## Develop
+
+Setup the missena adapter in `integrationExamples/gpt/userId_example.html`.
+
+For example:
+
+```js
+const AD_UNIT_CODE = "test-div";
+const PUBLISHER_MISSENA_TOKEN = "PA-34745704";
+
+var adUnits = [
+  {
+    code: AD_UNIT_CODE,
+    mediaTypes: {
+      banner: {
+        sizes: [1, 1],
+      },
+    },
+    bids: [
+      {
+        bidder: "missena",
+        params: {
+          apiKey: PUBLISHER_MISSENA_TOKEN,
+        },
+      },
+    ],
+  },
+];
+```
+
+Then start the demo app:
+
+```shell
+gulp serve-fast --modules=missenaBidAdapter
+```
+
+And open [http://localhost:9999/integrationExamples/gpt/userId_example.html](http://localhost:9999/integrationExamples/gpt/userId_example.html)
+
+## Test
+
+```shell
+gulp test --file test/spec/modules/missenaBidAdapter_spec.js
+```
+
+Add the `--watch` option to re-run unit tests whenever the source code changes.
+
+## Build
+
+```shell
+gulp build --modules=missenaBidAdapter
+```
diff --git a/test/spec/modules/missenaBidAdapter_spec.js b/test/spec/modules/missenaBidAdapter_spec.js
new file mode 100644
index 00000000000..026e79c6d5a
--- /dev/null
+++ b/test/spec/modules/missenaBidAdapter_spec.js
@@ -0,0 +1,131 @@
+import { expect } from 'chai';
+import { spec, _getPlatform } from 'modules/missenaBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+
+describe('Missena Adapter', function () {
+  const adapter = newBidder(spec);
+
+  const bidId = 'abc';
+
+  const bid = {
+    bidder: 'missena',
+    bidId: bidId,
+    sizes: [[1, 1]],
+    params: {
+      apiKey: 'PA-34745704',
+    },
+  };
+
+  describe('codes', function () {
+    it('should return a bidder code of missena', function () {
+      expect(spec.code).to.equal('missena');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should return true if the apiKey param is present', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false if the apiKey is missing', function () {
+      expect(
+        spec.isBidRequestValid(Object.assign(bid, { params: {} }))
+      ).to.equal(false);
+    });
+
+    it('should return false if the apiKey is an empty string', function () {
+      expect(
+        spec.isBidRequestValid(Object.assign(bid, { params: { apiKey: '' } }))
+      ).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const consentString = 'AAAAAAAAA==';
+
+    const bidderRequest = {
+      gdprConsent: {
+        consentString: consentString,
+        gdprApplies: true,
+      },
+      refererInfo: {
+        referer: 'https://referer',
+        canonicalUrl: 'https://canonical',
+      },
+    };
+
+    const requests = spec.buildRequests([bid, bid], bidderRequest);
+    const request = requests[0];
+    const payload = JSON.parse(request.data);
+
+    it('should return as many server requests as bidder requests', function () {
+      expect(requests.length).to.equal(2);
+    });
+
+    it('should have a post method', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should send the bidder id', function () {
+      expect(payload.request_id).to.equal(bidId);
+    });
+
+    it('should send referer information to the request', function () {
+      expect(payload.referer).to.equal('https://referer');
+      expect(payload.referer_canonical).to.equal('https://canonical');
+    });
+
+    it('should send gdpr consent information to the request', function () {
+      expect(payload.consent_string).to.equal(consentString);
+      expect(payload.consent_required).to.equal(true);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const serverResponse = {
+      requestId: bidId,
+      cpm: 0.5,
+      currency: 'USD',
+      ad: '<!-- -->',
+    };
+
+    const serverTimeoutResponse = {
+      requestId: bidId,
+      timeout: true,
+      ad: '<!-- -->',
+    };
+
+    const serverEmptyAdResponse = {
+      requestId: bidId,
+      cpm: 0.5,
+      currency: 'USD',
+      ad: '',
+    };
+
+    it('should return a proper bid response', function () {
+      const result = spec.interpretResponse({ body: serverResponse }, bid);
+
+      expect(result.length).to.equal(1);
+
+      expect(Object.keys(result[0])).to.have.members(
+        Object.keys(serverResponse)
+      );
+    });
+
+    it('should return an empty response when the server answers with a timeout', function () {
+      const result = spec.interpretResponse(
+        { body: serverTimeoutResponse },
+        bid
+      );
+      expect(result).to.deep.equal([]);
+    });
+
+    it('should return an empty response when the server answers with an empty ad', function () {
+      const result = spec.interpretResponse(
+        { body: serverEmptyAdResponse },
+        bid
+      );
+      expect(result).to.deep.equal([]);
+    });
+  });
+});

From c27ff14b31c5a7a08695eda7dc929c768dbbb809 Mon Sep 17 00:00:00 2001
From: Harshad Mane <harshad.mane@pubmatic.com>
Date: Tue, 9 Feb 2021 02:12:10 -0800
Subject: [PATCH 233/304] Gulp test file example added in readme (#6287)

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 40df62ccee4..3e541080bf9 100644
--- a/README.md
+++ b/README.md
@@ -202,6 +202,11 @@ To run the unit tests:
 gulp test
 ```
 
+To run the unit tests for a perticular file (example for pubmaticBidAdapter_spec.js):
+```bash
+gulp test --file "test/spec/modules/pubmaticBidAdapter_spec.js"
+```
+
 To generate and view the code coverage reports:
 
 ```bash

From dde585bbd38d16157668a955690b00989dcf100b Mon Sep 17 00:00:00 2001
From: Pooja Pasawala <poojapasawala@gmail.com>
Date: Tue, 9 Feb 2021 02:38:53 -0800
Subject: [PATCH 234/304] Sharethrough: Add support for ID5, Shared ID, and
 Live Intent ID (#6261)

* Update prebid adapter universal ids to include ID5, SharedID, and LiveIntent ID.

[#176447070](https://www.pivotaltracker.com/story/show/176447070)

Co-authored-by: Mathieu Pheulpin <mpheulpin@sharethrough.com>

* Addressing review

[#176447070]

* Quick rewrite

[#176447070]

* Address ID5 review, forward linkType to adserver

* Reformatting SharedID to align with ID5

Co-authored-by: Mathieu Pheulpin <mpheulpin@sharethrough.com>
---
 modules/sharethroughBidAdapter.js             | 48 +++++++++++++------
 .../modules/sharethroughBidAdapter_spec.js    | 42 +++++++++++++++-
 2 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/modules/sharethroughBidAdapter.js b/modules/sharethroughBidAdapter.js
index 89484b1c68b..24be8673615 100644
--- a/modules/sharethroughBidAdapter.js
+++ b/modules/sharethroughBidAdapter.js
@@ -1,7 +1,7 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import * as utils from '../src/utils.js';
 
-const VERSION = '3.3.0';
+const VERSION = '3.3.1';
 const BIDDER_CODE = 'sharethrough';
 const STR_ENDPOINT = 'https://btlr.sharethrough.com/WYu2BXv1/v1';
 const DEFAULT_SIZE = [1, 1];
@@ -31,6 +31,8 @@ export const sharethroughAdapterSpec = {
         strVersion: VERSION
       };
 
+      Object.assign(query, handleUniversalIds(bidRequest));
+
       const nonHttp = sharethroughInternal.getProtocol().indexOf('http') < 0;
       query.secure = nonHttp || (sharethroughInternal.getProtocol().indexOf('https') > -1);
 
@@ -46,20 +48,6 @@ export const sharethroughAdapterSpec = {
         query.us_privacy = bidderRequest.uspConsent
       }
 
-      if (bidRequest.userId && bidRequest.userId.tdid) {
-        query.ttduid = bidRequest.userId.tdid;
-      }
-
-      if (bidRequest.userId && bidRequest.userId.pubcid) {
-        query.pubcid = bidRequest.userId.pubcid;
-      } else if (bidRequest.crumbs && bidRequest.crumbs.pubcid) {
-        query.pubcid = bidRequest.crumbs.pubcid;
-      }
-
-      if (bidRequest.userId && bidRequest.userId.idl_env) {
-        query.idluid = bidRequest.userId.idl_env;
-      }
-
       if (bidRequest.schain) {
         query.schain = JSON.stringify(bidRequest.schain);
       }
@@ -147,6 +135,36 @@ export const sharethroughAdapterSpec = {
   onSetTargeting: (bid) => {}
 };
 
+function handleUniversalIds(bidRequest) {
+  if (!bidRequest.userId) return {};
+
+  const universalIds = {};
+
+  const ttd = utils.deepAccess(bidRequest, 'userId.tdid');
+  if (ttd) universalIds.ttduid = ttd;
+
+  const pubc = utils.deepAccess(bidRequest, 'userId.pubcid') || utils.deepAccess(bidRequest, 'crumbs.pubcid');
+  if (pubc) universalIds.pubcid = pubc;
+
+  const idl = utils.deepAccess(bidRequest, 'userId.idl_env');
+  if (idl) universalIds.idluid = idl;
+
+  const id5 = utils.deepAccess(bidRequest, 'userId.id5id.uid');
+  if (id5) {
+    universalIds.id5uid = { id: id5 };
+    const id5link = utils.deepAccess(bidRequest, 'userId.id5id.ext.linkType');
+    if (id5link) universalIds.id5uid.linkType = id5link;
+  }
+
+  const lipb = utils.deepAccess(bidRequest, 'userId.lipb.lipbid');
+  if (lipb) universalIds.liuid = lipb;
+
+  const shd = utils.deepAccess(bidRequest, 'userId.sharedid');
+  if (shd) universalIds.shduid = shd; // object with keys: id & third
+
+  return universalIds;
+}
+
 function getLargestSize(sizes) {
   function area(size) {
     return size[0] * size[1];
diff --git a/test/spec/modules/sharethroughBidAdapter_spec.js b/test/spec/modules/sharethroughBidAdapter_spec.js
index cd9071a6098..b3451a09dde 100644
--- a/test/spec/modules/sharethroughBidAdapter_spec.js
+++ b/test/spec/modules/sharethroughBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import { expect } from 'chai';
 import { sharethroughAdapterSpec, sharethroughInternal } from 'modules/sharethroughBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+import * as utils from '../../../src/utils.js';
 
 const spec = newBidder(sharethroughAdapterSpec).getSpec();
 const bidRequests = [
@@ -15,7 +16,20 @@ const bidRequests = [
     userId: {
       tdid: 'fake-tdid',
       pubcid: 'fake-pubcid',
-      idl_env: 'fake-identity-link'
+      idl_env: 'fake-identity-link',
+      id5id: {
+        uid: 'fake-id5id',
+        ext: {
+          linkType: 2
+        }
+      },
+      sharedid: {
+        id: 'fake-sharedid',
+        third: 'fake-sharedthird'
+      },
+      lipb: {
+        lipbid: 'fake-lipbid'
+      }
     },
     crumbs: {
       pubcid: 'fake-pubcid-in-crumbs-obj'
@@ -329,6 +343,15 @@ describe('sharethrough adapter spec', function() {
       expect(bidRequest.data.pubcid).to.eq('fake-pubcid');
     });
 
+    it('should add the pubcid parameter if a bid request contains a value for the Publisher Common ID Module in the' +
+      ' crumbs object of the bidrequest', function() {
+      const bidData = utils.deepClone(bidRequests);
+      delete bidData[0].userId.pubcid;
+
+      const bidRequest = spec.buildRequests(bidData)[0];
+      expect(bidRequest.data.pubcid).to.eq('fake-pubcid-in-crumbs-obj');
+    });
+
     it('should add the pubcid parameter if a bid request contains a value for the Publisher Common ID Module in the' +
       ' crumbs object of the bidrequest', function() {
       const bidRequest = spec.buildRequests(bidRequests)[0];
@@ -341,6 +364,23 @@ describe('sharethrough adapter spec', function() {
       expect(bidRequest.data.idluid).to.eq('fake-identity-link');
     });
 
+    it('should add the id5uid parameter if a bid request contains a value for ID5', function() {
+      const bidRequest = spec.buildRequests(bidRequests)[0];
+      expect(bidRequest.data.id5uid.id).to.eq('fake-id5id');
+      expect(bidRequest.data.id5uid.linkType).to.eq(2);
+    });
+
+    it('should add the shduid parameter if a bid request contains a value for Shared ID', function() {
+      const bidRequest = spec.buildRequests(bidRequests)[0];
+      expect(bidRequest.data.shduid.id).to.eq('fake-sharedid');
+      expect(bidRequest.data.shduid.third).to.eq('fake-sharedthird');
+    });
+
+    it('should add the liuid parameter if a bid request contains a value for LiveIntent ID', function() {
+      const bidRequest = spec.buildRequests(bidRequests)[0];
+      expect(bidRequest.data.liuid).to.eq('fake-lipbid');
+    });
+
     it('should add Sharethrough specific parameters', function() {
       const builtBidRequests = spec.buildRequests(bidRequests);
       expect(builtBidRequests[0]).to.deep.include({

From 73cfeb537a9ffbca707e80c1c171d14f57b46869 Mon Sep 17 00:00:00 2001
From: lowendavid <66423906+lowendavid@users.noreply.github.com>
Date: Tue, 9 Feb 2021 11:39:14 +0100
Subject: [PATCH 235/304] SmartAdServer Bid Adapter: image sync and noAd
 (#6236)

* SIM-889 Now we have image based sync

* SIM-889 Added test to check noad and image sync

* SIM-889 Fixing indenting issues
---
 modules/smartadserverBidAdapter.js            | 12 +++-
 .../modules/smartadserverBidAdapter_spec.js   | 69 ++++++++++++++++++-
 2 files changed, 78 insertions(+), 3 deletions(-)

diff --git a/modules/smartadserverBidAdapter.js b/modules/smartadserverBidAdapter.js
index ed9003e3b4d..bb9364c72c3 100644
--- a/modules/smartadserverBidAdapter.js
+++ b/modules/smartadserverBidAdapter.js
@@ -135,7 +135,7 @@ export const spec = {
     const bidResponses = [];
     let response = serverResponse.body;
     try {
-      if (response) {
+      if (response && !response.isNoAd) {
         const bidRequest = JSON.parse(bidRequestString.data);
 
         let bidResponse = {
@@ -147,7 +147,8 @@ export const spec = {
           dealId: response.dealId,
           currency: response.currency,
           netRevenue: response.isNetCpm,
-          ttl: response.ttl
+          ttl: response.ttl,
+          dspPixels: response.dspPixels
         };
 
         if (bidRequest.mediaType === VIDEO) {
@@ -182,6 +183,13 @@ export const spec = {
         type: 'iframe',
         url: serverResponses[0].body.cSyncUrl
       });
+    } else if (syncOptions.pixelEnabled && serverResponses.length > 0 && serverResponses[0].body.dspPixels !== undefined) {
+      serverResponses[0].body.dspPixels.forEach(function(pixel) {
+        syncs.push({
+          type: 'image',
+          url: pixel
+        });
+      });
     }
     return syncs;
   }
diff --git a/test/spec/modules/smartadserverBidAdapter_spec.js b/test/spec/modules/smartadserverBidAdapter_spec.js
index e3bca240a47..749de43b9af 100644
--- a/test/spec/modules/smartadserverBidAdapter_spec.js
+++ b/test/spec/modules/smartadserverBidAdapter_spec.js
@@ -115,7 +115,41 @@ describe('Smart bid adapter tests', function () {
       ttl: 300,
       adUrl: 'http://awesome.fake.url',
       ad: '< --- awesome script --- >',
-      cSyncUrl: 'http://awesome.fake.csync.url'
+      cSyncUrl: 'http://awesome.fake.csync.url',
+      isNoAd: false
+    }
+  };
+
+  var BID_RESPONSE_IS_NO_AD = {
+    body: {
+      cpm: 12,
+      width: 300,
+      height: 250,
+      creativeId: 'zioeufg',
+      currency: 'GBP',
+      isNetCpm: true,
+      ttl: 300,
+      adUrl: 'http://awesome.fake.url',
+      ad: '< --- awesome script --- >',
+      cSyncUrl: 'http://awesome.fake.csync.url',
+      isNoAd: true
+    }
+  };
+
+  var BID_RESPONSE_IMAGE_SYNC = {
+    body: {
+      cpm: 12,
+      width: 300,
+      height: 250,
+      creativeId: 'zioeufg',
+      currency: 'GBP',
+      isNetCpm: true,
+      ttl: 300,
+      adUrl: 'http://awesome.fake.url',
+      ad: '< --- awesome script --- >',
+      cSyncUrl: 'http://awesome.fake.csync.url',
+      isNoAd: false,
+      dspPixels: ['pixelOne', 'pixelTwo', 'pixelThree']
     }
   };
 
@@ -149,6 +183,18 @@ describe('Smart bid adapter tests', function () {
     expect(requestContent).to.have.property('ckid').and.to.equal(42);
   });
 
+  it('Verify parse response with no ad', function () {
+    const request = spec.buildRequests(DEFAULT_PARAMS);
+    const bids = spec.interpretResponse(BID_RESPONSE_IS_NO_AD, request[0]);
+    expect(bids).to.have.lengthOf(0);
+
+    expect(function () {
+      spec.interpretResponse(BID_RESPONSE_IS_NO_AD, {
+        data: 'invalid Json'
+      })
+    }).to.not.throw();
+  });
+
   it('Verify parse response', function () {
     const request = spec.buildRequests(DEFAULT_PARAMS);
     const bids = spec.interpretResponse(BID_RESPONSE, request[0]);
@@ -258,6 +304,27 @@ describe('Smart bid adapter tests', function () {
     expect(syncs).to.have.lengthOf(0);
   });
 
+  it('Verifies user sync using dspPixels', function () {
+    var syncs = spec.getUserSyncs({
+      iframeEnabled: false,
+      pixelEnabled: true
+    }, [BID_RESPONSE_IMAGE_SYNC]);
+    expect(syncs).to.have.lengthOf(3);
+    expect(syncs[0].type).to.equal('image');
+
+    syncs = spec.getUserSyncs({
+      iframeEnabled: false,
+      pixelEnabled: false
+    }, [BID_RESPONSE_IMAGE_SYNC]);
+    expect(syncs).to.have.lengthOf(0);
+
+    syncs = spec.getUserSyncs({
+      iframeEnabled: false,
+      pixelEnabled: true
+    }, []);
+    expect(syncs).to.have.lengthOf(0);
+  });
+
   describe('gdpr tests', function () {
     afterEach(function () {
       config.resetConfig();

From fae47aab59b29b54421b57cfc22ab9271b436ebf Mon Sep 17 00:00:00 2001
From: iskmerof <matt.foremski@gmail.com>
Date: Wed, 10 Feb 2021 06:19:01 -0500
Subject: [PATCH 236/304] Add client Alias Adkernel (#6291)

Adding "bcm" alias to Adkernel adapter
---
 modules/adkernelBidAdapter.js                | 2 +-
 test/spec/modules/adkernelBidAdapter_spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
index 20ed65fe2e2..03fa5c2b2d9 100644
--- a/modules/adkernelBidAdapter.js
+++ b/modules/adkernelBidAdapter.js
@@ -52,7 +52,7 @@ const NATIVE_INDEX = NATIVE_MODEL.reduce((acc, val, idx) => {
 export const spec = {
 
   code: 'adkernel',
-  aliases: ['headbidding', 'adsolut', 'oftmediahb', 'audiencemedia', 'waardex_ak', 'roqoon', 'andbeyond', 'adbite', 'houseofpubs', 'torchad', 'stringads'],
+  aliases: ['headbidding', 'adsolut', 'oftmediahb', 'audiencemedia', 'waardex_ak', 'roqoon', 'andbeyond', 'adbite', 'houseofpubs', 'torchad', 'stringads', 'bcm'],
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   /**
diff --git a/test/spec/modules/adkernelBidAdapter_spec.js b/test/spec/modules/adkernelBidAdapter_spec.js
index 4454aa00a71..0d772423a22 100644
--- a/test/spec/modules/adkernelBidAdapter_spec.js
+++ b/test/spec/modules/adkernelBidAdapter_spec.js
@@ -556,7 +556,7 @@ describe('Adkernel adapter', function () {
 
   describe('adapter configuration', () => {
     it('should have aliases', () => {
-      expect(spec.aliases).to.have.lengthOf(11);
+      expect(spec.aliases).to.have.lengthOf(12);
     });
   });
 

From 4a7b465d6bd640046b7da3675e203082caed2cd4 Mon Sep 17 00:00:00 2001
From: Ian Flournoy <ian@flournoy.us>
Date: Wed, 10 Feb 2021 06:55:26 -0500
Subject: [PATCH 237/304] [ParrableIdSystem] Add GVLID and handle TC Consent
 data (#6283)

* Added GDPR support

* Remove forgotten .only

Co-authored-by: Victor <victorigualada@gmail.com>
---
 modules/parrableIdSystem.js                | 22 ++++++++++++---
 test/spec/modules/parrableIdSystem_spec.js | 32 ++++++++++++++++++++++
 2 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/modules/parrableIdSystem.js b/modules/parrableIdSystem.js
index afaf794513e..f072de8736f 100644
--- a/modules/parrableIdSystem.js
+++ b/modules/parrableIdSystem.js
@@ -14,12 +14,13 @@ import { getStorageManager } from '../src/storageManager.js';
 
 const PARRABLE_URL = 'https://h.parrable.com/prebid';
 const PARRABLE_COOKIE_NAME = '_parrable_id';
+const PARRABLE_GVLID = 928;
 const LEGACY_ID_COOKIE_NAME = '_parrable_eid';
 const LEGACY_OPTOUT_COOKIE_NAME = '_parrable_optout';
 const ONE_YEAR_MS = 364 * 24 * 60 * 60 * 1000;
 const EXPIRE_COOKIE_DATE = 'Thu, 01 Jan 1970 00:00:00 GMT';
 
-const storage = getStorageManager();
+const storage = getStorageManager(PARRABLE_GVLID);
 
 function getExpirationDate() {
   const oneYearFromNow = new Date(utils.timestamp() + ONE_YEAR_MS);
@@ -167,7 +168,7 @@ function shouldFilterImpression(configParams, parrableId) {
   return !isAllowed() || isBlocked();
 }
 
-function fetchId(configParams) {
+function fetchId(configParams, gdprConsentData) {
   if (!isValidConfig(configParams)) return;
 
   let parrableId = readCookie();
@@ -183,6 +184,8 @@ function fetchId(configParams) {
   const eid = (parrableId) ? parrableId.eid : null;
   const refererInfo = getRefererInfo();
   const uspString = uspDataHandler.getConsentData();
+  const gdprApplies = (gdprConsentData && typeof gdprConsentData.gdprApplies === 'boolean' && gdprConsentData.gdprApplies);
+  const gdprConsentString = (gdprConsentData && gdprApplies && gdprConsentData.consentString) || '';
   const partners = configParams.partners || configParams.partner
   const trackers = typeof partners === 'string'
     ? partners.split(',')
@@ -198,6 +201,7 @@ function fetchId(configParams) {
 
   const searchParams = {
     data: encodeBase64UrlSafe(btoa(JSON.stringify(data))),
+    gdpr: gdprApplies ? 1 : 0,
     _rand: Math.random()
   };
 
@@ -205,6 +209,10 @@ function fetchId(configParams) {
     searchParams.us_privacy = uspString;
   }
 
+  if (gdprApplies) {
+    searchParams.gdpr_consent = gdprConsentString;
+  }
+
   const options = {
     method: 'GET',
     withCredentials: true
@@ -251,7 +259,7 @@ function fetchId(configParams) {
     callback,
     id: parrableId
   };
-};
+}
 
 /** @type {Submodule} */
 export const parrableIdSubmodule = {
@@ -260,6 +268,12 @@ export const parrableIdSubmodule = {
    * @type {string}
    */
   name: 'parrableId',
+  /**
+   * Global Vendor List ID
+   * @type {number}
+   */
+  gvlid: PARRABLE_GVLID,
+
   /**
    * decode the stored id value for passing to bid requests
    * @function
@@ -282,7 +296,7 @@ export const parrableIdSubmodule = {
    */
   getId(config, gdprConsentData, currentStoredId) {
     const configParams = (config && config.params) || {};
-    return fetchId(configParams);
+    return fetchId(configParams, gdprConsentData);
   }
 };
 
diff --git a/test/spec/modules/parrableIdSystem_spec.js b/test/spec/modules/parrableIdSystem_spec.js
index 5a10529778c..f0aac7666f9 100644
--- a/test/spec/modules/parrableIdSystem_spec.js
+++ b/test/spec/modules/parrableIdSystem_spec.js
@@ -210,6 +210,38 @@ describe('Parrable ID System', function() {
         removeParrableCookie();
       });
     });
+
+    describe('GDPR consent', () => {
+      let callbackSpy = sinon.spy();
+
+      const config = {
+        params: {
+          partner: 'partner'
+        }
+      };
+
+      const gdprConsentTestCases = [
+        { consentData: { gdprApplies: true, consentString: 'expectedConsentString' }, expected: { gdpr: 1, gdpr_consent: 'expectedConsentString' } },
+        { consentData: { gdprApplies: false, consentString: 'expectedConsentString' }, expected: { gdpr: 0 } },
+        { consentData: { gdprApplies: true, consentString: undefined }, expected: { gdpr: 1, gdpr_consent: '' } },
+        { consentData: { gdprApplies: 'yes', consentString: 'expectedConsentString' }, expected: { gdpr: 0 } },
+        { consentData: undefined, expected: { gdpr: 0 } }
+      ];
+
+      gdprConsentTestCases.forEach((testCase, index) => {
+        it(`should call user sync url with the gdprConsent - case ${index}`, () => {
+          parrableIdSubmodule.getId(config, testCase.consentData).callback(callbackSpy);
+
+          if (testCase.expected.gdpr === 1) {
+            expect(server.requests[0].url).to.contain('gdpr=' + testCase.expected.gdpr);
+            expect(server.requests[0].url).to.contain('gdpr_consent=' + testCase.expected.gdpr_consent);
+          } else {
+            expect(server.requests[0].url).to.contain('gdpr=' + testCase.expected.gdpr);
+            expect(server.requests[0].url).to.not.contain('gdpr_consent');
+          }
+        })
+      });
+    });
   });
 
   describe('parrableIdSystem.decode()', function() {

From 8e2501e881d6f2790d474e1393b56d9af5400478 Mon Sep 17 00:00:00 2001
From: Matt Kendall <1870166+mkendall07@users.noreply.github.com>
Date: Wed, 10 Feb 2021 16:24:04 -0500
Subject: [PATCH 238/304] 4.26.0 release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d8b6af04379..97020126830 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.26.0-pre",
+  "version": "4.26.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From ff0b015c96c1c707ca66a66505a350c935adac62 Mon Sep 17 00:00:00 2001
From: Matt Kendall <1870166+mkendall07@users.noreply.github.com>
Date: Wed, 10 Feb 2021 16:38:25 -0500
Subject: [PATCH 239/304] 4.27.0-pre

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 97020126830..45493de7aea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.26.0",
+  "version": "4.27.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From a037c5455b038b25c0be07a1625aac4761ef7f3e Mon Sep 17 00:00:00 2001
From: pnh-pubx <73683023+pnh-pubx@users.noreply.github.com>
Date: Thu, 11 Feb 2021 04:34:49 +0530
Subject: [PATCH 240/304] Updated data mapping of winning bid and auction logs
 in pubxai analytics adapter (#6285)

Co-authored-by: Phaneendra Hegde <phaneendra.hegde@gmail.com>
---
 modules/pubxaiAnalyticsAdapter.js             |  13 +-
 .../modules/pubxaiAnalyticsAdapter_spec.js    | 164 ++++++------------
 2 files changed, 64 insertions(+), 113 deletions(-)

diff --git a/modules/pubxaiAnalyticsAdapter.js b/modules/pubxaiAnalyticsAdapter.js
index 7e2f5061621..894752d607b 100644
--- a/modules/pubxaiAnalyticsAdapter.js
+++ b/modules/pubxaiAnalyticsAdapter.js
@@ -27,9 +27,13 @@ var pubxaiAnalyticsAdapter = Object.assign(adapter(
       if (eventType === CONSTANTS.EVENTS.BID_TIMEOUT) {
         args.forEach(item => { mapBidResponse(item, 'timeout'); });
       } else if (eventType === CONSTANTS.EVENTS.AUCTION_INIT) {
-        events.auctionInit = args;
+        events.floorDetail = {};
+        if (typeof args.bidderRequests[0].bids[0] !== 'undefined' && typeof args.bidderRequests[0].bids[0].floorData !== 'undefined') {
+          Object.assign(events.floorDetail, args.bidderRequests[0].bids[0].floorData);
+        }
         auctionTimestamp = args.timestamp;
       } else if (eventType === CONSTANTS.EVENTS.BID_REQUESTED) {
+        events.bids = [];
         mapBidRequests(args).forEach(item => { events.bids.push(item) });
       } else if (eventType === CONSTANTS.EVENTS.BID_RESPONSE) {
         mapBidResponse(args, 'response');
@@ -56,6 +60,8 @@ function mapBidRequests(params) {
         adUnitCode: bid.adUnitCode,
         requestId: bid.bidderRequestId,
         auctionId: bid.auctionId,
+        placementId: bid.params.placementId,
+        floorData: bid.floorData,
         transactionId: bid.transactionId,
         sizes: utils.parseSizesInput(bid.mediaTypes.banner.sizes).toString(),
         renderStatus: 1,
@@ -134,8 +140,9 @@ pubxaiAnalyticsAdapter.shouldFireEventRequest = function (samplingRate = 1) {
 function send(data, status) {
   if (pubxaiAnalyticsAdapter.shouldFireEventRequest(initOptions.samplingRate)) {
     let location = utils.getWindowLocation();
-    if (typeof data !== 'undefined' && typeof data.auctionInit !== 'undefined') {
-      Object.assign(data.auctionInit, { host: location.host, path: location.pathname, search: location.search });
+    if (typeof data !== 'undefined') {
+      data.pageDetail = {};
+      Object.assign(data.pageDetail, { host: location.host, path: location.pathname, search: location.search });
     }
     data.initOptions = initOptions;
 
diff --git a/test/spec/modules/pubxaiAnalyticsAdapter_spec.js b/test/spec/modules/pubxaiAnalyticsAdapter_spec.js
index 91c81dcae8d..95245f2c6c9 100644
--- a/test/spec/modules/pubxaiAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubxaiAnalyticsAdapter_spec.js
@@ -27,6 +27,8 @@ describe('pubxai analytics adapter', function() {
       pubxId: '6c415fc0-8b0e-4cf5-be73-01526a4db625'
     };
 
+    let location = utils.getWindowLocation();
+
     let prebidEvent = {
       'auctionInit': {
         'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
@@ -219,6 +221,12 @@ describe('pubxai analytics adapter', function() {
         'originalCpm': 0.5,
         'originalCurrency': 'USD',
         'floorData': {
+          'fetchStatus': 'success',
+          'floorProvider': 'PubXFloor',
+          'location': 'fetch',
+          'modelVersion': 'new model 1.0',
+          'skipRate': 0,
+          'skipped': false,
           'floorValue': 0.4,
           'floorRule': '/19968336/header-bid-tag-1|banner',
           'floorCurrency': 'USD',
@@ -381,6 +389,12 @@ describe('pubxai analytics adapter', function() {
           'originalCpm': 0.5,
           'originalCurrency': 'USD',
           'floorData': {
+            'fetchStatus': 'success',
+            'floorProvider': 'PubXFloor',
+            'location': 'fetch',
+            'modelVersion': 'new model 1.0',
+            'skipRate': 0,
+            'skipped': false,
             'floorValue': 0.4,
             'floorRule': '/19968336/header-bid-tag-1|banner',
             'floorCurrency': 'USD',
@@ -449,6 +463,12 @@ describe('pubxai analytics adapter', function() {
         'originalCpm': 0.5,
         'originalCurrency': 'USD',
         'floorData': {
+          'fetchStatus': 'success',
+          'floorProvider': 'PubXFloor',
+          'location': 'fetch',
+          'modelVersion': 'new model 1.0',
+          'skipRate': 0,
+          'skipped': false,
           'floorValue': 0.4,
           'floorRule': '/19968336/header-bid-tag-1|banner',
           'floorCurrency': 'USD',
@@ -488,9 +508,13 @@ describe('pubxai analytics adapter', function() {
         'params': [{
           'placementId': 13144370
         }]
-      }
+      },
+      'pageDetail': {
+        'host': location.host,
+        'path': location.pathname,
+        'search': location.search
+      },
     };
-    let location = utils.getWindowLocation();
 
     let expectedAfterBid = {
       'bids': [{
@@ -509,6 +533,12 @@ describe('pubxai analytics adapter', function() {
         'mediaType': 'banner',
         'statusMessage': 'Bid available',
         'floorData': {
+          'fetchStatus': 'success',
+          'floorProvider': 'PubXFloor',
+          'location': 'fetch',
+          'modelVersion': 'new model 1.0',
+          'skipRate': 0,
+          'skipped': false,
           'floorValue': 0.4,
           'floorRule': '/19968336/header-bid-tag-1|banner',
           'floorCurrency': 'USD',
@@ -527,118 +557,21 @@ describe('pubxai analytics adapter', function() {
         'timeToRespond': 267,
         'responseTimestamp': 1603865707449,
         'platform': navigator.platform,
+        'placementId': 13144370,
         'deviceType': getDeviceType()
       }],
-      'auctionInit': {
+      'pageDetail': {
         'host': location.host,
         'path': location.pathname,
-        'search': location.search,
-        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-        'timestamp': 1603865707180,
-        'auctionStatus': 'inProgress',
-        'adUnits': [{
-          'code': '/19968336/header-bid-tag-1',
-          'mediaTypes': {
-            'banner': {
-              'sizes': [
-                [
-                  300,
-                  250
-                ]
-              ]
-            }
-          },
-          'bids': [{
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': 13144370
-            },
-            'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-            'floorData': {
-              'skipped': false,
-              'skipRate': 0,
-              'modelVersion': 'new model 1.0',
-              'location': 'fetch',
-              'floorProvider': 'PubXFloor',
-              'fetchStatus': 'success'
-            }
-          }],
-          'sizes': [
-            [
-              300,
-              250
-            ]
-          ],
-          'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294'
-        }],
-        'adUnitCodes': [
-          '/19968336/header-bid-tag-1'
-        ],
-        'bidderRequests': [{
-          'bidderCode': 'appnexus',
-          'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-          'bidderRequestId': '184cbc05bb90ba',
-          'bids': [{
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': 13144370
-            },
-            'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
-            'floorData': {
-              'skipped': false,
-              'skipRate': 0,
-              'modelVersion': 'new model 1.0',
-              'location': 'fetch',
-              'floorProvider': 'PubXFloor',
-              'fetchStatus': 'success'
-            },
-            'mediaTypes': {
-              'banner': {
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ]
-                ]
-              }
-            },
-            'adUnitCode': '/19968336/header-bid-tag-1',
-            'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294',
-            'sizes': [
-              [
-                300,
-                250
-              ]
-            ],
-            'bidId': '248f9a4489835e',
-            'bidderRequestId': '184cbc05bb90ba',
-            'src': 'client',
-            'bidRequestsCount': 1,
-            'bidderRequestsCount': 1,
-            'bidderWinsCount': 0
-          }],
-          'auctionStart': 1603865707180,
-          'timeout': 1000,
-          'refererInfo': {
-            'referer': 'http://local-pnh.net:8080/stream/',
-            'reachedTop': true,
-            'isAmp': false,
-            'numIframes': 0,
-            'stack': [
-              'http://local-pnh.net:8080/stream/'
-            ],
-            'canonicalUrl': null
-          },
-          'start': 1603865707182
-        }],
-        'noBids': [],
-        'bidsReceived': [],
-        'winningBids': [],
-        'timeout': 1000,
-        'config': {
-          'samplingRate': '1',
-          'pubxId': '6c415fc0-8b0e-4cf5-be73-01526a4db625'
-        }
+        'search': location.search
+      },
+      'floorDetail': {
+        'fetchStatus': 'success',
+        'floorProvider': 'PubXFloor',
+        'location': 'fetch',
+        'modelVersion': 'new model 1.0',
+        'skipRate': 0,
+        'skipped': false
       },
       'initOptions': initOptions
     };
@@ -660,6 +593,12 @@ describe('pubxai analytics adapter', function() {
         'status': 'rendered',
         'statusMessage': 'Bid available',
         'floorData': {
+          'fetchStatus': 'success',
+          'floorProvider': 'PubXFloor',
+          'location': 'fetch',
+          'modelVersion': 'new model 1.0',
+          'skipRate': 0,
+          'skipped': false,
           'floorValue': 0.4,
           'floorRule': '/19968336/header-bid-tag-1|banner',
           'floorCurrency': 'USD',
@@ -680,6 +619,11 @@ describe('pubxai analytics adapter', function() {
         'platform': navigator.platform,
         'deviceType': getDeviceType()
       },
+      'pageDetail': {
+        'host': location.host,
+        'path': location.pathname,
+        'search': location.search
+      },
       'initOptions': initOptions
     }
 

From c9e8869ddd867a475efa4531d594ed422252aa8c Mon Sep 17 00:00:00 2001
From: TheMediaGrid <44166371+TheMediaGrid@users.noreply.github.com>
Date: Thu, 11 Feb 2021 14:41:38 +0300
Subject: [PATCH 241/304] Grid Bid Adapter: Added video protocols to the ad
 request (#6299)

---
 modules/gridBidAdapter.js                | 6 +++++-
 test/spec/modules/gridBidAdapter_spec.js | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js
index 6e610b67e0e..b296fe39ae4 100644
--- a/modules/gridBidAdapter.js
+++ b/modules/gridBidAdapter.js
@@ -365,7 +365,7 @@ function _addBidResponse(serverBid, bidRequest, bidResponses) {
 }
 
 function createVideoRequest(bid, mediaType) {
-  const {playerSize, mimes, durationRangeSec} = mediaType;
+  const {playerSize, mimes, durationRangeSec, protocols} = mediaType;
   const size = (playerSize || bid.sizes || [])[0];
   if (!size) return;
 
@@ -380,6 +380,10 @@ function createVideoRequest(bid, mediaType) {
     result.maxduration = durationRangeSec[1];
   }
 
+  if (protocols && protocols.length) {
+    result.protocols = protocols;
+  }
+
   return result;
 }
 
diff --git a/test/spec/modules/gridBidAdapter_spec.js b/test/spec/modules/gridBidAdapter_spec.js
index 084c67562e6..b4e87119111 100644
--- a/test/spec/modules/gridBidAdapter_spec.js
+++ b/test/spec/modules/gridBidAdapter_spec.js
@@ -105,7 +105,8 @@ describe('TheMediaGrid Adapter', function () {
         'sizes': [[728, 90]],
         'mediaTypes': {
           'video': {
-            'playerSize': [[400, 600]]
+            'playerSize': [[400, 600]],
+            'protocols': [1, 2, 3]
           },
           'banner': {
             'sizes': [[728, 90]]
@@ -281,7 +282,8 @@ describe('TheMediaGrid Adapter', function () {
           },
           'video': {
             'w': 400,
-            'h': 600
+            'h': 600,
+            'protocols': [1, 2, 3]
           }
         }]
       });

From f672209110ef30b9cdf96048d4e8285d43716b4a Mon Sep 17 00:00:00 2001
From: bretg <bgorsline@gmail.com>
Date: Thu, 11 Feb 2021 06:52:17 -0500
Subject: [PATCH 242/304] Rubicon Bid Adapter: updated transactionId to
 auctionId for OpenRTB (#6298)

---
 modules/rubiconBidAdapter.js                | 4 ++--
 test/spec/modules/rubiconBidAdapter_spec.js | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index 395b7a693b2..e9f25c9411e 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -153,7 +153,7 @@ export const spec = {
         test: config.getConfig('debug') ? 1 : 0,
         cur: ['USD'],
         source: {
-          tid: bidRequest.transactionId
+          tid: bidRequest.auctionId
         },
         tmax: bidderRequest.timeout,
         imp: [{
@@ -424,7 +424,7 @@ export const spec = {
       'rp_floor': (params.floor = parseFloat(params.floor)) >= 0.01 ? params.floor : undefined,
       'rp_secure': '1',
       'tk_flint': `${rubiConf.int_type || DEFAULT_INTEGRATION}_v$prebid.version$`,
-      'x_source.tid': bidRequest.transactionId,
+      'x_source.tid': bidRequest.auctionId,
       'x_source.pchain': params.pchain,
       'p_screen_res': _getScreenResolution(),
       'tk_user_key': params.userId,
diff --git a/test/spec/modules/rubiconBidAdapter_spec.js b/test/spec/modules/rubiconBidAdapter_spec.js
index 8c25d97dada..5b881299210 100644
--- a/test/spec/modules/rubiconBidAdapter_spec.js
+++ b/test/spec/modules/rubiconBidAdapter_spec.js
@@ -415,7 +415,7 @@ describe('the rubicon adapter', function () {
             'rp_secure': /[01]/,
             'rand': '0.1',
             'tk_flint': INTEGRATION,
-            'x_source.tid': 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',
+            'x_source.tid': 'c45dd708-a418-42ec-b8a7-b70a6c6fab0a',
             'x_source.pchain': 'GAM:11111-reseller1:22222',
             'p_screen_res': /\d+x\d+/,
             'tk_user_key': '12346',
@@ -572,7 +572,7 @@ describe('the rubicon adapter', function () {
             'rp_secure': /[01]/,
             'rand': '0.1',
             'tk_flint': INTEGRATION,
-            'x_source.tid': 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',
+            'x_source.tid': 'c45dd708-a418-42ec-b8a7-b70a6c6fab0a',
             'p_screen_res': /\d+x\d+/,
             'tk_user_key': '12346',
             'kw': 'a,b,c',
@@ -895,7 +895,7 @@ describe('the rubicon adapter', function () {
               'rp_secure': /[01]/,
               'rand': '0.1',
               'tk_flint': INTEGRATION,
-              'x_source.tid': 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',
+              'x_source.tid': 'c45dd708-a418-42ec-b8a7-b70a6c6fab0a',
               'p_screen_res': /\d+x\d+/,
               'tk_user_key': '12346',
               'kw': 'a,b,c',
@@ -2067,7 +2067,7 @@ describe('the rubicon adapter', function () {
             'p_pos': 'atf',
             'rp_secure': /[01]/,
             'tk_flint': INTEGRATION,
-            'x_source.tid': 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',
+            'x_source.tid': 'c45dd708-a418-42ec-b8a7-b70a6c6fab0a',
             'p_screen_res': /\d+x\d+/,
             'tk_user_key': '12346',
             'kw': 'a,b,c',

From 2702e964cd0d540002450ddacd776f7c1b635794 Mon Sep 17 00:00:00 2001
From: Harshad Mane <harshad.mane@pubmatic.com>
Date: Fri, 12 Feb 2021 02:50:29 -0800
Subject: [PATCH 243/304] Fix for Issue 6117: Added Module Name in Build to
 Comments (#6297)

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

diff --git a/gulpfile.js b/gulpfile.js
index b7a9e442a8c..51536992bd0 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -31,7 +31,7 @@ const execa = require('execa');
 
 var prebid = require('./package.json');
 var dateString = 'Updated : ' + (new Date()).toISOString().substring(0, 10);
-var banner = '/* <%= prebid.name %> v<%= prebid.version %>\n' + dateString + ' */\n';
+var banner = '/* <%= prebid.name %> v<%= prebid.version %>\n' + dateString + '\nModules: <%= modules %> */\n';
 var port = 9999;
 const FAKE_SERVER_HOST = argv.host ? argv.host : 'localhost';
 const FAKE_SERVER_PORT = 4444;
@@ -157,12 +157,13 @@ function makeWebpackPkg() {
 
   const analyticsSources = helpers.getAnalyticsSources();
   const moduleSources = helpers.getModulePaths(externalModules);
+  const modulesString = (externalModules.length > 0) ? externalModules.join(', ') :  'All available modules in current version.';
 
   return gulp.src([].concat(moduleSources, analyticsSources, 'src/prebid.js'))
     .pipe(helpers.nameModules(externalModules))
     .pipe(webpackStream(cloned, webpack))
     .pipe(uglify())
-    .pipe(gulpif(file => file.basename === 'prebid-core.js', header(banner, { prebid: prebid })))
+    .pipe(gulpif(file => file.basename === 'prebid-core.js', header(banner, { prebid: prebid, modules: modulesString })))
     .pipe(gulp.dest('build/dist'));
 }
 

From a6c3986c0a306f4dc50b149d4a5f617282741a96 Mon Sep 17 00:00:00 2001
From: Patrick McCann <patmmccann@gmail.com>
Date: Fri, 12 Feb 2021 06:39:20 -0500
Subject: [PATCH 244/304] map tripleliftBidAdapter.js tl_source to
 bid.meta.mediaType (#6303)

---
 modules/tripleliftBidAdapter.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/tripleliftBidAdapter.js b/modules/tripleliftBidAdapter.js
index f97165f3d1c..029cdd68331 100644
--- a/modules/tripleliftBidAdapter.js
+++ b/modules/tripleliftBidAdapter.js
@@ -322,6 +322,14 @@ function _buildResponseObject(bidderRequest, bid) {
     if (bid.adomain && bid.adomain.length) {
       bidResponse.meta.advertiserDomains = bid.adomain;
     }
+
+    if (bid.tl_source && bid.tl_source == 'hdx') {
+      bidResponse.meta.mediaType = 'banner';
+    }
+
+    if (bid.tl_source && bid.tl_source == 'tlx') {
+      bidResponse.meta.mediaType = 'native';
+    }
   };
   return bidResponse;
 }

From 62ca969575e82eb1ae5416e412982d562d74c2d5 Mon Sep 17 00:00:00 2001
From: prebidtappx <77485538+prebidtappx@users.noreply.github.com>
Date: Fri, 12 Feb 2021 15:54:43 +0100
Subject: [PATCH 245/304] Tappx Bid Adapter: new bidder adapter added (#6233)

* ADD: tappx bid adapter

* FIX: replace .includes by .indexOf

* UPDATE: Expand the test coverage

* FIX: format spacing tests

* FIX: get auctionId from validBidRequests

* UPDATE: add bannerMediaType tablet sizes

* FIX: get timeout from bidderRequest.timeout

* UPDATE: replace the way to get the hostname

* UPDATE: adding  support multiple bid requests in a single call

* UPDATE: remove hardcoded test payload param

Co-authored-by: marc_tappx <marc@tappx.com>
---
 modules/tappxBidAdapter.js                | 289 ++++++++++++++++++++++
 modules/tappxBidAdapter.md                |  37 +++
 test/spec/modules/tappxBidAdapter_spec.js |  86 +++++++
 3 files changed, 412 insertions(+)
 create mode 100644 modules/tappxBidAdapter.js
 create mode 100644 modules/tappxBidAdapter.md
 create mode 100644 test/spec/modules/tappxBidAdapter_spec.js

diff --git a/modules/tappxBidAdapter.js b/modules/tappxBidAdapter.js
new file mode 100644
index 00000000000..7782f151802
--- /dev/null
+++ b/modules/tappxBidAdapter.js
@@ -0,0 +1,289 @@
+'use strict';
+
+import * as utils from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'tappx';
+const TTL = 360;
+const CUR = 'USD';
+var HOST;
+var hostDomain;
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+  */
+  isBidRequestValid: function(bid) {
+    if ((bid.params == null) || (bid.params.endpoint == null) || (bid.params.tappxkey == null)) {
+      utils.logWarn(`[TAPPX]: Please review the mandatory Tappx parameters. ${JSON.stringify(bid)}`);
+      return false;
+    }
+    return true;
+  },
+
+  /**
+   * Takes an array of valid bid requests, all of which are guaranteed to have passed the isBidRequestValid() test.
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {*} validBidRequests
+   * @param {*} bidderRequest
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    let requests = [];
+    validBidRequests.forEach(oneValidRequest => {
+      requests.push(buildOneRequest(oneValidRequest, bidderRequest));
+    });
+    return requests;
+  },
+
+  /**
+   * Parse the response and generate one or more bid objects.
+   *
+   * @param {*} serverResponse
+   * @param {*} originalRequest
+   */
+  interpretResponse: function(serverResponse, originalRequest) {
+    const responseBody = serverResponse.body;
+    if (!serverResponse.body) {
+      utils.logWarn('[TAPPX]: Empty response body HTTP 204, no bids');
+      return [];
+    }
+
+    const bids = [];
+    responseBody.seatbid.forEach(serverSeatBid => {
+      serverSeatBid.bid.forEach(serverBid => {
+        bids.push(interpretBannerBid(serverBid, originalRequest));
+      });
+    });
+
+    return bids;
+  },
+
+  /**
+   * If the publisher allows user-sync activity, the platform will call this function and the adapter may register pixels and/or iframe user syncs.
+   *
+   * @param {*} syncOptions
+   * @param {*} serverResponses
+   * @param {*} gdprConsent
+   */
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let url = `https://${hostDomain}/cs/usersync.php?`;
+
+    // GDPR & CCPA
+    if (gdprConsent) {
+      url += '&gdpr=' + (gdprConsent.gdprApplies ? 1 : 0);
+      url += '&gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || '');
+    }
+    if (uspConsent) {
+      url += '&us_privacy=' + encodeURIComponent(uspConsent);
+    }
+
+    // SyncOptions
+    if (syncOptions.iframeEnabled) {
+      url += '&type=iframe'
+      return [{
+        type: 'iframe',
+        url: url
+      }];
+    } else {
+      url += '&type=img'
+      return [{
+        type: 'image',
+        url: url
+      }];
+    }
+  }
+}
+
+/**
+ * Parse the response and generate one bid object.
+ *
+ * @param {object} serverBid Bid by OpenRTB 2.5
+ * @returns {object} Prebid banner bidObject
+ */
+function interpretBannerBid(serverBid, request) {
+  return {
+    requestId: request.bids.bidId,
+    cpm: serverBid.price,
+    currency: serverBid.cur ? serverBid.cur : CUR,
+    width: serverBid.w,
+    height: serverBid.h,
+    ad: serverBid.adm,
+    ttl: TTL,
+    creativeId: serverBid.crid,
+    netRevenue: true,
+    mediaType: BANNER,
+  }
+}
+
+/**
+* Build and makes the request
+*
+* @param {*} validBidRequests
+* @param {*} bidderRequest
+* @return response ad
+*/
+function buildOneRequest(validBidRequests, bidderRequest) {
+  HOST = utils.deepAccess(validBidRequests, 'params.host');
+  hostDomain = HOST.split('/', 1)[0];
+
+  const ENDPOINT = utils.deepAccess(validBidRequests, 'params.endpoint');
+  const TAPPXKEY = utils.deepAccess(validBidRequests, 'params.tappxkey');
+  const BIDFLOOR = utils.deepAccess(validBidRequests, 'params.bidfloor');
+  const bannerMediaType = utils.deepAccess(validBidRequests, 'mediaTypes.banner');
+  const { refererInfo } = bidderRequest;
+
+  // let requests = [];
+  let payload = {};
+  let publisher = {};
+  let tagid;
+  let api = {};
+
+  // > App/Site object
+  if (utils.deepAccess(validBidRequests, 'params.app')) {
+    let app = {};
+    app.name = utils.deepAccess(validBidRequests, 'params.app.name');
+    app.bundle = utils.deepAccess(validBidRequests, 'params.app.bundle');
+    app.domain = utils.deepAccess(validBidRequests, 'params.app.domain');
+    publisher.name = utils.deepAccess(validBidRequests, 'params.app.publisher.name');
+    publisher.domain = utils.deepAccess(validBidRequests, 'params.app.publisher.domain');
+    tagid = `${app.name}_typeAdBanVid_${getOs()}`;
+    payload.app = app;
+    api[0] = utils.deepAccess(validBidRequests, 'params.api') ? utils.deepAccess(validBidRequests, 'params.api') : [3, 5];
+  } else {
+    let site = {};
+    site.name = (bidderRequest && refererInfo) ? utils.parseUrl(refererInfo.referer).hostname : window.location.hostname;
+    site.bundle = (bidderRequest && refererInfo) ? utils.parseUrl(refererInfo.referer).hostname : window.location.hostname;
+    site.domain = (bidderRequest && refererInfo) ? utils.parseUrl(refererInfo.referer).hostname : window.location.hostname;
+    publisher.name = (bidderRequest && refererInfo) ? utils.parseUrl(refererInfo.referer).hostname : window.location.hostname;
+    publisher.domain = (bidderRequest && refererInfo) ? utils.parseUrl(refererInfo.referer).hostname : window.location.hostname;
+    tagid = `${site.name}_typeAdBanVid_${getOs()}`;
+    payload.site = site;
+  }
+  // < App/Site object
+
+  // > Imp object
+  let imp = {};
+  let w;
+  let h;
+
+  if (bannerMediaType) {
+    let banner = {};
+    w = bannerMediaType.sizes[0][0];
+    h = bannerMediaType.sizes[0][1];
+    banner.w = w;
+    banner.h = h;
+    if (
+      ((bannerMediaType.sizes[0].indexOf(480) >= 0) && (bannerMediaType.sizes[0].indexOf(320) >= 0)) ||
+      ((bannerMediaType.sizes[0].indexOf(768) >= 0) && (bannerMediaType.sizes[0].indexOf(1024) >= 0))) {
+      banner.pos = 7
+    } else {
+      banner.pos = 4
+    }
+
+    banner.api = api;
+
+    let format = {};
+    format[0] = {};
+    format[0].w = w;
+    format[0].h = h;
+    banner.format = format;
+
+    imp.banner = banner;
+  }
+
+  imp.id = validBidRequests.bidId;
+  imp.tagid = tagid;
+  imp.secure = 1;
+
+  imp.bidfloor = utils.deepAccess(validBidRequests, 'params.bidfloor');
+  // < Imp object
+
+  // > Device object
+  let device = {};
+  // Mandatory
+  device.os = getOs();
+  device.ip = 'peer';
+  device.ua = navigator.userAgent;
+  device.ifa = validBidRequests.ifa;
+
+  // Optional
+  device.h = screen.height;
+  device.w = screen.width;
+  device.dnt = utils.getDNT() ? 1 : 0;
+  device.language = getLanguage();
+  device.make = navigator.vendor ? navigator.vendor : '';
+
+  let geo = {};
+  geo.country = utils.deepAccess(validBidRequests, 'params.geo.country');
+  // < Device object
+
+  // > Params
+  let params = {};
+  params.host = 'tappx.com';
+  params.tappxkey = TAPPXKEY;
+  params.endpoint = ENDPOINT;
+  params.bidfloor = BIDFLOOR;
+  // < Params
+
+  // > GDPR
+  let regs = {};
+  regs.gdpr = 0;
+  if (!(bidderRequest.gdprConsent == null)) {
+    if (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') { regs.gdpr = bidderRequest.gdprConsent.gdprApplies; }
+    if (regs.gdpr) { regs.consent = bidderRequest.gdprConsent.consentString; }
+  }
+
+  // CCPA
+  regs.ext = {};
+  if (!(bidderRequest.uspConsent == null)) {
+    regs.ext.us_privacy = bidderRequest.uspConsent;
+  }
+
+  // COPPA compliance
+  if (config.getConfig('coppa') === true) {
+    regs.coppa = config.getConfig('coppa') === true ? 1 : 0;
+  }
+  // < GDPR
+
+  // > Payload
+  payload.id = validBidRequests.auctionId;
+  payload.test = utils.deepAccess(validBidRequests, 'params.test') ? 1 : 0;
+  payload.at = 1;
+  payload.tmax = bidderRequest.timeout ? bidderRequest.timeout : 600;
+  payload.bidder = BIDDER_CODE;
+  payload.imp = [imp];
+
+  payload.device = device;
+  payload.params = params;
+  payload.regs = regs;
+  // < Payload
+
+  return {
+    method: 'POST',
+    url: `https://${HOST}/${ENDPOINT}?type_cnn=prebidjs`,
+    data: JSON.stringify(payload),
+    bids: validBidRequests
+  };
+}
+
+function getLanguage() {
+  const language = navigator.language ? 'language' : 'userLanguage';
+  return navigator[language].split('-')[0];
+}
+
+function getOs() {
+  let ua = navigator.userAgent;
+  if (ua == null) { return 'unknown'; } else if (ua.match(/(iPhone|iPod|iPad)/)) { return 'ios'; } else if (ua.match(/Android/)) { return 'android'; } else if (ua.match(/Window/)) { return 'windows'; } else { return 'unknown'; }
+}
+
+registerBidder(spec);
diff --git a/modules/tappxBidAdapter.md b/modules/tappxBidAdapter.md
new file mode 100644
index 00000000000..d9ffd98b6c5
--- /dev/null
+++ b/modules/tappxBidAdapter.md
@@ -0,0 +1,37 @@
+# Overview
+```
+Module Name: Tappx Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@tappx.com
+```
+
+# Description
+Module that connects to :tappx demand sources.
+Please use ```tappx``` as the bidder code.
+Ads sizes available: [320,50], [300,250], [320,480], [1024,768], [728,90]
+
+# Banner Test Parameters
+```
+    var adUnits = [
+            {
+                code: 'banner-ad-div',
+                mediaTypes: {
+                    banner: {
+                        sizes: [[320,50]]
+                    }
+                },
+                bids: [
+                    {
+                        bidder: "tappx",
+                        params: {
+                            host: "testing.ssp.tappx.com/rtb/v2/",
+                            tappxkey: "pub-1234-android-1234",
+                            endpoint: "ZZ1234PBJS",
+                            bidfloor: 0.005,
+                            test: true // Optional for testing purposes
+                        }
+                    }
+                ]
+            }
+    ];
+```
diff --git a/test/spec/modules/tappxBidAdapter_spec.js b/test/spec/modules/tappxBidAdapter_spec.js
new file mode 100644
index 00000000000..c4410d8ce5e
--- /dev/null
+++ b/test/spec/modules/tappxBidAdapter_spec.js
@@ -0,0 +1,86 @@
+import { assert } from 'chai';
+import {spec} from 'modules/tappxBidAdapter';
+
+describe('Tappx adapter tests', function () {
+  describe('isBidRequestValid', function () {
+    let bid = { bidder: 'tappx', params: { host: 'testing.ssp.tappx.com', tappxkey: 'pub-1234-test-1234', endpoint: 'ZZ1234PBJS', bidfloor: 0.005 } };
+
+    it('should return true when required params found', function () {
+      assert(spec.isBidRequestValid(bid));
+    });
+
+    it('should return false when required params are missing', function () {
+      const bid = {
+        host: 'testing.ssp.tappx.com'
+      };
+      assert.isFalse(spec.isBidRequestValid(bid));
+    });
+  });
+
+  describe('buildRequest', function () {
+    let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+    // Web Test
+    let validBidRequests = [{'bidder': 'tappx', 'params': {'host': 'testing.ssp.tappx.com', 'tappxkey': 'pub-1234-android-1234', 'endpoint': 'ZZ1234PBJS', 'bidfloor': 0.005, 'api': [3, 5]}, 'crumbs': {'pubcid': 'df2144f7-673f-4440-83f5-cd4a73642d99'}, 'fpd': {'context': {'adServer': {'name': 'gam', 'adSlot': '/19968336/header-bid-tag-0'}, 'pbAdSlot': '/19968336/header-bid-tag-0'}}, 'mediaTypes': {'banner': {'sizes': [[320, 480]]}}, 'adUnitCode': 'div-1', 'transactionId': '713f2c01-61e3-45b5-9e4e-2b163033f3d6', 'sizes': [[320, 480]], 'bidId': '27818d05971607', 'bidderRequestId': '1320551a307df5', 'auctionId': '3f1281d3-9860-4657-808d-3c1d42231ef3', 'src': 'client', 'bidRequestsCount': 1, 'bidderRequestsCount': 1, 'bidderWinsCount': 0}]
+    // App Test
+    let validAppBidRequests = [{'bidder': 'tappx', 'params': {'host': 'testing.ssp.tappx.com', 'tappxkey': 'pub-1234-android-1234', 'endpoint': 'ZZ1234PBJS', 'bidfloor': 0.005, 'api': [3, 5], 'app': {'name': 'Tappx Test', 'bundle': 'com.test.tappx', 'domain': 'tappx.com', 'publisher': { 'name': 'Tappx', 'domain': 'tappx.com' }}}, 'crumbs': {'pubcid': 'df2144f7-673f-4440-83f5-cd4a73642d99'}, 'fpd': {'context': {'adServer': {'name': 'gam', 'adSlot': '/19968336/header-bid-tag-0'}, 'pbAdSlot': '/19968336/header-bid-tag-0'}}, 'mediaTypes': {'banner': {'sizes': [[320, 50]]}}, 'adUnitCode': 'div-1', 'transactionId': '713f2c01-61e3-45b5-9e4e-2b163033f3d6', 'sizes': [[320, 50]], 'bidId': '27818d05971607', 'bidderRequestId': '1320551a307df5', 'auctionId': '3f1281d3-9860-4657-808d-3c1d42231ef3', 'src': 'client', 'bidRequestsCount': 1, 'bidderRequestsCount': 1, 'bidderWinsCount': 0}]
+    let bidderRequest = {'bidderCode': 'tappx', 'auctionId': '6cca2192-2262-468b-8a3c-d00c58a5d911', 'bidderRequestId': '1ae5c6a02684df', 'bids': [{'bidder': 'tappx', 'params': {'host': 'tests.tappx.com', 'tappxkey': 'pub-1234-test-1234', 'endpoint': 'ZZ1234PBJS', 'bidfloor': 0.005}, 'fpd': {'context': {'adServer': {'name': 'gam', 'adSlot': '/19968336/header-bid-tag-0'}, 'pbAdSlot': '/19968336/header-bid-tag-0'}}, 'mediaTypes': {'banner': {'sizes': [[320, 480]]}}, 'adUnitCode': 'banner-ad-div', 'transactionId': 'c44cdbde-ab6d-47a0-8dde-6b4ff7909a35', 'sizes': [[320, 50]], 'bidId': '2e3a5feb30cfe4', 'bidderRequestId': '1ae5c6a02684df', 'auctionId': '6cca2192-2262-468b-8a3c-d00c58a5d911', 'src': 'client', 'bidRequestsCount': 1, 'bidderRequestsCount': 1, 'bidderWinsCount': 0}], 'auctionStart': 1611308859094, 'timeout': 700, 'refererInfo': {'referer': 'http://tappx.local:9999/integrationExamples/gpt/gdpr_hello_world.html?pbjs_debug=true', 'reachedTop': true, 'isAmp': false, 'numIframes': 0, 'stack': ['http://tappx.local:9999/integrationExamples/gpt/gdpr_hello_world.html?pbjs_debug=true'], 'canonicalUrl': null}, 'gdprConsent': {'consentString': consentString, 'vendorData': {'metadata': 'BO-JeiTPABAOkAAABAENABA', 'gdprApplies': true, 'hasGlobalScope': false, 'cookieVersion': 1, 'created': '2020-12-09T09:22:09.900Z', 'lastUpdated': '2021-01-14T15:44:03.600Z', 'cmpId': 0, 'cmpVersion': 1, 'consentScreen': 0, 'consentLanguage': 'EN', 'vendorListVersion': 1, 'maxVendorId': 0, 'purposeConsents': {}, 'vendorConsents': {}}, 'gdprApplies': true, 'apiVersion': 1}, 'uspConsent': '1YCC', 'start': 1611308859099};
+
+    it('should add gdpr/usp consent information to the request', function () {
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = JSON.parse(request[0].data);
+
+      expect(payload.regs.gdpr).to.exist.and.to.be.true;
+      expect(payload.regs.consent).to.exist.and.to.equal(consentString);
+      expect(payload.regs.ext.us_privacy).to.exist;
+    });
+
+    it('should properly build a banner request', function () {
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request[0].url).to.match(/^(http|https):\/\/(.*)\.tappx\.com\/.+/);
+      expect(request[0].method).to.equal('POST');
+
+      const data = JSON.parse(request[0].data);
+      expect(data.site).to.not.equal(null);
+      expect(data.imp).to.have.lengthOf(1);
+      expect(data.imp[0].bidfloor, data).to.not.be.null;
+      expect(data.imp[0].banner).to.not.equal(null);
+      expect(data.imp[0].banner.w).to.be.oneOf([320, 50, 250, 480]);
+      expect(data.imp[0].banner.h).to.be.oneOf([320, 50, 250, 480]);
+    });
+
+    it('should properly build a banner request with app params', function () {
+      const request = spec.buildRequests(validAppBidRequests, bidderRequest);
+      expect(request[0].url).to.match(/^(http|https):\/\/(.*)\.tappx\.com\/.+/);
+      expect(request[0].method).to.equal('POST');
+
+      const data = JSON.parse(request[0].data);
+      expect(data.site).to.not.equal(null);
+      expect(data.imp).to.have.lengthOf(1);
+      expect(data.imp[0].bidfloor, data).to.not.be.null;
+      expect(data.imp[0].banner).to.not.equal(null);
+      expect(data.imp[0].banner.w).to.be.oneOf([320, 50, 250, 480]);
+      expect(data.imp[0].banner.h).to.be.oneOf([320, 50, 250, 480]);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const bidRequest = {
+      data: {},
+      bids: [ {'bidder': 'tappx', 'params': {'host': 'testing.ssp.tappx.com', 'tappxkey': 'pub-1234-android-1234', 'endpoint': 'ZZ1234PBJS', 'bidfloor': 0.05, 'api': [3, 5]}, 'crumbs': {'pubcid': 'df2144f7-673f-4440-83f5-cd4a73642d99'}, 'fpd': {'context': {'adServer': {'name': 'gam', 'adSlot': '/19968336/header-bid-tag-0'}, 'pbAdSlot': '/19968336/header-bid-tag-0'}}, 'mediaTypes': {'banner': {'sizes': [[320, 480]]}}, 'adUnitCode': 'div-1', 'transactionId': '47dd44e8-e7db-417c-a8f1-621a2e1a117d', 'sizes': [[320, 480]], 'bidId': '2170932097e505', 'bidderRequestId': '140ba7a1ab7aeb', 'auctionId': '1c54b4f1-645f-44e6-b8ae-5d43c923ef1c', 'src': 'client', 'bidRequestsCount': 1, 'bidderRequestsCount': 1, 'bidderWinsCount': 0} ]
+    };
+
+    const serverResponse = {'body': {'id': '1c54b4f1-645f-44e6-b8ae-5d43c923ef1c', 'bidid': 'bid3811165568213389257', 'seatbid': [{'seat': '1', 'group': 0, 'bid': [{'id': '3811165568213389257', 'impid': 1, 'price': 0.05, 'adm': "<!-- Tappx Test AD :: 320x480 --><a href='http://www.tappx.com' target=\"_blank\">\t<img src='https://testing.ssp.tappx.com/zcdn/creatives/interstitial320x480.gif'></a>", 'w': 320, 'h': 480, 'lurl': 'http://testing.ssp.tappx.com/rtb/RTBv2Loss?id=3811165568213389257&ep=ZZ1234PBJS&au=test&bu=localhost&sz=320x480&pu=0.005&pt=0.01&cid=&crid=&adv=&aid=${AUCTION_ID}&bidid=${AUCTION_BID_ID}&impid=${AUCTION_IMP_ID}&sid=${AUCTION_SEAT_ID}&adid=${AUCTION_AD_ID}&ap=${AUCTION_PRICE}&cur=${AUCTION_CURRENCY}&mbr=${AUCTION_MBR}&l=${AUCTION_LOSS}', 'cid': '01744fbb521e9fb10ffea926190effea', 'crid': 'a13cf884e66e7c660afec059c89d98b6', 'adomain': []}]}], 'cur': 'USD'}, 'headers': {}};
+    it('receive reponse with single placement', function () {
+      const bids = spec.interpretResponse(serverResponse, bidRequest);
+      const bid = bids[0];
+      expect(bid.cpm).to.exist;
+      expect(bid.ad).to.match(/^<!-- Tappx Test AD/);
+    });
+
+    const emptyServerResponse = {'headers': {}};
+    it('receive reponse without ad', function () {
+      const bids = spec.interpretResponse(emptyServerResponse, bidRequest);
+      expect(bids).to.have.lengthOf(0);
+    });
+  });
+});

From 6cc1ec3bea52652806d6b79d96b630c9daadcded Mon Sep 17 00:00:00 2001
From: guiann <guillaume.andouard@adyoulike.com>
Date: Fri, 12 Feb 2021 16:11:59 +0100
Subject: [PATCH 246/304] Add Native ad capability to AdYouLike adapter (#6198)

* Remove useless bidderCode in bid response

* send all the available sizes in the bid request

* Use the banner sizes if given

* avoid compatibility issue with old bid format

* ad iframe and publisher domain paramters to bid requests

* add publisher domain info in ad request

* add a check in unit tests for publisherDomain

* encode uri components

* add native assets support

* add native information to ad request

* fix native ad parsing

* fix nativ condition to set mediatype

* fix image access and add trackers

* fix and add unit test on native ad

* update md file

* remove usage of URLSearchParams

* allox pure native ad with no adm provided

Co-authored-by: Guillaume <guiandouard@gmail.com>
---
 modules/adyoulikeBidAdapter.js                | 177 ++++++++++++++++--
 modules/adyoulikeBidAdapter.md                |  60 ++++--
 test/spec/modules/adyoulikeBidAdapter_spec.js | 143 +++++++++++++-
 3 files changed, 346 insertions(+), 34 deletions(-)

diff --git a/modules/adyoulikeBidAdapter.js b/modules/adyoulikeBidAdapter.js
index 40d3cf84369..308d474d2c4 100644
--- a/modules/adyoulikeBidAdapter.js
+++ b/modules/adyoulikeBidAdapter.js
@@ -2,6 +2,7 @@ import * as utils from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
 import find from 'core-js-pure/features/array/find.js';
+import {BANNER, NATIVE} from '../src/mediaTypes.js';
 
 const VERSION = '1.0';
 const BIDDER_CODE = 'adyoulike';
@@ -9,6 +10,7 @@ const DEFAULT_DC = 'hb-api';
 
 export const spec = {
   code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, NATIVE],
   aliases: ['ayl'], // short code
   /**
    * Determines whether or not the given bid request is valid.
@@ -18,10 +20,11 @@ export const spec = {
    */
   isBidRequestValid: function (bid) {
     const sizes = getSize(getSizeArray(bid));
-    if (!bid.params || !bid.params.placement || !sizes.width || !sizes.height) {
-      return false;
-    }
-    return true;
+    const sizeValid = sizes.width > 0 && sizes.height > 0;
+
+    // allows no size fornative only
+    return (bid.params && bid.params.placement &&
+            (sizeValid || (bid.mediaTypes && bid.mediaTypes.native)));
   },
   /**
    * Make a server request from the list of BidRequests.
@@ -41,6 +44,7 @@ export const spec = {
         accumulator[bid.bidId].Width = size.width;
         accumulator[bid.bidId].Height = size.height;
         accumulator[bid.bidId].AvailableSizes = sizesArray.join(',');
+        if (bid.mediaTypes && bid.mediaTypes.native) accumulator[bid.bidId].Native = bid.mediaTypes.native;
         return accumulator;
       }, {}),
       PageRefreshed: getPageRefreshed()
@@ -171,9 +175,9 @@ function createEndpointQS(bidderRequest) {
 }
 
 function getSizeArray(bid) {
-  let inputSize = bid.sizes;
+  let inputSize = bid.sizes || [];
   if (bid.mediaTypes && bid.mediaTypes.banner) {
-    inputSize = bid.mediaTypes.banner.sizes;
+    inputSize = bid.mediaTypes.banner.sizes || [];
   }
 
   return utils.parseSizesInput(inputSize);
@@ -203,34 +207,179 @@ function getSize(sizesArray) {
   return parsed;
 }
 
+function getInternalImgUrl(uid) {
+  if (!uid) return '';
+  return 'https://blobs.omnitagjs.com/blobs/' + uid.substr(16, 2) + '/' + uid.substr(16) + '/' + uid;
+}
+
+function getImageUrl(config, resource, width, height) {
+  let url = '';
+
+  switch (resource.Kind) {
+    case 'INTERNAL':
+      url = getInternalImgUrl(resource.Data.Internal.BlobReference.Uid);
+
+      break;
+
+    case 'EXTERNAL':
+      const dynPrefix = config.DynamicPrefix;
+      let extUrl = resource.Data.External.Url;
+      extUrl = extUrl.replace(/\[height\]/i, '' + height);
+      extUrl = extUrl.replace(/\[width\]/i, '' + width);
+
+      if (extUrl.indexOf(dynPrefix) >= 0) {
+        const urlmatch = (/.*url=([^&]*)/gm).exec(extUrl);
+        url = urlmatch ? urlmatch[1] : '';
+        if (!url) {
+          url = getInternalImgUrl((/.*key=([^&]*)/gm).exec(extUrl)[1]);
+        }
+      } else {
+        url = extUrl;
+      }
+
+      break;
+  }
+
+  return url;
+}
+
+function getTrackers(eventsArray, jsTrackers) {
+  const result = [];
+
+  if (!eventsArray) return result;
+
+  eventsArray.map((item, index) => {
+    if ((jsTrackers && item.Kind === 'JAVASCRIPT_URL') ||
+        (!jsTrackers && item.Kind === 'PIXEL_URL')) {
+      result.push(item.Url);
+    }
+  });
+  return result;
+}
+
+function getNativeAssets(response, nativeConfig) {
+  const native = {};
+
+  var adJson = {};
+  var textsJson = {};
+  if (typeof response.Ad === 'string') {
+    adJson = JSON.parse(response.Ad.match(/\/\*PREBID\*\/(.*)\/\*PREBID\*\//)[1]);
+    textsJson = adJson.Content.Preview.Text;
+
+    var impressionUrl = adJson.TrackingPrefix +
+            '/pixel?event_kind=IMPRESSION&attempt=' + adJson.Attempt;
+
+    if (adJson.Campaign) {
+      impressionUrl += '&campaign=' + adJson.Campaign;
+    }
+
+    native.clickUrl = adJson.TrackingPrefix + '/ar?event_kind=CLICK&attempt=' + adJson.Attempt +
+      '&campaign=' + adJson.Campaign + '&url=' + encodeURIComponent(adJson.Content.Landing.Url);
+
+    native.clickTrackers = getTrackers(adJson.OnEvents['CLICK']);
+    native.impressionTrackers = getTrackers(adJson.OnEvents['IMPRESSION']);
+    native.impressionTrackers.push(impressionUrl);
+    native.javascriptTrackers = getTrackers(adJson.OnEvents['IMPRESSION'], true);
+  }
+
+  Object.keys(nativeConfig).map(function(key, index) {
+    if (typeof response.Native === 'object') {
+      native[key] = response.Native[key];
+    } else {
+      switch (key) {
+        case 'title':
+          native[key] = textsJson.TITLE;
+          break;
+        case 'body':
+          native[key] = textsJson.DESCRIPTION;
+          break;
+        case 'cta':
+          native[key] = textsJson.CALLTOACTION;
+          break;
+        case 'sponsoredBy':
+          native[key] = adJson.Content.Preview.Sponsor.Name;
+          break;
+        case 'image':
+          // main image requested size
+          const imgSize = nativeConfig.image.sizes || [];
+          if (!imgSize.length) {
+            imgSize[0] = response.Width || 300;
+            imgSize[1] = response.Height || 250;
+          }
+
+          native[key] = {
+            url: getImageUrl(adJson, adJson.Content.Preview.Thumbnail.Image, imgSize[0], imgSize[1]),
+            width: imgSize[0],
+            height: imgSize[1]
+          };
+          break;
+        case 'icon':
+          if (adJson.HasSponsorImage) {
+            // icon requested size
+            const iconSize = nativeConfig.icon.sizes || [];
+            if (!iconSize.length) {
+              iconSize[0] = 50;
+              iconSize[1] = 50;
+            }
+
+            native[key] = {
+              url: getImageUrl(adJson, adJson.Content.Preview.Sponsor.Logo.Resource, iconSize[0], iconSize[1]),
+              width: iconSize[0],
+              height: iconSize[1]
+            };
+          }
+          break;
+        case 'privacyIcon':
+          native[key] = getImageUrl(adJson, adJson.Content.Preview.Credit.Logo.Resource, 25, 25);
+          break;
+        case 'privacyLink':
+          native[key] = adJson.Content.Preview.Credit.Url;
+          break;
+      }
+    }
+  });
+
+  return native;
+}
+
 /* Create bid from response */
 function createBid(response, bidRequests) {
-  if (!response || !response.Ad) {
+  if (!response || (!response.Ad && !response.Native)) {
     return
   }
 
+  const request = bidRequests && bidRequests[response.BidID];
+
   // In case we don't retreive the size from the adserver, use the given one.
-  if (bidRequests && bidRequests[response.BidID]) {
+  if (request) {
     if (!response.Width || response.Width === '0') {
-      response.Width = bidRequests[response.BidID].Width;
+      response.Width = request.Width;
     }
 
     if (!response.Height || response.Height === '0') {
-      response.Height = bidRequests[response.BidID].Height;
+      response.Height = request.Height;
     }
   }
 
-  return {
+  const bid = {
     requestId: response.BidID,
-    width: response.Width,
-    height: response.Height,
-    ad: response.Ad,
     ttl: 3600,
     creativeId: response.CreativeID,
     cpm: response.Price,
     netRevenue: true,
     currency: 'USD'
   };
+
+  if (request && request.Native) {
+    bid.native = getNativeAssets(response, request.Native);
+    bid.mediaType = 'native';
+  } else {
+    bid.width = response.Width;
+    bid.height = response.Height;
+    bid.ad = response.Ad;
+  }
+
+  return bid;
 }
 
 registerBidder(spec);
diff --git a/modules/adyoulikeBidAdapter.md b/modules/adyoulikeBidAdapter.md
index 120bee3bcbb..d0e7fa8883b 100644
--- a/modules/adyoulikeBidAdapter.md
+++ b/modules/adyoulikeBidAdapter.md
@@ -11,19 +11,49 @@ Banner formats are supported.
 
 # Test Parameters
 ```
-    var adUnits = [
-           {
-               code: 'test-div',
-               sizes: [[300, 250]],
-               bids: [
-                   {
-                       bidder: "adyoulike",
-                       params: {
-                           placement: 194f787b85c829fb8822cdaf1ae64435,
-                           DC: 'fra01', // Optional for set the data center name
-                       }
-                   }
-               ]
-           }
-       ];
+    var adUnits = {
+    "code": "test-div",
+    "mediaTypes": {
+      "banner": {
+        "sizes": ["300x250"]
+      },
+      "native": {
+        "image": {
+          "required": true,
+        },
+        "title": {
+          "required": true,
+          "len": 80
+        },
+        "cta": {
+          "required": false
+        },
+        "sponsoredBy": {
+          "required": true
+        },
+        "clickUrl": {
+          "required": true
+        },
+        "privacyIcon": {
+          "required": false
+        },
+        "privacyLink": {
+          "required": false
+        },
+        "body": {
+          "required": true
+        },
+        "icon": {
+          "required": true,
+          "sizes": []
+        }
+      }
+      bids: [{
+        bidder: "adyoulike",
+        params: {
+          placement: 194 f787b85c829fb8822cdaf1ae64435,
+          DC: "fra01", // Optional for set the data center name
+        }
+      }]
+    };
 ```
diff --git a/test/spec/modules/adyoulikeBidAdapter_spec.js b/test/spec/modules/adyoulikeBidAdapter_spec.js
index ec8f2f00923..4c108ed9f1d 100644
--- a/test/spec/modules/adyoulikeBidAdapter_spec.js
+++ b/test/spec/modules/adyoulikeBidAdapter_spec.js
@@ -58,12 +58,83 @@ describe('Adyoulike Adapter', function () {
       'mediaTypes':
         { 'banner':
           {'sizes': ['300x250']
+          },
+        'native':
+          { 'image': {
+            'required': true,
+          },
+          'title': {
+            'required': true,
+            'len': 80
+          },
+          'cta': {
+            'required': false
+          },
+          'sponsoredBy': {
+            'required': true
+          },
+          'clickUrl': {
+            'required': true
+          },
+          'privacyIcon': {
+            'required': false
+          },
+          'privacyLink': {
+            'required': false
+          },
+          'body': {
+            'required': true
+          },
+          'icon': {
+            'required': true,
+            'sizes': []
           }
+          },
         },
       'transactionId': 'bid_id_0_transaction_id'
     }
   ];
 
+  const sentBidNative = {
+    'bid_id_0': {
+      'PlacementID': 'e622af275681965d3095808561a1e510',
+      'TransactionID': 'e8355240-d976-4cd5-a493-640656fe08e8',
+      'AvailableSizes': '',
+      'Native': {
+        'image': {
+          'required': true,
+          'sizes': []
+        },
+        'title': {
+          'required': true,
+          'len': 80
+        },
+        'cta': {
+          'required': false
+        },
+        'sponsoredBy': {
+          'required': true
+        },
+        'clickUrl': {
+          'required': true
+        },
+        'privacyIcon': {
+          'required': false
+        },
+        'privacyLink': {
+          'required': false
+        },
+        'body': {
+          'required': true
+        },
+        'icon': {
+          'required': true,
+          'sizes': []
+        }
+      }
+    }
+  };
+
   const bidRequestWithDCPlacement = [
     {
       'bidId': 'bid_id_0',
@@ -165,11 +236,12 @@ describe('Adyoulike Adapter', function () {
       'Placement': 'placement_0'
     }
   ];
+  const admSample = "\u003cscript id=\"ayl-prebid-a11a121205932e75e622af275681965d\"\u003e\n(function(){\n\twindow.isPrebid = true\n\tvar prebidResults = /*PREBID*/{\"OnEvents\":{\"CLICK\":[{\"Kind\":\"PIXEL_URL\",\"Url\":\"https://testPixelCLICK.com/fake\"}],\"IMPRESSION\":[{\"Kind\":\"PIXEL_URL\",\"Url\":\"https://testPixelIMP.com/fake\"},{\"Kind\":\"JAVASCRIPT_URL\",\"Url\":\"https://testJsIMP.com/fake.js\"}]},\"Disabled\":false,\"Attempt\":\"a11a121205932e75e622af275681965d\",\"ApiPrefix\":\"https://fo-api.omnitagjs.com/fo-api\",\"TrackingPrefix\":\"https://tracking.omnitagjs.com/tracking\",\"DynamicPrefix\":\"https://tag-dyn.omnitagjs.com/fo-dyn\",\"StaticPrefix\":\"https://fo-static.omnitagjs.com/fo-static\",\"BlobPrefix\":\"https://fo-api.omnitagjs.com/fo-api/blobs\",\"SspPrefix\":\"https://fo-ssp.omnitagjs.com/fo-ssp\",\"VisitorPrefix\":\"https://visitor.omnitagjs.com/visitor\",\"Trusted\":true,\"Placement\":\"e622af275681965d3095808561a1e510\",\"PlacementAccess\":\"ALL\",\"Site\":\"6e2df7a92203c3c7a25561ed63f25a27\",\"Lang\":\"EN\",\"SiteLogo\":null,\"HasSponsorImage\":false,\"ResizeIframe\":true,\"IntegrationConfig\":{\"Kind\":\"WIDGET\",\"Widget\":{\"ExtraStyleSheet\":\"\",\"Placeholders\":{\"Body\":{\"Color\":{\"R\":77,\"G\":21,\"B\":82,\"A\":100},\"BackgroundColor\":{\"R\":255,\"G\":255,\"B\":255,\"A\":100},\"FontFamily\":\"Lato\",\"Width\":\"100%\",\"Align\":\"\",\"BoxShadow\":true},\"CallToAction\":{\"Color\":{\"R\":26,\"G\":157,\"B\":212,\"A\":100}},\"Description\":{\"Length\":130},\"Image\":{\"Width\":600,\"Height\":600,\"Lowres\":false,\"Raw\":false},\"Size\":{\"Height\":\"250px\",\"Width\":\"300px\"},\"Sponsor\":{\"Color\":{\"R\":35,\"G\":35,\"B\":35,\"A\":100},\"Label\":true,\"WithoutLogo\":false},\"Title\":{\"Color\":{\"R\":219,\"G\":181,\"B\":255,\"A\":100}}},\"Selector\":{\"Kind\":\"CSS\",\"Css\":\"#ayl-prebid-a11a121205932e75e622af275681965d\"},\"Insertion\":\"AFTER\",\"ClickFormat\":true,\"Creative20\":true,\"WidgetKind\":\"CREATIVE_TEMPLATE_4\"}},\"Legal\":\"Sponsored\",\"ForcedCampaign\":\"f1c80d4bb5643c222ae8de75e9b2f991\",\"ForcedTrack\":\"\",\"ForcedCreative\":\"\",\"ForcedSource\":\"\",\"DisplayMode\":\"DEFAULT\",\"Campaign\":\"f1c80d4bb5643c222ae8de75e9b2f991\",\"CampaignAccess\":\"ALL\",\"CampaignKind\":\"AD_TRAFFIC\",\"DataSource\":\"LOCAL\",\"DataSourceUrl\":\"\",\"DataSourceOnEventsIsolated\":false,\"DataSourceWithoutCookie\":false,\"Content\":{\"Preview\":{\"Thumbnail\":{\"Image\":{\"Kind\":\"EXTERNAL\",\"Data\":{\"External\":{\"Url\":\"https://tag-dyn.omnitagjs.com/fo-dyn/native/preview/image?key=fd4362d35bb174d6f1c80d4bb5643c22\\u0026kind=INTERNAL\\u0026ztop=0.000000\\u0026zleft=0.000000\\u0026zwidth=0.333333\\u0026zheight=1.000000\\u0026width=[width]\\u0026height=[height]\"}},\"ZoneTop\":0,\"ZoneLeft\":0,\"ZoneWidth\":1,\"ZoneHeight\":1,\"Smart\":false,\"NoTransform\":false,\"Quality\":\"NORMAL\"}},\"Text\":{\"CALLTOACTION\":\"Click here to learn more\",\"DESCRIPTION\":\"Considérant l'extrémité conjoncturelle, il serait bon d'anticiper toutes les voies de bon sens.\",\"SPONSOR\":\"Tested by\",\"TITLE\":\"Adserver Traffic Redirect Internal\"},\"Sponsor\":{\"Name\":\"QA Team\"},\"Credit\":{\"Logo\":{\"Resource\":{\"Kind\":\"EXTERNAL\",\"Data\":{\"External\":{\"Url\":\"https://fo-static.omnitagjs.com/fo-static/native/images/info-ayl.png\"}},\"ZoneTop\":0,\"ZoneLeft\":0,\"ZoneWidth\":1,\"ZoneHeight\":1,\"Smart\":false,\"NoTransform\":false,\"Quality\":\"NORMAL\"}},\"Url\":\"https://blobs.omnitagjs.com/adchoice/\"}},\"Landing\":{\"Url\":\"https://www.w3.org/People/mimasa/test/xhtml/entities/entities-11.xhtml#lat1\",\"LegacyTracking\":false},\"ViewButtons\":{\"Close\":{\"Skip\":6000}},\"InternalContentFields\":{\"AnimatedImage\":false}},\"AdDomain\":\"adyoulike.com\",\"Opener\":\"REDIRECT\",\"PerformUITriggers\":[\"CLICK\"],\"RedirectionTarget\":\"TAB\"}/*PREBID*/;\n\tvar insertAds = function insertAds() {\insertAds();\n\t}\n})();\n\u003c/script\u003e";
   const responseWithSinglePlacement = [
     {
       'BidID': 'bid_id_0',
       'Placement': 'placement_0',
-      'Ad': 'placement_0',
+      'Ad': admSample,
       'Price': 0.5,
       'Height': 600,
     }
@@ -214,15 +286,34 @@ describe('Adyoulike Adapter', function () {
       'transactionId': 'bid_id_1_transaction_id'
     };
 
+    let nativeBid = {
+      'bidId': 'bid_id_1',
+      'bidder': 'adyoulike',
+      'placementCode': 'adunit/hb-1',
+      'params': {
+        'placement': 'placement_1'
+      },
+      mediaTypes: {
+        native: {
+
+        }
+      },
+      'transactionId': 'bid_id_1_transaction_id'
+    };
+
     it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
+      expect(!!spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true when required params found for native ad', function () {
+      expect(!!spec.isBidRequestValid(nativeBid)).to.equal(true);
     });
 
     it('should return false when required params are not passed', function () {
       let bid = Object.assign({}, bid);
       delete bid.size;
 
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(!!spec.isBidRequestValid(bid)).to.equal(false);
     });
 
     it('should return false when required params are not passed', function () {
@@ -231,7 +322,7 @@ describe('Adyoulike Adapter', function () {
       bid.params = {
         'placement': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(!!spec.isBidRequestValid(bid)).to.equal(false);
     });
   });
 
@@ -384,7 +475,7 @@ describe('Adyoulike Adapter', function () {
 
       expect(result.length).to.equal(1);
       expect(result[0].cpm).to.equal(0.5);
-      expect(result[0].ad).to.equal('placement_0');
+      expect(result[0].ad).to.equal(admSample);
       expect(result[0].width).to.equal(300);
       expect(result[0].height).to.equal(600);
     });
@@ -405,5 +496,47 @@ describe('Adyoulike Adapter', function () {
       expect(result[1].width).to.equal(400);
       expect(result[1].height).to.equal(250);
     });
+
+    it('receive reponse with Native ad', function () {
+      serverResponse.body = responseWithSinglePlacement;
+      let result = spec.interpretResponse(serverResponse, {data: '{"Bids":' + JSON.stringify(sentBidNative) + '}'});
+
+      expect(result.length).to.equal(1);
+
+      expect(result).to.deep.equal([{
+        cpm: 0.5,
+        creativeId: undefined,
+        currency: 'USD',
+        netRevenue: true,
+        requestId: 'bid_id_0',
+        ttl: 3600,
+        mediaType: 'native',
+        native: {
+          body: 'Considérant l\'extrémité conjoncturelle, il serait bon d\'anticiper toutes les voies de bon sens.',
+          clickTrackers: [
+            'https://testPixelCLICK.com/fake'
+          ],
+          clickUrl: 'https://tracking.omnitagjs.com/tracking/ar?event_kind=CLICK&attempt=a11a121205932e75e622af275681965d&campaign=f1c80d4bb5643c222ae8de75e9b2f991&url=https%3A%2F%2Fwww.w3.org%2FPeople%2Fmimasa%2Ftest%2Fxhtml%2Fentities%2Fentities-11.xhtml%23lat1',
+          cta: 'Click here to learn more',
+          image: {
+            height: 600,
+            url: 'https://blobs.omnitagjs.com/blobs/f1/f1c80d4bb5643c22/fd4362d35bb174d6f1c80d4bb5643c22',
+            width: 300,
+          },
+          impressionTrackers: [
+            'https://testPixelIMP.com/fake',
+            'https://tracking.omnitagjs.com/tracking/pixel?event_kind=IMPRESSION&attempt=a11a121205932e75e622af275681965d&campaign=f1c80d4bb5643c222ae8de75e9b2f991'
+          ],
+          javascriptTrackers: [
+            'https://testJsIMP.com/fake.js'
+          ],
+          privacyIcon: 'https://fo-static.omnitagjs.com/fo-static/native/images/info-ayl.png',
+          privacyLink: 'https://blobs.omnitagjs.com/adchoice/',
+          sponsoredBy: 'QA Team',
+          title: 'Adserver Traffic Redirect Internal',
+        }
+
+      }]);
+    });
   });
 });

From 2ea3f6f86143e0bab5973a7ae3f91a9639ec8efa Mon Sep 17 00:00:00 2001
From: Patrick McCann <patmmccann@gmail.com>
Date: Fri, 12 Feb 2021 12:02:42 -0500
Subject: [PATCH 247/304] Update targeting.js to fix TTL buffer arithmetic
 (#6300)

---
 src/targeting.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/targeting.js b/src/targeting.js
index aa80ce6fd5d..cb53ea0fed3 100644
--- a/src/targeting.js
+++ b/src/targeting.js
@@ -20,7 +20,7 @@ export const TARGETING_KEYS = Object.keys(CONSTANTS.TARGETING_KEYS).map(
 );
 
 // return unexpired bids
-const isBidNotExpired = (bid) => (bid.responseTimestamp + bid.ttl * 1000 + TTL_BUFFER) > timestamp();
+const isBidNotExpired = (bid) => (bid.responseTimestamp + bid.ttl * 1000 - TTL_BUFFER) > timestamp();
 
 // return bids whose status is not set. Winning bids can only have a status of `rendered`.
 const isUnusedBid = (bid) => bid && ((bid.status && !includes([CONSTANTS.BID_STATUS.RENDERED], bid.status)) || !bid.status);

From 6e51dcf0221d82928e7eefe613105d3d59ddd05d Mon Sep 17 00:00:00 2001
From: David Reischer <reischer.david@gmail.com>
Date: Fri, 12 Feb 2021 19:09:27 +0000
Subject: [PATCH 248/304] Permutive RTD submodule (#6290)

* Add Permutive RTD module

* set demo data in LS for test page

* fix linter issues

* reduce timeout on example page

* decrease sample timeouts

* rename targeting to segments
---
 .../gpt/permutiveRtdProvider_example.html     | 223 ++++++++++++++
 modules/permutiveRtdProvider.js               | 171 +++++++++++
 modules/permutiveRtdProvider.md               |  99 ++++++
 .../spec/modules/permutiveRtdProvider_spec.js | 282 ++++++++++++++++++
 4 files changed, 775 insertions(+)
 create mode 100644 integrationExamples/gpt/permutiveRtdProvider_example.html
 create mode 100644 modules/permutiveRtdProvider.js
 create mode 100644 modules/permutiveRtdProvider.md
 create mode 100644 test/spec/modules/permutiveRtdProvider_spec.js

diff --git a/integrationExamples/gpt/permutiveRtdProvider_example.html b/integrationExamples/gpt/permutiveRtdProvider_example.html
new file mode 100644
index 00000000000..0814dcece5b
--- /dev/null
+++ b/integrationExamples/gpt/permutiveRtdProvider_example.html
@@ -0,0 +1,223 @@
+<html>
+
+    <head>
+        <link rel="icon" type="image/png" href="/favicon.png">
+        <script async src="//www.googletagservices.com/tag/js/gpt.js"></script>
+        <script src="../../build/dev/prebid.js" async></script>
+        <script>
+            window.permutive = {};
+            window.permutive.ready = () => {};
+
+            function setLocalStorageData () {
+              const data = {
+                _pdfps: ['gam1', 'gam2'],
+                _prubicons: ['rubicon1', 'rubicon2'],
+                _papns: ['appnexus1', 'appnexus2'],
+                _psegs: ['1234', '1000001', '1000002'],
+                _ppam: ['ppam1', 'ppam2'],
+                _pcrprs: ['pcrprs1', 'pcrprs2']
+              }
+
+              for (let key in data) {
+                window.localStorage[key] = JSON.stringify(data[key])
+              }
+            }
+
+            setLocalStorageData()
+
+            var div_1_sizes = [
+                [300, 250],
+                [300, 600]
+            ];
+            var div_2_sizes = [
+                [728, 90],
+                [970, 250]
+            ];
+            var PREBID_TIMEOUT = 1000;
+            var FAILSAFE_TIMEOUT = 1500;
+
+            var adUnits = [
+              {
+                code: '/19968336/header-bid-tag-0',
+                mediaTypes: {
+                  banner: {
+                    sizes: div_1_sizes
+                  }
+                },
+                bids: [
+                  {
+                    bidder: 'appnexus',
+                    params: {
+                      placementId: 13144370,
+                      keywords: {
+                        inline_kvs: ['1']
+                      }
+                    }
+                  },
+                  {
+                    bidder: 'rubicon',
+                    params: {
+                      accountId: '9840',
+                      siteId: '123564',
+                      zoneId: '583584',
+                      inventory: {
+                        area: ['home']
+                      },
+                      visitor: {
+                        inline_kvs: ['1']
+                      }
+                    }
+                  },
+                  {
+                    bidder: 'ozone',
+                    params: {
+                      publisherId: 'OZONEGMG0001',
+                      siteId: '4204204209',
+                      placementId: '0420420500',
+                      customData: [
+                        {
+                          settings: {},
+                          targeting: {
+                            inline_kvs: ['1', '2', '3', '4']
+                          }
+                        }
+                      ],
+                      ozoneData: {}
+                    }
+                  }
+                ]
+              },
+              {
+                code: '/19968336/header-bid-tag-1',
+                mediaTypes: {
+                  banner: {
+                    sizes: div_2_sizes
+                  }
+                },
+                bids: [
+                  {
+                    bidder: 'appnexus',
+                    params: {
+                      placementId: 13144370
+                    }
+                  },
+                  {
+                    bidder: 'ozone',
+                    params: {
+                      publisherId: 'OZONEGMG0001',
+                      siteId: '4204204209',
+                      placementId: '0420420500'
+                    }
+                  }
+                ]
+              }
+            ];
+
+
+            var googletag = googletag || {};
+            googletag.cmd = googletag.cmd || [];
+            googletag.cmd.push(function() {
+                googletag.pubads().disableInitialLoad();
+            });
+
+            var pbjs = pbjs || {};
+            pbjs.que = pbjs.que || [];
+
+            pbjs.que.push(function() {
+              pbjs.setConfig({
+                debug: true,
+                realTimeData: {
+                  auctionDelay: 50, // maximum time for RTD modules to respond
+                  dataProviders: [
+                    {
+                      name: 'permutive',
+                      waitForIt: true,
+                      params: {
+                        acBidders: ['appnexus', 'rubicon', 'ozone'],
+                        maxSegs: 500,
+                        overwrites: {
+                          rubicon: function (bid, data, acEnabled, utils, defaultFn) {
+                            if (defaultFn){
+                              bid = defaultFn(bid, data, acEnabled)
+                            }
+                            if (data.gam && data.gam.length) {
+                              utils.deepSetValue(bid, 'params.visitor.permutive', data.gam)
+                            }
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              });
+              pbjs.addAdUnits(adUnits);
+              requestBids();
+            });
+
+            function requestBids () {
+              pbjs.que.push(function() {
+                pbjs.requestBids({
+                  bidsBackHandler: initAdserver,
+                  timeout: PREBID_TIMEOUT
+                });
+              });
+            }
+
+            function initAdserver() {
+                if (pbjs.initAdserverSet) return;
+                pbjs.initAdserverSet = true;
+                googletag.cmd.push(function() {
+                    pbjs.que.push(function() {
+                        pbjs.setTargetingForGPTAsync();
+                        googletag.pubads().refresh();
+                    });
+                });
+            }
+            // in case PBJS doesn't load
+            setTimeout(function() {
+                initAdserver();
+            }, FAILSAFE_TIMEOUT);
+
+            googletag.cmd.push(function() {
+                googletag.defineSlot('/19968336/header-bid-tag-0', div_1_sizes, 'div-1').addService(googletag.pubads());
+                googletag.pubads().enableSingleRequest();
+                googletag.enableServices();
+            });
+            googletag.cmd.push(function() {
+                googletag.defineSlot('/19968336/header-bid-tag-1', div_2_sizes, 'div-2').addService(googletag.pubads());
+                googletag.pubads().enableSingleRequest();
+                googletag.enableServices();
+            });
+
+        </script>
+
+    </head>
+
+    <body>
+        <p><button onclick="requestBids()">Refresh Ad Unit</button></p>
+        <h2>Basic Prebid.js Example</h2>
+        <h5>Div-1</h5>
+        <div id="div-1">
+            <script type="text/javascript">
+                googletag.cmd.push(function() {
+                    googletag.display("div-1");
+                });
+
+            </script>
+        </div>
+
+        <br>
+
+        <h5>Div-2</h5>
+        <div id="div-2">
+            <script type="text/javascript">
+                googletag.cmd.push(function() {
+                    googletag.display("div-2");
+                });
+
+            </script>
+        </div>
+
+    </body>
+
+</html>
diff --git a/modules/permutiveRtdProvider.js b/modules/permutiveRtdProvider.js
new file mode 100644
index 00000000000..8ec215d3cca
--- /dev/null
+++ b/modules/permutiveRtdProvider.js
@@ -0,0 +1,171 @@
+/**
+ * This module adds permutive provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will add custom segment targeting to ad units of specific bidders
+ * @module modules/permutiveRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import { getGlobal } from '../src/prebidGlobal.js'
+import { submodule } from '../src/hook.js'
+import { getStorageManager } from '../src/storageManager.js'
+import { deepSetValue, deepAccess, isFn, mergeDeep } from '../src/utils.js'
+import includes from 'core-js-pure/features/array/includes.js'
+
+export const storage = getStorageManager()
+
+function init (config, userConsent) {
+  return true
+}
+
+/**
+* Set segment targeting from cache and then try to wait for Permutive
+* to initialise to get realtime segment targeting
+*/
+export function initSegments (reqBidsConfigObj, callback, customConfig) {
+  const permutiveOnPage = isPermutiveOnPage()
+  const config = mergeDeep({
+    waitForIt: false,
+    params: {
+      maxSegs: 500,
+      acBidders: [],
+      overwrites: {}
+    }
+  }, customConfig)
+
+  setSegments(reqBidsConfigObj, config)
+
+  if (config.waitForIt && permutiveOnPage) {
+    window.permutive.ready(function () {
+      setSegments(reqBidsConfigObj, config)
+      callback()
+    }, 'realtime')
+  } else {
+    callback()
+  }
+}
+
+function setSegments (reqBidsConfigObj, config) {
+  const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits
+  const data = getSegments(config.params.maxSegs)
+  const utils = { deepSetValue, deepAccess, isFn, mergeDeep }
+
+  adUnits.forEach(adUnit => {
+    adUnit.bids.forEach(bid => {
+      const { bidder } = bid
+      const acEnabled = isAcEnabled(config, bidder)
+      const customFn = getCustomBidderFn(config, bidder)
+      const defaultFn = getDefaultBidderFn(bidder)
+
+      if (customFn) {
+        customFn(bid, data, acEnabled, utils, defaultFn)
+      } else if (defaultFn) {
+        defaultFn(bid, data, acEnabled)
+      } else {
+
+      }
+    })
+  })
+}
+
+function getCustomBidderFn (config, bidder) {
+  const overwriteFn = deepAccess(config, `params.overwrites.${bidder}`)
+
+  if (overwriteFn && isFn(overwriteFn)) {
+    return overwriteFn
+  } else {
+    return null
+  }
+}
+
+/**
+* Returns a function that receives a `bid` object, a `data` object and a `acEnabled` boolean
+* and which will set the right segment targeting keys for `bid` based on `data` and `acEnabled`
+* @param {string} bidder
+* @param {object} data
+*/
+function getDefaultBidderFn (bidder) {
+  const bidderMapper = {
+    appnexus: function (bid, data, acEnabled) {
+      if (acEnabled && data.ac && data.ac.length) {
+        deepSetValue(bid, 'params.keywords.p_standard', data.ac)
+      }
+      if (data.appnexus && data.appnexus.length) {
+        deepSetValue(bid, 'params.keywords.permutive', data.appnexus)
+      }
+
+      return bid
+    },
+    rubicon: function (bid, data, acEnabled) {
+      if (acEnabled && data.ac && data.ac.length) {
+        deepSetValue(bid, 'params.visitor.p_standard', data.ac)
+      }
+      if (data.rubicon && data.rubicon.length) {
+        deepSetValue(bid, 'params.visitor.permutive', data.rubicon)
+      }
+
+      return bid
+    },
+    ozone: function (bid, data, acEnabled) {
+      if (acEnabled && data.ac && data.ac.length) {
+        deepSetValue(bid, 'params.customData.0.targeting.p_standard', data.ac)
+      }
+
+      return bid
+    }
+  }
+
+  return bidderMapper[bidder]
+}
+
+export function isAcEnabled (config, bidder) {
+  const acBidders = deepAccess(config, 'params.acBidders') || []
+  return includes(acBidders, bidder)
+}
+
+export function isPermutiveOnPage () {
+  return typeof window.permutive !== 'undefined' && typeof window.permutive.ready === 'function'
+}
+
+/**
+* Returns all relevant segment IDs in an object
+*/
+export function getSegments (maxSegs) {
+  const legacySegs = readSegments('_psegs').map(Number).filter(seg => seg >= 1000000).map(String)
+  const _ppam = readSegments('_ppam')
+  const _pcrprs = readSegments('_pcrprs')
+
+  const segments = {
+    ac: [..._pcrprs, ..._ppam, ...legacySegs],
+    rubicon: readSegments('_prubicons'),
+    appnexus: readSegments('_papns'),
+    gam: readSegments('_pdfps')
+  }
+
+  for (const type in segments) {
+    segments[type] = segments[type].slice(0, maxSegs)
+  }
+
+  return segments
+}
+
+/**
+ * Gets an array of segment IDs from LocalStorage
+ * or returns an empty array
+ * @param {string} key
+ */
+function readSegments (key) {
+  try {
+    return JSON.parse(storage.getDataFromLocalStorage(key) || '[]')
+  } catch (e) {
+    return []
+  }
+}
+
+/** @type {RtdSubmodule} */
+export const permutiveSubmodule = {
+  name: 'permutive',
+  getBidRequestData: initSegments,
+  init: init
+}
+
+submodule('realTimeData', permutiveSubmodule)
diff --git a/modules/permutiveRtdProvider.md b/modules/permutiveRtdProvider.md
new file mode 100644
index 00000000000..55bdf6420cf
--- /dev/null
+++ b/modules/permutiveRtdProvider.md
@@ -0,0 +1,99 @@
+# Permutive Real-time Data Submodule
+This submodule reads segments from Permutive and attaches them as targeting keys to bid requests. Using this module will deliver best targeting results, leveraging Permutive's real-time segmentation and modelling capabilities.
+
+## Usage
+Compile the Permutive RTD module into your Prebid build:
+```
+gulp build --modules=permutiveRtdProvider
+```
+You then need to enable the Permutive RTD in your Prebid configuration, using the below format:
+
+```javascript
+pbjs.setConfig({
+  ...,
+  realTimeData: {
+    auctionDelay: 50, // optional auction delay
+    dataProviders: [{
+      name: 'permutive',
+      waitForIt: true, // should be true if there's an `auctionDelay`
+      params: {
+        acBidders: ['appnexus', 'rubicon', 'ozone']
+      }
+    }]
+  },
+  ...
+})
+```
+
+## Supported Bidders
+The below bidders are currently support by the Permutive RTD module. Please reach out to your Permutive Account Manager to request support for any additional bidders.
+
+| Bidder      | ID         | First-party segments | Audience Connector |
+| ----------- | ---------- | -------------------- | ------------------ |
+| Xandr       | `appnexus` | Yes                  | Yes                |
+| Magnite     | `rubicon`  | Yes                  | Yes                |
+| Ozone       | `ozone`    | No                   | Yes                |
+
+* **First-party segments:** When enabling the respective Activation for a segment in Permutive, this module will automatically attach that segment to the bid request. There is no need to enable individual bidders in the module configuration, it will automatically reflect which SSP integrations you have enabled in Permutive. Permutive segments will be sent in the `permutive` key-value.
+
+* **Audience Connector:** You'll need to define which bidder should receive Audience Connector segments. You need to include the `ID` of any bidder in the `acBidders` array. Audience Connector segments will be sent in the `p_standard` key-value.
+
+
+## Parameters
+| Name              | Type                 | Description        | Default        |
+| ----------------- | -------------------- | ------------------ | ------------------ |
+| name              | String               | This should always be `permutive` | - |
+| waitForIt         | Boolean              | Should be `true` if there's an `auctionDelay` defined (optional) | `false` |
+| params            | Object               |                 | - |
+| params.acBidders  | String[]             | An array of bidders which should receive AC segments. Pleasee see `Supported Bidders` for bidder support and possible values. | `[]` |
+| params.maxSegs    | Integer              | Maximum number of segments to be included in either the `permutive` or `p_standard` key-value. | `500` |
+| params.overwrites | Object               | See `Custom Bidder Setup` for details on how to define custom bidder functions.      | `{}` |
+
+
+## Custom Bidder Setup
+You can overwrite the default bidder function, for example to include a different set of segments or to support additional bidders. The below example modifies what first-party segments Magnite receives (segments from `gam` instead of `rubicon`). As best practise we recommend to first call `defaultFn` and then only overwrite specific key-values. The below example only overwrites `permutive` while `p_standard` are still set by `defaultFn` (if `rubicon` is an enabled `acBidder`).
+
+```javascript
+pbjs.setConfig({
+  ...,
+  realTimeData: {
+    auctionDelay: 50,
+    dataProviders: [{
+      name: 'permutive',
+      waitForIt: true,
+      params: {
+        acBidders: ['appnexus', 'rubicon'],
+        maxSegs: 450,
+        overwrites: {
+          rubicon: function (bid, data, acEnabled, utils, defaultFn) {
+            if (defaultFn){
+              bid = defaultFn(bid, data, acEnabled)
+            }
+            if (data.gam && data.gam.length) {
+              utils.deepSetValue(bid, 'params.visitor.permutive', data.gam)
+            }
+          }
+        }
+      }
+    }]
+  },
+  ...
+})
+```
+Any custom bidder function will receive the following parameters:
+
+| Name          | Type          | Description                             |
+| ------------- |-------------- | --------------------------------------- |
+| bid           | Object        | The bidder specific bidder object. You will mutate this object to set the appropriate targeting keys.       |
+| data          | Object        | An object containing Permutive segments |
+| data.appnexus | string[]      | Segments exposed by the Xandr SSP integration |
+| data.rubicon  | string[]      | Segments exposed by the Magnite SSP integration  |
+| data.gam      | string[]      | Segments exposed by the Google Ad Manager integration |
+| data.ac       | string[]      | Segments exposed by the Audience Connector |
+| acEnabled     | Boolean       | `true` if the current bidder in included in `params.acBidders` |
+| utils         | {}            | An object containing references to various util functions used by `permutiveRtdProvider.js`. Please make sure not to overwrite any of these. |
+| defaultFn     | Function      | The default function for this bidder. Please note that this can be `undefined` if there is no default function for this bidder (see `Supported Bidders`). The function expect the following parameters: `bid`, `data`, `acEnabled` and will return `bid`. |
+
+**Warning**
+
+The custom bidder function will mutate the `bid` object. Please be aware that this could break your bid request if you accidentally overwrite any fields other than the `permutive` or `p_standard` key-values or if you change the structure of the `bid` object in any way.
diff --git a/test/spec/modules/permutiveRtdProvider_spec.js b/test/spec/modules/permutiveRtdProvider_spec.js
new file mode 100644
index 00000000000..d55bbc58056
--- /dev/null
+++ b/test/spec/modules/permutiveRtdProvider_spec.js
@@ -0,0 +1,282 @@
+import { permutiveSubmodule, storage, getSegments, initSegments, isAcEnabled, isPermutiveOnPage } from 'modules/permutiveRtdProvider.js'
+import { deepAccess } from '../../../src/utils.js'
+
+describe('permutiveRtdProvider', function () {
+  before(function () {
+    const data = getTargetingData()
+    setLocalStorage(data)
+  })
+
+  after(function () {
+    const data = getTargetingData()
+    removeLocalStorage(data)
+  })
+
+  describe('permutiveSubmodule', function () {
+    it('should initalise and return true', function () {
+      expect(permutiveSubmodule.init()).to.equal(true)
+    })
+  })
+
+  describe('Getting segments', function () {
+    it('should retrieve segments in the expected structure', function () {
+      const data = transformedTargeting()
+      expect(getSegments(250)).to.deep.equal(data)
+    })
+    it('should enforce max segments', function () {
+      const max = 1
+      const segments = getSegments(max)
+
+      for (const key in segments) {
+        expect(segments[key]).to.have.length(max)
+      }
+    })
+  })
+
+  describe('Default segment targeting', function () {
+    it('sets segment targeting for Xandr', function () {
+      const data = transformedTargeting()
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'appnexus') {
+              expect(deepAccess(params, 'keywords.permutive')).to.eql(data.appnexus)
+              expect(deepAccess(params, 'keywords.p_standard')).to.eql(data.ac)
+            }
+          })
+        })
+      }
+    })
+    it('sets segment targeting for Rubicon', function () {
+      const data = transformedTargeting()
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'rubicon') {
+              expect(deepAccess(params, 'visitor.permutive')).to.eql(data.rubicon)
+              expect(deepAccess(params, 'visitor.p_standard')).to.eql(data.ac)
+            }
+          })
+        })
+      }
+    })
+    it('sets segment targeting for Ozone', function () {
+      const data = transformedTargeting()
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'ozone') {
+              expect(deepAccess(params, 'customData.0.targeting.p_standard')).to.eql(data.ac)
+            }
+          })
+        })
+      }
+    })
+  })
+
+  describe('Custom segment targeting', function () {
+    it('sets custom segment targeting for Rubicon', function () {
+      const data = transformedTargeting()
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      config.params.overwrites = {
+        rubicon: function (bid, data, acEnabled, utils, defaultFn) {
+          if (defaultFn) {
+            bid = defaultFn(bid, data, acEnabled)
+          }
+          if (data.gam && data.gam.length) {
+            utils.deepSetValue(bid, 'params.visitor.permutive', data.gam)
+          }
+        }
+      }
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'rubicon') {
+              expect(deepAccess(params, 'visitor.permutive')).to.eql(data.gam)
+              expect(deepAccess(params, 'visitor.p_standard')).to.eql(data.ac)
+            }
+          })
+        })
+      }
+    })
+  })
+
+  describe('Permutive on page', function () {
+    it('checks if Permutive is on page', function () {
+      expect(isPermutiveOnPage()).to.equal(false)
+    })
+  })
+
+  describe('AC is enabled', function () {
+    it('checks if AC is enabled for Xandr', function () {
+      expect(isAcEnabled({ params: { acBidders: ['appnexus'] } }, 'appnexus')).to.equal(true)
+      expect(isAcEnabled({ params: { acBidders: ['kjdbfkvb'] } }, 'appnexus')).to.equal(false)
+    })
+    it('checks if AC is enabled for Magnite', function () {
+      expect(isAcEnabled({ params: { acBidders: ['rubicon'] } }, 'rubicon')).to.equal(true)
+      expect(isAcEnabled({ params: { acBidders: ['kjdbfkb'] } }, 'rubicon')).to.equal(false)
+    })
+    it('checks if AC is enabled for Ozone', function () {
+      expect(isAcEnabled({ params: { acBidders: ['ozone'] } }, 'ozone')).to.equal(true)
+      expect(isAcEnabled({ params: { acBidders: ['kjdvb'] } }, 'ozone')).to.equal(false)
+    })
+  })
+})
+
+function setLocalStorage (data) {
+  for (const key in data) {
+    storage.setDataInLocalStorage(key, JSON.stringify(data[key]))
+  }
+}
+
+function removeLocalStorage (data) {
+  for (const key in data) {
+    storage.removeDataFromLocalStorage(key)
+  }
+}
+
+function getConfig () {
+  return {
+    name: 'permutive',
+    waitForIt: true,
+    params: {
+      acBidders: ['appnexus', 'rubicon', 'ozone'],
+      maxSegs: 500
+    }
+  }
+}
+
+function transformedTargeting () {
+  const data = getTargetingData()
+
+  return {
+    ac: [...data._pcrprs, ...data._ppam, ...data._psegs.filter(seg => seg >= 1000000)],
+    appnexus: data._papns,
+    rubicon: data._prubicons,
+    gam: data._pdfps
+  }
+}
+
+function getTargetingData () {
+  return {
+    _pdfps: ['gam1', 'gam2'],
+    _prubicons: ['rubicon1', 'rubicon2'],
+    _papns: ['appnexus1', 'appnexus2'],
+    _psegs: ['1234', '1000001', '1000002'],
+    _ppam: ['ppam1', 'ppam2'],
+    _pcrprs: ['pcrprs1', 'pcrprs2']
+  }
+}
+
+function getAdUnits () {
+  return [
+    {
+      code: '/19968336/header-bid-tag-0',
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [300, 250],
+            [300, 600]
+          ]
+        }
+      },
+      bids: [
+        {
+          bidder: 'appnexus',
+          params: {
+            placementId: 13144370,
+            keywords: {
+              inline_kvs: ['1']
+            }
+          }
+        },
+        {
+          bidder: 'rubicon',
+          params: {
+            accountId: '9840',
+            siteId: '123564',
+            zoneId: '583584',
+            inventory: {
+              area: ['home']
+            },
+            visitor: {
+              inline_kvs: ['1']
+            }
+          }
+        },
+        {
+          bidder: 'ozone',
+          params: {
+            publisherId: 'OZONEGMG0001',
+            siteId: '4204204209',
+            placementId: '0420420500',
+            customData: [
+              {
+                settings: {},
+                targeting: {
+                  inline_kvs: ['1', '2', '3', '4']
+                }
+              }
+            ],
+            ozoneData: {}
+          }
+        }
+      ]
+    },
+    {
+      code: '/19968336/header-bid-tag-1',
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [728, 90],
+            [970, 250]
+          ]
+        }
+      },
+      bids: [
+        {
+          bidder: 'appnexus',
+          params: {
+            placementId: 13144370
+          }
+        },
+        {
+          bidder: 'ozone',
+          params: {
+            publisherId: 'OZONEGMG0001',
+            siteId: '4204204209',
+            placementId: '0420420500'
+          }
+        }
+      ]
+    }
+  ]
+}

From a55b1ad3fcc2cfeeabd083ee1784161e35fa8f26 Mon Sep 17 00:00:00 2001
From: Gena <wertixvost@gmail.com>
Date: Fri, 12 Feb 2021 23:58:33 +0200
Subject: [PATCH 249/304] Adtelligent Bid Adapter: Add Navelix as alias (#6306)

* Navelix bidder

* gvlID
---
 modules/adtelligentBidAdapter.js                | 15 +++++----------
 test/spec/modules/adtelligentBidAdapter_spec.js |  3 ++-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/modules/adtelligentBidAdapter.js b/modules/adtelligentBidAdapter.js
index 0964de397d1..669feeedb04 100644
--- a/modules/adtelligentBidAdapter.js
+++ b/modules/adtelligentBidAdapter.js
@@ -15,16 +15,10 @@ const HOST_GETTERS = {
       return 'ghb' + subdomainSuffixes[num++ % subdomainSuffixes.length] + '.adtelligent.com';
     }
   }()),
-  appaloosa: function () {
-    return 'ghb.hb.appaloosa.media';
-  },
-  onefiftytwomedia: function () {
-    return 'ghb.ads.152media.com';
-  },
-  mediafuse: function () {
-    return 'ghb.hbmp.mediafuse.com';
-  }
-
+  navelix: () => 'ghb.hb.navelix.com',
+  appaloosa: () => 'ghb.hb.appaloosa.media',
+  onefiftytwomedia: () => 'ghb.ads.152media.com',
+  mediafuse: () => 'ghb.hbmp.mediafuse.com',
 }
 const getUri = function (bidderCode) {
   let bidderWithoutSuffix = bidderCode.split('_')[0];
@@ -41,6 +35,7 @@ export const spec = {
   code: BIDDER_CODE,
   gvlid: 410,
   aliases: ['onefiftytwomedia', 'selectmedia', 'appaloosa',
+    { code: 'navelix', gvlid: 380 },
     {
       code: 'mediafuse',
       skipPbsAliasing: true
diff --git a/test/spec/modules/adtelligentBidAdapter_spec.js b/test/spec/modules/adtelligentBidAdapter_spec.js
index 7a0d704d7c2..67372216e96 100644
--- a/test/spec/modules/adtelligentBidAdapter_spec.js
+++ b/test/spec/modules/adtelligentBidAdapter_spec.js
@@ -14,7 +14,8 @@ const aliasEP = {
   appaloosa: 'https://ghb.hb.appaloosa.media/v2/auction/',
   appaloosa_publisherSuffix: 'https://ghb.hb.appaloosa.media/v2/auction/',
   onefiftytwomedia: 'https://ghb.ads.152media.com/v2/auction/',
-  mediafuse: 'https://ghb.hbmp.mediafuse.com/v2/auction/'
+  mediafuse: 'https://ghb.hbmp.mediafuse.com/v2/auction/',
+  navelix: 'https://ghb.hb.navelix.com/v2/auction/',
 };
 
 const DEFAULT_ADATPER_REQ = { bidderCode: 'adtelligent' };

From c94ee670446776db0e6f6ad50379fe8e59ba323f Mon Sep 17 00:00:00 2001
From: jsut <adam.prime@wattpad.com>
Date: Tue, 16 Feb 2021 07:31:28 -0500
Subject: [PATCH 250/304] Pubmatic add warning for non-string adSlots (#6304)

* add warning for non-string adSlots

- and update the markdown file to say they should be strings

* be more specific in explanatory comment
---
 modules/pubmaticBidAdapter.js | 3 +++
 modules/pubmaticBidAdapter.md | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index c70ecb4af27..07e5b62ac26 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -204,6 +204,9 @@ function _cleanSlot(slotName) {
   if (utils.isStr(slotName)) {
     return slotName.replace(/^\s+/g, '').replace(/\s+$/g, '');
   }
+  if (slotName) {
+    utils.logWarn(BIDDER_CODE + ': adSlot must be a string. Ignoring adSlot');
+  }
   return '';
 }
 
diff --git a/modules/pubmaticBidAdapter.md b/modules/pubmaticBidAdapter.md
index a34df148630..e9d93d79758 100644
--- a/modules/pubmaticBidAdapter.md
+++ b/modules/pubmaticBidAdapter.md
@@ -24,9 +24,9 @@ var adUnits = [
     bids: [{
       bidder: 'pubmatic',
       params: {
-        publisherId: '156209',               // required, must be wrapped in quotes
+        publisherId: '156209',               // required, must be a string, not an integer or other js type.
         oustreamAU: 'renderer_test_pubmatic',   // required if mediaTypes-> video-> context is 'outstream' and optional if renderer is defined in adUnits or in mediaType video. This value can be get by BlueBillyWig Team.
-        adSlot: 'pubmatic_test2',            // optional
+        adSlot: 'pubmatic_test2',            // optional, must be a string, not an integer or other js type.
         pmzoneid: 'zone1, zone11',           // optional
         lat: '40.712775',                    // optional
         lon: '-74.005973',                   // optional

From 59ef8113628ef05ada2990d25c4f677c87d9eeec Mon Sep 17 00:00:00 2001
From: Steve Alliance <steve.alliance@gmail.com>
Date: Tue, 16 Feb 2021 12:01:34 -0500
Subject: [PATCH 251/304] Update ttl outstream (#6253)

* adding DMX

test @97%, two files added one updated

* Update districtm_spec.js

* Update districtmDMX.js

* adding all districtm needed file

* remove legacy file

* remove typo || 0 in the test method

* force default to return a valid width and height

* update unit test code for failing test

* changed class for an object

* remove package-lock.json

* change file name for dmx adapter

* renamed files

* restaure package-lock.json

* update to last package-lock state

* update gdpr user consent

* fix sizes issue

* Documentation updates

Adding the readme.md info

* update file name and update unit testing import file location

* current machine state

* lint correction

* remove variable assigment duplicate

* adding CCPA support for DMX

* adding test for ccpa and gdpr

* districtm dmx adding deal id field

* idsync support ccpa & gdpr

* merge forked

* stop mediatype changing ttl

* remove lint error

* adding gvlid for dmx

* removing change

Removing change from on commit PR file package-lock.json

* update file

Removing comments on DMX adapter

* Revert "removing change"

This reverts commit e4bbbe55

* adding aliases base on ticket #6294

* update file

Removing comments on DMX adapter

* fix error for issue #6294

* file removal from PR

Co-authored-by: Steve Alliance <steve@districtm.ca>
Co-authored-by: Luis <luissastreverzun@gmail.com>
Co-authored-by: Steve Alliance <stevealliance@Steves-Air.localdomain>
Co-authored-by: Steve Alliance <stevealliance@Steves-MacBook-Air.local>
Co-authored-by: steve-a-districtm <steve@districtm.net>
Co-authored-by: Steve Alliance <stevealliance@DMMBP-C02WXCFAJG5H.local>
---
 modules/districtmDMXBidAdapter.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/districtmDMXBidAdapter.js b/modules/districtmDMXBidAdapter.js
index f01c3c2ce9f..ec0a0a2f2e6 100644
--- a/modules/districtmDMXBidAdapter.js
+++ b/modules/districtmDMXBidAdapter.js
@@ -7,6 +7,7 @@ const BIDDER_CODE = 'districtmDMX';
 
 const DMXURI = 'https://dmx.districtm.io/b/v1';
 
+const GVLID = 144;
 const VIDEO_MAPPING = {
   playback_method: {
     'auto_play_sound_on': 1,
@@ -19,6 +20,8 @@ const VIDEO_MAPPING = {
 };
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
+  aliases: ['dmx'],
   supportedFormat: [BANNER, VIDEO],
   supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid(bid) {
@@ -41,7 +44,7 @@ export const spec = {
               nBid.height = nBid.h || height;
               nBid.ttl = 300;
               nBid.mediaType = bid.mediaTypes && bid.mediaTypes.video ? 'video' : 'banner';
-              if (nBid.mediaType) {
+              if (nBid.mediaType === 'video') {
                 nBid.vastXml = cleanVast(nBid.adm, nBid.nurl);
                 nBid.ttl = 3600;
               }

From 942afbe744d3e25b04684bb9c28e90a10905c2a5 Mon Sep 17 00:00:00 2001
From: Ian Flournoy <ian@flournoy.us>
Date: Tue, 16 Feb 2021 12:24:30 -0500
Subject: [PATCH 252/304] [ParrableIdSystem] Accept lowercase timezone names in
 timezone filter (#6282)

* Add lower case comparison for allowedZones

* Lowercase blocked zones also

* Fixed timezone lowercase tests

* Handle IE missing timeZone field

* Improve lowercase timezone comparison

Co-authored-by: Victor <victorigualada@gmail.com>
---
 modules/parrableIdSystem.js                | 13 +++++++---
 test/spec/modules/parrableIdSystem_spec.js | 28 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/modules/parrableIdSystem.js b/modules/parrableIdSystem.js
index f072de8736f..826dd9a933a 100644
--- a/modules/parrableIdSystem.js
+++ b/modules/parrableIdSystem.js
@@ -6,6 +6,7 @@
  */
 
 import * as utils from '../src/utils.js'
+import find from 'core-js-pure/features/array/find.js';
 import { ajax } from '../src/ajax.js';
 import { submodule } from '../src/hook.js';
 import { getRefererInfo } from '../src/refererDetection.js';
@@ -137,12 +138,18 @@ function shouldFilterImpression(configParams, parrableId) {
   const offset = (new Date()).getTimezoneOffset() / 60;
   const zone = Intl.DateTimeFormat().resolvedOptions().timeZone;
 
+  function isZoneListed(list, zone) {
+    // IE does not provide a timeZone in IANA format so zone will be empty
+    const zoneLowercase = zone && zone.toLowerCase();
+    return !!(list && zone && find(list, zn => zn.toLowerCase() === zoneLowercase));
+  }
+
   function isAllowed() {
     if (utils.isEmpty(config.allowedZones) &&
       utils.isEmpty(config.allowedOffsets)) {
       return true;
     }
-    if (utils.contains(config.allowedZones, zone)) {
+    if (isZoneListed(config.allowedZones, zone)) {
       return true;
     }
     if (utils.contains(config.allowedOffsets, offset)) {
@@ -156,7 +163,7 @@ function shouldFilterImpression(configParams, parrableId) {
       utils.isEmpty(config.blockedOffsets)) {
       return false;
     }
-    if (utils.contains(config.blockedZones, zone)) {
+    if (isZoneListed(config.blockedZones, zone)) {
       return true;
     }
     if (utils.contains(config.blockedOffsets, offset)) {
@@ -165,7 +172,7 @@ function shouldFilterImpression(configParams, parrableId) {
     return false;
   }
 
-  return !isAllowed() || isBlocked();
+  return isBlocked() || !isAllowed();
 }
 
 function fetchId(configParams, gdprConsentData) {
diff --git a/test/spec/modules/parrableIdSystem_spec.js b/test/spec/modules/parrableIdSystem_spec.js
index f0aac7666f9..3f517a66c68 100644
--- a/test/spec/modules/parrableIdSystem_spec.js
+++ b/test/spec/modules/parrableIdSystem_spec.js
@@ -305,6 +305,20 @@ describe('Parrable ID System', function() {
       expect(resolvedOptions.called).to.equal(true);
     });
 
+    it('permits an impression from a lower cased allowed timezone', function() {
+      const allowedZone = 'America/New_York';
+      const resolvedOptions = sinon.stub().returns({ timeZone: allowedZone });
+      Intl.DateTimeFormat.returns({ resolvedOptions });
+
+      expect(parrableIdSubmodule.getId({ params: {
+        partner: 'prebid-test',
+        timezoneFilter: {
+          allowedZones: [ allowedZone.toLowerCase() ]
+        }
+      } })).to.have.property('callback');
+      expect(resolvedOptions.called).to.equal(true);
+    });
+
     it('permits an impression from a timezone that is not blocked', function() {
       const blockedZone = 'America/New_York';
       const resolvedOptions = sinon.stub().returns({ timeZone: 'Iceland' });
@@ -333,6 +347,20 @@ describe('Parrable ID System', function() {
       expect(resolvedOptions.called).to.equal(true);
     });
 
+    it('does not permit an impression from a lower cased blocked timezone', function() {
+      const blockedZone = 'America/New_York';
+      const resolvedOptions = sinon.stub().returns({ timeZone: blockedZone });
+      Intl.DateTimeFormat.returns({ resolvedOptions });
+
+      expect(parrableIdSubmodule.getId({ params: {
+        partner: 'prebid-test',
+        timezoneFilter: {
+          blockedZones: [ blockedZone.toLowerCase() ]
+        }
+      } })).to.equal(null);
+      expect(resolvedOptions.called).to.equal(true);
+    });
+
     it('does not permit an impression from a blocked timezone even when also allowed', function() {
       const timezone = 'America/New_York';
       const resolvedOptions = sinon.stub().returns({ timeZone: timezone });

From 7bc2561bfeee91ee4be752c76970566c366515ab Mon Sep 17 00:00:00 2001
From: Thomas Skaarnes Nikitin
 <48713095+thomas-netric@users.noreply.github.com>
Date: Tue, 16 Feb 2021 20:37:21 +0100
Subject: [PATCH 253/304] Added new size - Id 550 (980x480) (#6311)

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

diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index e9f25c9411e..6e1e383c4d2 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -103,7 +103,8 @@ var sizeMap = {
   278: '320x500',
   282: '320x400',
   288: '640x380',
-  548: '500x1000'
+  548: '500x1000',
+  550: '980x480'
 };
 utils._each(sizeMap, (item, key) => sizeMap[item] = key);
 

From 929b27a4bc3815b834793a712cbb996971d23fcf Mon Sep 17 00:00:00 2001
From: bretg <bgorsline@gmail.com>
Date: Tue, 16 Feb 2021 16:10:45 -0500
Subject: [PATCH 254/304] Revert "Rubicon Bid Adapter: updated transactionId to
 auctionId for OpenRTB (#6298)" (#6314)

This reverts commit f672209110ef30b9cdf96048d4e8285d43716b4a.
---
 modules/rubiconBidAdapter.js                | 4 ++--
 test/spec/modules/rubiconBidAdapter_spec.js | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index 6e1e383c4d2..f3b4ff2500a 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -154,7 +154,7 @@ export const spec = {
         test: config.getConfig('debug') ? 1 : 0,
         cur: ['USD'],
         source: {
-          tid: bidRequest.auctionId
+          tid: bidRequest.transactionId
         },
         tmax: bidderRequest.timeout,
         imp: [{
@@ -425,7 +425,7 @@ export const spec = {
       'rp_floor': (params.floor = parseFloat(params.floor)) >= 0.01 ? params.floor : undefined,
       'rp_secure': '1',
       'tk_flint': `${rubiConf.int_type || DEFAULT_INTEGRATION}_v$prebid.version$`,
-      'x_source.tid': bidRequest.auctionId,
+      'x_source.tid': bidRequest.transactionId,
       'x_source.pchain': params.pchain,
       'p_screen_res': _getScreenResolution(),
       'tk_user_key': params.userId,
diff --git a/test/spec/modules/rubiconBidAdapter_spec.js b/test/spec/modules/rubiconBidAdapter_spec.js
index 5b881299210..8c25d97dada 100644
--- a/test/spec/modules/rubiconBidAdapter_spec.js
+++ b/test/spec/modules/rubiconBidAdapter_spec.js
@@ -415,7 +415,7 @@ describe('the rubicon adapter', function () {
             'rp_secure': /[01]/,
             'rand': '0.1',
             'tk_flint': INTEGRATION,
-            'x_source.tid': 'c45dd708-a418-42ec-b8a7-b70a6c6fab0a',
+            'x_source.tid': 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',
             'x_source.pchain': 'GAM:11111-reseller1:22222',
             'p_screen_res': /\d+x\d+/,
             'tk_user_key': '12346',
@@ -572,7 +572,7 @@ describe('the rubicon adapter', function () {
             'rp_secure': /[01]/,
             'rand': '0.1',
             'tk_flint': INTEGRATION,
-            'x_source.tid': 'c45dd708-a418-42ec-b8a7-b70a6c6fab0a',
+            'x_source.tid': 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',
             'p_screen_res': /\d+x\d+/,
             'tk_user_key': '12346',
             'kw': 'a,b,c',
@@ -895,7 +895,7 @@ describe('the rubicon adapter', function () {
               'rp_secure': /[01]/,
               'rand': '0.1',
               'tk_flint': INTEGRATION,
-              'x_source.tid': 'c45dd708-a418-42ec-b8a7-b70a6c6fab0a',
+              'x_source.tid': 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',
               'p_screen_res': /\d+x\d+/,
               'tk_user_key': '12346',
               'kw': 'a,b,c',
@@ -2067,7 +2067,7 @@ describe('the rubicon adapter', function () {
             'p_pos': 'atf',
             'rp_secure': /[01]/,
             'tk_flint': INTEGRATION,
-            'x_source.tid': 'c45dd708-a418-42ec-b8a7-b70a6c6fab0a',
+            'x_source.tid': 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',
             'p_screen_res': /\d+x\d+/,
             'tk_user_key': '12346',
             'kw': 'a,b,c',

From 46152b27f9eaa86c0b57623cff42360a7bdc15b2 Mon Sep 17 00:00:00 2001
From: bretg <bgorsline@gmail.com>
Date: Tue, 16 Feb 2021 17:34:47 -0500
Subject: [PATCH 255/304] Rubicon: adding size 300x200 (#6315)

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

diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index f3b4ff2500a..7297c82440f 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -104,7 +104,8 @@ var sizeMap = {
   282: '320x400',
   288: '640x380',
   548: '500x1000',
-  550: '980x480'
+  550: '980x480',
+  552: '300x200'
 };
 utils._each(sizeMap, (item, key) => sizeMap[item] = key);
 

From 838ede577cd6de17b1f7ed8faac673331ecb32c9 Mon Sep 17 00:00:00 2001
From: lksharma <sharmak.love@gmail.com>
Date: Wed, 17 Feb 2021 02:05:06 -0500
Subject: [PATCH 256/304] added prebid version support to ixdiag (#6292)

---
 modules/ixBidAdapter.js                | 3 ++-
 test/spec/modules/ixBidAdapter_spec.js | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 48a2e741c5a..699209a12e9 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -511,7 +511,8 @@ function buildIXDiag(validBidRequests) {
     nu: 0,
     ou: 0,
     allU: 0,
-    ren: false
+    ren: false,
+    version: '$prebid.version$'
   };
 
   // create ad unit map and collect the required diag properties
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index fca3f8f992e..354898207a5 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -1496,6 +1496,7 @@ describe('IndexexchangeAdapter', function () {
         expect(diagObj.ren).to.equal(false);
         expect(diagObj.mfu).to.equal(1);
         expect(diagObj.allU).to.equal(1);
+        expect(diagObj.version).to.equal('$prebid.version$');
       });
     });
   });

From 3fd2bb57a4c849b0cba573b6f3ddc2b65f41e76a Mon Sep 17 00:00:00 2001
From: YerkovichM <48519843+YerkovichM@users.noreply.github.com>
Date: Wed, 17 Feb 2021 09:06:21 +0200
Subject: [PATCH 257/304] Extended ID permissions supported by bidder (#6276)

* User id bidder permission scheme

* styling

* prebidServer support

* -

* fix

* prebidServerBidAdapter take eidPermissions directly from userId module

* -

* unit tests

* -

* -

* update

* -

* -

* changed pbjs_bidders to pbjsBidders

* changed pbjsBidders to bidders
ext.prebid.data.eidPermissions to ext.prebid.data.eidpermissions

* rerun circleci

* rerun circleci

* omitting eidPermission entry if 'bidders' is not configured

* fixed 'calling the PBS adapter without any defined userId modules causes an exception'

* proposal

* rerun circleci

* utils implementation

* comment

* revert import validation

Co-authored-by: myerkovich <myerkovich@rubiconproject.com>
Co-authored-by: Marko Yerkovich <marko_yerkovich@MacBook-Pro-Marko.local>
Co-authored-by: Marko Yerkovich <myerkovich@magnite.com>
---
 integrationExamples/gpt/userId_example.html   |   1 +
 modules/prebidServerBidAdapter/index.js       |  29 +++-
 modules/userId/eids.js                        |  22 +++
 modules/userId/index.js                       |  53 +++++--
 src/utils.js                                  |   8 ++
 .../modules/prebidServerBidAdapter_spec.js    |  46 +++----
 test/spec/modules/userId_spec.js              | 130 +++++++++++++++++-
 7 files changed, 249 insertions(+), 40 deletions(-)

diff --git a/integrationExamples/gpt/userId_example.html b/integrationExamples/gpt/userId_example.html
index fa9b1e3b5fd..71299a4a6e1 100644
--- a/integrationExamples/gpt/userId_example.html
+++ b/integrationExamples/gpt/userId_example.html
@@ -236,6 +236,7 @@
                         },
                         {
                         name: "sharedId",
+                        // bidders: ["rubicon", "sampleBidders"], // to allow this ID for specific bidders
                         params: {
                             syncTime: 60 // in seconds, default is 24 hours
                         },
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index d878b520c78..c8199cd0aaf 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -12,6 +12,7 @@ import includes from 'core-js-pure/features/array/includes.js';
 import { S2S_VENDORS } from './config.js';
 import { ajax } from '../../src/ajax.js';
 import find from 'core-js-pure/features/array/find.js';
+import { getPrebidInternal } from '../../src/utils.js';
 
 const getConfig = config.getConfig;
 
@@ -23,6 +24,8 @@ const DEFAULT_S2S_NETREVENUE = true;
 
 let _s2sConfigs;
 
+let eidPermissions;
+
 /**
  * @typedef {Object} AdapterOptions
  * @summary s2sConfig parameter that adds arguments to resulting OpenRTB payload that goes to Prebid Server
@@ -459,7 +462,7 @@ export function resetWurlMap() {
 }
 
 const OPEN_RTB_PROTOCOL = {
-  buildRequest(s2sBidRequest, bidRequests, adUnits, s2sConfig) {
+  buildRequest(s2sBidRequest, bidRequests, adUnits, s2sConfig, requestedBidders) {
     let imps = [];
     let aliases = {};
     const firstBidRequest = bidRequests[0];
@@ -704,6 +707,17 @@ const OPEN_RTB_PROTOCOL = {
       utils.deepSetValue(request, 'user.ext.eids', bidUserIdAsEids);
     }
 
+    if (utils.isArray(eidPermissions) && eidPermissions.length > 0) {
+      if (requestedBidders && utils.isArray(requestedBidders)) {
+        eidPermissions.forEach(i => {
+          if (i.bidders) {
+            i.bidders = i.bidders.filter(bidder => requestedBidders.includes(bidder))
+          }
+        });
+      }
+      utils.deepSetValue(request, 'ext.prebid.data.eidpermissions', eidPermissions);
+    }
+
     if (bidRequests) {
       if (firstBidRequest.gdprConsent) {
         // note - gdprApplies & consentString may be undefined in certain use-cases for consentManagement module
@@ -962,8 +976,9 @@ export function PrebidServer() {
         queueSync(syncBidders, gdprConsent, uspConsent, s2sBidRequest.s2sConfig);
       }
 
-      const request = OPEN_RTB_PROTOCOL.buildRequest(s2sBidRequest, bidRequests, validAdUnits, s2sBidRequest.s2sConfig);
+      const request = OPEN_RTB_PROTOCOL.buildRequest(s2sBidRequest, bidRequests, validAdUnits, s2sBidRequest.s2sConfig, requestedBidders);
       const requestJson = request && JSON.stringify(request);
+      utils.logInfo('BidRequest: ' + requestJson);
       if (request && requestJson) {
         ajax(
           s2sBidRequest.s2sConfig.endpoint,
@@ -1021,4 +1036,14 @@ export function PrebidServer() {
   });
 }
 
+/**
+ * Global setter that sets eids permissions for bidders
+ * This setter is to be used by userId module when included
+ * @param {array} newEidPermissions
+ */
+function setEidPermissions(newEidPermissions) {
+  eidPermissions = newEidPermissions;
+}
+getPrebidInternal().setEidPermissions = setEidPermissions;
+
 adapterManager.registerBidAdapter(new PrebidServer(), 'prebidServer');
diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index 27665de4136..80750ccaae8 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -224,3 +224,25 @@ export function createEidsArray(bidRequestUserId) {
   }
   return eids;
 }
+
+/**
+ * @param {SubmoduleContainer[]} submodules
+ */
+export function buildEidPermissions(submodules) {
+  let eidPermissions = [];
+  submodules.filter(i => utils.isPlainObject(i.idObj) && Object.keys(i.idObj).length)
+    .forEach(i => {
+      Object.keys(i.idObj).forEach(key => {
+        if (utils.deepAccess(i, 'config.bidders') && Array.isArray(i.config.bidders) &&
+          utils.deepAccess(USER_IDS_CONFIG, key + '.source')) {
+          eidPermissions.push(
+            {
+              source: USER_IDS_CONFIG[key].source,
+              bidders: i.config.bidders
+            }
+          );
+        }
+      });
+    });
+  return eidPermissions;
+}
diff --git a/modules/userId/index.js b/modules/userId/index.js
index da2c7b225fa..3253be42a76 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -137,8 +137,9 @@ import { getGlobal } from '../../src/prebidGlobal.js';
 import { gdprDataHandler } from '../../src/adapterManager.js';
 import CONSTANTS from '../../src/constants.json';
 import { module, hook } from '../../src/hook.js';
-import { createEidsArray } from './eids.js';
+import { createEidsArray, buildEidPermissions } from './eids.js';
 import { getCoreStorageManager } from '../../src/storageManager.js';
+import {getPrebidInternal} from '../../src/utils.js';
 
 const MODULE_NAME = 'User ID';
 const COOKIE = 'cookie';
@@ -215,6 +216,14 @@ export function setStoredValue(submodule, value) {
   }
 }
 
+function setPrebidServerEidPermissions(initializedSubmodules) {
+  let setEidPermissions = getPrebidInternal().setEidPermissions;
+  if (typeof setEidPermissions === 'function' && utils.isArray(initializedSubmodules)) {
+    setEidPermissions(buildEidPermissions(initializedSubmodules));
+  }
+}
+
+/**
 /**
  * @param {SubmoduleStorage} storage
  * @param {String|undefined} key optional key of the value
@@ -434,6 +443,26 @@ function getCombinedSubmoduleIds(submodules) {
   return combinedSubmoduleIds;
 }
 
+/**
+ * This function will create a combined object for bidder with allowed subModule Ids
+ * @param {SubmoduleContainer[]} submodules
+ * @param {string} bidder
+ */
+function getCombinedSubmoduleIdsForBidder(submodules, bidder) {
+  if (!Array.isArray(submodules) || !submodules.length || !bidder) {
+    return {};
+  }
+  return submodules
+    .filter(i => !i.config.bidders || !utils.isArray(i.config.bidders) || i.config.bidders.includes(bidder))
+    .filter(i => utils.isPlainObject(i.idObj) && Object.keys(i.idObj).length)
+    .reduce((carry, i) => {
+      Object.keys(i.idObj).forEach(key => {
+        carry[key] = i.idObj[key];
+      });
+      return carry;
+    }, {});
+}
+
 /**
  * @param {AdUnit[]} adUnits
  * @param {SubmoduleContainer[]} submodules
@@ -442,19 +471,18 @@ function addIdDataToAdUnitBids(adUnits, submodules) {
   if ([adUnits].some(i => !Array.isArray(i) || !i.length)) {
     return;
   }
-  const combinedSubmoduleIds = getCombinedSubmoduleIds(submodules);
-  const combinedSubmoduleIdsAsEids = createEidsArray(combinedSubmoduleIds);
-  if (Object.keys(combinedSubmoduleIds).length) {
-    adUnits.forEach(adUnit => {
-      if (adUnit.bids && utils.isArray(adUnit.bids)) {
-        adUnit.bids.forEach(bid => {
+  adUnits.forEach(adUnit => {
+    if (adUnit.bids && utils.isArray(adUnit.bids)) {
+      adUnit.bids.forEach(bid => {
+        const combinedSubmoduleIds = getCombinedSubmoduleIdsForBidder(submodules, bid.bidder);
+        if (Object.keys(combinedSubmoduleIds).length) {
           // create a User ID object on the bid,
           bid.userId = combinedSubmoduleIds;
-          bid.userIdAsEids = combinedSubmoduleIdsAsEids;
-        });
-      }
-    });
-  }
+          bid.userIdAsEids = createEidsArray(combinedSubmoduleIds);
+        }
+      });
+    }
+  });
 }
 
 /**
@@ -467,6 +495,7 @@ function initializeSubmodulesAndExecuteCallbacks(continueAuction) {
   if (typeof initializedSubmodules === 'undefined') {
     initializedSubmodules = initSubmodules(submodules, gdprDataHandler.getConsentData());
     if (initializedSubmodules.length) {
+      setPrebidServerEidPermissions(initializedSubmodules);
       // list of submodules that have callbacks that need to be executed
       const submodulesWithCallbacks = initializedSubmodules.filter(item => utils.isFn(item.callback));
 
diff --git a/src/utils.js b/src/utils.js
index acdf0f101ad..bd3257ab7e7 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -43,6 +43,14 @@ export const internal = {
   deepEqual
 };
 
+let prebidInternal = {}
+/**
+ * Returns object that is used as internal prebid namespace
+ */
+export function getPrebidInternal() {
+  return prebidInternal;
+}
+
 var uniqueRef = {};
 export let bind = function(a, b) { return b; }.bind(null, 1, uniqueRef)() === uniqueRef
   ? Function.prototype.bind
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index f17cd3ab14f..4652bbb63f7 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -953,17 +953,15 @@ describe('S2S Adapter', function () {
       adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
-
-      expect(requestBid.ext).to.deep.equal({
-        prebid: {
-          aliases: {
-            brealtime: 'appnexus'
-          },
-          auctiontimestamp: 1510852447530,
-          targeting: {
-            includebidderkeys: false,
-            includewinners: true
-          }
+      expect(requestBid.ext).to.haveOwnProperty('prebid');
+      expect(requestBid.ext.prebid).to.deep.include({
+        aliases: {
+          brealtime: 'appnexus'
+        },
+        auctiontimestamp: 1510852447530,
+        targeting: {
+          includebidderkeys: false,
+          includewinners: true
         }
       });
     });
@@ -985,17 +983,15 @@ describe('S2S Adapter', function () {
       adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
-
-      expect(requestBid.ext).to.deep.equal({
-        prebid: {
-          aliases: {
-            [alias]: 'appnexus'
-          },
-          auctiontimestamp: 1510852447530,
-          targeting: {
-            includebidderkeys: false,
-            includewinners: true
-          }
+      expect(requestBid.ext).to.haveOwnProperty('prebid');
+      expect(requestBid.ext.prebid).to.deep.include({
+        aliases: {
+          [alias]: 'appnexus'
+        },
+        auctiontimestamp: 1510852447530,
+        targeting: {
+          includebidderkeys: false,
+          includewinners: true
         }
       });
     });
@@ -1376,7 +1372,7 @@ describe('S2S Adapter', function () {
 
       expect(requestBid).to.haveOwnProperty('ext');
       expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.equal({
+      expect(requestBid.ext.prebid).to.deep.include({
         auctiontimestamp: 1510852447530,
         foo: 'bar',
         targeting: {
@@ -1410,7 +1406,7 @@ describe('S2S Adapter', function () {
 
       expect(requestBid).to.haveOwnProperty('ext');
       expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.equal({
+      expect(requestBid.ext.prebid).to.deep.include({
         auctiontimestamp: 1510852447530,
         targeting: {
           includewinners: false,
@@ -1446,7 +1442,7 @@ describe('S2S Adapter', function () {
 
       expect(requestBid).to.haveOwnProperty('ext');
       expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.equal({
+      expect(requestBid.ext.prebid).to.deep.include({
         auctiontimestamp: 1510852447530,
         cache: {
           vastxml: 'vastxml-set-though-extPrebid.cache.vastXml'
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index 0fcf03dde67..8a7be41b2b5 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -39,6 +39,7 @@ import {haloIdSubmodule} from 'modules/haloIdSystem.js';
 import {pubProvidedIdSubmodule} from 'modules/pubProvidedIdSystem.js';
 import {criteoIdSubmodule} from 'modules/criteoIdSystem.js';
 import {tapadIdSubmodule} from 'modules/tapadIdSystem.js';
+import {getPrebidInternal} from 'src/utils.js';
 
 let assert = require('chai').assert;
 let expect = require('chai').expect;
@@ -70,7 +71,7 @@ describe('User ID', function () {
       code,
       mediaTypes: {banner: {}, native: {}},
       sizes: [[300, 200], [300, 600]],
-      bids: [{bidder: 'sampleBidder', params: {placementId: 'banner-only-bidder'}}]
+      bids: [{bidder: 'sampleBidder', params: {placementId: 'banner-only-bidder'}}, {bidder: 'anotherSampleBidder', params: {placementId: 'banner-only-bidder'}}]
     };
   }
 
@@ -1196,6 +1197,133 @@ describe('User ID', function () {
       }, {adUnits});
     });
 
+    it('eidPermissions fun with bidders', function (done) {
+      coreStorage.setCookie('sharedid', JSON.stringify({
+        'id': 'test222',
+        'ts': 1590525289611
+      }), (new Date(Date.now() + 5000).toUTCString()));
+
+      setSubmoduleRegistry([sharedIdSubmodule]);
+      let eidPermissions;
+      getPrebidInternal().setEidPermissions = function (newEidPermissions) {
+        eidPermissions = newEidPermissions;
+      }
+      init(config);
+      config.setConfig({
+        userSync: {
+          syncDelay: 0,
+          userIds: [
+            {
+              name: 'sharedId',
+              bidders: [
+                'sampleBidder'
+              ],
+              storage: {
+                type: 'cookie',
+                name: 'sharedid',
+                expires: 28
+              }
+            }
+          ]
+        }
+      });
+
+      requestBidsHook(function () {
+        expect(eidPermissions).to.deep.equal(
+          [
+            {
+              bidders: [
+                'sampleBidder'
+              ],
+              source: 'sharedid.org'
+            }
+          ]
+        );
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            if (bid.bidder === 'sampleBidder') {
+              expect(bid).to.have.deep.nested.property('userId.sharedid');
+              expect(bid.userId.sharedid.id).to.equal('test222');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'sharedid.org',
+                uids: [
+                  {
+                    id: 'test222',
+                    atype: 1,
+                    ext: {
+                      third: 'test222'
+                    }
+                  }
+                ]
+              });
+            }
+            if (bid.bidder === 'anotherSampleBidder') {
+              expect(bid).to.not.have.deep.nested.property('userId.sharedid');
+              expect(bid).to.not.have.property('userIdAsEids');
+            }
+          });
+        });
+        coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
+        getPrebidInternal().setEidPermissions = undefined;
+        done();
+      }, {adUnits});
+    });
+
+    it('eidPermissions fun without bidders', function (done) {
+      coreStorage.setCookie('sharedid', JSON.stringify({
+        'id': 'test222',
+        'ts': 1590525289611
+      }), (new Date(Date.now() + 5000).toUTCString()));
+
+      setSubmoduleRegistry([sharedIdSubmodule]);
+      let eidPermissions;
+      getPrebidInternal().setEidPermissions = function (newEidPermissions) {
+        eidPermissions = newEidPermissions;
+      }
+      init(config);
+      config.setConfig({
+        userSync: {
+          syncDelay: 0,
+          userIds: [
+            {
+              name: 'sharedId',
+              storage: {
+                type: 'cookie',
+                name: 'sharedid',
+                expires: 28
+              }
+            }
+          ]
+        }
+      });
+
+      requestBidsHook(function () {
+        expect(eidPermissions).to.deep.equal(
+          []
+        );
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.sharedid');
+            expect(bid.userId.sharedid.id).to.equal('test222');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'sharedid.org',
+              uids: [
+                {
+                  id: 'test222',
+                  atype: 1,
+                  ext: {
+                    third: 'test222'
+                  }
+                }]
+            });
+          });
+        });
+        getPrebidInternal().setEidPermissions = undefined;
+        coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
+        done();
+      }, {adUnits});
+    });
+
     it('test hook from pubProvidedId config params', function (done) {
       setSubmoduleRegistry([pubProvidedIdSubmodule]);
       init(config);

From c3a26f416812cfed174f926c811943cc31f45bf6 Mon Sep 17 00:00:00 2001
From: WlsLogan <77974248+WlsLogan@users.noreply.github.com>
Date: Wed, 17 Feb 2021 11:19:41 +0200
Subject: [PATCH 258/304] new bid adapter: Logain (#6312)

Co-authored-by: Aiholkin <artem.iholkin@smartyads.com>
---
 modules/loganBidAdapter.js                | 118 ++++++++
 modules/loganBidAdapter.md                |  72 +++++
 test/spec/modules/loganBidAdapter_spec.js | 329 ++++++++++++++++++++++
 3 files changed, 519 insertions(+)
 create mode 100644 modules/loganBidAdapter.js
 create mode 100644 modules/loganBidAdapter.md
 create mode 100644 test/spec/modules/loganBidAdapter_spec.js

diff --git a/modules/loganBidAdapter.js b/modules/loganBidAdapter.js
new file mode 100644
index 00000000000..e55876de675
--- /dev/null
+++ b/modules/loganBidAdapter.js
@@ -0,0 +1,118 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+
+const BIDDER_CODE = 'logan';
+const AD_URL = 'https://USeast2.logan.ai/?c=o&m=multi';
+const SYNC_URL = 'https://ssp-cookie.logan.ai/html?src=pbjs'
+
+function isBidResponseValid(bid) {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
+    !bid.ttl || !bid.currency) {
+    return false;
+  }
+  switch (bid.mediaType) {
+    case BANNER:
+      return Boolean(bid.width && bid.height && bid.ad);
+    case VIDEO:
+      return Boolean(bid.vastUrl);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers);
+    default:
+      return false;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: (bid) => {
+    return Boolean(bid.bidId && bid.params && !isNaN(parseInt(bid.params.placementId)));
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest) => {
+    const winTop = utils.getWindowTop();
+    const location = winTop.location;
+    const placements = [];
+    const request = {
+      'deviceWidth': winTop.screen.width,
+      'deviceHeight': winTop.screen.height,
+      'language': (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
+      'secure': 1,
+      'host': location.host,
+      'page': location.pathname,
+      'placements': placements
+    };
+
+    if (bidderRequest) {
+      if (bidderRequest.uspConsent) {
+        request.ccpa = bidderRequest.uspConsent;
+      }
+      if (bidderRequest.gdprConsent) {
+        request.gdpr = bidderRequest.gdprConsent
+      }
+    }
+
+    const len = validBidRequests.length;
+    for (let i = 0; i < len; i++) {
+      const bid = validBidRequests[i];
+      const placement = {
+        placementId: bid.params.placementId,
+        bidId: bid.bidId,
+        schain: bid.schain || {},
+      };
+      const mediaType = bid.mediaTypes
+
+      if (mediaType && mediaType[BANNER] && mediaType[BANNER].sizes) {
+        placement.sizes = mediaType[BANNER].sizes;
+        placement.traffic = BANNER;
+      } else if (mediaType && mediaType[VIDEO] && mediaType[VIDEO].playerSize) {
+        placement.wPlayer = mediaType[VIDEO].playerSize[0];
+        placement.hPlayer = mediaType[VIDEO].playerSize[1];
+        placement.traffic = VIDEO;
+      } else if (mediaType && mediaType[NATIVE]) {
+        placement.native = mediaType[NATIVE];
+        placement.traffic = NATIVE;
+      }
+      placements.push(placement);
+    }
+
+    return {
+      method: 'POST',
+      url: AD_URL,
+      data: request
+    };
+  },
+
+  interpretResponse: (serverResponse) => {
+    let response = [];
+    for (let i = 0; i < serverResponse.body.length; i++) {
+      let resItem = serverResponse.body[i];
+      if (isBidResponseValid(resItem)) {
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncUrl = SYNC_URL
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+    return [{
+      type: 'iframe',
+      url: syncUrl
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/loganBidAdapter.md b/modules/loganBidAdapter.md
new file mode 100644
index 00000000000..3c628cdacc2
--- /dev/null
+++ b/modules/loganBidAdapter.md
@@ -0,0 +1,72 @@
+# Overview
+
+```
+Module Name: logan Bidder Adapter
+Module Type: logan Bidder Adapter
+Maintainer: support@logan.ai
+```
+
+# Description
+
+Module that connects to logan demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+                {
+                    code:'1',
+                    mediaTypes:{
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'logan',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        video: {
+                            playerSize: [640, 480],
+                            context: 'instream'
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'logan',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'logan',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/test/spec/modules/loganBidAdapter_spec.js b/test/spec/modules/loganBidAdapter_spec.js
new file mode 100644
index 00000000000..96029294df0
--- /dev/null
+++ b/test/spec/modules/loganBidAdapter_spec.js
@@ -0,0 +1,329 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/loganBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+
+describe('LoganBidAdapter', function () {
+  const bid = {
+    bidId: '23fhj33i987f',
+    bidder: 'logan',
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+      placementId: 783,
+      traffic: BANNER
+    }
+  };
+
+  const bidderRequest = {
+    refererInfo: {
+      referer: 'test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      delete bid.params.placementId;
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests([bid], bidderRequest);
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://USeast2.logan.ai/?c=o&m=multi');
+    });
+    it('Returns valid data if array of bids is valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements');
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.gdpr).to.not.exist;
+      expect(data.ccpa).to.not.exist;
+      let placement = data['placements'][0];
+      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'sizes', 'schain');
+      expect(placement.placementId).to.equal(783);
+      expect(placement.bidId).to.equal('23fhj33i987f');
+      expect(placement.traffic).to.equal(BANNER);
+      expect(placement.schain).to.be.an('object');
+      expect(placement.sizes).to.be.an('array');
+    });
+
+    it('Returns valid data for mediatype video', function () {
+      const playerSize = [300, 300];
+      bid.mediaTypes = {};
+      bid.params.traffic = VIDEO;
+      bid.mediaTypes[VIDEO] = {
+        playerSize
+      };
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      let placement = data['placements'][0];
+      expect(placement).to.be.an('object');
+      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'wPlayer', 'hPlayer', 'schain');
+      expect(placement.traffic).to.equal(VIDEO);
+      expect(placement.wPlayer).to.equal(playerSize[0]);
+      expect(placement.hPlayer).to.equal(playerSize[1]);
+    });
+
+    it('Returns valid data for mediatype native', function () {
+      const native = {
+        title: {
+          required: true
+        },
+        body: {
+          required: true
+        },
+        icon: {
+          required: true,
+          size: [64, 64]
+        }
+      };
+
+      bid.mediaTypes = {};
+      bid.params.traffic = NATIVE;
+      bid.mediaTypes[NATIVE] = native;
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      let placement = data['placements'][0];
+      expect(placement).to.be.an('object');
+      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'native', 'schain');
+      expect(placement.traffic).to.equal(NATIVE);
+      expect(placement.native).to.equal(native);
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      bidderRequest.gdprConsent = 'test';
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = 'test';
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+
+    it('Returns empty data if no valid requests are passed', function () {
+      serverRequest = spec.buildRequests([]);
+      let data = serverRequest.data;
+      expect(data.placements).to.be.an('array').that.is.empty;
+    });
+  });
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.width).to.equal(300);
+      expect(dataItem.height).to.equal(250);
+      expect(dataItem.ad).to.equal('Test');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
+          mediaType: 'native',
+          native: {
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
+          },
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('iframe')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://ssp-cookie.logan.ai/html?src=pbjs&gdpr=1&gdpr_consent=ALL')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1NNN'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('iframe')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://ssp-cookie.logan.ai/html?src=pbjs&ccpa_consent=1NNN')
+    });
+  });
+});

From dc83f3b13dbff0509768723063659767250f69f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Cejrowski?= <pcejrowski@gmail.com>
Date: Wed, 17 Feb 2021 11:44:19 +0100
Subject: [PATCH 259/304] Change URL in Tapad Id Submodule (#6318)

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

diff --git a/modules/tapadIdSystem.js b/modules/tapadIdSystem.js
index e4dfe304585..a49d62897ad 100644
--- a/modules/tapadIdSystem.js
+++ b/modules/tapadIdSystem.js
@@ -3,7 +3,7 @@ import { submodule } from '../src/hook.js';
 import * as ajax from '../src/ajax.js'
 import * as utils from '../src/utils.js';
 
-export const graphUrl = 'https://realtime-graph-access-zxvhwknfeq-uc.a.run.app/v1/graph';
+export const graphUrl = 'https://rtga.tapad.com/v1/graph';
 
 export const tapadIdSubmodule = {
   name: 'tapadId',

From bdb661fb67a390a5f062049971b1d0d4d10114a9 Mon Sep 17 00:00:00 2001
From: li-ran <70167305+li-ran@users.noreply.github.com>
Date: Wed, 17 Feb 2021 06:08:17 -0500
Subject: [PATCH 260/304] IndexExchange Bid Adapter: Added support for netID,
 ID+ and FabrickId userId (#6286)

* added more userID partner support for IX adapter - TDID, LI, NetID, Neustar, Zeotap

* removed liveintent and adsrvr.org [DNA-5040]

* updated neustar id

* fixed fabrickid

* frabrickId instead of id

* added more userID partner support for IX adapter - NetID, Neustar, Zeotap (#1)

* added more userID partner support for IX adapter - TDID, LI, NetID, Neustar, Zeotap

* added tests

* added tests for new userinfo modules

* missed a few checks

* Dna 5040 ix userid support (#2)

* added more userID partner support for IX adapter - TDID, LI, NetID, Neustar, Zeotap

* removed liveintent and adsrvr.org [DNA-5040]

* updated neustar id

* fixed fabrickid

* frabrickId instead of id

* added tests

* added tests for new userinfo modules

* missed a few checks

Co-authored-by: Ran Li <ran.li@indexexchange.com>

* added few missing checks in IX adapter

* Use userIdAsEids instead of userId (#3)

* use eids, revert package-lock
* test update

Co-authored-by: Ran Li <ran.li@indexexchange.com>
Co-authored-by: amykwyang <amyyang90@gmail.com>
---
 modules/ixBidAdapter.js                | 78 ++++++++++------------
 test/spec/modules/ixBidAdapter_spec.js | 90 ++++++++++++++++++++++++--
 2 files changed, 116 insertions(+), 52 deletions(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 699209a12e9..7ddad134451 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -212,36 +212,35 @@ function getBidRequest(id, impressions) {
 }
 
 /**
- * Adds a User ID module's response into user Eids array.
- *
- * @param  {array}  userEids       An array of objects containing user ids,
- *                                 will be attached to bid request later.
- * @param  {object} seenIdPartners An object with Identity partners names already added,
- *                                 updated with new partner name.
- * @param  {*}      id             The id obtained from User ID module.
- * @param  {string} source         The URL of the User ID module.
- * @param  {string} ixlPartnerName The name of the Identity Partner in IX Library.
- * @param  {string} rtiPartner     The name of the User ID provider in Prebid.
- * @return {boolean}               True if successfully added the ID to the userEids, false otherwise.
+ * From the userIdAsEids array, filter for the ones our adserver can use, and modify them
+ * for our purposes, e.g. add rtiPartner
+ * @param {array} allEids userIdAsEids passed in by prebid
+ * @return {object} contains toSend (eids to send to the adserver) and seenSources (used to filter
+ *                  identity info from IX Library)
  */
-function addUserEids(userEids, seenIdPartners, id, source, ixlPartnerName, rtiPartner) {
-  if (id) {
-    // mark the partnername that IX RTI uses
-    seenIdPartners[ixlPartnerName] = 1;
-    userEids.push({
-      source: source,
-      uids: [{
-        id: id,
-        ext: {
-          rtiPartner: rtiPartner
-        }
-      }]
-    });
-    return true;
+function getEidInfo(allEids) {
+  // determines which eids we send and the rtiPartner field in ext
+  var sourceRTIMapping = {
+    'liveramp.com': 'idl',
+    'netid.de': 'NETID',
+    'neustar.biz': 'fabrickId',
+    'zeotap.com': 'zeotapIdPlus'
+  };
+  var toSend = [];
+  var seenSources = {};
+  if (utils.isArray(allEids)) {
+    for (var i = 0; i < allEids.length; i++) {
+      if (sourceRTIMapping[allEids[i].source] && utils.deepAccess(allEids[i], 'uids.0')) {
+        seenSources[allEids[i].source] = 1;
+        allEids[i].uids[0].ext = {
+          rtiPartner: sourceRTIMapping[allEids[i].source]
+        };
+        delete allEids[i].uids[0].atype;
+        toSend.push(allEids[i]);
+      }
+    }
   }
-
-  utils.logWarn('Tried to add a user ID from Prebid, the ID received was null');
-  return false;
+  return { toSend: toSend, seenSources: seenSources };
 }
 
 /**
@@ -255,21 +254,12 @@ function addUserEids(userEids, seenIdPartners, id, source, ixlPartnerName, rtiPa
  *
  */
 function buildRequest(validBidRequests, bidderRequest, impressions, version) {
-  const userEids = [];
-
   // Always use secure HTTPS protocol.
   let baseUrl = SECURE_BID_URL;
 
-  // Dict for identity partners already populated from prebid
-  let seenIdPartners = {};
-
   // Get ids from Prebid User ID Modules
-  const userId = validBidRequests[0].userId;
-  if (userId && typeof userId === 'object') {
-    if (userId.idl_env) {
-      addUserEids(userEids, seenIdPartners, userId.idl_env, 'liveramp.com', 'LiveRampIp', 'idl');
-    }
-  }
+  var eidInfo = getEidInfo(utils.deepAccess(validBidRequests, '0.userIdAsEids'));
+  var userEids = eidInfo.toSend;
 
   // RTI ids will be included in the bid request if the function getIdentityInfo() is loaded
   // and if the data for the partner exist
@@ -278,12 +268,10 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
     if (identityInfo && typeof identityInfo === 'object') {
       for (const partnerName in identityInfo) {
         if (identityInfo.hasOwnProperty(partnerName)) {
-          // check if not already populated by prebid cache
-          if (!seenIdPartners.hasOwnProperty(partnerName)) {
-            let response = identityInfo[partnerName];
-            if (!response.responsePending && response.data && typeof response.data === 'object' && Object.keys(response.data).length) {
-              userEids.push(response.data);
-            }
+          let response = identityInfo[partnerName];
+          if (!response.responsePending && response.data && typeof response.data === 'object' &&
+                Object.keys(response.data).length && !eidInfo.seenSources[response.data.source]) {
+            userEids.push(response.data);
           }
         }
       }
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index 354898207a5..6d7b3a397bd 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -3,6 +3,7 @@ import { config } from 'src/config.js';
 import { expect } from 'chai';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { spec } from 'modules/ixBidAdapter.js';
+import { createEidsArray } from 'modules/userId/eids.js';
 
 describe('IndexexchangeAdapter', function () {
   const IX_SECURE_ENDPOINT = 'https://htlb.casalemedia.com/cygnus';
@@ -351,8 +352,13 @@ describe('IndexexchangeAdapter', function () {
 
   const DEFAULT_USERID_DATA = {
     idl_env: '1234-5678-9012-3456', // Liveramp
+    netId: 'testnetid123', // NetId
+    IDP: 'userIDP000', // IDP
+    fabrickId: 'fabrickId9000', // FabrickId
   };
 
+  const DEFAULT_USERIDASEIDS_DATA = createEidsArray(DEFAULT_USERID_DATA);
+
   const DEFAULT_USERID_PAYLOAD = [
     {
       source: 'liveramp.com',
@@ -362,6 +368,30 @@ describe('IndexexchangeAdapter', function () {
           rtiPartner: 'idl'
         }
       }]
+    }, {
+      source: 'netid.de',
+      uids: [{
+        id: DEFAULT_USERID_DATA.netId,
+        ext: {
+          rtiPartner: 'NETID'
+        }
+      }]
+    }, {
+      source: 'neustar.biz',
+      uids: [{
+        id: DEFAULT_USERID_DATA.fabrickId,
+        ext: {
+          rtiPartner: 'fabrickId'
+        }
+      }]
+    }, {
+      source: 'zeotap.com',
+      uids: [{
+        id: DEFAULT_USERID_DATA.IDP,
+        ext: {
+          rtiPartner: 'zeotapIdPlus'
+        }
+      }]
     }
   ];
 
@@ -761,14 +791,18 @@ describe('IndexexchangeAdapter', function () {
       delete window.headertag;
     });
 
-    it('IX adapter reads LiveRamp IDL envelope from Prebid and adds it to Video', function () {
+    it('IX adapter reads supported user modules from Prebid and adds it to Video', function () {
       const cloneValidBid = utils.deepClone(DEFAULT_VIDEO_VALID_BID);
-      cloneValidBid[0].userId = utils.deepClone(DEFAULT_USERID_DATA);
+      // cloneValidBid[0].userId = utils.deepClone(DEFAULT_USERID_DATA);
+      cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
       const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
       const payload = JSON.parse(request.data.r);
 
-      expect(payload.user.eids).to.have.lengthOf(1);
+      expect(payload.user.eids).to.have.lengthOf(4);
       expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[0]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[1]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[2]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[3]);
     });
 
     it('We continue to send in IXL identity info and Prebid takes precedence over IXL', function () {
@@ -822,11 +856,45 @@ describe('IndexexchangeAdapter', function () {
               }
             }
           ]
+        },
+        NetIdIp: {
+          source: 'netid.de',
+          uids: [
+            {
+              id: 'testnetid',
+              ext: {
+                rtiPartner: 'NETID'
+              }
+            }
+          ]
+        },
+        NeustarIp: {
+          source: 'neustar.biz',
+          uids: [
+            {
+              id: 'testfabrick',
+              ext: {
+                rtiPartner: 'fabrickId'
+              }
+            }
+          ]
+        },
+        ZeotapIp: {
+          source: 'zeotap.com',
+          uids: [
+            {
+              id: 'testzeotap',
+              ext: {
+                rtiPartner: 'zeotapIdPlus'
+              }
+            }
+          ]
         }
       };
 
       const cloneValidBid = utils.deepClone(DEFAULT_BANNER_VALID_BID);
-      cloneValidBid[0].userId = utils.deepClone(DEFAULT_USERID_DATA)
+      // cloneValidBid[0].userId = utils.deepClone(DEFAULT_USERID_DATA);
+      cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
 
       const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
       const payload = JSON.parse(request.data.r);
@@ -867,10 +935,14 @@ describe('IndexexchangeAdapter', function () {
       })
 
       expect(payload.user).to.exist;
-      expect(payload.user.eids).to.have.lengthOf(3);
+      expect(payload.user.eids).to.have.lengthOf(6);
+
       expect(payload.user.eids).to.deep.include(validUserIdPayload[0]);
       expect(payload.user.eids).to.deep.include(validUserIdPayload[1]);
       expect(payload.user.eids).to.deep.include(validUserIdPayload[2]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[3]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[4]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[5]);
     });
 
     it('IXL and Prebid are mutually exclusive', function () {
@@ -892,7 +964,8 @@ describe('IndexexchangeAdapter', function () {
       };
 
       const cloneValidBid = utils.deepClone(DEFAULT_VIDEO_VALID_BID);
-      cloneValidBid[0].userId = utils.deepClone(DEFAULT_USERID_DATA);
+      // cloneValidBid[0].userId = utils.deepClone(DEFAULT_USERID_DATA);
+      cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
 
       const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
 
@@ -910,9 +983,12 @@ describe('IndexexchangeAdapter', function () {
       });
 
       const payload = JSON.parse(request.data.r);
-      expect(payload.user.eids).to.have.lengthOf(2);
+      expect(payload.user.eids).to.have.lengthOf(5);
       expect(payload.user.eids).to.deep.include(validUserIdPayload[0]);
       expect(payload.user.eids).to.deep.include(validUserIdPayload[1]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[2]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[3]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[4]);
     });
   });
 

From 2964e373051235024e154a6699b09dc1b3e00dae Mon Sep 17 00:00:00 2001
From: Jason Snellbaker <jsnellbaker@appnexus.com>
Date: Wed, 17 Feb 2021 15:31:12 -0500
Subject: [PATCH 261/304] Prebid 4.27.0 Release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 45493de7aea..a12805ef8e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.27.0-pre",
+  "version": "4.27.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 26a268a0899634998f7ccc05243238c55c389d84 Mon Sep 17 00:00:00 2001
From: Jason Snellbaker <jsnellbaker@appnexus.com>
Date: Wed, 17 Feb 2021 15:46:08 -0500
Subject: [PATCH 262/304] increment pre version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a12805ef8e8..dc0a46844ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.27.0",
+  "version": "4.28.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From cfe44642da9ba806441b119abeb651dd31091f54 Mon Sep 17 00:00:00 2001
From: matthieularere-msq
 <63732822+matthieularere-msq@users.noreply.github.com>
Date: Thu, 18 Feb 2021 12:45:22 +0100
Subject: [PATCH 263/304] mediasquare fix userId (#6321)

---
 modules/mediasquareBidAdapter.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/mediasquareBidAdapter.js b/modules/mediasquareBidAdapter.js
index 87f768d3b77..cb9bf5285a1 100644
--- a/modules/mediasquareBidAdapter.js
+++ b/modules/mediasquareBidAdapter.js
@@ -59,7 +59,11 @@ export const spec = {
       }
       if (bidderRequest.uspConsent) { payload.uspConsent = bidderRequest.uspConsent; }
       if (bidderRequest.schain) { payload.schain = bidderRequest.schain; }
-      if (bidderRequest.userId) { payload.userId = bidderRequest.userId; }
+      if (bidderRequest.userId) {
+        payload.userId = bidderRequest.userId;
+      } else if (bidderRequest.hasOwnProperty('bids') && typeof bidderRequest.bids == 'object' && bidderRequest.bids.length > 0 && bidderRequest.bids[0].hasOwnProperty('userId')) {
+        payload.userId = bidderRequest.bids[0].userId;
+      }
     };
     if (test) { payload.debug = true; }
     const payloadString = JSON.stringify(payload);

From 09391478c54da109ec9eddda35520640be624afe Mon Sep 17 00:00:00 2001
From: Samuel Adu <samuel.adu@gmail.com>
Date: Thu, 18 Feb 2021 11:53:34 +0000
Subject: [PATCH 264/304] Change the EU consent string parameter name to the
 company-wide standard (#6320)

---
 modules/verizonMediaIdSystem.js                | 2 +-
 test/spec/modules/verizonMediaIdSystem_spec.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/verizonMediaIdSystem.js b/modules/verizonMediaIdSystem.js
index fdfb8a993d8..ca395087d2d 100644
--- a/modules/verizonMediaIdSystem.js
+++ b/modules/verizonMediaIdSystem.js
@@ -59,7 +59,7 @@ export const verizonMediaIdSubmodule = {
       '1p': includes([1, '1', true], params['1p']) ? '1' : '0',
       he: params.he,
       gdpr: isEUConsentRequired(consentData) ? '1' : '0',
-      euconsent: isEUConsentRequired(consentData) ? consentData.gdpr.consentString : '',
+      gdpr_consent: isEUConsentRequired(consentData) ? consentData.gdpr.consentString : '',
       us_privacy: consentData && consentData.uspConsent ? consentData.uspConsent : ''
     };
 
diff --git a/test/spec/modules/verizonMediaIdSystem_spec.js b/test/spec/modules/verizonMediaIdSystem_spec.js
index c5d743235d6..10054b5674c 100644
--- a/test/spec/modules/verizonMediaIdSystem_spec.js
+++ b/test/spec/modules/verizonMediaIdSystem_spec.js
@@ -87,7 +87,7 @@ describe('Verizon Media ID Submodule', () => {
         pixelId: PIXEL_ID,
         '1p': '0',
         gdpr: '1',
-        euconsent: consentData.gdpr.consentString,
+        gdpr_consent: consentData.gdpr.consentString,
         us_privacy: consentData.uspConsent
       };
       const requestQueryParams = utils.parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
@@ -107,7 +107,7 @@ describe('Verizon Media ID Submodule', () => {
         he: HASHED_EMAIL,
         '1p': '0',
         gdpr: '1',
-        euconsent: consentData.gdpr.consentString,
+        gdpr_consent: consentData.gdpr.consentString,
         us_privacy: consentData.uspConsent
       };
       const requestQueryParams = utils.parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
@@ -134,7 +134,7 @@ describe('Verizon Media ID Submodule', () => {
 
       const requestQueryParams = utils.parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
       expect(requestQueryParams.gdpr).to.equal('1');
-      expect(requestQueryParams.euconsent).to.equal(consentData.gdpr.consentString);
+      expect(requestQueryParams.gdpr_consent).to.equal(consentData.gdpr.consentString);
     });
 
     it('sets GDPR consent data flag correctly when call is NOT under GDPR jurisdiction.', () => {
@@ -147,7 +147,7 @@ describe('Verizon Media ID Submodule', () => {
 
       const requestQueryParams = utils.parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
       expect(requestQueryParams.gdpr).to.equal('0');
-      expect(requestQueryParams.euconsent).to.equal('');
+      expect(requestQueryParams.gdpr_consent).to.equal('');
     });
 
     [1, '1', true].forEach(firstPartyParamValue => {

From 302b788c5a25c6847cfd172bb5a06a08f6b8cc0d Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Thu, 18 Feb 2021 08:54:12 -0800
Subject: [PATCH 265/304] adding support in pbsAdapter for getFloor (#6273)

---
 modules/prebidServerBidAdapter/index.js       | 17 ++++
 .../modules/prebidServerBidAdapter_spec.js    | 95 +++++++++++++++++++
 2 files changed, 112 insertions(+)

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index c8199cd0aaf..2d8acb34225 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -642,6 +642,23 @@ const OPEN_RTB_PROTOCOL = {
         utils.deepSetValue(imp, 'ext.prebid.storedauctionresponse.id', storedAuctionResponseBid.storedAuctionResponse.toString());
       }
 
+      const getFloorBid = find(firstBidRequest.bids, bid => bid.adUnitCode === adUnit.code && typeof bid.getFloor === 'function');
+
+      if (getFloorBid) {
+        let floorInfo;
+        try {
+          floorInfo = getFloorBid.getFloor({
+            currency: config.getConfig('currency.adServerCurrency') || DEFAULT_S2S_CURRENCY,
+          });
+        } catch (e) {
+          utils.logError('PBS: getFloor threw an error: ', e);
+        }
+        if (floorInfo && floorInfo.currency && !isNaN(parseFloat(floorInfo.floor))) {
+          imp.bidfloor = parseFloat(floorInfo.floor);
+          imp.bidfloorcur = floorInfo.currency
+        }
+      }
+
       if (imp.banner || imp.video || imp.native) {
         imps.push(imp);
       }
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 4652bbb63f7..8d88a3e0042 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -829,6 +829,101 @@ describe('S2S Adapter', function () {
       expect(requestBid.imp[0].ext.prebid.storedauctionresponse.id).to.equal('11111');
     });
 
+    describe('price floors module', function () {
+      function runTest(expectedFloor, expectedCur) {
+        adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+        const requestBid = JSON.parse(server.requests[requestCount].requestBody);
+        expect(requestBid.imp[0].bidfloor).to.equal(expectedFloor);
+        expect(requestBid.imp[0].bidfloorcur).to.equal(expectedCur);
+        requestCount += 1;
+      }
+
+      let getFloorResponse, requestCount;
+      beforeEach(function () {
+        getFloorResponse = {};
+        requestCount = 0;
+      });
+
+      it('should NOT pass bidfloor and bidfloorcur when getFloor not present or returns invalid response', function () {
+        const _config = {
+          s2sConfig: CONFIG,
+        };
+
+        config.setConfig(_config);
+
+        // if no get floor
+        runTest(undefined, undefined);
+
+        // if getFloor returns empty object
+        BID_REQUESTS[0].bids[0].getFloor = () => getFloorResponse;
+        sinon.spy(BID_REQUESTS[0].bids[0], 'getFloor');
+
+        runTest(undefined, undefined);
+        // make sure getFloor was called
+        expect(
+          BID_REQUESTS[0].bids[0].getFloor.calledWith({
+            currency: 'USD',
+          })
+        ).to.be.true;
+
+        // if getFloor does not return number
+        getFloorResponse = {currency: 'EUR', floor: 'not a number'};
+        runTest(undefined, undefined);
+
+        // if getFloor does not return currency
+        getFloorResponse = {floor: 1.1};
+        runTest(undefined, undefined);
+      });
+
+      it('should correctly pass bidfloor and bidfloorcur', function () {
+        const _config = {
+          s2sConfig: CONFIG,
+        };
+
+        config.setConfig(_config);
+
+        BID_REQUESTS[0].bids[0].getFloor = () => getFloorResponse;
+        sinon.spy(BID_REQUESTS[0].bids[0], 'getFloor');
+
+        // returns USD and string floor
+        getFloorResponse = {currency: 'USD', floor: '1.23'};
+        runTest(1.23, 'USD');
+        // make sure getFloor was called
+        expect(
+          BID_REQUESTS[0].bids[0].getFloor.calledWith({
+            currency: 'USD',
+          })
+        ).to.be.true;
+
+        // returns non USD and number floor
+        getFloorResponse = {currency: 'EUR', floor: 0.85};
+        runTest(0.85, 'EUR');
+      });
+
+      it('should correctly pass adServerCurrency when set to getFloor not default', function () {
+        config.setConfig({
+          s2sConfig: CONFIG,
+          currency: { adServerCurrency: 'JPY' },
+        });
+
+        // we have to start requestCount at 1 because a conversion rates fetch occurs when adServerCur is not USD!
+        requestCount = 1;
+
+        BID_REQUESTS[0].bids[0].getFloor = () => getFloorResponse;
+        sinon.spy(BID_REQUESTS[0].bids[0], 'getFloor');
+
+        // returns USD and string floor
+        getFloorResponse = {currency: 'JPY', floor: 97.2};
+        runTest(97.2, 'JPY');
+        // make sure getFloor was called with JPY
+        expect(
+          BID_REQUESTS[0].bids[0].getFloor.calledWith({
+            currency: 'JPY',
+          })
+        ).to.be.true;
+      });
+    });
+
     it('adds device.w and device.h even if the config lacks a device object', function () {
       const _config = {
         s2sConfig: CONFIG,

From 2d23cbc4291336050a675b061adf90b8d5063cf6 Mon Sep 17 00:00:00 2001
From: Damyan <wyand@abv.bg>
Date: Thu, 18 Feb 2021 23:14:43 +0200
Subject: [PATCH 266/304] AdHash Bidder Adapter: initial prebid.js integration
 (#6274)

---
 modules/adhashBidAdapter.js                | 102 ++++++++++++++
 modules/adhashBidAdapter.md                |  43 ++++++
 test/spec/modules/adhashBidAdapter_spec.js | 155 +++++++++++++++++++++
 3 files changed, 300 insertions(+)
 create mode 100644 modules/adhashBidAdapter.js
 create mode 100644 modules/adhashBidAdapter.md
 create mode 100644 test/spec/modules/adhashBidAdapter_spec.js

diff --git a/modules/adhashBidAdapter.js b/modules/adhashBidAdapter.js
new file mode 100644
index 00000000000..b30f9cebbc1
--- /dev/null
+++ b/modules/adhashBidAdapter.js
@@ -0,0 +1,102 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import includes from 'core-js-pure/features/array/includes.js';
+import { BANNER } from '../src/mediaTypes.js';
+
+const VERSION = '1.0';
+
+export const spec = {
+  code: 'adhash',
+  url: 'https://bidder.adhash.org/rtb?version=' + VERSION + '&prebid=true',
+  supportedMediaTypes: [ BANNER ],
+
+  isBidRequestValid: (bid) => {
+    try {
+      const { publisherId, platformURL } = bid.params;
+      return (
+        includes(Object.keys(bid.mediaTypes), BANNER) &&
+        typeof publisherId === 'string' &&
+        publisherId.length === 42 &&
+        typeof platformURL === 'string' &&
+        platformURL.length >= 13
+      );
+    } catch (error) {
+      return false;
+    }
+  },
+
+  buildRequests: (validBidRequests, bidderRequest) => {
+    const { gdprConsent } = bidderRequest;
+    const { url } = spec;
+    const bidRequests = [];
+    let referrer = '';
+    if (bidderRequest && bidderRequest.refererInfo) {
+      referrer = bidderRequest.refererInfo.referer;
+    }
+    for (var i = 0; i < validBidRequests.length; i++) {
+      var index = Math.floor(Math.random() * validBidRequests[i].sizes.length);
+      var size = validBidRequests[i].sizes[index].join('x');
+      bidRequests.push({
+        method: 'POST',
+        url: url,
+        bidRequest: validBidRequests[i],
+        data: {
+          timezone: new Date().getTimezoneOffset() / 60,
+          location: referrer,
+          publisherId: validBidRequests[i].params.publisherId,
+          size: {
+            screenWidth: window.screen.width,
+            screenHeight: window.screen.height
+          },
+          navigator: {
+            platform: window.navigator.platform,
+            language: window.navigator.language,
+            userAgent: window.navigator.userAgent
+          },
+          creatives: [{
+            size: size,
+            position: validBidRequests[i].adUnitCode
+          }],
+          blockedCreatives: [],
+          currentTimestamp: new Date().getTime(),
+          recentAds: [],
+          GDPR: gdprConsent
+        },
+        options: {
+          withCredentials: false,
+          crossOrigin: true
+        },
+      });
+    }
+    return bidRequests;
+  },
+
+  interpretResponse: (serverResponse, request) => {
+    const responseBody = serverResponse ? serverResponse.body : {};
+
+    if (!responseBody.creatives || responseBody.creatives.length === 0) {
+      return [];
+    }
+
+    const publisherURL = JSON.stringify(request.bidRequest.params.platformURL);
+    const oneTimeId = request.bidRequest.adUnitCode + Math.random().toFixed(16).replace('0.', '.');
+    const bidderResponse = JSON.stringify({ responseText: JSON.stringify(responseBody) });
+    const requestData = JSON.stringify(request.data);
+
+    return [{
+      requestId: request.bidRequest.bidId,
+      cpm: responseBody.creatives[0].costEUR,
+      ad:
+        `<div id="${oneTimeId}"></div>
+        <script src="https://bidder.adhash.org/static/scripts/creative.min.js"></script>
+        <script>callAdvertiser(${bidderResponse},['${oneTimeId}'],${requestData},${publisherURL})</script>`,
+      width: request.bidRequest.sizes[0][0],
+      height: request.bidRequest.sizes[0][1],
+      creativeId: request.bidRequest.adUnitCode,
+      netRevenue: true,
+      currency: 'EUR',
+      ttl: 60
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/adhashBidAdapter.md b/modules/adhashBidAdapter.md
new file mode 100644
index 00000000000..c1093e0ccd7
--- /dev/null
+++ b/modules/adhashBidAdapter.md
@@ -0,0 +1,43 @@
+# Overview
+
+```
+Module Name: AdHash Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: damyan@adhash.org
+```
+
+# Description
+
+Here is what you need for Prebid integration with AdHash:
+1. Register with AdHash.
+2. Once registered and approved, you will receive a Publisher ID and Platform URL.
+3. Use the Publisher ID and Platform URL as parameters in params.
+
+Please note that a number of AdHash functionalities are not supported in the Prebid.js integration:
+* Cookie-less frequency and recency capping;
+* Audience segments;
+* Price floors and passback tags, as they are not needed in the Prebid.js setup;
+* Reservation for direct deals only, as bids are evaluated based on their price.
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: '/19968336/header-bid-tag-1',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]]
+                }
+            },
+            bids: [
+                {
+                    bidder: 'adhash',
+                    params: {
+                        publisherId: '0x1234567890123456789012345678901234567890',
+                        platformURL: 'https://adhash.org/p/struma/'
+                    }
+                }
+            ]
+        }
+    ];
+```
\ No newline at end of file
diff --git a/test/spec/modules/adhashBidAdapter_spec.js b/test/spec/modules/adhashBidAdapter_spec.js
new file mode 100644
index 00000000000..ab4df84c093
--- /dev/null
+++ b/test/spec/modules/adhashBidAdapter_spec.js
@@ -0,0 +1,155 @@
+import { expect } from 'chai';
+import { spec } from 'modules/adhashBidAdapter.js';
+
+describe('adhashBidAdapter', function () {
+  describe('isBidRequestValid', function () {
+    const validBid = {
+      bidder: 'adhash',
+      params: {
+        publisherId: '0xc3b09b27e9c6ef73957901aa729b9e69e5bbfbfb',
+        platformURL: 'https://adhash.org/p/struma/'
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      adUnitCode: 'adunit-code',
+      sizes: [[300, 250]],
+      bidId: '12345678901234',
+      bidderRequestId: '98765432109876',
+      auctionId: '01234567891234',
+    };
+
+    it('should return true when all mandatory parameters are there', function () {
+      expect(spec.isBidRequestValid(validBid)).to.equal(true);
+    });
+
+    it('should return false when there are no params', function () {
+      const bid = { ...validBid };
+      delete bid.params;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when unsupported media type is requested', function () {
+      const bid = { ...validBid };
+      bid.mediaTypes = { native: { sizes: [[300, 250]] } };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when publisherId is not a string', function () {
+      const bid = { ...validBid };
+      bid.params.publisherId = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when publisherId is not valid', function () {
+      const bid = { ...validBid };
+      bid.params.publisherId = 'short string';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when publisherId is not a string', function () {
+      const bid = { ...validBid };
+      bid.params.platformURL = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when publisherId is not valid', function () {
+      const bid = { ...validBid };
+      bid.params.platformURL = 'https://';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequest = {
+      params: {
+        publisherId: '0xc3b09b27e9c6ef73957901aa729b9e69e5bbfbfb'
+      },
+      sizes: [[300, 250]],
+      adUnitCode: 'adUnitCode'
+    };
+    it('should build the request correctly', function () {
+      const result = spec.buildRequests(
+        [ bidRequest ],
+        { gdprConsent: true, refererInfo: { referer: 'http://example.com/' } }
+      );
+      expect(result.length).to.equal(1);
+      expect(result[0].method).to.equal('POST');
+      expect(result[0].url).to.equal('https://bidder.adhash.org/rtb?version=1.0&prebid=true');
+      expect(result[0].bidRequest).to.equal(bidRequest);
+      expect(result[0].data).to.have.property('timezone');
+      expect(result[0].data).to.have.property('location');
+      expect(result[0].data).to.have.property('publisherId');
+      expect(result[0].data).to.have.property('size');
+      expect(result[0].data).to.have.property('navigator');
+      expect(result[0].data).to.have.property('creatives');
+      expect(result[0].data).to.have.property('blockedCreatives');
+      expect(result[0].data).to.have.property('currentTimestamp');
+      expect(result[0].data).to.have.property('recentAds');
+    });
+    it('should build the request correctly without referer', function () {
+      const result = spec.buildRequests([ bidRequest ], { gdprConsent: true });
+      expect(result.length).to.equal(1);
+      expect(result[0].method).to.equal('POST');
+      expect(result[0].url).to.equal('https://bidder.adhash.org/rtb?version=1.0&prebid=true');
+      expect(result[0].bidRequest).to.equal(bidRequest);
+      expect(result[0].data).to.have.property('timezone');
+      expect(result[0].data).to.have.property('location');
+      expect(result[0].data).to.have.property('publisherId');
+      expect(result[0].data).to.have.property('size');
+      expect(result[0].data).to.have.property('navigator');
+      expect(result[0].data).to.have.property('creatives');
+      expect(result[0].data).to.have.property('blockedCreatives');
+      expect(result[0].data).to.have.property('currentTimestamp');
+      expect(result[0].data).to.have.property('recentAds');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const request = {
+      data: { some: 'data' },
+      bidRequest: {
+        bidId: '12345678901234',
+        adUnitCode: 'adunit-code',
+        sizes: [[300, 250]],
+        params: {
+          platformURL: 'https://adhash.org/p/struma/'
+        }
+      }
+    };
+
+    it('should interpret the response correctly', function () {
+      const serverResponse = {
+        body: {
+          creatives: [{
+            costEUR: 1.234
+          }]
+        }
+      };
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result.length).to.equal(1);
+      expect(result[0].requestId).to.equal('12345678901234');
+      expect(result[0].cpm).to.equal(1.234);
+      expect(result[0].width).to.equal(300);
+      expect(result[0].height).to.equal(250);
+      expect(result[0].creativeId).to.equal('adunit-code');
+      expect(result[0].netRevenue).to.equal(true);
+      expect(result[0].currency).to.equal('EUR');
+      expect(result[0].ttl).to.equal(60);
+    });
+
+    it('should return empty array when there are no creatives returned', function () {
+      expect(spec.interpretResponse({body: {creatives: []}}, request).length).to.equal(0);
+    });
+
+    it('should return empty array when there is no creatives key in the response', function () {
+      expect(spec.interpretResponse({body: {}}, request).length).to.equal(0);
+    });
+
+    it('should return empty array when something is not right', function () {
+      expect(spec.interpretResponse(null, request).length).to.equal(0);
+    });
+  });
+});

From 9c38fbcdf6eec43b50fb0ea530281ecb22899c25 Mon Sep 17 00:00:00 2001
From: mmoschovas <63253416+mmoschovas@users.noreply.github.com>
Date: Fri, 19 Feb 2021 07:32:40 -0500
Subject: [PATCH 267/304] PBJS Video Cache Update (#6295)

---
 src/auction.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/auction.js b/src/auction.js
index 15c6b50ce71..ec9ff7d8209 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -458,7 +458,7 @@ function tryAddVideoBid(auctionInstance, bidResponse, bidRequests, afterBidAdded
   const context = videoMediaType && deepAccess(videoMediaType, 'context');
 
   if (config.getConfig('cache.url') && context !== OUTSTREAM) {
-    if (!bidResponse.videoCacheKey) {
+    if (!bidResponse.videoCacheKey || config.getConfig('cache.ignoreBidderCacheKey')) {
       addBid = false;
       callPrebidCache(auctionInstance, bidResponse, afterBidAdded, bidderRequest);
     } else if (!bidResponse.vastUrl) {

From c3b159d6c79ec40ad5723fd5f03f26c84974faf3 Mon Sep 17 00:00:00 2001
From: Catalin Ciocov <catalin.ciocov@gmail.com>
Date: Fri, 19 Feb 2021 15:13:07 +0200
Subject: [PATCH 268/304] Support bidder aliasing by not using bid.bidder to
 retrieve configs (which are static anyway) (#6313)

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

diff --git a/modules/inskinBidAdapter.js b/modules/inskinBidAdapter.js
index 3951e27c870..f06382c6375 100644
--- a/modules/inskinBidAdapter.js
+++ b/modules/inskinBidAdapter.js
@@ -4,9 +4,7 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 const BIDDER_CODE = 'inskin';
 
 const CONFIG = {
-  'inskin': {
-    'BASE_URI': 'https://mfad.inskinad.com/api/v2'
-  }
+  BASE_URI: 'https://mfad.inskinad.com/api/v2'
 };
 
 export const spec = {
@@ -97,8 +95,7 @@ export const spec = {
     }
 
     validBidRequests.map(bid => {
-      let config = CONFIG[bid.bidder];
-      ENDPOINT_URL = config.BASE_URI;
+      ENDPOINT_URL = CONFIG.BASE_URI;
 
       const placement = Object.assign({
         divName: bid.bidId,

From 1935513394c7896708ffe48fafc16f3060c85dc4 Mon Sep 17 00:00:00 2001
From: Ben Anderson <benanderson@benanderson.us>
Date: Fri, 19 Feb 2021 09:31:23 -0500
Subject: [PATCH 269/304] Fabrick ID System : updates to _setReferrer and
 appending urls (#6322)

* fabrickId updates

 - encode all url params
 - dedupe w/out queryString and keep the longest
 - additionally truncate from % if that ends up being the last (or next to last) char after truncation
 - truncate 1k instead of 200
 - don't send functions along in query (only send strings and numbers)

* attempting to fix ie failure - https://app.circleci.com/pipelines/github/prebid/Prebid.js/3945/workflows/4929a5c0-9e57-49e3-a6d8-29691560ca31/jobs/12086

* re-attempting to fix ie failure - https://app.circleci.com/pipelines/github/prebid/Prebid.js/3945/workflows/4929a5c0-9e57-49e3-a6d8-29691560ca31/jobs/12086

* re-attempting to fix ie failure - https://app.circleci.com/pipelines/github/prebid/Prebid.js/3945/workflows/4929a5c0-9e57-49e3-a6d8-29691560ca31/jobs/12086

* re-attempting to fix ie failure - https://app.circleci.com/pipelines/github/prebid/Prebid.js/3945/workflows/4929a5c0-9e57-49e3-a6d8-29691560ca31/jobs/12086

* re-attempting to fix ie failure - https://app.circleci.com/pipelines/github/prebid/Prebid.js/3945/workflows/4929a5c0-9e57-49e3-a6d8-29691560ca31/jobs/12086

* re-attempting to fix ie failure - https://app.circleci.com/pipelines/github/prebid/Prebid.js/3945/workflows/4929a5c0-9e57-49e3-a6d8-29691560ca31/jobs/12086

- attempting to add debugging so I can know what exactly is failing in ie (since I don't have a windows machine)

* found the issue having debugged locally - stubbing my error message is what killed me!

* not the right way to loop through a map

Co-authored-by: Anderson, Ben <Ben.Anderson@team.neustar>
---
 modules/fabrickIdSystem.js                | 72 +++++++++++++++++------
 test/spec/modules/fabrickIdSystem_spec.js | 46 ++++++++++++---
 2 files changed, 91 insertions(+), 27 deletions(-)

diff --git a/modules/fabrickIdSystem.js b/modules/fabrickIdSystem.js
index e61b377eefa..bb838788f07 100644
--- a/modules/fabrickIdSystem.js
+++ b/modules/fabrickIdSystem.js
@@ -46,7 +46,7 @@ export const fabrickIdSubmodule = {
       if (window.fabrickMod1) {
         window.fabrickMod1(configParams, consentData, cacheIdObj);
       }
-      if (!configParams || typeof configParams.apiKey !== 'string') {
+      if (!configParams || !configParams.apiKey || typeof configParams.apiKey !== 'string') {
         utils.logError('fabrick submodule requires an apiKey.');
         return;
       }
@@ -55,28 +55,34 @@ export const fabrickIdSubmodule = {
         let keysArr = Object.keys(configParams);
         for (let i in keysArr) {
           let k = keysArr[i];
-          if (k === 'url' || k === 'refererInfo') {
+          if (k === 'url' || k === 'refererInfo' || (k.length > 3 && k.substring(0, 3) === 'max')) {
             continue;
           }
           let v = configParams[k];
           if (Array.isArray(v)) {
             for (let j in v) {
-              url += `${k}=${v[j]}&`;
+              if (typeof v[j] === 'string' || typeof v[j] === 'number') {
+                url += `${k}=${v[j]}&`;
+              }
             }
-          } else {
+          } else if (typeof v === 'string' || typeof v === 'number') {
             url += `${k}=${v}&`;
           }
         }
         // pull off the trailing &
         url = url.slice(0, -1)
         const referer = _getRefererInfo(configParams);
-        const urls = new Set();
-        url = truncateAndAppend(urls, url, 'r', referer.referer);
+        const refs = new Map();
+        _setReferrer(refs, referer.referer);
         if (referer.stack && referer.stack[0]) {
-          url = truncateAndAppend(urls, url, 'r', referer.stack[0]);
+          _setReferrer(refs, referer.stack[0]);
         }
-        url = truncateAndAppend(urls, url, 'r', referer.canonicalUrl);
-        url = truncateAndAppend(urls, url, 'r', window.location.href);
+        _setReferrer(refs, referer.canonicalUrl);
+        _setReferrer(refs, window.location.href);
+
+        refs.forEach(v => {
+          url = appendUrl(url, 'r', v, configParams);
+        });
 
         const resp = function (callback) {
           const callbacks = {
@@ -130,18 +136,48 @@ function _getBaseUrl(configParams) {
   }
 }
 
-function truncateAndAppend(urls, url, paramName, s) {
-  if (s && url.length < 2000) {
-    if (s.length > 200) {
-      s = s.substring(0, 200);
+function _setReferrer(refs, s) {
+  if (s) {
+    // store the longest one for the same URI
+    const url = s.split('?')[0];
+    // OR store the longest one for the same domain
+    // const url = s.split('?')[0].replace('http://','').replace('https://', '').split('/')[0];
+    if (refs.has(url)) {
+      const prevRef = refs.get(url);
+      if (s.length > prevRef.length) {
+        refs.set(url, s);
+      }
+    } else {
+      refs.set(url, s);
+    }
+  }
+}
+
+export function appendUrl(url, paramName, s, configParams) {
+  const maxUrlLen = (configParams && configParams.maxUrlLen) || 2000;
+  const maxRefLen = (configParams && configParams.maxRefLen) || 1000;
+  const maxSpaceAvailable = (configParams && configParams.maxSpaceAvailable) || 50;
+  //                     make sure we have enough space left to make it worthwhile
+  if (s && url.length < (maxUrlLen - maxSpaceAvailable)) {
+    let thisMaxRefLen = maxUrlLen - url.length;
+    if (thisMaxRefLen > maxRefLen) {
+      thisMaxRefLen = maxRefLen;
     }
-    // Don't send the same url in multiple params
-    if (!urls.has(s)) {
-      urls.add(s);
-      return `${url}&${paramName}=${s}`
+
+    s = `&${paramName}=${encodeURIComponent(s)}`;
+
+    if (s.length >= thisMaxRefLen) {
+      s = s.substring(0, thisMaxRefLen);
+      if (s.charAt(s.length - 1) === '%') {
+        s = s.substring(0, thisMaxRefLen - 1);
+      } else if (s.charAt(s.length - 2) === '%') {
+        s = s.substring(0, thisMaxRefLen - 2);
+      }
     }
+    return `${url}${s}`
+  } else {
+    return url;
   }
-  return url;
 }
 
 submodule('userId', fabrickIdSubmodule);
diff --git a/test/spec/modules/fabrickIdSystem_spec.js b/test/spec/modules/fabrickIdSystem_spec.js
index cbd538816ab..c250c8e5e8b 100644
--- a/test/spec/modules/fabrickIdSystem_spec.js
+++ b/test/spec/modules/fabrickIdSystem_spec.js
@@ -1,7 +1,7 @@
 import * as utils from '../../../src/utils.js';
 import {server} from '../../mocks/xhr.js';
 
-import * as fabrickIdSystem from 'modules/fabrickIdSystem.js';
+import {fabrickIdSubmodule, appendUrl} from 'modules/fabrickIdSystem.js';
 
 const defaultConfigParams = {
   apiKey: '123',
@@ -10,26 +10,25 @@ const defaultConfigParams = {
   url: 'http://localhost:9999/test/mocks/fabrickId.json?'
 };
 const responseHeader = {'Content-Type': 'application/json'}
-const fabrickIdSubmodule = fabrickIdSystem.fabrickIdSubmodule;
 
 describe('Fabrick ID System', function() {
   let logErrorStub;
 
   beforeEach(function () {
-    logErrorStub = sinon.stub(utils, 'logError');
   });
 
   afterEach(function () {
-    logErrorStub.restore();
-    fabrickIdSubmodule.getRefererInfoOverride = null;
   });
 
   it('should log an error if no configParams were passed into getId', function () {
+    logErrorStub = sinon.stub(utils, 'logError');
     fabrickIdSubmodule.getId();
     expect(logErrorStub.calledOnce).to.be.true;
+    logErrorStub.restore();
   });
 
   it('should error on json parsing', function() {
+    logErrorStub = sinon.stub(utils, 'logError');
     let submoduleCallback = fabrickIdSubmodule.getId({
       name: 'fabrickId',
       params: defaultConfigParams
@@ -44,11 +43,12 @@ describe('Fabrick ID System', function() {
     );
     expect(callBackSpy.calledOnce).to.be.true;
     expect(logErrorStub.calledOnce).to.be.true;
+    logErrorStub.restore();
   });
 
   it('should truncate the params', function() {
     let r = '';
-    for (let i = 0; i < 300; i++) {
+    for (let i = 0; i < 1500; i++) {
       r += 'r';
     }
     let configParams = Object.assign({}, defaultConfigParams, {
@@ -66,7 +66,7 @@ describe('Fabrick ID System', function() {
     submoduleCallback(callBackSpy);
     let request = server.requests[0];
     r = '';
-    for (let i = 0; i < 200; i++) {
+    for (let i = 0; i < 1000 - 3; i++) {
       r += 'r';
     }
     expect(request.url).to.match(new RegExp(`r=${r}&r=`));
@@ -76,7 +76,6 @@ describe('Fabrick ID System', function() {
       JSON.stringify({})
     );
     expect(callBackSpy.calledOnce).to.be.true;
-    expect(logErrorStub.calledOnce).to.be.false;
   });
 
   it('should complete successfully', function() {
@@ -101,6 +100,35 @@ describe('Fabrick ID System', function() {
       JSON.stringify({})
     );
     expect(callBackSpy.calledOnce).to.be.true;
-    expect(logErrorStub.calledOnce).to.be.false;
+  });
+
+  it('should truncate 2', function() {
+    let configParams = {
+      maxUrlLen: 10,
+      maxRefLen: 5,
+      maxSpaceAvailable: 2
+    };
+
+    let url = appendUrl('', 'r', '123', configParams);
+    expect(url).to.equal('&r=12');
+
+    url = appendUrl('12345', 'r', '678', configParams);
+    expect(url).to.equal('12345&r=67');
+
+    url = appendUrl('12345678', 'r', '9', configParams);
+    expect(url).to.equal('12345678');
+
+    configParams.maxRefLen = 8;
+    url = appendUrl('', 'r', '1234&', configParams);
+    expect(url).to.equal('&r=1234');
+
+    url = appendUrl('', 'r', '123&', configParams);
+    expect(url).to.equal('&r=123');
+
+    url = appendUrl('', 'r', '12&', configParams);
+    expect(url).to.equal('&r=12%26');
+
+    url = appendUrl('', 'r', '1&&', configParams);
+    expect(url).to.equal('&r=1%26');
   });
 });

From 13230f04495c1b9ffd3a01d5f7ec6c2e2c607517 Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Tue, 23 Feb 2021 03:50:27 -0700
Subject: [PATCH 270/304] Configureable option to delay auction event + fix bug
 with googletag init (#6344)

---
 modules/rubiconAnalyticsAdapter.js            | 15 ++++--
 .../modules/rubiconAnalyticsAdapter_spec.js   | 52 ++++++++++++++++++-
 2 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index f216cbd6235..f1ba86de30f 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -60,7 +60,8 @@ const cache = {
 const BID_REJECTED_IPF = 'rejected-ipf';
 
 export let rubiConf = {
-  pvid: utils.generateUUID().slice(0, 8)
+  pvid: utils.generateUUID().slice(0, 8),
+  analyticsEventDelay: 0
 };
 // we are saving these as global to this module so that if a pub accidentally overwrites the entire
 // rubicon object, then we do not lose other data
@@ -487,7 +488,11 @@ function subscribeToGamSlots() {
       if (rubiConf.waitForGamSlots && !cache.auctions[auctionId].sent && Object.keys(cache.auctions[auctionId].gamHasRendered).every(adUnitCode => cache.auctions[auctionId].gamHasRendered[adUnitCode])) {
         clearTimeout(cache.timeouts[auctionId]);
         delete cache.timeouts[auctionId];
-        sendMessage.call(rubiconAdapter, auctionId);
+        if (rubiConf.analyticsEventDelay > 0) {
+          setTimeout(() => sendMessage.call(rubiconAdapter, auctionId), rubiConf.analyticsEventDelay)
+        } else {
+          sendMessage.call(rubiconAdapter, auctionId)
+        }
       }
     });
   });
@@ -568,9 +573,9 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
           cache.gpt.registered = true;
         } else if (!cache.gpt.registered) {
           cache.gpt.registered = true;
-          let googletag = window.googletag || {};
-          googletag.cmd = googletag.cmd || [];
-          googletag.cmd.push(function() {
+          window.googletag = window.googletag || {};
+          window.googletag.cmd = window.googletag.cmd || [];
+          window.googletag.cmd.push(function() {
             subscribeToGamSlots();
           });
         }
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index 71e5446ed06..505a2885404 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -636,6 +636,7 @@ describe('rubicon analytics adapter', function () {
         }
       });
       expect(rubiConf).to.deep.equal({
+        analyticsEventDelay: 0,
         pvid: '12345678',
         wrapperName: '1001_general',
         int_type: 'dmpbjs',
@@ -654,6 +655,7 @@ describe('rubicon analytics adapter', function () {
         }
       });
       expect(rubiConf).to.deep.equal({
+        analyticsEventDelay: 0,
         pvid: '12345678',
         wrapperName: '1001_general',
         int_type: 'dmpbjs',
@@ -674,6 +676,7 @@ describe('rubicon analytics adapter', function () {
         }
       });
       expect(rubiConf).to.deep.equal({
+        analyticsEventDelay: 0,
         pvid: '12345678',
         wrapperName: '1001_general',
         int_type: 'dmpbjs',
@@ -1500,7 +1503,7 @@ describe('rubicon analytics adapter', function () {
       it('should send request when waitForGamSlots is present but no bidWons are sent', function () {
         config.setConfig({
           rubicon: {
-            waitForGamSlots: true
+            waitForGamSlots: true,
           }
         });
         events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
@@ -1511,7 +1514,7 @@ describe('rubicon analytics adapter', function () {
         events.emit(AUCTION_END, MOCK.AUCTION_END);
         events.emit(SET_TARGETING, MOCK.SET_TARGETING);
 
-        // should not send if just slotRenderEnded is emmitted for both
+        // should send if just slotRenderEnded is emmitted for both
         mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
         mockGpt.emitEvent(gptSlotRenderEnded1.eventName, gptSlotRenderEnded1.params);
 
@@ -1536,6 +1539,51 @@ describe('rubicon analytics adapter', function () {
         };
         expect(message).to.deep.equal(expectedMessage);
       });
+
+      it('should delay the event call depending on analyticsEventDelay config', function () {
+        config.setConfig({
+          rubicon: {
+            waitForGamSlots: true,
+            analyticsEventDelay: 2000
+          }
+        });
+        events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+        events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+        events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+        events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
+        events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+        events.emit(AUCTION_END, MOCK.AUCTION_END);
+        events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+
+        // should send if just slotRenderEnded is emmitted for both
+        mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+        mockGpt.emitEvent(gptSlotRenderEnded1.eventName, gptSlotRenderEnded1.params);
+
+        // Should not be sent until delay
+        expect(server.requests.length).to.equal(0);
+
+        // tick the clock and it should fire
+        clock.tick(2000);
+
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+        let expectedGam0 = {
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        };
+        let expectedGam1 = {
+          advertiserId: 4444,
+          creativeId: 5555,
+          lineItemId: 6666,
+          adSlot: '/19968336/header-bid-tag1'
+        };
+        expect(expectedGam0).to.deep.equal(message.auctions[0].adUnits[0].gam);
+        expect(expectedGam1).to.deep.equal(message.auctions[0].adUnits[1].gam);
+      });
     });
 
     it('should correctly overwrite bidId if seatBidId is on the bidResponse', function () {

From f2e0b384b279076fd279062195608a5a40dfb7b0 Mon Sep 17 00:00:00 2001
From: mefjush <mefjush@gmail.com>
Date: Tue, 23 Feb 2021 11:53:07 +0100
Subject: [PATCH 271/304] Adhese Bid Adapter: replace id5 with eid (#6339)

---
 modules/adheseBidAdapter.js                | 18 +++++++++++-------
 test/spec/modules/adheseBidAdapter_spec.js | 18 +++++++++++++-----
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/modules/adheseBidAdapter.js b/modules/adheseBidAdapter.js
index 5510db62950..4fae85e82ad 100644
--- a/modules/adheseBidAdapter.js
+++ b/modules/adheseBidAdapter.js
@@ -24,8 +24,7 @@ export const spec = {
 
     const gdprParams = (gdprConsent && gdprConsent.consentString) ? { xt: [gdprConsent.consentString] } : {};
     const refererParams = (refererInfo && refererInfo.referer) ? { xf: [base64urlEncode(refererInfo.referer)] } : {};
-    const id5Params = (getId5Id(validBidRequests)) ? { x5: [getId5Id(validBidRequests)] } : {};
-    const commonParams = { ...gdprParams, ...refererParams, ...id5Params };
+    const commonParams = { ...gdprParams, ...refererParams };
 
     const slots = validBidRequests.map(bid => ({
       slotname: bidToSlotName(bid),
@@ -34,8 +33,13 @@ export const spec = {
 
     const payload = {
       slots: slots,
-      parameters: commonParams
-    }
+      parameters: commonParams,
+      user: {
+        ext: {
+          eids: getEids(validBidRequests),
+        }
+      }
+    };
 
     const account = getAccount(validBidRequests);
     const uri = 'https://ads-' + account + '.adhese.com/json';
@@ -154,9 +158,9 @@ function getAccount(validBidRequests) {
   return validBidRequests[0].params.account;
 }
 
-function getId5Id(validBidRequests) {
-  if (validBidRequests[0] && validBidRequests[0].userId && validBidRequests[0].userId.id5id && validBidRequests[0].userId.id5id.uid) {
-    return validBidRequests[0].userId.id5id.uid;
+function getEids(validBidRequests) {
+  if (validBidRequests[0] && validBidRequests[0].userIdAsEids) {
+    return validBidRequests[0].userIdAsEids;
   }
 }
 
diff --git a/test/spec/modules/adheseBidAdapter_spec.js b/test/spec/modules/adheseBidAdapter_spec.js
index 0089a403749..2ce40fd7ffb 100644
--- a/test/spec/modules/adheseBidAdapter_spec.js
+++ b/test/spec/modules/adheseBidAdapter_spec.js
@@ -17,10 +17,9 @@ let minimalBid = function() {
   }
 };
 
-let bidWithParams = function(data, userId) {
+let bidWithParams = function(data) {
   let bid = minimalBid();
   bid.params.data = data;
-  bid.userId = userId;
   return bid;
 };
 
@@ -117,10 +116,19 @@ describe('AdheseAdapter', function () {
       expect(JSON.parse(req.data).parameters).to.deep.include({ 'xf': [ 'aHR0cDovL3ByZWJpZC5vcmcvZGV2LWRvY3Mvc3ViamVjdHM_X2Q9MQ' ] });
     });
 
-    it('should include id5 id as /x5 param', function () {
-      let req = spec.buildRequests([ bidWithParams({}, { 'id5id': { 'uid': 'ID5-1234567890' } }) ], bidderRequest);
+    it('should include eids', function () {
+      let bid = minimalBid();
+      bid.userIdAsEids = [{ source: 'id5-sync.com', uids: [{ id: 'ID5@59sigaS-...' }] }];
+
+      let req = spec.buildRequests([ bid ], bidderRequest);
+
+      expect(JSON.parse(req.data).user.ext.eids).to.deep.equal(bid.userIdAsEids);
+    });
+
+    it('should not include eids field when userid module disabled', function () {
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
 
-      expect(JSON.parse(req.data).parameters).to.deep.include({ 'x5': [ 'ID5-1234567890' ] });
+      expect(JSON.parse(req.data)).to.not.have.key('eids');
     });
 
     it('should include bids', function () {

From 949ce7383c973f982ca659a2417dfa5e4f1e8db8 Mon Sep 17 00:00:00 2001
From: Vladimir Fedoseev <vl.fedoseev@gmail.com>
Date: Tue, 23 Feb 2021 12:04:02 +0100
Subject: [PATCH 272/304] FID-287: Update Reconciliation RTD delivery id format
 (#6343)

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

diff --git a/modules/reconciliationRtdProvider.js b/modules/reconciliationRtdProvider.js
index bd3d8861c5b..f8636862d4c 100644
--- a/modules/reconciliationRtdProvider.js
+++ b/modules/reconciliationRtdProvider.js
@@ -65,7 +65,7 @@ function handleAdMessage(e) {
           adDeliveryId = adSlot.getTargeting('RSDK_ADID');
           adDeliveryId = adDeliveryId.length
             ? adDeliveryId[0]
-            : utils.generateUUID();
+            : `${utils.timestamp()}-${utils.generateUUID()}`;
         }
       }
     }
@@ -246,7 +246,7 @@ function getReconciliationData(adUnitsCodes) {
 
     const adSlot = getSlotByCode(adUnitCode);
     const adUnitId = adSlot ? adSlot.getAdUnitPath() : adUnitCode;
-    const adDeliveryId = utils.generateUUID();
+    const adDeliveryId = `${utils.timestamp()}-${utils.generateUUID()}`;
 
     dataToReturn[adUnitCode] = {
       RSDK_AUID: adUnitId,

From 7040fcd293361a434cd9a24388fb654a9f013b8e Mon Sep 17 00:00:00 2001
From: Catalin Ciocov <catalin.ciocov@gmail.com>
Date: Tue, 23 Feb 2021 13:13:48 +0200
Subject: [PATCH 273/304] Inskin Bid Adapter: send screen size in the ad call
 (#6316)

---
 modules/inskinBidAdapter.js                | 6 +++++-
 test/spec/modules/inskinBidAdapter_spec.js | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/inskinBidAdapter.js b/modules/inskinBidAdapter.js
index f06382c6375..29040205818 100644
--- a/modules/inskinBidAdapter.js
+++ b/modules/inskinBidAdapter.js
@@ -105,8 +105,12 @@ export const spec = {
 
       placement.adTypes.push(5, 9, 163, 2163, 3006);
 
+      placement.properties = placement.properties || {};
+
+      placement.properties.screenWidth = screen.width;
+      placement.properties.screenHeight = screen.height;
+
       if (restrictions.length) {
-        placement.properties = placement.properties || {};
         placement.properties.restrictions = restrictions;
       }
 
diff --git a/test/spec/modules/inskinBidAdapter_spec.js b/test/spec/modules/inskinBidAdapter_spec.js
index e817b3e3b81..cedaff2a0cf 100644
--- a/test/spec/modules/inskinBidAdapter_spec.js
+++ b/test/spec/modules/inskinBidAdapter_spec.js
@@ -250,7 +250,7 @@ describe('InSkin BidAdapter', function () {
       const payload = JSON.parse(request.data);
 
       expect(payload.keywords).to.be.an('array').that.is.empty;
-      expect(payload.placements[0].properties).to.be.undefined;
+      expect(payload.placements[0].properties.restrictions).to.be.undefined;
     });
 
     it('should add keywords if TCF v2 purposes are not granted', function () {

From dc0a9c77e65a801cc9a280ebbf8a736bca0514e0 Mon Sep 17 00:00:00 2001
From: afsheenb <afsheenb@users.noreply.github.com>
Date: Wed, 24 Feb 2021 05:12:14 -0500
Subject: [PATCH 274/304] Ozone Bid Adapter: added or updated support for
 multiple modules (#6324)

* ozone 2.5.0 adapter updates

* ozone 2.5.0 adapter - fixup for prebidCircleCI tests to remove object values on user.eid

Co-authored-by: Afsheen Bigdeli <afsheenb@namecast.net>
---
 modules/ozoneBidAdapter.js                | 534 ++++++++++-----------
 modules/ozoneBidAdapter.md                |   4 +-
 test/spec/modules/ozoneBidAdapter_spec.js | 560 ++++++++--------------
 3 files changed, 461 insertions(+), 637 deletions(-)

diff --git a/modules/ozoneBidAdapter.js b/modules/ozoneBidAdapter.js
index 4246a39bc69..8ada9d59ae2 100644
--- a/modules/ozoneBidAdapter.js
+++ b/modules/ozoneBidAdapter.js
@@ -5,108 +5,151 @@ import {config} from '../src/config.js';
 import {getPriceBucketString} from '../src/cpmBucketManager.js';
 import { Renderer } from '../src/Renderer.js';
 const BIDDER_CODE = 'ozone';
-const ALLOWED_LOTAME_PARAMS = ['oz_lotameid', 'oz_lotamepid', 'oz_lotametpid'];
 
 // *** PROD ***
-const OZONEURI = 'https://elb.the-ozone-project.com/openrtb2/auction';
-const OZONECOOKIESYNC = 'https://elb.the-ozone-project.com/static/load-cookie.html';
+const ORIGIN = 'https://elb.the-ozone-project.com' // applies only to auction & cookie
+const AUCTIONURI = '/openrtb2/auction';
+const OZONECOOKIESYNC = '/static/load-cookie.html';
 const OZONE_RENDERER_URL = 'https://prebid.the-ozone-project.com/ozone-renderer.js';
 
-const OZONEVERSION = '2.4.0';
+const OZONEVERSION = '2.5.0';
 export const spec = {
+  gvlid: 524,
+  aliases: [{ code: 'lmc' }],
+  version: OZONEVERSION,
   code: BIDDER_CODE,
   supportedMediaTypes: [VIDEO, BANNER],
   cookieSyncBag: {'publisherId': null, 'siteId': null, 'userIdObject': {}}, // variables we want to make available to cookie sync
-  propertyBag: {'lotameWasOverridden': 0, 'pageId': null, 'buildRequestsStart': 0, 'buildRequestsEnd': 0}, /* allow us to store vars in instance scope - needs to be an object to be mutable */
-
+  propertyBag: {'pageId': null, 'buildRequestsStart': 0, 'buildRequestsEnd': 0}, /* allow us to store vars in instance scope - needs to be an object to be mutable */
+  whitelabel_defaults: {
+    'logId': 'OZONE',
+    'bidder': 'ozone',
+    'keyPrefix': 'oz',
+    'auctionUrl': ORIGIN + AUCTIONURI,
+    'cookieSyncUrl': ORIGIN + OZONECOOKIESYNC,
+    'rendererUrl': OZONE_RENDERER_URL
+  },
+  /**
+   * make sure that the whitelabel/default values are available in the propertyBag
+   * @param bid Object : the bid
+   */
+  loadWhitelabelData(bid) {
+    if (this.propertyBag.whitelabel) { return; }
+    this.propertyBag.whitelabel = JSON.parse(JSON.stringify(this.whitelabel_defaults));
+    let bidder = bid.bidder || 'ozone'; // eg. ozone
+    this.propertyBag.whitelabel.logId = bidder.toUpperCase();
+    this.propertyBag.whitelabel.bidder = bidder;
+    let bidderConfig = config.getConfig(bidder) || {};
+    if (bidderConfig.kvpPrefix) {
+      this.propertyBag.whitelabel.keyPrefix = bidderConfig.kvpPrefix;
+    }
+    if (bidderConfig.endpointOverride) {
+      if (bidderConfig.endpointOverride.origin) {
+        this.propertyBag.whitelabel.auctionUrl = bidderConfig.endpointOverride.origin + AUCTIONURI;
+        this.propertyBag.whitelabel.cookieSyncUrl = bidderConfig.endpointOverride.origin + OZONECOOKIESYNC;
+      }
+      if (bidderConfig.endpointOverride.rendererUrl) {
+        this.propertyBag.whitelabel.rendererUrl = bidderConfig.endpointOverride.rendererUrl;
+      }
+    }
+    this.logInfo('set propertyBag.whitelabel to', this.propertyBag.whitelabel);
+  },
+  getAuctionUrl() {
+    return this.propertyBag.whitelabel.auctionUrl;
+  },
+  getCookieSyncUrl() {
+    return this.propertyBag.whitelabel.cookieSyncUrl;
+  },
+  getRendererUrl() {
+    return this.propertyBag.whitelabel.rendererUrl;
+  },
+  /**
+   * wrappers for this.logInfo logWarn & logError, to add the proper prefix
+   */
+  logInfo() {
+    if (!this.propertyBag.whitelabel) { return; }
+    let args = arguments;
+    args[0] = `${this.propertyBag.whitelabel.logId}: ${arguments[0]}`;
+    utils.logInfo.apply(this, args);
+  },
+  logError() {
+    if (!this.propertyBag.whitelabel) { return; }
+    let args = arguments;
+    args[0] = `${this.propertyBag.whitelabel.logId}: ${arguments[0]}`;
+    utils.logError.apply(this, args);
+  },
+  logWarn() {
+    if (!this.propertyBag.whitelabel) { return; }
+    let args = arguments;
+    args[0] = `${this.propertyBag.whitelabel.logId}: ${arguments[0]}`;
+    utils.logWarn.apply(this, args);
+  },
   /**
    * Basic check to see whether required parameters are in the request.
    * @param bid
    * @returns {boolean}
    */
   isBidRequestValid(bid) {
-    utils.logInfo('OZONE: isBidRequestValid : ', config.getConfig(), bid);
+    this.loadWhitelabelData(bid);
+    this.logInfo('isBidRequestValid : ', config.getConfig(), bid);
     let adUnitCode = bid.adUnitCode; // adunit[n].code
 
     if (!(bid.params.hasOwnProperty('placementId'))) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : missing placementId : siteId, placementId and publisherId are REQUIRED', adUnitCode);
+      this.logError('BID ADAPTER VALIDATION FAILED : missing placementId : siteId, placementId and publisherId are REQUIRED', adUnitCode);
       return false;
     }
     if (!this.isValidPlacementId(bid.params.placementId)) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : placementId must be exactly 10 numeric characters', adUnitCode);
+      this.logError('BID ADAPTER VALIDATION FAILED : placementId must be exactly 10 numeric characters', adUnitCode);
       return false;
     }
     if (!(bid.params.hasOwnProperty('publisherId'))) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : missing publisherId : siteId, placementId and publisherId are REQUIRED', adUnitCode);
+      this.logError('BID ADAPTER VALIDATION FAILED : missing publisherId : siteId, placementId and publisherId are REQUIRED', adUnitCode);
       return false;
     }
     if (!(bid.params.publisherId).toString().match(/^[a-zA-Z0-9\-]{12}$/)) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : publisherId must be exactly 12 alphanumieric characters including hyphens', adUnitCode);
+      this.logError('BID ADAPTER VALIDATION FAILED : publisherId must be exactly 12 alphanumieric characters including hyphens', adUnitCode);
       return false;
     }
     if (!(bid.params.hasOwnProperty('siteId'))) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : missing siteId : siteId, placementId and publisherId are REQUIRED', adUnitCode);
+      this.logError('BID ADAPTER VALIDATION FAILED : missing siteId : siteId, placementId and publisherId are REQUIRED', adUnitCode);
       return false;
     }
     if (!(bid.params.siteId).toString().match(/^[0-9]{10}$/)) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : siteId must be exactly 10 numeric characters', adUnitCode);
+      this.logError('BID ADAPTER VALIDATION FAILED : siteId must be exactly 10 numeric characters', adUnitCode);
       return false;
     }
     if (bid.params.hasOwnProperty('customParams')) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : customParams should be renamed to customData', adUnitCode);
+      this.logError('BID ADAPTER VALIDATION FAILED : customParams should be renamed to customData', adUnitCode);
       return false;
     }
     if (bid.params.hasOwnProperty('customData')) {
       if (!Array.isArray(bid.params.customData)) {
-        utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : customData is not an Array', adUnitCode);
+        this.logError('BID ADAPTER VALIDATION FAILED : customData is not an Array', adUnitCode);
         return false;
       }
       if (bid.params.customData.length < 1) {
-        utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : customData is an array but does not contain any elements', adUnitCode);
+        this.logError('BID ADAPTER VALIDATION FAILED : customData is an array but does not contain any elements', adUnitCode);
         return false;
       }
       if (!(bid.params.customData[0]).hasOwnProperty('targeting')) {
-        utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : customData[0] does not contain "targeting"', adUnitCode);
+        this.logError('BID ADAPTER VALIDATION FAILED : customData[0] does not contain "targeting"', adUnitCode);
         return false;
       }
       if (typeof bid.params.customData[0]['targeting'] != 'object') {
-        utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : customData[0] targeting is not an object', adUnitCode);
-        return false;
-      }
-    }
-    if (bid.params.hasOwnProperty('lotameData')) {
-      if (typeof bid.params.lotameData !== 'object') {
-        utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : lotameData is not an object', adUnitCode);
+        this.logError('BID ADAPTER VALIDATION FAILED : customData[0] targeting is not an object', adUnitCode);
         return false;
       }
     }
     if (bid.hasOwnProperty('mediaTypes') && bid.mediaTypes.hasOwnProperty(VIDEO)) {
       if (!bid.mediaTypes[VIDEO].hasOwnProperty('context')) {
-        utils.logError('OZONE: No video context key/value in bid. Rejecting bid: ', bid);
+        this.logError('No video context key/value in bid. Rejecting bid: ', bid);
         return false;
       }
       if (bid.mediaTypes[VIDEO].context !== 'instream' && bid.mediaTypes[VIDEO].context !== 'outstream') {
-        utils.logError('OZONE: video.context is invalid. Only instream/outstream video is supported. Rejecting bid: ', bid);
+        this.logError('video.context is invalid. Only instream/outstream video is supported. Rejecting bid: ', bid);
         return false;
       }
     }
-    // guard against hacks in GET parameters that we might allow
-    const arrLotameOverride = this.getLotameOverrideParams();
-    // lotame override, test params. All 3 must be present, or none.
-    let lotameKeys = Object.keys(arrLotameOverride);
-    if (lotameKeys.length === ALLOWED_LOTAME_PARAMS.length) {
-      utils.logInfo('OZONE: VALIDATION : arrLotameOverride', arrLotameOverride);
-      for (let i in lotameKeys) {
-        if (!arrLotameOverride[ALLOWED_LOTAME_PARAMS[i]].toString().match(/^[0-9a-zA-Z]+$/)) {
-          utils.logError('OZONE: Only letters & numbers allowed in lotame override: ' + i.toString() + ': ' + arrLotameOverride[ALLOWED_LOTAME_PARAMS[i]].toString() + '. Rejecting bid: ', bid);
-          return false;
-        }
-      }
-    } else if (lotameKeys.length > 0) {
-      utils.logInfo('OZONE: VALIDATION : arrLotameOverride', arrLotameOverride);
-      utils.logError('OZONE: lotame override params are incomplete. You must set all ' + ALLOWED_LOTAME_PARAMS.length + ': ' + JSON.stringify(ALLOWED_LOTAME_PARAMS) + ', . Rejecting bid: ', bid);
-      return false;
-    }
     return true;
   },
 
@@ -119,8 +162,11 @@ export const spec = {
   },
 
   buildRequests(validBidRequests, bidderRequest) {
+    this.loadWhitelabelData(validBidRequests[0]);
     this.propertyBag.buildRequestsStart = new Date().getTime();
-    utils.logInfo(`OZONE: buildRequests time: ${this.propertyBag.buildRequestsStart} ozone v ${OZONEVERSION} validBidRequests`, validBidRequests, 'bidderRequest', bidderRequest);
+    let whitelabelBidder = this.propertyBag.whitelabel.bidder; // by default = ozone
+    let whitelabelPrefix = this.propertyBag.whitelabel.keyPrefix;
+    this.logInfo(`buildRequests time: ${this.propertyBag.buildRequestsStart} v ${OZONEVERSION} validBidRequests`, JSON.parse(JSON.stringify(validBidRequests)), 'bidderRequest', JSON.parse(JSON.stringify(bidderRequest)));
     // First check - is there any config to block this request?
     if (this.blockTheRequest()) {
       return [];
@@ -132,31 +178,31 @@ export const spec = {
       this.cookieSyncBag.publisherId = utils.deepAccess(validBidRequests[0], 'params.publisherId');
       htmlParams = validBidRequests[0].params;
     }
-    utils.logInfo('OZONE: cookie sync bag', this.cookieSyncBag);
-    let singleRequest = config.getConfig('ozone.singleRequest');
+    this.logInfo('cookie sync bag', this.cookieSyncBag);
+    let singleRequest = this.getWhitelabelConfigItem('ozone.singleRequest');
     singleRequest = singleRequest !== false; // undefined & true will be true
-    utils.logInfo('OZONE: config ozone.singleRequest : ', singleRequest);
+    this.logInfo(`config ${whitelabelBidder}.singleRequest : `, singleRequest);
     let ozoneRequest = {}; // we only want to set specific properties on this, not validBidRequests[0].params
     delete ozoneRequest.test; // don't allow test to be set in the config - ONLY use $_GET['pbjs_debug']
 
     if (bidderRequest && bidderRequest.gdprConsent) {
-      utils.logInfo('OZONE: ADDING GDPR info');
-      let apiVersion = utils.deepAccess(bidderRequest.gdprConsent, 'apiVersion', '1');
+      this.logInfo('ADDING GDPR info');
+      let apiVersion = bidderRequest.gdprConsent.apiVersion || '1';
       ozoneRequest.regs = {ext: {gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0, apiVersion: apiVersion}};
       if (ozoneRequest.regs.ext.gdpr) {
         ozoneRequest.user = ozoneRequest.user || {};
         ozoneRequest.user.ext = {'consent': bidderRequest.gdprConsent.consentString};
       } else {
-        utils.logInfo('OZONE: **** Strange CMP info: bidderRequest.gdprConsent exists BUT bidderRequest.gdprConsent.gdprApplies is false. See bidderRequest logged above. ****');
+        this.logInfo('**** Strange CMP info: bidderRequest.gdprConsent exists BUT bidderRequest.gdprConsent.gdprApplies is false. See bidderRequest logged above. ****');
       }
     } else {
-      utils.logInfo('OZONE: WILL NOT ADD GDPR info; no bidderRequest.gdprConsent object was present.');
+      this.logInfo('WILL NOT ADD GDPR info; no bidderRequest.gdprConsent object was present.');
     }
     const getParams = this.getGetParametersAsObject();
-    const ozTestMode = getParams.hasOwnProperty('oztestmode') ? getParams.oztestmode : null; // this can be any string, it's used for testing ads
+    const wlOztestmodeKey = whitelabelPrefix + 'testmode';
+    const isTestMode = getParams[wlOztestmodeKey] || null; // this can be any string, it's used for testing ads
     ozoneRequest.device = {'w': window.innerWidth, 'h': window.innerHeight};
     let placementIdOverrideFromGetParam = this.getPlacementIdOverrideFromGetParam(); // null or string
-    let lotameDataSingle = {}; // we will capture lotame data once & send it to the server as ext.ozone.lotameData
     // build the array of params to attach to `imp`
     let tosendtags = validBidRequests.map(ozoneBidRequest => {
       var obj = {};
@@ -168,18 +214,18 @@ export const spec = {
       let arrBannerSizes = [];
       if (!ozoneBidRequest.hasOwnProperty('mediaTypes')) {
         if (ozoneBidRequest.hasOwnProperty('sizes')) {
-          utils.logInfo('OZONE: no mediaTypes detected - will use the sizes array in the config root');
+          this.logInfo('no mediaTypes detected - will use the sizes array in the config root');
           arrBannerSizes = ozoneBidRequest.sizes;
         } else {
-          utils.logInfo('OZONE: no mediaTypes detected, no sizes array in the config root either. Cannot set sizes for banner type');
+          this.logInfo('no mediaTypes detected, no sizes array in the config root either. Cannot set sizes for banner type');
         }
       } else {
         if (ozoneBidRequest.mediaTypes.hasOwnProperty(BANNER)) {
           arrBannerSizes = ozoneBidRequest.mediaTypes[BANNER].sizes; /* Note - if there is a sizes element in the config root it will be pushed into here */
-          utils.logInfo('OZONE: setting banner size from the mediaTypes.banner element for bidId ' + obj.id + ': ', arrBannerSizes);
+          this.logInfo('setting banner size from the mediaTypes.banner element for bidId ' + obj.id + ': ', arrBannerSizes);
         }
         if (ozoneBidRequest.mediaTypes.hasOwnProperty(VIDEO)) {
-          utils.logInfo('OZONE: openrtb 2.5 compliant video');
+          this.logInfo('openrtb 2.5 compliant video');
           // examine all the video attributes in the config, and either put them into obj.video if allowed by IAB2.5 or else in to obj.video.ext
           if (typeof ozoneBidRequest.mediaTypes[VIDEO] == 'object') {
             let childConfig = utils.deepAccess(ozoneBidRequest, 'params.video', {});
@@ -188,25 +234,25 @@ export const spec = {
           }
           // we need to duplicate some of the video values
           let wh = getWidthAndHeightFromVideoObject(obj.video);
-          utils.logInfo('OZONE: setting video object from the mediaTypes.video element: ' + obj.id + ':', obj.video, 'wh=', wh);
+          this.logInfo('setting video object from the mediaTypes.video element: ' + obj.id + ':', obj.video, 'wh=', wh);
           if (wh && typeof wh === 'object') {
             obj.video.w = wh['w'];
             obj.video.h = wh['h'];
             if (playerSizeIsNestedArray(obj.video)) { // this should never happen; it was in the original spec for this change though.
-              utils.logInfo('OZONE: setting obj.video.format to be an array of objects');
+              this.logInfo('setting obj.video.format to be an array of objects');
               obj.video.ext.format = [wh];
             } else {
-              utils.logInfo('OZONE: setting obj.video.format to be an object');
+              this.logInfo('setting obj.video.format to be an object');
               obj.video.ext.format = wh;
             }
           } else {
-            utils.logWarn('OZONE: cannot set w, h & format values for video; the config is not right');
+            this.logWarn('cannot set w, h & format values for video; the config is not right');
           }
         }
         // Native integration is not complete yet
         if (ozoneBidRequest.mediaTypes.hasOwnProperty(NATIVE)) {
           obj.native = ozoneBidRequest.mediaTypes[NATIVE];
-          utils.logInfo('OZONE: setting native object from the mediaTypes.native element: ' + obj.id + ':', obj.native);
+          this.logInfo('setting native object from the mediaTypes.native element: ' + obj.id + ':', obj.native);
         }
       }
       if (arrBannerSizes.length > 0) {
@@ -223,52 +269,55 @@ export const spec = {
       // these 3 MUST exist - we check them in the validation method
       obj.placementId = placementId;
       // build the imp['ext'] object
-      obj.ext = {'prebid': {'storedrequest': {'id': placementId}}, 'ozone': {}};
-      obj.ext.ozone.adUnitCode = ozoneBidRequest.adUnitCode; // eg. 'mpu'
-      obj.ext.ozone.transactionId = ozoneBidRequest.transactionId; // this is the transactionId PER adUnit, common across bidders for this unit
+      obj.ext = {'prebid': {'storedrequest': {'id': placementId}}};
+      obj.ext[whitelabelBidder] = {};
+      obj.ext[whitelabelBidder].adUnitCode = ozoneBidRequest.adUnitCode; // eg. 'mpu'
+      obj.ext[whitelabelBidder].transactionId = ozoneBidRequest.transactionId; // this is the transactionId PER adUnit, common across bidders for this unit
       if (ozoneBidRequest.params.hasOwnProperty('customData')) {
-        obj.ext.ozone.customData = ozoneBidRequest.params.customData;
+        obj.ext[whitelabelBidder].customData = ozoneBidRequest.params.customData;
       }
-      utils.logInfo('OZONE: obj.ext.ozone is ', obj.ext.ozone);
-      if (ozTestMode != null) {
-        utils.logInfo('OZONE: setting ozTestMode to ', ozTestMode);
-        if (obj.ext.ozone.hasOwnProperty('customData')) {
-          for (let i = 0; i < obj.ext.ozone.customData.length; i++) {
-            obj.ext.ozone.customData[i]['targeting']['oztestmode'] = ozTestMode;
+      this.logInfo(`obj.ext.${whitelabelBidder} is `, obj.ext[whitelabelBidder]);
+      if (isTestMode != null) {
+        this.logInfo('setting isTestMode to ', isTestMode);
+        if (obj.ext[whitelabelBidder].hasOwnProperty('customData')) {
+          for (let i = 0; i < obj.ext[whitelabelBidder].customData.length; i++) {
+            obj.ext[whitelabelBidder].customData[i]['targeting'][wlOztestmodeKey] = isTestMode;
           }
         } else {
-          obj.ext.ozone.customData = [{'settings': {}, 'targeting': {'oztestmode': ozTestMode}}];
+          obj.ext[whitelabelBidder].customData = [{'settings': {}, 'targeting': {}}];
+          obj.ext[whitelabelBidder].customData[0].targeting[wlOztestmodeKey] = isTestMode;
         }
-      } else {
-        utils.logInfo('OZONE: no ozTestMode ');
-      }
-      // now deal with lotame, including the optional override parameters
-      if (Object.keys(lotameDataSingle).length === 0) { // we've not yet found lotameData, see if we can get it from this bid request object
-        lotameDataSingle = this.tryGetLotameData(ozoneBidRequest);
       }
       return obj;
     });
 
     // in v 2.0.0 we moved these outside of the individual ad slots
-    let extObj = {'ozone': {'oz_pb_v': OZONEVERSION, 'oz_rw': placementIdOverrideFromGetParam ? 1 : 0, 'oz_lot_rw': this.propertyBag.lotameWasOverridden}};
+    let extObj = {};
+    extObj[whitelabelBidder] = {};
+    extObj[whitelabelBidder][whitelabelPrefix + '_pb_v'] = OZONEVERSION;
+    extObj[whitelabelBidder][whitelabelPrefix + '_rw'] = placementIdOverrideFromGetParam ? 1 : 0;
     if (validBidRequests.length > 0) {
-      let userIds = this.findAllUserIds(validBidRequests[0]);
+      let userIds = this.cookieSyncBag.userIdObject; // 2021-01-06 - slight optimisation - we've already found this info
+      // let userIds = this.findAllUserIds(validBidRequests[0]);
       if (userIds.hasOwnProperty('pubcid')) {
-        extObj.ozone.pubcid = userIds.pubcid;
+        extObj[whitelabelBidder].pubcid = userIds.pubcid;
       }
     }
-    extObj.ozone.pv = this.getPageId(); // attach the page ID that will be common to all auciton calls for this page if refresh() is called
-    extObj.ozone.lotameData = lotameDataSingle; // 2.4.0 moved lotameData out of bid objects into the single ext.ozone area to remove duplication
-    let ozOmpFloorDollars = config.getConfig('ozone.oz_omp_floor'); // valid only if a dollar value (typeof == 'number')
-    utils.logInfo('OZONE: oz_omp_floor dollar value = ', ozOmpFloorDollars);
+    extObj[whitelabelBidder].pv = this.getPageId(); // attach the page ID that will be common to all auciton calls for this page if refresh() is called
+    let ozOmpFloorDollars = this.getWhitelabelConfigItem('ozone.oz_omp_floor'); // valid only if a dollar value (typeof == 'number')
+    this.logInfo(`${whitelabelPrefix}_omp_floor dollar value = `, ozOmpFloorDollars);
     if (typeof ozOmpFloorDollars === 'number') {
-      extObj.ozone.oz_omp_floor = ozOmpFloorDollars;
+      extObj[whitelabelBidder][whitelabelPrefix + '_omp_floor'] = ozOmpFloorDollars;
     } else if (typeof ozOmpFloorDollars !== 'undefined') {
-      utils.logError('OZONE: oz_omp_floor is invalid - IF SET then this must be a number, representing dollar value eg. oz_omp_floor: 1.55. You have it set as a ' + (typeof ozOmpFloorDollars));
+      this.logError(`${whitelabelPrefix}_omp_floor is invalid - IF SET then this must be a number, representing dollar value eg. ${whitelabelPrefix}_omp_floor: 1.55. You have it set as a ` + (typeof ozOmpFloorDollars));
     }
-    let ozWhitelistAdserverKeys = config.getConfig('ozone.oz_whitelist_adserver_keys');
+    let ozWhitelistAdserverKeys = this.getWhitelabelConfigItem('ozone.oz_whitelist_adserver_keys');
     let useOzWhitelistAdserverKeys = utils.isArray(ozWhitelistAdserverKeys) && ozWhitelistAdserverKeys.length > 0;
-    extObj.ozone.oz_kvp_rw = useOzWhitelistAdserverKeys ? 1 : 0;
+    extObj[whitelabelBidder][whitelabelPrefix + '_kvp_rw'] = useOzWhitelistAdserverKeys ? 1 : 0;
+    if (whitelabelBidder != 'ozone') {
+      this.logInfo('setting aliases object');
+      extObj.prebid = {aliases: {'ozone': whitelabelBidder}};
+    }
 
     var userExtEids = this.generateEids(validBidRequests); // generate the UserIDs in the correct format for UserId module
 
@@ -277,7 +326,7 @@ export const spec = {
       'page': document.location.href,
       'id': htmlParams.siteId
     };
-    ozoneRequest.test = (getParams.hasOwnProperty('pbjs_debug') && getParams['pbjs_debug'] == 'true') ? 1 : 0;
+    ozoneRequest.test = (getParams.hasOwnProperty('pbjs_debug') && getParams['pbjs_debug'] === 'true') ? 1 : 0;
 
     // this is for 2.2.1
     // coppa compliance
@@ -287,7 +336,7 @@ export const spec = {
 
     // return the single request object OR the array:
     if (singleRequest) {
-      utils.logInfo('OZONE: buildRequests starting to generate response for a single request');
+      this.logInfo('buildRequests starting to generate response for a single request');
       ozoneRequest.id = bidderRequest.auctionId; // Unique ID of the bid request, provided by the exchange.
       ozoneRequest.auctionId = bidderRequest.auctionId; // not sure if this should be here?
       ozoneRequest.imp = tosendtags;
@@ -296,36 +345,36 @@ export const spec = {
       utils.deepSetValue(ozoneRequest, 'user.ext.eids', userExtEids);
       var ret = {
         method: 'POST',
-        url: OZONEURI,
+        url: this.getAuctionUrl(),
         data: JSON.stringify(ozoneRequest),
         bidderRequest: bidderRequest
       };
-      utils.logInfo('OZONE: buildRequests ozoneRequest for single = ', ozoneRequest);
+      this.logInfo('buildRequests request data for single = ', ozoneRequest);
       this.propertyBag.buildRequestsEnd = new Date().getTime();
-      utils.logInfo(`OZONE: buildRequests going to return for single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, ret);
+      this.logInfo(`buildRequests going to return for single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, ret);
       return ret;
     }
     // not single request - pull apart the tosendtags array & return an array of objects each containing one element in the imp array.
     let arrRet = tosendtags.map(imp => {
-      utils.logInfo('OZONE: buildRequests starting to generate non-single response, working on imp : ', imp);
+      this.logInfo('buildRequests starting to generate non-single response, working on imp : ', imp);
       let ozoneRequestSingle = Object.assign({}, ozoneRequest);
-      imp.ext.ozone.pageAuctionId = bidderRequest['auctionId']; // make a note in the ext object of what the original auctionId was, in the bidderRequest object
-      ozoneRequestSingle.id = imp.ext.ozone.transactionId; // Unique ID of the bid request, provided by the exchange.
-      ozoneRequestSingle.auctionId = imp.ext.ozone.transactionId; // not sure if this should be here?
+      imp.ext[whitelabelBidder].pageAuctionId = bidderRequest['auctionId']; // make a note in the ext object of what the original auctionId was, in the bidderRequest object
+      ozoneRequestSingle.id = imp.ext[whitelabelBidder].transactionId; // Unique ID of the bid request, provided by the exchange.
+      ozoneRequestSingle.auctionId = imp.ext[whitelabelBidder].transactionId; // not sure if this should be here?
       ozoneRequestSingle.imp = [imp];
       ozoneRequestSingle.ext = extObj;
-      ozoneRequestSingle.source = {'tid': imp.ext.ozone.transactionId};
+      ozoneRequestSingle.source = {'tid': imp.ext[whitelabelBidder].transactionId};
       utils.deepSetValue(ozoneRequestSingle, 'user.ext.eids', userExtEids);
-      utils.logInfo('OZONE: buildRequests ozoneRequestSingle (for non-single) = ', ozoneRequestSingle);
+      this.logInfo('buildRequests RequestSingle (for non-single) = ', ozoneRequestSingle);
       return {
         method: 'POST',
-        url: OZONEURI,
+        url: this.getAuctionUrl(),
         data: JSON.stringify(ozoneRequestSingle),
         bidderRequest: bidderRequest
       };
     });
     this.propertyBag.buildRequestsEnd = new Date().getTime();
-    utils.logInfo(`OZONE: buildRequests going to return for non-single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, arrRet);
+    this.logInfo(`buildRequests going to return for non-single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, arrRet);
     return arrRet;
   },
   /**
@@ -339,9 +388,12 @@ export const spec = {
    * @returns {*}
    */
   interpretResponse(serverResponse, request) {
+    if (request && request.bidderRequest && request.bidderRequest.bids) { this.loadWhitelabelData(request.bidderRequest.bids[0]); }
     let startTime = new Date().getTime();
-    utils.logInfo(`OZONE: interpretResponse time: ${startTime} . Time between buildRequests done and interpretResponse start was ${startTime - this.propertyBag.buildRequestsEnd}ms`);
-    utils.logInfo(`OZONE: serverResponse, request`, serverResponse, request);
+    let whitelabelBidder = this.propertyBag.whitelabel.bidder; // by default = ozone
+    let whitelabelPrefix = this.propertyBag.whitelabel.keyPrefix;
+    this.logInfo(`interpretResponse time: ${startTime} . Time between buildRequests done and interpretResponse start was ${startTime - this.propertyBag.buildRequestsEnd}ms`);
+    this.logInfo(`serverResponse, request`, JSON.parse(JSON.stringify(serverResponse)), JSON.parse(JSON.stringify(request)));
     serverResponse = serverResponse.body || {};
     // note that serverResponse.id value is the auction_id we might want to use for reporting reasons.
     if (!serverResponse.hasOwnProperty('seatbid')) {
@@ -351,91 +403,91 @@ export const spec = {
       return [];
     }
     let arrAllBids = [];
-    let enhancedAdserverTargeting = config.getConfig('ozone.enhancedAdserverTargeting');
-    utils.logInfo('OZONE: enhancedAdserverTargeting', enhancedAdserverTargeting);
+    let enhancedAdserverTargeting = this.getWhitelabelConfigItem('ozone.enhancedAdserverTargeting');
+    this.logInfo('enhancedAdserverTargeting', enhancedAdserverTargeting);
     if (typeof enhancedAdserverTargeting == 'undefined') {
       enhancedAdserverTargeting = true;
     }
-    utils.logInfo('OZONE: enhancedAdserverTargeting', enhancedAdserverTargeting);
+    this.logInfo('enhancedAdserverTargeting', enhancedAdserverTargeting);
     serverResponse.seatbid = injectAdIdsIntoAllBidResponses(serverResponse.seatbid); // we now make sure that each bid in the bidresponse has a unique (within page) adId attribute.
     serverResponse.seatbid = this.removeSingleBidderMultipleBids(serverResponse.seatbid);
-    let ozOmpFloorDollars = config.getConfig('ozone.oz_omp_floor'); // valid only if a dollar value (typeof == 'number')
+    let ozOmpFloorDollars = this.getWhitelabelConfigItem('ozone.oz_omp_floor'); // valid only if a dollar value (typeof == 'number')
     let addOzOmpFloorDollars = typeof ozOmpFloorDollars === 'number';
-    let ozWhitelistAdserverKeys = config.getConfig('ozone.oz_whitelist_adserver_keys');
+    let ozWhitelistAdserverKeys = this.getWhitelabelConfigItem('ozone.oz_whitelist_adserver_keys');
     let useOzWhitelistAdserverKeys = utils.isArray(ozWhitelistAdserverKeys) && ozWhitelistAdserverKeys.length > 0;
 
     for (let i = 0; i < serverResponse.seatbid.length; i++) {
       let sb = serverResponse.seatbid[i];
       for (let j = 0; j < sb.bid.length; j++) {
         let thisRequestBid = this.getBidRequestForBidId(sb.bid[j].impid, request.bidderRequest.bids);
-        utils.logInfo(`OZONE seatbid:${i}, bid:${j} Going to set default w h for seatbid/bidRequest`, sb.bid[j], thisRequestBid);
+        this.logInfo(`seatbid:${i}, bid:${j} Going to set default w h for seatbid/bidRequest`, sb.bid[j], thisRequestBid);
         const {defaultWidth, defaultHeight} = defaultSize(thisRequestBid);
         let thisBid = ozoneAddStandardProperties(sb.bid[j], defaultWidth, defaultHeight);
         let videoContext = null;
         let isVideo = false;
         let bidType = utils.deepAccess(thisBid, 'ext.prebid.type');
-        utils.logInfo(`OZONE: this bid type is : ${bidType}`, j);
+        this.logInfo(`this bid type is : ${bidType}`, j);
         if (bidType === VIDEO) {
           isVideo = true;
           videoContext = this.getVideoContextForBidId(thisBid.bidId, request.bidderRequest.bids); // should be instream or outstream (or null if error)
           if (videoContext === 'outstream') {
-            utils.logInfo('OZONE: going to attach a renderer to OUTSTREAM video : ', j);
+            this.logInfo('going to attach a renderer to OUTSTREAM video : ', j);
             thisBid.renderer = newRenderer(thisBid.bidId);
           } else {
-            utils.logInfo('OZONE: bid is not an outstream video, will not attach a renderer: ', j);
+            this.logInfo('bid is not an outstream video, will not attach a renderer: ', j);
           }
         }
         let adserverTargeting = {};
         if (enhancedAdserverTargeting) {
           let allBidsForThisBidid = ozoneGetAllBidsForBidId(thisBid.bidId, serverResponse.seatbid);
           // add all the winning & non-winning bids for this bidId:
-          utils.logInfo('OZONE: Going to iterate allBidsForThisBidId', allBidsForThisBidid);
-          Object.keys(allBidsForThisBidid).forEach(function (bidderName, index, ar2) {
-            utils.logInfo(`OZONE: adding adserverTargeting for ${bidderName} for bidId ${thisBid.bidId}`);
+          this.logInfo('Going to iterate allBidsForThisBidId', allBidsForThisBidid);
+          Object.keys(allBidsForThisBidid).forEach((bidderName, index, ar2) => {
+            this.logInfo(`adding adserverTargeting for ${bidderName} for bidId ${thisBid.bidId}`);
             // let bidderName = bidderNameWH.split('_')[0];
-            adserverTargeting['oz_' + bidderName] = bidderName;
-            adserverTargeting['oz_' + bidderName + '_crid'] = String(allBidsForThisBidid[bidderName].crid);
-            adserverTargeting['oz_' + bidderName + '_adv'] = String(allBidsForThisBidid[bidderName].adomain);
-            adserverTargeting['oz_' + bidderName + '_adId'] = String(allBidsForThisBidid[bidderName].adId);
-            adserverTargeting['oz_' + bidderName + '_pb_r'] = getRoundedBid(allBidsForThisBidid[bidderName].price, allBidsForThisBidid[bidderName].ext.prebid.type);
+            adserverTargeting[whitelabelPrefix + '_' + bidderName] = bidderName;
+            adserverTargeting[whitelabelPrefix + '_' + bidderName + '_crid'] = String(allBidsForThisBidid[bidderName].crid);
+            adserverTargeting[whitelabelPrefix + '_' + bidderName + '_adv'] = String(allBidsForThisBidid[bidderName].adomain);
+            adserverTargeting[whitelabelPrefix + '_' + bidderName + '_adId'] = String(allBidsForThisBidid[bidderName].adId);
+            adserverTargeting[whitelabelPrefix + '_' + bidderName + '_pb_r'] = getRoundedBid(allBidsForThisBidid[bidderName].price, allBidsForThisBidid[bidderName].ext.prebid.type);
             if (allBidsForThisBidid[bidderName].hasOwnProperty('dealid')) {
-              adserverTargeting['oz_' + bidderName + '_dealid'] = String(allBidsForThisBidid[bidderName].dealid);
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_dealid'] = String(allBidsForThisBidid[bidderName].dealid);
             }
             if (addOzOmpFloorDollars) {
-              adserverTargeting['oz_' + bidderName + '_omp'] = allBidsForThisBidid[bidderName].price >= ozOmpFloorDollars ? '1' : '0';
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_omp'] = allBidsForThisBidid[bidderName].price >= ozOmpFloorDollars ? '1' : '0';
             }
             if (isVideo) {
-              adserverTargeting['oz_' + bidderName + '_vid'] = videoContext; // outstream or instream
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_vid'] = videoContext; // outstream or instream
             }
-            let flr = utils.deepAccess(allBidsForThisBidid[bidderName], 'ext.bidder.ozone.floor', null);
+            let flr = utils.deepAccess(allBidsForThisBidid[bidderName], `ext.bidder.${whitelabelBidder}.floor`, null);
             if (flr != null) {
-              adserverTargeting['oz_' + bidderName + '_flr'] = flr;
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_flr'] = flr;
             }
-            let rid = utils.deepAccess(allBidsForThisBidid[bidderName], 'ext.bidder.ozone.ruleId', null);
+            let rid = utils.deepAccess(allBidsForThisBidid[bidderName], `ext.bidder.${whitelabelBidder}.ruleId`, null);
             if (rid != null) {
-              adserverTargeting['oz_' + bidderName + '_rid'] = rid;
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_rid'] = rid;
             }
             if (bidderName.match(/^ozappnexus/)) {
-              adserverTargeting['oz_' + bidderName + '_sid'] = String(allBidsForThisBidid[bidderName].cid);
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_sid'] = String(allBidsForThisBidid[bidderName].cid);
             }
           });
         } else {
           if (useOzWhitelistAdserverKeys) {
-            utils.logWarn('OZONE: You have set a whitelist of adserver keys but this will be ignored because ozone.enhancedAdserverTargeting is set to false. No per-bid keys will be sent to adserver.');
+            this.logWarn(`You have set a whitelist of adserver keys but this will be ignored because ${whitelabelBidder}.enhancedAdserverTargeting is set to false. No per-bid keys will be sent to adserver.`);
           } else {
-            utils.logInfo('OZONE: ozone.enhancedAdserverTargeting is set to false, so no per-bid keys will be sent to adserver.');
+            this.logInfo(`${whitelabelBidder}.enhancedAdserverTargeting is set to false, so no per-bid keys will be sent to adserver.`);
           }
         }
         // also add in the winning bid, to be sent to dfp
         let {seat: winningSeat, bid: winningBid} = ozoneGetWinnerForRequestBid(thisBid.bidId, serverResponse.seatbid);
-        adserverTargeting['oz_auc_id'] = String(request.bidderRequest.auctionId);
-        adserverTargeting['oz_winner'] = String(winningSeat);
+        adserverTargeting[whitelabelPrefix + '_auc_id'] = String(request.bidderRequest.auctionId);
+        adserverTargeting[whitelabelPrefix + '_winner'] = String(winningSeat);
         if (enhancedAdserverTargeting) {
-          adserverTargeting['oz_imp_id'] = String(winningBid.impid);
-          adserverTargeting['oz_pb_v'] = OZONEVERSION;
+          adserverTargeting[whitelabelPrefix + '_imp_id'] = String(winningBid.impid);
+          adserverTargeting[whitelabelPrefix + '_pb_v'] = OZONEVERSION;
         }
         if (useOzWhitelistAdserverKeys) { // delete any un-whitelisted keys
-          utils.logInfo('OZONE: Going to filter out adserver targeting keys not in the whitelist: ', ozWhitelistAdserverKeys);
+          this.logInfo('Going to filter out adserver targeting keys not in the whitelist: ', ozWhitelistAdserverKeys);
           Object.keys(adserverTargeting).forEach(function(key) { if (ozWhitelistAdserverKeys.indexOf(key) === -1) { delete adserverTargeting[key]; } });
         }
         thisBid.adserverTargeting = adserverTargeting;
@@ -443,9 +495,22 @@ export const spec = {
       }
     }
     let endTime = new Date().getTime();
-    utils.logInfo(`OZONE: interpretResponse going to return at time ${endTime} (took ${endTime - startTime}ms) Time from buildRequests Start -> interpretRequests End = ${endTime - this.propertyBag.buildRequestsStart}ms`, arrAllBids);
+    this.logInfo(`interpretResponse going to return at time ${endTime} (took ${endTime - startTime}ms) Time from buildRequests Start -> interpretRequests End = ${endTime - this.propertyBag.buildRequestsStart}ms`, arrAllBids);
     return arrAllBids;
   },
+  /**
+   * Use this to get all config values
+   * Now it's getting complicated with whitelabeling, this simplifies the code for getting config values.
+   * eg. to get ozone.oz_omp_floor you just send '_omp_floor'
+   * @param ozoneVersion string like 'ozone.oz_omp_floor'
+   * @return {string|object}
+   */
+  getWhitelabelConfigItem(ozoneVersion) {
+    if (this.propertyBag.whitelabel.bidder == 'ozone') { return config.getConfig(ozoneVersion); }
+    let whitelabelledSearch = ozoneVersion.replace('ozone', this.propertyBag.whitelabel.bidder);
+    whitelabelledSearch = ozoneVersion.replace('oz_', this.propertyBag.whitelabel.keyPrefix + '_');
+    return config.getConfig(whitelabelledSearch);
+  },
   /**
    * If a bidder bids for > 1 size for an adslot, allow only the highest bid
    * @param seatbid object (serverResponse.seatbid)
@@ -475,7 +540,7 @@ export const spec = {
   },
   // see http://prebid.org/dev-docs/bidder-adaptor.html#registering-user-syncs
   getUserSyncs(optionsType, serverResponse, gdprConsent) {
-    utils.logInfo('OZONE: getUserSyncs optionsType, serverResponse, gdprConsent, cookieSyncBag', optionsType, serverResponse, gdprConsent, this.cookieSyncBag);
+    this.logInfo('getUserSyncs optionsType, serverResponse, gdprConsent, cookieSyncBag', optionsType, serverResponse, gdprConsent, this.cookieSyncBag);
     if (!serverResponse || serverResponse.length === 0) {
       return [];
     }
@@ -494,15 +559,16 @@ export const spec = {
       arrQueryString.push('publisherId=' + this.cookieSyncBag.publisherId);
       arrQueryString.push('siteId=' + this.cookieSyncBag.siteId);
       arrQueryString.push('cb=' + Date.now());
+      arrQueryString.push('bidder=' + this.propertyBag.whitelabel.bidder);
 
       var strQueryString = arrQueryString.join('&');
       if (strQueryString.length > 0) {
         strQueryString = '?' + strQueryString;
       }
-      utils.logInfo('OZONE: getUserSyncs going to return cookie sync url : ' + OZONECOOKIESYNC + strQueryString);
+      this.logInfo('getUserSyncs going to return cookie sync url : ' + this.getCookieSyncUrl() + strQueryString);
       return [{
         type: 'iframe',
-        url: OZONECOOKIESYNC + strQueryString
+        url: this.getCookieSyncUrl() + strQueryString
       }];
     }
   },
@@ -535,26 +601,31 @@ export const spec = {
   },
   /**
    *  Look for pubcid & all the other IDs according to http://prebid.org/dev-docs/modules/userId.html
+   *  NOTE that criteortus is deprecated & should be removed asap
    *  @return map
    */
   findAllUserIds(bidRequest) {
     var ret = {};
-    let searchKeysSingle = ['pubcid', 'tdid', 'parrableId', 'idl_env', 'digitrustid', 'criteortus'];
+    // @todo - what is fabrick called & where to look for it? If it's a simple value then it will automatically be ok
+    let searchKeysSingle = ['pubcid', 'tdid', 'id5id', 'parrableId', 'idl_env', 'criteoId', 'criteortus',
+      'sharedid', 'lotamePanoramaId', 'fabrickId'];
     if (bidRequest.hasOwnProperty('userId')) {
       for (let arrayId in searchKeysSingle) {
         let key = searchKeysSingle[arrayId];
         if (bidRequest.userId.hasOwnProperty(key)) {
-          ret[key] = bidRequest.userId[key];
+          if (typeof (bidRequest.userId[key]) == 'string') {
+            ret[key] = bidRequest.userId[key];
+          } else if (typeof (bidRequest.userId[key]) == 'object') {
+            ret[key] = bidRequest.userId[key][Object.keys(bidRequest.userId[key])[0]]; // cannot use Object.values
+          } else {
+            this.logError(`failed to get string key value for userId : ${key}`);
+          }
         }
       }
       var lipbid = utils.deepAccess(bidRequest.userId, 'lipb.lipbid');
       if (lipbid) {
         ret['lipb'] = {'lipbid': lipbid};
       }
-      var id5id = utils.deepAccess(bidRequest.userId, 'id5id.uid');
-      if (id5id) {
-        ret['id5id'] = id5id;
-      }
     }
     if (!ret.hasOwnProperty('pubcid')) {
       var pubcid = utils.deepAccess(bidRequest, 'crumbs.pubcid');
@@ -564,69 +635,6 @@ export const spec = {
     }
     return ret;
   },
-  /**
-   * get all the lotame override keys/values from the querystring.
-   * @return object containing zero or more keys/values
-   */
-  getLotameOverrideParams() {
-    const arrGet = this.getGetParametersAsObject();
-    utils.logInfo('OZONE: getLotameOverrideParams - arrGet=', arrGet);
-    let arrRet = {};
-    for (let i in ALLOWED_LOTAME_PARAMS) {
-      if (arrGet.hasOwnProperty(ALLOWED_LOTAME_PARAMS[i])) {
-        arrRet[ALLOWED_LOTAME_PARAMS[i]] = arrGet[ALLOWED_LOTAME_PARAMS[i]];
-      }
-    }
-    return arrRet;
-  },
-  /**
-   * Boolean function to check that this lotame data is valid (check Audience.id)
-   */
-  isLotameDataValid(lotameObj) {
-    if (!lotameObj.hasOwnProperty('Profile')) return false;
-    let prof = lotameObj.Profile;
-    if (!prof.hasOwnProperty('tpid')) return false;
-    if (!prof.hasOwnProperty('pid')) return false;
-    let audiences = utils.deepAccess(prof, 'Audiences.Audience');
-    if (typeof audiences != 'object') {
-      return false;
-    }
-    for (var i = 0; i < audiences.length; i++) {
-      let aud = audiences[i];
-      if (!aud.hasOwnProperty('id')) {
-        return false;
-      }
-    }
-    return true; // All Audiences objects have an 'id' key
-  },
-  /**
-   * Use the arrOverride keys/vals to update the arrExisting lotame object.
-   * Ideally we will only be using the oz_lotameid value to update the audiences id, but in the event of bad/missing
-   * pid & tpid we will also have to use substitute values for those too.
-   *
-   * @param objOverride object will contain all the ALLOWED_LOTAME_PARAMS parameters
-   * @param lotameData object might be {} or contain the lotame data
-   */
-  makeLotameObjectFromOverride(objOverride, lotameData) {
-    if ((lotameData.hasOwnProperty('Profile') && Object.keys(lotameData.Profile).length < 3) ||
-      (!lotameData.hasOwnProperty('Profile'))) { // bad or empty lotame object (should contain pid, tpid & Audiences object) - build a total replacement
-      utils.logInfo('OZONE: makeLotameObjectFromOverride will return a full default lotame object');
-      return {
-        'Profile': {
-          'tpid': objOverride['oz_lotametpid'],
-          'pid': objOverride['oz_lotamepid'],
-          'Audiences': {'Audience': [{'id': objOverride['oz_lotameid'], 'abbr': objOverride['oz_lotameid']}]}
-        }
-      };
-    }
-    if (utils.deepAccess(lotameData, 'Profile.Audiences.Audience')) {
-      utils.logInfo('OZONE: makeLotameObjectFromOverride will return the existing lotame object with updated Audience by oz_lotameid');
-      lotameData.Profile.Audiences.Audience = [{'id': objOverride['oz_lotameid'], 'abbr': objOverride['oz_lotameid']}];
-      return lotameData;
-    }
-    utils.logInfo('OZONE: makeLotameObjectFromOverride Weird error - failed to find Profile.Audiences.Audience in lotame object. Will return the object as-is');
-    return lotameData;
-  },
   /**
    * Convenient method to get the value we need for the placementId - ONLY from the bidRequest - NOT taking into account any GET override ID
    * @param bidRequest
@@ -642,48 +650,30 @@ export const spec = {
    * @returns null|string
    */
   getPlacementIdOverrideFromGetParam() {
+    let whitelabelPrefix = this.propertyBag.whitelabel.keyPrefix;
     let arr = this.getGetParametersAsObject();
-    if (arr.hasOwnProperty('ozstoredrequest')) {
-      if (this.isValidPlacementId(arr.ozstoredrequest)) {
-        utils.logInfo('OZONE: using GET ozstoredrequest ' + arr.ozstoredrequest + ' to replace placementId');
-        return arr.ozstoredrequest;
+    if (arr.hasOwnProperty(whitelabelPrefix + 'storedrequest')) {
+      if (this.isValidPlacementId(arr[whitelabelPrefix + 'storedrequest'])) {
+        this.logInfo(`using GET ${whitelabelPrefix}storedrequest ` + arr[whitelabelPrefix + 'storedrequest'] + ' to replace placementId');
+        return arr[whitelabelPrefix + 'storedrequest'];
       } else {
-        utils.logError('OZONE: GET ozstoredrequest FAILED VALIDATION - will not use it');
+        this.logError(`GET ${whitelabelPrefix}storedrequest FAILED VALIDATION - will not use it`);
       }
     }
     return null;
   },
-  /**
-   * Produces external userid object
-   */
-  addExternalUserId(eids, value, source, atype) {
-    if (utils.isStr(value)) {
-      eids.push({
-        source,
-        uids: [{
-          id: value,
-          atype
-        }]
-      });
-    }
-  },
   /**
    * Generate an object we can append to the auction request, containing user data formatted correctly for different ssps
+   * http://prebid.org/dev-docs/modules/userId.html
    * @param validBidRequests
    * @return {Array}
    */
   generateEids(validBidRequests) {
-    let eids = [];
-    this.handleTTDId(eids, validBidRequests);
+    let eids;
     const bidRequest = validBidRequests[0];
     if (bidRequest && bidRequest.userId) {
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.pubcid`), 'pubcid', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.pubcid`), 'pubcommon', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.id5id.uid`), 'id5-sync.com', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.criteortus.${BIDDER_CODE}.userid`), 'criteortus', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.idl_env`), 'liveramp.com', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.lipb.lipbid`), 'liveintent.com', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.parrableId.eid`), 'parrable.com', 1);
+      eids = bidRequest.userIdAsEids;
+      this.handleTTDId(eids, validBidRequests);
     }
     return eids;
   },
@@ -725,9 +715,9 @@ export const spec = {
    */
   blockTheRequest() {
     // if there is an ozone.oz_request = false then quit now.
-    let ozRequest = config.getConfig('ozone.oz_request');
+    let ozRequest = this.getWhitelabelConfigItem('ozone.oz_request');
     if (typeof ozRequest == 'boolean' && !ozRequest) {
-      utils.logWarn('OZONE: Will not allow auction : ozone.oz_request is set to false');
+      this.logWarn(`Will not allow auction : ${this.propertyBag.whitelabel.keyPrefix}one.${this.propertyBag.whitelabel.keyPrefix}_request is set to false`);
       return true;
     }
     return false;
@@ -747,34 +737,6 @@ export const spec = {
     }
     return this.propertyBag.pageId;
   },
-  /**
-   * handle the complexity of there possibly being lotameData override (may be valid/invalid) & there may or may not be lotameData present in the bidRequest
-   * NOTE THAT this will also set this.propertyBag.lotameWasOverridden=1 if we use lotame override
-   * @param ozoneBidRequest
-   * @return object representing the absolute lotameData we need to use.
-   */
-  tryGetLotameData: function(ozoneBidRequest) {
-    const arrLotameOverride = this.getLotameOverrideParams();
-    let ret = {};
-    if (Object.keys(arrLotameOverride).length === ALLOWED_LOTAME_PARAMS.length) {
-      // all override params are present, override lotame object:
-      if (ozoneBidRequest.params.hasOwnProperty('lotameData')) {
-        ret = this.makeLotameObjectFromOverride(arrLotameOverride, ozoneBidRequest.params.lotameData);
-      } else {
-        ret = this.makeLotameObjectFromOverride(arrLotameOverride, {});
-      }
-      this.propertyBag.lotameWasOverridden = 1;
-    } else if (ozoneBidRequest.params.hasOwnProperty('lotameData')) {
-      // no lotame override, use it as-is
-      if (this.isLotameDataValid(ozoneBidRequest.params.lotameData)) {
-        ret = ozoneBidRequest.params.lotameData;
-      } else {
-        utils.logError('OZONE: INVALID LOTAME DATA FOUND - WILL NOT USE THIS AT ALL ELSE IT MIGHT BREAK THE AUCTION CALL!', ozoneBidRequest.params.lotameData);
-        ret = {};
-      }
-    }
-    return ret;
-  },
   unpackVideoConfigIntoIABformat(videoConfig, childConfig) {
     let ret = {'ext': {}};
     ret = this._unpackVideoConfigIntoIABformat(ret, videoConfig);
@@ -853,7 +815,7 @@ export const spec = {
  * @returns seatbid object
  */
 export function injectAdIdsIntoAllBidResponses(seatbid) {
-  utils.logInfo('OZONE: injectAdIdsIntoAllBidResponses', seatbid);
+  spec.logInfo('injectAdIdsIntoAllBidResponses', seatbid);
   for (let i = 0; i < seatbid.length; i++) {
     let sb = seatbid[i];
     for (let j = 0; j < sb.bid.length; j++) {
@@ -879,7 +841,7 @@ export function checkDeepArray(Arr) {
 
 export function defaultSize(thebidObj) {
   if (!thebidObj) {
-    utils.logInfo('OZONE: defaultSize received empty bid obj! going to return fixed default size');
+    spec.logInfo('defaultSize received empty bid obj! going to return fixed default size');
     return {
       'defaultHeight': 250,
       'defaultWidth': 300
@@ -932,7 +894,7 @@ export function ozoneGetAllBidsForBidId(matchBidId, serverResponseSeatBid) {
     for (let k = 0; k < theseBids.length; k++) {
       if (theseBids[k].impid === matchBidId) {
         if (objBids.hasOwnProperty(thisSeat)) { // > 1 bid for an adunit from a bidder - only use the one with the highest bid
-        //   objBids[`${thisSeat}${theseBids[k].w}x${theseBids[k].h}`] = theseBids[k];
+          //   objBids[`${thisSeat}${theseBids[k].w}x${theseBids[k].h}`] = theseBids[k];
           if (objBids[thisSeat]['price'] < theseBids[k].price) {
             objBids[thisSeat] = theseBids[k];
           }
@@ -957,14 +919,14 @@ export function getRoundedBid(price, mediaType) {
   let theConfigObject = getGranularityObject(mediaType, mediaTypeGranularity, strBuckets, objBuckets);
   let theConfigKey = getGranularityKeyName(mediaType, mediaTypeGranularity, strBuckets);
 
-  utils.logInfo('OZONE: getRoundedBid. price:', price, 'mediaType:', mediaType, 'configkey:', theConfigKey, 'configObject:', theConfigObject, 'mediaTypeGranularity:', mediaTypeGranularity, 'strBuckets:', strBuckets);
+  spec.logInfo('getRoundedBid. price:', price, 'mediaType:', mediaType, 'configkey:', theConfigKey, 'configObject:', theConfigObject, 'mediaTypeGranularity:', mediaTypeGranularity, 'strBuckets:', strBuckets);
 
   let priceStringsObj = getPriceBucketString(
     price,
     theConfigObject,
     config.getConfig('currency.granularityMultiplier')
   );
-  utils.logInfo('OZONE: priceStringsObj', priceStringsObj);
+  spec.logInfo('priceStringsObj', priceStringsObj);
   // by default, without any custom granularity set, you get granularity name : 'medium'
   let granularityNamePriceStringsKeyMapping = {
     'medium': 'med',
@@ -975,7 +937,7 @@ export function getRoundedBid(price, mediaType) {
   };
   if (granularityNamePriceStringsKeyMapping.hasOwnProperty(theConfigKey)) {
     let priceStringsKey = granularityNamePriceStringsKeyMapping[theConfigKey];
-    utils.logInfo('OZONE: getRoundedBid: looking for priceStringsKey:', priceStringsKey);
+    spec.logInfo('getRoundedBid: looking for priceStringsKey:', priceStringsKey);
     return priceStringsObj[priceStringsKey];
   }
   return priceStringsObj['auto'];
@@ -1044,15 +1006,15 @@ export function getWidthAndHeightFromVideoObject(objVideo) {
     return null;
   }
   if (playerSize[0] && typeof playerSize[0] === 'object') {
-    utils.logInfo('OZONE: getWidthAndHeightFromVideoObject found nested array inside playerSize.', playerSize[0]);
+    spec.logInfo('getWidthAndHeightFromVideoObject found nested array inside playerSize.', playerSize[0]);
     playerSize = playerSize[0];
     if (typeof playerSize[0] !== 'number' && typeof playerSize[0] !== 'string') {
-      utils.logInfo('OZONE: getWidthAndHeightFromVideoObject found non-number/string type inside the INNER array in playerSize. This is totally wrong - cannot continue.', playerSize[0]);
+      spec.logInfo('getWidthAndHeightFromVideoObject found non-number/string type inside the INNER array in playerSize. This is totally wrong - cannot continue.', playerSize[0]);
       return null;
     }
   }
   if (playerSize.length !== 2) {
-    utils.logInfo('OZONE: getWidthAndHeightFromVideoObject found playerSize with length of ' + playerSize.length + '. This is totally wrong - cannot continue.');
+    spec.logInfo('getWidthAndHeightFromVideoObject found playerSize with length of ' + playerSize.length + '. This is totally wrong - cannot continue.');
     return null;
   }
   return ({'w': playerSize[0], 'h': playerSize[1]});
@@ -1079,17 +1041,17 @@ export function playerSizeIsNestedArray(objVideo) {
  * @returns {*}
  */
 function getPlayerSizeFromObject(objVideo) {
-  utils.logInfo('OZONE: getPlayerSizeFromObject received object', objVideo);
+  spec.logInfo('getPlayerSizeFromObject received object', objVideo);
   let playerSize = utils.deepAccess(objVideo, 'playerSize');
   if (!playerSize) {
     playerSize = utils.deepAccess(objVideo, 'ext.playerSize');
   }
   if (!playerSize) {
-    utils.logError('OZONE: getPlayerSizeFromObject FAILED: no playerSize in video object or ext', objVideo);
+    spec.logError('getPlayerSizeFromObject FAILED: no playerSize in video object or ext', objVideo);
     return null;
   }
   if (typeof playerSize !== 'object') {
-    utils.logError('OZONE: getPlayerSizeFromObject FAILED: playerSize is not an object/array', objVideo);
+    spec.logError('getPlayerSizeFromObject FAILED: playerSize is not an object/array', objVideo);
     return null;
   }
   return playerSize;
@@ -1099,21 +1061,23 @@ function getPlayerSizeFromObject(objVideo) {
   The renderer function will not assume that the renderer script is loaded - it will push() the ultimate render function call
  */
 function newRenderer(adUnitCode, rendererOptions = {}) {
+  let isLoaded = window.ozoneVideo;
+  spec.logInfo(`newRenderer going to set loaded to ${isLoaded ? 'true' : 'false'}`);
   const renderer = Renderer.install({
-    url: OZONE_RENDERER_URL,
+    url: spec.getRendererUrl(),
     config: rendererOptions,
-    loaded: false,
+    loaded: isLoaded,
     adUnitCode
   });
   try {
     renderer.setRender(outstreamRender);
   } catch (err) {
-    utils.logWarn('OZONE Prebid Error calling setRender on renderer', err);
+    spec.logError('Prebid Error when calling setRender on renderer', JSON.parse(JSON.stringify(renderer)), err);
   }
   return renderer;
 }
 function outstreamRender(bid) {
-  utils.logInfo('OZONE: outstreamRender called. Going to push the call to window.ozoneVideo.outstreamRender(bid) bid =', bid);
+  spec.logInfo('outstreamRender called. Going to push the call to window.ozoneVideo.outstreamRender(bid) bid =', JSON.parse(JSON.stringify(bid)));
   // push to render queue because ozoneVideo may not be loaded yet
   bid.renderer.push(() => {
     window.ozoneVideo.outstreamRender(bid);
@@ -1121,4 +1085,4 @@ function outstreamRender(bid) {
 }
 
 registerBidder(spec);
-utils.logInfo('OZONE: ozoneBidAdapter was loaded');
+utils.logInfo(`*BidAdapter ${OZONEVERSION} was loaded`);
diff --git a/modules/ozoneBidAdapter.md b/modules/ozoneBidAdapter.md
index bc8cb6a6102..ca18c962219 100644
--- a/modules/ozoneBidAdapter.md
+++ b/modules/ozoneBidAdapter.md
@@ -37,7 +37,6 @@ adUnits = [{
                             siteId: '4204204201', /* An ID used to identify a site within a publisher account - required */
                             placementId: '0420420421', /* an ID used to identify the piece of inventory - required - for appnexus test use 13144370. */
 							customData: [{"settings": {}, "targeting": {"key": "value", "key2": ["value1", "value2"]}}],/* optional array with 'targeting' placeholder for passing publisher specific key-values for targeting. */                            
-                            lotameData: {"Profile": {"tpid":"value","pid":"value","Audiences": {"Audience":[{"id":"value"},{"id":"value2"}]}}}, /* optional JSON placeholder for passing Lotame DMP data */
                         }
                     }]
                 }];
@@ -52,7 +51,7 @@ adUnits = [{
                     code: 'id-of-your-video-div',
                     mediaTypes: {
                         video: {
-                            playerSize: [640, 480],
+                            playerSize: [640, 360],
                             mimes: ['video/mp4'],
                             context: 'outstream',
                         }
@@ -64,7 +63,6 @@ adUnits = [{
                             siteId: '4204204201', /* An ID used to identify a site within a publisher account - required */
 							customData: [{"settings": {}, "targeting": { "key": "value", "key2": ["value1", "value2"]}}]
                             placementId: '0440440442', /* an ID used to identify the piece of inventory - required - for unruly test use 0440440442. */
-                            lotameData: {"Profile": {"tpid":"value","pid":"value","Audiences": {"Audience":[{"id":"value"},{"id":"value2"}]}}}, /* optional JSON placeholder for passing Lotame DMP data */
 							video: {
                                 skippable: true, /* optional */
                                 playback_method: ['auto_play_sound_off'], /* optional */
diff --git a/test/spec/modules/ozoneBidAdapter_spec.js b/test/spec/modules/ozoneBidAdapter_spec.js
index c1022608b4a..10b8ce31d28 100644
--- a/test/spec/modules/ozoneBidAdapter_spec.js
+++ b/test/spec/modules/ozoneBidAdapter_spec.js
@@ -6,12 +6,13 @@ import {getGranularityKeyName, getGranularityObject} from '../../../modules/ozon
 import * as utils from '../../../src/utils.js';
 const OZONEURI = 'https://elb.the-ozone-project.com/openrtb2/auction';
 const BIDDER_CODE = 'ozone';
+
 /*
 
 NOTE - use firefox console to deep copy the objects to use here
 
  */
-var originalPropertyBag = {'lotameWasOverridden': 0, 'pageId': null};
+var originalPropertyBag = {'pageId': null};
 var validBidRequests = [
   {
     adUnitCode: 'div-gpt-ad-1460505748561-0',
@@ -21,7 +22,7 @@ var validBidRequests = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     sizes: [[300, 250], [300, 600]],
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
@@ -36,7 +37,7 @@ var validBidRequestsMulti = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     sizes: [[300, 250], [300, 600]],
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   },
@@ -49,11 +50,14 @@ var validBidRequestsMulti = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c0',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     sizes: [[300, 250], [300, 600]],
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
 ];
+// use 'pubcid', 'tdid', 'id5id', 'parrableId', 'idl_env', 'criteoId', 'criteortus'
+// NOTE THAT criteortus is no longer referenced anywhere - should be removed asap
+// see http://prebid.org/dev-docs/modules/userId.html
 var validBidRequestsWithUserIdData = [
   {
     adUnitCode: 'div-gpt-ad-1460505748561-0',
@@ -63,10 +67,83 @@ var validBidRequestsWithUserIdData = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     sizes: [[300, 250], [300, 600]],
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87',
-    userId: {'pubcid': '12345678', 'id5id': { 'uid': 'ID5-someId' }, 'criteortus': {'ozone': {'userid': 'critId123'}}, 'idl_env': 'liverampId', 'lipb': {'lipbid': 'lipbidId123'}, 'parrableId': {eid: 'parrableid123'}}
+    userId: {
+      'pubcid': '12345678',
+      'tdid': '1111tdid',
+      'id5id': 'ID5-someId',
+      'criteortus': {'ozone': {'userid': 'critId123'}},
+      'criteoId': '1111criteoId',
+      'idl_env': 'liverampId',
+      'lipb': {'lipbid': 'lipbidId123'},
+      'parrableId': {'eid': '01.5678.parrableid'}
+    },
+    userIdAsEids: [
+      {
+        'source': 'pubcid.org',
+        'uids': [
+          {
+            'id': '12345678',
+            'atype': 1
+          }
+        ]
+      },
+      {
+        'source': 'adserver.org',
+        'uids': [{
+          'id': '1111tdid',
+          'atype': 1,
+          'ext': {
+            'rtiPartner': 'TDID'
+          }
+        }]
+      },
+      {
+        'source': 'id5-sync.com',
+        'uids': [{
+          'id': 'ID5-someId',
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'criteortus',
+        'uids': [{
+          'id': {'ozone': {'userid': 'critId123'}},
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'criteoId',
+        'uids': [{
+          'id': '1111criteoId',
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'idl_env',
+        'uids': [{
+          'id': 'liverampId',
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'lipb',
+        'uids': [{
+          'id': {'lipbid': 'lipbidId123'},
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'parrableId',
+        'uids': [{
+          'id': {'eid': '01.5678.parrableid'},
+          'atype': 1,
+        }]
+      }
+    ]
+
   }
 ];
 var validBidRequestsMinimal = [
@@ -91,7 +168,7 @@ var validBidRequestsNoSizes = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
 ];
@@ -105,7 +182,7 @@ var validBidRequestsWithBannerMediaType = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     mediaTypes: {banner: {sizes: [[300, 250], [300, 600]]}},
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
@@ -119,7 +196,7 @@ var validBidRequestsWithNonBannerMediaTypesAndValidOutstreamVideo = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, video: {skippable: true, playback_method: ['auto_play_sound_off'], targetDiv: 'some-different-div-id-to-my-adunitcode'} } ] },
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, video: {skippable: true, playback_method: ['auto_play_sound_off'], targetDiv: 'some-different-div-id-to-my-adunitcode'} } ] },
     mediaTypes: {video: {mimes: ['video/mp4'], 'context': 'outstream', 'sizes': [640, 480], playerSize: [640, 480]}, native: {info: 'dummy data'}},
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
@@ -161,43 +238,21 @@ var validBidRequests1OutstreamVideo2020 = [
           }
         }
       ],
-      'lotameData': {
-        'Profile': {
-          'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-          'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-          'Audiences': {
-            'Audience': [
-              {
-                'id': '439847',
-                'abbr': 'all'
-              },
-              {
-                'id': '446197',
-                'abbr': 'Arts, Culture & Literature'
-              },
-              {
-                'id': '446198',
-                'abbr': 'Business'
-              }
-            ]
-          }
+      'userId': {
+        'pubcid': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56'
+      },
+      'userIdAsEids': [
+        {
+          'source': 'pubcid.org',
+          'uids': [
+            {
+              'id': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56',
+              'atype': 1
+            }
+          ]
         }
-      }
-    },
-    'userId': {
-      'pubcid': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56'
+      ]
     },
-    'userIdAsEids': [
-      {
-        'source': 'pubcid.org',
-        'uids': [
-          {
-            'id': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56',
-            'atype': 1
-          }
-        ]
-      }
-    ],
     'mediaTypes': {
       'video': {
         'playerSize': [
@@ -272,32 +327,10 @@ var validBidderRequest1OutstreamVideo2020 = {
                 'pt9': '|k0xw2vqzp33kklb3j5w4|||'
               }
             }
-          ],
-          'lotameData': {
-            'Profile': {
-              'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-              'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-              'Audiences': {
-                'Audience': [
-                  {
-                    'id': '439847',
-                    'abbr': 'all'
-                  },
-                  {
-                    'id': '446197',
-                    'abbr': 'Arts, Culture & Literature'
-                  },
-                  {
-                    'id': '446198',
-                    'abbr': 'Business'
-                  }
-                ]
-              }
-            }
-          }
+          ]
         },
         'userId': {
-          'id5id': { uid: 'ID5-ZHMOpSv9CkZNiNd1oR4zc62AzCgSS73fPjmQ6Od7OA' },
+          'id5id': 'ID5-ZHMOpSv9CkZNiNd1oR4zc62AzCgSS73fPjmQ6Od7OA',
           'pubcid': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56'
         },
         'userIdAsEids': [
@@ -370,7 +403,7 @@ var validBidderRequest = {
       bidder: 'ozone',
       bidderRequestId: '1c1586b27a1b5c8',
       crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-      params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { banner: { topframe: 1, w: 300, h: 250, format: [{ w: 300, h: 250 }, { w: 300, h: 600 }] }, id: '2899ec066a91ff8', secure: 1, tagid: 'undefined' } ] },
+      params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { banner: { topframe: 1, w: 300, h: 250, format: [{ w: 300, h: 250 }, { w: 300, h: 600 }] }, id: '2899ec066a91ff8', secure: 1, tagid: 'undefined' } ] },
       sizes: [[300, 250], [300, 600]],
       transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
     }],
@@ -399,7 +432,7 @@ var bidderRequestWithFullGdpr = {
       bidder: 'ozone',
       bidderRequestId: '1c1586b27a1b5c8',
       crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-      params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { banner: { topframe: 1, w: 300, h: 250, format: [{ w: 300, h: 250 }, { w: 300, h: 600 }] }, id: '2899ec066a91ff8', secure: 1, tagid: 'undefined' } ] },
+      params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { banner: { topframe: 1, w: 300, h: 250, format: [{ w: 300, h: 250 }, { w: 300, h: 600 }] }, id: '2899ec066a91ff8', secure: 1, tagid: 'undefined' } ] },
       sizes: [[300, 250], [300, 600]],
       transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
     }],
@@ -491,17 +524,6 @@ var bidderRequestWithPartialGdpr = {
       params: {
         publisherId: '9876abcd12-3',
         customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}],
-        lotameData: {
-          'Profile': {
-            'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4',
-            'Audiences': {
-              'Audience': [{'id': '99999', 'abbr': 'sports'}, {
-                'id': '88888',
-                'abbr': 'movie'
-              }, {'id': '77777', 'abbr': 'blogger'}]
-            }
-          }
-        },
         placementId: '1310000099',
         siteId: '1234567890',
         id: 'fea37168-78f1-4a23-a40e-88437a99377e',
@@ -982,29 +1004,7 @@ var multiRequest1 = [
             'pt9': '|k0xw2vqzp33kklb3j5w4|||'
           }
         }
-      ],
-      'lotameData': {
-        'Profile': {
-          'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-          'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-          'Audiences': {
-            'Audience': [
-              {
-                'id': '439847',
-                'abbr': 'all'
-              },
-              {
-                'id': '446197',
-                'abbr': 'Arts, Culture & Literature'
-              },
-              {
-                'id': '446198',
-                'abbr': 'Business'
-              }
-            ]
-          }
-        }
-      }
+      ]
     },
     'mediaTypes': {
       'banner': {
@@ -1069,29 +1069,7 @@ var multiRequest1 = [
             'pt9': '|k0xw2vqzp33kklb3j5w4|||'
           }
         }
-      ],
-      'lotameData': {
-        'Profile': {
-          'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-          'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-          'Audiences': {
-            'Audience': [
-              {
-                'id': '439847',
-                'abbr': 'all'
-              },
-              {
-                'id': '446197',
-                'abbr': 'Arts, Culture & Literature'
-              },
-              {
-                'id': '446198',
-                'abbr': 'Business'
-              }
-            ]
-          }
-        }
-      }
+      ]
     },
     'mediaTypes': {
       'banner': {
@@ -1165,29 +1143,7 @@ var multiBidderRequest1 = {
                 'pt9': '|k0xw2vqzp33kklb3j5w4|||'
               }
             }
-          ],
-          'lotameData': {
-            'Profile': {
-              'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-              'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-              'Audiences': {
-                'Audience': [
-                  {
-                    'id': '439847',
-                    'abbr': 'all'
-                  },
-                  {
-                    'id': '446197',
-                    'abbr': 'Arts, Culture & Literature'
-                  },
-                  {
-                    'id': '446198',
-                    'abbr': 'Business'
-                  }
-                ]
-              }
-            }
-          }
+          ]
         },
         'mediaTypes': {
           'banner': {
@@ -1252,29 +1208,7 @@ var multiBidderRequest1 = {
                 'pt9': '|k0xw2vqzp33kklb3j5w4|||'
               }
             }
-          ],
-          'lotameData': {
-            'Profile': {
-              'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-              'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-              'Audiences': {
-                'Audience': [
-                  {
-                    'id': '439847',
-                    'abbr': 'all'
-                  },
-                  {
-                    'id': '446197',
-                    'abbr': 'Arts, Culture & Literature'
-                  },
-                  {
-                    'id': '446198',
-                    'abbr': 'Business'
-                  }
-                ]
-              }
-            }
-          }
+          ]
         },
         'mediaTypes': {
           'banner': {
@@ -1588,8 +1522,7 @@ describe('ozone Adapter', function () {
         placementId: '1310000099',
         publisherId: '9876abcd12-3',
         siteId: '1234567890',
-        customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}],
-        lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}},
+        customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}]
       },
       siteId: 1234567890
     }
@@ -1883,26 +1816,11 @@ describe('ozone Adapter', function () {
     it('should not validate customParams - this is a renamed key', function () {
       expect(spec.isBidRequestValid(xBadCustomParams)).to.equal(false);
     });
-
-    var xBadLotame = {
-      bidder: BIDDER_CODE,
-      params: {
-        'placementId': '1234567890',
-        'publisherId': '9876abcd12-3',
-        'lotameData': 'this should be an object',
-        siteId: '1234567890'
-      }
-    };
-    it('should not validate lotameData being sent', function () {
-      expect(spec.isBidRequestValid(xBadLotame)).to.equal(false);
-    });
-
     var xBadVideoContext2 = {
       bidder: BIDDER_CODE,
       params: {
         'placementId': '1234567890',
         'publisherId': '9876abcd12-3',
-        'lotameData': {},
         siteId: '1234567890'
       },
       mediaTypes: {
@@ -1937,35 +1855,6 @@ describe('ozone Adapter', function () {
       instreamVid.mediaTypes.video.context = 'instream';
       expect(spec.isBidRequestValid(instreamVid)).to.equal(true);
     });
-    // validate lotame override parameters
-    it('should validate lotame override params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': 'tpid123'};
-      };
-      expect(spec.isBidRequestValid(validBidReq)).to.equal(true);
-    });
-    it('should validate missing lotame override params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123'};
-      };
-      expect(spec.isBidRequestValid(validBidReq)).to.equal(false);
-    });
-    it('should validate invalid lotame override params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': '123 "this ain\\t right!" eee'};
-      };
-      expect(spec.isBidRequestValid(validBidReq)).to.equal(false);
-    });
-    it('should validate no lotame override params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {};
-      };
-      expect(spec.isBidRequestValid(validBidReq)).to.equal(true);
-    });
   });
 
   describe('buildRequests', function () {
@@ -1989,19 +1878,27 @@ describe('ozone Adapter', function () {
       const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
       expect(request.data).to.be.a('string');
       var data = JSON.parse(request.data);
-      expect(data.ext.ozone.lotameData).to.be.an('object');
+      expect(data.imp[0].ext.ozone.customData).to.be.an('array');
+      expect(request).not.to.have.key('lotameData');
+      expect(request).not.to.have.key('customData');
+    });
+
+    it('adds all parameters inside the ext object only - lightning', function () {
+      let localBidReq = JSON.parse(JSON.stringify(validBidRequests));
+      const request = spec.buildRequests(localBidReq, validBidderRequest.bidderRequest);
+      expect(request.data).to.be.a('string');
+      var data = JSON.parse(request.data);
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
       expect(request).not.to.have.key('lotameData');
       expect(request).not.to.have.key('customData');
     });
 
     it('ignores ozoneData in & after version 2.1.1', function () {
-      let validBidRequestsWithOzoneData = validBidRequests;
+      let validBidRequestsWithOzoneData = JSON.parse(JSON.stringify(validBidRequests));
       validBidRequestsWithOzoneData[0].params.ozoneData = {'networkID': '3048', 'dfpSiteID': 'd.thesun', 'sectionID': 'homepage', 'path': '/', 'sec_id': 'null', 'sec': 'sec', 'topics': 'null', 'kw': 'null', 'aid': 'null', 'search': 'null', 'article_type': 'null', 'hide_ads': '', 'article_slug': 'null'};
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsWithOzoneData, validBidderRequest.bidderRequest);
       expect(request.data).to.be.a('string');
       var data = JSON.parse(request.data);
-      expect(data.ext.ozone.lotameData).to.be.an('object');
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
       expect(data.imp[0].ext.ozone.ozoneData).to.be.undefined;
       expect(request).not.to.have.key('lotameData');
@@ -2018,7 +1915,7 @@ describe('ozone Adapter', function () {
       expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
     });
 
-    it('handles no ozone, lotame or custom data', function () {
+    it('handles no ozone or custom data', function () {
       const request = spec.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
       expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
     });
@@ -2080,6 +1977,7 @@ describe('ozone Adapter', function () {
       expect(payload.regs.ext.gdpr).to.equal(1);
       expect(payload.user.ext.consent).to.equal(consentString);
     });
+
     it('should set regs.ext.gdpr flag to 0 when gdprApplies is false', function () {
       let consentString = 'BOcocyaOcocyaAfEYDENCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NphLgA==';
       let bidderRequest = validBidderRequest.bidderRequest;
@@ -2118,13 +2016,14 @@ describe('ozone Adapter', function () {
       bidRequests[0]['userId'] = {
         'criteortus': '1111',
         'digitrustid': {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
-        'id5id': {'uid': '2222'},
+        'id5id': '2222',
         'idl_env': '3333',
         'lipb': {'lipbid': '4444'},
-        'parrableId': {eid: 'eidVersion.encryptionKeyReference.encryptedValue'},
+        'parrableid': 'eidVersion.encryptionKeyReference.encryptedValue',
         'pubcid': '5555',
         'tdid': '6666'
       };
+      bidRequests[0]['userIdAsEids'] = validBidRequestsWithUserIdData[0]['userIdAsEids'];
       const request = spec.buildRequests(bidRequests, bidderRequest);
       const payload = JSON.parse(request.data);
       let firstBid = payload.imp[0].ext.ozone;
@@ -2138,62 +2037,121 @@ describe('ozone Adapter', function () {
       bidRequests[0]['userId'] = {
         'criteortus': '1111',
         'digitrustid': {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
-        'id5id': {'uid': '2222'},
+        'id5id': '2222',
         'idl_env': '3333',
         'lipb': {'lipbid': '4444'},
-        'parrableId': {eid: 'eidVersion.encryptionKeyReference.encryptedValue'},
+        'parrableid': 'eidVersion.encryptionKeyReference.encryptedValue',
         // 'pubcid': '5555', // remove pubcid from here to emulate the OLD module & cause the failover code to kick in
         'tdid': '6666'
       };
+      bidRequests[0]['userIdAsEids'] = validBidRequestsWithUserIdData[0]['userIdAsEids'];
       const request = spec.buildRequests(bidRequests, validBidderRequest.bidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.ext.ozone.pubcid).to.equal(bidRequests[0]['crumbs']['pubcid']);
       delete validBidRequests[0].userId; // tidy up now, else it will screw with other tests
     });
 
-    it('should add a user.ext.eids object to contain user ID data in the new location (Nov 2019)', function() {
+    it('should add a user.ext.eids object to contain user ID data in the new location (Nov 2019) Updated Aug 2020', function() {
       const request = spec.buildRequests(validBidRequestsWithUserIdData, validBidderRequest.bidderRequest);
+      /*
+      'pubcid': '12345678',
+      'tdid': '1111tdid',
+      'id5id': 'ID5-someId',
+      'criteortus': {'ozone': {'userid': 'critId123'}},
+      'criteoId': '1111criteoId',
+      'idl_env': 'liverampId',
+      'lipb': {'lipbid': 'lipbidId123'},
+      'parrableId': {'eid': '01.5678.parrableid'}
+       */
+
       const payload = JSON.parse(request.data);
       expect(payload.user).to.exist;
       expect(payload.user.ext).to.exist;
       expect(payload.user.ext.eids).to.exist;
-      expect(payload.user.ext.eids[0]['source']).to.equal('pubcid');
+      expect(payload.user.ext.eids[0]['source']).to.equal('pubcid.org');
       expect(payload.user.ext.eids[0]['uids'][0]['id']).to.equal('12345678');
-      expect(payload.user.ext.eids[1]['source']).to.equal('pubcommon');
-      expect(payload.user.ext.eids[1]['uids'][0]['id']).to.equal('12345678');
+      expect(payload.user.ext.eids[1]['source']).to.equal('adserver.org');
+      expect(payload.user.ext.eids[1]['uids'][0]['id']).to.equal('1111tdid');
       expect(payload.user.ext.eids[2]['source']).to.equal('id5-sync.com');
       expect(payload.user.ext.eids[2]['uids'][0]['id']).to.equal('ID5-someId');
-      expect(payload.user.ext.eids[3]['source']).to.equal('criteortus');
-      expect(payload.user.ext.eids[3]['uids'][0]['id']).to.equal('critId123');
-      expect(payload.user.ext.eids[4]['source']).to.equal('liveramp.com');
-      expect(payload.user.ext.eids[4]['uids'][0]['id']).to.equal('liverampId');
-      expect(payload.user.ext.eids[5]['source']).to.equal('liveintent.com');
-      expect(payload.user.ext.eids[5]['uids'][0]['id']).to.equal('lipbidId123');
-      expect(payload.user.ext.eids[6]['source']).to.equal('parrable.com');
-      expect(payload.user.ext.eids[6]['uids'][0]['id']).to.equal('parrableid123');
+      expect(payload.user.ext.eids[3]['source']).to.equal('criteortus'); // this is deprecated
+      expect(payload.user.ext.eids[3]['uids'][0]['id']['ozone']['userid']).to.equal('critId123');
+      expect(payload.user.ext.eids[4]['source']).to.equal('criteoId');
+      expect(payload.user.ext.eids[4]['uids'][0]['id']).to.equal('1111criteoId');
+      expect(payload.user.ext.eids[5]['source']).to.equal('idl_env');
+      expect(payload.user.ext.eids[5]['uids'][0]['id']).to.equal('liverampId');
+      expect(payload.user.ext.eids[6]['source']).to.equal('lipb');
+      expect(payload.user.ext.eids[6]['uids'][0]['id']['lipbid']).to.equal('lipbidId123');
+      expect(payload.user.ext.eids[7]['source']).to.equal('parrableId');
+      expect(payload.user.ext.eids[7]['uids'][0]['id']['eid']).to.equal('01.5678.parrableid');
+    });
+
+    it('replaces the auction url for a config override', function () {
+      spec.propertyBag.whitelabel = null;
+      let fakeOrigin = 'http://sometestendpoint';
+      config.setConfig({'ozone': {'endpointOverride': {'origin': fakeOrigin}}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      expect(request.url).to.equal(fakeOrigin + '/openrtb2/auction');
+      expect(request.method).to.equal('POST');
+      config.setConfig({'ozone': {'kvpPrefix': null, 'endpointOverride': null}});
+      spec.propertyBag.whitelabel = null;
     });
 
+    it('replaces the renderer url for a config override', function () {
+      spec.propertyBag.whitelabel = null;
+      let fakeUrl = 'http://renderer.com';
+      config.setConfig({'ozone': {'endpointOverride': {'rendererUrl': fakeUrl}}});
+      const request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest1OutstreamVideo2020.bidderRequest);
+      const result = spec.interpretResponse(getCleanValidVideoResponse(), validBidderRequest1OutstreamVideo2020);
+      const bid = result[0];
+      expect(bid.renderer).to.be.an.instanceOf(Renderer);
+      expect(bid.renderer.url).to.equal(fakeUrl);
+      config.setConfig({'ozone': {'kvpPrefix': null, 'endpointOverride': null}});
+      spec.propertyBag.whitelabel = null;
+    });
+
+    it('replaces the kvp prefix ', function () {
+      spec.propertyBag.whitelabel = null;
+      config.setConfig({'ozone': {'kvpPrefix': 'test'}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.ozone).to.haveOwnProperty('test_rw');
+      config.setConfig({'ozone': {'kvpPrefix': null}});
+      spec.propertyBag.whitelabel = null;
+    });
+
+    it('handles an alias ', function () {
+      spec.propertyBag.whitelabel = null;
+      config.setConfig({'lmc': {'kvpPrefix': 'test'}});
+      let br = JSON.parse(JSON.stringify(validBidRequests));
+      br[0]['bidder'] = 'lmc';
+      const request = spec.buildRequests(br, validBidderRequest.bidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.lmc).to.haveOwnProperty('test_rw');
+      config.setConfig({'lmc': {'kvpPrefix': null}}); // I cant remove the key so set the value to null
+      spec.propertyBag.whitelabel = null;
+    });
+    var specMock = utils.deepClone(spec);
     it('should use oztestmode GET value if set', function() {
       // mock the getGetParametersAsObject function to simulate GET parameters for oztestmode:
-      spec.getGetParametersAsObject = function() {
+      specMock.getGetParametersAsObject = function() {
         return {'oztestmode': 'mytestvalue_123'};
       };
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = specMock.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
       const data = JSON.parse(request.data);
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
       expect(data.imp[0].ext.ozone.customData[0].targeting.oztestmode).to.equal('mytestvalue_123');
     });
     it('should use oztestmode GET value if set, even if there is no customdata in config', function() {
       // mock the getGetParametersAsObject function to simulate GET parameters for oztestmode:
-      spec.getGetParametersAsObject = function() {
+      specMock.getGetParametersAsObject = function() {
         return {'oztestmode': 'mytestvalue_123'};
       };
-      const request = spec.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
+      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
       const data = JSON.parse(request.data);
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
       expect(data.imp[0].ext.ozone.customData[0].targeting.oztestmode).to.equal('mytestvalue_123');
     });
-    var specMock = utils.deepClone(spec);
     it('should use a valid ozstoredrequest GET value if set to override the placementId values, and set oz_rw if we find it', function() {
       // mock the getGetParametersAsObject function to simulate GET parameters for ozstoredrequest:
       specMock.getGetParametersAsObject = function() {
@@ -2215,54 +2173,6 @@ describe('ozone Adapter', function () {
       expect(data.imp[0].ext.prebid.storedrequest.id).to.equal('1310000099');
     });
 
-    it('should pick up the value of valid lotame override parameters when there is a lotame object', function () {
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': '123eee'};
-      };
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
-      const payload = JSON.parse(request.data);
-      expect(payload.ext.ozone.lotameData.Profile.Audiences.Audience[0].id).to.equal('123abc');
-      expect(payload.ext.ozone.oz_lot_rw).to.equal(1);
-    });
-    it('should pick up the value of valid lotame override parameters when there is an empty lotame object', function () {
-      let nolotameBidReq = JSON.parse(JSON.stringify(validBidRequests));
-      nolotameBidReq[0].params.lotameData = {};
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': '123eeetpid'};
-      };
-      const request = spec.buildRequests(nolotameBidReq, validBidderRequest.bidderRequest);
-      const payload = JSON.parse(request.data);
-      expect(payload.ext.ozone.lotameData.Profile.Audiences.Audience[0].id).to.equal('123abc');
-      expect(payload.ext.ozone.lotameData.Profile.tpid).to.equal('123eeetpid');
-      expect(payload.ext.ozone.lotameData.Profile.pid).to.equal('pid123');
-      expect(payload.ext.ozone.oz_lot_rw).to.equal(1);
-    });
-    it('should pick up the value of valid lotame override parameters when there is NO "lotame" key at all', function () {
-      let nolotameBidReq = JSON.parse(JSON.stringify(validBidRequests));
-      delete (nolotameBidReq[0].params['lotameData']);
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': '123eeetpid'};
-      };
-      const request = spec.buildRequests(nolotameBidReq, validBidderRequest.bidderRequest);
-      const payload = JSON.parse(request.data);
-      expect(payload.ext.ozone.lotameData.Profile.Audiences.Audience[0].id).to.equal('123abc');
-      expect(payload.ext.ozone.lotameData.Profile.tpid).to.equal('123eeetpid');
-      expect(payload.ext.ozone.lotameData.Profile.pid).to.equal('pid123');
-      expect(payload.ext.ozone.oz_lot_rw).to.equal(1);
-      spec.propertyBag = originalPropertyBag; // tidy up
-    });
-    // NOTE - only one negative test case;
-    // you can't send invalid lotame params to buildRequests because 'validate' will have rejected them
-    it('should not use lotame override parameters if they dont exist', function () {
-      expect(spec.propertyBag.lotameWasOverridden).to.equal(0);
-      spec.getGetParametersAsObject = function() {
-        return {}; //  no lotame override params
-      };
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
-      const payload = JSON.parse(request.data);
-      expect(payload.ext.ozone.oz_lot_rw).to.equal(0);
-    });
-
     it('should pick up the config value of coppa & set it in the request', function () {
       config.setConfig({'coppa': true});
       const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest.bidderRequest);
@@ -2609,6 +2519,14 @@ describe('ozone Adapter', function () {
       const result = playerSizeIsNestedArray(obj);
       expect(result).to.be.null;
     });
+    it('should add oz_appnexus_dealid into ads request if dealid exists in the auction response', function () {
+      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest.bidderRequest);
+      let validres = JSON.parse(JSON.stringify(validResponse2Bids));
+      validres.body.seatbid[0].bid[0].dealid = '1234';
+      const result = spec.interpretResponse(validres, request);
+      expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_dealid')).to.equal('1234');
+      expect(utils.deepAccess(result[1].adserverTargeting, 'oz_appnexus_dealid', '')).to.equal('');
+    });
   });
 
   describe('default size', function () {
@@ -2660,44 +2578,6 @@ describe('ozone Adapter', function () {
       config.resetConfig();
     });
   });
-  describe('makeLotameObjectFromOverride', function() {
-    it('should update an object with valid lotame data', function () {
-      let objLotameOverride = {'oz_lotametpid': '1234', 'oz_lotameid': '12345', 'oz_lotamepid': '123456'};
-      let result = spec.makeLotameObjectFromOverride(
-        objLotameOverride,
-        {'Profile': {'pid': 'originalpid', 'tpid': 'originaltpid', 'Audiences': {'Audience': [{'id': 'aud1'}]}}}
-      );
-      expect(result.Profile.Audiences.Audience).to.be.an('array');
-      expect(result.Profile.Audiences.Audience[0]).to.be.an('object');
-      expect(result.Profile.Audiences.Audience[0]).to.deep.include({'id': '12345', 'abbr': '12345'});
-    });
-    it('should return the original object if it seems weird', function () {
-      let objLotameOverride = {'oz_lotametpid': '1234', 'oz_lotameid': '12345', 'oz_lotamepid': '123456'};
-      let objLotameOriginal = {'Profile': {'pid': 'originalpid', 'tpid': 'originaltpid', 'somethingstrange': [{'id': 'aud1'}]}};
-      let result = spec.makeLotameObjectFromOverride(
-        objLotameOverride,
-        objLotameOriginal
-      );
-      expect(result).to.equal(objLotameOriginal);
-    });
-  });
-  describe('lotameDataIsValid', function() {
-    it('should allow a valid minimum lotame object', function() {
-      let obj = {'Profile': {'pid': '', 'tpid': '', 'Audiences': {'Audience': []}}};
-      let result = spec.isLotameDataValid(obj);
-      expect(result).to.be.true;
-    });
-    it('should allow a valid lotame object', function() {
-      let obj = {'Profile': {'pid': '12345', 'tpid': '45678', 'Audiences': {'Audience': [{'id': '1234', 'abbr': '567'}, {'id': '9999', 'abbr': '1111'}]}}};
-      let result = spec.isLotameDataValid(obj);
-      expect(result).to.be.true;
-    });
-    it('should disallow a lotame object without an Audience.id', function() {
-      let obj = {'Profile': {'tpid': '', 'pid': '', 'Audiences': {'Audience': [{'abbr': 'marktest'}]}}};
-      let result = spec.isLotameDataValid(obj);
-      expect(result).to.be.false;
-    });
-  });
   describe('getPageId', function() {
     it('should return the same Page ID for multiple calls', function () {
       let result = spec.getPageId();
@@ -2720,24 +2600,6 @@ describe('ozone Adapter', function () {
       expect(result).to.equal('outstream');
     });
   });
-  describe('getLotameOverrideParams', function() {
-    it('should get 3 valid lotame params that exist in GET params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': 'tpid123'};
-      };
-      let result = spec.getLotameOverrideParams();
-      expect(Object.keys(result).length).to.equal(3);
-    });
-    it('should get only 1 valid lotame param that exists in GET params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'xoz_lotamepid': 'pid123', 'xoz_lotametpid': 'tpid123'};
-      };
-      let result = spec.getLotameOverrideParams();
-      expect(Object.keys(result).length).to.equal(1);
-    });
-  });
   describe('unpackVideoConfigIntoIABformat', function() {
     it('should correctly unpack a usual video config', function () {
       let mediaTypes = {

From 29085b511661bd1bea2ae35b9ff665e84c6710a9 Mon Sep 17 00:00:00 2001
From: nllerandi3lift <75995508+nllerandi3lift@users.noreply.github.com>
Date: Wed, 24 Feb 2021 06:46:12 -0500
Subject: [PATCH 275/304] Triplelift Bid Adapter: add PubCommon ID support
 (#6352)

---
 modules/tripleliftBidAdapter.js               | 27 +++++++++++--------
 .../spec/modules/tripleliftBidAdapter_spec.js | 21 ++++++++++++---
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/modules/tripleliftBidAdapter.js b/modules/tripleliftBidAdapter.js
index 029cdd68331..b681b0980ea 100644
--- a/modules/tripleliftBidAdapter.js
+++ b/modules/tripleliftBidAdapter.js
@@ -129,9 +129,10 @@ function _buildPostBody(bidRequests) {
   });
 
   let eids = [
-    ...getUnifiedIdEids(bidRequests),
-    ...getIdentityLinkEids(bidRequests),
-    ...getCriteoEids(bidRequests)
+    ...getUnifiedIdEids([bidRequests[0]]),
+    ...getIdentityLinkEids([bidRequests[0]]),
+    ...getCriteoEids([bidRequests[0]]),
+    ...getPubCommonEids([bidRequests[0]])
   ];
 
   if (eids.length > 0) {
@@ -239,20 +240,24 @@ function _getExt(schain, fpd) {
   return ext;
 }
 
-function getUnifiedIdEids(bidRequests) {
-  return getEids(bidRequests, 'tdid', 'adserver.org', 'TDID');
+function getUnifiedIdEids(bidRequest) {
+  return getEids(bidRequest, 'tdid', 'adserver.org', 'TDID');
 }
 
-function getIdentityLinkEids(bidRequests) {
-  return getEids(bidRequests, 'idl_env', 'liveramp.com', 'idl');
+function getIdentityLinkEids(bidRequest) {
+  return getEids(bidRequest, 'idl_env', 'liveramp.com', 'idl');
 }
 
-function getCriteoEids(bidRequests) {
-  return getEids(bidRequests, 'criteoId', 'criteo.com', 'criteoId');
+function getCriteoEids(bidRequest) {
+  return getEids(bidRequest, 'criteoId', 'criteo.com', 'criteoId');
 }
 
-function getEids(bidRequests, type, source, rtiPartner) {
-  return bidRequests
+function getPubCommonEids(bidRequest) {
+  return getEids(bidRequest, 'pubcid', 'pubcid.org', 'pubcid');
+}
+
+function getEids(bidRequest, type, source, rtiPartner) {
+  return bidRequest
     .map(getUserId(type)) // bids -> userIds of a certain type
     .filter((x) => !!x) // filter out null userIds
     .map(formatEid(source, rtiPartner)); // userIds -> eid objects
diff --git a/test/spec/modules/tripleliftBidAdapter_spec.js b/test/spec/modules/tripleliftBidAdapter_spec.js
index c5d00f4db2b..eb410c2525d 100644
--- a/test/spec/modules/tripleliftBidAdapter_spec.js
+++ b/test/spec/modules/tripleliftBidAdapter_spec.js
@@ -506,15 +506,16 @@ describe('triplelift adapter', function () {
       });
     });
 
-    it('should add user ids from multiple bid requests', function () {
+    it('should consolidate user ids from multiple bid requests', function () {
       const tdidId = '6bca7f6b-a98a-46c0-be05-6020f7604598';
       const idlEnvId = 'XY6104gr0njcH9UDIR7ysFFJcm2XNpqeJTYslleJ_cMlsFOfZI';
       const criteoId = '53e30ea700424f7bbdd793b02abc5d7';
+      const pubcid = '3261d8ad-435d-481d-abd1-9f1a9ec99f0e';
 
       const bidRequestsMultiple = [
-        { ...bidRequests[0], userId: { tdid: tdidId } },
-        { ...bidRequests[0], userId: { idl_env: idlEnvId } },
-        { ...bidRequests[0], userId: { criteoId: criteoId } }
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } },
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } },
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } }
       ];
 
       const request = tripleliftAdapterSpec.buildRequests(bidRequestsMultiple, bidderRequest);
@@ -549,10 +550,22 @@ describe('triplelift adapter', function () {
                   ext: { rtiPartner: 'criteoId' }
                 }
               ]
+            },
+            {
+              source: 'pubcid.org',
+              uids: [
+                {
+                  id: '3261d8ad-435d-481d-abd1-9f1a9ec99f0e',
+                  ext: { rtiPartner: 'pubcid' }
+                }
+              ]
             }
           ]
         }
       });
+
+      expect(payload.user.ext.eids).to.be.an('array');
+      expect(payload.user.ext.eids).to.have.lengthOf(4);
     });
 
     it('should return a query string for TL call', function () {

From 8f920c5eec6299318fd7f31e1f7dd54b8dc160af Mon Sep 17 00:00:00 2001
From: Mike Chowla <mike.chowla@pubmatic.com>
Date: Wed, 24 Feb 2021 13:49:05 -0800
Subject: [PATCH 276/304] Prebid 4.28.0 Release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dc0a46844ca..27b5dff8888 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.28.0-pre",
+  "version": "4.28.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From ee3fa3e520bd62a91e408f065b720a56d2b85948 Mon Sep 17 00:00:00 2001
From: Mike Chowla <mike.chowla@pubmatic.com>
Date: Wed, 24 Feb 2021 14:10:51 -0800
Subject: [PATCH 277/304] Increment pre version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 27b5dff8888..e992a108c5c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.28.0",
+  "version": "4.29.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 89f73e0754a9c2a09edbc99964e0c228275049e9 Mon Sep 17 00:00:00 2001
From: KazuakiM <kazuaki_mabuchi_to_go@hotmail.co.jp>
Date: Thu, 25 Feb 2021 16:34:42 +0900
Subject: [PATCH 278/304] GMOSSP Bid Adapter :  add refererInfo from
 bidderRequest  (#6319)

---
 modules/gmosspBidAdapter.js                | 32 ++++++++++++++++++++--
 test/spec/modules/gmosspBidAdapter_spec.js | 24 ++++++++++++----
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/modules/gmosspBidAdapter.js b/modules/gmosspBidAdapter.js
index d9dc8f7641a..5eac4069b21 100644
--- a/modules/gmosspBidAdapter.js
+++ b/modules/gmosspBidAdapter.js
@@ -29,7 +29,7 @@ export const spec = {
   buildRequests: function (validBidRequests, bidderRequest) {
     const bidRequests = [];
 
-    const url = bidderRequest.refererInfo.referer;
+    const urlInfo = getUrlInfo(bidderRequest.refererInfo);
     const cur = getCurrencyType();
     const dnt = utils.getDNT() ? '1' : '0';
 
@@ -46,7 +46,8 @@ export const spec = {
       queryString = utils.tryAppendQueryString(queryString, 'bid', bid);
       queryString = utils.tryAppendQueryString(queryString, 'ver', ver);
       queryString = utils.tryAppendQueryString(queryString, 'sid', sid);
-      queryString = utils.tryAppendQueryString(queryString, 'url', url);
+      queryString = utils.tryAppendQueryString(queryString, 'url', urlInfo.url);
+      queryString = utils.tryAppendQueryString(queryString, 'ref', urlInfo.ref);
       queryString = utils.tryAppendQueryString(queryString, 'cur', cur);
       queryString = utils.tryAppendQueryString(queryString, 'dnt', dnt);
 
@@ -131,4 +132,31 @@ function getCurrencyType() {
   return 'JPY';
 }
 
+function getUrlInfo(refererInfo) {
+  return {
+    url: getUrl(refererInfo),
+    ref: getReferrer(),
+  };
+}
+
+function getUrl(refererInfo) {
+  if (refererInfo && refererInfo.referer) {
+    return refererInfo.referer;
+  }
+
+  try {
+    return window.top.location.href;
+  } catch (e) {
+    return window.location.href;
+  }
+}
+
+function getReferrer() {
+  try {
+    return window.top.document.referrer;
+  } catch (e) {
+    return document.referrer;
+  }
+}
+
 registerBidder(spec);
diff --git a/test/spec/modules/gmosspBidAdapter_spec.js b/test/spec/modules/gmosspBidAdapter_spec.js
index 5de3db623c5..52bb8460caa 100644
--- a/test/spec/modules/gmosspBidAdapter_spec.js
+++ b/test/spec/modules/gmosspBidAdapter_spec.js
@@ -54,18 +54,30 @@ describe('GmosspAdapter', function () {
       }
     ];
 
-    const bidderRequest = {
-      refererInfo: {
-        referer: 'https://hoge.com'
-      }
-    };
-
     it('sends bid request to ENDPOINT via GET', function () {
+      const bidderRequest = {
+        refererInfo: {
+          referer: 'https://hoge.com'
+        }
+      };
+
       const requests = spec.buildRequests(bidRequests, bidderRequest);
       expect(requests[0].url).to.equal(ENDPOINT);
       expect(requests[0].method).to.equal('GET');
       expect(requests[0].data).to.equal('tid=791e9d84-af92-4903-94da-24c7426d9d0c&bid=2b84475b5b636e&ver=$prebid.version$&sid=123456&url=https%3A%2F%2Fhoge.com&cur=JPY&dnt=0&');
     });
+
+    it('should use fallback if refererInfo.referer in bid request is empty', function () {
+      const bidderRequest = {
+        refererInfo: {
+          referer: ''
+        }
+      };
+
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      const result = 'tid=791e9d84-af92-4903-94da-24c7426d9d0c&bid=2b84475b5b636e&ver=$prebid.version$&sid=123456&url=' + encodeURIComponent(window.top.location.href) + '&cur=JPY&dnt=0&';
+      expect(requests[0].data).to.equal(result);
+    });
   });
 
   describe('interpretResponse', function () {

From c18f788b91af2f8aac194be45fa24782e4b2b2db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Fern=C3=A1ndez?= <cfalonso@gmail.com>
Date: Thu, 25 Feb 2021 09:28:44 +0100
Subject: [PATCH 279/304] Axonix Bid Adapter: add new bid adapter (#6341)

* Add Axonix bid adapter

* Fixed tests
---
 modules/axonixBidAdapter.js                | 178 ++++++++++
 modules/axonixBidAdapter.md                | 140 ++++++++
 test/spec/modules/axonixBidAdapter_spec.js | 372 +++++++++++++++++++++
 3 files changed, 690 insertions(+)
 create mode 100644 modules/axonixBidAdapter.js
 create mode 100644 modules/axonixBidAdapter.md
 create mode 100644 test/spec/modules/axonixBidAdapter_spec.js

diff --git a/modules/axonixBidAdapter.js b/modules/axonixBidAdapter.js
new file mode 100644
index 00000000000..161ea8c6715
--- /dev/null
+++ b/modules/axonixBidAdapter.js
@@ -0,0 +1,178 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+import * as utils from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+
+const BIDDER_CODE = 'axonix';
+const BIDDER_VERSION = '1.0.0';
+
+const CURRENCY = 'USD';
+const DEFAULT_REGION = 'us-east-1';
+
+function getBidFloor(bidRequest) {
+  let floorInfo = {};
+
+  if (typeof bidRequest.getFloor === 'function') {
+    floorInfo = bidRequest.getFloor({
+      currency: CURRENCY,
+      mediaType: '*',
+      size: '*'
+    });
+  }
+
+  return floorInfo.floor || 0;
+}
+
+function getPageUrl(bidRequest, bidderRequest) {
+  let pageUrl = config.getConfig('pageUrl');
+
+  if (bidRequest.params.referrer) {
+    pageUrl = bidRequest.params.referrer;
+  } else if (!pageUrl) {
+    pageUrl = bidderRequest.refererInfo.referer;
+  }
+
+  return bidRequest.params.secure ? pageUrl.replace(/^http:/i, 'https:') : pageUrl;
+}
+
+function isMobile() {
+  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent);
+}
+
+function isConnectedTV() {
+  return (/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(navigator.userAgent);
+}
+
+function getURL(params, path) {
+  let { supplyId, region, endpoint } = params;
+  let url;
+
+  if (endpoint) {
+    url = endpoint;
+  } else if (region) {
+    url = `https://openrtb-${region}.axonix.com/supply/${path}/${supplyId}`;
+  } else {
+    url = `https://openrtb-${DEFAULT_REGION}.axonix.com/supply/${path}/${supplyId}`
+  }
+
+  return url;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  version: BIDDER_VERSION,
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  isBidRequestValid: function(bid) {
+    // video bid request validation
+    if (bid.hasOwnProperty('mediaTypes') && bid.mediaTypes.hasOwnProperty(VIDEO)) {
+      if (!bid.mediaTypes[VIDEO].hasOwnProperty('mimes') ||
+        !utils.isArray(bid.mediaTypes[VIDEO].mimes) ||
+        bid.mediaTypes[VIDEO].mimes.length === 0) {
+        utils.logError('mimes are mandatory for video bid request. Ad Unit: ', JSON.stringify(bid));
+
+        return false;
+      }
+    }
+
+    return !!(bid.params && bid.params.supplyId);
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    // device.connectiontype
+    let connection = navigator.connection || navigator.webkitConnection;
+    let connectiontype = 'unknown';
+
+    if (connection && connection.effectiveType) {
+      connectiontype = connection.effectiveType;
+    }
+
+    const requests = validBidRequests.map(validBidRequest => {
+      // app/site
+      let app;
+      let site;
+
+      if (typeof config.getConfig('app') === 'object') {
+        app = config.getConfig('app');
+      } else {
+        site = {
+          page: getPageUrl(validBidRequest, bidderRequest)
+        }
+      }
+
+      const data = {
+        app,
+        site,
+        validBidRequest,
+        connectiontype,
+        devicetype: isMobile() ? 1 : isConnectedTV() ? 3 : 2,
+        bidfloor: getBidFloor(validBidRequest),
+        dnt: (navigator.doNotTrack === 'yes' || navigator.doNotTrack === '1' || navigator.msDoNotTrack === '1') ? 1 : 0,
+        language: navigator.language,
+        prebidVersion: '$prebid.version$',
+        screenHeight: screen.height,
+        screenWidth: screen.width,
+        tmax: config.getConfig('bidderTimeout'),
+        ua: navigator.userAgent,
+      };
+
+      return {
+        method: 'POST',
+        url: getURL(validBidRequest.params, 'prebid'),
+        options: {
+          withCredentials: false,
+          contentType: 'application/json'
+        },
+        data
+      };
+    });
+
+    return requests;
+  },
+
+  interpretResponse: function(serverResponse) {
+    if (!utils.isArray(serverResponse)) {
+      return [];
+    }
+
+    const responses = [];
+
+    for (const response of serverResponse) {
+      if (response.requestId) {
+        responses.push(Object.assign(response, {
+          ttl: config.getConfig('_bidderTimeout')
+        }));
+      }
+    }
+
+    return responses;
+  },
+
+  onTimeout: function(timeoutData) {
+    const params = utils.deepAccess(timeoutData, '0.params.0');
+
+    if (!utils.isEmpty(params)) {
+      ajax(getURL(params, 'prebid/timeout'), null, timeoutData[0], {
+        method: 'POST',
+        options: {
+          withCredentials: false,
+          contentType: 'application/json'
+        }
+      });
+    }
+  },
+
+  onBidWon: function(bids) {
+    for (const bid of bids) {
+      const { nurl } = bid || {};
+
+      if (bid.nurl) {
+        utils.replaceAuctionPrice(nurl, bid.cpm)
+        utils.triggerPixel(nurl);
+      };
+    }
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/axonixBidAdapter.md b/modules/axonixBidAdapter.md
new file mode 100644
index 00000000000..1ff59f17828
--- /dev/null
+++ b/modules/axonixBidAdapter.md
@@ -0,0 +1,140 @@
+# Overview
+
+```
+Module Name : Axonix Bidder Adapter
+Module Type : Bidder Adapter
+Maintainer  : support-prebid@axonix.com
+```
+
+# Description
+
+Module that connects to Axonix's exchange for bids.
+
+# Parameters
+
+| Name          | Scope    | Description                                     | Example                                |
+| :------------ | :------- | :---------------------------------------------- | :------------------------------------- |
+| `supplyId`    | required | Supply UUID                                     | `"2c426f78-bb18-4a16-abf4-62c6cd0ee8de"` |
+| `region`      | optional | Cloud region                                    | `"us-east-1"`                            |
+| `endpoint`    | optional | Supply custom endpoint                          | `"https://open-rtb.axonix.com/custom"`   |
+| `instl`       | optional | Set to 1 if using interstitial (default: 0)     | `1`   |
+
+# Test Parameters
+
+## Banner
+
+```javascript
+var bannerAdUnit = {
+  code: 'test-banner',
+  mediaTypes: {
+    banner: {
+      sizes: [[120, 600], [300, 250], [320, 50], [468, 60], [728, 90]]
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+};
+```
+
+## Video
+
+```javascript
+var videoAdUnit = {
+  code: 'test-video',
+  mediaTypes: {
+    video: {
+      protocols: [1, 2, 3, 4, 5, 6, 7, 8]
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+};
+```
+
+## Native
+
+```javascript
+var nativeAdUnit = {
+  code: 'test-native',
+  mediaTypes: {
+    native: {
+
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+};
+```
+
+## Multiformat
+
+```javascript
+var adUnits = [
+{
+  code: 'test-banner',
+  mediaTypes: {
+    banner: {
+      sizes: [[120, 600], [300, 250], [320, 50], [468, 60], [728, 90]]
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+},
+{
+  code: 'test-video',
+  mediaTypes: {
+    video: {
+      protocols: [1, 2, 3, 4, 5, 6, 7, 8]
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+},
+{
+  code: 'test-native',
+  mediaTypes: {
+    native: {
+
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+}
+];
+```
diff --git a/test/spec/modules/axonixBidAdapter_spec.js b/test/spec/modules/axonixBidAdapter_spec.js
new file mode 100644
index 00000000000..632e080f83d
--- /dev/null
+++ b/test/spec/modules/axonixBidAdapter_spec.js
@@ -0,0 +1,372 @@
+import { expect } from 'chai';
+import { spec } from 'modules/axonixBidAdapter';
+import { newBidder } from 'src/adapters/bidderFactory';
+import * as utils from 'src/utils';
+
+describe('AxonixBidAdapter', function () {
+  const adapter = newBidder(spec);
+
+  const SUPPLY_ID_1 = '91fd110a-5685-11eb-8db6-a7e0eeefbbc7';
+  const SUPPLY_ID_2 = '22de2092-568b-11eb-bae3-cfa975dc72aa';
+  const REGION_1 = 'us-east-1';
+  const REGION_2 = 'eu-west-1';
+
+  const BANNER_REQUEST = {
+    adUnitCode: 'ad_code',
+    bidId: 'abcd1234',
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250],
+          [300, 200]
+        ]
+      }
+    },
+    bidder: 'axonix',
+    params: {
+      supplyId: SUPPLY_ID_1,
+      region: REGION_1
+    },
+    requestId: 'q4owht8ofqi3ulwsd',
+    transactionId: 'fvpq3oireansdwo'
+  };
+
+  const VIDEO_REQUEST = {
+    adUnitCode: 'ad_code',
+    bidId: 'abcd1234',
+    mediaTypes: {
+      video: {
+        context: 'outstream',
+        mimes: ['video/mp4'],
+        playerSize: [400, 300],
+        renderer: {
+          url: 'https://url.com',
+          backupOnly: true,
+          render: () => true
+        },
+      }
+    },
+    bidder: 'axonix',
+    params: {
+      supplyId: SUPPLY_ID_1,
+      region: REGION_1
+    },
+    requestId: 'q4owht8ofqi3ulwsd',
+    transactionId: 'fvpq3oireansdwo'
+  };
+
+  const BIDDER_REQUEST = {
+    bidderCode: 'axonix',
+    auctionId: '18fd8b8b0bd757',
+    bidderRequestId: '418b37f85e772c',
+    timeout: 3000,
+    gdprConsent: {
+      consentString: 'BOKAVy4OKAVy4ABAB8AAAAAZ+A==',
+      gdprApplies: true
+    },
+    refererInfo: {
+      referer: 'https://www.prebid.org',
+      canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
+    }
+  };
+
+  const BANNER_RESPONSE = {
+    requestId: 'f08b3a8dcff747eabada295dcf94eee0',
+    cpm: 6,
+    currency: 'USD',
+    width: 300,
+    height: 250,
+    ad: '<html></html>',
+    creativeId: 'abc',
+    netRevenue: false,
+    meta: {
+      networkId: 'nid',
+      advertiserDomains: [
+        'https://the.url'
+      ],
+      secondaryCatIds: [
+        'IAB1'
+      ],
+      mediaType: 'banner'
+    },
+    nurl: 'https://win.url'
+  };
+
+  const VIDEO_RESPONSE = {
+    requestId: 'f08b3a8dcff747eabada295dcf94eee0',
+    cpm: 6,
+    currency: 'USD',
+    width: 300,
+    height: 250,
+    ad: '<?xml version="1.0" encoding="UTF-8" ?><VAST version="3.0"></VAST>',
+    creativeId: 'abc',
+    netRevenue: false,
+    meta: {
+      networkId: 'nid',
+      advertiserDomains: [
+        'https://the.url'
+      ],
+      secondaryCatIds: [
+        'IAB1'
+      ],
+      mediaType: 'video'
+    },
+    nurl: 'https://win.url'
+  };
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    let validBids = [
+      {
+        bidder: 'axonix',
+        params: {
+          supplyId: SUPPLY_ID_1,
+          region: REGION_1
+        },
+      },
+      {
+        bidder: 'axonix',
+        params: {
+          supplyId: SUPPLY_ID_2,
+          region: REGION_2
+        },
+        future_parameter: {
+          future: 'ididid'
+        }
+      },
+    ];
+
+    let invalidBids = [
+      {
+        bidder: 'axonix',
+        params: {},
+      },
+      {
+        bidder: 'axonix',
+      },
+    ];
+
+    it('should accept valid bids', function () {
+      for (let bid of validBids) {
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      }
+    });
+
+    it('should reject invalid bids', function () {
+      for (let bid of invalidBids) {
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      }
+    });
+  });
+
+  describe('buildRequests: can handle banner ad requests', function () {
+    it('creates ServerRequests with the correct data', function () {
+      const [request] = spec.buildRequests([BANNER_REQUEST], BIDDER_REQUEST);
+
+      expect(request).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+      expect(request).to.have.property('method', 'POST');
+      expect(request).to.have.property('data');
+
+      const { data } = request;
+      expect(data.app).to.be.undefined;
+
+      expect(data).to.have.property('site');
+      expect(data.site).to.have.property('page', 'https://www.prebid.org');
+
+      expect(data).to.have.property('validBidRequest', BANNER_REQUEST);
+      expect(data).to.have.property('connectiontype').to.exist;
+      expect(data).to.have.property('devicetype', 2);
+      expect(data).to.have.property('bidfloor', 0);
+      expect(data).to.have.property('dnt', 0);
+      expect(data).to.have.property('language').to.be.a('string');
+      expect(data).to.have.property('prebidVersion').to.be.a('string');
+      expect(data).to.have.property('screenHeight').to.be.a('number');
+      expect(data).to.have.property('screenWidth').to.be.a('number');
+      expect(data).to.have.property('tmax').to.be.a('number');
+      expect(data).to.have.property('ua').to.be.a('string');
+    });
+
+    it('creates ServerRequests pointing to the correct region and endpoint if it changes', function () {
+      const bannerRequests = [utils.deepClone(BANNER_REQUEST), utils.deepClone(BANNER_REQUEST)];
+      bannerRequests[0].params.endpoint = 'https://the.url';
+      bannerRequests[1].params.endpoint = 'https://the.other.url';
+
+      const requests = spec.buildRequests(bannerRequests, BIDDER_REQUEST);
+
+      requests.forEach((request, index) => {
+        expect(request).to.have.property('url', bannerRequests[index].params.endpoint);
+      });
+    });
+
+    it('creates ServerRequests pointing to default endpoint if missing', function () {
+      const bannerRequests = [utils.deepClone(BANNER_REQUEST), utils.deepClone(BANNER_REQUEST)];
+      bannerRequests[1].params.supplyId = SUPPLY_ID_2;
+      bannerRequests[1].params.region = REGION_2;
+
+      const requests = spec.buildRequests(bannerRequests, BIDDER_REQUEST);
+      expect(requests[0]).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+      expect(requests[1]).to.have.property('url', `https://openrtb-${REGION_2}.axonix.com/supply/prebid/${SUPPLY_ID_2}`);
+    });
+
+    it('creates ServerRequests pointing to default region if missing', function () {
+      const bannerRequest = utils.deepClone(BANNER_REQUEST);
+      delete bannerRequest.params.region;
+
+      const requests = spec.buildRequests([bannerRequest], BIDDER_REQUEST);
+      expect(requests[0]).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+    });
+  });
+
+  describe('buildRequests: can handle video ad requests', function () {
+    it('creates ServerRequests with the correct data', function () {
+      const [request] = spec.buildRequests([VIDEO_REQUEST], BIDDER_REQUEST);
+
+      expect(request).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+      expect(request).to.have.property('method', 'POST');
+      expect(request).to.have.property('data');
+
+      const { data } = request;
+      expect(data.app).to.be.undefined;
+
+      expect(data).to.have.property('site');
+      expect(data.site).to.have.property('page', 'https://www.prebid.org');
+
+      expect(data).to.have.property('validBidRequest', VIDEO_REQUEST);
+      expect(data).to.have.property('connectiontype').to.exist;
+      expect(data).to.have.property('devicetype', 2);
+      expect(data).to.have.property('bidfloor', 0);
+      expect(data).to.have.property('dnt', 0);
+      expect(data).to.have.property('language').to.be.a('string');
+      expect(data).to.have.property('prebidVersion').to.be.a('string');
+      expect(data).to.have.property('screenHeight').to.be.a('number');
+      expect(data).to.have.property('screenWidth').to.be.a('number');
+      expect(data).to.have.property('tmax').to.be.a('number');
+      expect(data).to.have.property('ua').to.be.a('string');
+    });
+
+    it('creates ServerRequests pointing to the correct region and endpoint if it changes', function () {
+      const videoRequests = [utils.deepClone(VIDEO_REQUEST), utils.deepClone(VIDEO_REQUEST)];
+      videoRequests[0].params.endpoint = 'https://the.url';
+      videoRequests[1].params.endpoint = 'https://the.other.url';
+
+      const requests = spec.buildRequests(videoRequests, BIDDER_REQUEST);
+
+      requests.forEach((request, index) => {
+        expect(request).to.have.property('url', videoRequests[index].params.endpoint);
+      });
+    });
+
+    it('creates ServerRequests pointing to default endpoint if missing', function () {
+      const videoRequests = [utils.deepClone(VIDEO_REQUEST), utils.deepClone(VIDEO_REQUEST)];
+      videoRequests[1].params.supplyId = SUPPLY_ID_2;
+      videoRequests[1].params.region = REGION_2;
+
+      const requests = spec.buildRequests(videoRequests, BIDDER_REQUEST);
+      expect(requests[0]).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+      expect(requests[1]).to.have.property('url', `https://openrtb-${REGION_2}.axonix.com/supply/prebid/${SUPPLY_ID_2}`);
+    });
+
+    it('creates ServerRequests pointing to default region if missing', function () {
+      const videoRequest = utils.deepClone(VIDEO_REQUEST);
+      delete videoRequest.params.region;
+
+      const requests = spec.buildRequests([videoRequest], BIDDER_REQUEST);
+      expect(requests[0]).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+    });
+  });
+
+  describe.skip('buildRequests: can handle native ad requests', function () {
+    it('creates ServerRequests pointing to the correct region and endpoint if it changes', function () {
+      // loop:
+      //   set supply id
+      //   set region/endpoint in ssp config
+      //   call buildRequests, validate request (url, method, supply id)
+      expect.fail('Not implemented');
+    });
+
+    it('creates ServerRequests pointing to default endpoint if missing', function () {
+      // no endpoint in config means default value openrtb.axonix.com
+      expect.fail('Not implemented');
+    });
+
+    it('creates ServerRequests pointing to default region if missing', function () {
+      // no region in config means default value us-east-1
+      expect.fail('Not implemented');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('considers corner cases', function() {
+      expect(spec.interpretResponse(null)).to.be.an('array').that.is.empty;
+      expect(spec.interpretResponse()).to.be.an('array').that.is.empty;
+    });
+
+    it('ignores unparseable responses', function() {
+      expect(spec.interpretResponse('invalid')).to.be.an('array').that.is.empty;
+      expect(spec.interpretResponse(['invalid'])).to.be.an('array').that.is.empty;
+      expect(spec.interpretResponse([{ invalid: 'object' }])).to.be.an('array').that.is.empty;
+    });
+
+    it('parses banner responses', function () {
+      const response = spec.interpretResponse([BANNER_RESPONSE]);
+
+      expect(response).to.be.an('array').that.is.not.empty;
+      expect(response[0]).to.equal(BANNER_RESPONSE);
+    });
+
+    it('parses 1 video responses', function () {
+      const response = spec.interpretResponse([VIDEO_RESPONSE]);
+
+      expect(response).to.be.an('array').that.is.not.empty;
+      expect(response[0]).to.equal(VIDEO_RESPONSE);
+    });
+
+    it.skip('parses 1 native responses', function () {
+      // passing 1 valid native in a response generates an array with 1 correct prebid response
+      // examine mediaType:native, native element
+      // check nativeBidIsValid from {@link file://./../../../src/native.js}
+      expect.fail('Not implemented');
+    });
+  });
+
+  describe('onBidWon', function () {
+    beforeEach(function () {
+      sinon.stub(utils, 'triggerPixel');
+    });
+
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+
+    it('called once', function () {
+      spec.onBidWon(spec.interpretResponse([BANNER_RESPONSE]));
+      expect(utils.triggerPixel.calledOnce).to.equal(true);
+    });
+
+    it('called false', function () {
+      spec.onBidWon([{ cpm: '2.21' }]);
+      expect(utils.triggerPixel.called).to.equal(false);
+    });
+
+    it('when there is no notification expected server side, none is called', function () {
+      var response = spec.onBidWon([]);
+      expect(utils.triggerPixel.called).to.equal(false);
+      expect(response).to.be.an('undefined')
+    });
+  });
+
+  describe('onTimeout', function () {
+    it('banner response', () => {
+      spec.onTimeout(spec.interpretResponse([BANNER_RESPONSE]));
+    });
+
+    it('video response', () => {
+      spec.onTimeout(spec.interpretResponse([VIDEO_RESPONSE]));
+    });
+  });
+});

From c2865bafcb9f15a0c205f9c25607aa60fb257db1 Mon Sep 17 00:00:00 2001
From: ysfbsf <youssef.bsf@gmail.com>
Date: Thu, 25 Feb 2021 14:22:09 +0100
Subject: [PATCH 280/304] Documentation: Prebid Server and Postbid integration
 example ( ad server-less ) (#6348)

---
 .../postbid/postbid_prebidServer_example.html | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 integrationExamples/postbid/postbid_prebidServer_example.html

diff --git a/integrationExamples/postbid/postbid_prebidServer_example.html b/integrationExamples/postbid/postbid_prebidServer_example.html
new file mode 100644
index 00000000000..3af7b010872
--- /dev/null
+++ b/integrationExamples/postbid/postbid_prebidServer_example.html
@@ -0,0 +1,86 @@
+<html>
+<head>
+<script>
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+    (function() {
+        var pbjsEl = document.createElement("script");
+        pbjsEl.type = "text/javascript";
+        pbjsEl.async = true;
+        pbjsEl.src = '../../build/dev/prebid.js';
+        var pbjsTargetEl = document.getElementsByTagName("head")[0];
+        pbjsTargetEl.insertBefore(pbjsEl, pbjsTargetEl.firstChild);
+      })();
+
+    pbjs.que.push(function() {
+        var adUnits = [{
+            code: 'postbid_iframe',
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 250]]
+              }
+            },
+            bids: [
+              {
+                bidder: 'appnexus',
+                params: {
+                   placementId: 13144370
+                }
+              }
+            ]
+          }];
+
+        pbjs.setConfig({
+          bidderTimeout: 1000,
+          s2sConfig : {
+            accountId : '1',
+            enabled : true, //default value set to false
+            bidders : ['appnexus'],
+            timeout : 1000, //default value is 1000
+            adapter : 'prebidServer', //if we have any other s2s adapter, default value is s2s
+            endpoint : 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+          }
+        });
+
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.requestBids({
+            bidsBackHandler: function(bidResponses) {
+                var iframe = document.getElementById('postbid_iframe');
+                var iframeDoc = iframe.contentWindow.document;
+                var adServerTargeting = pbjs.getAdserverTargetingForAdUnitCode('postbid_iframe');
+
+                // If any bidders return any creatives
+                if (adServerTargeting && adServerTargeting['hb_adid']) {
+                    pbjs.renderAd(iframeDoc, adServerTargeting['hb_adid']);
+                } else {
+                    iframe.width = sizes[0][0];
+                    iframe.height = sizes[0][1];
+                    iframeDoc.write('<head></head><body>' + passbackTagHtml + '</body>');
+                    iframeDoc.close();
+                }
+            }
+        })
+    });
+
+    var passbackTagHtml = 'TO ADD';
+</script>
+
+</head>
+
+<body>
+    <iframe id='postbid_iframe'
+            FRAMEBORDER="0"
+            SCROLLING="no"
+            MARGINHEIGHT="0"
+            MARGINWIDTH="0"
+            TOPMARGIN="0"
+            LEFTMARGIN="0"
+            ALLOWTRANSPARENCY="true"
+            WIDTH="0"
+            HEIGHT="0">
+    </iframe>
+
+</body>
+</html>

From 52f481338df82e78106dd5b68848be7507983c3c Mon Sep 17 00:00:00 2001
From: Olivier <osazos@adagio.io>
Date: Thu, 25 Feb 2021 16:32:27 +0100
Subject: [PATCH 281/304] Native: add custom data assets capability (#6220)

Use `mediaTypes.native.ext: {}` special object to add/allow custom data. assets.
---
 src/native.js            | 78 +++++++++++++++++++++++++++-------------
 test/spec/native_spec.js | 74 ++++++++++++++++++++++++++++++++------
 2 files changed, 117 insertions(+), 35 deletions(-)

diff --git a/src/native.js b/src/native.js
index 2d22e16c8a5..b43e582327b 100644
--- a/src/native.js
+++ b/src/native.js
@@ -165,30 +165,38 @@ export function getNativeTargeting(bid, bidReq) {
     `nativeParams.sendTargetingKeys`
   ) !== false;
 
-  Object.keys(bid['native']).forEach(asset => {
-    if (asset !== 'adTemplate') {
-      const key = CONSTANTS.NATIVE_KEYS[asset];
-      let value = getAssetValue(bid['native'][asset]);
-
-      const sendPlaceholder = deepAccess(
-        bidReq,
-        `mediaTypes.native.${asset}.sendId`
-      );
-
-      if (sendPlaceholder) {
-        const placeholder = `${key}:${bid.adId}`;
-        value = placeholder;
-      }
-
-      const assetSendTargetingKeys = deepAccess(
-        bidReq,
-        `nativeParams.${asset}.sendTargetingKeys`);
-
-      const sendTargeting = typeof assetSendTargetingKeys === 'boolean' ? assetSendTargetingKeys : globalSendTargetingKeys;
-
-      if (key && value && sendTargeting) {
-        keyValues[key] = value;
-      }
+  const nativeKeys = getNativeKeys(bidReq);
+
+  const flatBidNativeKeys = { ...bid.native, ...bid.native.ext };
+  delete flatBidNativeKeys.ext;
+
+  Object.keys(flatBidNativeKeys).forEach(asset => {
+    const key = nativeKeys[asset];
+    let value = getAssetValue(bid.native[asset]) || getAssetValue(deepAccess(bid, `native.ext.${asset}`));
+
+    if (asset === 'adTemplate' || !key || !value) {
+      return;
+    }
+
+    let sendPlaceholder = deepAccess(bidReq, `nativeParams.${asset}.sendId`);
+    if (typeof sendPlaceholder !== 'boolean') {
+      sendPlaceholder = deepAccess(bidReq, `nativeParams.ext.${asset}.sendId`);
+    }
+
+    if (sendPlaceholder) {
+      const placeholder = `${key}:${bid.adId}`;
+      value = placeholder;
+    }
+
+    let assetSendTargetingKeys = deepAccess(bidReq, `nativeParams.${asset}.sendTargetingKeys`)
+    if (typeof assetSendTargetingKeys !== 'boolean') {
+      assetSendTargetingKeys = deepAccess(bidReq, `nativeParams.ext.${asset}.sendTargetingKeys`);
+    }
+
+    const sendTargeting = typeof assetSendTargetingKeys === 'boolean' ? assetSendTargetingKeys : globalSendTargetingKeys;
+
+    if (sendTargeting) {
+      keyValues[key] = value;
     }
   });
 
@@ -234,6 +242,13 @@ export function getAllAssetsMessage(data, adObject) {
       message.adTemplate = getAssetValue(adObject.native[key]);
     } else if (key === 'rendererUrl' && adObject.native[key]) {
       message.rendererUrl = getAssetValue(adObject.native[key]);
+    } else if (key === 'ext') {
+      Object.keys(adObject.native[key]).forEach(extKey => {
+        if (adObject.native[key][extKey]) {
+          const value = getAssetValue(adObject.native[key][extKey]);
+          message.assets.push({ key: extKey, value });
+        }
+      })
     } else if (adObject.native[key] && CONSTANTS.NATIVE_KEYS.hasOwnProperty(key)) {
       const value = getAssetValue(adObject.native[key]);
 
@@ -255,3 +270,18 @@ function getAssetValue(value) {
 
   return value;
 }
+
+function getNativeKeys(bidReq) {
+  const extraNativeKeys = {}
+
+  if (deepAccess(bidReq, 'nativeParams.ext')) {
+    Object.keys(bidReq.nativeParams.ext).forEach(extKey => {
+      extraNativeKeys[extKey] = `hb_native_${extKey}`;
+    })
+  }
+
+  return {
+    ...CONSTANTS.NATIVE_KEYS,
+    ...extraNativeKeys
+  }
+}
diff --git a/test/spec/native_spec.js b/test/spec/native_spec.js
index ef9d407dd0c..7154a0fde37 100644
--- a/test/spec/native_spec.js
+++ b/test/spec/native_spec.js
@@ -23,7 +23,11 @@ const bid = {
     clickUrl: 'https://www.link.example',
     clickTrackers: ['https://tracker.example'],
     impressionTrackers: ['https://impression.example'],
-    javascriptTrackers: '<script src=\"http://www.foobar.js\"></script>'
+    javascriptTrackers: '<script src=\"http://www.foobar.js\"></script>',
+    ext: {
+      foo: 'foo-value',
+      baz: 'baz-value'
+    }
   }
 };
 
@@ -36,7 +40,11 @@ const bidWithUndefinedFields = {
     clickUrl: 'https://www.link.example',
     clickTrackers: ['https://tracker.example'],
     impressionTrackers: ['https://impression.example'],
-    javascriptTrackers: '<script src=\"http://www.foobar.js\"></script>'
+    javascriptTrackers: '<script src=\"http://www.foobar.js\"></script>',
+    ext: {
+      foo: 'foo-value',
+      baz: undefined
+    }
   }
 };
 
@@ -59,14 +67,21 @@ describe('native.js', function () {
     expect(targeting[CONSTANTS.NATIVE_KEYS.title]).to.equal(bid.native.title);
     expect(targeting[CONSTANTS.NATIVE_KEYS.body]).to.equal(bid.native.body);
     expect(targeting[CONSTANTS.NATIVE_KEYS.clickUrl]).to.equal(bid.native.clickUrl);
+    expect(targeting.hb_native_foo).to.equal(bid.native.foo);
   });
 
   it('sends placeholders for configured assets', function () {
     const bidRequest = {
-      mediaTypes: {
-        native: {
-          body: { sendId: true },
-          clickUrl: { sendId: true },
+      nativeParams: {
+        body: { sendId: true },
+        clickUrl: { sendId: true },
+        ext: {
+          foo: {
+            sendId: false
+          },
+          baz: {
+            sendId: true
+          }
         }
       }
     };
@@ -75,15 +90,33 @@ describe('native.js', function () {
     expect(targeting[CONSTANTS.NATIVE_KEYS.title]).to.equal(bid.native.title);
     expect(targeting[CONSTANTS.NATIVE_KEYS.body]).to.equal('hb_native_body:123');
     expect(targeting[CONSTANTS.NATIVE_KEYS.clickUrl]).to.equal('hb_native_linkurl:123');
+    expect(targeting.hb_native_foo).to.equal(bid.native.ext.foo);
+    expect(targeting.hb_native_baz).to.equal('hb_native_baz:123');
   });
 
   it('should only include native targeting keys with values', function () {
-    const targeting = getNativeTargeting(bidWithUndefinedFields);
+    const bidRequest = {
+      nativeParams: {
+        body: { sendId: true },
+        clickUrl: { sendId: true },
+        ext: {
+          foo: {
+            required: false
+          },
+          baz: {
+            required: false
+          }
+        }
+      }
+    };
+
+    const targeting = getNativeTargeting(bidWithUndefinedFields, bidRequest);
 
     expect(Object.keys(targeting)).to.deep.equal([
       CONSTANTS.NATIVE_KEYS.title,
       CONSTANTS.NATIVE_KEYS.sponsoredBy,
-      CONSTANTS.NATIVE_KEYS.clickUrl
+      CONSTANTS.NATIVE_KEYS.clickUrl,
+      'hb_native_foo'
     ]);
   });
 
@@ -138,6 +171,12 @@ describe('native.js', function () {
         sponsoredBy: {
           required: false,
           sendTargetingKeys: false
+        },
+        ext: {
+          foo: {
+            required: false,
+            sendTargetingKeys: true
+          }
         }
       }
 
@@ -148,7 +187,8 @@ describe('native.js', function () {
       CONSTANTS.NATIVE_KEYS.title,
       CONSTANTS.NATIVE_KEYS.body,
       CONSTANTS.NATIVE_KEYS.image,
-      CONSTANTS.NATIVE_KEYS.clickUrl
+      CONSTANTS.NATIVE_KEYS.clickUrl,
+      'hb_native_foo'
     ]);
   });
 
@@ -265,7 +305,7 @@ describe('native.js', function () {
 
     const message = getAllAssetsMessage(messageRequest, bid);
 
-    expect(message.assets.length).to.equal(7);
+    expect(message.assets.length).to.equal(9);
     expect(message.assets).to.deep.include({
       key: 'body',
       value: bid.native.body
@@ -294,6 +334,14 @@ describe('native.js', function () {
       key: 'sponsoredBy',
       value: bid.native.sponsoredBy
     });
+    expect(message.assets).to.deep.include({
+      key: 'foo',
+      value: bid.native.ext.foo
+    });
+    expect(message.assets).to.deep.include({
+      key: 'baz',
+      value: bid.native.ext.baz
+    });
   });
 
   it('creates native all asset message with only defined fields', function() {
@@ -305,7 +353,7 @@ describe('native.js', function () {
 
     const message = getAllAssetsMessage(messageRequest, bidWithUndefinedFields);
 
-    expect(message.assets.length).to.equal(3);
+    expect(message.assets.length).to.equal(4);
     expect(message.assets).to.deep.include({
       key: 'clickUrl',
       value: bid.native.clickUrl
@@ -318,6 +366,10 @@ describe('native.js', function () {
       key: 'sponsoredBy',
       value: bid.native.sponsoredBy
     });
+    expect(message.assets).to.deep.include({
+      key: 'foo',
+      value: bid.native.ext.foo
+    });
   });
 });
 

From 63ffed03d28f027b85c658a37a897801d9eb6aee Mon Sep 17 00:00:00 2001
From: iprom-adserver <79305981+iprom-adserver@users.noreply.github.com>
Date: Thu, 25 Feb 2021 19:07:31 +0100
Subject: [PATCH 282/304] iPROM adapter upload - adapter (#6334)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Gašper Žagar <gasper.zagar@iprom.si>
---
 modules/ipromBidAdapter.js                |  72 ++++++++
 modules/ipromBidAdapter.md                |  34 ++++
 test/spec/modules/ipromBidAdapter_spec.js | 193 ++++++++++++++++++++++
 3 files changed, 299 insertions(+)
 create mode 100644 modules/ipromBidAdapter.js
 create mode 100644 modules/ipromBidAdapter.md
 create mode 100644 test/spec/modules/ipromBidAdapter_spec.js

diff --git a/modules/ipromBidAdapter.js b/modules/ipromBidAdapter.js
new file mode 100644
index 00000000000..e328cd1ec5d
--- /dev/null
+++ b/modules/ipromBidAdapter.js
@@ -0,0 +1,72 @@
+import * as utils from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'iprom';
+const ENDPOINT_URL = 'https://core.iprom.net/programmatic';
+const VERSION = 'v1.0.0';
+const DEFAULT_CURRENCY = 'EUR';
+const DEFAULT_NETREVENUE = true;
+const DEFAULT_TTL = 360;
+
+export const spec = {
+  code: BIDDER_CODE,
+  isBidRequestValid: function ({ bidder, params = {} } = {}) {
+    // id parameter checks
+    if (!params.id) {
+      utils.logError(`${bidder}: Parameter 'id' missing`);
+      return false;
+    } else if (typeof params.id !== 'string') {
+      utils.logError(`${bidder}: Parameter 'id' needs to be a string`);
+      return false;
+    }
+    // dimension parameter checks
+    if (!params.dimension) {
+      utils.logError(`${bidder}: Required parameter 'dimension' missing`);
+      return false;
+    } else if (typeof params.dimension !== 'string') {
+      utils.logError(`${bidder}: Parameter 'dimension' needs to be a string`);
+      return false;
+    }
+
+    return true;
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const payload = {
+      bids: validBidRequests,
+      referer: bidderRequest.refererInfo,
+      version: VERSION
+    };
+    const payloadString = JSON.stringify(payload);
+
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: payloadString
+    };
+  },
+
+  interpretResponse: function (serverResponse, request) {
+    let bids = serverResponse.body;
+
+    const bidResponses = [];
+
+    bids.forEach(bid => {
+      bidResponses.push({
+        ad: bid.ad,
+        requestId: bid.requestId,
+        cpm: bid.cpm,
+        width: bid.width,
+        height: bid.height,
+        creativeId: bid.creativeId,
+        currency: bid.currency || DEFAULT_CURRENCY,
+        netRevenue: bid.netRevenue || DEFAULT_NETREVENUE,
+        ttl: bid.ttl || DEFAULT_TTL,
+      });
+    });
+
+    return bidResponses;
+  },
+}
+
+registerBidder(spec);
diff --git a/modules/ipromBidAdapter.md b/modules/ipromBidAdapter.md
new file mode 100644
index 00000000000..f7124e7c89c
--- /dev/null
+++ b/modules/ipromBidAdapter.md
@@ -0,0 +1,34 @@
+# Overview
+
+```
+Module Name: Iprom PreBid Adapter
+Module Type: Bidder Adapter
+Maintainer: support@iprom.si
+```
+
+# Description
+
+Module that connects to Iprom's demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],  // a display size
+                }
+            },
+            bids: [
+                {
+                    bidder: "iprom",
+                    params: {
+                        id: '1234',
+                        dimension: '300x250'
+                    }
+                }
+            ]
+        }
+    ];
+```
diff --git a/test/spec/modules/ipromBidAdapter_spec.js b/test/spec/modules/ipromBidAdapter_spec.js
new file mode 100644
index 00000000000..535cc332b21
--- /dev/null
+++ b/test/spec/modules/ipromBidAdapter_spec.js
@@ -0,0 +1,193 @@
+import {expect} from 'chai';
+import {spec} from 'modules/ipromBidAdapter.js';
+
+describe('iPROM Adapter', function () {
+  let bidRequests;
+  let bidderRequest;
+
+  beforeEach(function () {
+    bidRequests = [
+      {
+        bidder: 'iprom',
+        params: {
+          id: '1234',
+          dimension: '300x250',
+        },
+        adUnitCode: '/19966331/header-bid-tag-1',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600]],
+          }
+        },
+        bidId: '29a72b151f7bd3',
+        auctionId: 'e36abb27-g3b1-1ad6-8a4c-701c8919d3hh',
+        bidderRequestId: '2z76da40m1b3cb8',
+        transactionId: 'j51lhf58-1ad6-g3b1-3j6s-912c9493g0gu'
+      }
+    ];
+
+    bidderRequest = {
+      timeout: 3000,
+      refererInfo: {
+        referer: 'https://adserver.si/index.html',
+        reachedTop: true,
+        numIframes: 1,
+        stack: [
+          'https://adserver.si/index.html',
+          'https://adserver.si/iframe1.html',
+        ]
+      }
+    }
+  });
+
+  describe('validating bids', function () {
+    it('should accept valid bid', function () {
+      let validBid = {
+        bidder: 'iprom',
+        params: {
+          id: '1234',
+          dimension: '300x250',
+        },
+      };
+
+      const isValid = spec.isBidRequestValid(validBid);
+
+      expect(isValid).to.equal(true);
+    });
+
+    it('should reject bid if missing dimension and id', function () {
+      let invalidBid = {
+        bidder: 'iprom',
+        params: {}
+      };
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.equal(false);
+    });
+
+    it('should reject bid if missing dimension', function () {
+      let invalidBid = {
+        bidder: 'iprom',
+        params: {
+          id: '1234',
+        }
+      };
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.equal(false);
+    });
+
+    it('should reject bid if dimension is not a string', function () {
+      let invalidBid = {
+        bidder: 'iprom',
+        params: {
+          id: '1234',
+          dimension: 404,
+        }
+      };
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.equal(false);
+    });
+
+    it('should reject bid if missing id', function () {
+      let invalidBid = {
+        bidder: 'iprom',
+        params: {
+          dimension: '300x250',
+        }
+      };
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.equal(false);
+    });
+
+    it('should reject bid if id is not a string', function () {
+      let invalidBid = {
+        bidder: 'iprom',
+        params: {
+          id: 1234,
+          dimension: '300x250',
+        }
+      };
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.equal(false);
+    });
+  });
+
+  describe('building requests', function () {
+    it('should go to correct endpoint', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+
+      expect(request.method).to.exist;
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.exist;
+      expect(request.url).to.equal('https://core.iprom.net/programmatic');
+    });
+
+    it('should add referer info', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const requestparse = JSON.parse(request.data);
+
+      expect(requestparse.referer).to.exist;
+      expect(requestparse.referer.referer).to.equal('https://adserver.si/index.html');
+    });
+
+    it('should add adapter version', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const requestparse = JSON.parse(request.data);
+
+      expect(requestparse.version).to.exist;
+    });
+
+    it('should contain id and dimension', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const requestparse = JSON.parse(request.data);
+
+      expect(requestparse.bids[0].params.id).to.equal('1234');
+      expect(requestparse.bids[0].params.dimension).to.equal('300x250');
+    });
+  });
+
+  describe('handling responses', function () {
+    it('should return complete bid response', function () {
+      const serverResponse = {
+        body: [{
+          requestId: '29a72b151f7bd3',
+          cpm: 0.5,
+          width: '300',
+          height: '250',
+          creativeId: 1234,
+          ad: '<html><head><title>Iprom Header bidding example</title></head><body><img src="https://iprom.si/files/2015/08/iprom-logo.svg"></body></html>'
+        }
+        ]};
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const bids = spec.interpretResponse(serverResponse, request);
+
+      expect(bids).to.be.lengthOf(1);
+      expect(bids[0].requestId).to.equal('29a72b151f7bd3');
+      expect(bids[0].cpm).to.equal(0.5);
+      expect(bids[0].width).to.equal('300');
+      expect(bids[0].height).to.equal('250');
+      expect(bids[0].ad).to.have.length.above(1);
+    });
+
+    it('should return empty bid response', function () {
+      const emptyServerResponse = {
+        body: []
+      };
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const bids = spec.interpretResponse(emptyServerResponse, request);
+
+      expect(bids).to.be.lengthOf(0);
+    });
+  });
+});

From 827d982d324421224787e955d1a7382689f120cc Mon Sep 17 00:00:00 2001
From: jackhsiehucf <77815341+jackhsiehucf@users.noreply.github.com>
Date: Fri, 26 Feb 2021 21:31:17 +0800
Subject: [PATCH 283/304] Ucfunnel Bid Adapter: update currency parameter in ad
 response (#6357)

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

diff --git a/modules/ucfunnelBidAdapter.js b/modules/ucfunnelBidAdapter.js
index d54ad7fb0ee..4003c6ed5fd 100644
--- a/modules/ucfunnelBidAdapter.js
+++ b/modules/ucfunnelBidAdapter.js
@@ -69,7 +69,7 @@ export const spec = {
       cpm: ad.cpm || 0,
       creativeId: ad.crid || ad.ad_id || bidRequest.params.adid,
       dealId: ad.deal || null,
-      currency: 'USD',
+      currency: ad.currency || 'USD',
       netRevenue: true,
       ttl: 1800,
       meta: {}

From 49fb43865cb237920abce7043d5521b15d07abc8 Mon Sep 17 00:00:00 2001
From: TheMediaGrid <44166371+TheMediaGrid@users.noreply.github.com>
Date: Mon, 1 Mar 2021 15:08:44 +0300
Subject: [PATCH 284/304] TheMediaGrid Bid Adapter: fix trouble with alias
 using (#6363)

---
 modules/gridBidAdapter.js                |  1 -
 test/spec/modules/gridBidAdapter_spec.js | 10 ----------
 2 files changed, 11 deletions(-)

diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js
index b296fe39ae4..8ab2e2b8a95 100644
--- a/modules/gridBidAdapter.js
+++ b/modules/gridBidAdapter.js
@@ -329,7 +329,6 @@ function _addBidResponse(serverBid, bidRequest, bidResponses) {
     if (bid) {
       const bidResponse = {
         requestId: bid.bidId, // bid.bidderRequestId,
-        bidderCode: spec.code,
         cpm: serverBid.price,
         width: serverBid.w,
         height: serverBid.h,
diff --git a/test/spec/modules/gridBidAdapter_spec.js b/test/spec/modules/gridBidAdapter_spec.js
index b4e87119111..df119bb689d 100644
--- a/test/spec/modules/gridBidAdapter_spec.js
+++ b/test/spec/modules/gridBidAdapter_spec.js
@@ -491,7 +491,6 @@ describe('TheMediaGrid Adapter', function () {
           'width': 300,
           'height': 250,
           'ad': '<div>test content 1</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': false,
@@ -549,7 +548,6 @@ describe('TheMediaGrid Adapter', function () {
           'width': 300,
           'height': 250,
           'ad': '<div>test content 1</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': false,
@@ -563,7 +561,6 @@ describe('TheMediaGrid Adapter', function () {
           'width': 300,
           'height': 600,
           'ad': '<div>test content 2</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': false,
@@ -577,7 +574,6 @@ describe('TheMediaGrid Adapter', function () {
           'width': 728,
           'height': 90,
           'ad': '<div>test content 3</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': false,
@@ -637,7 +633,6 @@ describe('TheMediaGrid Adapter', function () {
           'dealId': undefined,
           'width': 300,
           'height': 600,
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'video',
           'netRevenue': false,
@@ -654,7 +649,6 @@ describe('TheMediaGrid Adapter', function () {
           'dealId': undefined,
           'width': undefined,
           'height': undefined,
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'video',
           'netRevenue': false,
@@ -786,7 +780,6 @@ describe('TheMediaGrid Adapter', function () {
           'width': 300,
           'height': 250,
           'ad': '<div>test content 1</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': false,
@@ -800,7 +793,6 @@ describe('TheMediaGrid Adapter', function () {
           'width': 300,
           'height': 600,
           'ad': '<div>test content 2</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': false,
@@ -814,7 +806,6 @@ describe('TheMediaGrid Adapter', function () {
           'width': 728,
           'height': 90,
           'ad': '<div>test content 3</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': false,
@@ -828,7 +819,6 @@ describe('TheMediaGrid Adapter', function () {
           'width': 300,
           'height': 600,
           'ad': '<div>test content 4</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': false,

From db14341c5374da8e3896ac7ec8c7496e9f271684 Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Mon, 1 Mar 2021 10:35:41 -0800
Subject: [PATCH 285/304] Rubicon Analytics Adapter: pass along
 advertiserDomains (#6356)

* Pass along advertiser domains!

* only send up to 10 adomains
---
 modules/rubiconAnalyticsAdapter.js            |  9 ++-
 .../modules/rubiconAnalyticsAdapter_spec.js   | 63 +++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index f1ba86de30f..08ae8bf2dd8 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -139,7 +139,8 @@ function sendMessage(auctionId, bidWonId) {
         'mediaType',
         'floorValue',
         'floorRuleValue',
-        'floorRule'
+        'floorRule',
+        'adomains'
       ]) : undefined
     ]);
   }
@@ -364,7 +365,11 @@ export function parseBidResponse(bid, previousBidResponse, auctionFloorData) {
     'seatBidId',
     'floorValue', () => utils.deepAccess(bid, 'floorData.floorValue'),
     'floorRuleValue', () => utils.deepAccess(bid, 'floorData.floorRuleValue'),
-    'floorRule', () => utils.debugTurnedOn() ? utils.deepAccess(bid, 'floorData.floorRule') : undefined
+    'floorRule', () => utils.debugTurnedOn() ? utils.deepAccess(bid, 'floorData.floorRule') : undefined,
+    'adomains', () => {
+      let adomains = utils.deepAccess(bid, 'meta.advertiserDomains');
+      return Array.isArray(adomains) && adomains.length > 0 ? adomains.slice(0, 10) : undefined
+    }
   ]);
 }
 
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index 505a2885404..136f5ef240a 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -852,6 +852,69 @@ describe('rubicon analytics adapter', function () {
       expect(message.auctions[0].adUnits[1].bids[0].bidResponse.dimensions).to.equal(undefined);
     });
 
+    it('should pass along adomians correctly', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      // 1 adomains
+      let bidResponse1 = utils.deepClone(MOCK.BID_RESPONSE[0]);
+      bidResponse1.meta = {
+        advertiserDomains: ['magnite.com']
+      }
+
+      // two adomains
+      let bidResponse2 = utils.deepClone(MOCK.BID_RESPONSE[1]);
+      bidResponse2.meta = {
+        advertiserDomains: ['prebid.org', 'magnite.com']
+      }
+
+      // make sure we only pass max 10 adomains
+      bidResponse2.meta.advertiserDomains = [...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains]
+
+      events.emit(BID_RESPONSE, bidResponse1);
+      events.emit(BID_RESPONSE, bidResponse2);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+      expect(message.auctions[0].adUnits[0].bids[0].bidResponse.adomains).to.deep.equal(['magnite.com']);
+      expect(message.auctions[0].adUnits[1].bids[0].bidResponse.adomains).to.deep.equal(['prebid.org', 'magnite.com', 'prebid.org', 'magnite.com', 'prebid.org', 'magnite.com', 'prebid.org', 'magnite.com', 'prebid.org', 'magnite.com']);
+    });
+
+    it('should NOT pass along adomians correctly when edge cases', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      // empty => nothing
+      let bidResponse1 = utils.deepClone(MOCK.BID_RESPONSE[0]);
+      bidResponse1.meta = {
+        advertiserDomains: []
+      }
+
+      // not array => nothing
+      let bidResponse2 = utils.deepClone(MOCK.BID_RESPONSE[1]);
+      bidResponse2.meta = {
+        advertiserDomains: 'prebid.org'
+      }
+
+      events.emit(BID_RESPONSE, bidResponse1);
+      events.emit(BID_RESPONSE, bidResponse2);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+      expect(message.auctions[0].adUnits[0].bids[0].bidResponse.adomains).to.be.undefined;
+      expect(message.auctions[0].adUnits[1].bids[0].bidResponse.adomains).to.be.undefined;
+    });
+
     function performFloorAuction(provider) {
       let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
       auctionInit.bidderRequests[0].bids[0].floorData = {

From 3da54454f87ee87939309e09d5e47f45cde93378 Mon Sep 17 00:00:00 2001
From: msm0504 <51493331+msm0504@users.noreply.github.com>
Date: Mon, 1 Mar 2021 23:07:06 -0500
Subject: [PATCH 286/304] support setting coopSync in s2sConfig (#6330)

---
 modules/prebidServerBidAdapter/index.js       |  4 +++
 .../modules/prebidServerBidAdapter_spec.js    | 31 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 2d8acb34225..d64dad31b17 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -203,6 +203,10 @@ function queueSync(bidderCodes, gdprConsent, uspConsent, s2sConfig) {
     payload.us_privacy = uspConsent;
   }
 
+  if (typeof s2sConfig.coopSync === 'boolean') {
+    payload.coopSync = s2sConfig.coopSync;
+  }
+
   const jsonPayload = JSON.stringify(payload);
   ajax(s2sConfig.syncEndpoint,
     (response) => {
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 8d88a3e0042..e5c6fe0324a 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -2529,5 +2529,36 @@ describe('S2S Adapter', function () {
       const requestBid = JSON.parse(server.requests[0].requestBody);
       expect(requestBid.bidders).to.deep.equal(['appnexus', 'rubicon']);
     });
+
+    it('should add cooperative sync flag to cookie_sync request if property is present', function () {
+      let s2sConfig = utils.deepClone(CONFIG);
+      s2sConfig.coopSync = false;
+      s2sConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      let bidRequest = utils.deepClone(BID_REQUESTS);
+
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
+      let requestBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(requestBid.coopSync).to.equal(false);
+    });
+
+    it('should not add cooperative sync flag to cookie_sync request if property is not present', function () {
+      let s2sConfig = utils.deepClone(CONFIG);
+      s2sConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      let bidRequest = utils.deepClone(BID_REQUESTS);
+
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
+      let requestBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(requestBid.coopSync).to.be.undefined;
+    });
   });
 });

From 47712cbe4f529b041fdb22594451b3b8b1856af9 Mon Sep 17 00:00:00 2001
From: PWyrembak <paul@trustx.org>
Date: Tue, 2 Mar 2021 12:27:21 +0300
Subject: [PATCH 287/304] TrustX Bid Adapter: Fix alias error (#6373)

---
 modules/trustxBidAdapter.js                |  1 -
 test/spec/modules/trustxBidAdapter_spec.js | 14 --------------
 2 files changed, 15 deletions(-)

diff --git a/modules/trustxBidAdapter.js b/modules/trustxBidAdapter.js
index f412fa21a05..a86ac1f2874 100644
--- a/modules/trustxBidAdapter.js
+++ b/modules/trustxBidAdapter.js
@@ -207,7 +207,6 @@ function _addBidResponse(serverBid, bidsMap, priceType, bidResponses, RendererCo
         const bid = slot.bids.shift();
         const bidResponse = {
           requestId: bid.bidId, // bid.bidderRequestId,
-          bidderCode: spec.code,
           cpm: serverBid.price,
           width: serverBid.w,
           height: serverBid.h,
diff --git a/test/spec/modules/trustxBidAdapter_spec.js b/test/spec/modules/trustxBidAdapter_spec.js
index 9e0aad9b36f..e9daaa83b5d 100644
--- a/test/spec/modules/trustxBidAdapter_spec.js
+++ b/test/spec/modules/trustxBidAdapter_spec.js
@@ -262,7 +262,6 @@ describe('TrustXAdapter', function () {
           'width': 300,
           'height': 250,
           'ad': '<div>test content 1</div>',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
@@ -320,7 +319,6 @@ describe('TrustXAdapter', function () {
           'width': 300,
           'height': 250,
           'ad': '<div>test content 1</div>',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
@@ -334,7 +332,6 @@ describe('TrustXAdapter', function () {
           'width': 300,
           'height': 600,
           'ad': '<div>test content 2</div>',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
@@ -348,7 +345,6 @@ describe('TrustXAdapter', function () {
           'width': 728,
           'height': 90,
           'ad': '<div>test content 3</div>',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
@@ -476,7 +472,6 @@ describe('TrustXAdapter', function () {
           'width': 300,
           'height': 250,
           'ad': '<div>test content 1</div>',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
@@ -490,7 +485,6 @@ describe('TrustXAdapter', function () {
           'width': 300,
           'height': 600,
           'ad': '<div>test content 2</div>',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
@@ -504,7 +498,6 @@ describe('TrustXAdapter', function () {
           'width': 728,
           'height': 90,
           'ad': '<div>test content 3</div>',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
@@ -518,7 +511,6 @@ describe('TrustXAdapter', function () {
           'width': 300,
           'height': 600,
           'ad': '<div>test content 4</div>',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
@@ -580,7 +572,6 @@ describe('TrustXAdapter', function () {
           'width': 300,
           'height': 250,
           'ad': '<div>test content 1</div>',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
@@ -594,7 +585,6 @@ describe('TrustXAdapter', function () {
           'width': 300,
           'height': 250,
           'ad': '<div>test content 2</div>',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
@@ -655,7 +645,6 @@ describe('TrustXAdapter', function () {
         'dealId': undefined,
         'width': 300,
         'height': 600,
-        'bidderCode': 'trustx',
         'currency': 'USD',
         'mediaType': 'video',
         'netRevenue': true,
@@ -735,7 +724,6 @@ describe('TrustXAdapter', function () {
         'dealId': undefined,
         'width': 300,
         'height': 600,
-        'bidderCode': 'trustx',
         'currency': 'USD',
         'mediaType': 'video',
         'netRevenue': true,
@@ -753,7 +741,6 @@ describe('TrustXAdapter', function () {
         'dealId': undefined,
         'width': 300,
         'height': 250,
-        'bidderCode': 'trustx',
         'currency': 'USD',
         'mediaType': 'video',
         'netRevenue': true,
@@ -771,7 +758,6 @@ describe('TrustXAdapter', function () {
         'dealId': undefined,
         'width': 300,
         'height': 250,
-        'bidderCode': 'trustx',
         'currency': 'USD',
         'mediaType': 'video',
         'netRevenue': true,

From a58aa83260f1a6763e6a634ee81887a6b7873b73 Mon Sep 17 00:00:00 2001
From: Justas Pupelis <pupelis.justas@gmail.com>
Date: Tue, 2 Mar 2021 16:14:51 +0200
Subject: [PATCH 288/304] Adform Bid Adapter: add global targeting to the
 request query as parameter (#6376)

Co-authored-by: Justas <jpmiltas@gmail.com>
---
 modules/adformBidAdapter.js                | 30 +++++++++++++++++++++
 test/spec/modules/adformBidAdapter_spec.js | 31 ++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/modules/adformBidAdapter.js b/modules/adformBidAdapter.js
index 05e45a428d3..dc30e152861 100644
--- a/modules/adformBidAdapter.js
+++ b/modules/adformBidAdapter.js
@@ -5,6 +5,7 @@ import { config } from '../src/config.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { Renderer } from '../src/Renderer.js';
 import * as utils from '../src/utils.js';
+import includes from 'core-js-pure/features/array/includes.js';
 
 const OUTSTREAM_RENDERER_URL = 'https://s2.adform.net/banners/scripts/video/outstream/render.js';
 
@@ -24,13 +25,32 @@ export const spec = {
 
     var request = [];
     var globalParams = [ [ 'adxDomain', 'adx.adform.net' ], [ 'fd', 1 ], [ 'url', null ], [ 'tid', null ], [ 'eids', eids ] ];
+    const targetingParams = { mkv: [], mkw: [], msw: [] };
+
     var bids = JSON.parse(JSON.stringify(validBidRequests));
     var bidder = (bids[0] && bids[0].bidder) || BIDDER_CODE;
+
+    // set common targeting options as query params
+    if (bids.length > 1) {
+      for (let key in targetingParams) {
+        if (targetingParams.hasOwnProperty(key)) {
+          const collection = bids.map(bid => ((bid.params[key] && bid.params[key].split(',')) || []));
+          targetingParams[key] = collection.reduce(intersects);
+          if (targetingParams[key].length) {
+            bids.forEach((bid, index) => {
+              bid.params[key] = collection[index].filter(item => !includes(targetingParams[key], item));
+            });
+          }
+        }
+      }
+    }
+
     for (i = 0, l = bids.length; i < l; i++) {
       bid = bids[i];
       if ((bid.params.priceType === 'net') || (bid.params.pt === 'net')) {
         netRevenue = 'net';
       }
+
       for (j = 0, k = globalParams.length; j < k; j++) {
         _key = globalParams[j][0];
         _value = bid[_key] || bid.params[_key];
@@ -65,6 +85,12 @@ export const spec = {
       request.push('us_privacy=' + bidderRequest.uspConsent);
     }
 
+    for (let key in targetingParams) {
+      if (targetingParams.hasOwnProperty(key)) {
+        globalParams.push([ key, targetingParams[key].join(',') ]);
+      }
+    }
+
     for (i = 1, l = globalParams.length; i < l; i++) {
       _key = globalParams[i][0];
       _value = globalParams[i][1];
@@ -114,6 +140,10 @@ export const spec = {
         return result;
       }, {});
     }
+
+    function intersects(col1, col2) {
+      return col1.filter(item => includes(col2, item));
+    }
   },
   interpretResponse: function (serverResponse, bidRequest) {
     const VALID_RESPONSES = {
diff --git a/test/spec/modules/adformBidAdapter_spec.js b/test/spec/modules/adformBidAdapter_spec.js
index 23db7a8dc97..18b2565d4f8 100644
--- a/test/spec/modules/adformBidAdapter_spec.js
+++ b/test/spec/modules/adformBidAdapter_spec.js
@@ -157,6 +157,37 @@ describe('Adform adapter', function () {
       assert.equal(eids, 'some_id_value');
     });
 
+    it('should add parameter to global parameters if it exists in all bids', function () {
+      const _bids = [];
+      _bids.push(bids[0]);
+      _bids.push(bids[1]);
+      _bids.push(bids[2]);
+      _bids[0].params.mkv = 'key:value,key1:value1';
+      _bids[1].params.mkv = 'key:value,key1:value1,keyR:removed';
+      _bids[2].params.mkv = 'key:value,key1:value1,keyR:removed,key8:value1';
+      _bids[0].params.mkw = 'targeting';
+      _bids[1].params.mkw = 'targeting';
+      _bids[2].params.mkw = 'targeting,targeting2';
+      _bids[0].params.msw = 'search:word,search:word2';
+      _bids[1].params.msw = 'search:word';
+      _bids[2].params.msw = 'search:word,search:word5';
+      let bidList = _bids;
+      let request = spec.buildRequests(bidList);
+      let parsedUrl = parseUrl(request.url);
+      assert.equal(parsedUrl.query.mkv, encodeURIComponent('key:value,key1:value1'));
+      assert.equal(parsedUrl.query.mkw, 'targeting');
+      assert.equal(parsedUrl.query.msw, encodeURIComponent('search:word'));
+      assert.ok(!parsedUrl.items[0].mkv);
+      assert.ok(!parsedUrl.items[0].mkw);
+      assert.equal(parsedUrl.items[0].msw, 'search:word2');
+      assert.equal(parsedUrl.items[1].mkv, 'keyR:removed');
+      assert.ok(!parsedUrl.items[1].mkw);
+      assert.ok(!parsedUrl.items[1].msw);
+      assert.equal(parsedUrl.items[2].mkv, 'keyR:removed,key8:value1');
+      assert.equal(parsedUrl.items[2].mkw, 'targeting2');
+      assert.equal(parsedUrl.items[2].msw, 'search:word5');
+    });
+
     describe('user privacy', function () {
       it('should send GDPR Consent data to adform if gdprApplies', function () {
         let request = spec.buildRequests([bids[0]], {gdprConsent: {gdprApplies: true, consentString: 'concentDataString'}});

From 7b3bec58f1e4ad18f7c5b347a7f0768e999fa1dd Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Tue, 2 Mar 2021 19:43:39 +0100
Subject: [PATCH 289/304] Prebid 4.29.0 Release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e992a108c5c..9de23df383d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.29.0-pre",
+  "version": "4.29.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 8219c2f18e289437c827d8a9dbb804f738c8c6ca Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Tue, 2 Mar 2021 19:58:09 +0100
Subject: [PATCH 290/304] Increment pre version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9de23df383d..dfd8a60b06d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "4.29.0",
+  "version": "4.30.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 8268068c85c91a30d1fa0a723121d74b3d45aa62 Mon Sep 17 00:00:00 2001
From: Salomon Rada <salomon@gamoshi.com>
Date: Tue, 2 Mar 2021 21:04:10 +0200
Subject: [PATCH 291/304] Gamoshi Bid Adapter: update adaptor aliases (#6355)

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

diff --git a/modules/gamoshiBidAdapter.js b/modules/gamoshiBidAdapter.js
index f8d2b70981c..de839219897 100644
--- a/modules/gamoshiBidAdapter.js
+++ b/modules/gamoshiBidAdapter.js
@@ -43,7 +43,7 @@ export const helper = {
 
 export const spec = {
   code: 'gamoshi',
-  aliases: ['gambid', 'cleanmedia', '9MediaOnline', 'MobfoxX'],
+  aliases: ['gambid', '9MediaOnline'],
   supportedMediaTypes: ['banner', 'video'],
 
   isBidRequestValid: function (bid) {

From 7807069376562402bd89cece367bbdd8304b87e1 Mon Sep 17 00:00:00 2001
From: vladi-mmg <vladi@m-m-g.com>
Date: Tue, 2 Mar 2021 23:50:09 +0200
Subject: [PATCH 292/304] Marsmedia Bid Adapter: add support for viewability,
 floor price module, COPPA & CCPA (#6337)

* Change publisherId to zoneId
Add gdpr
Add supply chain
Add video media type

* Remove comments

* Fix unit test coverage

* fix request id bug
add vastXml to video response

* Remove bid response default sizes

* Change endpoint url

* Add unit test for vastXml

* Change end point

* Remove trailing-space

* Add onBidWon function

* New adapter - videofy

* Marsmedia & Videofy - Add onTimeout onSetTargeting

* Create sendbeacon function

* - add viewability

* remove unnecessary utils.getWindowTop()
---
 modules/marsmediaBidAdapter.js                | 171 ++++++++-
 test/spec/modules/marsmediaBidAdapter_spec.js | 349 ++++++++++--------
 2 files changed, 354 insertions(+), 166 deletions(-)

diff --git a/modules/marsmediaBidAdapter.js b/modules/marsmediaBidAdapter.js
index 1ce2558b8de..bb1763ebb2e 100644
--- a/modules/marsmediaBidAdapter.js
+++ b/modules/marsmediaBidAdapter.js
@@ -3,6 +3,7 @@
 import * as utils from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
 
 function MarsmediaAdapter() {
   this.code = 'marsmedia';
@@ -16,7 +17,7 @@ function MarsmediaAdapter() {
   let SUPPORTED_VIDEO_API = [1, 2, 5];
   let slotsToBids = {};
   let that = this;
-  let version = '2.3';
+  let version = '2.4';
 
   this.isBidRequestValid = function (bid) {
     return !!(bid.params && bid.params.zoneId);
@@ -53,6 +54,7 @@ function MarsmediaAdapter() {
       if (!(impObj.banner || impObj.video)) {
         continue;
       }
+      impObj.bidfloor = _getFloor(BRs[i]);
       impObj.ext = frameExt(BRs[i]);
       impList.push(impObj);
     }
@@ -153,9 +155,31 @@ function MarsmediaAdapter() {
   }
 
   function frameExt(bid) {
-    return {
-      bidder: {
-        zoneId: bid.params['zoneId']
+    if ((bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes)) {
+      let bidSizes = (bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) || bid.sizes;
+      bidSizes = ((utils.isArray(bidSizes) && utils.isArray(bidSizes[0])) ? bidSizes : [bidSizes]);
+      bidSizes = bidSizes.filter(size => utils.isArray(size));
+      const processedSizes = bidSizes.map(size => ({w: parseInt(size[0], 10), h: parseInt(size[1], 10)}));
+
+      const element = document.getElementById(bid.adUnitCode);
+      const minSize = _getMinSize(processedSizes);
+      const viewabilityAmount = _isViewabilityMeasurable(element)
+        ? _getViewability(element, utils.getWindowTop(), minSize)
+        : 'na';
+      const viewabilityAmountRounded = isNaN(viewabilityAmount) ? viewabilityAmount : Math.round(viewabilityAmount);
+
+      return {
+        bidder: {
+          zoneId: bid.params['zoneId']
+        },
+        viewability: viewabilityAmountRounded
+      }
+    } else {
+      return {
+        bidder: {
+          zoneId: bid.params['zoneId']
+        },
+        viewability: 'na'
       }
     }
   }
@@ -180,12 +204,15 @@ function MarsmediaAdapter() {
       }
     };
     if (BRs[0].schain) {
-      bid.source = {
-        'ext': {
-          'schain': BRs[0].schain
-        }
-      }
+      utils.deepSetValue(bid, 'source.ext.schain', BRs[0].schain);
+    }
+    if (bidderRequest.uspConsent) {
+      utils.deepSetValue(bid, 'regs.ext.us_privacy', bidderRequest.uspConsent)
     }
+    if (config.getConfig('coppa') === true) {
+      utils.deepSetValue(bid, 'regs.coppa', config.getConfig('coppa') & 1)
+    }
+
     return bid;
   }
 
@@ -241,12 +268,6 @@ function MarsmediaAdapter() {
     sendbeacon(bid, 20)
   };
 
-  function sendbeacon(bid, type) {
-    const bidString = JSON.stringify(bid);
-    const encodedBuf = window.btoa(bidString);
-    utils.triggerPixel('https://ping-hqx-1.go2speed.media/notification/rtb/beacon/?bt=' + type + '&bid=3mhdom&hb_j=' + encodedBuf, null);
-  }
-
   this.interpretResponse = function (serverResponse) {
     let responses = serverResponse.body || [];
     let bids = [];
@@ -295,6 +316,126 @@ function MarsmediaAdapter() {
 
     return bids;
   };
+
+  function sendbeacon(bid, type) {
+    const bidString = JSON.stringify(bid);
+    const encodedBuf = window.btoa(bidString);
+    utils.triggerPixel('https://ping-hqx-1.go2speed.media/notification/rtb/beacon/?bt=' + type + '&bid=3mhdom&hb_j=' + encodedBuf, null);
+  }
+
+  /**
+   * Gets bidfloor
+   * @param {Object} bid
+   * @returns {Number} floor
+   */
+  function _getFloor (bid) {
+    const curMediaType = bid.mediaTypes.video ? 'video' : 'banner';
+    let floor = 0;
+
+    if (typeof bid.getFloor === 'function') {
+      const floorInfo = bid.getFloor({
+        currency: 'USD',
+        mediaType: curMediaType,
+        size: '*'
+      });
+
+      if (typeof floorInfo === 'object' &&
+        floorInfo.currency === 'USD' &&
+        !isNaN(parseFloat(floorInfo.floor))) {
+        floor = floorInfo.floor;
+      }
+    }
+
+    return floor;
+  }
+
+  function _getMinSize(sizes) {
+    return sizes.reduce((min, size) => size.h * size.w < min.h * min.w ? size : min);
+  }
+
+  function _isViewabilityMeasurable(element) {
+    return !_isIframe() && element !== null;
+  }
+
+  function _isIframe() {
+    try {
+      return utils.getWindowSelf() !== utils.getWindowTop();
+    } catch (e) {
+      return true;
+    }
+  }
+
+  function _getViewability(element, topWin, { w, h } = {}) {
+    return topWin.document.visibilityState === 'visible'
+      ? _getPercentInView(element, topWin, { w, h })
+      : 0;
+  }
+
+  function _getPercentInView(element, topWin, { w, h } = {}) {
+    const elementBoundingBox = _getBoundingBox(element, { w, h });
+
+    const elementInViewBoundingBox = _getIntersectionOfRects([ {
+      left: 0,
+      top: 0,
+      right: topWin.innerWidth,
+      bottom: topWin.innerHeight
+    }, elementBoundingBox ]);
+
+    let elementInViewArea, elementTotalArea;
+
+    if (elementInViewBoundingBox !== null) {
+      // Some or all of the element is in view
+      elementInViewArea = elementInViewBoundingBox.width * elementInViewBoundingBox.height;
+      elementTotalArea = elementBoundingBox.width * elementBoundingBox.height;
+
+      return ((elementInViewArea / elementTotalArea) * 100);
+    }
+
+    return 0;
+  }
+
+  function _getBoundingBox(element, { w, h } = {}) {
+    let { width, height, left, top, right, bottom } = element.getBoundingClientRect();
+
+    if ((width === 0 || height === 0) && w && h) {
+      width = w;
+      height = h;
+      right = left + w;
+      bottom = top + h;
+    }
+
+    return { width, height, left, top, right, bottom };
+  }
+
+  function _getIntersectionOfRects(rects) {
+    const bbox = {
+      left: rects[0].left,
+      right: rects[0].right,
+      top: rects[0].top,
+      bottom: rects[0].bottom
+    };
+
+    for (let i = 1; i < rects.length; ++i) {
+      bbox.left = Math.max(bbox.left, rects[i].left);
+      bbox.right = Math.min(bbox.right, rects[i].right);
+
+      if (bbox.left >= bbox.right) {
+        return null;
+      }
+
+      bbox.top = Math.max(bbox.top, rects[i].top);
+      bbox.bottom = Math.min(bbox.bottom, rects[i].bottom);
+
+      if (bbox.top >= bbox.bottom) {
+        return null;
+      }
+    }
+
+    bbox.width = bbox.right - bbox.left;
+    bbox.height = bbox.bottom - bbox.top;
+
+    return bbox;
+  }
 }
 
 export const spec = new MarsmediaAdapter();
diff --git a/test/spec/modules/marsmediaBidAdapter_spec.js b/test/spec/modules/marsmediaBidAdapter_spec.js
index b4c2fe68f34..cf074b0f3d6 100644
--- a/test/spec/modules/marsmediaBidAdapter_spec.js
+++ b/test/spec/modules/marsmediaBidAdapter_spec.js
@@ -1,11 +1,41 @@
-import {spec} from '../../../modules/marsmediaBidAdapter.js';
-import * as utils from '../../../src/utils.js';
-import * as sinon from 'sinon';
+import { spec } from 'modules/marsmediaBidAdapter.js';
+import * as utils from 'src/utils.js';
+import { config } from 'src/config.js';
 
-var r1adapter = spec;
+var marsAdapter = spec;
 
 describe('marsmedia adapter tests', function () {
+  let element, win;
+  let sandbox;
+
   beforeEach(function() {
+    element = {
+      x: 0,
+      y: 0,
+
+      width: 0,
+      height: 0,
+
+      getBoundingClientRect: () => {
+        return {
+          width: element.width,
+          height: element.height,
+
+          left: element.x,
+          top: element.y,
+          right: element.x + element.width,
+          bottom: element.y + element.height
+        };
+      }
+    };
+    win = {
+      document: {
+        visibilityState: 'visible'
+      },
+
+      innerWidth: 800,
+      innerHeight: 600
+    };
     this.defaultBidderRequest = {
       'refererInfo': {
         'referer': 'Reference Page',
@@ -15,28 +45,40 @@ describe('marsmedia adapter tests', function () {
         ]
       }
     };
+
+    this.defaultBidRequestList = [
+      {
+        'bidder': 'marsmedia',
+        'params': {
+          'zoneId': 9999
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250]]
+          }
+        },
+        'adUnitCode': 'Unit-Code',
+        'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
+        'bidderRequestId': '418b37f85e772c',
+        'auctionId': '18fd8b8b0bd757',
+        'bidRequestsCount': 1,
+        'bidId': '51ef8751f9aead'
+      }
+    ];
+
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(document, 'getElementById').withArgs('Unit-Code').returns(element);
+    sandbox.stub(utils, 'getWindowTop').returns(win);
+    sandbox.stub(utils, 'getWindowSelf').returns(win);
+  });
+
+  afterEach(function() {
+    sandbox.restore();
   });
 
   describe('Verify 1.0 POST Banner Bid Request', function () {
     it('buildRequests works', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'marsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaType': 'banner',
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
-          'sizes': [[300, 250]],
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
 
       expect(bidRequest.url).to.have.string('https://hb.go2speed.media/bidder/?bid=3mhdom&zoneId=9999&hbv=');
       expect(bidRequest.method).to.equal('POST');
@@ -52,11 +94,11 @@ describe('marsmedia adapter tests', function () {
       expect(openrtbRequest.imp[0].ext.bidder.zoneId).to.equal(9999);
     });
 
-    it('interpretResponse works', function() {
+    /* it('interpretResponse works', function() {
       var bidList = {
         'body': [
           {
-            'impid': 'div-gpt-ad-1438287399331-0',
+            'impid': 'Unit-Code',
             'w': 300,
             'h': 250,
             'adm': '<div>My Compelling Ad</div>',
@@ -67,7 +109,7 @@ describe('marsmedia adapter tests', function () {
         ]
       };
 
-      var bannerBids = r1adapter.interpretResponse(bidList);
+      var bannerBids = marsAdapter.interpretResponse(bidList);
 
       expect(bannerBids.length).to.equal(1);
       const bid = bannerBids[0];
@@ -78,7 +120,7 @@ describe('marsmedia adapter tests', function () {
       expect(bid.netRevenue).to.equal(true);
       expect(bid.cpm).to.equal(1.0);
       expect(bid.ttl).to.equal(350);
-    });
+    }); */
   });
 
   describe('Verify POST Video Bid Request', function() {
@@ -95,7 +137,7 @@ describe('marsmedia adapter tests', function () {
               'context': 'instream'
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-1',
+          'adUnitCode': 'Unit-Code',
           'sizes': [
             [300, 250]
           ],
@@ -107,7 +149,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
 
       expect(bidRequest.url).to.have.string('https://hb.go2speed.media/bidder/?bid=3mhdom&zoneId=9999&hbv=');
       expect(bidRequest.method).to.equal('POST');
@@ -132,7 +174,7 @@ describe('marsmedia adapter tests', function () {
       var bidList = {
         'body': [
           {
-            'impid': 'div-gpt-ad-1438287399331-1',
+            'impid': 'Unit-Code',
             'price': 1,
             'adm': 'https://example.com/',
             'adomain': [
@@ -147,7 +189,7 @@ describe('marsmedia adapter tests', function () {
         ]
       };
 
-      var videoBids = r1adapter.interpretResponse(bidList);
+      var videoBids = marsAdapter.interpretResponse(bidList);
 
       expect(videoBids.length).to.equal(1);
       const bid = videoBids[0];
@@ -166,7 +208,7 @@ describe('marsmedia adapter tests', function () {
       var bidList = {
         'body': [
           {
-            'impid': 'div-gpt-ad-1438287399331-1',
+            'impid': 'Unit-Code',
             'price': 1,
             'adm': '<?xml><VAST></VAST>',
             'adomain': [
@@ -181,7 +223,7 @@ describe('marsmedia adapter tests', function () {
         ]
       };
 
-      var videoBids = r1adapter.interpretResponse(bidList);
+      var videoBids = marsAdapter.interpretResponse(bidList);
 
       expect(videoBids.length).to.equal(1);
       const bid = videoBids[0];
@@ -199,26 +241,6 @@ describe('marsmedia adapter tests', function () {
 
   describe('misc buildRequests', function() {
     it('should send GDPR Consent data to Marsmedia tag', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'marsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaTypes': {
-            'banner': {
-              'sizes': [[300, 250]]
-            }
-          },
-          'adUnitCode': 'div-gpt-ad-1438287399331-3',
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
       var consentString = 'testConsentString';
       var gdprBidderRequest = this.defaultBidderRequest;
       gdprBidderRequest.gdprConsent = {
@@ -226,13 +248,50 @@ describe('marsmedia adapter tests', function () {
         'consentString': consentString
       };
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, gdprBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, gdprBidderRequest);
 
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.user.ext.consent).to.equal(consentString);
       expect(openrtbRequest.regs.ext.gdpr).to.equal(true);
     });
 
+    it('should have CCPA Consent if defined', function () {
+      const ccpaBidderRequest = this.defaultBidderRequest;
+      ccpaBidderRequest.uspConsent = '1YYN';
+      const bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, ccpaBidderRequest);
+      const openrtbRequest = JSON.parse(bidRequest.data);
+
+      expect(openrtbRequest.regs.ext.us_privacy).to.equal('1YYN');
+    });
+
+    it('should submit coppa if set in config', function () {
+      sinon.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(true);
+      const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+      const requestparse = JSON.parse(request.data);
+      expect(requestparse.regs.coppa).to.equal(1);
+      config.getConfig.restore();
+    });
+
+    it('should process floors module if available', function() {
+      const floorBidderRequest = this.defaultBidRequestList;
+      const floorInfo = {
+        currency: 'USD',
+        floor: 1.20
+      };
+      floorBidderRequest[0].getFloor = () => floorInfo;
+      const request = marsAdapter.buildRequests(floorBidderRequest, this.defaultBidderRequest);
+      const requestparse = JSON.parse(request.data);
+      expect(requestparse.imp[0].bidfloor).to.equal(1.20);
+    });
+
+    it('should have 0 bidfloor value', function() {
+      const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+      const requestparse = JSON.parse(request.data);
+      expect(requestparse.imp[0].bidfloor).to.equal(0);
+    });
+
     it('prefer 2.0 sizes', function () {
       var bidRequestList = [
         {
@@ -245,7 +304,7 @@ describe('marsmedia adapter tests', function () {
               'sizes': [[300, 600]]
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
+          'adUnitCode': 'Unit-Code',
           'sizes': [[300, 250]],
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
@@ -255,7 +314,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
 
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.imp[0].banner.format[0].w).to.equal(300);
@@ -274,7 +333,7 @@ describe('marsmedia adapter tests', function () {
               'sizes': [[300]]
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -283,7 +342,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
       expect(bidRequest.method).to.be.undefined;
     });
 
@@ -297,7 +356,7 @@ describe('marsmedia adapter tests', function () {
           'mediaTypes': {
             'banner': {}
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -306,7 +365,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
       expect(bidRequest.method).to.be.undefined;
     });
 
@@ -320,7 +379,7 @@ describe('marsmedia adapter tests', function () {
           'mediaTypes': {
             'banner': {'sizes': [['400', '500'], ['4n0', '5g0']]}
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -329,35 +388,15 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.imp[0].banner.format.length).to.equal(1);
     });
 
     it('dnt is correctly set to 1', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'marsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaTypes': {
-            'banner': {
-              'sizes': [[300, 600]]
-            }
-          },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
       var dntStub = sinon.stub(utils, 'getDNT').returns(1);
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
 
       dntStub.restore();
 
@@ -378,7 +417,7 @@ describe('marsmedia adapter tests', function () {
               'playerSize': ['600', '300']
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-1',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -387,7 +426,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
 
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.imp[0].video.w).to.equal(600);
@@ -407,7 +446,7 @@ describe('marsmedia adapter tests', function () {
               'playerSize': ['badWidth', 'badHeight']
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-1',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -416,7 +455,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
 
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.imp[0].video.w).to.be.undefined;
@@ -435,7 +474,7 @@ describe('marsmedia adapter tests', function () {
               'context': 'instream'
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-1',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -444,7 +483,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
 
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.imp[0].video.w).to.be.undefined;
@@ -453,52 +492,74 @@ describe('marsmedia adapter tests', function () {
 
     it('should return empty site data when refererInfo is missing', function() {
       delete this.defaultBidderRequest.refererInfo;
-      var bidRequestList = [
-        {
-          'bidder': 'marsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaType': 'banner',
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
-          'sizes': [[300, 250]],
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
       const openrtbRequest = JSON.parse(bidRequest.data);
 
       expect(openrtbRequest.site.domain).to.equal('');
       expect(openrtbRequest.site.page).to.equal('');
       expect(openrtbRequest.site.ref).to.equal('');
     });
+
+    context('when element is fully in view', function() {
+      it('returns 100', function() {
+        Object.assign(element, { width: 600, height: 400 });
+        const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+        const openrtbRequest = JSON.parse(request.data);
+        expect(openrtbRequest.imp[0].ext.viewability).to.equal(100);
+      });
+    });
+
+    context('when element is out of view', function() {
+      it('returns 0', function() {
+        Object.assign(element, { x: -300, y: 0, width: 207, height: 320 });
+        const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+        const openrtbRequest = JSON.parse(request.data);
+        expect(openrtbRequest.imp[0].ext.viewability).to.equal(0);
+      });
+    });
+
+    context('when element is partially in view', function() {
+      it('returns percentage', function() {
+        Object.assign(element, { width: 800, height: 800 });
+        const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+        const openrtbRequest = JSON.parse(request.data);
+        expect(openrtbRequest.imp[0].ext.viewability).to.equal(75);
+      });
+    });
+
+    context('when nested iframes', function() {
+      it('returns \'na\'', function() {
+        Object.assign(element, { width: 600, height: 400 });
+
+        utils.getWindowTop.restore();
+        utils.getWindowSelf.restore();
+        sandbox.stub(utils, 'getWindowTop').returns(win);
+        sandbox.stub(utils, 'getWindowSelf').returns({});
+
+        const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+        const openrtbRequest = JSON.parse(request.data);
+        expect(openrtbRequest.imp[0].ext.viewability).to.equal('na');
+      });
+    });
+
+    context('when tab is inactive', function() {
+      it('returns 0', function() {
+        Object.assign(element, { width: 600, height: 400 });
+
+        utils.getWindowTop.restore();
+        win.document.visibilityState = 'hidden';
+        sandbox.stub(utils, 'getWindowTop').returns(win);
+
+        const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+        const openrtbRequest = JSON.parse(request.data);
+        expect(openrtbRequest.imp[0].ext.viewability).to.equal(0);
+      });
+    });
   });
 
   it('should return empty site.domain and site.page when refererInfo.stack is empty', function() {
     this.defaultBidderRequest.refererInfo.stack = [];
-    var bidRequestList = [
-      {
-        'bidder': 'marsmedia',
-        'params': {
-          'zoneId': 9999
-        },
-        'mediaType': 'banner',
-        'adUnitCode': 'div-gpt-ad-1438287399331-0',
-        'sizes': [[300, 250]],
-        'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-        'bidderRequestId': '418b37f85e772c',
-        'auctionId': '18fd8b8b0bd757',
-        'bidRequestsCount': 1,
-        'bidId': '51ef8751f9aead'
-      }
-    ];
-
-    var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+    var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
     const openrtbRequest = JSON.parse(bidRequest.data);
 
     expect(openrtbRequest.site.domain).to.equal('');
@@ -508,24 +569,7 @@ describe('marsmedia adapter tests', function () {
 
   it('should secure correctly', function() {
     this.defaultBidderRequest.refererInfo.stack[0] = ['https://securesite.dvl'];
-    var bidRequestList = [
-      {
-        'bidder': 'marsmedia',
-        'params': {
-          'zoneId': 9999
-        },
-        'mediaType': 'banner',
-        'adUnitCode': 'div-gpt-ad-1438287399331-0',
-        'sizes': [[300, 250]],
-        'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-        'bidderRequestId': '418b37f85e772c',
-        'auctionId': '18fd8b8b0bd757',
-        'bidRequestsCount': 1,
-        'bidId': '51ef8751f9aead'
-      }
-    ];
-
-    var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+    var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
     const openrtbRequest = JSON.parse(bidRequest.data);
 
     expect(openrtbRequest.imp[0].secure).to.equal(1);
@@ -551,9 +595,12 @@ describe('marsmedia adapter tests', function () {
         'params': {
           'zoneId': 9999
         },
-        'mediaType': 'banner',
-        'adUnitCode': 'div-gpt-ad-1438287399331-0',
-        'sizes': [[300, 250]],
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250]]
+          }
+        },
+        'adUnitCode': 'Unit-Code',
         'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
         'bidderRequestId': '418b37f85e772c',
         'auctionId': '18fd8b8b0bd757',
@@ -563,7 +610,7 @@ describe('marsmedia adapter tests', function () {
       }
     ];
 
-    var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+    var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
     const openrtbRequest = JSON.parse(bidRequest.data);
 
     expect(openrtbRequest.source.ext.schain).to.deep.equal(schain);
@@ -571,7 +618,7 @@ describe('marsmedia adapter tests', function () {
 
   describe('misc interpretResponse', function () {
     it('No bid response', function() {
-      var noBidResponse = r1adapter.interpretResponse({
+      var noBidResponse = marsAdapter.interpretResponse({
         'body': ''
       });
       expect(noBidResponse.length).to.equal(0);
@@ -589,22 +636,22 @@ describe('marsmedia adapter tests', function () {
           'sizes': [[300, 250]]
         }
       },
-      'adUnitCode': 'bannerDiv'
+      'adUnitCode': 'Unit-Code'
     };
 
     it('should return true when required params found', function () {
-      expect(r1adapter.isBidRequestValid(bid)).to.equal(true);
+      expect(marsAdapter.isBidRequestValid(bid)).to.equal(true);
     });
 
     it('should return false when placementId missing', function () {
       delete bid.params.zoneId;
-      expect(r1adapter.isBidRequestValid(bid)).to.equal(false);
+      expect(marsAdapter.isBidRequestValid(bid)).to.equal(false);
     });
   });
 
   describe('getUserSyncs', function () {
     it('returns an empty string', function () {
-      expect(r1adapter.getUserSyncs()).to.deep.equal([]);
+      expect(marsAdapter.getUserSyncs()).to.deep.equal([]);
     });
   });
 

From 771d2bb94e36ee2409525fd08d59cad1318789cb Mon Sep 17 00:00:00 2001
From: JulieLorin <juli.lorin+github@gmail.com>
Date: Thu, 4 Mar 2021 13:51:19 +0100
Subject: [PATCH 293/304] fix bidderRequest matching for finding a renderer
 (#6359)

---
 src/auction.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/auction.js b/src/auction.js
index ec9ff7d8209..217a50be3d6 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -519,7 +519,7 @@ function getPreparedBidForAuction({adUnitCode, bid, bidderRequest, auctionId}) {
   events.emit(CONSTANTS.EVENTS.BID_ADJUSTMENT, bidObject);
 
   // a publisher-defined renderer can be used to render bids
-  const bidReq = bidderRequest.bids && find(bidderRequest.bids, bid => bid.adUnitCode == adUnitCode);
+  const bidReq = bidderRequest.bids && find(bidderRequest.bids, bid => bid.adUnitCode == adUnitCode && bid.bidId == bidObject.requestId);
   const adUnitRenderer = bidReq && bidReq.renderer;
 
   // a publisher can also define a renderer for a mediaType

From d9a2430e3c8087e1dca416b601654ec68e8e36e9 Mon Sep 17 00:00:00 2001
From: Laura Morillo-Velarde <laura.morillovelarde@gmail.com>
Date: Thu, 4 Mar 2021 15:40:20 +0100
Subject: [PATCH 294/304] Seedtag Bid Adapter: add support for inArticle
 placement (#6369)

* Fix: check mandatory video params

* Simplifying mediaType video existence check

* SQDTAR-42: onWonBid event (#2)

* Adding onBidWon handler.

* Adding nurl to bid.

* Adding nurl field to bid.

* Adding inArticle placement type to seedtag adapter. (#1)

Co-authored-by: Carlos Barreiro Mata <barreymata@gmail.com>
---
 modules/seedtagBidAdapter.js                | 27 ++++++++++---
 test/spec/modules/seedtagBidAdapter_spec.js | 45 ++++++++++++++++++---
 2 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/modules/seedtagBidAdapter.js b/modules/seedtagBidAdapter.js
index e1832e50020..24cc6489ef0 100644
--- a/modules/seedtagBidAdapter.js
+++ b/modules/seedtagBidAdapter.js
@@ -6,7 +6,13 @@ const BIDDER_CODE = 'seedtag';
 const SEEDTAG_ALIAS = 'st';
 const SEEDTAG_SSP_ENDPOINT = 'https://s.seedtag.com/c/hb/bid';
 const SEEDTAG_SSP_ONTIMEOUT_ENDPOINT = 'https://s.seedtag.com/se/hb/timeout';
-
+const ALLOWED_PLACEMENTS = {
+  inImage: true,
+  inScreen: true,
+  inArticle: true,
+  banner: true,
+  video: true
+}
 const mediaTypesMap = {
   [BANNER]: 'display',
   [VIDEO]: 'video'
@@ -27,10 +33,7 @@ function hasMandatoryParams(params) {
     !!params.publisherId &&
     !!params.adUnitId &&
     !!params.placement &&
-    (params.placement === 'inImage' ||
-      params.placement === 'inScreen' ||
-      params.placement === 'banner' ||
-      params.placement === 'video')
+    !!ALLOWED_PLACEMENTS[params.placement]
   );
 }
 
@@ -88,8 +91,10 @@ function buildBid(seedtagBid) {
     currency: seedtagBid.currency,
     netRevenue: true,
     mediaType: mediaType,
-    ttl: seedtagBid.ttl
+    ttl: seedtagBid.ttl,
+    nurl: seedtagBid.nurl
   };
+
   if (mediaType === VIDEO) {
     bid.vastXml = seedtagBid.content;
   } else {
@@ -200,6 +205,16 @@ export const spec = {
   onTimeout(data) {
     getTimeoutUrl(data);
     utils.triggerPixel(SEEDTAG_SSP_ONTIMEOUT_ENDPOINT);
+  },
+
+  /**
+   * Function to call when the adapter wins the auction
+   * @param {bid} Bid information received from the server
+   */
+  onBidWon: function (bid) {
+    if (bid && bid.nurl) {
+      utils.triggerPixel(bid.nurl);
+    }
   }
 }
 registerBidder(spec);
diff --git a/test/spec/modules/seedtagBidAdapter_spec.js b/test/spec/modules/seedtagBidAdapter_spec.js
index 8957bde6bd9..b43d2fa8a5f 100644
--- a/test/spec/modules/seedtagBidAdapter_spec.js
+++ b/test/spec/modules/seedtagBidAdapter_spec.js
@@ -1,5 +1,6 @@
 import { expect } from 'chai'
 import { spec, getTimeoutUrl } from 'modules/seedtagBidAdapter.js'
+import * as utils from 'src/utils.js'
 
 const PUBLISHER_ID = '0000-0000-01'
 const ADUNIT_ID = '000000'
@@ -42,7 +43,7 @@ describe('Seedtag Adapter', function() {
               }
             )
           }
-          const placements = ['banner', 'video', 'inImage', 'inScreen']
+          const placements = ['banner', 'video', 'inImage', 'inScreen', 'inArticle']
           placements.forEach(placement => {
             it('should be ' + placement, function() {
               const isBidRequestValid = spec.isBidRequestValid(
@@ -53,7 +54,7 @@ describe('Seedtag Adapter', function() {
           })
         })
       })
-      describe('when video slot has all mandatory params.', function() {
+      describe('when video slot has all mandatory params', function() {
         it('should return true, when video mediatype object are correct.', function() {
           const slotConfig = getSlotConfigs(
             {
@@ -116,7 +117,7 @@ describe('Seedtag Adapter', function() {
           expect(isBidRequestValid).to.equal(false)
         })
       })
-      describe('when video mediaType object is not correct.', function() {
+      describe('when video mediaType object is not correct', function() {
         function createVideoSlotconfig(mediaType) {
           return getSlotConfigs(mediaType, {
             publisherId: PUBLISHER_ID,
@@ -301,7 +302,7 @@ describe('Seedtag Adapter', function() {
       expect(typeof bids).to.equal('object')
       expect(bids.length).to.equal(0)
     })
-    it('should return a void array, when the server response have not got bids.', function() {
+    it('should return a void array, when the server response have no bids.', function() {
       const request = { data: JSON.stringify({}) }
       const serverResponse = { body: { bids: [] } }
       const bids = spec.interpretResponse(serverResponse, request)
@@ -323,7 +324,8 @@ describe('Seedtag Adapter', function() {
                   width: 728,
                   height: 90,
                   mediaType: 'display',
-                  ttl: 360
+                  ttl: 360,
+                  nurl: 'testurl.com/nurl'
                 }
               ],
               cookieSync: { url: '' }
@@ -338,6 +340,7 @@ describe('Seedtag Adapter', function() {
           expect(bids[0].currency).to.equal('USD')
           expect(bids[0].netRevenue).to.equal(true)
           expect(bids[0].ad).to.equal('content')
+          expect(bids[0].nurl).to.equal('testurl.com/nurl')
         })
       })
       describe('the bid is a video', function() {
@@ -354,7 +357,8 @@ describe('Seedtag Adapter', function() {
                   width: 728,
                   height: 90,
                   mediaType: 'video',
-                  ttl: 360
+                  ttl: 360,
+                  nurl: undefined
                 }
               ],
               cookieSync: { url: '' }
@@ -416,4 +420,33 @@ describe('Seedtag Adapter', function() {
       )
     })
   })
+
+  describe('onBidWon', function () {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel')
+    })
+
+    afterEach(function() {
+      utils.triggerPixel.restore()
+    })
+
+    describe('without nurl', function() {
+      const bid = {}
+
+      it('does not create pixel ', function() {
+        spec.onBidWon(bid)
+        expect(utils.triggerPixel.called).to.equal(false);
+      })
+    })
+
+    describe('with nurl', function () {
+      const nurl = 'http://seedtag_domain/won'
+      const bid = { nurl }
+
+      it('creates nurl pixel if bid nurl', function() {
+        spec.onBidWon({ nurl })
+        expect(utils.triggerPixel.calledWith(nurl)).to.equal(true);
+      })
+    })
+  })
 })

From f466902e2d946ba9f8dbf41a9df7f5f240fab0d3 Mon Sep 17 00:00:00 2001
From: guiann <guillaume.andouard@adyoulike.com>
Date: Thu, 4 Mar 2021 19:41:36 +0100
Subject: [PATCH 295/304] improve robustness on OnEvent fields (#6384)

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

diff --git a/modules/adyoulikeBidAdapter.js b/modules/adyoulikeBidAdapter.js
index 308d474d2c4..e5777f1e627 100644
--- a/modules/adyoulikeBidAdapter.js
+++ b/modules/adyoulikeBidAdapter.js
@@ -276,10 +276,15 @@ function getNativeAssets(response, nativeConfig) {
     native.clickUrl = adJson.TrackingPrefix + '/ar?event_kind=CLICK&attempt=' + adJson.Attempt +
       '&campaign=' + adJson.Campaign + '&url=' + encodeURIComponent(adJson.Content.Landing.Url);
 
-    native.clickTrackers = getTrackers(adJson.OnEvents['CLICK']);
-    native.impressionTrackers = getTrackers(adJson.OnEvents['IMPRESSION']);
+    if (adJson.OnEvents) {
+      native.clickTrackers = getTrackers(adJson.OnEvents['CLICK']);
+      native.impressionTrackers = getTrackers(adJson.OnEvents['IMPRESSION']);
+      native.javascriptTrackers = getTrackers(adJson.OnEvents['IMPRESSION'], true);
+    } else {
+      native.impressionTrackers = [];
+    }
+
     native.impressionTrackers.push(impressionUrl);
-    native.javascriptTrackers = getTrackers(adJson.OnEvents['IMPRESSION'], true);
   }
 
   Object.keys(nativeConfig).map(function(key, index) {

From d45935d886cb660883bf43a72dcf105365c07966 Mon Sep 17 00:00:00 2001
From: Adam Browning <19834421+adam-browning@users.noreply.github.com>
Date: Thu, 4 Mar 2021 20:55:31 +0200
Subject: [PATCH 296/304] oneVideo Bid Adapter: remove adapter adId because of
 conflict with pbjs core (#6382)

* updated object,str,num validations using pbjs utils

* validation if statements for content object

* validation if statements for content object

* updated contetn object validations using utils

* refractoring clean if statement

* fixing typos

* added todos

* added category string & data object validations

* fixed esling ENDPOINT issue

* updated content obj unit tests

* fixed cat & data validation

* fixed producer as object

* revert .includes() to .indexof() for IE

* reduced content obj params accoriding to ad-server support

* fixed typeOf typo

* fixed episode to Number

* gitignore

* restore gitignore

* removed unsupported params from md file

* reverted package & pagkage-lock

* fixed incorrect episdoe from str to num

* removed bid.adid setting from L97

* removed bid.adId setting

* updated adId test

* updated version to 3.0.6
---
 modules/oneVideoBidAdapter.js                | 3 +--
 test/spec/modules/oneVideoBidAdapter_spec.js | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/oneVideoBidAdapter.js b/modules/oneVideoBidAdapter.js
index 2f9275f969d..3bf14eb11cb 100644
--- a/modules/oneVideoBidAdapter.js
+++ b/modules/oneVideoBidAdapter.js
@@ -4,7 +4,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 const BIDDER_CODE = 'oneVideo';
 export const spec = {
   code: 'oneVideo',
-  VERSION: '3.0.5',
+  VERSION: '3.0.6',
   ENDPOINT: 'https://ads.adaptv.advertising.com/rtb/openrtb?ext_id=',
   E2ETESTENDPOINT: 'https://ads-wc.v.ssp.yahoo.com/rtb/openrtb?ext_id=',
   SYNC_ENDPOINT1: 'https://pixel.advertising.com/ups/57304/sync?gdpr=&gdpr_consent=&_origin=0&redir=true',
@@ -94,7 +94,6 @@ export const spec = {
       requestId: bidRequest.bidId,
       bidderCode: spec.code,
       cpm: bid.price,
-      adId: bid.adid,
       creativeId: bid.crid,
       width: size.width,
       height: size.height,
diff --git a/test/spec/modules/oneVideoBidAdapter_spec.js b/test/spec/modules/oneVideoBidAdapter_spec.js
index bc37ea15255..9ee1045a6e8 100644
--- a/test/spec/modules/oneVideoBidAdapter_spec.js
+++ b/test/spec/modules/oneVideoBidAdapter_spec.js
@@ -221,7 +221,7 @@ describe('OneVideoBidAdapter', function () {
       const placement = bidRequest.params.video.placement;
       const rewarded = bidRequest.params.video.rewarded;
       const inventoryid = bidRequest.params.video.inventoryid;
-      const VERSION = '3.0.5';
+      const VERSION = '3.0.6';
       expect(data.imp[0].video.w).to.equal(width);
       expect(data.imp[0].video.h).to.equal(height);
       expect(data.imp[0].bidfloor).to.equal(bidRequest.params.bidfloor);
@@ -567,7 +567,6 @@ describe('OneVideoBidAdapter', function () {
         requestId: bidRequest.bidId,
         bidderCode: spec.code,
         cpm: serverResponse.seatbid[0].bid[0].price,
-        adId: serverResponse.seatbid[0].bid[0].adid,
         creativeId: serverResponse.seatbid[0].bid[0].crid,
         vastXml: serverResponse.seatbid[0].bid[0].adm,
         width: 640,

From f250fe7fa6d9ab7c5714995e1e4e49285070e830 Mon Sep 17 00:00:00 2001
From: Patrick McCann <patmmccann@gmail.com>
Date: Thu, 4 Mar 2021 19:00:40 -0400
Subject: [PATCH 297/304] PBS Bid Adapter: add dchain (demand chain object) to
 prebid server adapter (#6383)

* Update prebidServerBidAdapter_spec.js

* Update index.js
---
 modules/prebidServerBidAdapter/index.js          | 1 +
 test/spec/modules/prebidServerBidAdapter_spec.js | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index d64dad31b17..7cfef6a0784 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -930,6 +930,7 @@ const OPEN_RTB_PROTOCOL = {
           if (bid.burl) { bidObject.burl = bid.burl; }
           bidObject.currency = (response.cur) ? response.cur : DEFAULT_S2S_CURRENCY;
           bidObject.meta = bidObject.meta || {};
+          if (bid.ext && bid.ext.dchain) { bidObject.meta.dchain = utils.deepClone(bid.ext.dchain); }
           if (bid.adomain) { bidObject.meta.advertiserDomains = bid.adomain; }
 
           // the OpenRTB location for "TTL" as understood by Prebid.js is "exp" (expiration).
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index e5c6fe0324a..9e20629fe45 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -270,6 +270,7 @@ const RESPONSE_OPENRTB = {
                 'win': 'http://wurl.org?id=333'
               }
             },
+            'dchain': { 'ver': '1.0', 'complete': 0, 'nodes': [ { 'asi': 'magnite.com', 'bsid': '123456789', } ] },
             'bidder': {
               'appnexus': {
                 'brand_id': 1,
@@ -1936,6 +1937,9 @@ describe('S2S Adapter', function () {
       expect(response).to.have.property('meta');
       expect(response.meta).to.have.property('advertiserDomains');
       expect(response.meta.advertiserDomains[0]).to.equal('appnexus.com');
+      expect(response.meta).to.have.property('dchain');
+      expect(response.meta.dchain.ver).to.equal('1.0');
+      expect(response.meta.dchain.nodes[0].asi).to.equal('magnite.com');
       expect(response).to.not.have.property('vastUrl');
       expect(response).to.not.have.property('videoCacheKey');
       expect(response).to.have.property('ttl', 60);

From f51ce4e87d6771850bc9d63863891e84bf10a53a Mon Sep 17 00:00:00 2001
From: Harshad Mane <harshad.mane@pubmatic.com>
Date: Fri, 5 Mar 2021 03:25:05 -0800
Subject: [PATCH 298/304] Gulp Build: fix to populate modules list when gulp
 bundle is executed (#6331)

* added support for pubcommon, digitrust, id5id

* added support for IdentityLink

* changed the source for id5

* added unit test cases

* changed source param for identityLink

* need to update modules list when gulp bundle is called

* added a comment
---
 gulpfile.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gulpfile.js b/gulpfile.js
index 51536992bd0..d7b91db4ade 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -157,7 +157,7 @@ function makeWebpackPkg() {
 
   const analyticsSources = helpers.getAnalyticsSources();
   const moduleSources = helpers.getModulePaths(externalModules);
-  const modulesString = (externalModules.length > 0) ? externalModules.join(', ') :  'All available modules in current version.';
+  const modulesString = getModulesListToAddInBanner(externalModules);
 
   return gulp.src([].concat(moduleSources, analyticsSources, 'src/prebid.js'))
     .pipe(helpers.nameModules(externalModules))
@@ -167,6 +167,10 @@ function makeWebpackPkg() {
     .pipe(gulp.dest('build/dist'));
 }
 
+function getModulesListToAddInBanner(modules){
+  return (modules.length > 0) ? modules.join(', ') :  'All available modules in current version.';
+}
+
 function gulpBundle(dev) {
   return bundle(dev).pipe(gulp.dest('build/' + (dev ? 'dev' : 'dist')));
 }
@@ -216,6 +220,8 @@ function bundle(dev, moduleArr) {
   return gulp.src(
     entries
   )
+    // Need to uodate the "Modules: ..." section in comment with the current modules list
+    .pipe(replace(/(Modules: )(.*?)(\*\/)/, ('$1' + getModulesListToAddInBanner(helpers.getArgModules()) + ' $3')))
     .pipe(gulpif(dev, sourcemaps.init({ loadMaps: true })))
     .pipe(concat(outputFileName))
     .pipe(gulpif(!argv.manualEnable, footer('\n<%= global %>.processQueue();', {

From dc15ae5cfb357fea72da6ad4b79f29f4cc5651bb Mon Sep 17 00:00:00 2001
From: Skylinar <53079123+Skylinar@users.noreply.github.com>
Date: Fri, 5 Mar 2021 22:31:23 +0100
Subject: [PATCH 299/304] Smartx Bid Adapter: updated out-stream render to
 support smartPlay 5.2 (#6370)

* Add smartclipBidAdapter

* smartxBidAdapter.js - removed unused variables, removed debug, added window before the outstream related functions

* - made outstream player configurable

* remove wrong named files

* camelcase

* fix

* Out-Stream render update to SmartPlay 5.2

* ESlint fix

* ESlint fix

* ESlint fix

* adjust tests, fixes

* ESlint

Co-authored-by: smartclip AdTechnology <adtech@smartclip.com>
Co-authored-by: Gino Cirlini <adtech@smartclip.tv>
---
 modules/smartxBidAdapter.js                | 64 +++++++---------------
 modules/smartxBidAdapter.md                | 12 ++--
 test/spec/modules/smartxBidAdapter_spec.js |  4 +-
 3 files changed, 29 insertions(+), 51 deletions(-)

diff --git a/modules/smartxBidAdapter.js b/modules/smartxBidAdapter.js
index 804b25d1afc..57c54cb5090 100644
--- a/modules/smartxBidAdapter.js
+++ b/modules/smartxBidAdapter.js
@@ -64,7 +64,7 @@ export const spec = {
         return false;
       }
       if (!utils.getBidIdParameter('outstream_function', bid.params)) {
-        utils.logMessage(BIDDER_CODE + ': outstream_function parameter is not defined. The default outstream renderer will be injected in the header. You can override the default SmartX outstream rendering by defining your own Outstream function using field outstream_function.');
+        utils.logMessage(BIDDER_CODE + ': outstream_function parameter is not defined. The default outstream renderer will be injected in the header.');
         return true;
       }
     }
@@ -311,7 +311,7 @@ export const spec = {
                   return utils.logMessage('SmartX outstream video loaded event');
                 },
                 ended: function ended() {
-                  utils.logMessage('SmartX outstream renderer video event');
+                  return utils.logMessage('SmartX outstream renderer video event');
                 }
               });
             } catch (err) {
@@ -328,50 +328,25 @@ export const spec = {
 }
 
 function createOutstreamScript(bid) {
-  // for SmartPlay 4.12
-  function scPrebidClose(ele, completeCollapsed) {
-    if (completeCollapsed) {
-      document.getElementById(ele.id).style.display = 'none';
-    }
-  }
-
   const confMinAdWidth = utils.getBidIdParameter('minAdWidth', bid.renderer.config.outstream_options) || 290;
   const confMaxAdWidth = utils.getBidIdParameter('maxAdWidth', bid.renderer.config.outstream_options) || 900;
-  const confStartOpen = utils.getBidIdParameter('startOpen', bid.renderer.config.outstream_options) || 'false';
-  const confEndingScreen = utils.getBidIdParameter('endingScreen', bid.renderer.config.outstream_options) || 'true';
-  const confHeaderText = utils.getBidIdParameter('headerText', bid.renderer.config.outstream_options) || '';
-  const confSkipOffset = utils.getBidIdParameter('skipOffset', bid.renderer.config.outstream_options) || 0;
-  const confDesiredBitrate = utils.getBidIdParameter('desiredBitrate', bid.renderer.config.outstream_options) || 1600;
+  const confStartOpen = utils.getBidIdParameter('startOpen', bid.renderer.config.outstream_options);
+  const confEndingScreen = utils.getBidIdParameter('endingScreen', bid.renderer.config.outstream_options);
+  const confTitle = utils.getBidIdParameter('title', bid.renderer.config.outstream_options);
+  const confSkipOffset = utils.getBidIdParameter('skipOffset', bid.renderer.config.outstream_options);
+  const confDesiredBitrate = utils.getBidIdParameter('desiredBitrate', bid.renderer.config.outstream_options);
   const elementId = utils.getBidIdParameter('slot', bid.renderer.config.outstream_options) || bid.adUnitCode;
 
-  // for SmartPlay 4.12
-  let initCollapsed = true;
-  let completeCollapsed = true;
-  if (confStartOpen === 'true') {
-    initCollapsed = false;
-  }
-  if (confEndingScreen === 'true') {
-    completeCollapsed = false;
-  }
-
   utils.logMessage('[SMARTX][renderer] Handle SmartX outstream renderer');
 
-  let smartPlayObj = {
+  var smartPlayObj = {
     minAdWidth: confMinAdWidth,
     maxAdWidth: confMaxAdWidth,
-    headerText: confHeaderText,
+    title: confTitle,
     skipOffset: confSkipOffset,
-    behaviourMatrix: {
-      init: {
-        'collapsed': initCollapsed
-      },
-      complete: {
-        'collapsed': completeCollapsed
-      }
-    },
-    environmentVars: {
-      desiredBitrate: confDesiredBitrate,
-    },
+    startOpen: confStartOpen,
+    endingScreen: confEndingScreen,
+    desiredBitrate: confDesiredBitrate,
     onStartCallback: function (m, n) {
       try {
         window.sc_smartIntxtStart(n);
@@ -384,23 +359,24 @@ function createOutstreamScript(bid) {
     },
     onEndCallback: function (m, n) {
       try {
-        scPrebidClose(n, completeCollapsed); // for SmartPlay 4.12
         window.sc_smartIntxtEnd(n);
       } catch (f) {}
     },
   };
+
   smartPlayObj.adResponse = bid.vastContent;
-  const script = window.document.createElement('script');
+
+  const divID = '#' + elementId;
+  var script = document.createElement('script');
+  script.src = 'https://dco.smartclip.net/?plc=7777778';
   script.type = 'text/javascript';
   script.async = 'true';
-  script.src = 'https://dco.smartclip.net/?plc=7777777';
   script.onload = script.onreadystatechange = function () {
-    var rs = this.readyState;
-    if (rs && rs != 'complete' && rs != 'loaded') return;
     try {
-      window.SmartPlay(elementId, smartPlayObj);
+      // eslint-disable-next-line
+      let _outstreamPlayer = new OutstreamPlayer(divID, smartPlayObj);
     } catch (e) {
-      utils.logError('error caught : ' + e);
+      utils.logError('[SmartPlay][renderer] Error caught: ' + e);
     }
   };
   return script;
diff --git a/modules/smartxBidAdapter.md b/modules/smartxBidAdapter.md
index 082a36f3dde..b25ce68bb6e 100644
--- a/modules/smartxBidAdapter.md
+++ b/modules/smartxBidAdapter.md
@@ -36,10 +36,10 @@ This adapter requires setup and approval from the smartclip team.
                     slot: 'video1',
                     minAdWidth: 290,
                     maxAdWidth: 900,
-                    headerText: '',
+                    title: '',
                     skipOffset: 0,
-                    startOpen: 'true',
-                    endingScreen: 'true',
+                    startOpen: true,
+                    endingScreen: true,
                     desiredBitrate: 1600,
                 },
             }
@@ -71,10 +71,10 @@ This adapter requires setup and approval from the smartclip team.
                     slot: 'video1',
                     minAdWidth: 290,
                     maxAdWidth: 900,
-                    headerText: '',
+                    title: '',
                     skipOffset: 0,
-                    startOpen: 'true',
-                    endingScreen: 'true',
+                    startOpen: true,
+                    endingScreen: true,
                     desiredBitrate: 1600,
                 },
                 user: {
diff --git a/test/spec/modules/smartxBidAdapter_spec.js b/test/spec/modules/smartxBidAdapter_spec.js
index 82c6642bd74..abc06b48ce7 100644
--- a/test/spec/modules/smartxBidAdapter_spec.js
+++ b/test/spec/modules/smartxBidAdapter_spec.js
@@ -421,6 +421,8 @@ describe('The smartx adapter', function () {
     it('should return an array of bid responses', function () {
       var responses = spec.interpretResponse(serverResponse, bidderRequestObj);
       expect(responses).to.be.an('array').with.length(2);
+      expect(bidderRequestObj).to.be.an('Object');
+      expect(bidderRequestObj.bidRequest.bids).to.be.an('array').with.length(2);
       expect(responses[0].requestId).to.equal(123);
       expect(responses[0].currency).to.equal('USD');
       expect(responses[0].cpm).to.equal(12);
@@ -505,7 +507,7 @@ describe('The smartx adapter', function () {
       responses[0].renderer.render(responses[0]);
 
       expect(scriptTag.getAttribute('type')).to.equal('text/javascript');
-      expect(scriptTag.getAttribute('src')).to.equal('https://dco.smartclip.net/?plc=7777777');
+      expect(scriptTag.getAttribute('src')).to.equal('https://dco.smartclip.net/?plc=7777778');
 
       window.document.getElementById.restore();
     });

From 8c686a931022995265499034e5a6b6d0d2cea68d Mon Sep 17 00:00:00 2001
From: mmoschovas <63253416+mmoschovas@users.noreply.github.com>
Date: Fri, 5 Mar 2021 17:51:35 -0500
Subject: [PATCH 300/304] Fpd 2.0 Update (#6293)

* Update to consolidate applying FPD to both banner and video requests. FPD will be merged using global defined FPD, ad unit FPD, and rubicon bidder param FPD. Validation logic with warning logs added

* Refectored last push to:
1) Correct keywords bug
2) Revise error which looked for FPD in (user/context).ext.data as opposed to (user/context).data
3) General code cleanup

* Consolidated other FPD data logic into new function

* 1. Update to move pbadslot and adserver data into imp[] as opposed to parent.
2. Update to convert keywords passed through RP params to string if array found

* Removed unnecessary conditional

* Changed conditional to check for undefined type

* FPD 2.0 Update
1) The setConfig and setBidderConfig functions support a transition period where they map the original 'fpd' config:
   - fpd.context.ATTR --> ortb2.site.ATTR
   - fpd.context.data.ATTR --> ortb2.site.ext.data
   - fpd.user.ATTR --> ortb2.user.ATTR
   - fpd.user.data.ATTR --> ortb2.user.ext.data
2) gptPreAuction:
   a) move adunit.fpd to adunit.ortb2
   b) adUnit.ortb2Imp.ext.data.adserver.{name, adSlot}
   c) pbAdSlot moves to AdUnit.ortb2Imp.ext.data.pbAdSlot

3) pbsBidAdapter
   a) merge the new ortb2 and AdUnit.ortb2Imp.ext objects into the OpenRTB JSON.
   b) therefore imp[].ext.context.data.pbadslot is now changed to imp[].ext.data.pbadslot (no context)
   c) read adUnit.ortb2Imp.ext.data.adserver from the new location. Output location is moved to imp[].ext.data.adserver (no context)

* FPD 2.0 Update
Update to adrelevantis adapter to look at config.ortb2 instead of config.fpd

* FPD 2.0 Update
Update to amx adapter to look at config.ortb2 instead of config.fpd

* FPD 2.0 Update
Update to avocet adapter to look at config.ortb2 instead of config.fpd

* FPD 2.0 Update
Update to criteo adapter to look at config.ortb2 instead of config.fpd

* Update to correct imp fpd structure

* Update to s2s adapter to coincide with imp fpd alteration

* Update to consolidate several lines of duplicate code into one location

* Slight modification for ortb2Imp to use ortb2Imp.ext as opposed to ortb2Imp.ext.data

* FPD 2.0 Update
Update to grid adapter to look at config.ortb2 instead of config.fpd

* FPD 2.0 Update
Update to inmar adapter to look at config.ortb2 instead of config.fpd

* FPD 2.0 Update
Update to luponmedia adapter to look at config.ortb2 instead of config.fpd

* FPD 2.0 Update
Update to smaato adapter to look at config.ortb2 instead of config.fpd

* FPD 2.0 Update
Update to triplelift adapter to look at config.ortb2 instead of config.fpd

* Update to gptPreAuction to move over to imp level ortb2

* FPD 2.0 Update
Update to triplelift adapter to look at config.ortb2 instead of config.fpd

* FPD 2.0 Update

* FPD 2.0 Update
Update to jwplayerRtd adapter to look at config.ortb2 instead of config.fpd

* FPD 2.0 Update
Update to admixer adapter to look at config.ortb2 instead of config.fpd

* FPD 2.0 Update
Update to rubicon adapter to look at config.ortb2 instead of config.fpd

* Update to fix keyword bug

* Added backwards compatibility functions for FPD both global/bidder and adunit level data

* Update to utilize new backward functionality for fpd 2.0

* Removed extra new line

* Update to include new backward functionality for FPD 2.0 data

* Update to utilize new backward functionality to pass FPD 2.0 data

* Update to utilize backward functionality to pass FPD 2.0 data

* Update to utilize backward functionality to pass FPD 2.0 data

* Update to utilize backward functionality to pass FPD 2.0 data

* Update to utilize backward functionality to pass FPD 2.0 data

* Update to utilize backward functionality to pass FPD 2.0 data

* Fixed typo in fpd config object location

* Uodate to utilize backward functionality to pass FPD 2.0 data

* Update to change all ortb2Imp.ext.data.adserver.adSlot references to ortb2Imp.ext.data.adserver.adslot - all lowercase. Corresponding adapter and unit tests to adhere to these changes

* Fixed typo

* Fixed typo

* FPD 2.0 update to rubicon adapter to pass iab values

* Updates:
1) Change function name
2) addAdUnits always pass array
3) Remove unecessary comment
4) Bug fix for ortb2.user.data to be filtered on legacy fpd conversion
---
 modules/admixerBidAdapter.js                  |   8 +-
 modules/adrelevantisBidAdapter.js             |   6 +-
 modules/amxBidAdapter.js                      |   2 +-
 modules/avocetBidAdapter.js                   |   2 +-
 modules/criteoBidAdapter.js                   |  11 +-
 modules/gptPreAuction.js                      |  32 +--
 modules/gridBidAdapter.js                     |   4 +-
 modules/inmarBidAdapter.js                    |   2 +-
 modules/jwplayerRtdProvider.js                |   4 +-
 modules/luponmediaBidAdapter.js               |   7 +-
 modules/prebidServerBidAdapter/index.js       |  60 +++---
 modules/rubiconBidAdapter.js                  |  97 +++++----
 modules/smaatoBidAdapter.js                   |   6 +-
 modules/tripleliftBidAdapter.js               |  11 +-
 src/adapterManager.js                         |   2 +-
 src/config.js                                 | 135 ++++++++++++-
 src/prebid.js                                 |   6 +-
 test/spec/adUnits_spec.js                     |  11 +
 test/spec/config_spec.js                      |  15 ++
 .../modules/adrelevantisBidAdapter_spec.js    |  10 +-
 test/spec/modules/amxBidAdapter_spec.js       |  20 +-
 test/spec/modules/criteoBidAdapter_spec.js    |  24 ++-
 test/spec/modules/gptPreAuction_spec.js       |  54 ++---
 test/spec/modules/gridBidAdapter_spec.js      |  10 +
 test/spec/modules/jwplayerRtdProvider_spec.js |  48 ++---
 .../modules/prebidServerBidAdapter_spec.js    | 110 ++++++----
 test/spec/modules/rubiconBidAdapter_spec.js   | 190 +++++++++++-------
 test/spec/modules/smaatoBidAdapter_spec.js    |   6 +-
 .../spec/modules/tripleliftBidAdapter_spec.js |  20 +-
 29 files changed, 583 insertions(+), 330 deletions(-)

diff --git a/modules/admixerBidAdapter.js b/modules/admixerBidAdapter.js
index d2a6f9a639e..6cf738a0086 100644
--- a/modules/admixerBidAdapter.js
+++ b/modules/admixerBidAdapter.js
@@ -21,7 +21,7 @@ export const spec = {
   buildRequests: function (validRequest, bidderRequest) {
     const payload = {
       imps: [],
-      fpd: config.getConfig('fpd')
+      fpd: config.getLegacyFpd(config.getConfig('ortb2'))
     };
     let endpointUrl;
     if (bidderRequest) {
@@ -42,7 +42,11 @@ export const spec = {
       }
     }
     validRequest.forEach((bid) => {
-      payload.imps.push(bid);
+      let imp = {};
+      Object.keys(bid).forEach(key => {
+        (key === 'ortb2Imp') ? imp.fpd = config.getLegacyImpFpd(bid[key]) : imp[key] = bid[key];
+      });
+      payload.imps.push(imp);
     });
     const payloadString = JSON.stringify(payload);
     return {
diff --git a/modules/adrelevantisBidAdapter.js b/modules/adrelevantisBidAdapter.js
index 5da941c65ca..c6298cffde9 100644
--- a/modules/adrelevantisBidAdapter.js
+++ b/modules/adrelevantisBidAdapter.js
@@ -120,11 +120,11 @@ export const spec = {
       payload.referrer_detection = refererinfo;
     }
 
-    let fpdcfg = config.getConfig('fpd')
+    let fpdcfg = config.getLegacyFpd(config.getConfig('ortb2'));
     if (fpdcfg && fpdcfg.context) {
       let fdata = {
-        keywords: fpdcfg.context.keywords,
-        category: fpdcfg.context.data.category
+        keywords: fpdcfg.context.keywords || '',
+        category: utils.deepAccess(fpdcfg, 'context.data.category') || ''
       }
       payload.fpd = fdata;
     }
diff --git a/modules/amxBidAdapter.js b/modules/amxBidAdapter.js
index a1fa202c154..497c2142b9b 100644
--- a/modules/amxBidAdapter.js
+++ b/modules/amxBidAdapter.js
@@ -259,7 +259,7 @@ export const spec = {
       d: '',
       m: createBidMap(bidRequests),
       cpp: config.getConfig('coppa') ? 1 : 0,
-      fpd: config.getConfig('fpd'),
+      fpd: config.getLegacyFpd(config.getConfig('ortb2')),
       eids: values(bidRequests.reduce((all, bid) => {
         // we only want unique ones in here
         if (bid == null || bid.userIdAsEids == null) {
diff --git a/modules/avocetBidAdapter.js b/modules/avocetBidAdapter.js
index 7a9e5062c0f..1283bb865d4 100644
--- a/modules/avocetBidAdapter.js
+++ b/modules/avocetBidAdapter.js
@@ -53,7 +53,7 @@ export const spec = {
     const publisherDomain = config.getConfig('publisherDomain');
 
     // First-party data from config
-    const fpd = config.getConfig('fpd');
+    const fpd = config.getLegacyFpd(config.getConfig('ortb2'));
 
     // GDPR status and TCF consent string
     let tcfConsentString;
diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index e3a6b9eaa12..41cbb0670c8 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -28,7 +28,7 @@ export const spec = {
   gvlid: GVLID,
   supportedMediaTypes: [ BANNER, VIDEO, NATIVE ],
 
-  /**
+  /** f
    * @param {object} bid
    * @return {boolean}
    */
@@ -56,10 +56,11 @@ export const spec = {
   buildRequests: (bidRequests, bidderRequest) => {
     let url;
     let data;
+    let fpd = config.getLegacyFpd(config.getConfig('ortb2')) || {};
 
     Object.assign(bidderRequest, {
-      publisherExt: config.getConfig('fpd.context'),
-      userExt: config.getConfig('fpd.user'),
+      publisherExt: fpd.context,
+      userExt: fpd.user,
       ceh: config.getConfig('criteo.ceh')
     });
 
@@ -280,8 +281,8 @@ function buildCdbRequest(context, bidRequests, bidderRequest) {
       if (bidRequest.params.zoneId) {
         slot.zoneid = bidRequest.params.zoneId;
       }
-      if (bidRequest.fpd && bidRequest.fpd.context) {
-        slot.ext = bidRequest.fpd.context;
+      if (utils.deepAccess(bidRequest, 'ortb2Imp.ext')) {
+        slot.ext = bidRequest.ortb2Imp.ext;
       }
       if (bidRequest.params.ext) {
         slot.ext = Object.assign({}, slot.ext, bidRequest.params.ext);
diff --git a/modules/gptPreAuction.js b/modules/gptPreAuction.js
index 48b72671d6a..ee2b5406453 100644
--- a/modules/gptPreAuction.js
+++ b/modules/gptPreAuction.js
@@ -26,46 +26,48 @@ export const appendGptSlots = adUnits => {
 
     if (matchingAdUnitCode) {
       const adUnit = adUnitMap[matchingAdUnitCode];
-      adUnit.fpd = adUnit.fpd || {};
-      adUnit.fpd.context = adUnit.fpd.context || {};
+      adUnit.ortb2Imp = adUnit.ortb2Imp || {};
+      adUnit.ortb2Imp.ext = adUnit.ortb2Imp.ext || {};
+      adUnit.ortb2Imp.ext.data = adUnit.ortb2Imp.ext.data || {};
 
-      const context = adUnit.fpd.context;
-      context.adServer = context.adServer || {};
-      context.adServer.name = 'gam';
-      context.adServer.adSlot = slot.getAdUnitPath();
+      const context = adUnit.ortb2Imp.ext.data;
+      context.adserver = context.adserver || {};
+      context.adserver.name = 'gam';
+      context.adserver.adslot = slot.getAdUnitPath();
     }
   });
 };
 
 export const appendPbAdSlot = adUnit => {
-  adUnit.fpd = adUnit.fpd || {};
-  adUnit.fpd.context = adUnit.fpd.context || {};
-  const context = adUnit.fpd.context;
+  adUnit.ortb2Imp = adUnit.ortb2Imp || {};
+  adUnit.ortb2Imp.ext = adUnit.ortb2Imp.ext || {};
+  adUnit.ortb2Imp.ext.data = adUnit.ortb2Imp.ext.data || {};
+  const context = adUnit.ortb2Imp.ext.data;
   const { customPbAdSlot } = _currentConfig;
 
   if (customPbAdSlot) {
-    context.pbAdSlot = customPbAdSlot(adUnit.code, utils.deepAccess(context, 'adServer.adSlot'));
+    context.pbadslot = customPbAdSlot(adUnit.code, utils.deepAccess(context, 'adserver.adslot'));
     return;
   }
 
   // use context.pbAdSlot if set
-  if (context.pbAdSlot) {
+  if (context.pbadslot) {
     return;
   }
   // use data attribute 'data-adslotid' if set
   try {
     const adUnitCodeDiv = document.getElementById(adUnit.code);
     if (adUnitCodeDiv.dataset.adslotid) {
-      context.pbAdSlot = adUnitCodeDiv.dataset.adslotid;
+      context.pbadslot = adUnitCodeDiv.dataset.adslotid;
       return;
     }
   } catch (e) {}
   // banner adUnit, use GPT adunit if defined
-  if (context.adServer) {
-    context.pbAdSlot = context.adServer.adSlot;
+  if (utils.deepAccess(context, 'adserver.adslot')) {
+    context.pbadslot = context.adserver.adslot;
     return;
   }
-  context.pbAdSlot = adUnit.code;
+  context.pbadslot = adUnit.code;
 };
 
 export const makeBidRequestsHook = (fn, adUnits, ...args) => {
diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js
index 8ab2e2b8a95..964b34dcfa2 100644
--- a/modules/gridBidAdapter.js
+++ b/modules/gridBidAdapter.js
@@ -180,8 +180,8 @@ export const spec = {
     }
 
     const configKeywords = utils.transformBidderParamKeywords({
-      'user': utils.deepAccess(config.getConfig('fpd.user'), 'keywords') || null,
-      'context': utils.deepAccess(config.getConfig('fpd.context'), 'keywords') || null
+      'user': utils.deepAccess(config.getConfig('ortb2.user'), 'keywords') || null,
+      'context': utils.deepAccess(config.getConfig('ortb2.site'), 'keywords') || null
     });
 
     if (configKeywords.length) {
diff --git a/modules/inmarBidAdapter.js b/modules/inmarBidAdapter.js
index 7583985b23c..e1edd935587 100755
--- a/modules/inmarBidAdapter.js
+++ b/modules/inmarBidAdapter.js
@@ -40,7 +40,7 @@ export const spec = {
       uspConsent: bidderRequest.uspConsent,
       currencyCode: config.getConfig('currency.adServerCurrency'),
       coppa: config.getConfig('coppa'),
-      firstPartyData: config.getConfig('fpd'),
+      firstPartyData: config.getLegacyFpd(config.getConfig('ortb2')),
       prebidVersion: '$prebid.version$'
     };
 
diff --git a/modules/jwplayerRtdProvider.js b/modules/jwplayerRtdProvider.js
index a29c4ce5fa7..8332e720ae7 100644
--- a/modules/jwplayerRtdProvider.js
+++ b/modules/jwplayerRtdProvider.js
@@ -144,7 +144,7 @@ function enrichBidRequest(bidReqConfig, onDone) {
  * @param {function} onDone
  */
 export function enrichAdUnits(adUnits) {
-  const fpdFallback = config.getConfig('fpd.context.data.jwTargeting');
+  const fpdFallback = config.getConfig('ortb2.site.ext.data.jwTargeting');
   adUnits.forEach(adUnit => {
     const jwTargeting = extractPublisherParams(adUnit, fpdFallback);
     if (!jwTargeting || !Object.keys(jwTargeting).length) {
@@ -170,7 +170,7 @@ function supportsInstreamVideo(mediaTypes) {
 export function extractPublisherParams(adUnit, fallback) {
   let adUnitTargeting;
   try {
-    adUnitTargeting = adUnit.fpd.context.data.jwTargeting;
+    adUnitTargeting = adUnit.ortb2Imp.ext.data.jwTargeting;
   } catch (e) {}
 
   if (!adUnitTargeting && !supportsInstreamVideo(adUnit.mediaTypes)) {
diff --git a/modules/luponmediaBidAdapter.js b/modules/luponmediaBidAdapter.js
index 4f7fd2ae1a0..29b54f77fbb 100644
--- a/modules/luponmediaBidAdapter.js
+++ b/modules/luponmediaBidAdapter.js
@@ -279,8 +279,9 @@ function newOrtbBidRequest(bidRequest, bidderRequest, currentImps) {
     utils.deepSetValue(data, 'source.ext.schain', bidRequest.schain);
   }
 
-  const siteData = Object.assign({}, bidRequest.params.inventory, config.getConfig('fpd.context'));
-  const userData = Object.assign({}, bidRequest.params.visitor, config.getConfig('fpd.user'));
+  const fpd = config.getLegacyFpd(config.getConfig('ortb2')) || {};
+  const siteData = Object.assign({}, bidRequest.params.inventory, fpd.context);
+  const userData = Object.assign({}, bidRequest.params.visitor, fpd.user);
 
   if (!utils.isEmpty(siteData) || !utils.isEmpty(userData)) {
     const bidderData = {
@@ -301,7 +302,7 @@ function newOrtbBidRequest(bidRequest, bidderRequest, currentImps) {
     utils.deepSetValue(data, 'ext.prebid.bidderconfig.0', bidderData);
   }
 
-  const pbAdSlot = utils.deepAccess(bidRequest, 'fpd.context.pbAdSlot');
+  const pbAdSlot = utils.deepAccess(bidRequest, 'ortb2Imp.ext.data.pbadslot');
   if (typeof pbAdSlot === 'string' && pbAdSlot) {
     utils.deepSetValue(data.imp[0].ext, 'context.data.adslot', pbAdSlot);
   }
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 7cfef6a0784..20cf93caae5 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -336,18 +336,18 @@ function addBidderFirstPartyDataToRequest(request) {
   const bidderConfig = config.getBidderConfig();
   const fpdConfigs = Object.keys(bidderConfig).reduce((acc, bidder) => {
     const currBidderConfig = bidderConfig[bidder];
-    if (currBidderConfig.fpd) {
-      const fpd = {};
-      if (currBidderConfig.fpd.context) {
-        fpd.site = currBidderConfig.fpd.context;
+    if (currBidderConfig.ortb2) {
+      const ortb2 = {};
+      if (currBidderConfig.ortb2.site) {
+        ortb2.site = currBidderConfig.ortb2.site;
       }
-      if (currBidderConfig.fpd.user) {
-        fpd.user = currBidderConfig.fpd.user;
+      if (currBidderConfig.ortb2.user) {
+        ortb2.user = currBidderConfig.ortb2.user;
       }
 
       acc.push({
         bidders: [ bidder ],
-        config: { fpd }
+        config: { ortb2 }
       });
     }
     return acc;
@@ -618,23 +618,27 @@ const OPEN_RTB_PROTOCOL = {
 
       const imp = { id: adUnit.code, ext, secure: s2sConfig.secure };
 
-      /**
-       * Prebid AdSlot
-       * @type {(string|undefined)}
-       */
-      const pbAdSlot = utils.deepAccess(adUnit, 'fpd.context.pbAdSlot');
-      if (typeof pbAdSlot === 'string' && pbAdSlot) {
-        utils.deepSetValue(imp, 'ext.context.data.pbadslot', pbAdSlot);
-      }
-
-      /**
-       * Copy GAM AdUnit and Name to imp
-       */
-      ['name', 'adSlot'].forEach(name => {
-        /** @type {(string|undefined)} */
-        const value = utils.deepAccess(adUnit, `fpd.context.adserver.${name}`);
-        if (typeof value === 'string' && value) {
-          utils.deepSetValue(imp, `ext.context.data.adserver.${name.toLowerCase()}`, value);
+      const ortb2 = {...utils.deepAccess(adUnit, 'ortb2Imp.ext.data')};
+      Object.keys(ortb2).forEach(prop => {
+        /**
+          * Prebid AdSlot
+          * @type {(string|undefined)}
+        */
+        if (prop === 'pbadslot') {
+          if (typeof ortb2[prop] === 'string' && ortb2[prop]) utils.deepSetValue(imp, 'ext.data.pbadslot', ortb2[prop]);
+        } else if (prop === 'adserver') {
+          /**
+           * Copy GAM AdUnit and Name to imp
+           */
+          ['name', 'adslot'].forEach(name => {
+            /** @type {(string|undefined)} */
+            const value = utils.deepAccess(ortb2, `adserver.${name}`);
+            if (typeof value === 'string' && value) {
+              utils.deepSetValue(imp, `ext.data.adserver.${name.toLowerCase()}`, value);
+            }
+          });
+        } else {
+          utils.deepSetValue(imp, `ext.data.${prop}`, ortb2[prop]);
         }
       });
 
@@ -763,12 +767,12 @@ const OPEN_RTB_PROTOCOL = {
       utils.deepSetValue(request, 'regs.coppa', 1);
     }
 
-    const commonFpd = getConfig('fpd') || {};
-    if (commonFpd.context) {
-      utils.deepSetValue(request, 'site.ext.data', commonFpd.context);
+    const commonFpd = getConfig('ortb2') || {};
+    if (commonFpd.site) {
+      utils.deepSetValue(request, 'site', commonFpd.site);
     }
     if (commonFpd.user) {
-      utils.deepSetValue(request, 'user.ext.data', commonFpd.user);
+      utils.deepSetValue(request, 'user', commonFpd.user);
     }
     addBidderFirstPartyDataToRequest(request);
 
diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index 7297c82440f..9905498edee 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -871,21 +871,26 @@ function addVideoParameters(data, bidRequest) {
 }
 
 function applyFPD(bidRequest, mediaType, data) {
-  const bidFpd = {
-    user: {...bidRequest.params.visitor},
-    context: {...bidRequest.params.inventory}
+  const BID_FPD = {
+    user: {ext: {data: {...bidRequest.params.visitor}}},
+    site: {ext: {data: {...bidRequest.params.inventory}}}
   };
 
-  if (bidRequest.params.keywords) bidFpd.context.keywords = (utils.isArray(bidRequest.params.keywords)) ? bidRequest.params.keywords.join(',') : bidRequest.params.keywords;
+  if (bidRequest.params.keywords) BID_FPD.site.keywords = (utils.isArray(bidRequest.params.keywords)) ? bidRequest.params.keywords.join(',') : bidRequest.params.keywords;
 
-  let fpd = utils.mergeDeep({}, config.getConfig('fpd') || {}, bidRequest.fpd || {}, bidFpd);
-
-  const map = {user: {banner: 'tg_v.', code: 'user'}, context: {banner: 'tg_i.', code: 'site'}, adserver: 'dfp_ad_unit_code'};
-  let obj = {};
-  let impData = {};
-  let keywords = [];
+  let fpd = utils.mergeDeep({}, config.getConfig('ortb2') || {}, BID_FPD);
+  let impData = utils.deepAccess(bidRequest.ortb2Imp, 'ext.data') || {};
+  const MAP = {user: 'tg_v.', site: 'tg_i.', adserver: 'tg_i.dfp_ad_unit_code', pbadslot: 'tg_i.pbadslot', keywords: 'kw'};
   const validate = function(prop, key) {
-    if (typeof prop === 'object' && !Array.isArray(prop)) {
+    if (key === 'data' && Array.isArray(prop)) {
+      return prop.filter(name => name.segment && utils.deepAccess(name, 'ext.taxonomyname').match(/iab/i)).map(value => {
+        let segments = value.segment.filter(obj => obj.id).reduce((result, obj) => {
+          result.push(obj.id);
+          return result;
+        }, []);
+        if (segments.length > 0) return segments.toString();
+      }).toString();
+    } else if (typeof prop === 'object' && !Array.isArray(prop)) {
       utils.logWarn('Rubicon: Filtered FPD key: ', key, ': Expected value to be string, integer, or an array of strings/ints');
     } else if (typeof prop !== 'undefined') {
       return (Array.isArray(prop)) ? prop.filter(value => {
@@ -895,53 +900,43 @@ function applyFPD(bidRequest, mediaType, data) {
       }).toString() : prop.toString();
     }
   };
-
-  Object.keys(fpd).filter(value => fpd[value] && map[value] && typeof fpd[value] === 'object').forEach((type) => {
-    obj[map[type].code] = Object.keys(fpd[type]).filter(value => typeof fpd[type][value] !== 'undefined').reduce((result, key) => {
-      if (key === 'keywords') {
-        if (!Array.isArray(fpd[type][key]) && mediaType === BANNER) fpd[type][key] = [fpd[type][key]]
-
-        result[key] = fpd[type][key];
-
-        if (mediaType === BANNER) keywords = keywords.concat(fpd[type][key]);
-      } else if (key === 'data') {
-        utils.mergeDeep(result, {ext: {data: fpd[type][key]}});
-      } else if (key === 'adServer' || key === 'pbAdSlot') {
-        (key === 'adServer') ? ['name', 'adSlot'].forEach(name => {
-          const value = validate(fpd[type][key][name]);
-          if (value) utils.deepSetValue(impData, `adserver.${name.toLowerCase()}`, value.replace(/^\/+/, ''))
-        }) : impData[key.toLowerCase()] = fpd[type][key].replace(/^\/+/, '')
-      } else {
-        utils.mergeDeep(result, {ext: {data: {[key]: fpd[type][key]}}});
-      }
-
-      return result;
-    }, {});
-
-    if (mediaType === BANNER) {
-      let duplicate = (typeof obj[map[type].code].ext === 'object' && obj[map[type].code].ext.data) || {};
-
-      Object.keys(duplicate).forEach((key) => {
-        const val = (key === 'adserver') ? duplicate.adserver.adslot : validate(duplicate[key], key);
-
-        if (val) data[(map[key]) ? `${map[type][BANNER]}${map[key]}` : `${map[type][BANNER]}${key}`] = val;
-      });
-    }
-  });
+  const addBannerData = function(obj, name, key) {
+    let val = validate(obj, key);
+    let loc = (MAP[key]) ? `${MAP[key]}` : (key === 'data') ? `${MAP[name]}iab` : `${MAP[name]}${key}`;
+    data[loc] = (data[loc]) ? data[loc].concat(',', val) : val;
+  }
 
   Object.keys(impData).forEach((key) => {
-    if (mediaType === BANNER) {
-      (map[key]) ? data[`tg_i.${map[key]}`] = impData[key].adslot : data[`tg_i.${key.toLowerCase()}`] = impData[key];
-    } else {
-      utils.mergeDeep(data.imp[0], {ext: {context: {data: {[key]: impData[key]}}}});
+    if (key === 'adserver') {
+      ['name', 'adslot'].forEach(prop => {
+        if (impData[key][prop]) impData[key][prop] = impData[key][prop].replace(/^\/+/, '');
+      });
+    } else if (key === 'pbadslot') {
+      impData[key] = impData[key].replace(/^\/+/, '');
     }
   });
 
   if (mediaType === BANNER) {
-    let kw = validate(keywords, 'keywords');
-    if (kw) data.kw = kw;
+    ['site', 'user'].forEach(name => {
+      Object.keys(fpd[name]).forEach((key) => {
+        if (key !== 'ext') {
+          addBannerData(fpd[name][key], name, key);
+        } else if (fpd[name][key].data) {
+          Object.keys(fpd[name].ext.data).forEach((key) => {
+            addBannerData(fpd[name].ext.data[key], name, key);
+          });
+        }
+      });
+    });
+    Object.keys(impData).forEach((key) => {
+      (key === 'adserver') ? addBannerData(impData[key].adslot, name, key) : addBannerData(impData[key], 'site', key);
+    });
   } else {
-    utils.mergeDeep(data, obj);
+    if (Object.keys(impData).length) {
+      utils.mergeDeep(data.imp[0].ext, {data: impData});
+    }
+
+    utils.mergeDeep(data, fpd);
   }
 }
 
diff --git a/modules/smaatoBidAdapter.js b/modules/smaatoBidAdapter.js
index 93915689cee..fdb4d2df984 100644
--- a/modules/smaatoBidAdapter.js
+++ b/modules/smaatoBidAdapter.js
@@ -98,8 +98,10 @@ const buildOpenRtbBidRequestPayload = (validBidRequests, bidderRequest) => {
     }
   };
 
-  Object.assign(request.user, config.getConfig('fpd.user'));
-  Object.assign(request.site, config.getConfig('fpd.context'));
+  let fpd = config.getLegacyFpd(config.getConfig('ortb2')) || {};
+
+  Object.assign(request.user, fpd.user);
+  Object.assign(request.site, fpd.context);
 
   if (bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies === true) {
     utils.deepSetValue(request, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies ? 1 : 0);
diff --git a/modules/tripleliftBidAdapter.js b/modules/tripleliftBidAdapter.js
index b681b0980ea..e8d248eea03 100644
--- a/modules/tripleliftBidAdapter.js
+++ b/modules/tripleliftBidAdapter.js
@@ -122,8 +122,8 @@ function _buildPostBody(bidRequests) {
     } else if (bidRequest.mediaTypes.banner) {
       imp.banner = { format: _sizes(bidRequest.sizes) };
     };
-    if (!utils.isEmpty(bidRequest.fpd)) {
-      imp.fpd = _getAdUnitFpd(bidRequest.fpd);
+    if (!utils.isEmpty(bidRequest.ortb2Imp)) {
+      imp.fpd = _getAdUnitFpd(bidRequest.ortb2Imp);
     }
     return imp;
   });
@@ -190,9 +190,10 @@ function _getGlobalFpd() {
   const fpd = {};
   const context = {}
   const user = {};
+  const ortbData = config.getLegacyFpd(config.getConfig('ortb2')) || {};
 
-  const fpdContext = Object.assign({}, config.getConfig('fpd.context'));
-  const fpdUser = Object.assign({}, config.getConfig('fpd.user'));
+  const fpdContext = Object.assign({}, ortbData.context);
+  const fpdUser = Object.assign({}, ortbData.user);
 
   _addEntries(context, fpdContext);
   _addEntries(user, fpdUser);
@@ -210,7 +211,7 @@ function _getAdUnitFpd(adUnitFpd) {
   const fpd = {};
   const context = {};
 
-  _addEntries(context, adUnitFpd.context);
+  _addEntries(context, adUnitFpd.ext);
 
   if (!utils.isEmpty(context)) {
     fpd.context = context;
diff --git a/src/adapterManager.js b/src/adapterManager.js
index cb84607e130..f7f5d821932 100644
--- a/src/adapterManager.js
+++ b/src/adapterManager.js
@@ -68,7 +68,7 @@ function getBids({bidderCode, auctionId, bidderRequestId, adUnits, labels, src})
           }
 
           bid = Object.assign({}, bid, getDefinedParams(adUnit, [
-            'fpd',
+            'ortb2Imp',
             'mediaType',
             'renderer',
             'storedAuctionResponse'
diff --git a/src/config.js b/src/config.js
index daaf739bbbd..51184a8014d 100644
--- a/src/config.js
+++ b/src/config.js
@@ -324,6 +324,119 @@ export function newConfig() {
     return bidderConfig;
   }
 
+  /**
+   * Returns backwards compatible FPD data for modules
+   */
+  function getLegacyFpd(obj) {
+    if (typeof obj !== 'object') return;
+
+    let duplicate = {};
+
+    Object.keys(obj).forEach((type) => {
+      let prop = (type === 'site') ? 'context' : type;
+      duplicate[prop] = (prop === 'context' || prop === 'user') ? Object.keys(obj[type]).filter(key => key !== 'data').reduce((result, key) => {
+        if (key === 'ext') {
+          utils.mergeDeep(result, obj[type][key]);
+        } else {
+          utils.mergeDeep(result, {[key]: obj[type][key]});
+        }
+
+        return result;
+      }, {}) : obj[type];
+    });
+
+    return duplicate;
+  }
+
+  /**
+   * Returns backwards compatible FPD data for modules
+   */
+  function getLegacyImpFpd(obj) {
+    if (typeof obj !== 'object') return;
+
+    let duplicate = {};
+
+    if (utils.deepAccess(obj, 'ext.data')) {
+      Object.keys(obj.ext.data).forEach((key) => {
+        if (key === 'pbadslot') {
+          utils.mergeDeep(duplicate, {context: {pbAdSlot: obj.ext.data[key]}});
+        } else if (key === 'adserver') {
+          utils.mergeDeep(duplicate, {context: {adServer: obj.ext.data[key]}});
+        } else {
+          utils.mergeDeep(duplicate, {context: {data: {[key]: obj.ext.data[key]}}});
+        }
+      });
+    }
+
+    return duplicate;
+  }
+
+  /**
+   * Copy FPD over to OpenRTB standard format in config
+   */
+  function convertFpd(opt) {
+    let duplicate = {};
+
+    Object.keys(opt).forEach((type) => {
+      let prop = (type === 'context') ? 'site' : type;
+      duplicate[prop] = (prop === 'site' || prop === 'user') ? Object.keys(opt[type]).reduce((result, key) => {
+        if (key === 'data') {
+          utils.mergeDeep(result, {ext: {data: opt[type][key]}});
+        } else {
+          utils.mergeDeep(result, {[key]: opt[type][key]});
+        }
+
+        return result;
+      }, {}) : opt[type];
+    });
+
+    return duplicate;
+  }
+
+  /**
+   * Copy Impression FPD over to OpenRTB standard format in config
+   * Only accepts bid level context.data values with pbAdSlot and adServer exceptions
+   */
+  function convertImpFpd(opt) {
+    let duplicate = {};
+
+    Object.keys(opt).filter(prop => prop === 'context').forEach((type) => {
+      Object.keys(opt[type]).forEach((key) => {
+        if (key === 'data') {
+          utils.mergeDeep(duplicate, {ext: {data: opt[type][key]}});
+        } else {
+          if (typeof opt[type][key] === 'object' && !Array.isArray(opt[type][key])) {
+            Object.keys(opt[type][key]).forEach(data => {
+              utils.mergeDeep(duplicate, {ext: {data: {[key.toLowerCase()]: {[data.toLowerCase()]: opt[type][key][data]}}}});
+            });
+          } else {
+            utils.mergeDeep(duplicate, {ext: {data: {[key.toLowerCase()]: opt[type][key]}}});
+          }
+        }
+      });
+    });
+
+    return duplicate;
+  }
+
+  /**
+   * Copy FPD over to OpenRTB standard format in each adunit
+   */
+  function convertAdUnitFpd(arr) {
+    let convert = [];
+
+    arr.forEach((adunit) => {
+      if (adunit.fpd) {
+        (adunit['ortb2Imp']) ? utils.mergeDeep(adunit['ortb2Imp'], convertImpFpd(adunit.fpd)) : adunit['ortb2Imp'] = convertImpFpd(adunit.fpd);
+        convert.push((({ fpd, ...duplicate }) => duplicate)(adunit));
+      } else {
+        convert.push(adunit);
+      }
+    });
+
+    return convert;
+  }
+
   /*
    * Sets configuration given an object containing key-value pairs and calls
    * listeners that were added by the `subscribe` function
@@ -338,13 +451,14 @@ export function newConfig() {
     let topicalConfig = {};
 
     topics.forEach(topic => {
-      let option = options[topic];
+      let prop = (topic === 'fpd') ? 'ortb2' : topic;
+      let option = (topic === 'fpd') ? convertFpd(options[topic]) : options[topic];
 
-      if (utils.isPlainObject(defaults[topic]) && utils.isPlainObject(option)) {
-        option = Object.assign({}, defaults[topic], option);
+      if (utils.isPlainObject(defaults[prop]) && utils.isPlainObject(option)) {
+        option = Object.assign({}, defaults[prop], option);
       }
 
-      topicalConfig[topic] = config[topic] = option;
+      topicalConfig[prop] = config[prop] = option;
     });
 
     callSubscribers(topicalConfig);
@@ -437,11 +551,13 @@ export function newConfig() {
           bidderConfig[bidder] = {};
         }
         Object.keys(config.config).forEach(topic => {
-          let option = config.config[topic];
+          let prop = (topic === 'fpd') ? 'ortb2' : topic;
+          let option = (topic === 'fpd') ? convertFpd(config.config[topic]) : config.config[topic];
+
           if (utils.isPlainObject(option)) {
-            bidderConfig[bidder][topic] = Object.assign({}, bidderConfig[bidder][topic] || {}, option);
+            bidderConfig[bidder][prop] = Object.assign({}, bidderConfig[bidder][prop] || {}, option);
           } else {
-            bidderConfig[bidder][topic] = option;
+            bidderConfig[bidder][prop] = option;
           }
         });
       });
@@ -499,7 +615,10 @@ export function newConfig() {
     runWithBidder,
     callbackWithBidder,
     setBidderConfig,
-    getBidderConfig
+    getBidderConfig,
+    convertAdUnitFpd,
+    getLegacyFpd,
+    getLegacyImpFpd
   };
 }
 
diff --git a/src/prebid.js b/src/prebid.js
index 3452107effd..6565c1610d8 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -595,11 +595,7 @@ $$PREBID_GLOBAL$$.requestBids.before(executeCallbacks, 49);
  */
 $$PREBID_GLOBAL$$.addAdUnits = function (adUnitArr) {
   utils.logInfo('Invoking $$PREBID_GLOBAL$$.addAdUnits', arguments);
-  if (utils.isArray(adUnitArr)) {
-    $$PREBID_GLOBAL$$.adUnits.push.apply($$PREBID_GLOBAL$$.adUnits, adUnitArr);
-  } else if (typeof adUnitArr === 'object') {
-    $$PREBID_GLOBAL$$.adUnits.push(adUnitArr);
-  }
+  $$PREBID_GLOBAL$$.adUnits.push.apply($$PREBID_GLOBAL$$.adUnits, config.convertAdUnitFpd(utils.isArray(adUnitArr) ? adUnitArr : [adUnitArr]));
   // emit event
   events.emit(ADD_AD_UNITS);
 };
diff --git a/test/spec/adUnits_spec.js b/test/spec/adUnits_spec.js
index 7dd48a13208..baa5b4ac8c4 100644
--- a/test/spec/adUnits_spec.js
+++ b/test/spec/adUnits_spec.js
@@ -23,6 +23,16 @@ describe('Publisher API _ AdUnits', function () {
         }
       ]
     }, {
+      fpd: {
+        context: {
+          pbAdSlot: 'adSlotTest',
+          data: {
+            inventory: [4],
+            keywords: 'foo,bar',
+            visitor: [1, 2, 3],
+          }
+        }
+      },
       code: '/1996833/slot-2',
       sizes: [[468, 60]],
       bids: [
@@ -85,6 +95,7 @@ describe('Publisher API _ AdUnits', function () {
     it('the second adUnits value should be same with the adUnits that is added by $$PREBID_GLOBAL$$.addAdUnits();', function () {
       assert.strictEqual(adUnit2.code, '/1996833/slot-2', 'adUnit2 code');
       assert.deepEqual(adUnit2.sizes, [[468, 60]], 'adUnit2 sizes');
+      assert.deepEqual(adUnit2['ortb2Imp'], {'ext': {'data': {'pbadslot': 'adSlotTest', 'inventory': [4], 'keywords': 'foo,bar', 'visitor': [1, 2, 3]}}}, 'adUnit2 ortb2Imp');
       assert.strictEqual(bids2[0].bidder, 'rubicon', 'adUnit2 bids1 bidder');
       assert.strictEqual(bids2[0].params.rp_account, '4934', 'adUnit2 bids1 params.rp_account');
       assert.strictEqual(bids2[0].params.rp_zonesize, '23948-15', 'adUnit2 bids1 params.rp_zonesize');
diff --git a/test/spec/config_spec.js b/test/spec/config_spec.js
index 81ce966efb2..0b8dd6978cf 100644
--- a/test/spec/config_spec.js
+++ b/test/spec/config_spec.js
@@ -6,6 +6,8 @@ const utils = require('src/utils');
 
 let getConfig;
 let setConfig;
+let getBidderConfig;
+let setBidderConfig;
 let setDefaults;
 
 describe('config API', function () {
@@ -15,6 +17,8 @@ describe('config API', function () {
     const config = newConfig();
     getConfig = config.getConfig;
     setConfig = config.setConfig;
+    getBidderConfig = config.getBidderConfig;
+    setBidderConfig = config.setBidderConfig;
     setDefaults = config.setDefaults;
     logErrorSpy = sinon.spy(utils, 'logError');
     logWarnSpy = sinon.spy(utils, 'logWarn');
@@ -57,6 +61,17 @@ describe('config API', function () {
     expect(getConfig('foo')).to.eql({baz: 'qux'});
   });
 
+  it('moves fpd config into ortb2 properties', function () {
+    setConfig({fpd: {context: {keywords: 'foo,bar', data: {inventory: [1]}}}});
+    expect(getConfig('ortb2')).to.eql({site: {keywords: 'foo,bar', ext: {data: {inventory: [1]}}}});
+    expect(getConfig('fpd')).to.eql(undefined);
+  });
+
+  it('moves fpd bidderconfig into ortb2 properties', function () {
+    setBidderConfig({bidders: ['bidderA'], config: {fpd: {context: {keywords: 'foo,bar', data: {inventory: [1]}}}}});
+    expect(getBidderConfig()).to.eql({'bidderA': {ortb2: {site: {keywords: 'foo,bar', ext: {data: {inventory: [1]}}}}}});
+  });
+
   it('sets debugging', function () {
     setConfig({ debug: true });
     expect(getConfig('debug')).to.be.true;
diff --git a/test/spec/modules/adrelevantisBidAdapter_spec.js b/test/spec/modules/adrelevantisBidAdapter_spec.js
index 11a6a14a353..596f3bade5d 100644
--- a/test/spec/modules/adrelevantisBidAdapter_spec.js
+++ b/test/spec/modules/adrelevantisBidAdapter_spec.js
@@ -224,12 +224,14 @@ describe('AdrelevantisAdapter', function () {
       let bidRequest = Object.assign({}, bidRequests[0]);
       sinon
         .stub(config, 'getConfig')
-        .withArgs('fpd')
+        .withArgs('ortb2')
         .returns({
-          context: {
+          site: {
             keywords: 'US Open',
-            data: {
-              category: 'sports/tennis'
+            ext: {
+              data: {
+                category: 'sports/tennis'
+              }
             }
           }
         });
diff --git a/test/spec/modules/amxBidAdapter_spec.js b/test/spec/modules/amxBidAdapter_spec.js
index 766045b0f3e..0658fe9f33c 100644
--- a/test/spec/modules/amxBidAdapter_spec.js
+++ b/test/spec/modules/amxBidAdapter_spec.js
@@ -17,10 +17,26 @@ const embeddedTrackingPixel = `https://1x1.a-mo.net/hbx/g_impression?A=sample&B=
 const sampleNurl = 'https://example.exchange/nurl';
 
 const sampleFPD = {
+  site: {
+    keywords: 'sample keywords',
+    ext: {
+      data: {
+        pageType: 'article'
+      }
+    }
+  },
+  user: {
+    gender: 'O',
+    yob: 1982,
+  }
+};
+
+const legacySampleFPD = {
   context: {
     keywords: 'sample keywords',
     data: {
       pageType: 'article'
+
     }
   },
   user: {
@@ -31,7 +47,7 @@ const sampleFPD = {
 
 const stubConfig = (withStub) => {
   const stub = sinon.stub(config, 'getConfig').callsFake(
-    (arg) => arg === 'fpd' ? sampleFPD : null
+    (arg) => arg === 'ortb2' ? sampleFPD : null
   )
 
   withStub();
@@ -253,7 +269,7 @@ describe('AmxBidAdapter', () => {
     it('will forward first-party data', () => {
       stubConfig(() => {
         const { data } = spec.buildRequests([sampleBidRequestBase], sampleBidderRequest);
-        expect(data.fpd).to.deep.equal(sampleFPD)
+        expect(data.fpd).to.deep.equal(legacySampleFPD)
       });
     });
 
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index e91d3b10abb..cad1e3f8114 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -820,14 +820,18 @@ describe('The Criteo bidding adapter', function () {
     it('should properly build a request with first party data', function () {
       const contextData = {
         keywords: ['power tools'],
-        data: {
-          pageType: 'article'
+        ext: {
+          data: {
+            pageType: 'article'
+          }
         }
       };
       const userData = {
         gender: 'M',
-        data: {
-          registered: true
+        ext: {
+          data: {
+            registered: true
+          }
         }
       };
       const bidRequests = [
@@ -842,8 +846,8 @@ describe('The Criteo bidding adapter', function () {
               bidfloor: 0.75
             }
           },
-          fpd: {
-            context: {
+          ortb2Imp: {
+            ext: {
               data: {
                 someContextAttribute: 'abc'
               }
@@ -854,8 +858,8 @@ describe('The Criteo bidding adapter', function () {
 
       sandbox.stub(config, 'getConfig').callsFake(key => {
         const config = {
-          fpd: {
-            context: contextData,
+          ortb2: {
+            site: contextData,
             user: userData
           }
         };
@@ -863,8 +867,8 @@ describe('The Criteo bidding adapter', function () {
       });
 
       const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.publisher.ext).to.deep.equal(contextData);
-      expect(request.data.user.ext).to.deep.equal(userData);
+      expect(request.data.publisher.ext).to.deep.equal({keywords: ['power tools'], data: {pageType: 'article'}});
+      expect(request.data.user.ext).to.deep.equal({gender: 'M', data: {registered: true}});
       expect(request.data.slots[0].ext).to.deep.equal({
         bidfloor: 0.75,
         data: {
diff --git a/test/spec/modules/gptPreAuction_spec.js b/test/spec/modules/gptPreAuction_spec.js
index 16b84467af2..c4a81c21d5c 100644
--- a/test/spec/modules/gptPreAuction_spec.js
+++ b/test/spec/modules/gptPreAuction_spec.js
@@ -30,34 +30,34 @@ describe('GPT pre-auction module', () => {
           '<div id="foo3">test2</div>';
 
     it('should be unchanged if already defined on adUnit', () => {
-      const adUnit = { fpd: { context: { pbAdSlot: '12345' } } };
+      const adUnit = { ortb2Imp: { ext: { data: { pbadslot: '12345' } } } };
       appendPbAdSlot(adUnit);
-      expect(adUnit.fpd.context.pbAdSlot).to.equal('12345');
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('12345');
     });
 
     it('should use adUnit.code if matching id exists', () => {
-      const adUnit = { code: 'foo1', fpd: { context: {} } };
+      const adUnit = { code: 'foo1', ortb2Imp: { ext: { data: {} } } };
       appendPbAdSlot(adUnit);
-      expect(adUnit.fpd.context.pbAdSlot).to.equal('bar1');
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('bar1');
     });
 
     it('should use the gptSlot.adUnitPath if the adUnit.code matches a div id but does not have a data-adslotid', () => {
-      const adUnit = { code: 'foo3', mediaTypes: { banner: { sizes: [[250, 250]] } }, fpd: { context: { adServer: { name: 'gam', adSlot: '/baz' } } } };
+      const adUnit = { code: 'foo3', mediaTypes: { banner: { sizes: [[250, 250]] } }, ortb2Imp: { ext: { data: { adserver: { name: 'gam', adslot: '/baz' } } } } };
       appendPbAdSlot(adUnit);
-      expect(adUnit.fpd.context.pbAdSlot).to.equal('/baz');
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('/baz');
     });
 
     it('should use the video adUnit.code (which *should* match the configured "adSlotName", but is not being tested) if there is no matching div with "data-adslotid" defined', () => {
-      const adUnit = { code: 'foo4', mediaTypes: { video: { sizes: [[250, 250]] } }, fpd: { context: {} } };
+      const adUnit = { code: 'foo4', mediaTypes: { video: { sizes: [[250, 250]] } }, ortb2Imp: { ext: { data: {} } } };
       adUnit.code = 'foo5';
       appendPbAdSlot(adUnit, undefined);
-      expect(adUnit.fpd.context.pbAdSlot).to.equal('foo5');
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('foo5');
     });
 
     it('should use the adUnit.code if all other sources failed', () => {
-      const adUnit = { code: 'foo4', fpd: { context: {} } };
+      const adUnit = { code: 'foo4', ortb2Imp: { ext: { data: {} } } };
       appendPbAdSlot(adUnit, undefined);
-      expect(adUnit.fpd.context.pbAdSlot).to.equal('foo4');
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('foo4');
     });
 
     it('should use the customPbAdSlot function if one is given', () => {
@@ -67,32 +67,32 @@ describe('GPT pre-auction module', () => {
         }
       });
 
-      const adUnit = { code: 'foo1', fpd: { context: {} } };
+      const adUnit = { code: 'foo1', ortb2Imp: { ext: { data: {} } } };
       appendPbAdSlot(adUnit);
-      expect(adUnit.fpd.context.pbAdSlot).to.equal('customPbAdSlotName');
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('customPbAdSlotName');
     });
   });
 
   describe('appendGptSlots', () => {
     it('should not add adServer object to context if no slots defined', () => {
-      const adUnit = { code: 'adUnitCode', fpd: { context: {} } };
+      const adUnit = { code: 'adUnitCode', ortb2Imp: { ext: { data: {} } } };
       appendGptSlots([adUnit]);
-      expect(adUnit.fpd.context.adServer).to.be.undefined;
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.be.undefined;
     });
 
     it('should not add adServer object to context if no slot matches', () => {
       window.googletag.pubads().setSlots(testSlots);
-      const adUnit = { code: 'adUnitCode', fpd: { context: {} } };
+      const adUnit = { code: 'adUnitCode', ortb2Imp: { ext: { data: {} } } };
       appendGptSlots([adUnit]);
-      expect(adUnit.fpd.context.adServer).to.be.undefined;
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.be.undefined;
     });
 
     it('should add adServer object to context if matching slot is found', () => {
       window.googletag.pubads().setSlots(testSlots);
-      const adUnit = { code: 'slotCode2', fpd: { context: {} } };
+      const adUnit = { code: 'slotCode2', ortb2Imp: { ext: { data: {} } } };
       appendGptSlots([adUnit]);
-      expect(adUnit.fpd.context.adServer).to.be.an('object');
-      expect(adUnit.fpd.context.adServer).to.deep.equal({ name: 'gam', adSlot: 'slotCode2' });
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.be.an('object');
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.deep.equal({ name: 'gam', adslot: 'slotCode2' });
     });
 
     it('should use the customGptSlotMatching function if one is given', () => {
@@ -104,10 +104,10 @@ describe('GPT pre-auction module', () => {
       });
 
       window.googletag.pubads().setSlots(testSlots);
-      const adUnit = { code: 'SlOtCoDe1', fpd: { context: {} } };
+      const adUnit = { code: 'SlOtCoDe1', ortb2Imp: { ext: { data: {} } } };
       appendGptSlots([adUnit]);
-      expect(adUnit.fpd.context.adServer).to.be.an('object');
-      expect(adUnit.fpd.context.adServer).to.deep.equal({ name: 'gam', adSlot: 'slotCode1' });
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.be.an('object');
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.deep.equal({ name: 'gam', adslot: 'slotCode1' });
     });
   });
 
@@ -164,23 +164,23 @@ describe('GPT pre-auction module', () => {
     it('should append PB Ad Slot and GPT Slot info to first-party data in each ad unit', () => {
       const testAdUnits = [{
         code: 'adUnit1',
-        fpd: { context: { pbAdSlot: '12345' } }
+        ortb2Imp: { ext: { data: { pbadslot: '12345' } } }
       }, {
         code: 'slotCode1',
-        fpd: { context: { pbAdSlot: '67890' } }
+        ortb2Imp: { ext: { data: { pbadslot: '67890' } } }
       }, {
         code: 'slotCode3',
       }];
 
       const expectedAdUnits = [{
         code: 'adUnit1',
-        fpd: { context: { pbAdSlot: '12345' } }
+        ortb2Imp: { ext: { data: { pbadslot: '12345' } } }
       }, {
         code: 'slotCode1',
-        fpd: { context: { pbAdSlot: '67890', adServer: { name: 'gam', adSlot: 'slotCode1' } } }
+        ortb2Imp: { ext: { data: { pbadslot: '67890', adserver: { name: 'gam', adslot: 'slotCode1' } } } }
       }, {
         code: 'slotCode3',
-        fpd: { context: { pbAdSlot: 'slotCode3', adServer: { name: 'gam', adSlot: 'slotCode3' } } }
+        ortb2Imp: { ext: { data: { pbadslot: 'slotCode3', adserver: { name: 'gam', adslot: 'slotCode3' } } } }
       }];
 
       window.googletag.pubads().setSlots(testSlots);
diff --git a/test/spec/modules/gridBidAdapter_spec.js b/test/spec/modules/gridBidAdapter_spec.js
index df119bb689d..2e8601bddf6 100644
--- a/test/spec/modules/gridBidAdapter_spec.js
+++ b/test/spec/modules/gridBidAdapter_spec.js
@@ -400,6 +400,16 @@ describe('TheMediaGrid Adapter', function () {
       expect(payload.site.content).to.deep.equal(jsContent);
     });
 
+    it('should contain the keyword values if it present in ortb2.(site/user)', function () {
+      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
+        arg => arg === 'ortb2.user' ? {'keywords': 'foo'} : (arg === 'ortb2.site' ? {'keywords': 'bar'} : null));
+      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload.ext.keywords).to.deep.equal([{'key': 'user', 'value': ['foo']}, {'key': 'context', 'value': ['bar']}]);
+      getConfigStub.restore();
+    });
+
     it('shold be right tmax when timeout in config is less then timeout in bidderRequest', function() {
       const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
         arg => arg === 'bidderTimeout' ? 2000 : null);
diff --git a/test/spec/modules/jwplayerRtdProvider_spec.js b/test/spec/modules/jwplayerRtdProvider_spec.js
index f7beb6ba486..458e45e8ae7 100644
--- a/test/spec/modules/jwplayerRtdProvider_spec.js
+++ b/test/spec/modules/jwplayerRtdProvider_spec.js
@@ -229,8 +229,8 @@ describe('jwplayerRtdProvider', function() {
 
           const bid = {};
           const adUnit = {
-            fpd: {
-              context: {
+            ortb2Imp: {
+              ext: {
                 data: {
                   jwTargeting: {
                     mediaID: mediaIdWithSegment,
@@ -298,8 +298,8 @@ describe('jwplayerRtdProvider', function() {
         }
       ];
       const adUnit = {
-        fpd: {
-          context: {
+        ortb2Imp: {
+          ext: {
             data: {
               jwTargeting: {
                 mediaID: testIdForSuccess
@@ -345,8 +345,8 @@ describe('jwplayerRtdProvider', function() {
         }
       ];
       const adUnit = {
-        fpd: {
-          context: {
+        ortb2Imp: {
+          ext: {
             data: {
               jwTargeting: {
                 mediaID: testIdForSuccess
@@ -392,8 +392,8 @@ describe('jwplayerRtdProvider', function() {
         }
       ];
       const adUnit = {
-        fpd: {
-          context: {
+        ortb2Imp: {
+          ext: {
             data: {
               jwTargeting: {
                 mediaID: testIdForFailure
@@ -435,19 +435,19 @@ describe('jwplayerRtdProvider', function() {
     });
 
     it('should include banner ad units that specify jwTargeting', function() {
-      const adUnit = { mediaTypes: { banner: {} }, fpd: { context: { data: { jwTargeting: {} } } } };
+      const adUnit = { mediaTypes: { banner: {} }, ortb2Imp: { ext: { data: { jwTargeting: {} } } } };
       const targeting = extractPublisherParams(adUnit, config);
       expect(targeting).to.deep.equal(config);
     });
 
     it('should include outstream ad units that specify jwTargeting', function() {
-      const adUnit = { mediaTypes: { video: { context: 'outstream' } }, fpd: { context: { data: { jwTargeting: {} } } } };
+      const adUnit = { mediaTypes: { video: { context: 'outstream' } }, ortb2Imp: { ext: { data: { jwTargeting: {} } } } };
       const targeting = extractPublisherParams(adUnit, config);
       expect(targeting).to.deep.equal(config);
     });
 
     it('should fallback to config when empty jwTargeting is defined in ad unit', function () {
-      const adUnit = { fpd: { context: { data: { jwTargeting: {} } } } };
+      const adUnit = { ortb2Imp: { ext: { data: { jwTargeting: {} } } } };
       const targeting = extractPublisherParams(adUnit, config);
       expect(targeting).to.deep.equal(config);
     });
@@ -457,7 +457,7 @@ describe('jwplayerRtdProvider', function() {
       const expectedPlayerID = 'test_player_id';
       const config = { playerID: 'bad_id', mediaID: 'bad_id' };
 
-      const adUnit = { fpd: { context: { data: { jwTargeting: { mediaID: expectedMediaID, playerID: expectedPlayerID } } } } };
+      const adUnit = { ortb2Imp: { ext: { data: { jwTargeting: { mediaID: expectedMediaID, playerID: expectedPlayerID } } } } };
       const targeting = extractPublisherParams(adUnit, config);
       expect(targeting).to.have.property('mediaID', expectedMediaID);
       expect(targeting).to.have.property('playerID', expectedPlayerID);
@@ -468,7 +468,7 @@ describe('jwplayerRtdProvider', function() {
       const expectedPlayerID = 'test_player_id';
       const config = { playerID: expectedPlayerID, mediaID: 'bad_id' };
 
-      const adUnit = { fpd: { context: { data: { jwTargeting: { mediaID: expectedMediaID } } } } };
+      const adUnit = { ortb2Imp: { ext: { data: { jwTargeting: { mediaID: expectedMediaID } } } } };
       const targeting = extractPublisherParams(adUnit, config);
       expect(targeting).to.have.property('mediaID', expectedMediaID);
       expect(targeting).to.have.property('playerID', expectedPlayerID);
@@ -577,8 +577,8 @@ describe('jwplayerRtdProvider', function() {
         bidReqConfig = {
           adUnits: [
             {
-              fpd: {
-                context: {
+              ortb2Imp: {
+                ext: {
                   data: {
                     jwTargeting: {
                       mediaID: validMediaIDs[0]
@@ -591,8 +591,8 @@ describe('jwplayerRtdProvider', function() {
               ]
             },
             {
-              fpd: {
-                context: {
+              ortb2Imp: {
+                ext: {
                   data: {
                     jwTargeting: {
                       mediaID: validMediaIDs[1]
@@ -658,8 +658,8 @@ describe('jwplayerRtdProvider', function() {
       it('sets targeting data in proper structure', function () {
         const bid = {};
         const adUnitWithMediaId = {
-          fpd: {
-            context: {
+          ortb2Imp: {
+            ext: {
               data: {
                 jwTargeting: {
                   mediaID: testIdForSuccess
@@ -690,8 +690,8 @@ describe('jwplayerRtdProvider', function() {
         const adUnitCode = 'test_ad_unit';
         const bid = {};
         const adUnit = {
-          fpd: {
-            context: {
+          ortb2Imp: {
+            ext: {
               data: {
                 jwTargeting: {
                   mediaID: testIdForFailure
@@ -701,7 +701,7 @@ describe('jwplayerRtdProvider', function() {
           },
           bids: [ bid ]
         };
-        const expectedContentId = 'jw_' + adUnit.fpd.context.data.jwTargeting.mediaID;
+        const expectedContentId = 'jw_' + adUnit.ortb2Imp.ext.data.jwTargeting.mediaID;
         const expectedTargeting = {
           content: {
             id: expectedContentId
@@ -732,8 +732,8 @@ describe('jwplayerRtdProvider', function() {
 
         const adUnitEmptyfpd = {
           code: 'test_ad_unit_empty_fpd',
-          fpd: {
-            context: {
+          ortb2Imp: {
+            ext: {
               id: 'sthg'
             }
           },
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 9e20629fe45..babee7e10d7 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -1607,7 +1607,29 @@ describe('S2S Adapter', function () {
 
       const expected = allowedBidders.map(bidder => ({
         bidders: [ bidder ],
-        config: { fpd: { site: context, user } }
+        config: {
+          ortb2: {
+            site: {
+              content: { userrating: 4 },
+              ext: {
+                data: {
+                  pageType: 'article',
+                  category: 'tools'
+                }
+              }
+            },
+            user: {
+              yob: '1984',
+              geo: { country: 'ca' },
+              ext: {
+                data: {
+                  registered: true,
+                  interests: ['cars']
+                }
+              }
+            }
+          }
+        }
       }));
 
       config.setConfig({ fpd: { context: commonContext, user: commonUser } });
@@ -1615,12 +1637,12 @@ describe('S2S Adapter', function () {
       adapter.callBids(s2sBidRequest, bidRequests, addBidResponse, done, ajax);
       const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
       expect(parsedRequestBody.ext.prebid.bidderconfig).to.deep.equal(expected);
-      expect(parsedRequestBody.site.ext.data).to.deep.equal(commonContext);
-      expect(parsedRequestBody.user.ext.data).to.deep.equal(commonUser);
+      expect(parsedRequestBody.site).to.deep.equal(commonContext);
+      expect(parsedRequestBody.user).to.deep.equal(commonUser);
     });
 
     describe('pbAdSlot config', function () {
-      it('should not send \"imp.ext.context.data.pbadslot\" if \"fpd.context\" is undefined', function () {
+      it('should not send \"imp.ext.data.pbadslot\" if \"ortb2Imp.ext\" is undefined', function () {
         const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
@@ -1630,30 +1652,32 @@ describe('S2S Adapter', function () {
 
         expect(parsedRequestBody.imp).to.be.a('array');
         expect(parsedRequestBody.imp[0]).to.be.a('object');
-        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.context.data.pbadslot');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.pbadslot');
       });
 
-      it('should not send \"imp.ext.context.data.pbadslot\" if \"fpd.context.pbAdSlot\" is undefined', function () {
+      it('should not send \"imp.ext.data.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" is undefined', function () {
         const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
-        bidRequest.ad_units[0].fpd = {};
+        bidRequest.ad_units[0].ortb2Imp = {};
 
         adapter.callBids(bidRequest, BID_REQUESTS, addBidResponse, done, ajax);
         const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
 
         expect(parsedRequestBody.imp).to.be.a('array');
         expect(parsedRequestBody.imp[0]).to.be.a('object');
-        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.context.data.pbadslot');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.pbadslot');
       });
 
-      it('should not send \"imp.ext.context.data.pbadslot\" if \"fpd.context.pbAdSlot\" is empty string', function () {
+      it('should not send \"imp.ext.data.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" is empty string', function () {
         const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
-        bidRequest.ad_units[0].fpd = {
-          context: {
-            pbAdSlot: ''
+        bidRequest.ad_units[0].ortb2Imp = {
+          ext: {
+            data: {
+              pbadslot: ''
+            }
           }
         };
 
@@ -1662,16 +1686,18 @@ describe('S2S Adapter', function () {
 
         expect(parsedRequestBody.imp).to.be.a('array');
         expect(parsedRequestBody.imp[0]).to.be.a('object');
-        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.context.data.pbadslot');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.pbadslot');
       });
 
-      it('should send \"imp.ext.context.data.pbadslot\" if \"fpd.context.pbAdSlot\" value is a non-empty string', function () {
+      it('should send \"imp.ext.data.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" value is a non-empty string', function () {
         const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
-        bidRequest.ad_units[0].fpd = {
-          context: {
-            pbAdSlot: '/a/b/c'
+        bidRequest.ad_units[0].ortb2Imp = {
+          ext: {
+            data: {
+              pbadslot: '/a/b/c'
+            }
           }
         };
 
@@ -1680,13 +1706,13 @@ describe('S2S Adapter', function () {
 
         expect(parsedRequestBody.imp).to.be.a('array');
         expect(parsedRequestBody.imp[0]).to.be.a('object');
-        expect(parsedRequestBody.imp[0]).to.have.deep.nested.property('ext.context.data.pbadslot');
-        expect(parsedRequestBody.imp[0].ext.context.data.pbadslot).to.equal('/a/b/c');
+        expect(parsedRequestBody.imp[0]).to.have.deep.nested.property('ext.data.pbadslot');
+        expect(parsedRequestBody.imp[0].ext.data.pbadslot).to.equal('/a/b/c');
       });
     });
 
     describe('GAM ad unit config', function () {
-      it('should not send \"imp.ext.context.data.adserver.adslot\" if \"fpd.context\" is undefined', function () {
+      it('should not send \"imp.ext.data.adserver.adslot\" if \"ortb2Imp.ext\" is undefined', function () {
         const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
@@ -1696,31 +1722,33 @@ describe('S2S Adapter', function () {
 
         expect(parsedRequestBody.imp).to.be.a('array');
         expect(parsedRequestBody.imp[0]).to.be.a('object');
-        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.context.data.adslot');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.adslot');
       });
 
-      it('should not send \"imp.ext.context.data.adserver.adslot\" if \"fpd.context.adserver.adSlot\" is undefined', function () {
+      it('should not send \"imp.ext.data.adserver.adslot\" if \"ortb2Imp.ext.data.adserver.adslot\" is undefined', function () {
         const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
-        bidRequest.ad_units[0].fpd = {};
+        bidRequest.ad_units[0].ortb2Imp = {};
 
         adapter.callBids(bidRequest, BID_REQUESTS, addBidResponse, done, ajax);
         const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
 
         expect(parsedRequestBody.imp).to.be.a('array');
         expect(parsedRequestBody.imp[0]).to.be.a('object');
-        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.context.data.adslot');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.adslot');
       });
 
-      it('should not send \"imp.ext.context.data.adserver.adslot\" if \"fpd.context.adserver.adSlot\" is empty string', function () {
+      it('should not send \"imp.ext.data.adserver.adslot\" if \"ortb2Imp.ext.data.adserver.adslot\" is empty string', function () {
         const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
-        bidRequest.ad_units[0].fpd = {
-          context: {
-            adServer: {
-              adSlot: ''
+        bidRequest.ad_units[0].ortb2Imp = {
+          ext: {
+            data: {
+              adserver: {
+                adslot: ''
+              }
             }
           }
         };
@@ -1730,18 +1758,20 @@ describe('S2S Adapter', function () {
 
         expect(parsedRequestBody.imp).to.be.a('array');
         expect(parsedRequestBody.imp[0]).to.be.a('object');
-        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.context.data.adslot');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.adslot');
       });
 
-      it('should send both \"adslot\" and \"name\" from \"imp.ext.context.data.adserver\" if \"fpd.context.adserver.adSlot\" and \"fpd.context.adserver.name\" values are non-empty strings', function () {
+      it('should send both \"adslot\" and \"name\" from \"imp.ext.data.adserver\" if \"ortb2Imp.ext.data.adserver.adslot\" and \"ortb2Imp.ext.data.adserver.name\" values are non-empty strings', function () {
         const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
-        bidRequest.ad_units[0].fpd = {
-          context: {
-            adserver: {
-              adSlot: '/a/b/c',
-              name: 'adserverName1'
+        bidRequest.ad_units[0].ortb2Imp = {
+          ext: {
+            data: {
+              adserver: {
+                adslot: '/a/b/c',
+                name: 'adserverName1'
+              }
             }
           }
         };
@@ -1751,10 +1781,10 @@ describe('S2S Adapter', function () {
 
         expect(parsedRequestBody.imp).to.be.a('array');
         expect(parsedRequestBody.imp[0]).to.be.a('object');
-        expect(parsedRequestBody.imp[0]).to.have.deep.nested.property('ext.context.data.adserver.adslot');
-        expect(parsedRequestBody.imp[0]).to.have.deep.nested.property('ext.context.data.adserver.name');
-        expect(parsedRequestBody.imp[0].ext.context.data.adserver.adslot).to.equal('/a/b/c');
-        expect(parsedRequestBody.imp[0].ext.context.data.adserver.name).to.equal('adserverName1');
+        expect(parsedRequestBody.imp[0]).to.have.deep.nested.property('ext.data.adserver.adslot');
+        expect(parsedRequestBody.imp[0]).to.have.deep.nested.property('ext.data.adserver.name');
+        expect(parsedRequestBody.imp[0].ext.data.adserver.adslot).to.equal('/a/b/c');
+        expect(parsedRequestBody.imp[0].ext.data.adserver.name).to.equal('adserverName1');
       });
     });
   });
diff --git a/test/spec/modules/rubiconBidAdapter_spec.js b/test/spec/modules/rubiconBidAdapter_spec.js
index 8c25d97dada..36890a2891b 100644
--- a/test/spec/modules/rubiconBidAdapter_spec.js
+++ b/test/spec/modules/rubiconBidAdapter_spec.js
@@ -827,27 +827,39 @@ describe('the rubicon adapter', function () {
           });
 
           it('should merge first party data from getConfig with the bid params, if present', () => {
-            const context = {
+            const site = {
               keywords: 'e,f',
               rating: '4-star',
-              data: {
-                page: 'home'
+              ext: {
+                data: {
+                  page: 'home'
+                }
               }
             };
             const user = {
+              data: [{
+                'name': 'www.dataprovider1.com',
+                'ext': { 'taxonomyname': 'IAB Audience Taxonomy' },
+                'segment': [
+                  { 'id': '687' },
+                  { 'id': '123' }
+                ]
+              }],
               gender: 'M',
               yob: '1984',
               geo: {country: 'ca'},
               keywords: 'd',
-              data: {
-                age: 40
+              ext: {
+                data: {
+                  age: 40
+                }
               }
             };
 
             sandbox.stub(config, 'getConfig').callsFake(key => {
               const config = {
-                fpd: {
-                  context,
+                ortb2: {
+                  site,
                   user
                 }
               };
@@ -861,8 +873,9 @@ describe('the rubicon adapter', function () {
               'tg_v.likes': 'sports,video games',
               'tg_v.gender': 'M',
               'tg_v.age': '40',
+              'tg_v.iab': '687,123',
               'tg_v.yob': '1984',
-              'tg_i.rating': '5-star',
+              'tg_i.rating': '4-star,5-star',
               'tg_i.page': 'home',
               'tg_i.prodtype': 'tech,mobile',
             };
@@ -1287,12 +1300,12 @@ describe('the rubicon adapter', function () {
         describe('Prebid AdSlot', function () {
           beforeEach(function () {
             // enforce that the bid at 0 does not have a 'context' property
-            if (bidderRequest.bids[0].hasOwnProperty('fpd')) {
-              delete bidderRequest.bids[0].fpd;
+            if (bidderRequest.bids[0].hasOwnProperty('ortb2Imp')) {
+              delete bidderRequest.bids[0].ortb2Imp;
             }
           });
 
-          it('should not send \"tg_i.pbadslot’\" if \"fpd.context\" object is not valid', function () {
+          it('should not send \"tg_i.pbadslot’\" if \"ortb2Imp.ext.data\" object is not valid', function () {
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
             const data = parseQuery(request.data);
 
@@ -1300,8 +1313,8 @@ describe('the rubicon adapter', function () {
             expect(data).to.not.have.property('tg_i.pbadslot’');
           });
 
-          it('should not send \"tg_i.pbadslot’\" if \"fpd.context.pbAdSlot\" is undefined', function () {
-            bidderRequest.bids[0].fpd = {};
+          it('should not send \"tg_i.pbadslot’\" if \"ortb2Imp.ext.data.pbadslot\" is undefined', function () {
+            bidderRequest.bids[0].ortb2Imp = {};
 
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
             const data = parseQuery(request.data);
@@ -1310,10 +1323,12 @@ describe('the rubicon adapter', function () {
             expect(data).to.not.have.property('tg_i.pbadslot’');
           });
 
-          it('should not send \"tg_i.pbadslot’\" if \"fpd.context.pbAdSlot\" value is an empty string', function () {
-            bidderRequest.bids[0].fpd = {
-              context: {
-                pbAdSlot: ''
+          it('should not send \"tg_i.pbadslot’\" if \"ortb2Imp.ext.data.pbadslot\" value is an empty string', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  pbadslot: ''
+                }
               }
             };
 
@@ -1324,10 +1339,12 @@ describe('the rubicon adapter', function () {
             expect(data).to.not.have.property('tg_i.pbadslot');
           });
 
-          it('should send \"tg_i.pbadslot\" if \"fpd.context.pbAdSlot\" value is a valid string', function () {
-            bidderRequest.bids[0].fpd = {
-              context: {
-                pbAdSlot: 'abc'
+          it('should send \"tg_i.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" value is a valid string', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  pbadslot: 'abc'
+                }
               }
             }
 
@@ -1339,12 +1356,14 @@ describe('the rubicon adapter', function () {
             expect(data['tg_i.pbadslot']).to.equal('abc');
           });
 
-          it('should send \"tg_i.pbadslot\" if \"fpd.context.pbAdSlot\" value is a valid string, but all leading slash characters should be removed', function () {
-            bidderRequest.bids[0].fpd = {
-              context: {
-                pbAdSlot: '/a/b/c'
+          it('should send \"tg_i.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" value is a valid string, but all leading slash characters should be removed', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  pbadslot: '/a/b/c'
+                }
               }
-            };
+            }
 
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
             const data = parseQuery(request.data);
@@ -1358,12 +1377,12 @@ describe('the rubicon adapter', function () {
         describe('GAM ad unit', function () {
           beforeEach(function () {
             // enforce that the bid at 0 does not have a 'context' property
-            if (bidderRequest.bids[0].hasOwnProperty('fpd')) {
-              delete bidderRequest.bids[0].fpd;
+            if (bidderRequest.bids[0].hasOwnProperty('ortb2Imp')) {
+              delete bidderRequest.bids[0].ortb2Imp;
             }
           });
 
-          it('should not send \"tg_i.dfp_ad_unit_code’\" if \"fpd.context\" object is not valid', function () {
+          it('should not send \"tg_i.dfp_ad_unit_code’\" if \"ortb2Imp.ext.data\" object is not valid', function () {
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
             const data = parseQuery(request.data);
 
@@ -1371,8 +1390,8 @@ describe('the rubicon adapter', function () {
             expect(data).to.not.have.property('tg_i.dfp_ad_unit_code’');
           });
 
-          it('should not send \"tg_i.dfp_ad_unit_code’\" if \"fpd.context.adServer.adSlot\" is undefined', function () {
-            bidderRequest.bids[0].fpd = {};
+          it('should not send \"tg_i.dfp_ad_unit_code’\" if \"ortb2Imp.ext.data.adServer.adslot\" is undefined', function () {
+            bidderRequest.bids[0].ortb2Imp = {};
 
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
             const data = parseQuery(request.data);
@@ -1381,11 +1400,13 @@ describe('the rubicon adapter', function () {
             expect(data).to.not.have.property('tg_i.dfp_ad_unit_code’');
           });
 
-          it('should not send \"tg_i.dfp_ad_unit_code’\" if \"fpd.context.adServer.adSlot\" value is an empty string', function () {
-            bidderRequest.bids[0].fpd = {
-              context: {
-                adServer: {
-                  adSlot: ''
+          it('should not send \"tg_i.dfp_ad_unit_code’\" if \"ortb2Imp.ext.data.adServer.adslot\" value is an empty string', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  adserver: {
+                    adslot: ''
+                  }
                 }
               }
             };
@@ -1397,11 +1418,13 @@ describe('the rubicon adapter', function () {
             expect(data).to.not.have.property('tg_i.dfp_ad_unit_code');
           });
 
-          it('should send \"tg_i.dfp_ad_unit_code\" if \"fpd.context.adServer.adSlot\" value is a valid string', function () {
-            bidderRequest.bids[0].fpd = {
-              context: {
-                adServer: {
-                  adSlot: 'abc'
+          it('should send \"tg_i.dfp_ad_unit_code\" if \"ortb2Imp.ext.data.adServer.adslot\" value is a valid string', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  adserver: {
+                    adslot: 'abc'
+                  }
                 }
               }
             }
@@ -1414,11 +1437,13 @@ describe('the rubicon adapter', function () {
             expect(data['tg_i.dfp_ad_unit_code']).to.equal('abc');
           });
 
-          it('should send \"tg_i.dfp_ad_unit_code\" if \"fpd.context.adServer.adSlot\" value is a valid string, but all leading slash characters should be removed', function () {
-            bidderRequest.bids[0].fpd = {
-              context: {
-                adServer: {
-                  adSlot: 'a/b/c'
+          it('should send \"tg_i.dfp_ad_unit_code\" if \"ortb2Imp.ext.data.adServer.adslot\" value is a valid string, but all leading slash characters should be removed', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  adserver: {
+                    adslot: 'a/b/c'
+                  }
                 }
               }
             };
@@ -1871,27 +1896,36 @@ describe('the rubicon adapter', function () {
         it('should include first party data', () => {
           createVideoBidderRequest();
 
-          const context = {
-            data: {
-              page: 'home'
+          const site = {
+            ext: {
+              data: {
+                page: 'home'
+              }
+            },
+            content: {
+              data: [{foo: 'bar'}]
             },
             keywords: 'e,f',
-            rating: '4-star'
+            rating: '4-star',
+            data: [{foo: 'bar'}]
           };
           const user = {
-            data: {
-              age: 31
+            ext: {
+              data: {
+                age: 31
+              }
             },
             keywords: 'd',
             gender: 'M',
             yob: '1984',
-            geo: {country: 'ca'}
+            geo: {country: 'ca'},
+            data: [{foo: 'bar'}]
           };
 
           sandbox.stub(config, 'getConfig').callsFake(key => {
             const config = {
-              fpd: {
-                context,
+              ortb2: {
+                site,
                 user
               }
             };
@@ -1901,19 +1935,19 @@ describe('the rubicon adapter', function () {
           const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
 
           const expected = {
-            site: Object.assign({}, context, context.data, bidderRequest.bids[0].params.inventory),
-            user: Object.assign({}, user, user.data, bidderRequest.bids[0].params.visitor)
+            site: Object.assign({}, site, {keywords: bidderRequest.bids[0].params.keywords.join(',')}),
+            user: Object.assign({}, user),
+            siteData: Object.assign({}, site.ext.data, bidderRequest.bids[0].params.inventory),
+            userData: Object.assign({}, user.ext.data, bidderRequest.bids[0].params.visitor),
           };
 
-          delete expected.site.data;
-          delete expected.user.data;
-          delete expected.site.keywords;
-          delete expected.user.keywords;
+          delete request.data.site.page;
+          delete request.data.site.content.language;
 
           expect(request.data.site.keywords).to.deep.equal('a,b,c');
           expect(request.data.user.keywords).to.deep.equal('d');
-          expect(request.data.site.ext.data).to.deep.equal(expected.site);
-          expect(request.data.user.ext.data).to.deep.equal(expected.user);
+          expect(request.data.site.ext.data).to.deep.equal(expected.siteData);
+          expect(request.data.user.ext.data).to.deep.equal(expected.userData);
         });
 
         it('should include storedAuctionResponse in video bid request', function () {
@@ -1932,29 +1966,33 @@ describe('the rubicon adapter', function () {
           expect(request.data.imp[0].ext.prebid.storedauctionresponse.id).to.equal('11111');
         });
 
-        it('should include pbAdSlot in bid request', function () {
+        it('should include pbadslot in bid request', function () {
           createVideoBidderRequest();
-          bidderRequest.bids[0].fpd = {
-            context: {
-              pbAdSlot: '1234567890'
+          bidderRequest.bids[0].ortb2Imp = {
+            ext: {
+              data: {
+                pbadslot: '1234567890'
+              }
             }
-          };
+          }
 
           sandbox.stub(Date, 'now').callsFake(() =>
             bidderRequest.auctionStart + 100
           );
 
           const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          expect(request.data.imp[0].ext.context.data.pbadslot).to.equal('1234567890');
+          expect(request.data.imp[0].ext.data.pbadslot).to.equal('1234567890');
         });
 
         it('should include GAM ad unit in bid request', function () {
           createVideoBidderRequest();
-          bidderRequest.bids[0].fpd = {
-            context: {
-              adServer: {
-                adSlot: '1234567890',
-                name: 'adServerName1'
+          bidderRequest.bids[0].ortb2Imp = {
+            ext: {
+              data: {
+                adserver: {
+                  adslot: '1234567890',
+                  name: 'adServerName1'
+                }
               }
             }
           };
@@ -1964,8 +2002,8 @@ describe('the rubicon adapter', function () {
           );
 
           const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          expect(request.data.imp[0].ext.context.data.adserver.adslot).to.equal('1234567890');
-          expect(request.data.imp[0].ext.context.data.adserver.name).to.equal('adServerName1');
+          expect(request.data.imp[0].ext.data.adserver.adslot).to.equal('1234567890');
+          expect(request.data.imp[0].ext.data.adserver.name).to.equal('adServerName1');
         });
 
         it('should use the integration type provided in the config instead of the default', () => {
diff --git a/test/spec/modules/smaatoBidAdapter_spec.js b/test/spec/modules/smaatoBidAdapter_spec.js
index 6af0a855800..1bc77fc9572 100644
--- a/test/spec/modules/smaatoBidAdapter_spec.js
+++ b/test/spec/modules/smaatoBidAdapter_spec.js
@@ -42,7 +42,7 @@ const ADTYPE_IMG = 'Img';
 const ADTYPE_RICHMEDIA = 'Richmedia';
 const ADTYPE_VIDEO = 'Video';
 
-const context = {
+const site = {
   keywords: 'power tools,drills'
 };
 
@@ -439,8 +439,8 @@ describe('smaatoBidAdapterTest', () => {
     it('sends fp data', () => {
       this.sandbox.stub(config, 'getConfig').callsFake(key => {
         const config = {
-          fpd: {
-            context,
+          ortb2: {
+            site,
             user
           }
         };
diff --git a/test/spec/modules/tripleliftBidAdapter_spec.js b/test/spec/modules/tripleliftBidAdapter_spec.js
index eb410c2525d..30377ec0a5d 100644
--- a/test/spec/modules/tripleliftBidAdapter_spec.js
+++ b/test/spec/modules/tripleliftBidAdapter_spec.js
@@ -143,10 +143,10 @@ describe('triplelift adapter', function () {
           auctionId: '1d1a030790a475',
           userId: {},
           schain,
-          fpd: {
-            context: {
-              pbAdSlot: 'homepage-top-rect',
+          ortb2Imp: {
+            ext: {
               data: {
+                pbAdSlot: 'homepage-top-rect',
                 adUnitSpecificAttribute: 123
               }
             }
@@ -663,11 +663,13 @@ describe('triplelift adapter', function () {
       const sens = null;
       const category = ['news', 'weather', 'hurricane'];
       const pmp_elig = 'true';
-      const fpd = {
-        context: {
+      const ortb2 = {
+        site: {
           pmp_elig: pmp_elig,
-          data: {
-            category: category
+          ext: {
+            data: {
+              category: category
+            }
           }
         },
         user: {
@@ -676,7 +678,7 @@ describe('triplelift adapter', function () {
       }
       sandbox.stub(config, 'getConfig').callsFake(key => {
         const config = {
-          fpd
+          ortb2
         };
         return utils.deepAccess(config, key);
       });
@@ -688,8 +690,8 @@ describe('triplelift adapter', function () {
     });
     it('should send ad unit fpd if kvps are available', function() {
       const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.imp[0].fpd.context).to.haveOwnProperty('pbAdSlot');
       expect(request.data.imp[0].fpd.context).to.haveOwnProperty('data');
+      expect(request.data.imp[0].fpd.context.data).to.haveOwnProperty('pbAdSlot');
       expect(request.data.imp[0].fpd.context.data).to.haveOwnProperty('adUnitSpecificAttribute');
       expect(request.data.imp[1].fpd).to.not.exist;
     });

From 15cf2f0cf9f863c6c88e4890e867e628f4c95ff0 Mon Sep 17 00:00:00 2001
From: Ryan Schweitzer <50628828+r-schweitzer@users.noreply.github.com>
Date: Mon, 8 Mar 2021 11:57:29 +0000
Subject: [PATCH 301/304] PBS Bid Adapter: fix s2s alias collision with
 built-in adapter aliasing (#6379)

* fixed overwriting of aliases for s2s

* made change

* added fix
---
 modules/prebidServerBidAdapter/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 20cf93caae5..088b5430f46 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -724,7 +724,7 @@ const OPEN_RTB_PROTOCOL = {
     }
 
     if (!utils.isEmpty(aliases)) {
-      request.ext.prebid.aliases = aliases;
+      request.ext.prebid.aliases = {...request.ext.prebid.aliases, ...aliases};
     }
 
     const bidUserIdAsEids = utils.deepAccess(bidRequests, '0.bids.0.userIdAsEids');

From 83e82229398724ac2c38936e5b8afa3f7de66dd4 Mon Sep 17 00:00:00 2001
From: Pierre Turpin <pierre.turpin54@gmail.com>
Date: Mon, 8 Mar 2021 16:03:08 +0100
Subject: [PATCH 302/304] Clean side-effect when checking that local storage is
 enabled (#6323)

---
 src/storageManager.js                      |  9 +++++--
 test/spec/unit/core/storageManager_spec.js | 29 ++++++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/storageManager.js b/src/storageManager.js
index 60e5a7706d0..66a0cf68cbf 100644
--- a/src/storageManager.js
+++ b/src/storageManager.js
@@ -1,4 +1,4 @@
-import { hook } from './hook.js';
+import {hook} from './hook.js';
 import * as utils from './utils.js';
 import includes from 'core-js-pure/features/array/includes.js';
 
@@ -110,7 +110,12 @@ export function newStorageManager({gvlid, moduleName, moduleType} = {}) {
         try {
           localStorage.setItem('prebid.cookieTest', '1');
           return localStorage.getItem('prebid.cookieTest') === '1';
-        } catch (error) {}
+        } catch (error) {
+        } finally {
+          try {
+            localStorage.removeItem('prebid.cookieTest');
+          } catch (error) {}
+        }
       }
       return false;
     }
diff --git a/test/spec/unit/core/storageManager_spec.js b/test/spec/unit/core/storageManager_spec.js
index de09df5b196..5bb766217f5 100644
--- a/test/spec/unit/core/storageManager_spec.js
+++ b/test/spec/unit/core/storageManager_spec.js
@@ -46,16 +46,17 @@ describe('storage manager', function() {
 
   describe('localstorage forbidden access in 3rd-party context', function() {
     let errorLogSpy;
-    const originalLocalStorage = { get: () => window.localStorage };
+    let originalLocalStorage;
     const localStorageMock = { get: () => { throw Error } };
 
     beforeEach(function() {
+      originalLocalStorage = window.localStorage;
       Object.defineProperty(window, 'localStorage', localStorageMock);
       errorLogSpy = sinon.spy(utils, 'logError');
     });
 
     afterEach(function() {
-      Object.defineProperty(window, 'localStorage', originalLocalStorage);
+      Object.defineProperty(window, 'localStorage', { get: () => originalLocalStorage });
       errorLogSpy.restore();
     })
 
@@ -70,4 +71,28 @@ describe('storage manager', function() {
       sinon.assert.calledThrice(errorLogSpy);
     })
   })
+
+  describe('localstorage is enabled', function() {
+    let localStorage;
+
+    beforeEach(function() {
+      localStorage = window.localStorage;
+      localStorage.clear();
+    });
+
+    afterEach(function() {
+      localStorage.clear();
+    })
+
+    it('should remove side-effect after checking', function () {
+      const storage = getStorageManager();
+
+      localStorage.setItem('unrelated', 'dummy');
+      const val = storage.localStorageIsEnabled();
+
+      expect(val).to.be.true;
+      expect(localStorage.length).to.be.eq(1);
+      expect(localStorage.getItem('unrelated')).to.be.eq('dummy');
+    });
+  });
 });

From 3129a96f57141727c759f82189a348f6c37da19b Mon Sep 17 00:00:00 2001
From: Karim Mourra <karim@jwplayer.com>
Date: Tue, 9 Mar 2021 05:18:34 -0500
Subject: [PATCH 303/304] updates docs and demo for fpd changes (#6302)

Co-authored-by: karimJWP <karimJWP@github.com>
---
 .../gpt/jwplayerRtdProvider_example.html      | 48 +++++++++----------
 modules/jwplayerRtdProvider.md                | 12 +++--
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/integrationExamples/gpt/jwplayerRtdProvider_example.html b/integrationExamples/gpt/jwplayerRtdProvider_example.html
index 75eb85a2d8c..41c27b70ece 100644
--- a/integrationExamples/gpt/jwplayerRtdProvider_example.html
+++ b/integrationExamples/gpt/jwplayerRtdProvider_example.html
@@ -10,32 +10,30 @@
       var PREBID_TIMEOUT = 1000;
 
       var adUnits = [{
-        code: 'div-gpt-ad-1460505748561-0',
-        fpd: {
-          context: {
-            data: {
-              jwTargeting: {
-                // Note: the following Ids are placeholders and should be replaced with your Ids.
-                playerID: '123',
-                mediaID: 'abc'
+          code: 'div-gpt-ad-1460505748561-0',
+          ortb2Imp: {
+              ext: {
+                  data: {
+                      jwTargeting: {
+                          // Note: the following Ids are placeholders and should be replaced with your Ids.
+                          playerID: '123',
+                          mediaID: 'abc'
+                      }
+                  }
               }
-            },
-          }
-        },
-
-        mediaTypes: {
-          banner: {
-            sizes: [[300, 250], [300,600]],
-          }
-        },
-        // Replace this object to test a new Adapter!
-        bids: [{
-          bidder: 'appnexus',
-          params: {
-            placementId: 13144370
-          }
-        }]
-
+          },
+          mediaTypes: {
+              banner: {
+                  sizes: [[300, 250], [300,600]],
+              }
+          },
+          // Replace this object to test a new Adapter!
+          bids: [{
+              bidder: 'appnexus',
+              params: {
+                  placementId: 13144370
+              }
+          }]
       }];
 
       var pbjs = pbjs || {};
diff --git a/modules/jwplayerRtdProvider.md b/modules/jwplayerRtdProvider.md
index ae09277979a..0723e8cbb6c 100644
--- a/modules/jwplayerRtdProvider.md
+++ b/modules/jwplayerRtdProvider.md
@@ -25,14 +25,14 @@ pbjs.setConfig({
     }
 });
 ```
-Lastly, include the content's media ID and/or the player's ID in the matching AdUnit's `fpd.context.data`:
+Lastly, include the content's media ID and/or the player's ID in the matching AdUnit's `ortb2Imp.ext.data`:
 
 ```javascript
 const adUnit = {
   code: '/19968336/prebid_native_example_1',
   ...
-  fpd: {
-    context: {
+  ortb2Imp: {
+    ext: {
       data: {
         jwTargeting: {
           // Note: the following Ids are placeholders and should be replaced with your Ids.
@@ -52,7 +52,7 @@ pbjs.que.push(function() {
 });
 ``` 
 
-**Note**: You may also include `jwTargeting` information in the prebid config's `fpd.context.data`. Information provided in the adUnit will always supersede, and information in the config will be used as a fallback.
+**Note**: You may also include `jwTargeting` information in the prebid config's `ortb2.site.ext.data`. Information provided in the adUnit will always supersede, and information in the config will be used as a fallback.
  
 ##Prefetching
 In order to prefetch targeting information for certain media, include the media IDs in the `jwplayerDataProvider` var and set `waitForIt` to `true`:
@@ -117,3 +117,7 @@ To view an example:
 `http://localhost:9999/integrationExamples/gpt/jwplayerRtdProvider_example.html`
 
 **Note:** the mediaIds in the example are placeholder values; replace them with your existing IDs.
+
+#Maintainer info
+
+Maintained by JW Player. For any questions, comments or feedback please contact Karim Mourra, karim@jwplayer.com

From 9b2d3c0872b946f70e19d1160200c69ff83e505f Mon Sep 17 00:00:00 2001
From: pm-azhar-mulla <75726247+pm-azhar-mulla@users.noreply.github.com>
Date: Tue, 9 Mar 2021 16:50:53 +0530
Subject: [PATCH 304/304] Changed net revenue to True (#6387)

---
 modules/pubmaticBidAdapter.js                | 2 +-
 test/spec/modules/pubmaticBidAdapter_spec.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index 07e5b62ac26..41ca642c869 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -101,7 +101,7 @@ const NATIVE_MINIMUM_REQUIRED_IMAGE_ASSETS = [
   }
 ]
 
-const NET_REVENUE = false;
+const NET_REVENUE = true;
 const dealChannelValues = {
   1: 'PMP',
   5: 'PREF',
diff --git a/test/spec/modules/pubmaticBidAdapter_spec.js b/test/spec/modules/pubmaticBidAdapter_spec.js
index 37deb0bca9c..09573fe9f85 100644
--- a/test/spec/modules/pubmaticBidAdapter_spec.js
+++ b/test/spec/modules/pubmaticBidAdapter_spec.js
@@ -2614,7 +2614,7 @@ describe('PubMatic adapter', function () {
         }
         expect(response[0].dealId).to.equal(bidResponses.body.seatbid[0].bid[0].dealid);
         expect(response[0].currency).to.equal('USD');
-        expect(response[0].netRevenue).to.equal(false);
+        expect(response[0].netRevenue).to.equal(true);
         expect(response[0].ttl).to.equal(300);
         expect(response[0].meta.networkId).to.equal(123);
         expect(response[0].adserverTargeting.hb_buyid_pubmatic).to.equal('BUYER-ID-987');
@@ -2638,7 +2638,7 @@ describe('PubMatic adapter', function () {
         }
         expect(response[1].dealId).to.equal(bidResponses.body.seatbid[1].bid[0].dealid);
         expect(response[1].currency).to.equal('USD');
-        expect(response[1].netRevenue).to.equal(false);
+        expect(response[1].netRevenue).to.equal(true);
         expect(response[1].ttl).to.equal(300);
         expect(response[1].meta.networkId).to.equal(422);
         expect(response[1].adserverTargeting.hb_buyid_pubmatic).to.equal('BUYER-ID-789');