Merge branch 'prebid:master' into master

jwplayer · Apr 26, 2023 · dcfc9fe · dcfc9fe
2 parents e6b1672 + d0bb0f5
commit dcfc9fe
Show file tree

Hide file tree

Showing 57 changed files with 3,585 additions and 2,895 deletions.
diff --git a/integrationExamples/gpt/fledge_example.html b/integrationExamples/gpt/fledge_example.html
@@ -0,0 +1,103 @@
+<html>
+<head>
+  <!--
+    FLEDGE (Protected Audience API) configuration with GPT and FLEDGE-supporting adapter
+
+    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>
+  <script>
+    var FAILSAFE_TIMEOUT = 3000;
+    var PREBID_TIMEOUT = 1500;
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    var googletag = googletag || {};
+    googletag.cmd = googletag.cmd || [];
+
+    googletag.cmd.push(function() {
+      googletag.pubads().disableInitialLoad();
+    });
+
+    var adUnits = [{
+      code: 'div-gpt-ad-1460505748561-0',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      bids: [{
+        bidder: 'openx',
+        params: {
+          platform: '8869ec2c-9d3f-4f16-9d2f-49aaab8978fb',
+          unit: '111111'
+        }
+      }],
+      ortb2Imp: {
+        ext: {
+          ae: 1
+        }
+      }
+    }];
+
+    pbjs.que.push(function() {
+      pbjs.setConfig({
+        fledgeForGpt: {
+          enabled: true
+        }
+      });
+
+      pbjs.setBidderConfig({
+        bidders: ['openx'],
+        config: {
+          fledgeEnabled: true
+        }
+      });
+
+      pbjs.addAdUnits(adUnits);
+
+      pbjs.requestBids({
+        bidsBackHandler: sendAdserverRequest,
+        timeout: PREBID_TIMEOUT
+      });
+
+      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);
+    });
+
+    googletag.cmd.push(function() {
+      googletag
+        .defineSlot('/19968336/header-bid-tag-0', adUnits[0].mediaTypes.banner.sizes, 'div-gpt-ad-1460505748561-0')
+        .addService(googletag.pubads());
+
+      googletag.pubads().enableSingleRequest();
+      googletag.enableServices();
+    });
+  </script>
+</head>
+
+<body>
+    <h2>Prebid.js FLEDGE+GPT Example</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>
+</body>
+</html>
diff --git a/integrationExamples/gpt/prebidServer_fledge_example.html b/integrationExamples/gpt/prebidServer_fledge_example.html
@@ -0,0 +1,111 @@
+<html>
+<head>
+  <!--
+    FLEDGE (Protected Audience API) configuration with GPT and Prebid-Server
+
+    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>
+  <script>
+    var FAILSAFE_TIMEOUT = 3000;
+    var PREBID_TIMEOUT = 1500;
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    var googletag = googletag || {};
+    googletag.cmd = googletag.cmd || [];
+
+    googletag.cmd.push(function() {
+      googletag.pubads().disableInitialLoad();
+    });
+
+    var adUnits = [{
+      code: 'div-gpt-ad-1460505748561-0',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      bids: [{
+        bidder: 'openx',
+        params: {
+          platform: '8869ec2c-9d3f-4f16-9d2f-49aaab8978fb',
+          unit: '111111'
+        }
+      }],
+      ortb2Imp: {
+        ext: {
+          ae: 1
+        }
+      }
+    }];
+
+    pbjs.que.push(function() {
+      pbjs.setConfig({
+        fledgeForGpt: {
+          enabled: true
+        },
+        s2sConfig: [{
+          accountId : '1',
+          enabled : true,
+          defaultVendor: 'appnexus',
+          bidders : ['openx'],
+          timeout : 1500,
+          adapter : 'prebidServer'
+        }]
+      });
+
+      pbjs.setBidderConfig({
+        bidders: ['openx'],
+        config: {
+          fledgeEnabled: true
+        }
+      });
+
+      pbjs.addAdUnits(adUnits);
+
+      pbjs.requestBids({
+        bidsBackHandler: sendAdserverRequest,
+        timeout: PREBID_TIMEOUT
+      });
+
+      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);
+    });
+
+    googletag.cmd.push(function() {
+      googletag
+        .defineSlot('/19968336/header-bid-tag-0', adUnits[0].mediaTypes.banner.sizes, 'div-gpt-ad-1460505748561-0')
+        .addService(googletag.pubads());
+
+      googletag.pubads().enableSingleRequest();
+      googletag.enableServices();
+    });
+  </script>
+</head>
+
+<body>
+    <h2>Prebid.js FLEDGE+GPT Example</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>
+</body>
+</html>
diff --git a/libraries/ortbConverter/processors/video.js b/libraries/ortbConverter/processors/video.js
@@ -6,6 +6,7 @@ import {sizesToFormat} from '../lib/sizes.js';
 const ORTB_VIDEO_PARAMS = new Set([
   'pos',
   'placement',
+  'plcmt',
   'api',
   'mimes',
   'protocols',

diff --git a/modules/adnuntiusBidAdapter.js b/modules/adnuntiusBidAdapter.js
@@ -6,6 +6,7 @@ import { getStorageManager } from '../src/storageManager.js';
 
 const BIDDER_CODE = 'adnuntius';
 const ENDPOINT_URL = 'https://ads.adnuntius.delivery/i';
+const ENDPOINT_URL_EUROPE = 'https://europe.delivery.adnuntius.com/i';
 const GVLID = 855;
 const DEFAULT_VAST_VERSION = 'vast4'
 // const DEFAULT_NATIVE = 'native'
@@ -130,10 +131,11 @@ export const spec = {
       const network = networkKeys[j];
       const networkRequest = [...request]
       if (network.indexOf('_video') > -1) { networkRequest.push('tt=' + DEFAULT_VAST_VERSION) }
+      const requestURL = gdprApplies ? ENDPOINT_URL_EUROPE : ENDPOINT_URL
       // if (network.indexOf('_native') > -1) { networkRequest.push('tt=' + DEFAULT_NATIVE) }
       requests.push({
         method: 'POST',
-        url: ENDPOINT_URL + '?' + networkRequest.join('&'),
+        url: requestURL + '?' + networkRequest.join('&'),
         data: JSON.stringify(networks[network]),
         bid: bidRequests[network]
       });