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

Update from Upstream Master #2

Merged
merged 50 commits into from
Aug 28, 2020
Merged
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
7ede93b
PubMatic to support passing content object set in pbjs.setConfig (#5592)
pm-harshad-mane Aug 14, 2020
db02d8a
PubMatic: Support for Outstream Renderer (BlueBilyWig Renderer) (#5553)
pm-shashank-jain Aug 14, 2020
84e2361
AdButler Bid Adapter: Add Doceree as alias (#5598)
dharton Aug 17, 2020
952e0fb
Digitrust removal, broader identity support, floor-module support (#5…
rtuschkany Aug 17, 2020
7696428
Adds support for additional consent (#5600)
patmmccann Aug 17, 2020
97713dd
pass along providers (#5610)
robertrmartinez Aug 17, 2020
f983af2
Emx bid adapter: gdpr user sync update (#5611)
EMXDigital Aug 18, 2020
cc58b23
Yieldone Analytics Adapter: Fix empty events (#5617)
hbanalytics Aug 18, 2020
8646ba7
Add Bright Mountain Media Bid Adapter (#5593)
Aug 18, 2020
38e078e
Added IronSource bidder tests and adapter according to specs (#5568)
liranbaruch Aug 18, 2020
0e182b7
add provider when noData (#5621)
robertrmartinez Aug 18, 2020
6c61de8
Configure Adhese gvlid, filter out empty params to reduce the Adhese …
mefjush Aug 18, 2020
28a4c34
Update rubicon adapter for liveramp userid requirements change (#5620)
Aug 18, 2020
3b5a747
Add intentIq (#5624)
yuvalgg Aug 18, 2020
fb72d51
Adds advertiserDomains to kargo adapter (#5625)
patmmccann Aug 18, 2020
c0850e9
Adding alias (#5622)
itaynave Aug 18, 2020
b01fe09
oneVideo Adapter: User sync pixel updates (VIDEOPUB-17981) (#5583)
adam-browning Aug 18, 2020
e1100af
surround getFloor in try catch (#5628)
robertrmartinez Aug 19, 2020
23af840
Extending the Real Time Data Module (#5519)
omerDotan Aug 19, 2020
f0e4433
Update dfpAdServerVideo.js to allow for vast4 (#5608)
patmmccann Aug 20, 2020
ce00f4c
purposes in call for invibes (#5533)
invibes Aug 20, 2020
2c0ea15
Update rubicon adapter for sharedid userid support (#5627)
Aug 20, 2020
1a38f40
Allow hp:0 in supply chain nodes passed to Rubicon (#5629)
mgriego Aug 20, 2020
a1692da
Add a new bidder adapter :mediagoBidderAdapter (#5614)
SylviaF Aug 20, 2020
0d8d9bf
updated userid module to stop caching the entire consent object (#5641)
smenzer Aug 20, 2020
b4c6b47
New bidder & analytics adapter: Concert (attempt #2) (#5623)
jplhomer Aug 20, 2020
40e5c7d
rename simpleHash to cyrb53Hash to make it clearer which hash functio…
smenzer Aug 20, 2020
67d184a
DMX support for video instream and more user id support (#5618)
stevealliance Aug 20, 2020
494015f
JW Player Real Time Data Provider (#5537)
karimMourra Aug 20, 2020
1d1ffa3
Prebid 4.4.0 Release
robertrmartinez Aug 20, 2020
8513f13
Increment pre version
robertrmartinez Aug 20, 2020
32066aa
module rule documentation updates (#5619)
bretg Aug 22, 2020
29bd8de
Add sspBC adapter (#5531)
wojciech-bialy-wpm Aug 24, 2020
b26bfe3
[IdentityLinkIdSystem] - pass tcfv2 consent string to envelope api (#…
NemanjaRajkovic9 Aug 24, 2020
01f4b28
Fix bug and add tests to catch next time (#5656)
robertrmartinez Aug 24, 2020
7001a23
Update vidazooBidAdapter_spec.js (#5639)
patmmccann Aug 25, 2020
71ff934
Add smartxBidAdapter (#5275)
smartclip-adtech Aug 25, 2020
e2c4e69
Add GDPR parameters to yieldlab delivery adtag (#5658)
mirkorean Aug 26, 2020
eb1aea4
Change ironsource to be lower case all over code (#5649)
liranbaruch Aug 26, 2020
347be07
aniviewBidAdapter - update renderer config (#5636)
itaynave Aug 26, 2020
353d2c4
yuktamedia Analytics Adapter: added pageViewId, language & refererInf…
AbhijitBhosale72 Aug 26, 2020
d38b5d0
fixed running of single spec file (#5648)
monis0395 Aug 26, 2020
a234c87
RP Bid Adapter read user.id (#5666)
Aug 26, 2020
aaae81f
add bidResponse object to cpmAdjustment calculator (#5609)
robertrmartinez Aug 26, 2020
ae956be
RP Bid Adapter: Use EID data set from userId/eids.js (#5657)
Aug 27, 2020
4274342
Prebid 4.5.0 Release
mike-chowla Aug 27, 2020
3f0ae07
Increment pre version
mike-chowla Aug 27, 2020
2b05803
qcadapter - tcf2 remove germany specific logic (#5664)
SleimanJneidi Aug 28, 2020
3d4e25d
merkleId Identity submodule submission (#5577)
angelamerkelprebid Aug 28, 2020
2d3b3bd
Added schain support and usersync output to cpmstarBidAdapter (#5660)
JoshuaMGoldstein Aug 28, 2020
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
qcadapter - tcf2 remove germany specific logic (prebid#5664)
  • Loading branch information
SleimanJneidi authored Aug 28, 2020
commit 2b05803d191368ffe46d6771c18c121799890bf1
5 changes: 0 additions & 5 deletions modules/quantcastBidAdapter.js
Original file line number Diff line number Diff line change
@@ -85,11 +85,6 @@ function checkTCFv1(vendorData) {
}

function checkTCFv2(tcData) {
if (tcData.purposeOneTreatment && tcData.publisherCC === 'DE') {
// special purpose 1 treatment for Germany
return true;
}

let restrictions = tcData.publisher ? tcData.publisher.restrictions : {};
let qcRestriction = restrictions && restrictions[PURPOSE_DATA_COLLECT]
? restrictions[PURPOSE_DATA_COLLECT][QUANTCAST_VENDOR_ID]
20 changes: 0 additions & 20 deletions test/spec/modules/quantcastBidAdapter_spec.js
Original file line number Diff line number Diff line change
@@ -430,26 +430,6 @@ describe('Quantcast adapter', function () {
expect(requests).to.equal(undefined);
});

it('allows TCF v2 request from Germany for purpose 1', function () {
const bidderRequest = {
gdprConsent: {
gdprApplies: true,
consentString: 'consentString',
vendorData: {
publisherCC: 'DE',
purposeOneTreatment: true
},
apiVersion: 2
}
};

const requests = qcSpec.buildRequests([bidRequest], bidderRequest);
const parsed = JSON.parse(requests[0].data);

expect(parsed.gdprSignal).to.equal(1);
expect(parsed.gdprConsent).to.equal('consentString');
});

it('allows TCF v2 request when Quantcast has consent for purpose 1', function() {
const bidderRequest = {
gdprConsent: {