Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prebid 7 #8530

Merged
merged 55 commits into from
Jun 8, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
f462beb
Prebid 7: Delete userid targeting module (#8227)
patmmccann Apr 2, 2022
1da703e
NextRoll ID: Remove NextRoll ID module (#8150)
abijr Apr 2, 2022
9bb10d8
Remove Sortable Analytics Adapter (#8251)
nicgallardo Apr 4, 2022
817c91d
Prebid 7: Merge in changes from master (#8278)
patmmccann Apr 12, 2022
418fe56
remove appnexusAnalyticsAdapter (#8330)
jsnellbaker Apr 27, 2022
fa20923
Merge branch 'master' into prebid-7
dgirardi Apr 28, 2022
90df3ff
Merge master into prebid-7 (#8336)
dgirardi Apr 28, 2022
1d74541
Revert "Merge master into prebid-7 (#8336)"
dgirardi Apr 28, 2022
ce4631c
Merge branch 'pb7-merge' into prebid-7
dgirardi Apr 28, 2022
14712d1
Merge branch 'master' into prebid-7
dgirardi May 2, 2022
db102b5
Prebid 7: Remove FLOC id submodule (#8225)
patmmccann May 3, 2022
a2b0079
Prebid 7: Delete onevideo bid adapter (#8281)
patmmccann May 3, 2022
3b3c8a5
Prebid 7: auction-specific first party data and refactoring of FPD in…
dgirardi May 3, 2022
64375dd
Merge branch 'master' into prebid-7
dgirardi May 3, 2022
eeeab7b
Prebid 7 : update instl for current prebid standards (#8361)
ChrisHuie May 3, 2022
670ee19
Merge branch 'master' into prebid-7
dgirardi May 4, 2022
863b2ee
Merge branch 'master' into prebid-7
dgirardi May 10, 2022
6259946
Merge branch 'master' into prebid-7
dgirardi May 16, 2022
b6f5ff2
Remove districtm Dmx Bid Adapter (#8417)
pierreted90 May 16, 2022
1e9da88
Merge branch 'master' into prebid-7
dgirardi May 17, 2022
19e669e
Merge branch 'prebid-7' of github.com:prebid/Prebid.js into prebid-7
dgirardi May 17, 2022
6e28596
Fix lint
dgirardi May 17, 2022
de31f55
Prebid 7: Remove Halo System (#8420)
patmmccann May 17, 2022
6fcb4f6
Prebid 7: change default of `allowAlternateBidderCodes` from `true` t…
dgirardi May 17, 2022
cf7c11b
Prebid 7: TheMediaGrid: make trustxBidAdapter as alias of gridBidAdap…
TheMediaGrid May 18, 2022
e0afeff
Prebid 7: Change default bidder access to storage manager (#8279)
patmmccann May 20, 2022
72a1ae4
Merge branch 'master' into prebid-7
dgirardi May 20, 2022
29f4c75
Merge branch 'prebid-7' of github.com:prebid/Prebid.js into prebid-7
dgirardi May 20, 2022
3104a3f
Remove Sortable Analytics Adapter (#8442)
liliana-sortable May 20, 2022
29848c2
Prebid 7: Remove AppNexus Alias for Brealtime and DistrictM (#8437)
patmmccann May 23, 2022
7efc875
remove md files of removed adapters (#8446)
ChrisHuie May 23, 2022
2870089
Prebid 7: Deprecating OneVideo Bid Adapter (#8436)
DeepthiNeeladri May 23, 2022
a8c4a80
Merge branch 'master' into prebid-7
dgirardi May 23, 2022
c885816
Sortable Adapter Removal (#8447)
nicgallardo May 24, 2022
e524628
Merge branch 'master' into prebid-7
dgirardi May 25, 2022
f7910d4
Merge branch 'master' into prebid-7
dgirardi May 25, 2022
823fa5a
Prebid 7: Clean up misc halo references (#8468)
patmmccann May 26, 2022
187c0d0
Prebid 7: Adapter fixes for reading impression position (#8451)
patmmccann May 26, 2022
13e0b43
Prebid 7: Remove Akamai DAP ID in favor of RTD (#8480)
patmmccann May 26, 2022
2da0059
Prebid 7: update multiple adapters to standardize bcat (#8462)
ChrisHuie May 26, 2022
2f1a83c
Merge branch 'master' into prebid-7
dgirardi May 31, 2022
26312c2
Magnite GVL ID update (7.0 branch) (#8502)
bretg May 31, 2022
174368b
Prebid 7: Remove stored auction response (#8235)
patmmccann Jun 1, 2022
228bb10
Merge branch 'master' into prebid-7
dgirardi Jun 1, 2022
a3364b5
Merge branch 'prebid-7' of github.com:prebid/Prebid.js into prebid-7
dgirardi Jun 1, 2022
a5f1ae8
Prebid 7: remove support for legacy FPD (#8372)
dgirardi Jun 1, 2022
133a738
Merge branch 'master' into prebid-7
dgirardi Jun 2, 2022
4a25c2e
Merge branch 'prebid-7' of github.com:prebid/Prebid.js into prebid-7
dgirardi Jun 2, 2022
da54a9c
Prebid 7: Allow USP module to work without explicit configuration (#8…
patmmccann Jun 2, 2022
5905aa9
Merge branch 'master' into prebid-7
dgirardi Jun 3, 2022
759cfc0
Prebid.js 7: update pbsBidAdapter to use imp.ext.prebid.bidder.BIDDER…
ChrisHuie Jun 6, 2022
6e3f8dd
Prebid 7: refactoring of refererInfo, pageUrl, publisherDomain (#8450)
dgirardi Jun 7, 2022
3682d62
Prebid 7: remove support for TCFv1 (#8356)
dgirardi Jun 7, 2022
d44519b
Merge branch 'master' into prebid-7
dgirardi Jun 7, 2022
1f648fd
Prebid 7: prevent Prebid from being loaded multiple times (#8508)
dgirardi Jun 8, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Prebid 7: Remove FLOC id submodule (#8225)
* Delete flocIdSystem.js

* Delete flocIdSystem.md

* Update teadsBidAdapter.js

* Update teadsBidAdapter_spec.js

* Update ixBidAdapter.js

* Update ixBidAdapter_spec.js

* Update pubmaticBidAdapter.js

* Update pubmaticBidAdapter_spec.js

* Update ucfunnelBidAdapter.js

* Update ucfunnelBidAdapter_spec.js

* Update userId_example.html

* Update .submodules.json

* Update userId.md

* Update userId.md

* Update userId_spec.js

* Update sharethroughBidAdapter.js

* Update sharethroughBidAdapter_spec.js

* Update pixfutureBidAdapter.js

* Update winrBidAdapter.js

* Update openxBidAdapter.js

* Update openxBidAdapter_spec.js

* Update winrBidAdapter_spec.js

* Update goldbachBidAdapter.js

* Update bridgewellBidAdapter_spec.js

* Update mediafuseBidAdapter.js

* Update appnexusBidAdapter.js

* Update appnexusBidAdapter_spec.js

* Update userId_spec.js

* Update goldbachBidAdapter_spec.js

* Update mediafuseBidAdapter_spec.js

* Update userId_spec.js

* Update userId_spec.js
  • Loading branch information
patmmccann authored May 3, 2022
commit db102b5373d201a3db93ed1e861473197ba1dfba
9 changes: 1 addition & 8 deletions integrationExamples/gpt/userId_example.html
Original file line number Diff line number Diff line change
Expand Up @@ -251,14 +251,7 @@
{
"name": "uid2"
}
,{
name: "flocId",
params: {
// Default sharedid.org token : "A3dHTSoNUMjjERBLlrvJSelNnwWUCwVQhZ5tNQ+sll7y+LkPPVZXtB77u2y7CweRIxiYaGwGXNlW1/dFp8VMEgIAAAB+eyJvcmlnaW4iOiJodHRwczovL3NoYXJlZGlkLm9yZzo0NDMiLCJmZWF0dXJlIjoiSW50ZXJlc3RDb2hvcnRBUEkiLCJleHBpcnkiOjE2MjYyMjA3OTksImlzU3ViZG9tYWluIjp0cnVlLCJpc1RoaXJkUGFydHkiOnRydWV9"
// To get new token, register https://developer.chrome.com/origintrials/#/trials/active for Federated Learning of Cohorts
token: "A3dHTSoNUMjjERBLlrvJSelNnwWUCwVQhZ5tNQ+sll7y+LkPPVZXtB77u2y7CweRIxiYaGwGXNlW1/dFp8VMEgIAAAB+eyJvcmlnaW4iOiJodHRwczovL3NoYXJlZGlkLm9yZzo0NDMiLCJmZWF0dXJlIjoiSW50ZXJlc3RDb2hvcnRBUEkiLCJleHBpcnkiOjE2MjYyMjA3OTksImlzU3ViZG9tYWluIjp0cnVlLCJpc1RoaXJkUGFydHkiOnRydWV9"
}
},
,
{
"name": "imuid",
"params": {
Expand Down
1 change: 0 additions & 1 deletion modules/.submodules.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"deepintentDpesIdSystem",
"dmdIdSystem",
"fabrickIdSystem",
"flocIdSystem",
"hadronIdSystem",
"haloIdSystem",
"id5IdSystem",
Expand Down
1 change: 0 additions & 1 deletion modules/appnexusBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,6 @@ export const spec = {
if (bidRequests[0].userId) {
let eids = [];

addUserId(eids, deepAccess(bidRequests[0], `userId.flocId.id`), 'chrome.com', null);
addUserId(eids, deepAccess(bidRequests[0], `userId.criteoId`), 'criteo.com', null);
addUserId(eids, deepAccess(bidRequests[0], `userId.netId`), 'netid.de', null);
addUserId(eids, deepAccess(bidRequests[0], `userId.idl_env`), 'liveramp.com', null);
Expand Down
110 changes: 0 additions & 110 deletions modules/flocIdSystem.js

This file was deleted.

34 changes: 0 additions & 34 deletions modules/flocIdSystem.md

This file was deleted.

1 change: 0 additions & 1 deletion modules/goldbachBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ export const spec = {
if (bidRequests[0].userId) {
let eids = [];

addUserId(eids, deepAccess(bidRequests[0], `userId.flocId.id`), 'chrome.com', null);
addUserId(eids, deepAccess(bidRequests[0], `userId.criteoId`), 'criteo.com', null);
addUserId(eids, deepAccess(bidRequests[0], `userId.netId`), 'netid.de', null);
addUserId(eids, deepAccess(bidRequests[0], `userId.idl_env`), 'liveramp.com', null);
Expand Down
16 changes: 2 additions & 14 deletions modules/ixBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ const PROVIDERS = [
'connectid',
'tapadId',
'quantcastId',
'flocId',
'pubProvidedId'
];
const REQUIRED_VIDEO_PARAMS = ['mimes', 'minduration', 'maxduration']; // note: protocol/protocols is also reqd
Expand Down Expand Up @@ -449,11 +448,10 @@ function getBidRequest(id, impressions, validBidRequests) {
* From the userIdAsEids array, filter for the ones our adserver can use, and modify them
* for our purposes, e.g. add rtiPartner
* @param {array} allEids userIdAsEids passed in by prebid
* @param {object} flocId flocId passed in by prebid
* @return {object} contains toSend (eids to send to the adserver) and seenSources (used to filter
* identity info from IX Library)
*/
function getEidInfo(allEids, flocData) {
function getEidInfo(allEids) {
let toSend = [];
let seenSources = {};
if (isArray(allEids)) {
Expand All @@ -471,16 +469,6 @@ function getEidInfo(allEids, flocData) {
}
}

const isValidFlocId = flocData && flocData.id && flocData.version;
if (isValidFlocId) {
const flocEid = {
'source': 'chrome.com',
'uids': [{ 'id': flocData.id, 'ext': { 'rtiPartner': 'flocId', 'ver': flocData.version } }]
};
toSend.push(flocEid);
seenSources['chrome.com'] = true;
}

return { toSend, seenSources };
}

Expand All @@ -498,7 +486,7 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
// Always use secure HTTPS protocol.
let baseUrl = SECURE_BID_URL;
// Get ids from Prebid User ID Modules
let eidInfo = getEidInfo(deepAccess(validBidRequests, '0.userIdAsEids'), deepAccess(validBidRequests, '0.userId.flocId'));
let eidInfo = getEidInfo(deepAccess(validBidRequests, '0.userIdAsEids'));
let userEids = eidInfo.toSend;
const pageUrl = getPageUrl() || deepAccess(bidderRequest, 'refererInfo.referer');

Expand Down
1 change: 0 additions & 1 deletion modules/mediafuseBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ export const spec = {
if (bidRequests[0].userId) {
let eids = [];

addUserId(eids, deepAccess(bidRequests[0], `userId.flocId.id`), 'chrome.com', null);
addUserId(eids, deepAccess(bidRequests[0], `userId.criteoId`), 'criteo.com', null);
addUserId(eids, deepAccess(bidRequests[0], `userId.netId`), 'netid.de', null);
addUserId(eids, deepAccess(bidRequests[0], `userId.idl_env`), 'liveramp.com', null);
Expand Down
4 changes: 0 additions & 4 deletions modules/openxBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ export const USER_ID_CODE_TO_QUERY_ARG = {
tapadId: 'tapadid', // Tapad Id
tdid: 'ttduuid', // The Trade Desk Unified ID
uid2: 'uid2', // Unified ID 2.0
flocId: 'floc', // Chrome FLoC,
admixerId: 'admixerid', // AdMixer ID
deepintentId: 'deepintentid', // DeepIntent ID
dmdId: 'dmdid', // DMD Marketing Corp ID
Expand Down Expand Up @@ -350,9 +349,6 @@ function appendUserIdsToQueryParams(queryParams, userIds) {
case 'merkleId':
queryParams[key] = userIdObjectOrValue.id;
break;
case 'flocId':
queryParams[key] = userIdObjectOrValue.id;
break;
case 'uid2':
queryParams[key] = userIdObjectOrValue.id;
break;
Expand Down
1 change: 0 additions & 1 deletion modules/pixfutureBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ export const spec = {
if (validBidRequests[0].userId) {
let eids = [];

addUserId(eids, deepAccess(validBidRequests[0], `userId.flocId.id`), 'chrome.com', null);
addUserId(eids, deepAccess(validBidRequests[0], `userId.criteoId`), 'criteo.com', null);
addUserId(eids, deepAccess(validBidRequests[0], `userId.unifiedId`), 'thetradedesk.com', null);
addUserId(eids, deepAccess(validBidRequests[0], `userId.id5Id`), 'id5.io', null);
Expand Down
64 changes: 0 additions & 64 deletions modules/pubmaticBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,6 @@ const dealChannelValues = {
6: 'PMPG'
};

const FLOC_FORMAT = {
'EID': 1,
'SEGMENT': 2
}
// BB stands for Blue BillyWig
const BB_RENDERER = {
bootstrapPlayer: function(bid) {
Expand Down Expand Up @@ -800,67 +796,8 @@ function _addFloorFromFloorModule(impObj, bid) {
logInfo(LOG_WARN_PREFIX, 'new impObj.bidfloor value:', impObj.bidfloor);
}

function _getFlocId(validBidRequests, flocFormat) {
var flocIdObject = null;
var flocId = deepAccess(validBidRequests, '0.userId.flocId');
if (flocId && flocId.id) {
switch (flocFormat) {
case FLOC_FORMAT.SEGMENT:
flocIdObject = {
id: 'FLOC',
name: 'FLOC',
ext: {
ver: flocId.version
},
segment: [{
id: flocId.id,
name: 'chrome.com',
value: flocId.id.toString()
}]
}
break;
case FLOC_FORMAT.EID:
default:
flocIdObject = {
source: 'chrome.com',
uids: [
{
atype: 1,
id: flocId.id,
ext: {
ver: flocId.version
}
},
]
}
break;
}
}
return flocIdObject;
}

function _handleFlocId(payload, validBidRequests) {
var flocObject = _getFlocId(validBidRequests, FLOC_FORMAT.SEGMENT);
if (flocObject) {
if (!payload.user) {
payload.user = {};
}
if (!payload.user.data) {
payload.user.data = [];
}
payload.user.data.push(flocObject);
}
}

function _handleEids(payload, validBidRequests) {
let bidUserIdAsEids = deepAccess(validBidRequests, '0.userIdAsEids');
let flocObject = _getFlocId(validBidRequests, FLOC_FORMAT.EID);
if (flocObject) {
if (!bidUserIdAsEids) {
bidUserIdAsEids = [];
}
bidUserIdAsEids.push(flocObject);
}
if (isArray(bidUserIdAsEids) && bidUserIdAsEids.length > 0) {
deepSetValue(payload, 'user.eids', bidUserIdAsEids);
}
Expand Down Expand Up @@ -1206,7 +1143,6 @@ export const spec = {

_handleEids(payload, validBidRequests);

_handleFlocId(payload, validBidRequests);
// First Party Data
const commonFpd = config.getConfig('ortb2') || {};
if (commonFpd.site) {
Expand Down
10 changes: 0 additions & 10 deletions modules/sharethroughBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -245,16 +245,6 @@ function getBidRequestFloor(bid) {

function userIdAsEids(bidRequest) {
const eids = createEidsArray(deepAccess(bidRequest, 'userId')) || [];

const flocData = deepAccess(bidRequest, 'userId.flocId');
const isFlocIdValid = flocData && flocData.id && flocData.version;
if (isFlocIdValid) {
eids.push({
source: 'chrome.com',
uids: [{ id: flocData.id, atype: 1, ext: { ver: flocData.version } }],
});
}

return eids;
}

Expand Down
15 changes: 0 additions & 15 deletions modules/teadsBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ export const spec = {
data: bids,
deviceWidth: screen.width,
hb_version: '$prebid.version$',
...getFLoCParameters(deepAccess(validBidRequests, '0.userId.flocId')),
...getUnifiedId2Parameter(deepAccess(validBidRequests, '0.userId.uid2')),
...getFirstPartyTeadsIdParameter()
};
Expand Down Expand Up @@ -237,20 +236,6 @@ function _validateId(id) {
return (parseInt(id) > 0);
}

/**
* Get FLoC parameters to be sent in the bid request.
* @param `{id: string, version: string} | undefined` optionalFlocId FLoC user ID object available if "flocIdSystem" module is enabled.
* @returns `{} | {cohortId: string} | {cohortVersion: string} | {cohortId: string, cohortVersion: string}`
*/
function getFLoCParameters(optionalFlocId) {
if (!optionalFlocId) {
return {};
}
const cohortId = optionalFlocId.id ? { cohortId: optionalFlocId.id } : {};
const cohortVersion = optionalFlocId.version ? { cohortVersion: optionalFlocId.version } : {};
return { ...cohortId, ...cohortVersion };
}

/**
* Get unified ID v2 parameter to be sent in bid request.
* @param `{id: string} | undefined` optionalUid2 uid2 user ID object available if "uid2IdSystem" module is enabled.
Expand Down
Loading