Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit d6d54cab25563e0ebece456d75733c9b9d78175e
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 25 07:40:48 2022 -0700

    fix lint

commit 43898cdf487b67061e48d65b7c469884df05918a
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 25 07:37:46 2022 -0700

    Do not provide a default value for publisherDomain

commit 5db64028f42935d2b62f58052562b9ae908c58f8
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 25 07:33:45 2022 -0700

    convert bidders: pass 2

commit a916edbb527f3342abfc2f55485918b08f8c2d30
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 25 07:09:05 2022 -0700

    convert bidders: done!

commit 1922bfbf57058b333540f9fef157bb177288dd51
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 25 06:53:44 2022 -0700

    convert bidders: visx

commit 31bb9c05044ca911ed683c7f86147ff9475964a1
Merge: dd22a3ddf e524628
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 25 06:40:54 2022 -0700

    Merge branch 'prebid-7' into referer-merge

commit e524628
Merge: c885816 14ae8d5
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 25 06:35:12 2022 -0700

    Merge branch 'master' into prebid-7

commit 14ae8d5
Author: Patrick McCann <patmmccann@gmail.com>
Date:   Tue May 24 15:58:21 2022 -0400

    Update fintezaAnalyticsAdapter_spec.js (prebid#8467)

commit b01ec40
Author: Prebid.js automated release <prebidjs-release@prebid.org>
Date:   Tue May 24 18:40:10 2022 +0000

    Increment version to 6.27.0-pre

commit e728f54
Author: Prebid.js automated release <prebidjs-release@prebid.org>
Date:   Tue May 24 18:40:10 2022 +0000

    Prebid 6.26.0 release

commit 170f6fd
Author: Patrick McCann <patmmccann@gmail.com>
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 <dgirardi@prebid.org>
Date:   Tue May 24 11:21:26 2022 -0700

    Remove medianetRtdProvider tests (prebid#8463)

commit dd22a3ddf7dd6b01a9adfacada728f9c435cd0b0
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Tue May 24 10:31:14 2022 -0700

    convert bidders: unicorn

commit de3801d8709e362d0507ee75dd92807734824bbf
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Tue May 24 09:17:20 2022 -0700

    convert bidders: sovrn

commit 063dfb337e67fb8fff98a738e86459ab3851b13e
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Tue May 24 08:54:47 2022 -0700

    convert bidders: smarthub

commit 1a4d03b0fb3c362f3d73a2ac4ee652aa2dba3768
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Tue May 24 08:33:45 2022 -0700

    convert bidders: rubicon

commit c885816
Author: Nic G <nic.gallardo@freestar.io>
Date:   Tue May 24 11:09:27 2022 -0400

    Sortable Adapter Removal (prebid#8447)

commit f11bcda
Author: asurovenko-zeta <80847074+asurovenko-zeta@users.noreply.github.com>
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 <surovenko.alexey@gmail.com>

commit c434889
Author: Vikas Srivastava <30315503+visrivastava@users.noreply.github.com>
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 <39541428+haruka-yamashita2@users.noreply.github.com>
Date:   Tue May 24 22:24:00 2022 +0900

    Rename id to aoneId from dacId (prebid#8453)
  • Loading branch information
dgirardi committed May 25, 2022
1 parent 1fd8431 commit 4e3915a
Show file tree
Hide file tree
Showing 102 changed files with 313 additions and 1,542 deletions.
3 changes: 2 additions & 1 deletion modules/adhashBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ export const spec = {
const bidRequests = [];
let referrer = '';
if (bidderRequest && bidderRequest.refererInfo) {
referrer = bidderRequest.refererInfo.referer;
// TODO: is 'page' the right value here?
referrer = bidderRequest.refererInfo.page;
}
for (var i = 0; i < validBidRequests.length; i++) {
var index = Math.floor(Math.random() * validBidRequests[i].sizes.length);
Expand Down
10 changes: 5 additions & 5 deletions modules/betweenBidAdapter.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {registerBidder} from '../src/adapters/bidderFactory.js';
import { getAdUnitSizes, parseSizesInput } from '../src/utils.js';
import { getRefererInfo } from '../src/refererDetection.js';
import {includes} from '../src/polyfill.js'
import {getAdUnitSizes, parseSizesInput} from '../src/utils.js';
import {includes} from '../src/polyfill.js';

const BIDDER_CODE = 'between';
let ENDPOINT = 'https://ads.betweendigital.com/adjson?t=prebid';
Expand Down Expand Up @@ -29,7 +28,7 @@ export const spec = {
buildRequests: function(validBidRequests, bidderRequest) {
let requests = [];
const gdprConsent = bidderRequest && bidderRequest.gdprConsent;
const refInfo = getRefererInfo();
const refInfo = bidderRequest?.refererInfo;

validBidRequests.forEach((i) => {
const video = i.mediaTypes && i.mediaTypes.video;
Expand Down Expand Up @@ -79,7 +78,8 @@ export const spec = {
params.schain = encodeToBase64WebSafe(JSON.stringify(i.schain));
}

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

if (gdprConsent) {
if (typeof gdprConsent.gdprApplies !== 'undefined') {
Expand Down
4 changes: 2 additions & 2 deletions modules/compassBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,14 @@ export const spec = {
winLocation = window.location;
}

const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.referer;
const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
let refferLocation;
try {
refferLocation = refferUrl && new URL(refferUrl);
} catch (e) {
logMessage(e);
}

// TODO: does the fallback make sense here?
let location = refferLocation || winLocation;
const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
const host = location.host;
Expand Down
8 changes: 4 additions & 4 deletions modules/dacIdSystem.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## DAC User ID Submodule
## AudienceOne User ID Submodule

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

## Building Prebid with DAC ID Support
## Building Prebid with AudienceOne ID Support

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

```
gulp build --modules=dacIdSystem
Expand Down
3 changes: 2 additions & 1 deletion modules/logicadBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ function newBidRequest(bid, bidderRequest) {
mediaTypes: bid.mediaTypes
}],
prebidJsVersion: '$prebid.version$',
referrer: bidderRequest.refererInfo.referer,
// TODO: is 'page' the right value here?
referrer: bidderRequest.refererInfo.page,
auctionStartTime: bidderRequest.auctionStart,
eids: bid.userIdAsEids,
};
Expand Down
3 changes: 2 additions & 1 deletion modules/mediafuseBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ export const spec = {

if (bidderRequest && bidderRequest.refererInfo) {
let refererinfo = {
rd_ref: encodeURIComponent(bidderRequest.refererInfo.referer),
// TODO: this collects everything it finds, except for canonicalUrl
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(',')
Expand Down
3 changes: 2 additions & 1 deletion modules/rtbsapeBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ export const spec = {
requestId: bidderRequest.bidderRequestId,
bids: validBidRequests,
timezone: (tz > 0 ? '-' : '+') + padInt(Math.floor(Math.abs(tz) / 60)) + ':' + padInt(Math.abs(tz) % 60),
refererInfo: bidderRequest.refererInfo
// TODO: please do not send internal data structures over the network
refererInfo: bidderRequest.refererInfo.legacy
},
}
},
Expand Down
5 changes: 3 additions & 2 deletions modules/rubiconAnalyticsAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ function sendBillingEvent(event) {

function getBasicEventDetails(auctionId, trigger) {
let auctionCache = cache.auctions[auctionId];
let referrer = config.getConfig('pageUrl') || pageReferer || (auctionCache && auctionCache.referrer);
let referrer = pageReferer || (auctionCache && auctionCache.referrer);
let message = {
timestamps: {
prebidLoaded: rubiconAdapter.MODULE_INITIALIZED_TIME,
Expand Down Expand Up @@ -676,7 +676,8 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
cacheEntry.bids = {};
cacheEntry.bidsWon = {};
cacheEntry.gamHasRendered = {};
cacheEntry.referrer = pageReferer = deepAccess(args, 'bidderRequests.0.refererInfo.referer');
// TODO: is 'page' the right value here?
cacheEntry.referrer = pageReferer = deepAccess(args, 'bidderRequests.0.refererInfo.page');
cacheEntry.bidderOrder = [];
const floorData = deepAccess(args, 'bidderRequests.0.bids.0.floorData');
if (floorData) {
Expand Down
5 changes: 3 additions & 2 deletions modules/rubiconBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -836,11 +836,12 @@ function _getScreenResolution() {
* @returns {string}
*/
function _getPageUrl(bidRequest, bidderRequest) {
let pageUrl = config.getConfig('pageUrl');
let pageUrl;
if (bidRequest.params.referrer) {
pageUrl = bidRequest.params.referrer;
} else if (!pageUrl) {
pageUrl = bidderRequest.refererInfo.referer;
// TODO: is 'page' the right value here?
pageUrl = bidderRequest.refererInfo.page;
}
return bidRequest.params.secure ? pageUrl.replace(/^http:/i, 'https:') : pageUrl;
}
Expand Down
5 changes: 3 additions & 2 deletions modules/saambaaBidAdapter.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// TODO: this adapter appears to have no tests

import {deepAccess, generateUUID, isEmpty, isFn, parseSizesInput, parseUrl} from '../src/utils.js';
import {config} from '../src/config.js';
import {registerBidder} from '../src/adapters/bidderFactory.js';
Expand Down Expand Up @@ -321,8 +323,7 @@ function createVideoRequestData(bid, bidderRequest) {
}

function getTopWindowLocation(bidderRequest) {
let url = bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer;
return parseUrl(config.getConfig('pageUrl') || url, { decodeSearchAsString: true });
return parseUrl(bidderRequest?.refererInfo?.page || '', { decodeSearchAsString: true });
}

function createBannerRequestData(bid, bidderRequest) {
Expand Down
2 changes: 1 addition & 1 deletion modules/seedingAllianceBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const spec = {
const pt = setOnAny(validBidRequests, 'params.pt') || setOnAny(validBidRequests, 'params.priceType') || 'net';
const tid = validBidRequests[0].transactionId;
const cur = [config.getConfig('currency.adServerCurrency') || DEFAULT_CUR];
let url = bidderRequest.refererInfo.referer;
let url = bidderRequest.refererInfo.page;

const imp = validBidRequests.map((bid, id) => {
const assets = _map(bid.nativeParams, (bidParams, key) => {
Expand Down
2 changes: 1 addition & 1 deletion modules/seedtagBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ export const spec = {
*/
buildRequests(validBidRequests, bidderRequest) {
const payload = {
url: bidderRequest.refererInfo.referer,
url: bidderRequest.refererInfo.page,
publisherToken: validBidRequests[0].params.publisherId,
cmp: !!bidderRequest.gdprConsent,
timeout: bidderRequest.timeout,
Expand Down
7 changes: 4 additions & 3 deletions modules/sharethroughBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ export const sharethroughAdapterSpec = {
cur: ['USD'],
tmax: timeout,
site: {
domain: window.location.hostname,
page: window.location.href,
ref: deepAccess(bidderRequest, 'refererInfo.referer'),
// TODO: do the fallbacks make sense here?
domain: deepAccess(bidderRequest, 'refererInfo.domain') || window.location.hostname,
page: deepAccess(bidderRequest, 'refererInfo.page') || window.location.href,
ref: deepAccess(bidderRequest, 'refererInfo.ref'),
...firstPartyData.site,
},
device: {
Expand Down
2 changes: 1 addition & 1 deletion modules/showheroes-bsBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const spec = {
},
buildRequests: function(validBidRequests, bidderRequest) {
let adUnits = [];
const pageURL = validBidRequests[0].params.contentPageUrl || bidderRequest.refererInfo.referer;
const pageURL = validBidRequests[0].params.contentPageUrl || bidderRequest.refererInfo.page;
const isStage = !!validBidRequests[0].params.stage;
const isOutstream = deepAccess(validBidRequests[0], 'mediaTypes.video.context') === 'outstream';
const isCustomRender = deepAccess(validBidRequests[0], 'params.outstreamOptions.customRender');
Expand Down
4 changes: 2 additions & 2 deletions modules/sirdataRtdProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ export function getSegmentsAndCategories(reqBidsConfigObj, onDone, moduleConfig,
sirdataDomain = 'sddan.com';
sendWithCredentials = true;
}

var actualUrl = moduleConfig.params.actualUrl || getRefererInfo().referer;
// TODO: is 'page' the right value here?
var actualUrl = moduleConfig.params.actualUrl || getRefererInfo().page;

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) : '');

Expand Down
4 changes: 2 additions & 2 deletions modules/slimcutBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ function buildRequestObject(bid) {
}
function getReferrerInfo(bidderRequest) {
let ref = window.location.href;
if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
ref = bidderRequest.refererInfo.referer;
if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.page) {
ref = bidderRequest.refererInfo.page;
}
return ref;
}
Expand Down
7 changes: 4 additions & 3 deletions modules/smaatoBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ const buildOpenRtbBidRequest = (bidRequest, bidderRequest) => {
tmax: bidderRequest.timeout,
site: {
id: window.location.hostname,
domain: window.location.hostname,
page: window.location.href,
ref: bidderRequest.refererInfo.referer
// TODO: do the fallbacks make sense here?
domain: bidderRequest.refererInfo.domain || window.location.hostname,
page: bidderRequest.refererInfo.page || window.location.href,
ref: bidderRequest.refererInfo.ref
},
device: {
language: (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
Expand Down
3 changes: 2 additions & 1 deletion modules/smartadserverBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ export const spec = {
appname: bid.params.appName && bid.params.appName !== '' ? bid.params.appName : undefined,
ckid: bid.params.ckId || 0,
tagId: bid.adUnitCode,
pageDomain: bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer ? bidderRequest.refererInfo.referer : undefined,
// TODO: is 'page' the right value here?
pageDomain: bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.page ? bidderRequest.refererInfo.page : undefined,
transactionId: bid.transactionId,
timeout: config.getConfig('bidderTimeout'),
bidId: bid.bidId,
Expand Down
2 changes: 1 addition & 1 deletion modules/smarthubBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function buildRequestParams(bidderRequest = {}, placements = []) {
winLocation = window.location;
}

const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.referer;
const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
let refferLocation;
try {
refferLocation = refferUrl && new URL(refferUrl);
Expand Down
3 changes: 2 additions & 1 deletion modules/smartxBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ export const spec = {
* @return ServerRequest Info describing the request to the server.
*/
buildRequests: function (bidRequests, bidderRequest) {
const page = bidderRequest.refererInfo.referer;
// TODO: does the fallback make sense here?
const page = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
const isPageSecure = !!page.match(/^https:/)

const smartxRequests = bidRequests.map(function (bid) {
Expand Down
3 changes: 2 additions & 1 deletion modules/smartyadsBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ export const spec = {
buildRequests: (validBidRequests = [], bidderRequest) => {
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;
Expand Down
2 changes: 1 addition & 1 deletion modules/smilewantedBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const spec = {
}

if (bidderRequest && bidderRequest.refererInfo) {
payload.pageDomain = bidderRequest.refererInfo.referer || '';
payload.pageDomain = bidderRequest.refererInfo.page || '';
}

if (bidderRequest && bidderRequest.gdprConsent) {
Expand Down
3 changes: 2 additions & 1 deletion modules/sonobiBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ export const spec = {

const payload = {
'key_maker': JSON.stringify(data),
'ref': bidderRequest.refererInfo.referer,
// TODO: is 'page' the right value here?
'ref': bidderRequest.refererInfo.page,
's': generateUUID(),
'pv': PAGEVIEW_ID,
'vp': _getPlatform(),
Expand Down
Loading

0 comments on commit 4e3915a

Please sign in to comment.