From 1fcf289d33824e1770765ee02e32b1dcb850d43e Mon Sep 17 00:00:00 2001 From: Demetrio Girardi Date: Fri, 20 May 2022 10:24:35 -0700 Subject: [PATCH] convert bidders: grid --- modules/gnetBidAdapter.js | 3 ++- modules/goldbachBidAdapter.js | 3 ++- modules/gothamadsBidAdapter.js | 3 ++- modules/gridBidAdapter.js | 3 ++- test/spec/modules/gnetBidAdapter_spec.js | 2 +- test/spec/modules/goldbachBidAdapter_spec.js | 2 +- test/spec/modules/gridBidAdapter_spec.js | 8 ++++---- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/modules/gnetBidAdapter.js b/modules/gnetBidAdapter.js index 274e8db2b50..8bab043d0db 100644 --- a/modules/gnetBidAdapter.js +++ b/modules/gnetBidAdapter.js @@ -31,7 +31,8 @@ export const spec = { */ buildRequests: function (validBidRequests, bidderRequest) { const bidRequests = []; - const referer = bidderRequest.refererInfo.referer; + // TODO: is 'page' the right value? + const referer = bidderRequest.refererInfo.page; _each(validBidRequests, (request) => { const data = {}; diff --git a/modules/goldbachBidAdapter.js b/modules/goldbachBidAdapter.js index 7b6ae810b67..49229b31b38 100644 --- a/modules/goldbachBidAdapter.js +++ b/modules/goldbachBidAdapter.js @@ -246,7 +246,8 @@ export const spec = { if (bidderRequest && bidderRequest.refererInfo) { let refererinfo = { - rd_ref: encodeURIComponent(bidderRequest.refererInfo.referer), + // TODO: this collects everything it finds, except for topmostLocation + rd_ref: encodeURIComponent(bidderRequest.refererInfo.topmostLocation), rd_top: bidderRequest.refererInfo.reachedTop, rd_ifs: bidderRequest.refererInfo.numIframes, rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',') diff --git a/modules/gothamadsBidAdapter.js b/modules/gothamadsBidAdapter.js index 1993f0c9b64..5f2d3c4f36a 100644 --- a/modules/gothamadsBidAdapter.js +++ b/modules/gothamadsBidAdapter.js @@ -74,8 +74,9 @@ export const spec = { let winTop = window; let location; + // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin try { - location = new URL(bidderRequest.refererInfo.referer) + location = new URL(bidderRequest.refererInfo.page) winTop = window.top; } catch (e) { location = winTop.location; diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js index 9a07969017d..f65f7bc9380 100644 --- a/modules/gridBidAdapter.js +++ b/modules/gridBidAdapter.js @@ -60,7 +60,8 @@ export const spec = { let userExt = null; let {bidderRequestId, auctionId, gdprConsent, uspConsent, timeout, refererInfo} = bidderRequest || {}; - const referer = refererInfo ? encodeURIComponent(refererInfo.referer) : ''; + // TODO: is 'page' the right value here? + const referer = refererInfo ? encodeURIComponent(refererInfo.page) : ''; const imp = []; const bidsMap = {}; diff --git a/test/spec/modules/gnetBidAdapter_spec.js b/test/spec/modules/gnetBidAdapter_spec.js index a69b196bc5c..21526aba201 100644 --- a/test/spec/modules/gnetBidAdapter_spec.js +++ b/test/spec/modules/gnetBidAdapter_spec.js @@ -69,7 +69,7 @@ describe('gnetAdapter', function () { const bidderRequest = { refererInfo: { - referer: 'https://gnetrtb.com' + page: 'https://gnetrtb.com' } }; diff --git a/test/spec/modules/goldbachBidAdapter_spec.js b/test/spec/modules/goldbachBidAdapter_spec.js index b5e5c596d0c..fc2c1beb900 100644 --- a/test/spec/modules/goldbachBidAdapter_spec.js +++ b/test/spec/modules/goldbachBidAdapter_spec.js @@ -802,7 +802,7 @@ describe('GoldbachXandrAdapter', function () { const bidRequest = Object.assign({}, bidRequests[0]) const bidderRequest = { refererInfo: { - referer: 'https://example.com/page.html', + topmostLocation: 'https://example.com/page.html', reachedTop: true, numIframes: 2, stack: [ diff --git a/test/spec/modules/gridBidAdapter_spec.js b/test/spec/modules/gridBidAdapter_spec.js index b03e4e566cf..564ff169fdb 100644 --- a/test/spec/modules/gridBidAdapter_spec.js +++ b/test/spec/modules/gridBidAdapter_spec.js @@ -44,12 +44,12 @@ describe('TheMediaGrid Adapter', function () { return JSON.parse(data); } const bidderRequest = { - refererInfo: {referer: 'https://example.com'}, + refererInfo: {page: 'https://example.com'}, bidderRequestId: '22edbae2733bf6', auctionId: '9e2dfbfe-00c7-4f5e-9850-4044df3229c7', timeout: 3000 }; - const referrer = encodeURIComponent(bidderRequest.refererInfo.referer); + const referrer = encodeURIComponent(bidderRequest.refererInfo.page); let bidRequests = [ { 'bidder': 'grid', @@ -736,12 +736,12 @@ describe('TheMediaGrid Adapter', function () { 'auctionId': 654645, }; const bidderRequestWithNumId = { - refererInfo: {referer: 'https://example.com'}, + refererInfo: {page: 'https://example.com'}, bidderRequestId: 345345345, auctionId: 654645, timeout: 3000 }; - const parsedReferrer = encodeURIComponent(bidderRequestWithNumId.refererInfo.referer); + const parsedReferrer = encodeURIComponent(bidderRequestWithNumId.refererInfo.page); const request = spec.buildRequests([bidRequestWithNumId], bidderRequestWithNumId); expect(request.data).to.be.an('string'); const payload = parseRequest(request.data);