Skip to content

Commit

Permalink
Prebid 7: refactoring of refererInfo, pageUrl, publisherDomain (#8450)
Browse files Browse the repository at this point in the history
* Squashed commit of the following:

commit ef322e9964924bcdbe9548e56df69b00b000f642
Merge: 9c1b79086 a8c4a80
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Mon May 23 12:08:14 2022 -0700

    Merge branch 'prebid-7' into referer

commit 9c1b7908659aaf904abd2bc4fcf53cd42a5b81cc
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Mon May 23 12:03:29 2022 -0700

    fix lint

commit 4d21818db17e08c038153eb2c77a1c7ebace13be
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Mon May 23 11:55:18 2022 -0700

    convert bidders: rtbhouse

commit 056c3172dcbae31ef1b7c63b5d033a5df713f0be
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Mon May 23 11:49:20 2022 -0700

    convert bidders: richaudience

commit 3b95d559a8075345da16ab59bca40def2572ee1c
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Mon May 23 11:12:43 2022 -0700

    convert bidders: revcontent

commit 9c3acfc9c86d9dc7c1928f21855288110ab87a8e
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Mon May 23 11:01:40 2022 -0700

    convert bidders: relaid

commit 65dbe122a7156ea1b380db37c083a90a0e7aa11a
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Mon May 23 10:47:48 2022 -0700

    convert bidders: quantcast

commit dc8fbb0c147c3229c8ceb4528b049a053b03b276
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Mon May 23 10:33:06 2022 -0700

    convert bidders: pulsepoint

commit 775ca874aaac052dae51498db10910cf25f51fbe
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Mon May 23 10:26:51 2022 -0700

    convert bidders: pubmatic

commit 60df0651fc27524100e944edca457a3ef95e1f4c
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Mon May 23 10:07:58 2022 -0700

    convert bidders: otm

commit 5ec60e4
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 12:44:58 2022 -0700

    convert bidders: operaads

commit e6bd48c
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 12:21:01 2022 -0700

    convert bidders: missena

commit d0703d4
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 12:00:38 2022 -0700

    convert bidders: microad

commit 8da461f
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 11:47:18 2022 -0700

    convert bidders: mediakeys

commit 15ee1b4
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 11:35:24 2022 -0700

    convert bidders: luponmedia

commit ab4e778
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 11:32:52 2022 -0700

    convert bidders: loglyft

commit f6c3be0
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 11:25:01 2022 -0700

    convert bidders: livewrapped

commit e2260b6
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 11:20:34 2022 -0700

    convert bidders: kubient

commit 50f0610
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 11:18:34 2022 -0700

    convert bidders: kobler

commit 8ba55cd
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 11:11:44 2022 -0700

    convert bidders: ix

commit 4486b4f
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 10:55:59 2022 -0700

    convert bidders: iqm

commit f95f031
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 10:41:11 2022 -0700

    convert bidders: iprom

commit cead162
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 10:38:11 2022 -0700

    convert bidders: insticator

commit 729a870
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 10:36:08 2022 -0700

    convert bidders: inskin

commit 93d6a47
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 10:35:07 2022 -0700

    convert bidders: inmar

commit 1105c2a
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 10:34:03 2022 -0700

    convert bidders: improveddigital

commit 535ff28
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 10:30:13 2022 -0700

    convert bidders: hybrid

commit 561b10b
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 10:27:31 2022 -0700

    convert bidders: gumgum

commit 1fcf289
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 10:24:35 2022 -0700

    convert bidders: grid

commit 46bf009
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 10:16:13 2022 -0700

    convert bidders: gmoss

commit 37c735a
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 10:13:33 2022 -0700

    convert bidders: glomex

commit 9feb6f5
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 10:07:43 2022 -0700

    convert bidders: glimpse

commit 90a3134
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 10:04:49 2022 -0700

    do not remove www in parseDomain

commit 6aeecac
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 10:01:51 2022 -0700

    convert bidders: gamoshi

commit 8b66ebb
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 09:54:23 2022 -0700

    convert bidders: feedad

commit effdac6
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 09:53:16 2022 -0700

    convert bidders: fabrick

commit c9f3a95
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 09:51:15 2022 -0700

    convert bidders: eplanning

commit 2a93dab
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 09:38:55 2022 -0700

    convert bidders: emx

commit 7f5c15a
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 09:31:43 2022 -0700

    convert bidders: deltaprojects

commit ce45157
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 09:18:27 2022 -0700

    convert bidders: criteoId

commit 985dcbc
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 09:14:29 2022 -0700

    convert bidders: criteo

commit 5cf6955
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 09:05:44 2022 -0700

    convert bidders: conversant

commit edf8b41
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 09:02:25 2022 -0700

    convert bidders: connecta

commit e5c71dd
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 08:59:02 2022 -0700

    convert bidders: concert

commit 29cd262
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 08:54:51 2022 -0700

    convert bidders: codefuel

commit f5c6357
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 08:54:05 2022 -0700

    convert bidders: cleanmedia

commit abd70f9
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 08:47:54 2022 -0700

    convert bidders: brightcom

commit a04ad82
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 08:42:14 2022 -0700

    convert bidders: bridgewell

commit a237df5
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 08:39:44 2022 -0700

    convert bidders: brave

commit 94337ef
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 08:26:21 2022 -0700

    convert bidders: bliink

commit b29945e
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Fri May 20 08:21:50 2022 -0700

    convert bidders: beachfront

commit 97ea0df
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Thu May 19 09:21:54 2022 -0700

    convert bidders: axonix

commit 0f5d97b
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Thu May 19 09:01:18 2022 -0700

    convert bidders: appnexus

commit 2d57f41
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Thu May 19 08:53:30 2022 -0700

    convert bidders: apacdex

commit 2ef8eaf
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Thu May 19 08:46:01 2022 -0700

    convert bidders: amx

commit fafb541
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Thu May 19 08:36:35 2022 -0700

    convert bidders: alkimi

commit 113e717
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 18 13:03:57 2022 -0700

    convert bidders: adyoulike

commit b9a4d56
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 18 12:50:19 2022 -0700

    convert bidders: adxcg

commit 06b0c9d
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 18 12:35:36 2022 -0700

    convert bidders: aduptech

commit 039444b
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 18 12:23:16 2022 -0700

    convert bidders: adrino

commit 70305f4
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 18 12:07:09 2022 -0700

    convert bidders: adnuntius

commit c614eca
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 18 12:03:30 2022 -0700

    convert bidders: adloox

commit 43327a9
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 18 11:55:07 2022 -0700

    convert bidders: adkernel

commit 0170539
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 18 11:20:28 2022 -0700

    convert bidders: adgeneration

commit f849022
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 18 11:09:30 2022 -0700

    convert adapters: adagio

commit e861922
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Wed May 18 10:50:25 2022 -0700

    rename referer to topmostLocation, make location all-or-nothing

commit b31e7cd
Author: Demetrio Girardi <dgirardi@prebid.org>
Date:   Tue May 17 10:42:45 2022 -0700

    Updated refererInfo logic

* Squashed commit of the following:

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 (#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 (#8284)" (#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 (#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 (#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 (#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 (#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 (#8453)

* fix lgtm alert

* Drop www in enrichments module

* make canonicalUrl respect pageUrl consistently

* clean up ancient jsdoc on setConfig

* test consistency of pageUrl

* Update tripleliftBidAdapter.js

* Update refererDetection.js

* convert bidders: incrx, taboola

* Fix minutemedia adapter param name

* Update teadsBidAdapter.js

* Update rubiconBidAdapter.js
  • Loading branch information
dgirardi committed Jun 7, 2022
1 parent 759cfc0 commit 6e3f8dd
Show file tree
Hide file tree
Showing 376 changed files with 1,810 additions and 1,906 deletions.
2 changes: 1 addition & 1 deletion modules/33acrossBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ function _buildRequestParams(bidRequests, bidderRequest) {

const uspConsent = bidderRequest && bidderRequest.uspConsent;

const pageUrl = (bidderRequest && bidderRequest.refererInfo) ? (bidderRequest.refererInfo.referer) : (undefined);
const pageUrl = bidderRequest?.refererInfo?.page

adapterState.uniqueSiteIds = bidRequests.map(req => req.params.siteId).filter(uniques);

Expand Down
2 changes: 1 addition & 1 deletion modules/a4gBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const spec = {

let data = {
[IFRAME_PARAM_NAME]: 0,
[LOCATION_PARAM_NAME]: (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) ? bidderRequest.refererInfo.referer : window.location.href,
[LOCATION_PARAM_NAME]: bidderRequest.refererInfo?.page,
[SIZE_PARAM_NAME]: sizeParams.join(ARRAY_PARAM_SEPARATOR),
[ID_PARAM_NAME]: idParams.join(ARRAY_PARAM_SEPARATOR),
[ZONE_ID_PARAM_NAME]: zoneIds.join(ARRAY_PARAM_SEPARATOR)
Expand Down
3 changes: 2 additions & 1 deletion modules/ablidaBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ export const spec = {
sizes: sizes,
bidId: bidRequest.bidId,
categories: bidRequest.params.categories,
referer: bidderRequest.refererInfo.referer,
// TODO: should referer be 'ref'?
referer: bidderRequest.refererInfo.page,
jaySupported: jaySupported,
device: device,
adapterVersion: 5,
Expand Down
5 changes: 3 additions & 2 deletions modules/adWMGBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ export const spec = {
buildRequests: (validBidRequests, bidderRequest) => {
const timeout = bidderRequest.timeout || 0;
const debug = config.getConfig('debug') || false;
const referrer = bidderRequest.refererInfo.referer;
// TODO: is 'page' the right value here?
const referrer = bidderRequest.refererInfo.page;
const locale = window.navigator.language && window.navigator.language.length > 0 ? window.navigator.language.substr(0, 2) : '';
const domain = config.getConfig('publisherDomain') || (window.location && window.location.host ? window.location.host : '');
const domain = bidderRequest.refererInfo.domain || '';
const ua = window.navigator.userAgent.toLowerCase();
const additional = spec.parseUserAgent(ua);

Expand Down
12 changes: 5 additions & 7 deletions modules/adagioBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@ import {
logInfo,
logWarn,
mergeDeep,
parseUrl
} from '../src/utils.js';
import {config} from '../src/config.js';
import {registerBidder} from '../src/adapters/bidderFactory.js';
import {loadExternalScript} from '../src/adloader.js';
import {verify} from 'criteo-direct-rsa-validate/build/verify.js';
import {getStorageManager} from '../src/storageManager.js';
import {getRefererInfo} from '../src/refererDetection.js';
import {getRefererInfo, parseDomain} from '../src/refererDetection.js';
import {createEidsArray} from './userId/eids.js';
import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
import {Renderer} from '../src/Renderer.js';
Expand Down Expand Up @@ -270,12 +269,11 @@ function getDevice() {

function getSite(bidderRequest) {
const { refererInfo } = bidderRequest;
const url = parseUrl(refererInfo.referer);

return {
domain: url.hostname || '',
page: refererInfo.referer || '',
referrer: canAccessTopWindow() ? getWindowTop().document.referrer || '' : getWindowSelf().document.referrer || '',
// TODO: do these fallbacks make sense?
domain: refererInfo.domain || parseDomain(refererInfo.topmostLocation) || '',
page: refererInfo.page || refererInfo.topmostLocation || '',
referrer: refererInfo.ref || getWindowSelf().document.referrer || '',
top: refererInfo.reachedTop
};
};
Expand Down
6 changes: 3 additions & 3 deletions modules/adbookpspBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ function buildRequest(validBidRequests, bidderRequest) {
id: bidderRequest.bidderRequestId,
tmax: bidderRequest.timeout,
site: {
domain: window.location.hostname,
page: window.location.href,
ref: bidderRequest.refererInfo.referer,
domain: bidderRequest.refererInfo.domain,
page: bidderRequest.refererInfo.page,
ref: bidderRequest.refererInfo.ref,
},
source: buildSource(validBidRequests, bidderRequest),
device: buildDevice(),
Expand Down
3 changes: 2 additions & 1 deletion modules/addefendBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ export const spec = {
pageId: false,
gdpr_applies: bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies ? bidderRequest.gdprConsent.gdprApplies : 'true',
gdpr_consent: bidderRequest.gdprConsent && bidderRequest.gdprConsent.consentString ? bidderRequest.gdprConsent.consentString : '',
referer: bidderRequest.refererInfo.referer,
// TODO: is 'page' the correct item here?
referer: bidderRequest.refererInfo.page,
bids: [],
};

Expand Down
16 changes: 6 additions & 10 deletions modules/adfBidAdapter.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
// jshint esversion: 6, es3: false, node: true
'use strict';

import {
registerBidder
} from '../src/adapters/bidderFactory.js';
import {
NATIVE, BANNER, VIDEO
} from '../src/mediaTypes.js';
import { mergeDeep, _map, deepAccess, parseSizesInput, deepSetValue } from '../src/utils.js';
import { config } from '../src/config.js';
import { Renderer } from '../src/Renderer.js';
import {registerBidder} from '../src/adapters/bidderFactory.js';
import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
import {_map, deepAccess, deepSetValue, mergeDeep, parseSizesInput} from '../src/utils.js';
import {config} from '../src/config.js';
import {Renderer} from '../src/Renderer.js';

const { getConfig } = config;

Expand Down Expand Up @@ -81,7 +77,7 @@ export const spec = {
}

if (!site.page) {
site.page = bidderRequest.refererInfo.referer;
site.page = bidderRequest.refererInfo.page;
}
}

Expand Down
3 changes: 2 additions & 1 deletion modules/adgenerationBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ export const spec = {
if (!validReq.mediaTypes || !validReq.mediaTypes.native) {
data = tryAppendQueryString(data, 'imark', '1');
}
data = tryAppendQueryString(data, 'tp', bidderRequest.refererInfo.referer);
// TODO: is 'page' the right value here?
data = tryAppendQueryString(data, 'tp', bidderRequest.refererInfo.page);
if (isIos()) {
const hyperId = getHyperId(validReq);
if (hyperId != null) {
Expand Down
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
3 changes: 2 additions & 1 deletion modules/adheseBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ export const spec = {

const adheseConfig = config.getConfig('adhese');
const gdprParams = (gdprConsent && gdprConsent.consentString) ? { xt: [gdprConsent.consentString] } : {};
const refererParams = (refererInfo && refererInfo.referer) ? { xf: [base64urlEncode(refererInfo.referer)] } : {};
// TODO: is 'page' the right value here?
const refererParams = (refererInfo && refererInfo.page) ? { xf: [base64urlEncode(refererInfo.page)] } : {};
const globalCustomParams = (adheseConfig && adheseConfig.globalTargets) ? cleanTargets(adheseConfig.globalTargets) : {};
const commonParams = { ...globalCustomParams, ...gdprParams, ...refererParams };
const vastContentAsUrl = !(adheseConfig && adheseConfig.vastContentAsUrl == false);
Expand Down
1 change: 1 addition & 0 deletions modules/adkernelAdnAnalyticsAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@ export function ExpiringQueue(callback, ttl) {
}
}

// TODO: this should reuse logic from refererDetection
function getNavigationInfo() {
try {
return getLocationAndReferrer(self.top);
Expand Down
15 changes: 6 additions & 9 deletions modules/adkernelAdnBidAdapter.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { deepAccess, parseSizesInput, isArray, deepSetValue, parseUrl, isStr, isNumber, logInfo } from '../src/utils.js';
import { deepAccess, parseSizesInput, isArray, deepSetValue, isStr, isNumber, logInfo } from '../src/utils.js';
import {registerBidder} from '../src/adapters/bidderFactory.js';
import {BANNER, VIDEO} from '../src/mediaTypes.js';
import {config} from '../src/config.js';
Expand All @@ -10,7 +10,7 @@ const DEFAULT_APIS = [1, 2];
const GVLID = 14;

function isRtbDebugEnabled(refInfo) {
return refInfo.referer.indexOf('adk_debug=true') !== -1;
return refInfo.topmostLocation?.indexOf('adk_debug=true') !== -1;
}

function buildImp(bidRequest) {
Expand Down Expand Up @@ -83,13 +83,10 @@ function buildRequestParams(tags, bidderRequest) {
}

function buildSite(refInfo) {
let loc = parseUrl(refInfo.referer);
let result = {
page: `${loc.protocol}://${loc.hostname}${loc.pathname}`,
secure: ~~(loc.protocol === 'https')
};
if (self === top && document.referrer) {
result.ref = document.referrer;
const result = {
page: refInfo.page,
secure: ~~(refInfo.page && refInfo.page.startsWith('https')),
ref: refInfo.ref
}
let keywords = document.getElementsByTagName('meta')['keywords'];
if (keywords && keywords.content) {
Expand Down
15 changes: 6 additions & 9 deletions modules/adkernelBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@ import {
deepSetValue,
getAdUnitSizes,
getDNT,
inIframe,
isArray,
isArrayOfNums,
isEmpty,
isNumber,
isPlainObject,
isStr,
mergeDeep,
parseGPTSingleSizeArrayToRtbSize,
parseUrl
parseGPTSingleSizeArrayToRtbSize
} from '../src/utils.js';
import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
import {registerBidder} from '../src/adapters/bidderFactory.js';
Expand Down Expand Up @@ -226,7 +224,7 @@ registerBidder(spec);
* @param refererInfo {refererInfo}
*/
function groupImpressionsByHostZone(bidRequests, refererInfo) {
let secure = (refererInfo && refererInfo.referer.indexOf('https:') === 0);
let secure = (refererInfo && refererInfo.page?.indexOf('https:') === 0);
return Object.values(
bidRequests.map(bidRequest => buildImp(bidRequest, secure))
.reduce((acc, curr, index) => {
Expand Down Expand Up @@ -535,14 +533,13 @@ function getLanguage() {
* Creates site description object
*/
function createSite(refInfo, fpd) {
let url = parseUrl(refInfo.referer);
let site = {
'domain': url.hostname,
'page': `${url.protocol}://${url.hostname}${url.pathname}`
'domain': refInfo.domain,
'page': refInfo.page
};
mergeDeep(site, fpd.site);
if (!inIframe() && document.referrer) {
site.ref = document.referrer;
if (refInfo.ref != null) {
site.ref = refInfo.ref;
} else {
delete site.ref;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/adlooxAnalyticsAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ MACRO['creatype'] = function(b, c) {
};
MACRO['pageurl'] = function(b, c) {
const refererInfo = getRefererInfo();
return (refererInfo.canonicalUrl || refererInfo.referer || '').substr(0, 300).split(/[?#]/)[0];
return (refererInfo.page || '').substr(0, 300).split(/[?#]/)[0];
};
MACRO['gpid'] = function(b, c) {
const adUnit = find(auctionManager.getAdUnits(), a => b.adUnitCode === a.code);
Expand Down
2 changes: 1 addition & 1 deletion modules/adlooxRtdProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ function getBidRequestData(reqBidsConfigObj, callback, config, userConsent) {
[ 'imp', config.params.imps ],
[ 'fc_ip', config.params.freqcap_ip ],
[ 'fc_ipua', config.params.freqcap_ipua ],
[ 'pn', (refererInfo.canonicalUrl || refererInfo.referer || '').substr(0, 300).split(/[?#]/)[0] ]
[ 'pn', (refererInfo.page || '').substr(0, 300).split(/[?#]/)[0] ]
];

if (!adUnits.length) {
Expand Down
3 changes: 2 additions & 1 deletion modules/admanBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,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
5 changes: 3 additions & 2 deletions modules/admixerBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ export const spec = {
if (bidderRequest) {
const {bidderCode} = bidderRequest;
endpointUrl = config.getConfig(`${bidderCode}.endpoint_url`);
if (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
payload.referrer = encodeURIComponent(bidderRequest.refererInfo.referer);
// TODO: is 'page' the right value here?
if (bidderRequest.refererInfo?.page) {
payload.referrer = encodeURIComponent(bidderRequest.refererInfo.page);
}
if (bidderRequest.gdprConsent) {
payload.gdprConsent = {
Expand Down
2 changes: 1 addition & 1 deletion modules/adnuntiusBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const spec = {

networks[network] = networks[network] || {};
networks[network].adUnits = networks[network].adUnits || [];
if (bidderRequest && bidderRequest.refererInfo) networks[network].context = bidderRequest.refererInfo.referer;
if (bidderRequest && bidderRequest.refererInfo) networks[network].context = bidderRequest.refererInfo.page;
if (adnMeta) networks[network].metaData = adnMeta;
networks[network].adUnits.push({ ...targeting, auId: bid.params.auId, targetId: bid.bidId });
}
Expand Down
20 changes: 3 additions & 17 deletions modules/adotBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
import {isArray, isBoolean, isFn, isPlainObject, isStr, logError, replaceAuctionPrice} from '../src/utils.js';
import {find} from '../src/polyfill.js';
import {config} from '../src/config.js';
import { OUTSTREAM } from '../src/video.js';
import {OUTSTREAM} from '../src/video.js';

const BIDDER_CODE = 'adot';
const ADAPTER_VERSION = 'v2.0.0';
const BID_METHOD = 'POST';
const BIDDER_URL = 'https://dsp.adotmob.com/headerbidding{PUBLISHER_PATH}/bidrequest';
const REQUIRED_VIDEO_PARAMS = ['mimes', 'protocols'];
const DOMAIN_REGEX = new RegExp('//([^/]*)');
const FIRST_PRICE = 1;
const IMP_BUILDER = { banner: buildBanner, video: buildVideo, native: buildNative };
const NATIVE_PLACEMENTS = {
Expand Down Expand Up @@ -43,19 +42,6 @@ function tryParse(data) {
}
}

/**
* Extract domain from given url
*
* @param {string} url
* @returns {string|null} Extracted domain
*/
function extractDomainFromURL(url) {
if (!url || !isStr(url)) return null;
const domain = url.match(DOMAIN_REGEX);
if (isArray(domain) && domain.length === 2) return domain[1];
return null;
}

/**
* Create and return site OpenRtb object from given bidderRequest
*
Expand All @@ -65,13 +51,13 @@ function extractDomainFromURL(url) {
function getOpenRTBSiteObject(bidderRequest) {
if (!bidderRequest || !bidderRequest.refererInfo) return null;

const domain = extractDomainFromURL(bidderRequest.refererInfo.referer);
const domain = bidderRequest.refererInfo.domain;
const publisherId = config.getConfig('adot.publisherId');

if (!domain) return null;

return {
page: bidderRequest.refererInfo.referer,
page: bidderRequest.refererInfo.page,
domain: domain,
name: domain,
publisher: {
Expand Down
8 changes: 2 additions & 6 deletions modules/adpartnerBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,8 @@ export const spec = {
},

buildRequests: function (validBidRequests, bidderRequest) {
let referer = window.location.href;
try {
referer = typeof bidderRequest.refererInfo === 'undefined'
? window.top.location.href
: bidderRequest.refererInfo.referer;
} catch (e) {}
// TODO does it make sense to fall back to window.location.href?
const referer = bidderRequest?.refererInfo?.page || window.location.href;

let bidRequests = [];
let beaconParams = {
Expand Down
1 change: 1 addition & 0 deletions modules/adplusBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ function createBidRequest(bid) {
screenWidth: screen.width,
screenHeight: screen.height,
language: window.navigator.language || 'en-US',
// TODO: these should probably look at refererInfo
pageUrl: window.location.href,
domain: window.location.hostname,
referrer: window.location.referrer,
Expand Down
3 changes: 2 additions & 1 deletion modules/adprimeBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,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
3 changes: 2 additions & 1 deletion modules/adrelevantisBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ export const spec = {

if (bidderRequest && bidderRequest.refererInfo) {
let refererinfo = {
rd_ref: encodeURIComponent(bidderRequest.refererInfo.referer),
// TODO: this sends everything it finds to the backend, 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/adrinoBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ export const spec = {
bidId: validBidRequests[i].bidId,
nativeParams: validBidRequests[i].nativeParams,
placementHash: validBidRequests[i].params.hash,
referer: bidderRequest.refererInfo.referer,
// TODO: is 'page' the right value here?
referer: bidderRequest.refererInfo.page,
userAgent: navigator.userAgent,
}

Expand Down
Loading

0 comments on commit 6e3f8dd

Please sign in to comment.