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.

Sign up for GitHub

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

Jump to bottom

Pubcommon id and shared id submodules: merge into one submodule #6808

Merged
merged 10 commits into from
Jun 7, 2021
Merged

Pubcommon id and shared id submodules: merge into one submodule #6808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2ee857b
merge pubcid and sharedid
May 21, 2021
9e1bfee
resolve conflicts
May 24, 2021
e30ad8a
remove useless comments
May 25, 2021
62d6193
rename/remove useless
May 25, 2021
7bef850
return coppa
May 25, 2021
ec41a92
fix circleci
May 25, 2021
6d4096d
rename + fix missed files
May 26, 2021
3b63dd2
Merge branch 'prebid-5.0' of https://github.com/prebid/Prebid.js into…
Jun 3, 2021
8ca32a1
revert sharedIdtest removal,merging reworked
Jun 3, 2021
0c7e5f6
pull + resolve conflicts
Jun 7, 2021
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
12 changes: 1 addition & 11 deletions integrationExamples/gpt/idImportLibrary_example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,7 @@
expires: 30
}
},
{
name: "sharedId",
params: {
syncTime: 60 // in seconds, default is 24 hours
},
storage: {
type: "html5",
name: "sharedid",
expires: 28
}
} , {
{
name: "liveIntentId",
params: {
publisherId: "9896876"
Expand Down
14 changes: 1 addition & 13 deletions integrationExamples/gpt/userId_example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"131": true, // id5Id
"929": true, // parrableId
"97": true, // identityLink
"887": true, // sharedId, uid2
"887": true, // uid2
"95": true, // lotamePanoramaId
"301": true, // zeotapIdPlus
"91": true, // criteo
Expand Down Expand Up @@ -195,18 +195,6 @@
"expires": 30
}
},
{
"name": "sharedId",
// bidders: ["rubicon", "sampleBidders"], // to allow this ID for specific bidders
"params": {
"syncTime": 60 // in seconds, default is 24 hours
},
"storage": {
"type": "cookie",
"name": "sharedid",
"expires": 28
}
},
{
"name": "lotamePanoramaId"
},
Expand Down
13 changes: 1 addition & 12 deletions modules/betweenBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {registerBidder} from '../src/adapters/bidderFactory.js';
import { getAdUnitSizes, parseSizesInput, deepAccess } from '../src/utils.js';
import { getAdUnitSizes, parseSizesInput } from '../src/utils.js';
import { getRefererInfo } from '../src/refererDetection.js';

const BIDDER_CODE = 'between';
Expand Down Expand Up @@ -37,8 +37,6 @@ export const spec = {
tz: getTz(),
fl: getFl(),
rr: getRr(),
shid: getSharedId(i)('id'),
shid3: getSharedId(i)('third'),
s: i.params.s,
bidid: i.bidId,
transactionid: i.transactionId,
Expand Down Expand Up @@ -149,15 +147,6 @@ export const spec = {
}
}

function getSharedId(bid) {
const id = deepAccess(bid, 'userId.sharedid.id');
const third = deepAccess(bid, 'userId.sharedid.third');
return function(kind) {
if (kind === 'id') return id || '';
return third || '';
}
}

function getRr() {
try {
var td = top.document;
Expand Down
1 change: 0 additions & 1 deletion modules/districtmDMXBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ export const spec = {
bindUserId(eids, utils.deepAccess(bidRequest[0], `userId.lotamePanoramaId`), 'lotame.com', 1);
bindUserId(eids, utils.deepAccess(bidRequest[0], `userId.parrableId`), 'parrable.com', 1);
bindUserId(eids, utils.deepAccess(bidRequest[0], `userId.netId`), 'netid.de', 1);
bindUserId(eids, utils.deepAccess(bidRequest[0], `userId.sharedid`), 'sharedid.org', 1);
dmxRequest.user = dmxRequest.user || {};
dmxRequest.user.ext = dmxRequest.user.ext || {};
dmxRequest.user.ext.eids = eids;
Expand Down
1 change: 0 additions & 1 deletion modules/ixBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ const PROVIDERS = [
'merkleId',
'parrableId',
'connectid',
'sharedid',
'tapadId',
'quantcastId',
'pubcid',
Expand Down
1 change: 0 additions & 1 deletion modules/openxBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export const USER_ID_CODE_TO_QUERY_ARG = {
parrableId: 'parrableid', // Parrable ID
pubcid: 'pubcid', // PubCommon ID
quantcastId: 'quantcastid', // Quantcast ID
sharedId: 'sharedid', // Shared ID User ID
tapadId: 'tapadid', // Tapad Id
tdid: 'ttduuid', // The Trade Desk Unified ID
verizonMediaId: 'verizonmediaid', // Verizon Media ConnectID
Expand Down
2 changes: 1 addition & 1 deletion modules/ozoneBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ export const spec = {
var ret = {};
// @todo - what is fabrick called & where to look for it? If it's a simple value then it will automatically be ok
let searchKeysSingle = ['pubcid', 'tdid', 'id5id', 'parrableId', 'idl_env', 'criteoId', 'criteortus',
'sharedid', 'lotamePanoramaId', 'fabrickId'];
'lotamePanoramaId', 'fabrickId'];
if (bidRequest.hasOwnProperty('userId')) {
for (let arrayId in searchKeysSingle) {
let key = searchKeysSingle[arrayId];
Expand Down
Loading