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

Revert "9.0 upstream" #11736

Merged
merged 1 commit into from
Jun 7, 2024
Merged

Revert "9.0 upstream" #11736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions allowedModules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

module.exports = {
'modules': [
'criteo-direct-rsa-validate',
'crypto-js',
'live-connect' // Maintained by LiveIntent : https://github.com/liveintent-berlin/live-connect/
],
Expand Down
2 changes: 1 addition & 1 deletion integrationExamples/gpt/paapi_example.html → integrationExamples/gpt/fledge_example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!--
FLEDGE (Protected Audience API) configuration with GPT and FLEDGE-supporting adapter

gulp serve --modules=paapiForGpt,openxBidAdapter
gulp serve --modules=fledgeForGpt,openxBidAdapter
-->
<script async src="../../build/dev/prebid.js"></script>
<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
Expand Down
13 changes: 10 additions & 3 deletions ...mples/gpt/prebidServer_paapi_example.html → ...ples/gpt/prebidServer_fledge_example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!--
FLEDGE (Protected Audience API) configuration with GPT and Prebid-Server

gulp serve --modules=paapiForGpt,prebidServerBidAdapter
gulp serve --modules=fledgeForGpt,prebidServerBidAdapter
-->
<script async src="../../build/dev/prebid.js"></script>
<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
Expand Down Expand Up @@ -44,8 +44,8 @@

pbjs.que.push(function() {
pbjs.setConfig({
paapi: {
enabled: true,
fledgeForGpt: {
enabled: true
},
s2sConfig: [{
accountId : '1',
Expand All @@ -57,6 +57,13 @@
}]
});

pbjs.setBidderConfig({
bidders: ['openx'],
config: {
fledgeEnabled: true
}
});

pbjs.addAdUnits(adUnits);

pbjs.requestBids({
Expand Down
0 ...s/top-level-paapi/shared/decisionLogic.js → ...ples/gpt/top-level-paapi/decisionLogic.js
View file
Open in desktop
File renamed without changes.
188 changes: 188 additions & 0 deletions integrationExamples/gpt/top-level-paapi/tl_paapi_example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
<html>
<head>
<script async src="../../../../build/dev/prebid.js"></script>
<script>
// intercept navigator.runAdAuction and print parameters to console
(() => {
var originalRunAdAuction = navigator.runAdAuction;
navigator.runAdAuction = function (...args) {
console.log('%c runAdAuction', 'background: cyan; border: 2px; border-radius: 3px', ...args);
return originalRunAdAuction.apply(navigator, args);
};
})();
</script>

<script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js"></script>

<script>
var FAILSAFE_TIMEOUT = 3300;
var PREBID_TIMEOUT = 3000;
var adUnits = [{
code: 'div-1',
mediaTypes: {
banner: {
sizes: [[300, 250]],
}
},
ortb2Imp: {
ext: {
ae: 1
}
},
bids: [
{
bidder: 'openx',
params: {
unit: '538703464',
response_template_name: 'test_banner_ad',
test: true,
delDomain: 'sademo-d.openx.net'
}
},

],
}
]
;

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

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

pbjs.que.push(function () {
pbjs.setConfig({
debug: true,
paapi: {
enabled: true,
gpt: {
autoconfig: false
}
},
debugging: {
enabled: true,
intercept: [
{
when: {
bidder: 'openx',
},
then: {
cpm: 0.1
},
paapi() {
return [
{
'seller': 'https://privacysandbox.openx.net',
'decisionLogicURL': 'https://privacysandbox.openx.net/fledge/decision-logic-component.js',
'sellerSignals': {
'floor': 0.01,
'currency': 'USD',
'auctionTimestamp': new Date().getTime(),
'publisherId': '537143056',
'adUnitId': '538703464'
},
'interestGroupBuyers': [
'https://privacysandbox.openx.net'
],
'perBuyerSignals': {
'https://privacysandbox.openx.net': {
'bid': 1.5
}
},
'sellerCurrency': 'USD'
}
];
}
}
]
},
});

pbjs.addAdUnits(adUnits);
pbjs.requestBids({
bidsBackHandler: sendAdserverRequest,
timeout: PREBID_TIMEOUT
});
});

function raa() {
return Promise.all(
Object.entries(pbjs.getPAAPIConfig())
.map(([adUnitCode, auctionConfig]) => {
return navigator.runAdAuction({
seller: window.location.origin,
decisionLogicURL: new URL('decisionLogic.js', window.location).toString(),
resolveToConfig: false,
...auctionConfig
}).then(urn => {
if (urn) {
// if we have a paapi winner, replace the adunit div
// with an iframe that renders it
const iframe = document.createElement('iframe');
Object.assign(iframe, {
src: urn,
frameBorder: 0,
scrolling: 'no',
}, auctionConfig.requestedSize);
const div = document.getElementById(adUnitCode);
div.parentElement.insertBefore(iframe, div);
div.remove();
return true;
}
});
})
).then(won => won.every(el => el));
}

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

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

googletag.cmd.push(function () {
googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-1').addService(googletag.pubads());

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

<body>
<h2>Standalone PAAPI Prebid.js Example</h2>
<p>Start local server with:</p>
<code>gulp serve-fast --https</code>
<p>Chrome flags:</p>
<code>--enable-features=CookieDeprecationFacilitatedTesting:label/treatment_1.2/force_eligible/true
--privacy-sandbox-enrollment-overrides=https://localhost:9999</code>
<p>Join interest group at <a href="https://privacysandbox.openx.net/fledge/advertiser">https://privacysandbox.openx.net/fledge/advertiser</a>
</p>
<h5>Div-1</h5>
<div id='div-1' style='min-width: 300px; min-height: 250px;'>
<script type='text/javascript'>
googletag.cmd.push(function () {
googletag.display('div-1');
});
</script>
</div>

</body>
</html>
6 changes: 1 addition & 5 deletions integrationExamples/realTimeData/jwplayerRtdProvider_example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,7 @@
waitForIt: true,
params: {
// Note: the following media Ids are placeholders and should be replaced with your Ids.
mediaIDs: ['abc', 'def', 'ghi', 'jkl'],
overrideContentId: 'always',
overrideContentUrl: 'always',
overrideContentTitle: 'always',
overrideContentDescription: 'always'
mediaIDs: ['abc', 'def', 'ghi', 'jkl']
}
}]
}
Expand Down
134 changes: 0 additions & 134 deletions integrationExamples/top-level-paapi/gam-contextual.html
View file
Open in desktop

This file was deleted.

Loading