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

rebase #5

Merged
merged 57 commits into from
Apr 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
81fc1ce
PBJS Core: canBidderRegisterSync ignoring iframe sync disabled by def…
patmmccann Apr 7, 2021
987c082
Added automatic tzo and targetId to adserver request. (#6534)
mikael-lundin Apr 7, 2021
0ab0964
Tappx Bid Adapter: minor updates and universal id added (#6504)
prebidtappx Apr 7, 2021
56bb4ae
Impactify Bid Adapter: add new bid adapter (#6518)
thomasdseao Apr 7, 2021
ef14e4f
Prebid 4.34.0 Release
Apr 7, 2021
f0e3891
Increment pre version
Apr 7, 2021
ce63213
Prebid server adapter: add config for openx hosting (#6530)
deivydas Apr 8, 2021
3cf4702
Yieldmo adapter: add meta data to bids (#6550)
ym-atsymuk Apr 8, 2021
3eae68b
Smartx Bid Adapter: Add meta.advertiserDomains support (#6547)
Skylinar Apr 8, 2021
6af2f1e
Onevideo / Adap.tv Adapter: updated example configuration (#6546)
adam-browning Apr 8, 2021
f48f978
Mass Deal Rendering Module: support multiple custom configs for dealI…
cciocov Apr 9, 2021
c3f5f85
ZetaSsp Bid Adapter: add new bid adapter (#6432)
asurovenko-zeta Apr 9, 2021
60b9d57
Adnuntius Bid Adapter: Fix for bid too low. (#6557)
mikael-lundin Apr 9, 2021
2cc905e
ReadPeak Bid Adapter: fix api issues, add gdpr consent, & getfloor mo…
readpeaktuomo Apr 9, 2021
c34d853
BetweenBidAdatper: added sharedid support (#6531)
ignat-one Apr 9, 2021
1183ae1
adWMG Bid Adapter: update endpoints for cookie sync (#6544)
nyakove Apr 9, 2021
cda0a48
Yieldmo Bid Adapter: add support for the floors module (#6541)
ym-dlabuzov Apr 9, 2021
1003755
Sortable Bid Adapter: add eids support (#6565)
karentnarvaez Apr 10, 2021
421066f
Outbrain Bid Adapter: replacing Zemanta (#6558)
Apr 10, 2021
1107655
Sirdata Real-time Data Module: add new RTD module (#6515)
nouchy Apr 10, 2021
c19e855
Logicad Bid Adapter: add support for userid modules (#6529)
logicad Apr 12, 2021
80de594
ATS-identityLinkIdSystem - add use3P config property to control firin…
mamatic Apr 12, 2021
75f5bdf
Proxistore Bid Adapter: add support for tcf v2 consent (#6543)
vincentproxistore Apr 12, 2021
4b0ba6f
BlueBillyWig Bid Adapter: add renderer customization options (#6540)
K-JBoon Apr 12, 2021
5acc5d2
OpenX Bid Adapter: Set Deal ID for video requests (#6573)
kenan-gillet Apr 12, 2021
7b09115
33Across Bid Adapter: add support for User ID modules (#6554)
curlyblueeagle Apr 12, 2021
dc5a59c
pubGENIUS bid adapter: support floor module (#6555)
edmonl Apr 12, 2021
37de88e
Welect Bid Adapter: update url of API (#6570)
nduitz Apr 13, 2021
e397325
Bright Mountain Media Bid Adapter: change bidder code to bmtm; alias …
Apr 13, 2021
abb1ba4
Adtelligent Bid Adapter: add adUrl support & new alias (#6559)
GeneGenie Apr 13, 2021
9eff9d5
Bright Mountain Media Bid Adapter: Change Endpoint URL (#6576)
Apr 13, 2021
e0007c2
Outbrain Bid Adapter: only trigger nurl ajax call if nurl is present …
Apr 13, 2021
c83bc53
LiveWrapper Bid Adapter: add US privacy and Coppa support (#6569)
bjorn-lw Apr 13, 2021
41e050a
Rubicon Analytics: Handle PBS Sending Bid ID 0 (#6584)
robertrmartinez Apr 13, 2021
e256788
TrustX Bid Adapter: support new format request (#6556)
PWyrembak Apr 14, 2021
5fbef60
FeedAd Bid Adapter: add support for GDPR/TCF 2.0 & remove video suppo…
couchcrew-thomas Apr 14, 2021
1aeca20
Ats optional 3p endpoint - keep default behavior the same (#6586)
mamatic Apr 14, 2021
d51d6eb
use another uri for cookieless (#6572)
vincentproxistore Apr 14, 2021
6a6268a
Pbjs Core: add new API to return the highest unused bid for a given a…
woggle23 Apr 14, 2021
93ba601
Adpone Bid Adapter: remove usersync and pass gpdr via querystring (#6…
seergiioo6 Apr 14, 2021
fddb135
Yieldmo bid adapter: set outstream renderer. (#6566)
ym-abaranov Apr 14, 2021
42e36de
Richaudience Bid Adapter: add new config UserSync (#6523)
richaudience Apr 14, 2021
05d8773
Prebid 4.35.0 Release
smenzer Apr 14, 2021
a3790c2
Increment pre version
smenzer Apr 14, 2021
caead3c
Deepintent ID System: add new ID module (#6537)
sourabhg Apr 15, 2021
bea2261
Update spotxBidAdpter renderer url to ensure onLoad is always called.…
npeceniak Apr 15, 2021
d18c6a8
VIS.X: add onSetTargeting, onBidWon & onTimeout handlers (#6532)
mk0x9 Apr 15, 2021
6ff2cf7
Index Exchange Bid Adapter: resolve negative size bug (#6582)
umakajan Apr 15, 2021
170c82d
smartx Bid Adapter: Outstream render bugfix numeric elementId (#6588)
Skylinar Apr 15, 2021
de40982
Update cookie sync call (#6567)
MaxSmileWanted Apr 16, 2021
8745d46
Add videoCacheKey back to bid response when using spotx as cache serv…
npeceniak Apr 16, 2021
f65fe74
Nativo Bid Adapter: add new bid adapter (#6542)
jsfledd Apr 16, 2021
1b28481
Spotx Bid Adapter: Update endpoint to indicate request is from Prebid…
npeceniak Apr 16, 2021
dd64734
Sharethrough Bid Adapter: add support for COPPA (#6602)
Apr 16, 2021
ef00f9b
tappx Bid Adapter: add video instream support and update testing (#6580)
prebidtappx Apr 16, 2021
c1e3ee6
Halo RTD Module: FPD 2.0 Updates & add ID system tests (#6505)
Apr 19, 2021
dc710b1
Zemanta bid adapter: reinstate Outbrain as alias (#6617)
Apr 19, 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
26 changes: 13 additions & 13 deletions integrationExamples/gpt/gdpr_hello_world.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,37 +82,37 @@
<script>
var PREBID_TIMEOUT = 700;
var FAILSAFE_TIMEOUT = 2500;

var adUnits = [{
code: 'div-gpt-ad-1460505748561-0',
mediaTypes: {
banner: {
sizes: [[300, 250], [300,600]]
}
},

// Replace this object to test a new Adapter!
bids: [{
bidder: 'appnexus',
params: {
placementId: 13144370
}
}]

}];

var pbjs = pbjs || {};
pbjs.que = pbjs.que || [];

</script>

<script>
var googletag = googletag || {};
googletag.cmd = googletag.cmd || [];
googletag.cmd.push(function() {
googletag.pubads().disableInitialLoad();
});

pbjs.que.push(function() {
pbjs.addAdUnits(adUnits);
pbjs.setConfig({
Expand All @@ -130,7 +130,7 @@
timeout: PREBID_TIMEOUT
});
});

function sendAdserverRequest() {
if (pbjs.adserverRequestSent) return;
pbjs.adserverRequestSent = true;
Expand All @@ -141,23 +141,23 @@
});
});
}

setTimeout(function() {
sendAdserverRequest();
console.log('timeout in main pbjs fired');
}, FAILSAFE_TIMEOUT);
</script>

</script>
<script>
googletag.cmd.push(function () {
googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());

googletag.pubads().enableSingleRequest();
googletag.enableServices();
});
</script>
</head>

<body>
<h2>Prebid.js Test</h2>
<h5>Div-1</h5>
Expand Down
30 changes: 3 additions & 27 deletions integrationExamples/gpt/haloRtdProvider_example.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,27 +40,6 @@
googletag.pubads().disableInitialLoad();
});

var appnexusSegmentHandler = function(bid, segments) {
if (!bid.params) {
bid.params = {};
}
if (!bid.params.user) {
bid.params.user = {};
}

if (!Array.isArray(bid.params.user.segments)) {
bid.params.user.segments = [];
}

var appnexusSegments = [];
for (var i = 0; i < segments.length; i++) {
var segment = segments[i];
let appnexusSegment = {'id': segment.id, 'value': segment.value};
appnexusSegments.push(appnexusSegment);
}
bid.params.user.segments = bid.params.user.segments.concat(appnexusSegments);
};

pbjs.que.push(function() {
pbjs.setConfig({
debug: true,
Expand All @@ -71,9 +50,6 @@
name: "halo",
waitForIt: true,
params: {
mapSegments: {
appnexus: appnexusSegmentHandler // pass true to use the builtin handler. here, we will demo overriding the handler with a function
},
segmentCache: false,
requestParams: {
publisherId: 0
Expand All @@ -89,7 +65,7 @@
});

function sendAdserverRequest() {
document.getElementById('audigent_segments').innerHTML = JSON.stringify(adUnits[0].bids[0].params.user.segments);
document.getElementById('audigent_segments').innerHTML = window.localStorage.getItem('auHaloRtd');
document.getElementById('halo_id').innerHTML = testHaloId;

if (pbjs.adserverRequestSent) return;
Expand Down Expand Up @@ -130,7 +106,7 @@
</head>

<body>
<h2>Audigent Segments Prebid</h2>
<h2>Halo RTD Prebid</h2>

<div id='test-div'>
<script>
Expand All @@ -142,7 +118,7 @@ <h2>Audigent Segments Prebid</h2>
<div id='halo_id'>
</div>

Audigent Segments (Appnexus):
Halo Real-Time Data:
<div id='audigent_segments'>
</div>
</body>
Expand Down
4 changes: 2 additions & 2 deletions integrationExamples/gpt/idImportLibrary_example.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
}, {
name: 'identityLink',
params: {
pid: '14' // Set your real identityLink placement ID here
},
pid: '14', // Set your real identityLink placement ID here
// notUse3P: true // true/false - If you do not want to use 3P endpoint to retrieve envelope. If you do not set this property to true, 3p endpoint will be fired. By default this propertt is undefined and 3p request will be fired.},
storage: {
type: 'html5',
name: 'idl_env',
Expand Down
146 changes: 146 additions & 0 deletions integrationExamples/gpt/sirdataRtdProvider_example.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name=viewport content="width=device-width, initial-scale=1">
<script type="text/javascript" src="https://cache.consentframework.com/js/pa/1020/c/Y1Dhs/stub" charset="utf-8"></script>
<script type="text/javascript" async src="https://choices.consentframework.com/js/pa/1020/c/Y1Dhs/cmp" charset="utf-8"></script>
</head>
<body>

<script async src="https://pagead2.googlesyndication.com/tag/js/gpt.js"></script>
<script src="../../build/dev/prebid.js" async></script>

<script>
var pbjs = pbjs || {};
pbjs.que = pbjs.que || [];

pbjs.que.push(function() {
pbjs.setConfig({
debug: true,
realTimeData: {
auctionDelay: 1000,
dataProviders: [
{
name: "SirdataRTDModule",
waitForIt: true,
params: {
setGptKeyValues: true,
partnerId: 1,
key: 1,
}
}
]
},
consentManagement: {
usp: {
cmpApi: 'iab',
timeout: 100 // US Privacy timeout 100ms
},
gdpr: {
cmpApi: 'iab',
timeout: 8000,
defaultGdprScope: true,
rules: [{
purpose: "storage",
enforcePurpose: true,
enforceVendor: true,
vendorExceptions: ["appnexus"] //Can work without consent for cookies
},{
purpose: "basicAds",
enforcePurpose: true,
enforceVendor: true,
vendorExceptions: ["appnexus"]
}]
},
}
});
});

</script>
<script>
var div_1_sizes = [
[728, 90]
];

var PREBID_TIMEOUT = 3000;
var FAILSAFE_TIMEOUT = 5000;

var adUnits = [
{
code: '/19968336/header-bid-tag-0',
mediaTypes: {
banner: {
sizes: div_1_sizes
}
},
bids: [{
bidder: 'appnexus',
params: {
placementId: 13144370
}
}]
}
];

// ======== DO NOT EDIT BELOW THIS LINE =========== //
var googletag = googletag || {};
googletag.cmd = googletag.cmd || [];
googletag.cmd.push(function() {
googletag.pubads().disableInitialLoad();
});

var pbjs = pbjs || {};
pbjs.que = pbjs.que || [];

pbjs.que.push(function() {
pbjs.addAdUnits(adUnits);
pbjs.requestBids({
bidsBackHandler: initAdserver,
timeout: PREBID_TIMEOUT
});
});

function initAdserver() {
if (pbjs.initAdserverSet) return;
pbjs.initAdserverSet = true;
googletag.cmd.push(function() {
pbjs.que.push(function() {
pbjs.setTargetingForGPTAsync();
googletag.pubads().refresh();
});
});
}


// in case PBJS doesn't load
setTimeout(function() {
initAdserver();
}, FAILSAFE_TIMEOUT);

googletag.cmd.push(function() {
googletag.defineSlot('/19968336/header-bid-tag-0', div_1_sizes, 'div-1').addService(googletag.pubads());
googletag.pubads().enableSingleRequest();
googletag.enableServices();
});

</script>

<article>
<p>
Give consent or make a choice in Europe. Module will add key/value pairs in ad calls. Check out for sd_rtd key in Google Ad call (https://securepubads.g.doubleclick.net/gampad/ads...) and in the payload sent to Xandr to endpoint https://ib.adnxs.com/ut/v3/prebid : tags[0].keywords.key[sd_rtd] should have an array of string as value. This array will mix user segments and/or page categories based on user's choices.
</p>
</article>
<h2>Basic Prebid.js Example</h2>
<h5>Div-1</h5>
<div id='div-1'>
<script type='text/javascript'>
googletag.cmd.push(function() {
googletag.display('div-1');
});

</script>
</div>

</body>
</html>
3 changes: 2 additions & 1 deletion integrationExamples/gpt/userId_example.html
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@
}, {
name: 'identityLink',
params: {
pid: '14' // Set your real identityLink placement ID here
pid: '14', // Set your real identityLink placement ID here
// notUse3P: true // true/false - If you do not want to use 3P endpoint to retrieve envelope. If you do not set this property to true, 3p endpoint will be fired. By default this property is undefined and 3p request will be fired.
},
storage: {
type: 'cookie',
Expand Down
24 changes: 23 additions & 1 deletion integrationExamples/mass/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,30 @@
pbjs.setConfig({
mass: {
enabled: true,

// official MASS-supported config:
dealIdPattern: /^MASS/i,
renderUrl: 'https://cdn.massplatform.net/bootloader.js',
dealIdPattern: /^MASS/i

// custom configs:
custom: [
// simple:
{
dealIdPattern: /^abc/i,
renderUrl: 'https://my.domain.com/script.js'
},

// flexible:
{
match: function(bid) {
// return true or false, based on given bid
},

render: function(payload) {
// render the ad
}
}
]
}
});
});
Expand Down
4 changes: 3 additions & 1 deletion modules/.submodules.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"zeotapIdPlusIdSystem",
"haloIdSystem",
"quantcastIdSystem",
"deepintentDpesIdSystem",
"nextrollIdSystem",
"idxIdSystem",
"fabrickIdSystem",
Expand All @@ -36,6 +37,7 @@
"haloRtdProvider",
"jwplayerRtdProvider",
"reconciliationRtdProvider",
"geoedgeRtdProvider"
"geoedgeRtdProvider",
"sirdataRtdProvider"
]
}
Loading