Multiple modules: use ortb2.source.tid and ortb2Imp.ext.tid inste…

…ad of auctionId/transactionId (#9969) * adkernel * aidem * beop * bliink * criteo * feedad * grid * kargo * medianet * optidigital * rubicon * smilewanted * Multiple modules: use `ortb2.source.tid` and `ortb2Imp.ext.tid` instead of auction/transaction IDs * tappx * onetag * use bidderRequestId instead of generateUUID
prebid · May 23, 2023 · 4ddc4ff · 4ddc4ff
1 parent 9b335cf
commit 4ddc4ff
Show file tree

Hide file tree

Showing 233 changed files with 1,618 additions and 1,055 deletions.
diff --git a/modules/33acrossBidAdapter.js b/modules/33acrossBidAdapter.js
@@ -1,19 +1,19 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { config } from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {config} from '../src/config.js';
 import {
   deepAccess,
-  uniques,
-  isArray,
+  getWindowSelf,
   getWindowTop,
+  isArray,
   isGptPubadsDefined,
   isSlotMatchingAdUnitCode,
   logInfo,
   logWarn,
-  getWindowSelf,
   mergeDeep,
-  pick
+  pick,
+  uniques
 } from '../src/utils.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
 // **************************** UTILS *************************** //
 const BIDDER_CODE = '33across';
@@ -183,7 +183,8 @@ function buildRequests(bidRequests, bidderRequest) {
         uspConsent,
         pageUrl,
         referer,
-        ttxSettings
+        ttxSettings,
+        bidderRequest,
       })
     )
   }
@@ -246,7 +247,7 @@ function _getMRAKey(bidRequest) {
 }
 
 // Infer the necessary data from valid bid for a minimal ttxRequest and create HTTP request
