Various Bid Adapters: point tmax at request object (prebid#9770)

* Removed 'CreateEidsArray' import statements, as well as references to it within corresponding functions. Added references to 'userIdAsEids' property as an alternative * Revert "Removed 'CreateEidsArray' import statements, as well as references to it within corresponding functions. Added references to 'userIdAsEids' property as an alternative" This reverts commit f654a5b. * passed all tests * passed tests with bluebillywigAdapter * Impactify bid adapter passed tests * Mediakeys bid adapter passing tests * Sharethrough bid adapter passed tests * Connectad bid adapter passed tests * Added tests back to expectedEids object, and adjusted userIdAsEids array to reflect changes * Yieldmo bid adapter passed tests * Smartadserver bid adapter passed tests * Removed unnecessary reassignment of bidUserId to eids * Removed unnecessary reassignment of bidUserId to eids * Improveddigital bid adapter passed tests * Yieldmo bid adapter passed tests * Sovrn bid adapter passed tests * Ttd bid adapter passed tests * Refactored adapters to draw tmax values from bidderRequest object and ensured they were passing tests * Update nexx360BidAdapter.js * Deleted unrelated ttsBidAdapter file from PR * Deleted unrelated ttdBidAdapter_spec file from PR * add back ttd adapter * add ttd spec flle back * add new line --------- Co-authored-by: Patrick McCann <pmccann@cafemedia.com> Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
jwplayer · May 18, 2023 · 33a337d · 33a337d
1 parent 2dce95a
commit 33a337d
Show file tree

Hide file tree

Showing 50 changed files with 61 additions and 102 deletions.
diff --git a/modules/acuityAdsBidAdapter.js b/modules/acuityAdsBidAdapter.js
@@ -150,7 +150,7 @@ export const spec = {
       coppa: config.getConfig('coppa') === true ? 1 : 0,
       ccpa: bidderRequest.uspConsent || undefined,
       gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: config.getConfig('bidderTimeout')
+      tmax: bidderRequest.timeout
     };
 
     const len = validBidRequests.length;

diff --git a/modules/amxBidAdapter.js b/modules/amxBidAdapter.js
@@ -332,7 +332,7 @@ export const spec = {
       m: createBidMap(bidRequests),
       cpp: config.getConfig('coppa') ? 1 : 0,
       fpd2: bidderRequest.ortb2,
-      tmax: config.getConfig('bidderTimeout'),
+      tmax: bidderRequest.timeout,
       amp: refInfo(bidderRequest, 'isAmp', null),
       ri: buildReferrerInfo(bidderRequest),
       sync: getSyncSettings(),

diff --git a/modules/appushBidAdapter.js b/modules/appushBidAdapter.js
@@ -154,7 +154,7 @@ export const spec = {
       coppa: config.getConfig('coppa') === true ? 1 : 0,
       ccpa: bidderRequest.uspConsent || undefined,
       gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: config.getConfig('bidderTimeout')
+      tmax: bidderRequest.timeout
     };
 
     const len = validBidRequests.length;

diff --git a/modules/beyondmediaBidAdapter.js b/modules/beyondmediaBidAdapter.js
@@ -145,7 +145,7 @@ export const spec = {
       coppa: config.getConfig('coppa') === true ? 1 : 0,
       ccpa: bidderRequest.uspConsent || undefined,
       gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: config.getConfig('bidderTimeout')
+      tmax: bidderRequest.timeout
     };
 
     const len = validBidRequests.length;

diff --git a/modules/braveBidAdapter.js b/modules/braveBidAdapter.js
@@ -83,7 +83,7 @@ export const spec = {
         domain: parseUrl(page).hostname,
         page: page,
       },
-      tmax: bidderRequest.timeout || config.getConfig('bidderTimeout') || 500,
+      tmax: bidderRequest.timeout,
       imp
     };
 

diff --git a/modules/brightcomBidAdapter.js b/modules/brightcomBidAdapter.js
@@ -68,7 +68,7 @@ function buildRequests(bidReqs, bidderRequest) {
         w: screen.width,
         h: screen.height
       },
-      tmax: config.getConfig('bidderTimeout')
+      tmax: bidderRequest?.timeout
     };
 
     if (bidderRequest && bidderRequest.gdprConsent) {

diff --git a/modules/brightcomSSPBidAdapter.js b/modules/brightcomSSPBidAdapter.js
@@ -84,7 +84,7 @@ function buildRequests(bidReqs, bidderRequest) {
         w: screen.width,
         h: screen.height
       },
-      tmax: config.getConfig('bidderTimeout')
+      tmax: bidderRequest?.timeout
     };
 
     if (bidderRequest?.gdprConsent) {

diff --git a/modules/coinzillaBidAdapter.js b/modules/coinzillaBidAdapter.js
@@ -1,5 +1,4 @@
 import { parseSizesInput } from '../src/utils.js';
-import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 
 const BIDDER_CODE = 'coinzilla';
@@ -78,7 +77,7 @@ export const spec = {
         dealId: dealId,
         currency: currency,
         netRevenue: netRevenue,
-        ttl: config.getConfig('_bidderTimeout'),
+        ttl: bidRequest.timeout,
         referrer: referrer,
         ad: response.ad,
         mediaType: response.mediaType,

diff --git a/modules/compassBidAdapter.js b/modules/compassBidAdapter.js
@@ -155,7 +155,7 @@ export const spec = {
       coppa: config.getConfig('coppa') === true ? 1 : 0,
       ccpa: bidderRequest.uspConsent || undefined,
       gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: config.getConfig('bidderTimeout')
+      tmax: bidderRequest.timeout
     };
 
     const len = validBidRequests.length;

diff --git a/modules/contentexchangeBidAdapter.js b/modules/contentexchangeBidAdapter.js
@@ -157,7 +157,7 @@ export const spec = {
       coppa: config.getConfig('coppa') === true ? 1 : 0,
       ccpa: bidderRequest.uspConsent || undefined,
       gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: config.getConfig('bidderTimeout')
+      tmax: bidderRequest.timeout
     };
 
     const len = validBidRequests.length;

diff --git a/modules/glimpseBidAdapter.js b/modules/glimpseBidAdapter.js
@@ -1,5 +1,4 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { config } from '../src/config.js';
 import { BANNER } from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
 import {
@@ -99,7 +98,7 @@ function getReferer(bidderRequest) {
 function buildQuery(bidderRequest) {
   let url = appendQueryParam(ENDPOINT, 'ver', '$prebid.version$');
 
-  const timeout = config.getConfig('bidderTimeout');
+  const timeout = bidderRequest.timeout;
   url = appendQueryParam(url, 'tmax', timeout);
 
   if (gdprApplies(bidderRequest)) {

diff --git a/modules/globalsunBidAdapter.js b/modules/globalsunBidAdapter.js
@@ -155,7 +155,7 @@ export const spec = {
       coppa: config.getConfig('coppa') === true ? 1 : 0,
       ccpa: bidderRequest.uspConsent || undefined,
       gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: config.getConfig('bidderTimeout')
+      tmax: bidderRequest.timeout
     };
 
     const len = validBidRequests.length;

diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js
@@ -93,7 +93,7 @@ export const spec = {
     let {bidderRequestId, auctionId, gdprConsent, uspConsent, timeout, refererInfo, gppConsent} = bidderRequest || {};
 
     const referer = refererInfo ? encodeURIComponent(refererInfo.page) : '';
-    const tmax = timeout || config.getConfig('bidderTimeout');
+    const tmax = timeout;
     const imp = [];
     const bidsMap = {};
     const requests = [];

diff --git a/modules/gridNMBidAdapter.js b/modules/gridNMBidAdapter.js
@@ -135,7 +135,7 @@ export const spec = {
         reqSource.ext.schain = schain;
       }
 
-      const bidderTimeout = config.getConfig('bidderTimeout') || timeout;
+      const bidderTimeout = timeout;
       const tmax = timeout ? Math.min(bidderTimeout, timeout) : bidderTimeout;
 
       const request = {

diff --git a/modules/gumgumBidAdapter.js b/modules/gumgumBidAdapter.js
@@ -284,7 +284,7 @@ function buildRequests(validBidRequests, bidderRequest) {
   const gdprConsent = bidderRequest && bidderRequest.gdprConsent;
   const uspConsent = bidderRequest && bidderRequest.uspConsent;
   const gppConsent = bidderRequest && bidderRequest.gppConsent;
-  const timeout = config.getConfig('bidderTimeout');
+  const timeout = bidderRequest && bidderRequest.timeout
   const coppa = config.getConfig('coppa') === true ? 1 : 0;
   const topWindowUrl = bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.page;
   _each(validBidRequests, bidRequest => {

diff --git a/modules/iqzoneBidAdapter.js b/modules/iqzoneBidAdapter.js
@@ -154,7 +154,7 @@ export const spec = {
       coppa: config.getConfig('coppa') === true ? 1 : 0,
       ccpa: bidderRequest.uspConsent || undefined,
       gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: config.getConfig('bidderTimeout')
+      tmax: bidderRequest.timeout
     };
 
     const len = validBidRequests.length;

diff --git a/modules/koblerBidAdapter.js b/modules/koblerBidAdapter.js
@@ -17,7 +17,6 @@ const BIDDER_ENDPOINT = 'https://bid.essrtb.com/bid/prebid_rtb_call';
 const DEV_BIDDER_ENDPOINT = 'https://bid-service.dev.essrtb.com/bid/prebid_rtb_call';
 const TIMEOUT_NOTIFICATION_ENDPOINT = 'https://bid.essrtb.com/notify/prebid_timeout';
 const SUPPORTED_CURRENCY = 'USD';
-const DEFAULT_TIMEOUT = 1000;
 const TIME_TO_LIVE_IN_SECONDS = 10 * 60;
 
 export const isBidRequestValid = function (bid) {
@@ -124,7 +123,7 @@ function getPageUrlFromRefererInfo() {
 
 function buildOpenRtbBidRequestPayload(validBidRequests, bidderRequest) {
   const imps = validBidRequests.map(buildOpenRtbImpObject);
-  const timeout = bidderRequest.timeout || config.getConfig('bidderTimeout') || DEFAULT_TIMEOUT;
+  const timeout = bidderRequest.timeout;
   const pageUrl = getPageUrlFromRequest(validBidRequests[0], bidderRequest)
   const request = {
     id: bidderRequest.auctionId,

diff --git a/modules/kueezBidAdapter.js b/modules/kueezBidAdapter.js
@@ -293,7 +293,7 @@ function generateSharedParams(sharedParams, bidderRequest) {
   const generalBidParams = getBidIdParameter('params', sharedParams);
   const userIds = getBidIdParameter('userId', sharedParams);
   const ortb2Metadata = bidderRequest.ortb2 || {};
-  const timeout = config.getConfig('bidderTimeout');
+  const timeout = bidderRequest.timeout;
 
   const params = {
     adapter_version: VERSION,

diff --git a/modules/luponmediaBidAdapter.js b/modules/luponmediaBidAdapter.js
@@ -292,7 +292,7 @@ function newOrtbBidRequest(bidRequest, bidderRequest, currentImps) {
     source: {
       tid: bidRequest.transactionId
     },
-    tmax: config.getConfig('timeout') || 1500,
+    tmax: bidderRequest.timeout,
     imp: currentImps.concat([{
       id: bidRequest.bidId,
       secure: 1,

diff --git a/modules/mathildeadsBidAdapter.js b/modules/mathildeadsBidAdapter.js
@@ -155,7 +155,7 @@ export const spec = {
       coppa: config.getConfig('coppa') === true ? 1 : 0,
       ccpa: bidderRequest.uspConsent || undefined,
       gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: config.getConfig('bidderTimeout')
+      tmax: bidderRequest.timeout
     };
 
     const len = validBidRequests.length;

diff --git a/modules/medianetBidAdapter.js b/modules/medianetBidAdapter.js
@@ -334,7 +334,7 @@ function generatePayload(bidRequests, bidderRequests) {
     id: bidRequests[0].auctionId,
     imp: bidRequests.map(request => slotParams(request)),
     ortb2: bidderRequests.ortb2,
-    tmax: bidderRequests.timeout || config.getConfig('bidderTimeout')
+    tmax: bidderRequests.timeout
   }
 }
 

diff --git a/modules/minutemediaBidAdapter.js b/modules/minutemediaBidAdapter.js
@@ -366,7 +366,7 @@ function generateGeneralParams(generalObject, bidderRequest) {
   const {syncEnabled, filterSettings} = config.getConfig('userSync') || {};
   const {bidderCode} = bidderRequest;
   const generalBidParams = generalObject.params;
-  const timeout = config.getConfig('bidderTimeout');
+  const timeout = bidderRequest.timeout;
 
   // these params are snake_case instead of camelCase to allow backwards compatability on the server.
   // in the future, these will be converted to camelCase to match our convention.

diff --git a/modules/onomagicBidAdapter.js b/modules/onomagicBidAdapter.js
@@ -13,7 +13,6 @@ import {
 } 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 = 'onomagic';
 const URL = 'https://bidder.onomagic.com/hb';
@@ -80,7 +79,7 @@ function buildRequests(bidReqs, bidderRequest) {
         w: screen.width,
         h: screen.height
       },
-      tmax: config.getConfig('bidderTimeout')
+      tmax: bidderRequest?.timeout
     };
 
     return {

diff --git a/modules/operaadsBidAdapter.js b/modules/operaadsBidAdapter.js
@@ -228,7 +228,7 @@ function buildOpenRtbBidRequest(bidRequest, bidderRequest) {
   // build OpenRTB request body
   const payload = {
     id: bidderRequest.auctionId,
-    tmax: bidderRequest.timeout || config.getConfig('bidderTimeout'),
+    tmax: bidderRequest.timeout,
     test: config.getConfig('debug') ? 1 : 0,
     imp: createImp(bidRequest),
     device: getDevice(),

diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
@@ -1211,7 +1211,7 @@ export const spec = {
     // bidderRequest has timeout property if publisher sets during calling requestBids function from page
     // if not bidderRequest contains global value set by Prebid
     if (bidderRequest?.timeout) {
-      payload.tmax = bidderRequest.timeout || config.getConfig('bidderTimeout');
+      payload.tmax = bidderRequest.timeout;
     } else {
       payload.tmax = window?.PWT?.versionDetails?.timeout;
     }

diff --git a/modules/riseBidAdapter.js b/modules/riseBidAdapter.js
@@ -384,7 +384,7 @@ function generateGeneralParams(generalObject, bidderRequest) {
   const {syncEnabled, filterSettings} = config.getConfig('userSync') || {};
   const {bidderCode} = bidderRequest;
   const generalBidParams = generalObject.params;
-  const timeout = config.getConfig('bidderTimeout');
+  const timeout = bidderRequest.timeout;
 
   // these params are snake_case instead of camelCase to allow backwards compatability on the server.
   // in the future, these will be converted to camelCase to match our convention.

diff --git a/modules/sharethroughBidAdapter.js b/modules/sharethroughBidAdapter.js
@@ -21,7 +21,7 @@ export const sharethroughAdapterSpec = {
   isBidRequestValid: bid => !!bid.params.pkey && bid.bidder === BIDDER_CODE,
 
   buildRequests: (bidRequests, bidderRequest) => {
-    const timeout = config.getConfig('bidderTimeout');
+    const timeout = bidderRequest.timeout;
     const firstPartyData = bidderRequest.ortb2 || {};
 
     const nonHttp = sharethroughInternal.getProtocol().indexOf('http') < 0;

diff --git a/modules/shinezBidAdapter.js b/modules/shinezBidAdapter.js
@@ -364,7 +364,7 @@ function generateGeneralParams(generalObject, bidderRequest) {
   const {syncEnabled, filterSettings} = config.getConfig('userSync') || {};
   const {bidderCode} = bidderRequest;
   const generalBidParams = generalObject.params;
-  const timeout = config.getConfig('bidderTimeout');
+  const timeout = bidderRequest.timeout;
 
   // these params are snake_case instead of camelCase to allow backwards compatability on the server.
   // in the future, these will be converted to camelCase to match our convention.

diff --git a/modules/smarthubBidAdapter.js b/modules/smarthubBidAdapter.js
@@ -125,7 +125,7 @@ function buildRequestParams(bidderRequest = {}, placements = []) {
     coppa: config.getConfig('coppa') === true ? 1 : 0,
     ccpa: bidderRequest.uspConsent || undefined,
     gdpr: bidderRequest.gdprConsent || undefined,
-    tmax: config.getConfig('bidderTimeout')
+    tmax: bidderRequest.timeout
   };
 }
 

diff --git a/modules/synacormediaBidAdapter.js b/modules/synacormediaBidAdapter.js
@@ -49,9 +49,7 @@ export const spec = {
       imp: []
     };
 
-    const callbackTimeout = bidderRequest.timeout;
-    const globalTimeout = config.getConfig('bidderTimeout');
-    const tmax = globalTimeout ? Math.min(globalTimeout, callbackTimeout) : callbackTimeout;
+    const tmax = bidderRequest.timeout;
     if (tmax) {
       openRtbBidRequest.tmax = tmax;
     }

diff --git a/modules/truereachBidAdapter.js b/modules/truereachBidAdapter.js
@@ -1,6 +1,5 @@
 import { deepAccess, getUniqueIdentifierStr } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { config } from '../src/config.js';
 import { BANNER } from '../src/mediaTypes.js';
 
 const SUPPORTED_AD_TYPES = [BANNER];
@@ -140,7 +139,7 @@ function buildCommonQueryParamsFromBids(validBidRequests, bidderRequest) {
     device: {
       ua: window.navigator.userAgent
     },
-    tmax: config.getConfig('bidderTimeout')
+    tmax: bidderRequest.timeout
   };
 
   return defaultParams;

diff --git a/modules/videoheroesBidAdapter.js b/modules/videoheroesBidAdapter.js
@@ -80,7 +80,7 @@ export const spec = {
         domain: parseUrl(page).hostname,
         page: page,
       },
-      tmax: bidderRequest.timeout || config.getConfig('bidderTimeout') || 500,
+      tmax: bidderRequest.timeout,
       imp
     };
 

diff --git a/modules/visiblemeasuresBidAdapter.js b/modules/visiblemeasuresBidAdapter.js
@@ -155,7 +155,7 @@ export const spec = {
       coppa: config.getConfig('coppa') === true ? 1 : 0,
       ccpa: bidderRequest.uspConsent || undefined,
       gdpr: bidderRequest.gdprConsent || undefined,
-      tmax: config.getConfig('bidderTimeout')
+      tmax: bidderRequest.timeout
     };
 
     const len = validBidRequests.length;

diff --git a/modules/vrtcalBidAdapter.js b/modules/vrtcalBidAdapter.js
@@ -46,7 +46,7 @@ export const spec = {
         coppa = 1;
       }
 
-      tmax = config.getConfig('bidderTimeout');
+      tmax = bid.timeout;
 
       const params = {
         prebidJS: 1,

diff --git a/modules/yieldoneBidAdapter.js b/modules/yieldoneBidAdapter.js
@@ -53,7 +53,7 @@ export const spec = {
       const bidId = bidRequest.bidId;
       const transactionId = bidRequest.transactionId;
       const unitCode = bidRequest.adUnitCode;
-      const timeout = config.getConfig('bidderTimeout');
+      const timeout = bidderRequest.timeout;
       const language = window.navigator.language;
       const screenSize = window.screen.width + 'x' + window.screen.height;
       const payload = {

diff --git a/test/spec/modules/acuityAdsBidAdapter_spec.js b/test/spec/modules/acuityAdsBidAdapter_spec.js
@@ -76,7 +76,8 @@ describe('AcuityAdsBidAdapter', function () {
     gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
     refererInfo: {
       referer: 'https://test.com'
-    }
+    },
+    timeout: 500
   };
 
   describe('isBidRequestValid', function () {

diff --git a/test/spec/modules/appushBidAdapter_spec.js b/test/spec/modules/appushBidAdapter_spec.js
@@ -76,7 +76,8 @@ describe('AppushBidAdapter', function () {
     gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
     refererInfo: {
       referer: 'https://test.com'
-    }
+    },
+    timeout: 500
   };
 
   describe('isBidRequestValid', function () {

diff --git a/test/spec/modules/beyondmediaBidAdapter_spec.js b/test/spec/modules/beyondmediaBidAdapter_spec.js
@@ -76,7 +76,8 @@ describe('AndBeyondMediaBidAdapter', function () {
     gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
     refererInfo: {
       referer: 'https://test.com'
-    }
+    },
+    timeout: 500
   };
 
   describe('isBidRequestValid', function () {

diff --git a/test/spec/modules/compassBidAdapter_spec.js b/test/spec/modules/compassBidAdapter_spec.js
@@ -76,7 +76,8 @@ describe('CompassBidAdapter', function () {
     gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
     refererInfo: {
       referer: 'https://test.com'
-    }
+    },
+    timeout: 500
   };
 
   describe('isBidRequestValid', function () {