From 0fed339f5ae03257b51bffb5c3391886afc53eb2 Mon Sep 17 00:00:00 2001
From: Neelanjan Sen <14229985+Fawke@users.noreply.github.com>
Date: Thu, 17 Oct 2019 21:56:06 +0530
Subject: [PATCH 01/49] fix for userSync endpoint getting called with bidder
alias names, instead of actual bidder names (#4265)
---
modules/prebidServerBidAdapter/index.js | 9 +-
.../modules/prebidServerBidAdapter_spec.js | 171 +++++++++++++-----
2 files changed, 134 insertions(+), 46 deletions(-)
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 872e0bb81d91..93b8dc085f87 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -1,7 +1,6 @@
import Adapter from '../../src/adapter';
import { createBid } from '../../src/bidfactory';
import * as utils from '../../src/utils';
-import { ajax } from '../../src/ajax';
import { STATUS, S2S, EVENTS } from '../../src/constants';
import adapterManager from '../../src/adapterManager';
import { config } from '../../src/config';
@@ -11,6 +10,7 @@ import { isValid } from '../../src/adapters/bidderFactory';
import events from '../../src/events';
import includes from 'core-js/library/fn/array/includes';
import { S2S_VENDORS } from './config.js';
+import { ajax } from '../../src/ajax';
const getConfig = config.getConfig;
@@ -148,7 +148,6 @@ function queueSync(bidderCodes, gdprConsent) {
}
}
const jsonPayload = JSON.stringify(payload);
-
ajax(_s2sConfig.syncEndpoint,
(response) => {
try {
@@ -960,7 +959,11 @@ export function PrebidServer() {
if (_s2sConfig && _s2sConfig.syncEndpoint) {
let consent = (Array.isArray(bidRequests) && bidRequests.length > 0) ? bidRequests[0].gdprConsent : undefined;
- queueSync(_s2sConfig.bidders, consent);
+ let syncBidders = _s2sConfig.bidders
+ .map(bidder => adapterManager.aliasRegistry[bidder] || bidder)
+ .filter((bidder, index, array) => (array.indexOf(bidder) === index));
+
+ queueSync(syncBidders, consent);
}
const request = protocolAdapter().buildRequest(s2sBidRequest, bidRequests, validAdUnits);
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 658f130d144a..7945be682826 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -2,10 +2,8 @@ import { expect } from 'chai';
import { PrebidServer as Adapter, resetSyncedStatus } from 'modules/prebidServerBidAdapter/index.js';
import adapterManager from 'src/adapterManager';
import * as utils from 'src/utils';
-import { userSync } from 'src/userSync';
import { ajax } from 'src/ajax';
import { config } from 'src/config';
-import { requestBidsHook } from 'modules/consentManagement';
import events from 'src/events';
import CONSTANTS from 'src/constants';
@@ -32,7 +30,7 @@ const REQUEST = {
'sizes': [[300, 250], [300, 600]],
'mediaTypes': {
'banner': {
- 'sizes': [[ 300, 250 ], [ 300, 300 ]]
+ 'sizes': [[300, 250], [300, 300]]
},
'native': {
'title': {
@@ -77,7 +75,7 @@ const VIDEO_REQUEST = {
'sizes': [640, 480],
'mediaTypes': {
'video': {
- 'playerSize': [[ 640, 480 ]],
+ 'playerSize': [[640, 480]],
'mimes': ['video/mp4']
}
},
@@ -107,7 +105,7 @@ const OUTSTREAM_VIDEO_REQUEST = {
'sizes': [640, 480],
'mediaTypes': {
'video': {
- playerSize: [[ 640, 480 ]],
+ playerSize: [[640, 480]],
context: 'outstream',
mimes: ['video/mp4']
},
@@ -325,7 +323,7 @@ const RESPONSE_OPENRTB = {
'price': 0.5,
'adm': '',
'adid': '29681110',
- 'adomain': [ 'appnexus.com' ],
+ 'adomain': ['appnexus.com'],
'iurl': 'http://lax1-ib.adnxs.com/cr?id=2968111',
'cid': '958',
'crid': '2968111',
@@ -517,6 +515,11 @@ describe('S2S Adapter', function () {
},
'bid_id': '123',
'adUnitCode': 'div-gpt-ad-1460505748561-0',
+ 'mediaTypes': {
+ 'banner': {
+ 'sizes': [[300, 250]]
+ }
+ },
'transactionId': '4ef956ad-fd83-406d-bd35-e4bb786ab86c',
'sizes': [300, 250],
'bidId': '123',
@@ -553,11 +556,11 @@ describe('S2S Adapter', function () {
xhr.restore();
});
- it('should not add outstrean without renderer', function() {
+ it('should not add outstrean without renderer', function () {
let ortb2Config = utils.deepClone(CONFIG);
ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
- config.setConfig({s2sConfig: ortb2Config});
+ config.setConfig({ s2sConfig: ortb2Config });
adapter.callBids(OUTSTREAM_VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
const requestBid = JSON.parse(requests[0].requestBody);
@@ -570,7 +573,7 @@ describe('S2S Adapter', function () {
});
it('exists converts types', function () {
- config.setConfig({s2sConfig: CONFIG});
+ config.setConfig({ s2sConfig: CONFIG });
adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
const requestBid = JSON.parse(requests[0].requestBody);
expect(requestBid).to.have.property('cache_markup', 2);
@@ -604,7 +607,7 @@ describe('S2S Adapter', function () {
expect(requestBid.user.ext.consent).is.equal('abc123');
config.resetConfig();
- config.setConfig({s2sConfig: CONFIG});
+ config.setConfig({ s2sConfig: CONFIG });
adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
requestBid = JSON.parse(requests[1].requestBody);
@@ -681,7 +684,7 @@ describe('S2S Adapter', function () {
const s2sConfig = Object.assign({}, CONFIG, {
cacheMarkup: 999
});
- config.setConfig({s2sConfig: s2sConfig});
+ config.setConfig({ s2sConfig: s2sConfig });
adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
const requestBid = JSON.parse(requests[0].requestBody);
expect(requestBid).to.have.property('cache_markup', 0);
@@ -722,7 +725,8 @@ describe('S2S Adapter', function () {
});
it('adds device and app objects to request', function () {
- const _config = { s2sConfig: CONFIG,
+ const _config = {
+ s2sConfig: CONFIG,
device: { ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC' },
app: { bundle: 'com.test.app' },
};
@@ -737,7 +741,7 @@ describe('S2S Adapter', function () {
});
expect(requestBid.app).to.deep.equal({
bundle: 'com.test.app',
- publisher: {'id': '1'}
+ publisher: { 'id': '1' }
});
});
@@ -762,7 +766,7 @@ describe('S2S Adapter', function () {
});
expect(requestBid.app).to.deep.equal({
bundle: 'com.test.app',
- publisher: {'id': '1'}
+ publisher: { 'id': '1' }
});
});
@@ -785,7 +789,7 @@ describe('S2S Adapter', function () {
});
expect(requestBid.app).to.deep.equal({
bundle: 'com.test.app',
- publisher: {'id': '1'}
+ publisher: { 'id': '1' }
});
});
@@ -858,7 +862,7 @@ describe('S2S Adapter', function () {
const s2sConfig = Object.assign({}, CONFIG, {
endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
});
- config.setConfig({s2sConfig: s2sConfig});
+ config.setConfig({ s2sConfig: s2sConfig });
const aliasBidder = {
bidder: 'brealtime',
@@ -889,7 +893,7 @@ describe('S2S Adapter', function () {
const s2sConfig = Object.assign({}, CONFIG, {
endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
});
- config.setConfig({s2sConfig: s2sConfig});
+ config.setConfig({ s2sConfig: s2sConfig });
const alias = 'foobar';
const aliasBidder = {
@@ -923,7 +927,7 @@ describe('S2S Adapter', function () {
const s2sConfig = Object.assign({}, CONFIG, {
endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
});
- config.setConfig({s2sConfig: s2sConfig});
+ config.setConfig({ s2sConfig: s2sConfig });
const myRequest = utils.deepClone(REQUEST);
myRequest.ad_units[0].bids[0].params.usePaymentRule = true;
@@ -949,7 +953,7 @@ describe('S2S Adapter', function () {
config.resetConfig();
const oldS2sConfig = Object.assign({}, CONFIG);
- config.setConfig({s2sConfig: oldS2sConfig});
+ config.setConfig({ s2sConfig: oldS2sConfig });
const myRequest2 = utils.deepClone(REQUEST);
myRequest2.ad_units[0].bids[0].params.keywords = {
@@ -1068,7 +1072,7 @@ describe('S2S Adapter', function () {
let s2sConfig = utils.deepClone(CONFIG);
s2sConfig.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
config.setConfig({
- currency: {adServerCurrency: ['USD', 'GB', 'UK', 'AU']},
+ currency: { adServerCurrency: ['USD', 'GB', 'UK', 'AU'] },
s2sConfig: s2sConfig
});
@@ -1083,7 +1087,7 @@ describe('S2S Adapter', function () {
let s2sConfig = utils.deepClone(CONFIG);
s2sConfig.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
config.setConfig({
- currency: {adServerCurrency: 'NZ'},
+ currency: { adServerCurrency: 'NZ' },
s2sConfig: s2sConfig
});
@@ -1097,7 +1101,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: s2sConfig });
const bidRequests = utils.deepClone(BID_REQUESTS);
adapter.callBids(REQUEST, bidRequests, addBidResponse, done, ajax);
@@ -1246,7 +1250,7 @@ describe('S2S Adapter', function () {
});
});
- it('passes schain object in request', function() {
+ it('passes schain object in request', function () {
const bidRequests = utils.deepClone(BID_REQUESTS);
const schainObject = {
'ver': '1.0',
@@ -1298,7 +1302,7 @@ describe('S2S Adapter', function () {
it('registers bids and calls BIDDER_DONE', function () {
server.respondWith(JSON.stringify(RESPONSE));
- config.setConfig({s2sConfig: CONFIG});
+ config.setConfig({ s2sConfig: CONFIG });
adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
server.respond();
sinon.assert.calledOnce(addBidResponse);
@@ -1321,7 +1325,7 @@ describe('S2S Adapter', function () {
it('registers video bids', function () {
server.respondWith(JSON.stringify(VIDEO_RESPONSE));
- config.setConfig({s2sConfig: CONFIG});
+ config.setConfig({ s2sConfig: CONFIG });
adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
server.respond();
sinon.assert.calledOnce(addBidResponse);
@@ -1339,7 +1343,7 @@ describe('S2S Adapter', function () {
it('does not call addBidResponse and calls done when ad unit not set', function () {
server.respondWith(JSON.stringify(RESPONSE_NO_BID_NO_UNIT));
- config.setConfig({s2sConfig: CONFIG});
+ config.setConfig({ s2sConfig: CONFIG });
adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
server.respond();
@@ -1350,7 +1354,7 @@ describe('S2S Adapter', function () {
it('does not call addBidResponse and calls done when server requests cookie sync', function () {
server.respondWith(JSON.stringify(RESPONSE_NO_COOKIE));
- config.setConfig({s2sConfig: CONFIG});
+ config.setConfig({ s2sConfig: CONFIG });
adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
server.respond();
@@ -1361,7 +1365,7 @@ describe('S2S Adapter', function () {
it('does not call addBidResponse and calls done when ad unit is set', function () {
server.respondWith(JSON.stringify(RESPONSE_NO_BID_UNIT_SET));
- config.setConfig({s2sConfig: CONFIG});
+ config.setConfig({ s2sConfig: CONFIG });
adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
server.respond();
@@ -1372,7 +1376,7 @@ describe('S2S Adapter', function () {
it('registers successful bids and calls done when there are less bids than requests', function () {
server.respondWith(JSON.stringify(RESPONSE));
- config.setConfig({s2sConfig: CONFIG});
+ config.setConfig({ s2sConfig: CONFIG });
adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
server.respond();
@@ -1390,7 +1394,7 @@ describe('S2S Adapter', function () {
it('should have dealId in bidObject', function () {
server.respondWith(JSON.stringify(RESPONSE));
- config.setConfig({s2sConfig: CONFIG});
+ config.setConfig({ s2sConfig: CONFIG });
adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
server.respond();
const response = addBidResponse.firstCall.args[1];
@@ -1400,11 +1404,11 @@ describe('S2S Adapter', function () {
it('should pass through default adserverTargeting if present in bidObject', function () {
server.respondWith(JSON.stringify(RESPONSE));
- config.setConfig({s2sConfig: CONFIG});
+ config.setConfig({ s2sConfig: CONFIG });
adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
server.respond();
const response = addBidResponse.firstCall.args[1];
- expect(response).to.have.property('adserverTargeting').that.deep.equals({'foo': 'bar'});
+ expect(response).to.have.property('adserverTargeting').that.deep.equals({ 'foo': 'bar' });
});
it('registers client user syncs when client bid adapter is present', function () {
@@ -1415,7 +1419,7 @@ describe('S2S Adapter', function () {
server.respondWith(JSON.stringify(RESPONSE_NO_PBS_COOKIE));
- config.setConfig({s2sConfig: CONFIG});
+ config.setConfig({ s2sConfig: CONFIG });
adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
server.respond();
@@ -1433,7 +1437,7 @@ describe('S2S Adapter', function () {
const s2sConfig = Object.assign({}, CONFIG, {
endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
});
- config.setConfig({s2sConfig});
+ config.setConfig({ s2sConfig });
server.respondWith(JSON.stringify(RESPONSE_OPENRTB));
adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
@@ -1447,7 +1451,7 @@ describe('S2S Adapter', function () {
it('registers bid responses when server requests cookie sync', function () {
server.respondWith(JSON.stringify(RESPONSE_NO_PBS_COOKIE));
- config.setConfig({s2sConfig: CONFIG});
+ config.setConfig({ s2sConfig: CONFIG });
adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
server.respond();
sinon.assert.calledOnce(addBidResponse);
@@ -1467,7 +1471,7 @@ describe('S2S Adapter', function () {
const s2sConfig = Object.assign({}, CONFIG, {
endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
});
- config.setConfig({s2sConfig});
+ config.setConfig({ s2sConfig });
server.respondWith(JSON.stringify(RESPONSE_OPENRTB));
adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
@@ -1490,7 +1494,7 @@ describe('S2S Adapter', function () {
const s2sConfig = Object.assign({}, CONFIG, {
endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
});
- config.setConfig({s2sConfig});
+ config.setConfig({ s2sConfig });
server.respondWith(JSON.stringify(RESPONSE_OPENRTB_VIDEO));
adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
@@ -1510,7 +1514,7 @@ describe('S2S Adapter', function () {
const s2sConfig = Object.assign({}, CONFIG, {
endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
});
- config.setConfig({s2sConfig});
+ config.setConfig({ s2sConfig });
const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
cacheResponse.seatbid.forEach(item => {
item.bid[0].ext.prebid.cache = {
@@ -1536,7 +1540,7 @@ describe('S2S Adapter', function () {
const s2sConfig = Object.assign({}, CONFIG, {
endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
});
- config.setConfig({s2sConfig});
+ config.setConfig({ s2sConfig });
const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
const targetingTestData = {
hb_cache_path: '/cache',
@@ -1564,7 +1568,7 @@ describe('S2S Adapter', function () {
const s2sConfig = Object.assign({}, CONFIG, {
endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
});
- config.setConfig({s2sConfig});
+ config.setConfig({ s2sConfig });
const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
cacheResponse.seatbid.forEach(item => {
item.bid[0].ext.prebid.targeting = {
@@ -1594,7 +1598,7 @@ describe('S2S Adapter', function () {
const s2sConfig = Object.assign({}, CONFIG, {
endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
});
- config.setConfig({s2sConfig});
+ config.setConfig({ s2sConfig });
server.respondWith(JSON.stringify(RESPONSE_OPENRTB_NATIVE));
adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
@@ -1624,7 +1628,7 @@ describe('S2S Adapter', function () {
}
config.setConfig(_config);
- config.setConfig({s2sConfig: CONFIG});
+ config.setConfig({ s2sConfig: CONFIG });
adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
server.respond();
@@ -1633,13 +1637,20 @@ describe('S2S Adapter', function () {
});
describe('s2sConfig', function () {
+ let xhr;
+ let requests;
let logErrorSpy;
beforeEach(function () {
+ xhr = sinon.useFakeXMLHttpRequest();
+ requests = [];
+ xhr.onCreate = request => requests.push(request);
logErrorSpy = sinon.spy(utils, 'logError');
+ resetSyncedStatus();
});
afterEach(function () {
+ xhr.restore();
utils.logError.restore();
});
@@ -1792,11 +1803,85 @@ describe('S2S Adapter', function () {
config.setConfig({
s2sConfig: {
syncUrlModifier: {
- appnexus: () => {}
+ appnexus: () => { }
}
}
});
expect(typeof config.getConfig('s2sConfig').syncUrlModifier.appnexus).to.equal('function')
});
+
+ it('should set correct bidder names to bidders property when using an alias for that bidder', function () {
+ const s2sConfig = utils.deepClone(CONFIG);
+
+ // Add syncEndpoint so that the request goes to the User Sync endpoint
+ // Modify the bidders property to include an alias for Rubicon adapter
+ s2sConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+ s2sConfig.bidders = ['appnexus', 'rubicon-alias'];
+
+ const request = utils.deepClone(REQUEST);
+
+ // Add another bidder, `rubicon-alias`
+ request.ad_units[0].bids.push({
+ bidder: 'rubicon-alias',
+ params: {
+ accoundId: 14062,
+ siteId: 70608,
+ zoneId: 498816
+ }
+ });
+
+ // 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',
+ 'auctionId': '4146ab2b-9422-4040-9b1c-966fffbfe2d4',
+ 'bidderRequestId': '4b1a4f9c3e4546',
+ 'tid': 'd7fa8342-ae22-4ca1-b237-331169350f84',
+ 'bids': [
+ {
+ 'bidder': 'rubicon-alias',
+ 'params': {
+ 'accountId': 14062,
+ 'siteId': 70608,
+ 'zoneId': 498816
+ },
+ 'bid_id': '2a9523915411c3',
+ 'mediaTypes': {
+ 'banner': {
+ 'sizes': [
+ [
+ 300,
+ 250
+ ]
+ ]
+ }
+ },
+ 'adUnitCode': 'div-gpt-ad-1460505748561-0',
+ 'transactionId': '78ddc106-b7d8-45d1-bd29-86993098e53d',
+ 'sizes': [
+ [
+ 300,
+ 250
+ ]
+ ],
+ 'bidId': '2a9523915411c3',
+ 'bidderRequestId': '4b1a4f9c3e4546',
+ 'auctionId': '4146ab2b-9422-4040-9b1c-966fffbfe2d4'
+ }
+ ],
+ 'auctionStart': 1569234122602,
+ 'timeout': 1000,
+ 'src': 's2s'
+ });
+
+ adapter.callBids(request, bidRequest, addBidResponse, done, ajax);
+
+ const requestBid = JSON.parse(requests[0].requestBody);
+ expect(requestBid.bidders).to.deep.equal(['appnexus', 'rubicon']);
+ });
});
});
From 315bd196b252124e3c21c56ac15d42eb3f7d438f Mon Sep 17 00:00:00 2001
From: Index Exchange 3 Prebid Team
Date: Thu, 17 Oct 2019 13:11:20 -0400
Subject: [PATCH 02/49] modify ixBidAdapater to always use the secure endpoint
(#4323)
---
modules/ixBidAdapter.js | 10 +---------
test/spec/modules/ixBidAdapter_spec.js | 3 +--
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 8d76d8626550..85d3be2f0ec2 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -6,7 +6,6 @@ import { registerBidder } from '../src/adapters/bidderFactory';
const BIDDER_CODE = 'ix';
const BANNER_SECURE_BID_URL = 'https://as-sec.casalemedia.com/cygnus';
-const BANNER_INSECURE_BID_URL = 'http://as.casalemedia.com/cygnus';
const SUPPORTED_AD_TYPES = [BANNER];
const ENDPOINT_VERSION = 7.2;
const CENT_TO_DOLLAR_FACTOR = 100;
@@ -188,10 +187,7 @@ export const spec = {
let validBidRequest = null;
let bannerImp = null;
- // Always start by assuming the protocol is HTTPS. This way, it will work
- // whether the page protocol is HTTP or HTTPS. Then check if the page is
- // actually HTTP.If we can guarantee it is, then, and only then, set protocol to
- // HTTP.
+ // Always use secure HTTPS protocol.
let baseUrl = BANNER_SECURE_BID_URL;
for (let i = 0; i < validBidRequests.length; i++) {
@@ -258,10 +254,6 @@ export const spec = {
if (options.refererInfo) {
r.site.page = options.refererInfo.referer;
-
- if (options.refererInfo.referer && options.refererInfo.referer.indexOf('https') !== 0) {
- baseUrl = BANNER_INSECURE_BID_URL;
- }
}
}
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index 38e64e8d3387..120d02408d7d 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -5,7 +5,6 @@ import { newBidder } from 'src/adapters/bidderFactory';
import { spec } from 'modules/ixBidAdapter';
describe('IndexexchangeAdapter', function () {
- const IX_INSECURE_ENDPOINT = 'http://as.casalemedia.com/cygnus';
const IX_SECURE_ENDPOINT = 'https://as-sec.casalemedia.com/cygnus';
const BIDDER_VERSION = 7.2;
@@ -401,7 +400,7 @@ describe('IndexexchangeAdapter', function () {
it('request should be made to IX endpoint with GET method', function () {
expect(requestMethod).to.equal('GET');
- expect(requestUrl).to.equal(IX_INSECURE_ENDPOINT);
+ expect(requestUrl).to.equal(IX_SECURE_ENDPOINT);
});
it('query object (version, siteID and request) should be correct', function () {
From 64bd8512dd36b4712bd9e53dbef86cf2b1ad8638 Mon Sep 17 00:00:00 2001
From: Harshad Mane
Date: Thu, 17 Oct 2019 10:33:52 -0700
Subject: [PATCH 03/49] PubMatic to support Parrable User Id sub-module (#4324)
* added support for pubcommon, digitrust, id5id
* added support for IdentityLink
* changed the source for id5
* added unit test cases
* changed source param for identityLink
* PubMatic to support parrable id
---
modules/pubmaticBidAdapter.js | 1 +
test/spec/modules/pubmaticBidAdapter_spec.js | 36 ++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index 58d8d773dae8..59f0f7a7db80 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -651,6 +651,7 @@ function _handleEids(payload, validBidRequests) {
_addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.criteortus.${BIDDER_CODE}.userid`), 'criteortus', 1);
_addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.idl_env`), 'liveramp.com', 1);
_addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.lipb.lipbid`), 'liveintent.com', 1);
+ _addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.parrableid`), 'parrable.com', 1);
}
if (eids.length > 0) {
payload.user.eids = eids;
diff --git a/test/spec/modules/pubmaticBidAdapter_spec.js b/test/spec/modules/pubmaticBidAdapter_spec.js
index 22c0f840026a..32fdd7745186 100644
--- a/test/spec/modules/pubmaticBidAdapter_spec.js
+++ b/test/spec/modules/pubmaticBidAdapter_spec.js
@@ -1696,6 +1696,42 @@ describe('PubMatic adapter', function () {
expect(data.user.eids).to.equal(undefined);
});
});
+
+ describe('Parrable Id', function() {
+ it('send the Parrable id if it is present', function() {
+ bidRequests[0].userId = {};
+ bidRequests[0].userId.parrableid = 'parrable-user-id';
+ let request = spec.buildRequests(bidRequests, {});
+ let data = JSON.parse(request.data);
+ expect(data.user.eids).to.deep.equal([{
+ 'source': 'parrable.com',
+ 'uids': [{
+ 'id': 'parrable-user-id',
+ 'atype': 1
+ }]
+ }]);
+ });
+
+ it('do not pass if not string', function() {
+ bidRequests[0].userId = {};
+ bidRequests[0].userId.parrableid = 1;
+ let request = spec.buildRequests(bidRequests, {});
+ let data = JSON.parse(request.data);
+ expect(data.user.eids).to.equal(undefined);
+ bidRequests[0].userId.parrableid = [];
+ request = spec.buildRequests(bidRequests, {});
+ data = JSON.parse(request.data);
+ expect(data.user.eids).to.equal(undefined);
+ bidRequests[0].userId.parrableid = null;
+ request = spec.buildRequests(bidRequests, {});
+ data = JSON.parse(request.data);
+ expect(data.user.eids).to.equal(undefined);
+ bidRequests[0].userId.parrableid = {};
+ request = spec.buildRequests(bidRequests, {});
+ data = JSON.parse(request.data);
+ expect(data.user.eids).to.equal(undefined);
+ });
+ });
});
it('Request params check for video ad', function () {
From b89d006abaec11b028422835c14776db68ed2724 Mon Sep 17 00:00:00 2001
From: Michael Kuryshev
Date: Fri, 18 Oct 2019 21:45:30 +0200
Subject: [PATCH 04/49] VISX: currency validation & fix double escape of
referer (#4299)
---
modules/visxBidAdapter.js | 83 ++++++++++++++----------
test/spec/modules/visxBidAdapter_spec.js | 52 ++++++++-------
2 files changed, 75 insertions(+), 60 deletions(-)
diff --git a/modules/visxBidAdapter.js b/modules/visxBidAdapter.js
index 2f9ec73c569f..15334e46e31f 100644
--- a/modules/visxBidAdapter.js
+++ b/modules/visxBidAdapter.js
@@ -15,8 +15,11 @@ const LOG_ERROR_MESS = {
emptySeatbid: 'Seatbid array from response has an empty item',
emptyResponse: 'Response is empty',
hasEmptySeatbidArray: 'Response has empty seatbid array',
- hasNoArrayOfBids: 'Seatbid from response has no array of bid objects - '
+ hasNoArrayOfBids: 'Seatbid from response has no array of bid objects - ',
+ notAllowedCurrency: 'Currency is not supported - ',
+ currencyMismatch: 'Currency from the request is not match currency from the response - '
};
+const currencyWhiteList = ['EUR', 'USD', 'GBP', 'PLN'];
export const spec = {
code: BIDDER_CODE,
isBidRequestValid: function(bid) {
@@ -34,6 +37,11 @@ export const spec = {
DEFAULT_CUR;
let reqId;
+ if (currencyWhiteList.indexOf(currency) === -1) {
+ utils.logError(LOG_ERROR_MESS.notAllowedCurrency + currency);
+ return;
+ }
+
bids.forEach(bid => {
reqId = bid.bidderRequestId;
const {params: {uid}, adUnitCode} = bid;
@@ -78,7 +86,7 @@ export const spec = {
if (bidderRequest) {
if (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
- payload.u = encodeURIComponent(bidderRequest.refererInfo.referer);
+ payload.u = bidderRequest.refererInfo.referer;
}
if (bidderRequest.gdprConsent) {
if (bidderRequest.gdprConsent.consentString) {
@@ -158,43 +166,48 @@ function _addBidResponse(serverBid, bidsMap, currency, bidResponses, bidsWithout
if (!serverBid.auid) errorMessage = LOG_ERROR_MESS.noAuid + JSON.stringify(serverBid);
if (!serverBid.adm) errorMessage = LOG_ERROR_MESS.noAdm + JSON.stringify(serverBid);
else {
+ const reqCurrency = currency || DEFAULT_CUR;
const awaitingBids = bidsMap[serverBid.auid];
if (awaitingBids) {
- const sizeId = bidsWithoutSizeMatching ? `${serverBid.w}x${serverBid.h}` : Object.keys(awaitingBids)[0];
- if (awaitingBids[sizeId]) {
- const slot = awaitingBids[sizeId][0];
-
- const bid = slot.bids.shift();
- bidResponses.push({
- requestId: bid.bidId,
- bidderCode: spec.code,
- cpm: serverBid.price,
- width: serverBid.w,
- height: serverBid.h,
- creativeId: serverBid.auid,
- currency: currency || DEFAULT_CUR,
- netRevenue: true,
- ttl: TIME_TO_LIVE,
- ad: serverBid.adm,
- dealId: serverBid.dealid
- });
-
- if (!slot.bids.length) {
- slot.parents.forEach(({parent, key, uid}) => {
- const index = parent[key].indexOf(slot);
- if (index > -1) {
- parent[key].splice(index, 1);
- }
- if (!parent[key].length) {
- delete parent[key];
- if (!utils.getKeys(parent).length) {
- delete bidsMap[uid];
- }
- }
+ if (serverBid.cur && serverBid.cur !== reqCurrency) {
+ errorMessage = LOG_ERROR_MESS.currencyMismatch + reqCurrency + ' - ' + serverBid.cur;
+ } else {
+ const sizeId = bidsWithoutSizeMatching ? `${serverBid.w}x${serverBid.h}` : Object.keys(awaitingBids)[0];
+ if (awaitingBids[sizeId]) {
+ const slot = awaitingBids[sizeId][0];
+
+ const bid = slot.bids.shift();
+ bidResponses.push({
+ requestId: bid.bidId,
+ bidderCode: spec.code,
+ cpm: serverBid.price,
+ width: serverBid.w,
+ height: serverBid.h,
+ creativeId: serverBid.auid,
+ currency: reqCurrency,
+ netRevenue: true,
+ ttl: TIME_TO_LIVE,
+ ad: serverBid.adm,
+ dealId: serverBid.dealid
});
+
+ if (!slot.bids.length) {
+ slot.parents.forEach(({parent, key, uid}) => {
+ const index = parent[key].indexOf(slot);
+ if (index > -1) {
+ parent[key].splice(index, 1);
+ }
+ if (!parent[key].length) {
+ delete parent[key];
+ if (!utils.getKeys(parent).length) {
+ delete bidsMap[uid];
+ }
+ }
+ });
+ }
+ } else {
+ bidsWithoutSizeMatching && bidsWithoutSizeMatching.push(serverBid);
}
- } else {
- bidsWithoutSizeMatching && bidsWithoutSizeMatching.push(serverBid);
}
} else {
errorMessage = LOG_ERROR_MESS.noPlacementCode + serverBid.auid;
diff --git a/test/spec/modules/visxBidAdapter_spec.js b/test/spec/modules/visxBidAdapter_spec.js
index 09ce92479f97..167d54e37a60 100755
--- a/test/spec/modules/visxBidAdapter_spec.js
+++ b/test/spec/modules/visxBidAdapter_spec.js
@@ -45,7 +45,7 @@ describe('VisxAdapter', function () {
referer: 'http://example.com'
}
};
- const encodedReferrer = encodeURIComponent(bidderRequest.refererInfo.referer);
+ const referrer = bidderRequest.refererInfo.referer;
let bidRequests = [
{
'bidder': 'visx',
@@ -86,7 +86,7 @@ describe('VisxAdapter', function () {
const request = spec.buildRequests([bidRequests[0]], bidderRequest);
const payload = request.data;
expect(payload).to.be.an('object');
- expect(payload).to.have.property('u', encodedReferrer);
+ expect(payload).to.have.property('u', referrer);
expect(payload).to.have.property('pt', 'net');
expect(payload).to.have.property('auids', '903535');
expect(payload).to.have.property('sizes', '300x250,300x600');
@@ -98,7 +98,7 @@ describe('VisxAdapter', function () {
const request = spec.buildRequests(bidRequests, bidderRequest);
const payload = request.data;
expect(payload).to.be.an('object');
- expect(payload).to.have.property('u', encodedReferrer);
+ expect(payload).to.have.property('u', referrer);
expect(payload).to.have.property('pt', 'net');
expect(payload).to.have.property('auids', '903535,903535,903536');
expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
@@ -111,7 +111,7 @@ describe('VisxAdapter', function () {
const request = spec.buildRequests(bidRequests, bidderRequest);
const payload = request.data;
expect(payload).to.be.an('object');
- expect(payload).to.have.property('u', encodedReferrer);
+ expect(payload).to.have.property('u', referrer);
expect(payload).to.have.property('pt', 'net');
expect(payload).to.have.property('auids', '903535,903535,903536');
expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
@@ -124,7 +124,7 @@ describe('VisxAdapter', function () {
const request = spec.buildRequests(bidRequests, bidderRequest);
const payload = request.data;
expect(payload).to.be.an('object');
- expect(payload).to.have.property('u', encodedReferrer);
+ expect(payload).to.have.property('u', referrer);
expect(payload).to.have.property('pt', 'net');
expect(payload).to.have.property('auids', '903535,903535,903536');
expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
@@ -138,7 +138,7 @@ describe('VisxAdapter', function () {
const request = spec.buildRequests(bidRequests, bidderRequest);
const payload = request.data;
expect(payload).to.be.an('object');
- expect(payload).to.have.property('u', encodedReferrer);
+ expect(payload).to.have.property('u', referrer);
expect(payload).to.have.property('pt', 'net');
expect(payload).to.have.property('auids', '903535,903535,903536');
expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
@@ -149,16 +149,16 @@ describe('VisxAdapter', function () {
it('should add currency from currency.bidderCurrencyDefault', function () {
const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
- arg => arg === 'currency.bidderCurrencyDefault.visx' ? 'JPY' : 'USD');
+ arg => arg === 'currency.bidderCurrencyDefault.visx' ? 'GBP' : 'USD');
const request = spec.buildRequests(bidRequests, bidderRequest);
const payload = request.data;
expect(payload).to.be.an('object');
- expect(payload).to.have.property('u', encodedReferrer);
+ expect(payload).to.have.property('u', referrer);
expect(payload).to.have.property('pt', 'net');
expect(payload).to.have.property('auids', '903535,903535,903536');
expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
expect(payload).to.have.property('r', '22edbae2733bf6');
- expect(payload).to.have.property('cur', 'JPY');
+ expect(payload).to.have.property('cur', 'GBP');
getConfigStub.restore();
});
@@ -168,7 +168,7 @@ describe('VisxAdapter', function () {
const request = spec.buildRequests(bidRequests, bidderRequest);
const payload = request.data;
expect(payload).to.be.an('object');
- expect(payload).to.have.property('u', encodedReferrer);
+ expect(payload).to.have.property('u', referrer);
expect(payload).to.have.property('pt', 'net');
expect(payload).to.have.property('auids', '903535,903535,903536');
expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
@@ -204,11 +204,11 @@ describe('VisxAdapter', function () {
describe('interpretResponse', function () {
const responses = [
- {'bid': [{'price': 1.15, 'adm': 'test content 1
', 'auid': 903535, 'h': 250, 'w': 300}], 'seat': '1'},
- {'bid': [{'price': 0.5, 'adm': 'test content 2
', 'auid': 903536, 'h': 600, 'w': 300}], 'seat': '1'},
- {'bid': [{'price': 0.15, 'adm': 'test content 3
', 'auid': 903535, 'h': 90, 'w': 728}], 'seat': '1'},
- {'bid': [{'price': 0, 'auid': 903537, 'h': 250, 'w': 300}], 'seat': '1'},
- {'bid': [{'price': 0, 'adm': 'test content 5
', 'h': 250, 'w': 300}], 'seat': '1'},
+ {'bid': [{'price': 1.15, 'adm': 'test content 1
', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
+ {'bid': [{'price': 0.5, 'adm': 'test content 2
', 'auid': 903536, 'h': 600, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
+ {'bid': [{'price': 0.15, 'adm': 'test content 3
', 'auid': 903535, 'h': 90, 'w': 728, 'cur': 'EUR'}], 'seat': '1'},
+ {'bid': [{'price': 0, 'auid': 903537, 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
+ {'bid': [{'price': 0, 'adm': 'test content 5
', 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
undefined,
{'bid': [], 'seat': '1'},
{'seat': '1'},
@@ -346,7 +346,7 @@ describe('VisxAdapter', function () {
'auctionId': '1cbd2feafe5e8b',
}
];
- const getConfigStub = sinon.stub(config, 'getConfig').returns('JPY');
+ const getConfigStub = sinon.stub(config, 'getConfig').returns('PLN');
const request = spec.buildRequests(bidRequests);
const expectedResponse = [
{
@@ -358,13 +358,15 @@ describe('VisxAdapter', function () {
'height': 250,
'ad': 'test content 1
',
'bidderCode': 'visx',
- 'currency': 'JPY',
+ 'currency': 'PLN',
'netRevenue': true,
'ttl': 360,
}
];
- const result = spec.interpretResponse({'body': {'seatbid': [responses[0]]}}, request);
+ const response = Object.assign({}, responses[0]);
+ Object.assign(response.bid[0], {'cur': 'PLN'});
+ const result = spec.interpretResponse({'body': {'seatbid': [response]}}, request);
expect(result).to.deep.equal(expectedResponse);
getConfigStub.restore();
});
@@ -412,11 +414,11 @@ describe('VisxAdapter', function () {
it('complicated case', function () {
const fullResponse = [
- {'bid': [{'price': 1.15, 'adm': 'test content 1
', 'auid': 903535, 'h': 250, 'w': 300}], 'seat': '1'},
- {'bid': [{'price': 0.5, 'adm': 'test content 2
', 'auid': 903536, 'h': 600, 'w': 300}], 'seat': '1'},
- {'bid': [{'price': 0.15, 'adm': 'test content 3
', 'auid': 903535, 'h': 90, 'w': 728}], 'seat': '1'},
- {'bid': [{'price': 0.15, 'adm': 'test content 4
', 'auid': 903535, 'h': 600, 'w': 300}], 'seat': '1'},
- {'bid': [{'price': 0.5, 'adm': 'test content 5
', 'auid': 903536, 'h': 600, 'w': 350}], 'seat': '1'},
+ {'bid': [{'price': 1.15, 'adm': 'test content 1
', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
+ {'bid': [{'price': 0.5, 'adm': 'test content 2
', 'auid': 903536, 'h': 600, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
+ {'bid': [{'price': 0.15, 'adm': 'test content 3
', 'auid': 903535, 'h': 90, 'w': 728, 'cur': 'EUR'}], 'seat': '1'},
+ {'bid': [{'price': 0.15, 'adm': 'test content 4
', 'auid': 903535, 'h': 600, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
+ {'bid': [{'price': 0.5, 'adm': 'test content 5
', 'auid': 903536, 'h': 600, 'w': 350, 'cur': 'EUR'}], 'seat': '1'},
];
const bidRequests = [
{
@@ -550,8 +552,8 @@ describe('VisxAdapter', function () {
it('dublicate uids and sizes in one slot', function () {
const fullResponse = [
- {'bid': [{'price': 1.15, 'adm': 'test content 1
', 'auid': 903535, 'h': 250, 'w': 300}], 'seat': '1'},
- {'bid': [{'price': 0.5, 'adm': 'test content 2
', 'auid': 903535, 'h': 250, 'w': 300}], 'seat': '1'},
+ {'bid': [{'price': 1.15, 'adm': 'test content 1
', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
+ {'bid': [{'price': 0.5, 'adm': 'test content 2
', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
];
const bidRequests = [
{
From cde90dcba4db9b2b9cdaffd7ef87b9131c3e6fc4 Mon Sep 17 00:00:00 2001
From: Harshad Mane
Date: Sun, 20 Oct 2019 18:29:18 -0700
Subject: [PATCH 05/49] PubMatic to support coppa (#4336)
* added support for pubcommon, digitrust, id5id
* added support for IdentityLink
* changed the source for id5
* added unit test cases
* changed source param for identityLink
* added coppa compliance
---
modules/pubmaticBidAdapter.js | 10 +++++
test/spec/modules/pubmaticBidAdapter_spec.js | 40 ++++++++++++++++++++
2 files changed, 50 insertions(+)
diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index 59f0f7a7db80..51cebebf6e4b 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -920,6 +920,11 @@ export const spec = {
};
}
+ // coppa compliance
+ if (config.getConfig('coppa') === true) {
+ utils.deepSetValue(payload, 'regs.coppa', 1);
+ }
+
_handleDealCustomTargetings(payload, dctrArr, validBidRequests);
_handleEids(payload, validBidRequests);
_blockedIabCategoriesValidation(payload, blockedIabCategories);
@@ -1019,6 +1024,11 @@ export const spec = {
syncurl += '&gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || '');
}
+ // coppa compliance
+ if (config.getConfig('coppa') === true) {
+ syncurl += '&coppa=1';
+ }
+
if (syncOptions.iframeEnabled) {
return [{
type: 'iframe',
diff --git a/test/spec/modules/pubmaticBidAdapter_spec.js b/test/spec/modules/pubmaticBidAdapter_spec.js
index 32fdd7745186..feb64dfe4acb 100644
--- a/test/spec/modules/pubmaticBidAdapter_spec.js
+++ b/test/spec/modules/pubmaticBidAdapter_spec.js
@@ -1171,6 +1171,46 @@ describe('PubMatic adapter', function () {
// should have called DigiTrust.getUser() once
expect(window.DigiTrust.getUser.calledOnce).to.equal(true);
});
+
+ 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', () => {
+ 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);
+ });
+
+ it('should NOT include coppa flag in bid request if coppa is set to false', () => {
+ 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);
+ }
+ });
});
describe('AdsrvrOrgId from config', function() {
From ab91441d6c8b1f35ef0c5ec77a3c8bbf3afb14bc Mon Sep 17 00:00:00 2001
From: Roffray
Date: Mon, 21 Oct 2019 03:40:16 +0200
Subject: [PATCH 06/49] vuble: outstream has fullscreen option (#4320)
* Mod: vuble oustream has fullscreen option
* Add: vuble test for outstream scenario
---
modules/vubleBidAdapter.js | 2 +-
test/spec/modules/vubleBidAdapter_spec.js | 52 +++++++++++++++++++++++
2 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/modules/vubleBidAdapter.js b/modules/vubleBidAdapter.js
index 80d62d21842c..63f817358de9 100644
--- a/modules/vubleBidAdapter.js
+++ b/modules/vubleBidAdapter.js
@@ -23,7 +23,7 @@ const outstreamRender = bid => {
showBigPlayButton: false,
showProgressBar: 'bar',
showVolume: false,
- allowFullscreen: false,
+ allowFullscreen: true,
skippable: false,
}
});
diff --git a/test/spec/modules/vubleBidAdapter_spec.js b/test/spec/modules/vubleBidAdapter_spec.js
index 8996c1b49575..b38ad8f85840 100644
--- a/test/spec/modules/vubleBidAdapter_spec.js
+++ b/test/spec/modules/vubleBidAdapter_spec.js
@@ -280,4 +280,56 @@ describe('VubleAdapter', function () {
expect(adapter.getUserSyncs(syncOptions, [response])).to.deep.equal([result]);
})
});
+
+ describe('Check outstream scenario with renderer', function () {
+ // bid Request
+ let bid = {
+ data: {
+ context: 'outstream',
+ env: 'net',
+ width: '640',
+ height: '360',
+ pub_id: '3',
+ zone_id: '12345',
+ bid_id: 'abdc',
+ floor_price: 5.50, // optional
+ adUnitCode: 'code'
+ },
+ method: 'POST',
+ url: '//player.mediabong.net/prebid/request'
+ };
+ // Server's response
+ let response = {
+ body: {
+ status: 'ok',
+ cpm: 5.00,
+ creativeId: '2468',
+ url: 'https//player.mediabong.net/prebid/ad/a1b2c3d4',
+ dealId: 'MDB-TEST-1357',
+ renderer_id: 0,
+ renderer_url: 'vuble_renderer.js',
+ content: 'test'
+ }
+ };
+
+ let adResponse = {
+ ad: {
+ video: {
+ content: 'test'
+ }
+ }
+ };
+ let adUnitCode = 'code';
+ let rendererUrl = 'vuble_renderer.js';
+ let rendererId = 0;
+
+ let formattedResponses = adapter.interpretResponse(response, bid);
+ it('should equal to the expected format result', function () {
+ expect(formattedResponses[0].adResponse).to.deep.equal(adResponse);
+ expect(formattedResponses[0].adUnitCode).to.deep.equal(adUnitCode);
+ expect(formattedResponses[0].renderer.url).to.equal(rendererUrl);
+ expect(formattedResponses[0].renderer.id).to.equal(rendererId);
+ expect(formattedResponses[0].renderer.render).to.exist.and.to.be.a('function');
+ });
+ });
});
From f919f581ab13c23954ae82850ec36f24951e0f31 Mon Sep 17 00:00:00 2001
From: Dan Bogdan <43830380+EMXDigital@users.noreply.github.com>
Date: Mon, 21 Oct 2019 09:06:52 -0400
Subject: [PATCH 07/49] EMXDigital: hotfix to resolve URIError from
decodeURIComponent (#4333)
* hotfix to resolve URIError from decodeURIComponent
* added unit for decoding adm
---
modules/emx_digitalBidAdapter.js | 4 ++--
test/spec/modules/emx_digitalBidAdapter_spec.js | 9 +++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/modules/emx_digitalBidAdapter.js b/modules/emx_digitalBidAdapter.js
index 12f3482184ba..7167f9018aa5 100644
--- a/modules/emx_digitalBidAdapter.js
+++ b/modules/emx_digitalBidAdapter.js
@@ -7,7 +7,7 @@ import includes from 'core-js/library/fn/array/includes';
const BIDDER_CODE = 'emx_digital';
const ENDPOINT = 'hb.emxdgt.com';
const RENDERER_URL = '//js.brealtime.com/outstream/1.30.0/bundle.js';
-const ADAPTER_VERSION = '1.41.0';
+const ADAPTER_VERSION = '1.41.1';
const DEFAULT_CUR = 'USD';
export const emxAdapter = {
@@ -116,7 +116,7 @@ export const emxAdapter = {
},
parseResponse: (bidResponseAdm) => {
try {
- return decodeURIComponent(bidResponseAdm);
+ return decodeURIComponent(bidResponseAdm.replace(/%(?![0-9][0-9a-fA-F]+)/g, '%25'));
} catch (err) {
utils.logError('emx_digitalBidAdapter', 'error', err);
}
diff --git a/test/spec/modules/emx_digitalBidAdapter_spec.js b/test/spec/modules/emx_digitalBidAdapter_spec.js
index 16f17174f884..80fd12a237c6 100644
--- a/test/spec/modules/emx_digitalBidAdapter_spec.js
+++ b/test/spec/modules/emx_digitalBidAdapter_spec.js
@@ -527,6 +527,15 @@ describe('emx_digital Adapter', function () {
});
expect(result.length).to.equal(0);
});
+
+ it('should not throw an error when decoding an improperly encoded adm', function () {
+ serverResponse.seatbid[0].bid[0].adm = '\\<\\/script\\>';
+ serverResponse.seatbid[1].bid[0].adm = '%3F%%3Demx%3C3prebid'
+
+ assert.doesNotThrow(() => spec.interpretResponse({
+ body: serverResponse
+ }));
+ });
});
describe('getUserSyncs', function () {
From 56d6c59ec1614c1c43f734b19832851d2a9e0b75 Mon Sep 17 00:00:00 2001
From: rumesh
Date: Mon, 21 Oct 2019 20:13:37 +0000
Subject: [PATCH 08/49] Specify second parameter for parseInt for
pubmaticBidAdapter (#4347)
---
modules/pubmaticBidAdapter.js | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index 51cebebf6e4b..73e6d8cfb523 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -174,8 +174,8 @@ function _parseAdSlot(bid) {
utils.logWarn(LOG_WARN_PREFIX + 'AdSlot Error: adSlot not in required format');
return;
}
- bid.params.width = parseInt(splits[0]);
- bid.params.height = parseInt(splits[1]);
+ bid.params.width = parseInt(splits[0], 10);
+ bid.params.height = parseInt(splits[1], 10);
} else if (bid.hasOwnProperty('mediaTypes') &&
bid.mediaTypes.hasOwnProperty(BANNER) &&
bid.mediaTypes.banner.hasOwnProperty('sizes')) {
@@ -441,8 +441,8 @@ function _createBannerRequest(bid) {
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]);
- bannerObj.h = parseInt(sizes[0][1]);
+ bannerObj.w = parseInt(sizes[0][0], 10);
+ bannerObj.h = parseInt(sizes[0][1], 10);
sizes = sizes.splice(1, sizes.length - 1);
}
} else {
@@ -482,11 +482,11 @@ function _createVideoRequest(bid) {
}
// 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]);
- videoObj.h = parseInt(bid.mediaTypes.video.playerSize[0][1]);
+ 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]);
- videoObj.h = parseInt(bid.mediaTypes.video.playerSize[1]);
+ 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 = {
From a65a11b3b0b63d9a454e64c210844b3e2179107c Mon Sep 17 00:00:00 2001
From: oasis <2394426+bmwcmw@users.noreply.github.com>
Date: Tue, 22 Oct 2019 11:42:04 +0200
Subject: [PATCH 09/49] Remove usage of getTopWindowUrl in Prebid Adapter
(#4341)
---
modules/criteoBidAdapter.js | 16 +++++---
test/spec/modules/criteoBidAdapter_spec.js | 45 +++++++++++++++++-----
2 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 86f289421ce4..7f292c76e209 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -8,7 +8,7 @@ import find from 'core-js/library/fn/array/find';
import JSEncrypt from 'jsencrypt/bin/jsencrypt';
import sha256 from 'crypto-js/sha256';
-export const ADAPTER_VERSION = 21;
+export const ADAPTER_VERSION = 23;
const BIDDER_CODE = 'criteo';
const CDB_ENDPOINT = 'https://bidder.criteo.com/cdb';
const CRITEO_VENDOR_ID = 91;
@@ -79,7 +79,7 @@ export const spec = {
url = adapter.buildCdbUrl();
data = adapter.buildCdbRequest();
} else {
- const context = buildContext(bidRequests);
+ const context = buildContext(bidRequests, bidderRequest);
url = buildCdbUrl(context);
data = buildCdbRequest(context, bidRequests, bidderRequest);
}
@@ -177,14 +177,18 @@ function publisherTagAvailable() {
/**
* @param {BidRequest[]} bidRequests
+ * @param bidderRequest
* @return {CriteoContext}
*/
-function buildContext(bidRequests) {
- const url = utils.getTopWindowUrl();
- const queryString = parse(url).search;
+function buildContext(bidRequests, bidderRequest) {
+ let referrer = '';
+ if (bidderRequest && bidderRequest.refererInfo) {
+ referrer = bidderRequest.refererInfo.referer;
+ }
+ const queryString = parse(referrer).search;
const context = {
- url: url,
+ url: referrer,
debug: queryString['pbt_debug'] === '1',
noLog: queryString['pbt_nolog'] === '1',
amp: false,
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index 03500d4add69..e5d789ff60d3 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -368,7 +368,11 @@ describe('The Criteo bidding adapter', function () {
});
describe('buildRequests', function () {
+ const refererUrl = 'https://criteo.com?pbt_debug=1&pbt_nolog=1';
const bidderRequest = {
+ refererInfo: {
+ referer: refererUrl
+ },
timeout: 3000,
gdprConsent: {
gdprApplies: 1,
@@ -385,10 +389,23 @@ describe('The Criteo bidding adapter', function () {
config.resetConfig();
});
- it('should properly build a zoneId request', function () {
- const publisherUrl = 'https://criteo.com?pbt_debug=1&pbt_nolog=1';
- utilsMock.expects('getTopWindowUrl').withExactArgs().once().returns(publisherUrl);
+ it('should properly build a request if refererInfo is not provided', function () {
+ const bidderRequest = {};
+ const bidRequests = [
+ {
+ bidder: 'criteo',
+ adUnitCode: 'bid-123',
+ transactionId: 'transaction-123',
+ sizes: [[728, 90]],
+ params: {}
+ },
+ ];
+ const request = spec.buildRequests(bidRequests, bidderRequest);
+ const ortbRequest = request.data;
+ expect(ortbRequest.publisher.url).to.equal('');
+ });
+ it('should properly build a zoneId request', function () {
const bidRequests = [
{
bidder: 'criteo',
@@ -407,7 +424,7 @@ describe('The Criteo bidding adapter', function () {
expect(request.url).to.match(/^https:\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=\d+&wv=[^&]+&cb=\d+&im=1&debug=1&nolog=1/);
expect(request.method).to.equal('POST');
const ortbRequest = request.data;
- expect(ortbRequest.publisher.url).to.equal(publisherUrl);
+ expect(ortbRequest.publisher.url).to.equal(refererUrl);
expect(ortbRequest.slots).to.have.lengthOf(1);
expect(ortbRequest.slots[0].impid).to.equal('bid-123');
expect(ortbRequest.slots[0].transactionid).to.equal('transaction-123');
@@ -421,6 +438,9 @@ describe('The Criteo bidding adapter', function () {
it('should properly build a networkId request', function () {
const bidderRequest = {
+ refererInfo: {
+ referer: refererUrl
+ },
timeout: 3000,
gdprConsent: {
gdprApplies: 0,
@@ -451,7 +471,7 @@ describe('The Criteo bidding adapter', function () {
expect(request.url).to.match(/^https:\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=\d+&wv=[^&]+&cb=\d/);
expect(request.method).to.equal('POST');
const ortbRequest = request.data;
- expect(ortbRequest.publisher.url).to.equal(utils.getTopWindowUrl());
+ expect(ortbRequest.publisher.url).to.equal(refererUrl);
expect(ortbRequest.publisher.networkid).to.equal(456);
expect(ortbRequest.slots).to.have.lengthOf(1);
expect(ortbRequest.slots[0].impid).to.equal('bid-123');
@@ -465,7 +485,12 @@ describe('The Criteo bidding adapter', function () {
});
it('should properly build a mixed request', function () {
- const bidderRequest = { timeout: 3000 };
+ const bidderRequest = {
+ refererInfo: {
+ referer: refererUrl
+ },
+ timeout: 3000
+ };
const bidRequests = [
{
bidder: 'criteo',
@@ -490,7 +515,7 @@ describe('The Criteo bidding adapter', function () {
expect(request.url).to.match(/^https:\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=\d+&wv=[^&]+&cb=\d/);
expect(request.method).to.equal('POST');
const ortbRequest = request.data;
- expect(ortbRequest.publisher.url).to.equal(utils.getTopWindowUrl());
+ expect(ortbRequest.publisher.url).to.equal(refererUrl);
expect(ortbRequest.publisher.networkid).to.equal(456);
expect(ortbRequest.slots).to.have.lengthOf(2);
expect(ortbRequest.slots[0].impid).to.equal('bid-123');
@@ -517,9 +542,9 @@ describe('The Criteo bidding adapter', function () {
},
},
];
- const bidderRequest = { timeout: 3000,
- gdprConsent: {
- },
+ const bidderRequest = {
+ timeout: 3000,
+ gdprConsent: {},
};
const ortbRequest = spec.buildRequests(bidRequests, bidderRequest).data;
From b5f3c995d827d1af3e3aa0dbd71d57618335f1c2 Mon Sep 17 00:00:00 2001
From: Paul Yang
Date: Tue, 22 Oct 2019 05:40:58 -0700
Subject: [PATCH 10/49] Conversant Bid Adapter update for 3.0 (#4284)
---
modules/conversantBidAdapter.js | 13 +++---
modules/conversantBidAdapter.md | 6 ++-
.../spec/modules/conversantBidAdapter_spec.js | 40 +++++++++----------
3 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/modules/conversantBidAdapter.js b/modules/conversantBidAdapter.js
index 00ca6a7bbd68..a3479a9d1d17 100644
--- a/modules/conversantBidAdapter.js
+++ b/modules/conversantBidAdapter.js
@@ -3,7 +3,7 @@ import {registerBidder} from '../src/adapters/bidderFactory';
import { BANNER, VIDEO } from '../src/mediaTypes';
const BIDDER_CODE = 'conversant';
-const URL = '//web.hb.ad.cpe.dotomi.com/s2s/header/24';
+const URL = 'https://web.hb.ad.cpe.dotomi.com/s2s/header/24';
export const spec = {
code: BIDDER_CODE,
@@ -44,26 +44,24 @@ export const spec = {
* Make a server request from the list of BidRequests.
*
* @param {BidRequest[]} validBidRequests - an array of bids
+ * @param bidderRequest
* @return {ServerRequest} Info describing the request to the server.
*/
buildRequests: function(validBidRequests, bidderRequest) {
- const loc = utils.getTopWindowLocation();
- const page = loc.href;
- const isPageSecure = (loc.protocol === 'https:') ? 1 : 0;
+ const page = (bidderRequest && bidderRequest.refererInfo) ? bidderRequest.refererInfo.referer : '';
let siteId = '';
let requestId = '';
let pubcid = null;
const conversantImps = validBidRequests.map(function(bid) {
const bidfloor = utils.getBidIdParameter('bidfloor', bid.params);
- const secure = isPageSecure || (utils.getBidIdParameter('secure', bid.params) ? 1 : 0);
siteId = utils.getBidIdParameter('site_id', bid.params);
requestId = bid.auctionId;
const imp = {
id: bid.bidId,
- secure: secure,
+ secure: 1,
bidfloor: bidfloor || 0,
displaymanager: 'Prebid.js',
displaymanagerver: '$prebid.version$'
@@ -154,6 +152,7 @@ export const spec = {
* Unpack the response from the server into a list of bids.
*
* @param {*} serverResponse A successful response from the server.
+ * @param bidRequest
* @return {Bid[]} An array of bids which were nested inside the server.
*/
interpretResponse: function(serverResponse, bidRequest) {
@@ -249,7 +248,7 @@ function getDevice() {
*
* [[300, 250], [300, 600]] => [{w: 300, h: 250}, {w: 300, h: 600}]
*
- * @param {number[2][]|number[2]} bidSizes - arrays of widths and heights
+ * @param {Array.>} bidSizes - arrays of widths and heights
* @returns {object[]} Array of objects with w and h
*/
function convertSizes(bidSizes) {
diff --git a/modules/conversantBidAdapter.md b/modules/conversantBidAdapter.md
index 3ce83d8c893e..5aba56530439 100644
--- a/modules/conversantBidAdapter.md
+++ b/modules/conversantBidAdapter.md
@@ -13,7 +13,11 @@ Module that connects to Conversant's demand sources. Supports banners and video
var adUnits = [
{
code: 'banner-test-div',
- sizes: [[300, 250]],
+ mediaTypes: {
+ banner: {
+ sizes: [[300, 250],[300,600]]
+ }
+ },
bids: [{
bidder: "conversant",
params: {
diff --git a/test/spec/modules/conversantBidAdapter_spec.js b/test/spec/modules/conversantBidAdapter_spec.js
index aeadc3bf828c..6c9f0c8e6e58 100644
--- a/test/spec/modules/conversantBidAdapter_spec.js
+++ b/test/spec/modules/conversantBidAdapter_spec.js
@@ -2,8 +2,6 @@ import {expect} from 'chai';
import {spec} from 'modules/conversantBidAdapter';
import * as utils from 'src/utils';
-var Adapter = require('modules/conversantBidAdapter');
-
describe('Conversant adapter tests', function() {
const siteId = '108060';
const versionPattern = /^\d+\.\d+\.\d+(.)*$/;
@@ -16,7 +14,6 @@ describe('Conversant adapter tests', function() {
site_id: siteId,
position: 1,
tag_id: 'tagid-1',
- secure: false,
bidfloor: 0.5
},
placementCode: 'pcode000',
@@ -30,8 +27,7 @@ describe('Conversant adapter tests', function() {
{
bidder: 'conversant',
params: {
- site_id: siteId,
- secure: false
+ site_id: siteId
},
mediaTypes: {
banner: {
@@ -50,8 +46,7 @@ describe('Conversant adapter tests', function() {
params: {
site_id: siteId,
position: 2,
- tag_id: '',
- secure: false
+ tag_id: ''
},
placementCode: 'pcode002',
transactionId: 'tx002',
@@ -198,9 +193,15 @@ describe('Conversant adapter tests', function() {
});
it('Verify buildRequest', function() {
- const request = spec.buildRequests(bidRequests);
+ const page = 'http://test.com?a=b&c=123';
+ const bidderRequest = {
+ refererInfo: {
+ referer: page
+ }
+ };
+ const request = spec.buildRequests(bidRequests, bidderRequest);
expect(request.method).to.equal('POST');
- expect(request.url).to.equal('//web.hb.ad.cpe.dotomi.com/s2s/header/24');
+ expect(request.url).to.equal('https://web.hb.ad.cpe.dotomi.com/s2s/header/24');
const payload = request.data;
expect(payload).to.have.property('id', 'req000');
@@ -209,7 +210,7 @@ describe('Conversant adapter tests', function() {
expect(payload.imp).to.be.an('array').with.lengthOf(6);
expect(payload.imp[0]).to.have.property('id', 'bid000');
- expect(payload.imp[0]).to.have.property('secure', 0);
+ expect(payload.imp[0]).to.have.property('secure', 1);
expect(payload.imp[0]).to.have.property('bidfloor', 0.5);
expect(payload.imp[0]).to.have.property('displaymanager', 'Prebid.js');
expect(payload.imp[0]).to.have.property('displaymanagerver').that.matches(versionPattern);
@@ -221,7 +222,7 @@ describe('Conversant adapter tests', function() {
expect(payload.imp[0]).to.not.have.property('video');
expect(payload.imp[1]).to.have.property('id', 'bid001');
- expect(payload.imp[1]).to.have.property('secure', 0);
+ expect(payload.imp[1]).to.have.property('secure', 1);
expect(payload.imp[1]).to.have.property('bidfloor', 0);
expect(payload.imp[1]).to.have.property('displaymanager', 'Prebid.js');
expect(payload.imp[1]).to.have.property('displaymanagerver').that.matches(versionPattern);
@@ -232,7 +233,7 @@ describe('Conversant adapter tests', function() {
expect(payload.imp[1].banner.format).to.deep.equal([{w: 728, h: 90}, {w: 468, h: 60}]);
expect(payload.imp[2]).to.have.property('id', 'bid002');
- expect(payload.imp[2]).to.have.property('secure', 0);
+ expect(payload.imp[2]).to.have.property('secure', 1);
expect(payload.imp[2]).to.have.property('bidfloor', 0);
expect(payload.imp[2]).to.have.property('displaymanager', 'Prebid.js');
expect(payload.imp[2]).to.have.property('displaymanagerver').that.matches(versionPattern);
@@ -242,7 +243,7 @@ describe('Conversant adapter tests', function() {
expect(payload.imp[2].banner.format).to.deep.equal([{w: 300, h: 600}, {w: 160, h: 600}]);
expect(payload.imp[3]).to.have.property('id', 'bid003');
- expect(payload.imp[3]).to.have.property('secure', 0);
+ expect(payload.imp[3]).to.have.property('secure', 1);
expect(payload.imp[3]).to.have.property('bidfloor', 0);
expect(payload.imp[3]).to.have.property('displaymanager', 'Prebid.js');
expect(payload.imp[3]).to.have.property('displaymanagerver').that.matches(versionPattern);
@@ -261,7 +262,7 @@ describe('Conversant adapter tests', function() {
expect(payload.imp[3]).to.not.have.property('banner');
expect(payload.imp[4]).to.have.property('id', 'bid004');
- expect(payload.imp[4]).to.have.property('secure', 0);
+ expect(payload.imp[4]).to.have.property('secure', 1);
expect(payload.imp[4]).to.have.property('bidfloor', 0);
expect(payload.imp[4]).to.have.property('displaymanager', 'Prebid.js');
expect(payload.imp[4]).to.have.property('displaymanagerver').that.matches(versionPattern);
@@ -280,7 +281,7 @@ describe('Conversant adapter tests', function() {
expect(payload.imp[4]).to.not.have.property('banner');
expect(payload.imp[5]).to.have.property('id', 'bid005');
- expect(payload.imp[5]).to.have.property('secure', 0);
+ expect(payload.imp[5]).to.have.property('secure', 1);
expect(payload.imp[5]).to.have.property('bidfloor', 0);
expect(payload.imp[5]).to.have.property('displaymanager', 'Prebid.js');
expect(payload.imp[5]).to.have.property('displaymanagerver').that.matches(versionPattern);
@@ -299,8 +300,7 @@ describe('Conversant adapter tests', function() {
expect(payload).to.have.property('site');
expect(payload.site).to.have.property('id', siteId);
expect(payload.site).to.have.property('mobile').that.is.oneOf([0, 1]);
- const loc = utils.getTopWindowLocation();
- const page = loc.href;
+
expect(payload.site).to.have.property('page', page);
expect(payload).to.have.property('device');
@@ -365,7 +365,7 @@ describe('Conversant adapter tests', function() {
it('Verify publisher commond id support', function() {
// clone bidRequests
- let requests = utils.deepClone(bidRequests)
+ let requests = utils.deepClone(bidRequests);
// add pubcid to every entry
requests.forEach((unit) => {
@@ -378,7 +378,7 @@ describe('Conversant adapter tests', function() {
it('Verify User ID publisher commond id support', function() {
// clone bidRequests
- let requests = utils.deepClone(bidRequests)
+ let requests = utils.deepClone(bidRequests);
// add pubcid to every entry
requests.forEach((unit) => {
@@ -415,4 +415,4 @@ describe('Conversant adapter tests', function() {
expect(payload).to.have.deep.nested.property('user.ext.consent', '');
expect(payload).to.not.have.deep.nested.property('regs.ext.gdpr');
});
-})
+});
From f92650f022463ed16fc9faaaadb279d14819ce95 Mon Sep 17 00:00:00 2001
From: Nepomuk Seiler
Date: Tue, 22 Oct 2019 17:32:18 +0200
Subject: [PATCH 11/49] Add cpmDistribution function for Google Analytics
adapter (#4240)
* Add cpmDistribution function for Google Analytics adapter
* Add test for the cpmDistribution function
* Remove half written comment
---
modules/googleAnalyticsAdapter.js | 12 ++++++
modules/googleAnalyticsAdapter.md | 37 +++++++++++++++++++
.../modules/googleAnalyticsAdapter_spec.js | 18 +++++++--
3 files changed, 64 insertions(+), 3 deletions(-)
create mode 100644 modules/googleAnalyticsAdapter.md
diff --git a/modules/googleAnalyticsAdapter.js b/modules/googleAnalyticsAdapter.js
index c1c160194493..2e569cd7ba11 100644
--- a/modules/googleAnalyticsAdapter.js
+++ b/modules/googleAnalyticsAdapter.js
@@ -19,6 +19,7 @@ var _enableCheck = true;
var _category = 'Prebid.js Bids';
var _eventCount = 0;
var _enableDistribution = false;
+var _cpmDistribution = null;
var _trackerSend = null;
var _sampled = true;
@@ -42,6 +43,9 @@ adapter.enableAnalytics = function ({ provider, options }) {
if (options && typeof options.enableDistribution !== 'undefined') {
_enableDistribution = options.enableDistribution;
}
+ if (options && typeof options.cpmDistribution === 'function') {
+ _cpmDistribution = options.cpmDistribution;
+ }
var bid = null;
@@ -166,6 +170,9 @@ function getLoadTimeDistribution(time) {
}
function getCpmDistribution(cpm) {
+ if (_cpmDistribution) {
+ return _cpmDistribution(cpm);
+ }
var distribution;
if (cpm >= 0 && cpm < 0.5) {
distribution = '$0-0.5';
@@ -255,6 +262,11 @@ function sendBidWonToGa(bid) {
checkAnalytics();
}
+/**
+ * Exposed for testing purposes
+ */
+adapter.getCpmDistribution = getCpmDistribution;
+
adapterManager.registerAnalyticsAdapter({
adapter,
code: 'ga'
diff --git a/modules/googleAnalyticsAdapter.md b/modules/googleAnalyticsAdapter.md
new file mode 100644
index 000000000000..08423a1d492f
--- /dev/null
+++ b/modules/googleAnalyticsAdapter.md
@@ -0,0 +1,37 @@
+# Google Analytics Adapter
+
+The google analytics adapter pushes prebid events into google analytics.
+
+## Usage
+
+The simplest way to enable the analytics adapter is this
+
+```javascript
+pbjs.enableAnalytics([{
+ provider: 'ga'
+}]);
+```
+
+Defaults will be used and you should see events being pushed to analytics.
+
+You can customize the adapter with various `options` like this
+
+```javascript
+pbjs.enableAnalytics([{
+ provider: 'ga',
+ options: { ... }
+}]);
+
+Here is a full list of settings available
+
+- `global` (string) - name of the global analytics object. Default is `ga`
+- `trackerName` (string) - use another tracker for prebid events. Default is the default tracker
+- `sampling` (number) - choose a value from `0` to `1`, where `0` means 0% and `1` means 100% tracked
+- `enableDistribution` (boolean) - enables additional events that track load time and cpm distribution
+ by creating buckets for load time and cpm
+- `cpmDistribution` (cpm: number => string) - customize the cpm buckets for the cpm distribution
+
+
+## Additional resources
+
+- [Prebid GA Analytics](http://prebid.org/overview/ga-analytics.html)
diff --git a/test/spec/modules/googleAnalyticsAdapter_spec.js b/test/spec/modules/googleAnalyticsAdapter_spec.js
index 20517f4138da..6bc0d4e192d3 100644
--- a/test/spec/modules/googleAnalyticsAdapter_spec.js
+++ b/test/spec/modules/googleAnalyticsAdapter_spec.js
@@ -4,12 +4,24 @@ var assert = require('assert');
describe('Ga', function () {
describe('enableAnalytics', function () {
- it('should accept a tracker name option and output prefixed send string', function () {
- var config = { options: { trackerName: 'foo' } };
- ga.enableAnalytics(config);
+ var cpmDistribution = function(cpm) {
+ return cpm <= 1 ? '<= 1$' : '> 1$';
+ }
+ var config = { options: { trackerName: 'foo', enableDistribution: true, cpmDistribution: cpmDistribution } };
+
+ // enableAnalytics can only be called once
+ ga.enableAnalytics(config);
+ it('should accept a tracker name option and output prefixed send string', function () {
var output = ga.getTrackerSend();
assert.equal(output, 'foo.send');
});
+
+ it('should use the custom cpm distribution', function() {
+ assert.equal(ga.getCpmDistribution(0.5), '<= 1$');
+ assert.equal(ga.getCpmDistribution(1), '<= 1$');
+ assert.equal(ga.getCpmDistribution(2), '> 1$');
+ assert.equal(ga.getCpmDistribution(5.23), '> 1$');
+ });
});
});
From 2318453cc97df8e904bf433bf4848f40f91260b7 Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III
Date: Tue, 22 Oct 2019 10:30:18 -0700
Subject: [PATCH 12/49] fixing SRA p_pos (#4337)
---
modules/rubiconBidAdapter.js | 5 ++-
test/spec/modules/rubiconBidAdapter_spec.js | 36 +++++++++++++++++++++
2 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index cc17e2596956..7885158425b5 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -410,9 +410,8 @@ export const spec = {
};
// add p_pos only if specified and valid
- if (params.position === 'atf' || params.position === 'btf') {
- data['p_pos'] = params.position;
- }
+ // For SRA we need to explicitly put empty semi colons so AE treats it as empty, instead of copying the latter value
+ data['p_pos'] = (params.position === 'atf' || params.position === 'btf') ? params.position : '';
if ((bidRequest.userId || {}).tdid) {
data['tpid_tdid'] = bidRequest.userId.tdid;
diff --git a/test/spec/modules/rubiconBidAdapter_spec.js b/test/spec/modules/rubiconBidAdapter_spec.js
index 4688f0f5d32e..0390d4598ae8 100644
--- a/test/spec/modules/rubiconBidAdapter_spec.js
+++ b/test/spec/modules/rubiconBidAdapter_spec.js
@@ -375,6 +375,42 @@ describe('the rubicon adapter', function () {
expect(data['p_pos']).to.equal(undefined);
});
+ it('should correctly send p_pos in sra fashion', function() {
+ sandbox.stub(config, 'getConfig').callsFake((key) => {
+ const config = {
+ 'rubicon.singleRequest': true
+ };
+ return config[key];
+ });
+ // first one is atf
+ var sraPosRequest = utils.deepClone(bidderRequest);
+
+ // second is not present
+ const bidCopy = utils.deepClone(sraPosRequest.bids[0]);
+ delete bidCopy.params.position;
+ sraPosRequest.bids.push(bidCopy);
+
+ // third is btf
+ const bidCopy1 = utils.deepClone(sraPosRequest.bids[0]);
+ bidCopy1.params.position = 'btf';
+ sraPosRequest.bids.push(bidCopy1);
+
+ // fourth is invalid (aka not atf or btf)
+ const bidCopy2 = utils.deepClone(sraPosRequest.bids[0]);
+ bidCopy2.params.position = 'unknown';
+ sraPosRequest.bids.push(bidCopy2);
+
+ // fifth is not present
+ const bidCopy3 = utils.deepClone(sraPosRequest.bids[0]);
+ delete bidCopy3.params.position;
+ sraPosRequest.bids.push(bidCopy3);
+
+ let [request] = spec.buildRequests(sraPosRequest.bids, sraPosRequest);
+ let data = parseQuery(request.data);
+
+ expect(data['p_pos']).to.equal('atf;;btf;;');
+ });
+
it('ad engine query params should be ordered correctly', function () {
sandbox.stub(Math, 'random').callsFake(() => 0.1);
let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
From 23fad51b12ea5e9e596525aad2f691170f6ea16b Mon Sep 17 00:00:00 2001
From: JonGoSonobi
Date: Tue, 22 Oct 2019 13:36:45 -0400
Subject: [PATCH 13/49] In Sonobi Adapter, only read sizes from bid.mediaTypes
(#4311)
---
modules/sonobiBidAdapter.js | 43 +++-
test/spec/modules/sonobiBidAdapter_spec.js | 279 +++++++++++++++------
2 files changed, 248 insertions(+), 74 deletions(-)
diff --git a/modules/sonobiBidAdapter.js b/modules/sonobiBidAdapter.js
index a0390a981a50..3fb9a83d2597 100644
--- a/modules/sonobiBidAdapter.js
+++ b/modules/sonobiBidAdapter.js
@@ -20,8 +20,36 @@ export const spec = {
* @param {BidRequest} bid - The bid params to validate.
* @return {boolean} True if this is a valid bid, and false otherwise.
*/
- isBidRequestValid: bid => !!(bid.params && (bid.params.ad_unit || bid.params.placement_id) && (bid.params.sizes || bid.sizes)),
+ isBidRequestValid: (bid) => {
+ if (!bid.params) {
+ return false;
+ }
+ if (!bid.params.ad_unit && !bid.params.placement_id) {
+ return false;
+ }
+
+ if (!deepAccess(bid, 'mediaTypes.banner') && !deepAccess(bid, 'mediaTypes.video')) {
+ return false;
+ }
+ if (deepAccess(bid, 'mediaTypes.banner')) { // Sonobi does not support multi type bids, favor banner over video
+ if (!deepAccess(bid, 'mediaTypes.banner.sizes') && !bid.params.sizes) {
+ // sizes at the banner or params level is required.
+ return false;
+ }
+ } else if (deepAccess(bid, 'mediaTypes.video')) {
+ if (deepAccess(bid, 'mediaTypes.video.context') === 'outstream' && !bid.params.sizes) {
+ // bids.params.sizes is required for outstream video adUnits
+ return false;
+ }
+ if (deepAccess(bid, 'mediaTypes.video.context') === 'instream' && !deepAccess(bid, 'mediaTypes.video.playerSize')) {
+ // playerSize is required for instream adUnits.
+ return false;
+ }
+ }
+
+ return true;
+ },
/**
* Make a server request from the list of BidRequests.
*
@@ -227,10 +255,21 @@ function _findBidderRequest(bidderRequests, bidId) {
}
function _validateSize (bid) {
+ if (deepAccess(bid, 'mediaTypes.video')) {
+ return ''; // Video bids arent allowed to override sizes via the trinity request
+ }
+
if (bid.params.sizes) {
return parseSizesInput(bid.params.sizes).join(',');
}
- return parseSizesInput(bid.sizes).join(',');
+ if (deepAccess(bid, 'mediaTypes.banner.sizes')) {
+ return parseSizesInput(deepAccess(bid, 'mediaTypes.banner.sizes')).join(',');
+ }
+
+ // Handle deprecated sizes definition
+ if (bid.sizes) {
+ return parseSizesInput(bid.sizes).join(',');
+ }
}
function _validateSlot (bid) {
diff --git a/test/spec/modules/sonobiBidAdapter_spec.js b/test/spec/modules/sonobiBidAdapter_spec.js
index dc536846ae2a..a6bf88cfc74b 100644
--- a/test/spec/modules/sonobiBidAdapter_spec.js
+++ b/test/spec/modules/sonobiBidAdapter_spec.js
@@ -19,87 +19,222 @@ describe('SonobiBidAdapter', function () {
})
describe('.isBidRequestValid', function () {
- let bid = {
- 'bidder': 'sonobi',
- 'params': {
- 'ad_unit': '/7780971/sparks_prebid_MR',
- 'sizes': [[300, 250], [300, 600]],
- 'floor': '1'
- },
- 'adUnitCode': 'adunit-code',
- 'sizes': [[300, 250], [300, 600]],
- 'bidId': '30b31c1838de1e',
- 'bidderRequestId': '22edbae2733bf6',
- 'auctionId': '1d1a030790a475',
- }
-
- it('should return true when required params found', function () {
- expect(spec.isBidRequestValid(bid)).to.equal(true)
- })
-
- it('should return true when bid.params.placement_id and bid.params.sizes are found', function () {
- let bid = Object.assign({}, bid)
- delete bid.params
- delete bid.sizes
- bid.params = {
- 'placement_id': '1a2b3c4d5e6f1a2b3c4d',
- 'sizes': [[300, 250], [300, 600]],
- }
+ it('should return false if there are no params', () => {
+ const bid = {
+ 'bidder': 'sonobi',
+ 'adUnitCode': 'adunit-code',
+ 'mediaTypes': {
+ banner: {
+ sizes: [[300, 250], [300, 600]]
+ }
+ },
+ 'bidId': '30b31c1838de1e',
+ 'bidderRequestId': '22edbae2733bf6',
+ 'auctionId': '1d1a030790a475',
+ };
+ expect(spec.isBidRequestValid(bid)).to.equal(false);
+ });
- expect(spec.isBidRequestValid(bid)).to.equal(true)
- })
+ it('should return false if there is no placement_id param and no ad_unit param', () => {
+ const bid = {
+ 'bidder': 'sonobi',
+ 'adUnitCode': 'adunit-code',
+ params: {
+ placementId: '1a2b3c4d5e6f1a2b3c4d',
+ },
+ 'mediaTypes': {
+ banner: {
+ sizes: [[300, 250], [300, 600]]
+ }
+ },
+ 'bidId': '30b31c1838de1e',
+ 'bidderRequestId': '22edbae2733bf6',
+ 'auctionId': '1d1a030790a475',
+ };
+ expect(spec.isBidRequestValid(bid)).to.equal(false);
+ });
- it('should return true when bid.params.placement_id and bid.sizes are found', function () {
- let bid = Object.assign({}, bid)
- delete bid.params
- bid.sizes = [[300, 250], [300, 600]]
- bid.params = {
- 'placement_id': '1a2b3c4d5e6f1a2b3c4d',
- }
+ it('should return false if there is no mediaTypes', () => {
+ const bid = {
+ 'bidder': 'sonobi',
+ 'adUnitCode': 'adunit-code',
+ params: {
+ placement_id: '1a2b3c4d5e6f1a2b3c4d'
+ },
+ 'mediaTypes': {
+ },
+ 'bidId': '30b31c1838de1e',
+ 'bidderRequestId': '22edbae2733bf6',
+ 'auctionId': '1d1a030790a475',
+ };
+ expect(spec.isBidRequestValid(bid)).to.equal(false);
+ });
- expect(spec.isBidRequestValid(bid)).to.equal(true)
- })
+ it('should return true if the bid is valid', () => {
+ const bid = {
+ 'bidder': 'sonobi',
+ 'adUnitCode': 'adunit-code',
+ params: {
+ placement_id: '1a2b3c4d5e6f1a2b3c4d'
+ },
+ 'mediaTypes': {
+ banner: {
+ sizes: [[300, 250], [300, 600]]
+ }
+ },
+ 'bidId': '30b31c1838de1e',
+ 'bidderRequestId': '22edbae2733bf6',
+ 'auctionId': '1d1a030790a475',
+ };
+ expect(spec.isBidRequestValid(bid)).to.equal(true);
+ });
- it('should return true when bid.params.ad_unit and bid.params.sizes are found', function () {
- let bid = Object.assign({}, bid)
- delete bid.params
- delete bid.sizes
- bid.params = {
- 'ad_unit': '/7780971/sparks_prebid_MR',
- 'sizes': [[300, 250], [300, 600]],
- }
+ describe('banner', () => {
+ it('should return false if there are no banner sizes and no param sizes', () => {
+ const bid = {
+ 'bidder': 'sonobi',
+ 'adUnitCode': 'adunit-code',
+ params: {
+ placement_id: '1a2b3c4d5e6f1a2b3c4d'
+ },
+ 'mediaTypes': {
+ banner: {
- expect(spec.isBidRequestValid(bid)).to.equal(true)
- })
+ }
+ },
+ 'bidId': '30b31c1838de1e',
+ 'bidderRequestId': '22edbae2733bf6',
+ 'auctionId': '1d1a030790a475',
+ };
+ expect(spec.isBidRequestValid(bid)).to.equal(false);
+ });
- it('should return true when bid.params.ad_unit and bid.sizes are found', function () {
- let bid = Object.assign({}, bid)
- delete bid.params
- bid.sizes = [[300, 250], [300, 600]]
- bid.params = {
- 'ad_unit': '/7780971/sparks_prebid_MR',
- }
+ it('should return true if there is banner sizes and no param sizes', () => {
+ const bid = {
+ 'bidder': 'sonobi',
+ 'adUnitCode': 'adunit-code',
+ params: {
+ placement_id: '1a2b3c4d5e6f1a2b3c4d'
+ },
+ 'mediaTypes': {
+ banner: {
+ sizes: [[300, 250], [300, 600]]
+ }
+ },
+ 'bidId': '30b31c1838de1e',
+ 'bidderRequestId': '22edbae2733bf6',
+ 'auctionId': '1d1a030790a475',
+ };
+ expect(spec.isBidRequestValid(bid)).to.equal(true);
+ });
- expect(spec.isBidRequestValid(bid)).to.equal(true)
- })
+ it('should return true if there is param sizes and no banner sizes', () => {
+ const bid = {
+ 'bidder': 'sonobi',
+ 'adUnitCode': 'adunit-code',
+ params: {
+ placement_id: '1a2b3c4d5e6f1a2b3c4d',
+ sizes: [[300, 250], [300, 600]]
+ },
+ 'mediaTypes': {
+ banner: {
+ }
+ },
+ 'bidId': '30b31c1838de1e',
+ 'bidderRequestId': '22edbae2733bf6',
+ 'auctionId': '1d1a030790a475',
+ };
+ expect(spec.isBidRequestValid(bid)).to.equal(true);
+ });
+ });
- it('should return false when no params are found', function () {
- let bid = Object.assign({}, bid)
- delete bid.params
- expect(spec.isBidRequestValid(bid)).to.equal(false)
- })
+ describe('video', () => {
+ describe('instream', () => {
+ it('should return false if there is no playerSize defined in the video mediaType', () => {
+ const bid = {
+ 'bidder': 'sonobi',
+ 'adUnitCode': 'adunit-code',
+ params: {
+ placement_id: '1a2b3c4d5e6f1a2b3c4d',
+ sizes: [[300, 250], [300, 600]]
+ },
+ 'mediaTypes': {
+ video: {
+ context: 'instream'
+ }
+ },
+ 'bidId': '30b31c1838de1e',
+ 'bidderRequestId': '22edbae2733bf6',
+ 'auctionId': '1d1a030790a475',
+ };
+ expect(spec.isBidRequestValid(bid)).to.equal(false);
+ });
+
+ it('should return true if there is playerSize defined on the video mediaType', () => {
+ const bid = {
+ 'bidder': 'sonobi',
+ 'adUnitCode': 'adunit-code',
+ params: {
+ placement_id: '1a2b3c4d5e6f1a2b3c4d',
+ },
+ 'mediaTypes': {
+ video: {
+ context: 'instream',
+ playerSize: [300, 250]
+ }
+ },
+ 'bidId': '30b31c1838de1e',
+ 'bidderRequestId': '22edbae2733bf6',
+ 'auctionId': '1d1a030790a475',
+ };
+ expect(spec.isBidRequestValid(bid)).to.equal(true);
+ });
+ });
- it('should return false when bid.params.placement_id and bid.params.ad_unit are not found', function () {
- let bid = Object.assign({}, bid)
- delete bid.params
- bid.params = {
- 'placement_id': 0,
- 'ad_unit': 0,
- 'sizes': [[300, 250], [300, 600]],
- }
- expect(spec.isBidRequestValid(bid)).to.equal(false)
- })
- })
+ describe('outstream', () => {
+ it('should return false if there is no param sizes', () => {
+ const bid = {
+ 'bidder': 'sonobi',
+ 'adUnitCode': 'adunit-code',
+ params: {
+ placement_id: '1a2b3c4d5e6f1a2b3c4d',
+ },
+ 'mediaTypes': {
+ video: {
+ context: 'outstream',
+ playerSize: [300, 250]
+ }
+ },
+ 'bidId': '30b31c1838de1e',
+ 'bidderRequestId': '22edbae2733bf6',
+ 'auctionId': '1d1a030790a475',
+ };
+ expect(spec.isBidRequestValid(bid)).to.equal(false);
+ });
+
+ it('should return true if there is param sizes', () => {
+ const bid = {
+ 'bidder': 'sonobi',
+ 'adUnitCode': 'adunit-code',
+ params: {
+ placement_id: '1a2b3c4d5e6f1a2b3c4d',
+ sizes: [300, 250]
+
+ },
+ 'mediaTypes': {
+ video: {
+ context: 'outstream'
+ }
+ },
+ 'bidId': '30b31c1838de1e',
+ 'bidderRequestId': '22edbae2733bf6',
+ 'auctionId': '1d1a030790a475',
+ };
+ expect(spec.isBidRequestValid(bid)).to.equal(true);
+ });
+ });
+ });
+ });
describe('.buildRequests', function () {
beforeEach(function() {
From 8b85edcb4af77532482336c062065d34cbf71996 Mon Sep 17 00:00:00 2001
From: TinchoF <50110327+TinchoF@users.noreply.github.com>
Date: Tue, 22 Oct 2019 15:54:08 -0300
Subject: [PATCH 14/49] Fix mediaTypes (#4332)
* Outcon bid adapter.
* Fix identation
* Fixes
* Fixes
* Fixes
* Spec fixes
* Fixes
* Fix urls
* Fix
* Fix parameters
* Fix space operators
* Fix bidder timeout
* Update
* Fix whitespace
* no message
* Outcon unit test
* no message
* no message
* no message
* no message
* Fixes
* Fixes
* Change url
* no message
* no message
* no message
* Added bidId
* no message
* no message
* no message
* no message
* Wrapping url with html
* no message
* no message
* no message
* Fix mediaTypes
* no message
* Update outconBidAdapter_spec.js
* Adding VAS response
* no message
* no message
* no message
* Fix
* Changed ttl
* no message
* supportedMediaTypes
* no message
* no message
---
modules/outconBidAdapter.js | 18 ++++++++++++++----
test/spec/modules/outconBidAdapter_spec.js | 13 +++++++++----
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/modules/outconBidAdapter.js b/modules/outconBidAdapter.js
index d691e807059b..ba0c11642797 100644
--- a/modules/outconBidAdapter.js
+++ b/modules/outconBidAdapter.js
@@ -1,18 +1,20 @@
import {registerBidder} from '../src/adapters/bidderFactory';
-import {config} from '../src/config';
const BIDDER_CODE = 'outcon';
+
export const spec = {
code: BIDDER_CODE,
+ supportedMediaTypes: ['banner', 'video'],
isBidRequestValid: function(bid) {
return !!((bid.params.pod || (bid.params.internalId && bid.params.publisher)) && bid.params.env);
},
buildRequests: function(validBidRequests) {
for (let i = 0; i < validBidRequests.length; i++) {
- let par = '';
let url = '';
+ let par = '';
if (validBidRequests[i].params.pod != undefined) par = 'get?pod=' + validBidRequests[i].params.pod + '&bidId=' + validBidRequests[i].bidId;
else par = 'get?internalId=' + validBidRequests[i].params.internalId + '&publisher=' + validBidRequests[i].params.publisher + '&bidId=' + validBidRequests[i].bidId;
+ par = par + '&vast=true';
switch (validBidRequests[i].params.env) {
case 'test':
par = par + '&demo=true';
@@ -42,10 +44,17 @@ export const spec = {
creativeId: serverResponse.body.creatives[0].id,
currency: serverResponse.body.cur,
netRevenue: true,
- ttl: config.getConfig('_bidderTimeout'),
+ ttl: 300,
ad: wrapDisplayUrl(serverResponse.body.creatives[0].url, serverResponse.body.type),
- vastImpUrl: serverResponse.body.trackingURL
+ vastImpUrl: serverResponse.body.trackingURL,
+ mediaType: serverResponse.body.type
};
+ if (serverResponse.body.type == 'video') {
+ Object.assign(bidResponse, {
+ vastUrl: serverResponse.body.vastURL,
+ ttl: 3600
+ });
+ }
bidResponses.push(bidResponse);
return bidResponses;
},
@@ -54,6 +63,7 @@ export const spec = {
function wrapDisplayUrl(displayUrl, type) {
if (type == 'video') return ``;
if (type == 'banner') return `