Skip to content

Commit 4e3915a

Browse files
dgirardidgirardi
committed
Squashed commit of the following:
commit d6d54cab25563e0ebece456d75733c9b9d78175e Author: Demetrio Girardi <[email protected]> Date: Wed May 25 07:40:48 2022 -0700 fix lint commit 43898cdf487b67061e48d65b7c469884df05918a Author: Demetrio Girardi <[email protected]> Date: Wed May 25 07:37:46 2022 -0700 Do not provide a default value for publisherDomain commit 5db64028f42935d2b62f58052562b9ae908c58f8 Author: Demetrio Girardi <[email protected]> Date: Wed May 25 07:33:45 2022 -0700 convert bidders: pass 2 commit a916edbb527f3342abfc2f55485918b08f8c2d30 Author: Demetrio Girardi <[email protected]> Date: Wed May 25 07:09:05 2022 -0700 convert bidders: done! commit 1922bfbf57058b333540f9fef157bb177288dd51 Author: Demetrio Girardi <[email protected]> Date: Wed May 25 06:53:44 2022 -0700 convert bidders: visx commit 31bb9c05044ca911ed683c7f86147ff9475964a1 Merge: dd22a3ddf e524628 Author: Demetrio Girardi <[email protected]> Date: Wed May 25 06:40:54 2022 -0700 Merge branch 'prebid-7' into referer-merge commit e524628 Merge: c885816 14ae8d5 Author: Demetrio Girardi <[email protected]> Date: Wed May 25 06:35:12 2022 -0700 Merge branch 'master' into prebid-7 commit 14ae8d5 Author: Patrick McCann <[email protected]> Date: Tue May 24 15:58:21 2022 -0400 Update fintezaAnalyticsAdapter_spec.js (prebid#8467) commit b01ec40 Author: Prebid.js automated release <[email protected]> Date: Tue May 24 18:40:10 2022 +0000 Increment version to 6.27.0-pre commit e728f54 Author: Prebid.js automated release <[email protected]> Date: Tue May 24 18:40:10 2022 +0000 Prebid 6.26.0 release commit 170f6fd Author: Patrick McCann <[email protected]> Date: Tue May 24 14:23:40 2022 -0400 Revert "Akamai RTD: fixed bugs on rtd module and added the entropy values (prebid#8284)" (prebid#8464) This reverts commit c434889. commit a6e3c44 Author: Demetrio Girardi <[email protected]> Date: Tue May 24 11:21:26 2022 -0700 Remove medianetRtdProvider tests (prebid#8463) commit dd22a3ddf7dd6b01a9adfacada728f9c435cd0b0 Author: Demetrio Girardi <[email protected]> Date: Tue May 24 10:31:14 2022 -0700 convert bidders: unicorn commit de3801d8709e362d0507ee75dd92807734824bbf Author: Demetrio Girardi <[email protected]> Date: Tue May 24 09:17:20 2022 -0700 convert bidders: sovrn commit 063dfb337e67fb8fff98a738e86459ab3851b13e Author: Demetrio Girardi <[email protected]> Date: Tue May 24 08:54:47 2022 -0700 convert bidders: smarthub commit 1a4d03b0fb3c362f3d73a2ac4ee652aa2dba3768 Author: Demetrio Girardi <[email protected]> Date: Tue May 24 08:33:45 2022 -0700 convert bidders: rubicon commit c885816 Author: Nic G <[email protected]> Date: Tue May 24 11:09:27 2022 -0400 Sortable Adapter Removal (prebid#8447) commit f11bcda Author: asurovenko-zeta <[email protected]> Date: Tue May 24 20:51:05 2022 +0700 Zeta global ssp bid adapter: add shortname param (prebid#8454) * zeta_global_sspBidAdapter shortname was added * remove the trash Co-authored-by: Surovenko Alexey <[email protected]> commit c434889 Author: Vikas Srivastava <[email protected]> Date: Tue May 24 19:17:57 2022 +0530 Akamai RTD: fixed bugs on rtd module and added the entropy values (prebid#8284) * Fixed bugs on rtd module and added the entropy values required by Akamai DAP * Fixed the timeout issue in build browserstack tests * Fixing review comments * Fixing review comments - using storage manager for managing localStorage * Fixing review comments - using loadExternalScript method to load the script * Fixed unit test case * Fixing review comments - Added consent handling commit 06ecc38 Author: haruka-yamashita2 <[email protected]> Date: Tue May 24 22:24:00 2022 +0900 Rename id to aoneId from dacId (prebid#8453)
1 parent 1fd8431 commit 4e3915a

File tree

102 files changed

+313
-1542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+313
-1542
lines changed

‎modules/adhashBidAdapter.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ export const spec = {
103103
const bidRequests = [];
104104
let referrer = '';
105105
if (bidderRequest && bidderRequest.refererInfo) {
106-
referrer = bidderRequest.refererInfo.referer;
106+
// TODO: is 'page' the right value here?
107+
referrer = bidderRequest.refererInfo.page;
107108
}
108109
for (var i = 0; i < validBidRequests.length; i++) {
109110
var index = Math.floor(Math.random() * validBidRequests[i].sizes.length);

‎modules/betweenBidAdapter.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {registerBidder} from '../src/adapters/bidderFactory.js';
2-
import { getAdUnitSizes, parseSizesInput } from '../src/utils.js';
3-
import { getRefererInfo } from '../src/refererDetection.js';
4-
import {includes} from '../src/polyfill.js'
2+
import {getAdUnitSizes, parseSizesInput} from '../src/utils.js';
3+
import {includes} from '../src/polyfill.js';
54

65
const BIDDER_CODE = 'between';
76
let ENDPOINT = 'https://ads.betweendigital.com/adjson?t=prebid';
@@ -29,7 +28,7 @@ export const spec = {
2928
buildRequests: function(validBidRequests, bidderRequest) {
3029
let requests = [];
3130
const gdprConsent = bidderRequest && bidderRequest.gdprConsent;
32-
const refInfo = getRefererInfo();
31+
const refInfo = bidderRequest?.refererInfo;
3332

3433
validBidRequests.forEach((i) => {
3534
const video = i.mediaTypes && i.mediaTypes.video;
@@ -79,7 +78,8 @@ export const spec = {
7978
params.schain = encodeToBase64WebSafe(JSON.stringify(i.schain));
8079
}
8180

82-
if (refInfo && refInfo.referer) params.ref = refInfo.referer;
81+
// TODO: is 'page' the right value here?
82+
if (refInfo && refInfo.page) params.ref = refInfo.page;
8383

8484
if (gdprConsent) {
8585
if (typeof gdprConsent.gdprApplies !== 'undefined') {

‎modules/compassBidAdapter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,14 @@ export const spec = {
126126
winLocation = window.location;
127127
}
128128

129-
const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.referer;
129+
const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
130130
let refferLocation;
131131
try {
132132
refferLocation = refferUrl && new URL(refferUrl);
133133
} catch (e) {
134134
logMessage(e);
135135
}
136-
136+
// TODO: does the fallback make sense here?
137137
let location = refferLocation || winLocation;
138138
const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
139139
const host = location.host;

‎modules/dacIdSystem.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
## DAC User ID Submodule
1+
## AudienceOne User ID Submodule
22

3-
DAC ID, provided by [D.A.Consortium Inc.](https://www.dac.co.jp/), is ID for ad targeting by using 1st party cookie.
3+
AudienceOne ID, provided by [D.A.Consortium Inc.](https://www.dac.co.jp/), is ID for ad targeting by using 1st party cookie.
44
Please contact D.A.Consortium Inc. before using this ID.
55

6-
## Building Prebid with DAC ID Support
6+
## Building Prebid with AudienceOne ID Support
77

8-
First, make sure to add the DAC ID submodule to your Prebid.js package with:
8+
First, make sure to add the AudienceOne ID submodule to your Prebid.js package with:
99

1010
```
1111
gulp build --modules=dacIdSystem

‎modules/logicadBidAdapter.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ function newBidRequest(bid, bidderRequest) {
6060
mediaTypes: bid.mediaTypes
6161
}],
6262
prebidJsVersion: '$prebid.version$',
63-
referrer: bidderRequest.refererInfo.referer,
63+
// TODO: is 'page' the right value here?
64+
referrer: bidderRequest.refererInfo.page,
6465
auctionStartTime: bidderRequest.auctionStart,
6566
eids: bid.userIdAsEids,
6667
};

‎modules/mediafuseBidAdapter.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@ export const spec = {
228228

229229
if (bidderRequest && bidderRequest.refererInfo) {
230230
let refererinfo = {
231-
rd_ref: encodeURIComponent(bidderRequest.refererInfo.referer),
231+
// TODO: this collects everything it finds, except for canonicalUrl
232+
rd_ref: encodeURIComponent(bidderRequest.refererInfo.topmostLocation),
232233
rd_top: bidderRequest.refererInfo.reachedTop,
233234
rd_ifs: bidderRequest.refererInfo.numIframes,
234235
rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')

‎modules/rtbsapeBidAdapter.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ export const spec = {
4343
requestId: bidderRequest.bidderRequestId,
4444
bids: validBidRequests,
4545
timezone: (tz > 0 ? '-' : '+') + padInt(Math.floor(Math.abs(tz) / 60)) + ':' + padInt(Math.abs(tz) % 60),
46-
refererInfo: bidderRequest.refererInfo
46+
// TODO: please do not send internal data structures over the network
47+
refererInfo: bidderRequest.refererInfo.legacy
4748
},
4849
}
4950
},

‎modules/rubiconAnalyticsAdapter.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ function sendBillingEvent(event) {
148148

149149
function getBasicEventDetails(auctionId, trigger) {
150150
let auctionCache = cache.auctions[auctionId];
151-
let referrer = config.getConfig('pageUrl') || pageReferer || (auctionCache && auctionCache.referrer);
151+
let referrer = pageReferer || (auctionCache && auctionCache.referrer);
152152
let message = {
153153
timestamps: {
154154
prebidLoaded: rubiconAdapter.MODULE_INITIALIZED_TIME,
@@ -676,7 +676,8 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
676676
cacheEntry.bids = {};
677677
cacheEntry.bidsWon = {};
678678
cacheEntry.gamHasRendered = {};
679-
cacheEntry.referrer = pageReferer = deepAccess(args, 'bidderRequests.0.refererInfo.referer');
679+
// TODO: is 'page' the right value here?
680+
cacheEntry.referrer = pageReferer = deepAccess(args, 'bidderRequests.0.refererInfo.page');
680681
cacheEntry.bidderOrder = [];
681682
const floorData = deepAccess(args, 'bidderRequests.0.bids.0.floorData');
682683
if (floorData) {

‎modules/rubiconBidAdapter.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -836,11 +836,12 @@ function _getScreenResolution() {
836836
* @returns {string}
837837
*/
838838
function _getPageUrl(bidRequest, bidderRequest) {
839-
let pageUrl = config.getConfig('pageUrl');
839+
let pageUrl;
840840
if (bidRequest.params.referrer) {
841841
pageUrl = bidRequest.params.referrer;
842842
} else if (!pageUrl) {
843-
pageUrl = bidderRequest.refererInfo.referer;
843+
// TODO: is 'page' the right value here?
844+
pageUrl = bidderRequest.refererInfo.page;
844845
}
845846
return bidRequest.params.secure ? pageUrl.replace(/^http:/i, 'https:') : pageUrl;
846847
}

‎modules/saambaaBidAdapter.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// TODO: this adapter appears to have no tests
2+
13
import {deepAccess, generateUUID, isEmpty, isFn, parseSizesInput, parseUrl} from '../src/utils.js';
24
import {config} from '../src/config.js';
35
import {registerBidder} from '../src/adapters/bidderFactory.js';
@@ -321,8 +323,7 @@ function createVideoRequestData(bid, bidderRequest) {
321323
}
322324

323325
function getTopWindowLocation(bidderRequest) {
324-
let url = bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer;
325-
return parseUrl(config.getConfig('pageUrl') || url, { decodeSearchAsString: true });
326+
return parseUrl(bidderRequest?.refererInfo?.page || '', { decodeSearchAsString: true });
326327
}
327328

328329
function createBannerRequestData(bid, bidderRequest) {

‎modules/seedingAllianceBidAdapter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export const spec = {
6262
const pt = setOnAny(validBidRequests, 'params.pt') || setOnAny(validBidRequests, 'params.priceType') || 'net';
6363
const tid = validBidRequests[0].transactionId;
6464
const cur = [config.getConfig('currency.adServerCurrency') || DEFAULT_CUR];
65-
let url = bidderRequest.refererInfo.referer;
65+
let url = bidderRequest.refererInfo.page;
6666

6767
const imp = validBidRequests.map((bid, id) => {
6868
const assets = _map(bid.nativeParams, (bidParams, key) => {

‎modules/seedtagBidAdapter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ export const spec = {
189189
*/
190190
buildRequests(validBidRequests, bidderRequest) {
191191
const payload = {
192-
url: bidderRequest.refererInfo.referer,
192+
url: bidderRequest.refererInfo.page,
193193
publisherToken: validBidRequests[0].params.publisherId,
194194
cmp: !!bidderRequest.gdprConsent,
195195
timeout: bidderRequest.timeout,

‎modules/sharethroughBidAdapter.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ export const sharethroughAdapterSpec = {
3434
cur: ['USD'],
3535
tmax: timeout,
3636
site: {
37-
domain: window.location.hostname,
38-
page: window.location.href,
39-
ref: deepAccess(bidderRequest, 'refererInfo.referer'),
37+
// TODO: do the fallbacks make sense here?
38+
domain: deepAccess(bidderRequest, 'refererInfo.domain') || window.location.hostname,
39+
page: deepAccess(bidderRequest, 'refererInfo.page') || window.location.href,
40+
ref: deepAccess(bidderRequest, 'refererInfo.ref'),
4041
...firstPartyData.site,
4142
},
4243
device: {

‎modules/showheroes-bsBidAdapter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export const spec = {
3030
},
3131
buildRequests: function(validBidRequests, bidderRequest) {
3232
let adUnits = [];
33-
const pageURL = validBidRequests[0].params.contentPageUrl || bidderRequest.refererInfo.referer;
33+
const pageURL = validBidRequests[0].params.contentPageUrl || bidderRequest.refererInfo.page;
3434
const isStage = !!validBidRequests[0].params.stage;
3535
const isOutstream = deepAccess(validBidRequests[0], 'mediaTypes.video.context') === 'outstream';
3636
const isCustomRender = deepAccess(validBidRequests[0], 'params.outstreamOptions.customRender');

‎modules/sirdataRtdProvider.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ export function getSegmentsAndCategories(reqBidsConfigObj, onDone, moduleConfig,
4747
sirdataDomain = 'sddan.com';
4848
sendWithCredentials = true;
4949
}
50-
51-
var actualUrl = moduleConfig.params.actualUrl || getRefererInfo().referer;
50+
// TODO: is 'page' the right value here?
51+
var actualUrl = moduleConfig.params.actualUrl || getRefererInfo().page;
5252

5353
const url = 'https://kvt.' + sirdataDomain + '/api/v1/public/p/' + moduleConfig.params.partnerId + '/d/' + moduleConfig.params.key + '/s?callback=&gdpr=' + gdprApplies + '&gdpr_consent=' + tcString + (actualUrl ? '&url=' + encodeURIComponent(actualUrl) : '');
5454

‎modules/slimcutBidAdapter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ function buildRequestObject(bid) {
113113
}
114114
function getReferrerInfo(bidderRequest) {
115115
let ref = window.location.href;
116-
if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
117-
ref = bidderRequest.refererInfo.referer;
116+
if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.page) {
117+
ref = bidderRequest.refererInfo.page;
118118
}
119119
return ref;
120120
}

‎modules/smaatoBidAdapter.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ const buildOpenRtbBidRequest = (bidRequest, bidderRequest) => {
1616
tmax: bidderRequest.timeout,
1717
site: {
1818
id: window.location.hostname,
19-
domain: window.location.hostname,
20-
page: window.location.href,
21-
ref: bidderRequest.refererInfo.referer
19+
// TODO: do the fallbacks make sense here?
20+
domain: bidderRequest.refererInfo.domain || window.location.hostname,
21+
page: bidderRequest.refererInfo.page || window.location.href,
22+
ref: bidderRequest.refererInfo.ref
2223
},
2324
device: {
2425
language: (navigator && navigator.language) ? navigator.language.split('-')[0] : '',

‎modules/smartadserverBidAdapter.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@ export const spec = {
148148
appname: bid.params.appName && bid.params.appName !== '' ? bid.params.appName : undefined,
149149
ckid: bid.params.ckId || 0,
150150
tagId: bid.adUnitCode,
151-
pageDomain: bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer ? bidderRequest.refererInfo.referer : undefined,
151+
// TODO: is 'page' the right value here?
152+
pageDomain: bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.page ? bidderRequest.refererInfo.page : undefined,
152153
transactionId: bid.transactionId,
153154
timeout: config.getConfig('bidderTimeout'),
154155
bidId: bid.bidId,

‎modules/smarthubBidAdapter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ function buildRequestParams(bidderRequest = {}, placements = []) {
100100
winLocation = window.location;
101101
}
102102

103-
const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.referer;
103+
const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
104104
let refferLocation;
105105
try {
106106
refferLocation = refferUrl && new URL(refferUrl);

‎modules/smartxBidAdapter.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ export const spec = {
6767
* @return ServerRequest Info describing the request to the server.
6868
*/
6969
buildRequests: function (bidRequests, bidderRequest) {
70-
const page = bidderRequest.refererInfo.referer;
70+
// TODO: does the fallback make sense here?
71+
const page = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
7172
const isPageSecure = !!page.match(/^https:/)
7273

7374
const smartxRequests = bidRequests.map(function (bid) {

‎modules/smartyadsBidAdapter.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ export const spec = {
3535
buildRequests: (validBidRequests = [], bidderRequest) => {
3636
let winTop = window;
3737
let location;
38+
// TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
3839
try {
39-
location = new URL(bidderRequest.refererInfo.referer)
40+
location = new URL(bidderRequest.refererInfo.page)
4041
winTop = window.top;
4142
} catch (e) {
4243
location = winTop.location;

‎modules/smilewantedBidAdapter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export const spec = {
5151
}
5252

5353
if (bidderRequest && bidderRequest.refererInfo) {
54-
payload.pageDomain = bidderRequest.refererInfo.referer || '';
54+
payload.pageDomain = bidderRequest.refererInfo.page || '';
5555
}
5656

5757
if (bidderRequest && bidderRequest.gdprConsent) {

‎modules/sonobiBidAdapter.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ export const spec = {
7676

7777
const payload = {
7878
'key_maker': JSON.stringify(data),
79-
'ref': bidderRequest.refererInfo.referer,
79+
// TODO: is 'page' the right value here?
80+
'ref': bidderRequest.refererInfo.page,
8081
's': generateUUID(),
8182
'pv': PAGEVIEW_ID,
8283
'vp': _getPlatform(),

0 commit comments

Comments
 (0)