From 86133120d56d45641cd2dc4b97927afcfb1c5738 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 11:51:18 -0400 Subject: [PATCH 01/32] Delete flocIdSystem.js --- modules/flocIdSystem.js | 110 ---------------------------------------- 1 file changed, 110 deletions(-) delete mode 100644 modules/flocIdSystem.js diff --git a/modules/flocIdSystem.js b/modules/flocIdSystem.js deleted file mode 100644 index 0cff7e86d73..00000000000 --- a/modules/flocIdSystem.js +++ /dev/null @@ -1,110 +0,0 @@ -/** - * This module adds flocId to the User ID module - * The {@link module:modules/userId} module is required - * @module modules/flocId - * @requires module:modules/userId - */ - -import { logInfo, logError } from '../src/utils.js'; -import {submodule} from '../src/hook.js' - -const MODULE_NAME = 'flocId'; - -/** - * Add meta tag to support enabling of floc origin trial - * @function - * @param {string} token - configured token for origin-trial - */ -function enableOriginTrial(token) { - const tokenElement = document.createElement('meta'); - tokenElement.httpEquiv = 'origin-trial'; - tokenElement.content = token; - document.head.appendChild(tokenElement); -} - -/** - * Get the interest cohort. - * @param successCallback - * @param errorCallback - */ -function getFlocData(successCallback, errorCallback) { - document.interestCohort() - .then((data) => { - successCallback(data); - }).catch((error) => { - errorCallback(error); - }); -} - -/** - * Encode the id - * @param value - * @returns {string|*} - */ -function encodeId(value) { - const result = {}; - if (value) { - result.flocId = value; - logInfo('Decoded value ' + JSON.stringify(result)); - return result; - } - return undefined; -} - -/** @type {Submodule} */ -export const flocIdSubmodule = { - /** - * used to link submodule with config - * @type {string} - */ - name: MODULE_NAME, - - /** - * decode the stored id value for passing to bid requests - * @function - * @param {string} value - * @returns {{flocId:{ id: string }} or undefined if value doesn't exists - */ - decode(value) { - return (value) ? encodeId(value) : undefined; - }, - /** - * If chrome and cohort enabled performs action to obtain id and return a value in the callback's response argument - * @function - * @param {SubmoduleConfig} [config] - * @returns {IdResponse|undefined} - */ - getId(config) { - // Block usage of storage of cohort ID - const checkStorage = (config && config.storage); - if (checkStorage) { - logError('User ID - flocId submodule storage should not defined'); - return; - } - // Validate feature is enabled - const isFlocEnabled = !!window.chrome && (!!window.chrome.webstore || !!window.chrome.runtime) && !!document.featurePolicy && !!document.featurePolicy.features() && document.featurePolicy.features().includes('interest-cohort'); - - if (isFlocEnabled) { - const configParams = (config && config.params) || {}; - if (configParams && (typeof configParams.token === 'string')) { - // Insert meta-tag with token from configuration - enableOriginTrial(configParams.token); - } - // Example expected output { "id": "14159", "version": "chrome.1.0" } - let returnCallback = (cb) => { - getFlocData((data) => { - returnCallback = () => { return data; } - logInfo('Cohort id: ' + JSON.stringify(data)); - cb(data); - }, (err) => { - logInfo(err); - cb(undefined); - }); - }; - - return {callback: returnCallback}; - } - } -}; - -submodule('userId', flocIdSubmodule); From 1468f3b80a9dcf07ce0370f831a9445c2b88b66d Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 11:51:40 -0400 Subject: [PATCH 02/32] Delete flocIdSystem.md --- modules/flocIdSystem.md | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 modules/flocIdSystem.md diff --git a/modules/flocIdSystem.md b/modules/flocIdSystem.md deleted file mode 100644 index 07184700a14..00000000000 --- a/modules/flocIdSystem.md +++ /dev/null @@ -1,34 +0,0 @@ -## FloC ID User ID Submodule - -### Building Prebid with Floc Id Support -Your Prebid build must include the modules for both **userId** and **flocIdSystem** submodule. Follow the build instructions for Prebid as -explained in the top level README.md file of the Prebid source tree. - -ex: $ gulp build --modules=userId,flocIdSystem - -### Prebid Params - -Individual params may be set for the FloC ID User ID Submodule. -``` -pbjs.setConfig({ - userSync: { - userIds: [{ - name: 'flocId', - params: { - token: "Registered token or default sharedid.org token" - } - }] - } -}); -``` - -### Parameter Descriptions for the `userSync` Configuration Section -The below parameters apply only to the FloC ID User ID Module integration. - -| Params under usersync.userIds[]| Scope | Type | Description | Example | -| --- | --- | --- | --- | --- | -| name | Required | String | ID value for the Floc ID module - `"flocId"` | `"flocId"` | -| params | Optional | Object | Details for flocId syncing. | | -| params.token | Optional | Object | Publisher registered token.To get new token, register https://developer.chrome.com/origintrials/#/trials/active for Federated Learning of Cohorts. Default sharedid.org token: token: "A3dHTSoNUMjjERBLlrvJSelNnwWUCwVQhZ5tNQ+sll7y+LkPPVZXtB77u2y7CweRIxiYaGwGXNlW1/dFp8VMEgIAAAB+eyJvcmlnaW4iOiJodHRwczovL3NoYXJlZGlkLm9yZzo0NDMiLCJmZWF0dXJlIjoiSW50ZXJlc3RDb2hvcnRBUEkiLCJleHBpcnkiOjE2MjYyMjA3OTksImlzU3ViZG9tYWluIjp0cnVlLCJpc1RoaXJkUGFydHkiOnRydWV9"| token: "A3dHTSoNUMjjERBLlrvJSelNnwWUCwVQhZ5tNQ+sll7y+LkPPVZXtB77u2y7CweRIxiYaGwGXNlW1/dFp8VMEgIAAAB+eyJvcmlnaW4iOiJodHRwczovL3NoYXJlZGlkLm9yZzo0NDMiLCJmZWF0dXJlIjoiSW50ZXJlc3RDb2hvcnRBUEkiLCJleHBpcnkiOjE2MjYyMjA3OTksImlzU3ViZG9tYWluIjp0cnVlLCJpc1RoaXJkUGFydHkiOnRydWV9" - | -| storage | Not Allowed | Object | Will ask browser for cohort everytime. Setting storage will fail id lookup || From 5fca93063761252bf6f2b7ef656c23fb7d193ed0 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:12:57 -0400 Subject: [PATCH 03/32] Update teadsBidAdapter.js --- modules/teadsBidAdapter.js | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/modules/teadsBidAdapter.js b/modules/teadsBidAdapter.js index a8902c896f6..ea94411b80f 100644 --- a/modules/teadsBidAdapter.js +++ b/modules/teadsBidAdapter.js @@ -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() }; @@ -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. From 1de2092694a7261e15db8e9c630da1210f6ab599 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:14:04 -0400 Subject: [PATCH 04/32] Update teadsBidAdapter_spec.js --- test/spec/modules/teadsBidAdapter_spec.js | 50 ----------------------- 1 file changed, 50 deletions(-) diff --git a/test/spec/modules/teadsBidAdapter_spec.js b/test/spec/modules/teadsBidAdapter_spec.js index 75ed7452b57..8ebe7b907f5 100644 --- a/test/spec/modules/teadsBidAdapter_spec.js +++ b/test/spec/modules/teadsBidAdapter_spec.js @@ -470,56 +470,6 @@ describe('teadsBidAdapter', () => { 'deviceWidth': 1680 }; - describe('FLoC ID', function () { - it('should not add cohortId and cohortVersion params to payload if FLoC ID system is not enabled', function () { - const bidRequest = { - ...baseBidRequest, - userId: {} // no "flocId" property -> assumption that the FLoC ID system is disabled - }; - - const request = spec.buildRequests([bidRequest], bidderResquestDefault); - const payload = JSON.parse(request.data); - - expect(payload).not.to.have.property('cohortId'); - expect(payload).not.to.have.property('cohortVersion'); - }); - - it('should add cohortId param to payload if FLoC ID system is enabled and ID available, but not version', function () { - const bidRequest = { - ...baseBidRequest, - userId: { - flocId: { - id: 'my-floc-id' - } - } - }; - - const request = spec.buildRequests([bidRequest], bidderResquestDefault); - const payload = JSON.parse(request.data); - - expect(payload.cohortId).to.equal('my-floc-id'); - expect(payload).not.to.have.property('cohortVersion'); - }); - - it('should add cohortId and cohortVersion params to payload if FLoC ID system is enabled', function () { - const bidRequest = { - ...baseBidRequest, - userId: { - flocId: { - id: 'my-floc-id', - version: 'chrome.1.1' - } - } - }; - - const request = spec.buildRequests([bidRequest], bidderResquestDefault); - const payload = JSON.parse(request.data); - - expect(payload.cohortId).to.equal('my-floc-id'); - expect(payload.cohortVersion).to.equal('chrome.1.1'); - }); - }); - describe('Unified ID v2', function () { it('should not add unifiedId2 param to payload if uid2 system is not enabled', function () { const bidRequest = { From 602dc54332209768abf46b249f1c946c477f581c Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:16:36 -0400 Subject: [PATCH 05/32] Update ixBidAdapter.js --- modules/ixBidAdapter.js | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js index 7cec6172ba4..8909a01b6d4 100644 --- a/modules/ixBidAdapter.js +++ b/modules/ixBidAdapter.js @@ -86,7 +86,6 @@ const PROVIDERS = [ 'connectid', 'tapadId', 'quantcastId', - 'flocId', 'pubProvidedId' ]; const REQUIRED_VIDEO_PARAMS = ['mimes', 'minduration', 'maxduration']; // note: protocol/protocols is also reqd @@ -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)) { @@ -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 }; } @@ -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'); From e13649d64156ab7963ae9e44ce7a520fdbf193db Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:18:50 -0400 Subject: [PATCH 06/32] Update ixBidAdapter_spec.js --- test/spec/modules/ixBidAdapter_spec.js | 86 +------------------------- 1 file changed, 1 insertion(+), 85 deletions(-) diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js index 0e1a854b67c..4de35986b42 100644 --- a/test/spec/modules/ixBidAdapter_spec.js +++ b/test/spec/modules/ixBidAdapter_spec.js @@ -519,23 +519,9 @@ describe('IndexexchangeAdapter', function () { ]; const DEFAULT_USERID_BID_DATA = { - lotamePanoramaId: 'bd738d136bdaa841117fe9b331bb4', - flocId: { id: '1234', version: 'chrome.1.2' } + lotamePanoramaId: 'bd738d136bdaa841117fe9b331bb4' }; - const DEFAULT_FLOC_USERID_PAYLOAD = [ - { - source: 'chrome.com', - uids: [{ - id: DEFAULT_USERID_BID_DATA.flocId.id, - ext: { - rtiPartner: 'flocId', - ver: DEFAULT_USERID_BID_DATA.flocId.version - } - }] - } - ]; - describe('inherited functions', function () { it('should exists and is a function', function () { const adapter = newBidder(spec); @@ -1000,76 +986,6 @@ describe('IndexexchangeAdapter', function () { expect(payload.user.eids).to.have.deep.members(DEFAULT_USERID_PAYLOAD); }); - it('IX adapter reads floc id from prebid userId and adds it to eids when there is not other eids', function () { - const cloneValidBid = utils.deepClone(DEFAULT_BANNER_VALID_BID); - cloneValidBid[0].userId = utils.deepClone(DEFAULT_USERID_BID_DATA); - const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0]; - const payload = JSON.parse(request.data.r); - - expect(payload.user.eids).to.have.lengthOf(1); - expect(payload.user.eids).to.deep.include(DEFAULT_FLOC_USERID_PAYLOAD[0]); - }); - - it('IX adapter reads floc id from prebid userId and appends it to eids', function () { - const cloneValidBid = utils.deepClone(DEFAULT_BANNER_VALID_BID); - cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA); - cloneValidBid[0].userId = utils.deepClone(DEFAULT_USERID_BID_DATA); - const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0]; - const payload = JSON.parse(request.data.r); - - expect(payload.user.eids).to.have.lengthOf(7); - expect(payload.user.eids).to.deep.include.members(DEFAULT_USERID_PAYLOAD); - expect(payload.user.eids).to.deep.include(DEFAULT_FLOC_USERID_PAYLOAD[0]); - }); - - it('IX adapter reads empty floc obj from prebid userId it, floc is not added to eids', function () { - const cloneValidBid = utils.deepClone(DEFAULT_BANNER_VALID_BID); - cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA); - cloneValidBid[0].userId = { 'flocId': {} } - const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0]; - const payload = JSON.parse(request.data.r); - - expect(payload.user.eids).to.have.lengthOf(6); - expect(payload.user.eids).to.deep.include.members(DEFAULT_USERID_PAYLOAD); - expect(payload.user.eids).should.not.include(DEFAULT_FLOC_USERID_PAYLOAD[0]); - }); - - it('IX adapter reads floc obj from prebid userId it version is missing, floc is not added to eids', function () { - const cloneValidBid = utils.deepClone(DEFAULT_BANNER_VALID_BID); - cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA); - cloneValidBid[0].userId = { 'flocId': { 'id': 'abcd' } } - const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0]; - const payload = JSON.parse(request.data.r); - - expect(payload.user.eids).to.have.lengthOf(6); - expect(payload.user.eids).to.deep.include.members(DEFAULT_USERID_PAYLOAD); - expect(payload.user.eids).should.not.include(DEFAULT_FLOC_USERID_PAYLOAD[0]); - }); - - it('IX adapter reads floc obj from prebid userId it ID is missing, floc is not added to eids', function () { - const cloneValidBid = utils.deepClone(DEFAULT_BANNER_VALID_BID); - cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA); - cloneValidBid[0].userId = { 'flocId': { 'version': 'chrome.a.b.c' } } - const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0]; - const payload = JSON.parse(request.data.r); - - expect(payload.user.eids).to.have.lengthOf(6); - expect(payload.user.eids).to.deep.include.members(DEFAULT_USERID_PAYLOAD); - expect(payload.user.eids).should.not.include(DEFAULT_FLOC_USERID_PAYLOAD[0]); - }); - - it('IX adapter reads floc id with empty id from prebid userId and it does not added to eids', function () { - const cloneValidBid = utils.deepClone(DEFAULT_BANNER_VALID_BID); - cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA); - cloneValidBid[0].userId = { flocID: { id: '', ver: 'chrome.1.2.3' } }; - const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0]; - const payload = JSON.parse(request.data.r); - - expect(payload.user.eids).to.have.lengthOf(6); - expect(payload.user.eids).to.deep.include.members(DEFAULT_USERID_PAYLOAD); - expect(payload.user.eids).should.not.include(DEFAULT_FLOC_USERID_PAYLOAD[0]); - }); - it('We continue to send in IXL identity info and Prebid takes precedence over IXL', function () { validIdentityResponse = { AdserverOrgIp: { From dc2934f49a34b1e23a5066745d98dfcf0716d182 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:24:29 -0400 Subject: [PATCH 07/32] Update pubmaticBidAdapter.js --- modules/pubmaticBidAdapter.js | 64 ----------------------------------- 1 file changed, 64 deletions(-) diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js index 0667ac0fc74..f90cf12c55b 100644 --- a/modules/pubmaticBidAdapter.js +++ b/modules/pubmaticBidAdapter.js @@ -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) { @@ -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); } @@ -1183,7 +1120,6 @@ export const spec = { _handleEids(payload, validBidRequests); _blockedIabCategoriesValidation(payload, blockedIabCategories); - _handleFlocId(payload, validBidRequests); // First Party Data const commonFpd = config.getConfig('ortb2') || {}; if (commonFpd.site) { From 831516372511f929f9ee359a904db0ae714cb3a2 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:27:13 -0400 Subject: [PATCH 08/32] Update pubmaticBidAdapter_spec.js --- test/spec/modules/pubmaticBidAdapter_spec.js | 62 -------------------- 1 file changed, 62 deletions(-) diff --git a/test/spec/modules/pubmaticBidAdapter_spec.js b/test/spec/modules/pubmaticBidAdapter_spec.js index 64e95460321..2651ca15685 100644 --- a/test/spec/modules/pubmaticBidAdapter_spec.js +++ b/test/spec/modules/pubmaticBidAdapter_spec.js @@ -2389,68 +2389,6 @@ describe('PubMatic adapter', function () { expect(data.user.eids).to.equal(undefined); }); }); - - describe('FlocId', function() { - it('send the FlocId if it is present', function() { - bidRequests[0].userId = {}; - bidRequests[0].userId.flocId = { - id: '1234', - version: 'chrome1.1' - } - let request = spec.buildRequests(bidRequests, {}); - let data = JSON.parse(request.data); - expect(data.user.eids).to.deep.equal([{ - 'source': 'chrome.com', - 'uids': [{ - 'id': '1234', - 'atype': 1, - 'ext': { - 'ver': 'chrome1.1' - } - }] - }]); - expect(data.user.data).to.deep.equal([{ - id: 'FLOC', - name: 'FLOC', - ext: { - ver: 'chrome1.1' - }, - segment: [{ - id: '1234', - name: 'chrome.com', - value: '1234' - }] - }]); - }); - - it('appnend the flocId if userIds are present', function() { - bidRequests[0].userId = {}; - bidRequests[0].userId.netId = 'netid-user-id'; - bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId); - bidRequests[0].userId.flocId = { - id: '1234', - version: 'chrome1.1' - } - let request = spec.buildRequests(bidRequests, {}); - let data = JSON.parse(request.data); - expect(data.user.eids).to.deep.equal([{ - 'source': 'netid.de', - 'uids': [{ - 'id': 'netid-user-id', - 'atype': 1 - }] - }, { - 'source': 'chrome.com', - 'uids': [{ - 'id': '1234', - 'atype': 1, - 'ext': { - 'ver': 'chrome1.1' - } - }] - }]); - }); - }); }); it('Request params check for video ad', function () { From 65734d6f64d8e5584f1de66eac1b345735576849 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:28:48 -0400 Subject: [PATCH 09/32] Update ucfunnelBidAdapter.js --- modules/ucfunnelBidAdapter.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/ucfunnelBidAdapter.js b/modules/ucfunnelBidAdapter.js index ec087d005d6..5c1b4680611 100644 --- a/modules/ucfunnelBidAdapter.js +++ b/modules/ucfunnelBidAdapter.js @@ -373,11 +373,6 @@ function addUserId(bidData, userId) { : ('verizonMediaId,' + userIdObjectOrValue); } break; - case 'flocId': - if (userIdObjectOrValue.id) { - bidData['cid'] = userIdObjectOrValue.id; - } - break; default: bidData[userIdProviderKey] = userIdObjectOrValue; break; From 0c2fd95f9714678fbc9615b0df6874c7624202dc Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:29:41 -0400 Subject: [PATCH 10/32] Update ucfunnelBidAdapter_spec.js --- test/spec/modules/ucfunnelBidAdapter_spec.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/spec/modules/ucfunnelBidAdapter_spec.js b/test/spec/modules/ucfunnelBidAdapter_spec.js index ac788e537e2..76e448b7694 100644 --- a/test/spec/modules/ucfunnelBidAdapter_spec.js +++ b/test/spec/modules/ucfunnelBidAdapter_spec.js @@ -17,7 +17,6 @@ const userId = { 'tdid': 'D6885E90-2A7A-4E0F-87CB-7734ED1B99A3', 'haloId': {}, 'uid2': {'id': 'eb33b0cb-8d35-4722-b9c0-1a31d4064888'}, - 'flocId': {'id': '12144', 'version': 'chrome.1.1'}, 'connectid': '4567' } @@ -160,7 +159,6 @@ describe('ucfunnel Adapter', function () { expect(data.w).to.equal(width); expect(data.h).to.equal(height); expect(data.eids).to.equal('uid2,eb33b0cb-8d35-4722-b9c0-1a31d4064888!verizonMediaId,4567'); - expect(data.cid).to.equal('12144'); expect(data.schain).to.equal('1.0,1!exchange1.com,1234,1,bid-request-1,publisher,publisher.com'); }); From 49c33e66a5f3a0130f8d12dc6827c173baea2851 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:32:47 -0400 Subject: [PATCH 11/32] Update userId_example.html --- integrationExamples/gpt/userId_example.html | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/integrationExamples/gpt/userId_example.html b/integrationExamples/gpt/userId_example.html index e11a0b626c9..e1da102f7f2 100644 --- a/integrationExamples/gpt/userId_example.html +++ b/integrationExamples/gpt/userId_example.html @@ -239,14 +239,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": { From a2554dd21515891658c70b5410b2876052437083 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:33:38 -0400 Subject: [PATCH 12/32] Update .submodules.json --- modules/.submodules.json | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/.submodules.json b/modules/.submodules.json index 85e4658cc61..b22007b5fe3 100644 --- a/modules/.submodules.json +++ b/modules/.submodules.json @@ -11,7 +11,6 @@ "deepintentDpesIdSystem", "dmdIdSystem", "fabrickIdSystem", - "flocIdSystem", "hadronIdSystem", "haloIdSystem", "id5IdSystem", From 2d48fbd8150757849e31264f67b7c112a5df1478 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:34:45 -0400 Subject: [PATCH 13/32] Update userId.md --- modules/userId/userId.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/userId/userId.md b/modules/userId/userId.md index ee49211e4cb..833e005174b 100644 --- a/modules/userId/userId.md +++ b/modules/userId/userId.md @@ -136,11 +136,6 @@ pbjs.setConfig({ name: '__adm__admixer', expires: 30 } - },{ - name: 'flocId', - params: { - token: "Registered token or default sharedid.org token" // Default sharedid.org token: "A3dHTSoNUMjjERBLlrvJSelNnwWUCwVQhZ5tNQ+sll7y+LkPPVZXtB77u2y7CweRIxiYaGwGXNlW1/dFp8VMEgIAAAB+eyJvcmlnaW4iOiJodHRwczovL3NoYXJlZGlkLm9yZzo0NDMiLCJmZWF0dXJlIjoiSW50ZXJlc3RDb2hvcnRBUEkiLCJleHBpcnkiOjE2MjYyMjA3OTksImlzU3ViZG9tYWluIjp0cnVlLCJpc1RoaXJkUGFydHkiOnRydWV9" - } },{ name: "kpuid", params:{ From c743b22fc43752aafba2993a0c64d899ed7a8cde Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:35:08 -0400 Subject: [PATCH 14/32] Update userId.md --- modules/userId/userId.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/userId/userId.md b/modules/userId/userId.md index 833e005174b..b8fb76f7356 100644 --- a/modules/userId/userId.md +++ b/modules/userId/userId.md @@ -273,11 +273,6 @@ pbjs.setConfig({ expires: 30 } },{ - name: 'flocId', - params: { - token: "Registered token or default sharedid.org token" // Default sharedid.org token: "A3dHTSoNUMjjERBLlrvJSelNnwWUCwVQhZ5tNQ+sll7y+LkPPVZXtB77u2y7CweRIxiYaGwGXNlW1/dFp8VMEgIAAAB+eyJvcmlnaW4iOiJodHRwczovL3NoYXJlZGlkLm9yZzo0NDMiLCJmZWF0dXJlIjoiSW50ZXJlc3RDb2hvcnRBUEkiLCJleHBpcnkiOjE2MjYyMjA3OTksImlzU3ViZG9tYWluIjp0cnVlLCJpc1RoaXJkUGFydHkiOnRydWV9" - } - },{ name: "deepintentId", storage: { type: "html5", From c2b2cd76b1d6e3f51bade6f08f06a6e12f1af6a6 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:38:02 -0400 Subject: [PATCH 15/32] Update userId_spec.js --- test/spec/modules/userId_spec.js | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js index 63107aa5107..420fd2ea185 100644 --- a/test/spec/modules/userId_spec.js +++ b/test/spec/modules/userId_spec.js @@ -45,7 +45,6 @@ import {getPrebidInternal} from 'src/utils.js'; import {uid2IdSubmodule} from 'modules/uid2IdSystem.js'; import {admixerIdSubmodule} from 'modules/admixerIdSystem.js'; import {deepintentDpesSubmodule} from 'modules/deepintentDpesIdSystem.js'; -import {flocIdSubmodule} from 'modules/flocIdSystem.js' import {amxIdSubmodule} from '../../../modules/amxIdSystem.js'; import {akamaiDAPIdSubmodule} from 'modules/akamaiDAPIdSystem.js' import {kinessoIdSubmodule} from 'modules/kinessoIdSystem.js' @@ -560,7 +559,7 @@ describe('User ID', function () { }); it('handles config with no usersync object', function () { - setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); + setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); init(config); config.setConfig({}); // usersync is undefined, and no logInfo message for 'User ID - usersync config updated' @@ -568,14 +567,14 @@ describe('User ID', function () { }); it('handles config with empty usersync object', function () { - setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); + setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); init(config); config.setConfig({userSync: {}}); expect(typeof utils.logInfo.args[0]).to.equal('undefined'); }); it('handles config with usersync and userIds that are empty objs', function () { - setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, nextrollIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); + setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, nextrollIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); init(config); config.setConfig({ userSync: { @@ -586,7 +585,7 @@ describe('User ID', function () { }); it('handles config with usersync and userIds with empty names or that dont match a submodule.name', function () { - setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, nextrollIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); + setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, nextrollIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); init(config); config.setConfig({ userSync: { @@ -603,7 +602,7 @@ describe('User ID', function () { }); it('config with 1 configurations should create 1 submodules', function () { - setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, nextrollIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); + setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, nextrollIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); init(config); config.setConfig(getConfigMock(['unifiedId', 'unifiedid', 'cookie'])); @@ -625,7 +624,7 @@ describe('User ID', function () { }); it('config with 24 configurations should result in 24 submodules add', function () { - setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, liveIntentIdSubmodule, britepoolIdSubmodule, netIdSubmodule, nextrollIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); + setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, liveIntentIdSubmodule, britepoolIdSubmodule, netIdSubmodule, nextrollIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); init(config); config.setConfig({ userSync: { @@ -677,8 +676,6 @@ describe('User ID', function () { }, { name: 'deepintentId', storage: {name: 'deepintentId', type: 'cookie'} - }, { - name: 'flocId' }, { name: 'akamaiDAPId' }, { @@ -700,7 +697,7 @@ describe('User ID', function () { }); it('config syncDelay updates module correctly', function () { - setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, nextrollIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); + setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, nextrollIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); init(config); config.setConfig({ @@ -716,7 +713,7 @@ describe('User ID', function () { }); it('config auctionDelay updates module correctly', function () { - setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, nextrollIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); + setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, nextrollIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); init(config); config.setConfig({ userSync: { @@ -731,7 +728,7 @@ describe('User ID', function () { }); it('config auctionDelay defaults to 0 if not a number', function () { - setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, nextrollIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); + setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, nextrollIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); init(config); config.setConfig({ userSync: { From 40078666d8a73fd0becfad495e019f233d3a017e Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:39:18 -0400 Subject: [PATCH 16/32] Update sharethroughBidAdapter.js --- modules/sharethroughBidAdapter.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/modules/sharethroughBidAdapter.js b/modules/sharethroughBidAdapter.js index 1dd95812e12..fe19a9c52fb 100644 --- a/modules/sharethroughBidAdapter.js +++ b/modules/sharethroughBidAdapter.js @@ -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; } From 7dccc2f02711eb269fef869c8d9c37bbc7f11609 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:39:57 -0400 Subject: [PATCH 17/32] Update sharethroughBidAdapter_spec.js --- test/spec/modules/sharethroughBidAdapter_spec.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test/spec/modules/sharethroughBidAdapter_spec.js b/test/spec/modules/sharethroughBidAdapter_spec.js index 39238cc877f..4e7919a2678 100644 --- a/test/spec/modules/sharethroughBidAdapter_spec.js +++ b/test/spec/modules/sharethroughBidAdapter_spec.js @@ -114,10 +114,6 @@ describe('sharethrough adapter spec', function () { sharedid: { id: 'fake-sharedid', }, - flocId: { - id: 'fake-flocid', - version: '42', - }, }, crumbs: { pubcid: 'fake-pubcid-in-crumbs-obj', @@ -222,7 +218,6 @@ describe('sharethrough adapter spec', function () { 'crwdcntrl.net': { id: 'fake-lotame' }, 'parrable.com': { id: 'fake-parrable' }, 'netid.de': { id: 'fake-netid' }, - 'chrome.com': { id: 'fake-flocid' }, }; expect(openRtbReq.user.ext.eids).to.be.an('array').that.have.length(Object.keys(expectedEids).length); for (const eid of openRtbReq.user.ext.eids) { From 85adb4fc705b5f79245b3689797fc503e9a50e43 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:40:59 -0400 Subject: [PATCH 18/32] Update pixfutureBidAdapter.js --- modules/pixfutureBidAdapter.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/pixfutureBidAdapter.js b/modules/pixfutureBidAdapter.js index 29552ec796d..aa2a12cc513 100644 --- a/modules/pixfutureBidAdapter.js +++ b/modules/pixfutureBidAdapter.js @@ -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); From 88aba6d706eb3baef4bdd27a5d1da732c861510e Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:41:29 -0400 Subject: [PATCH 19/32] Update winrBidAdapter.js --- modules/winrBidAdapter.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/winrBidAdapter.js b/modules/winrBidAdapter.js index 124aba57866..072f8320cfc 100644 --- a/modules/winrBidAdapter.js +++ b/modules/winrBidAdapter.js @@ -240,7 +240,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); From cb1ab35d71c8c82dc53cf577cee10f2000a8c98d Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:42:07 -0400 Subject: [PATCH 20/32] Update openxBidAdapter.js --- modules/openxBidAdapter.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/openxBidAdapter.js b/modules/openxBidAdapter.js index 85dcfbb3b47..31431bc273b 100644 --- a/modules/openxBidAdapter.js +++ b/modules/openxBidAdapter.js @@ -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 @@ -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; From 5e97e1a41d207b3730e93a96ab0c265f5e475105 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:42:39 -0400 Subject: [PATCH 21/32] Update openxBidAdapter_spec.js --- test/spec/modules/openxBidAdapter_spec.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/spec/modules/openxBidAdapter_spec.js b/test/spec/modules/openxBidAdapter_spec.js index 3bc53e30eb8..269f4bf9b90 100644 --- a/test/spec/modules/openxBidAdapter_spec.js +++ b/test/spec/modules/openxBidAdapter_spec.js @@ -1093,7 +1093,6 @@ describe('OpenxAdapter', function () { tapadId: '111-tapadid', tdid: '1111-tdid', uid2: {id: '1111-uid2'}, - flocId: {id: '12144', version: 'chrome.1.1'}, novatiq: {snowflake: '1111-novatiqid'}, admixerId: '1111-admixerid', deepintentId: '1111-deepintentid', @@ -1147,9 +1146,6 @@ describe('OpenxAdapter', function () { case 'merkleId': userIdValue = EXAMPLE_DATA_BY_ATTR.merkleId.id; break; - case 'flocId': - userIdValue = EXAMPLE_DATA_BY_ATTR.flocId.id; - break; case 'uid2': userIdValue = EXAMPLE_DATA_BY_ATTR.uid2.id; break; From e3704d5262a42bade88e039e7e6610fcaa91e04a Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:43:45 -0400 Subject: [PATCH 22/32] Update winrBidAdapter_spec.js --- test/spec/modules/winrBidAdapter_spec.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/test/spec/modules/winrBidAdapter_spec.js b/test/spec/modules/winrBidAdapter_spec.js index 03e441df727..445ccc9d19f 100644 --- a/test/spec/modules/winrBidAdapter_spec.js +++ b/test/spec/modules/winrBidAdapter_spec.js @@ -563,11 +563,7 @@ describe('WinrAdapter', function () { uid2: { id: 'sample-uid2-value' }, criteoId: 'sample-criteo-userid', netId: 'sample-netId-userid', - idl_env: 'sample-idl-userid', - flocId: { - id: 'sample-flocid-value', - version: 'chrome.1.0' - } + idl_env: 'sample-idl-userid' } }); @@ -584,11 +580,6 @@ describe('WinrAdapter', function () { id: 'sample-criteo-userid', }); - expect(payload.eids).to.deep.include({ - source: 'chrome.com', - id: 'sample-flocid-value' - }); - expect(payload.eids).to.deep.include({ source: 'netid.de', id: 'sample-netId-userid', From 8ff9172069b497efec8762fca023ebc1a701492e Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:44:51 -0400 Subject: [PATCH 23/32] Update goldbachBidAdapter.js --- modules/goldbachBidAdapter.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/goldbachBidAdapter.js b/modules/goldbachBidAdapter.js index 46ae3054188..7b6ae810b67 100644 --- a/modules/goldbachBidAdapter.js +++ b/modules/goldbachBidAdapter.js @@ -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); From 4ba0959de7784ae44179d1a5a3476a8776098ede Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:45:43 -0400 Subject: [PATCH 24/32] Update bridgewellBidAdapter_spec.js --- test/spec/modules/bridgewellBidAdapter_spec.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/spec/modules/bridgewellBidAdapter_spec.js b/test/spec/modules/bridgewellBidAdapter_spec.js index 8da82c71820..2c0db5d9dce 100644 --- a/test/spec/modules/bridgewellBidAdapter_spec.js +++ b/test/spec/modules/bridgewellBidAdapter_spec.js @@ -7,7 +7,6 @@ const userId = { 'pubcid': '074864cb-3705-430e-9ff7-48ccf3c21b94', 'sharedid': {'id': '01F61MX53D786DSB2WYD38ZVM7', 'third': '01F61MX53D786DSB2WYD38ZVM7'}, 'uid2': {'id': 'eb33b0cb-8d35-1234-b9c0-1a31d4064777'}, - 'flocId': {'id': '12345', 'version': 'chrome.1.1'}, } describe('bridgewellBidAdapter', function () { From 28a65bfeaaf358cc7d99a0200f8efdf4091ae33d Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:46:05 -0400 Subject: [PATCH 25/32] Update mediafuseBidAdapter.js --- modules/mediafuseBidAdapter.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/mediafuseBidAdapter.js b/modules/mediafuseBidAdapter.js index b77c965802e..f813fb2e131 100644 --- a/modules/mediafuseBidAdapter.js +++ b/modules/mediafuseBidAdapter.js @@ -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); From ed1cbf6a7fa45c13cdd31d2fc62811c6d5708a77 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:46:46 -0400 Subject: [PATCH 26/32] Update appnexusBidAdapter.js --- modules/appnexusBidAdapter.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js index 2758fc2d03a..f14eed81781 100644 --- a/modules/appnexusBidAdapter.js +++ b/modules/appnexusBidAdapter.js @@ -287,7 +287,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); From ff78313014300d91ad64ddf9edbd5c9653d7adb6 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:47:36 -0400 Subject: [PATCH 27/32] Update appnexusBidAdapter_spec.js --- test/spec/modules/appnexusBidAdapter_spec.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js index 11e92a1af2e..a4176f40eb6 100644 --- a/test/spec/modules/appnexusBidAdapter_spec.js +++ b/test/spec/modules/appnexusBidAdapter_spec.js @@ -940,10 +940,6 @@ describe('AppNexusAdapter', function () { criteoId: 'sample-criteo-userid', netId: 'sample-netId-userid', idl_env: 'sample-idl-userid', - flocId: { - id: 'sample-flocid-value', - version: 'chrome.1.0' - }, pubProvidedId: [{ source: 'puburl.com', uids: [{ @@ -975,11 +971,6 @@ describe('AppNexusAdapter', function () { id: 'sample-criteo-userid', }); - expect(payload.eids).to.deep.include({ - source: 'chrome.com', - id: 'sample-flocid-value' - }); - expect(payload.eids).to.deep.include({ source: 'netid.de', id: 'sample-netId-userid', From 57ecb9c3a868fba1f5ca157456128c7ccf05f6c0 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 12:51:44 -0400 Subject: [PATCH 28/32] Update userId_spec.js --- test/spec/modules/userId_spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js index 420fd2ea185..0ad61c711b2 100644 --- a/test/spec/modules/userId_spec.js +++ b/test/spec/modules/userId_spec.js @@ -623,7 +623,7 @@ describe('User ID', function () { expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 1 submodules'); }); - it('config with 24 configurations should result in 24 submodules add', function () { + it('config with 23 configurations should result in 23 submodules add', function () { setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, liveIntentIdSubmodule, britepoolIdSubmodule, netIdSubmodule, nextrollIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); init(config); config.setConfig({ @@ -693,7 +693,7 @@ describe('User ID', function () { }] } }); - expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 24 submodules'); + expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 23 submodules'); }); it('config syncDelay updates module correctly', function () { From 855ed4d15489561fc9a0da53479d3e61206b9fcc Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 13:15:49 -0400 Subject: [PATCH 29/32] Update goldbachBidAdapter_spec.js --- test/spec/modules/goldbachBidAdapter_spec.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/test/spec/modules/goldbachBidAdapter_spec.js b/test/spec/modules/goldbachBidAdapter_spec.js index 459cda7958f..b5e5c596d0c 100644 --- a/test/spec/modules/goldbachBidAdapter_spec.js +++ b/test/spec/modules/goldbachBidAdapter_spec.js @@ -919,11 +919,7 @@ describe('GoldbachXandrAdapter', function () { uid2: { id: 'sample-uid2-value' }, criteoId: 'sample-criteo-userid', netId: 'sample-netId-userid', - idl_env: 'sample-idl-userid', - flocId: { - id: 'sample-flocid-value', - version: 'chrome.1.0' - } + idl_env: 'sample-idl-userid' } }); @@ -940,11 +936,6 @@ describe('GoldbachXandrAdapter', function () { id: 'sample-criteo-userid', }); - expect(payload.eids).to.deep.include({ - source: 'chrome.com', - id: 'sample-flocid-value' - }); - expect(payload.eids).to.deep.include({ source: 'netid.de', id: 'sample-netId-userid', From 893fe56ef98c622c89ffefef7fa5482e32655ac1 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Mon, 28 Mar 2022 13:16:27 -0400 Subject: [PATCH 30/32] Update mediafuseBidAdapter_spec.js --- test/spec/modules/mediafuseBidAdapter_spec.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/test/spec/modules/mediafuseBidAdapter_spec.js b/test/spec/modules/mediafuseBidAdapter_spec.js index f4defa293e1..8c424cd5fc5 100644 --- a/test/spec/modules/mediafuseBidAdapter_spec.js +++ b/test/spec/modules/mediafuseBidAdapter_spec.js @@ -939,11 +939,7 @@ describe('MediaFuseAdapter', function () { uid2: { id: 'sample-uid2-value' }, criteoId: 'sample-criteo-userid', netId: 'sample-netId-userid', - idl_env: 'sample-idl-userid', - flocId: { - id: 'sample-flocid-value', - version: 'chrome.1.0' - } + idl_env: 'sample-idl-userid' } }); @@ -960,11 +956,6 @@ describe('MediaFuseAdapter', function () { id: 'sample-criteo-userid', }); - expect(payload.eids).to.deep.include({ - source: 'chrome.com', - id: 'sample-flocid-value' - }); - expect(payload.eids).to.deep.include({ source: 'netid.de', id: 'sample-netId-userid', From 4c066551b0a1bc95fcbaf54aa5e9f7de7c26b55e Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Thu, 7 Apr 2022 13:51:34 -0400 Subject: [PATCH 31/32] Update userId_spec.js --- test/spec/modules/userId_spec.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js index fbd76e946e6..bf33b2dcf6b 100644 --- a/test/spec/modules/userId_spec.js +++ b/test/spec/modules/userId_spec.js @@ -210,7 +210,7 @@ describe('User ID', function () { innerAdUnits2.forEach((unit) => { unit.bids.forEach((bid) => { - expect(bid).to.have.deep.nested.property('userId.pubcid'); + expect(bid).to.have.deep.nested.property('userId.pubowncid'); expect(bid.userId.pubcid).to.equal(pubcid2); expect(bid.userIdAsEids[0]).to.deep.equal({ source: 'pubcid.org', @@ -584,7 +584,6 @@ describe('User ID', function () { }); it('handles config with usersync and userIds with empty names or that dont match a submodule.name', function () { - setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); init(config); config.setConfig({ @@ -602,7 +601,6 @@ describe('User ID', function () { }); it('config with 1 configurations should create 1 submodules', function () { - setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); init(config); @@ -626,7 +624,6 @@ describe('User ID', function () { }); it('config with 22 configurations should result in 22 submodules add', function () { - setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, liveIntentIdSubmodule, britepoolIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); init(config); config.setConfig({ @@ -698,7 +695,6 @@ describe('User ID', function () { }); it('config syncDelay updates module correctly', function () { - setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); init(config); config.setConfig({ @@ -714,7 +710,6 @@ describe('User ID', function () { }); it('config auctionDelay updates module correctly', function () { - setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); init(config); config.setConfig({ @@ -730,7 +725,6 @@ describe('User ID', function () { }); it('config auctionDelay defaults to 0 if not a number', function () { - setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, akamaiDAPIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]); init(config); config.setConfig({ From 3a662df2fef3f85f0068a93b97a2f8ebbd452205 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Fri, 29 Apr 2022 14:16:51 -0400 Subject: [PATCH 32/32] Update userId_spec.js --- test/spec/modules/userId_spec.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js index 7c2ebcec1a9..f2c84ee253b 100644 --- a/test/spec/modules/userId_spec.js +++ b/test/spec/modules/userId_spec.js @@ -253,7 +253,6 @@ describe('User ID', function () { }); }); - init(config); setSubmoduleRegistry([sharedIdSystemSubmodule]);