-function _createServerRequest({ bidRequests, gdprConsent = {}, uspConsent, pageUrl, referer, ttxSettings }) {
+function _createServerRequest({ bidRequests, gdprConsent = {}, uspConsent, pageUrl, referer, ttxSettings, bidderRequest }) {
   const ttxRequest = {};
   const firstBidRequest = bidRequests[0];
   const { siteId, test } = firstBidRequest.params;
@@ -271,7 +272,7 @@ function _createServerRequest({ bidRequests, gdprConsent = {}, uspConsent, pageU
     ttxRequest.site.ref = referer;
   }
 
-  ttxRequest.id = firstBidRequest.auctionId;
+  ttxRequest.id = bidderRequest?.bidderRequestId;
 
   if (gdprConsent.consentString) {
     ttxRequest.user = setExtensions(ttxRequest.user, {

diff --git a/modules/adWMGBidAdapter.js b/modules/adWMGBidAdapter.js
@@ -59,11 +59,12 @@ export const spec = {
       }
 
       const request = {
+        // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
         auctionId: bidRequest.auctionId,
         requestId: bidRequest.bidId,
         bidRequestsCount: bidRequest.bidRequestsCount,
         bidderRequestId: bidRequest.bidderRequestId,
-        transactionId: bidRequest.transactionId,
+        transactionId: bidRequest.ortb2Imp?.ext?.tid,
         referrer: referrer,
         timeout: timeout,
         adUnit: adUnit,

diff --git a/modules/adagioBidAdapter.js b/modules/adagioBidAdapter.js
@@ -866,6 +866,7 @@ function storeRequestInAdagioNS(bidRequest) {
       bidder: bidRequest.bidder,
       params: bidRequest.params // use the updated bid.params object with auto-detected params
     }],
+    // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
     auctionId: bidRequest.auctionId,
     pageviewId: internal.getPageviewId(),
     printNumber,

diff --git a/modules/adbookpspBidAdapter.js b/modules/adbookpspBidAdapter.js
@@ -203,7 +203,7 @@ function buildRegs(bidderRequest) {
 function buildSource(bidRequests, bidderRequest) {
   const source = {
     fd: 1,
-    tid: bidderRequest.auctionId,
+    tid: bidderRequest.ortb2.source.tid,
   };
   const schain = deepAccess(bidRequests, '0.schain');
 

diff --git a/modules/addefendBidAdapter.js b/modules/addefendBidAdapter.js
@@ -30,6 +30,7 @@ export const spec = {
     for (var i = 0; i < validBidRequests.length; i++) {
       let vb = validBidRequests[i];
       let o = vb.params;
+      // TODO: fix auctionId/transactionId leak: https://github.com/prebid/Prebid.js/issues/9781
       bid.auctionId = vb.auctionId;
       o.bidId = vb.bidId;
       o.transactionId = vb.transactionId;

diff --git a/modules/adfBidAdapter.js b/modules/adfBidAdapter.js
@@ -3,7 +3,7 @@
 
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
-import {deepAccess, deepSetValue, mergeDeep, parseSizesInput, deepClone} from '../src/utils.js';
+import {deepAccess, deepClone, deepSetValue, mergeDeep, parseSizesInput} from '../src/utils.js';
 import {config} from '../src/config.js';
 import {Renderer} from '../src/Renderer.js';
 
@@ -58,7 +58,7 @@ export const spec = {
     const adxDomain = setOnAny(validBidRequests, 'params.adxDomain') || 'adx.adform.net';
 
     const pt = setOnAny(validBidRequests, 'params.pt') || setOnAny(validBidRequests, 'params.priceType') || 'net';
-    const tid = bidderRequest.auctionId;
+    const tid = bidderRequest.ortb2?.source?.tid;
     const test = setOnAny(validBidRequests, 'params.test');
     const currency = getConfig('currency.adServerCurrency');
     const cur = currency && [ currency ];
@@ -139,7 +139,7 @@ export const spec = {
     });
 
     const request = {
-      id: bidderRequest.auctionId,
+      id: bidderRequest.bidderRequestId,
       site,
       app,
       user,

diff --git a/modules/adgenerationBidAdapter.js b/modules/adgenerationBidAdapter.js
@@ -45,7 +45,7 @@ export const spec = {
       data = tryAppendQueryString(data, 'sdktype', '0');
       data = tryAppendQueryString(data, 'hb', 'true');
       data = tryAppendQueryString(data, 't', 'json3');
-      data = tryAppendQueryString(data, 'transactionid', validReq.transactionId);
+      data = tryAppendQueryString(data, 'transactionid', validReq.ortb2Imp?.ext?.tid);
       data = tryAppendQueryString(data, 'sizes', getSizes(validReq));
       data = tryAppendQueryString(data, 'currency', getCurrencyType());
       data = tryAppendQueryString(data, 'pbver', '$prebid.version$');

diff --git a/modules/adkernelAdnBidAdapter.js b/modules/adkernelAdnBidAdapter.js
@@ -1,4 +1,4 @@
-import { deepAccess, parseSizesInput, isArray, deepSetValue, isStr, isNumber, logInfo } from '../src/utils.js';
+import {deepAccess, deepSetValue, isArray, isNumber, isStr, logInfo, parseSizesInput} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
@@ -58,11 +58,11 @@ function canonicalizeSizesArray(sizes) {
 }
 
 function buildRequestParams(tags, bidderRequest) {
-  let {auctionId, gdprConsent, uspConsent, transactionId, refererInfo} = bidderRequest;
+  let {gdprConsent, uspConsent, refererInfo, ortb2} = bidderRequest;
   let req = {
-    id: auctionId,
-    // TODO: transactionId is undefined here, should this be auctionId? see #8573
-    tid: transactionId,
+    id: bidderRequest.bidderRequestId,
+    // TODO: root-level `tid` is not ORTB; is this intentional?
+    tid: ortb2?.source?.tid,
     site: buildSite(refererInfo),
     imp: tags
   };

diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
@@ -6,6 +6,7 @@ import {
   deepAccess,
   deepSetValue,
   getAdUnitSizes,
+  getDefinedParams,
   getDNT,
   isArray,
   isArrayOfNums,
@@ -14,14 +15,13 @@ import {
   isPlainObject,
   isStr,
   mergeDeep,
-  parseGPTSingleSizeArrayToRtbSize,
-  getDefinedParams
+  parseGPTSingleSizeArrayToRtbSize
 } from '../src/utils.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {find} from '../src/polyfill.js';
 import {config} from '../src/config.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import {convertOrtbRequestToProprietaryNative} from '../src/native.js';
 
 /*
  * In case you're AdKernel whitelable platform's client who needs branded adapter to
@@ -490,9 +490,9 @@ function makeRegulations(bidderRequest) {
  * @returns
  */
 function makeBaseRequest(bidderRequest, imps, fpd) {
-  let {auctionId, timeout} = bidderRequest;
+  let {timeout} = bidderRequest;
   let request = {
-    'id': auctionId,
+    'id': bidderRequest.bidderRequestId,
     'imp': imps,
     'at': 1,
     'tmax': parseInt(timeout)

diff --git a/modules/adqueryBidAdapter.js b/modules/adqueryBidAdapter.js
@@ -193,6 +193,7 @@ function buildRequest(validBidRequests, bidderRequest) {
   let bid = validBidRequests;
   return {
     placementCode: bid.params.placementId,
+    // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
     auctionId: bid.auctionId,
     type: bid.params.type,
     adUnitCode: bid.adUnitCode,

diff --git a/modules/adtrueBidAdapter.js b/modules/adtrueBidAdapter.js
@@ -469,7 +469,7 @@ export const spec = {
       conf.zoneId = conf.zoneId || bid.params.zoneId;
       conf.pubId = conf.pubId || bid.params.publisherId;
 
-      conf.transactionId = bid.transactionId;
+      conf.transactionId = bid.ortb2Imp?.ext?.tid;
       if (bidCurrency === '') {
         bidCurrency = bid.params.currency || UNDEFINED;
       } else if (bid.params.hasOwnProperty('currency') && bidCurrency !== bid.params.currency) {
@@ -492,7 +492,7 @@ export const spec = {
     payload.ext.wrapper = {};
 
     payload.ext.wrapper.transactionId = conf.transactionId;
-    payload.ext.wrapper.wiid = conf.wiid || bidderRequest.auctionId;
+    payload.ext.wrapper.wiid = conf.wiid || bidderRequest.ortb2?.ext?.tid;
     payload.ext.wrapper.wp = 'pbjs';
 
     payload.user.geo = {};
@@ -507,7 +507,7 @@ export const spec = {
     if (typeof config.getConfig('device') === 'object') {
       payload.device = Object.assign(payload.device, config.getConfig('device'));
     }
-
+    deepSetValue(payload, 'source.tid', conf.transactionId);
     // test bids
     if (window.location.href.indexOf('adtrueTest=true') !== -1) {
       payload.test = 1;

diff --git a/modules/aduptechBidAdapter.js b/modules/aduptechBidAdapter.js
@@ -255,6 +255,7 @@ export const spec = {
         url: internal.buildEndpointUrl(publisher),
         method: ENDPOINT_METHOD,
         data: {
+          // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
           auctionId: auctionId,
           pageUrl: pageUrl,
           referrer: referrer,
@@ -271,7 +272,7 @@ export const spec = {
       groupedBidRequests[publisher].forEach(bidRequest => {
         const bid = {
           bidId: bidRequest.bidId,
-          transactionId: bidRequest.transactionId,
+          transactionId: bidRequest.ortb2Imp?.ext?.tid,
           adUnitCode: bidRequest.adUnitCode,
           params: internal.extractParams(bidRequest)
         };

diff --git a/modules/adxcgBidAdapter.js b/modules/adxcgBidAdapter.js
@@ -98,7 +98,7 @@ export const spec = {
     device.dnt = getDNT() ? 1 : 0;
     device.language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
 
-    const tid = bidderRequest.auctionId;
+    const tid = bidderRequest.ortb2?.source?.tid;
     const test = setOnAny(validBidRequests, 'params.test');
     const currency = getConfig('currency.adServerCurrency');
     const cur = currency && [ currency ];

diff --git a/modules/adyoulikeBidAdapter.js b/modules/adyoulikeBidAdapter.js
@@ -71,7 +71,7 @@ export const spec = {
         let size = getSize(sizesArray);
         accumulator[bidReq.bidId] = {};
         accumulator[bidReq.bidId].PlacementID = bidReq.params.placement;
-        accumulator[bidReq.bidId].TransactionID = bidReq.transactionId;
+        accumulator[bidReq.bidId].TransactionID = bidReq.ortb2Imp?.ext?.tid;
         accumulator[bidReq.bidId].Width = size.width;
         accumulator[bidReq.bidId].Height = size.height;
         accumulator[bidReq.bidId].AvailableSizes = sizesArray.join(',');

diff --git a/modules/afpBidAdapter.js b/modules/afpBidAdapter.js
@@ -100,13 +100,13 @@ export const spec = {
       pageUrl: IS_DEV ? TEST_PAGE_URL : refererInfo.page,
       gdprConsent: gdprConsent,
       bidRequests: validBidRequests.map(validBidRequest => {
-        const {bidId, transactionId, sizes, params: {
+        const {bidId, ortb2Imp, sizes, params: {
           placeId, placeType, imageUrl, imageWidth, imageHeight
         }} = validBidRequest
         bidRequestMap[bidId] = validBidRequest
         const bidRequest = {
           bidId,
-          transactionId,
+          transactionId: ortb2Imp?.ext?.tid,
           sizes,
           placeId,
         }

diff --git a/modules/aidemBidAdapter.js b/modules/aidemBidAdapter.js
@@ -1,4 +1,15 @@
-import {_each, contains, deepAccess, deepSetValue, getDNT, isBoolean, isStr, isNumber, logError, logInfo} from '../src/utils.js';
+import {
+  _each,
+  contains,
+  deepAccess,
+  deepSetValue,
+  getDNT,
+  isBoolean,
+  isNumber,
+  isStr,
+  logError,
+  logInfo
+} from '../src/utils.js';
 import {config} from '../src/config.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
@@ -164,6 +175,7 @@ function buildWinNotice(bid) {
     impid: deepAccess(bid, 'meta.impid'),
     dsp_id: deepAccess(bid, 'meta.dsp_id'),
     adUnitCode: bid.adUnitCode,
+    // TODO: fix auctionId/transactionId leak: https://github.com/prebid/Prebid.js/issues/9781
     auctionId: bid.auctionId,
     transactionId: bid.transactionId,
     ttl: bid.ttl,
@@ -201,7 +213,7 @@ function getMediaType(bidRequest) {
 function getPrebidRequestFields(bidderRequest, bidRequests) {
   const payload = {};
   // Base Payload Data
-  deepSetValue(payload, 'id', bidderRequest.auctionId);
+  deepSetValue(payload, 'id', bidderRequest.bidderRequestId);
   // Impressions
   setPrebidImpressionObject(bidRequests, payload);
   // Device
@@ -231,7 +243,8 @@ function setPrebidImpressionObject(bidRequests, payload) {
     // Placement or ad tag used to initiate the auction
     deepSetValue(impressionObject, 'id', bidRequest.bidId);
     // Transaction id
-    deepSetValue(impressionObject, 'tid', deepAccess(bidRequest, 'transactionId'));
+    // TODO: `imp.tid` is not ORTB, is this intentional?
+    deepSetValue(impressionObject, 'tid', deepAccess(bidRequest, 'ortb2Imp.ext.tid'));
     // placement id
     deepSetValue(impressionObject, 'tagid', deepAccess(bidRequest, 'params.placementId', null));
     // Publisher id

diff --git a/modules/ajaBidAdapter.js b/modules/ajaBidAdapter.js
@@ -55,7 +55,7 @@ export const spec = {
       const asi = getBidIdParameter('asi', bidRequest.params);
       queryString = tryAppendQueryString(queryString, 'asi', asi);
       queryString = tryAppendQueryString(queryString, 'skt', SDKType);
-      queryString = tryAppendQueryString(queryString, 'tid', bidRequest.transactionId)
+      queryString = tryAppendQueryString(queryString, 'tid', bidRequest.ortb2Imp?.ext?.tid)
       queryString = tryAppendQueryString(queryString, 'prebid_id', bidRequest.bidId);
       queryString = tryAppendQueryString(queryString, 'prebid_ver', '$prebid.version$');
 

diff --git a/modules/alkimiBidAdapter.js b/modules/alkimiBidAdapter.js
@@ -1,5 +1,5 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {deepClone, deepAccess} from '../src/utils.js';
+import {deepAccess, deepClone} from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
 import {VIDEO} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
@@ -41,6 +41,7 @@ export const spec = {
     const alkimiConfig = config.getConfig('alkimi');
 
     let payload = {
+      // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
       requestId: bidderRequest.auctionId,
       signRequest: {bids, randomUUID: alkimiConfig && alkimiConfig.randomUUID},
       bidIds,

diff --git a/modules/amxBidAdapter.js b/modules/amxBidAdapter.js
@@ -303,6 +303,7 @@ export const spec = {
         };
 
     const payload = {
+      // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
       a: bidderRequest.auctionId,
       B: 0,
       b: loc.host,

diff --git a/modules/apacdexBidAdapter.js b/modules/apacdexBidAdapter.js
@@ -141,7 +141,7 @@ export const spec = {
       return {
         params: bid.params,
         mediaTypes: bid.mediaTypes,
-        transactionId: bid.transactionId,
+        transactionId: bid.ortb2Imp?.ext?.tid,
         sizes: bid.sizes,
         bidId: bid.bidId,
         adUnitCode: bid.adUnitCode,

diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
@@ -960,6 +960,7 @@ function bidToTag(bid) {
     tag['banner_frameworks'] = bid.params.frameworks;
   }
 
+  // TODO: why does this need to iterate through every ad unit?
   let adUnit = find(auctionManager.getAdUnits(), au => bid.transactionId === au.transactionId);
   if (adUnit && adUnit.mediaTypes && adUnit.mediaTypes.banner) {
     tag.ad_types.push(BANNER);

diff --git a/modules/apstreamBidAdapter.js b/modules/apstreamBidAdapter.js
@@ -421,6 +421,7 @@ function buildRequests(bidRequests, bidderRequest) {
   bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
   const data = {
     med: encodeURIComponent(window.location.href),
+    // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781
     auid: bidderRequest.auctionId,
     ref: document.referrer,
     dnt: getDNT() ? 1 : 0,

diff --git a/modules/asoBidAdapter.js b/modules/asoBidAdapter.js
@@ -299,7 +299,7 @@ function createBasePayload(bidRequest, bidderRequest) {
   const urlsInfo = getUrlsInfo(bidderRequest);
 
   const payload = {
-    id: bidRequest.auctionId + '_' + bidRequest.bidId,
+    id: bidRequest.bidId,
     at: 1,
     tmax: bidderRequest.timeout,
     site: {

diff --git a/modules/astraoneBidAdapter.js b/modules/astraoneBidAdapter.js
@@ -11,7 +11,7 @@ function buildBidRequests(validBidRequests) {
     const params = validBidRequest.params;
     const bidRequest = {
       bidId: validBidRequest.bidId,
-      transactionId: validBidRequest.transactionId,
+      transactionId: validBidRequest.ortb2Imp?.ext?.tid,
       sizes: validBidRequest.sizes,
       placement: params.placement,
       placeId: params.placeId,