Skip to content

Commit

Permalink
Merge branch 'prebid:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
sebrobert authored Jul 20, 2021
2 parents 886e6bc + 2a899c6 commit 2282f46
Show file tree
Hide file tree
Showing 158 changed files with 18,485 additions and 1,566 deletions.
5 changes: 3 additions & 2 deletions integrationExamples/gpt/akamaidap_email_example.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@
apiHostname: 'prebid.dap.akadns.net',
domain: 'prebid.org',
type: 'email',
identity: 'aaryn@query.com'
}
identity: 'aaryn@query.com',
apiVersion: 'v1'
},
},
],
syncDelay: 5000,
Expand Down
5 changes: 3 additions & 2 deletions integrationExamples/gpt/akamaidap_signature_example.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,9 @@
params: {
apiHostname: 'prebid.dap.akadns.net',
domain: 'prebid.org',
type: 'dap-signature:1.0.0'
}
type: 'dap-signature:1.0.0',
apiVersion: 'v1'
},
},
],
syncDelay: 5000,
Expand Down
119 changes: 119 additions & 0 deletions integrationExamples/gpt/akamaidap_x1_example.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@

<!--
This page calls a single bidder for a single ad slot. It can be considered a "hello world" example for using
Prebid with the Google Publisher Tag.
It also makes a good test page for new adapter PR submissions. Simply set your server's Bid Params object in the
bids array inside the adUnits, and it will use your adapter to load an ad.
NOTE that many ad servers won't send back an ad if the URL is localhost... so you might need to
set an alias in your /etc/hosts file so that you can load this page from a different domain.
-->

<html>
<head>
<script async src="../../build/dev/prebid.js"></script>
<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
<script>
var FAILSAFE_TIMEOUT = 3300;
var PREBID_TIMEOUT = 2000;

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: 'grid',
params: {
uid: 1
}
}]

}];

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.setConfig({

debugging: {
enabled: true
},

userSync: {
userIds: [
{
name: 'akamaiDAPId',
params: {
apiHostname: 'prebid.dap.akadns.net',
domain: 'prebid.org',
type: 'email',
identity: 'aaryn@query.com',
apiVersion: 'x1',
attributes: '{ "cohorts": [ "3:14400", "5:14400", "7:0" ],"first_name": "Ace","last_name": "McCool" }'
},
},
],
syncDelay: 5000,
auctionDelay: 2000,
segments: [ 1, 2, 3 ],
}
});
pbjs.addAdUnits(adUnits);
pbjs.requestBids({
bidsBackHandler: sendAdserverRequest,
timeout: PREBID_TIMEOUT
});
document.getElementById( "user-ids" ).innerHTML = JSON.stringify( pbjs.getUserIds() );
});

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

setTimeout(function() {
sendAdserverRequest();
}, FAILSAFE_TIMEOUT);

</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>
<div id='div-gpt-ad-1460505748561-0'>
<script type='text/javascript'>
googletag.cmd.push(function() { googletag.display('div-gpt-ad-1460505748561-0'); });
</script>
</div>
<h5>User IDs Sent to Bidding Adapter</h5>
<div id="user-ids"></div>
</body>
</html>
116 changes: 116 additions & 0 deletions integrationExamples/gpt/revcontent_example_banner.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Prebid.js Banner Example</title>
<!-- Prebid.js -->
<!-- <script async src="prebid.js"></script> -->
<!-- <script async src="../../build/dist/prebid.js"></script> -->
<script async src="../../build/dev/prebid.js"></script>
<!-- Google Publisher Tag -->
<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
<script>
var pbjs = pbjs || {};
pbjs.que = pbjs.que || [];
const customConfigObject = {
"buckets": [{
"max": 40,
"increment": 0.5
}]
};
// Prebid Banner Ad Unit
const adUnits = [{
code: '/21623266709/prebid-test',
mediaTypes: {
banner: {
sizes: [[300, 250]],
}
},
bids: [{
bidder: 'revcontent',
params: {
// Your user-id and api-key
apiKey: 'abababababababababababababababababababab',
userId: 111111,
domain: 'www.denverpost.com',
endpoint: 'trends.revcontent.com',
bidfloor: 0.05,
}
}]
},{
code: '/21623266709/prebid-test-2',
mediaTypes: {
banner: {
sizes: [[300, 250]],
}
},
bids: [{
bidder: 'revcontent',
params: {
// Your user-id and api-key
apiKey: 'abababababababababababababababababababab',
userId: 111111,
domain: 'www.denverpost.com',
endpoint: 'trends.revcontent.com',
bidfloor: 0.05,
}
}]
}
];
</script>
<script>
var googletag = googletag || {};
googletag.cmd = googletag.cmd || [];
googletag.cmd.push(function () {
googletag.pubads().disableInitialLoad();
});
pbjs.que.push(function () {
pbjs.setConfig({
enableSendAllBids: false,
priceGranularity: customConfigObject
});
pbjs.addAdUnits(adUnits);
pbjs.requestBids({ bidsBackHandler: sendAdServerRequest });
});
function sendAdServerRequest() {
googletag.cmd.push(function () {
pbjs.que.push(function () {
pbjs.setTargetingForGPTAsync('/21623266709/prebid-test');
pbjs.setTargetingForGPTAsync('/21623266709/prebid-test-2');
googletag.pubads().refresh();
});
});
}
</script>
<script>
googletag.cmd.push(function () {
googletag
.defineSlot('/21623266709/prebid-test', [[300, 250]], 'div-0')
.addService(googletag.pubads());
googletag
.defineSlot('/21623266709/prebid-test-2', [[300, 250]], 'div-1')
.addService(googletag.pubads());
googletag.pubads().enableSingleRequest();
googletag.enableServices();
});
</script>
</head>
<body>
<h2>Prebid.js Banner Example</h2>
<div id='div-0'>
<script>
googletag.cmd.push(function () {
googletag.display('div-0');
});
</script>
</div>
<br>
<div id='div-1'>
<script>
googletag.cmd.push(function () {
googletag.display('div-1');
});
</script>
</div>
<div id="targeting-keys"></div>
</body>
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<html>

<head>
<link rel="icon" type="image/png" href="/favicon.png">
<script async src="//www.googletagservices.com/tag/js/gpt.js"></script>
<title>Prebid.js Native Example</title>

<script async src="../../build/dev/prebid.js"></script>
<script async src="//www.googletagservices.com/tag/js/gpt.js"></script>
<script>
/*
Supported sizes:
Expand Down Expand Up @@ -42,8 +42,9 @@
bidder: 'revcontent',
params: {
size: size,
apiKey: '8a33fa9cf220ae685dcc3544f847cdda858d3b1c',
userId: 673,
// Your user-id and api-key
apiKey: 'abababababababababababababababababababab',
userId: 111111,
domain: 'test.com',
endpoint: 'trends.revcontent.com'
}
Expand Down Expand Up @@ -94,14 +95,13 @@
</head>

<body>
<h2>Basic Prebid.js Example</h2>
<h2>Prebid.js Native 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>
Expand Down
4 changes: 2 additions & 2 deletions modules/adagioBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,8 @@ function _parseNativeBidResponse(bid) {
if (bid.admNative.link.url) {
native.clickUrl = bid.admNative.link.url;
}
if (Array.isArray(bid.admNative.link.clickTrackers)) {
native.clickTrackers = bid.admNative.link.clickTrackers
if (Array.isArray(bid.admNative.link.clicktrackers)) {
native.clickTrackers = bid.admNative.link.clicktrackers
}
}

Expand Down
Loading

0 comments on commit 2282f46

Please sign in to comment.