Eng 3578

.eslintrc.js

@@ -35,7 +35,7 @@ module.exports = {
     "eqeqeq": "off",
     "no-return-assign": "off",
     "no-throw-literal": "off",
-    "no-undef": "off",
+    "no-undef": 2,
     "no-useless-escape": "off",
   },
   "overrides": Object.keys(allowedModules).map((key) => ({

CONTRIBUTING.md

@@ -48,7 +48,8 @@ When you are adding code to Prebid.js, or modifying code that isn't covered by a
   - _Assert_: check that the expected results have occurred
     - e.g., use Chai assertions to check that the expected output is equal to the actual output
 - Test the public interface, not the internal implementation
-- If you need to check `adloader.loadScript` in a test, use a `stub` rather than a `spy`. `spy`s trigger a network call which can result in a `script error` and cause unrelated unit tests to fail. `stub`s will let you gather information about the `adloader.loadScript` call without affecting external resources
+- If you need to check `adloader.loadExternalScript` in a test, use a `stub` rather than a `spy`. `spy`s trigger a network call which can result in a `script error` and cause unrelated unit tests to fail. `stub`s will let you gather information about the `adloader.loadExternalScript` call without affecting external resources
+- If your test makes ajax requests, use the global xhr stub in `test/mocks/xhr`. Do not use your own `sinon.useFakeXMLHttpRequest()` or `sinon.createFakeServer()`.
 - When writing tests you may use ES2015 syntax if desired
 
 ### Test Examples

PR_REVIEW.md

@@ -16,9 +16,11 @@ For modules and core platform updates, the initial reviewer should request an ad
 - If the change results in needing updates to docs (such as public API change, module interface etc), add a label for "needs docs" and inform the submitter they must submit a docs PR to update the appropriate area of Prebid.org **before the PR can merge**. Help them with finding where the docs are located on prebid.org if needed. 
   - Below are some examples of bidder specific updates that should require docs update (in their dev-docs/bidders/bidder.md file):
     - Add support for GDPR consentManagement module > add `gdpr_supported: true`
+    - Add support for US Privacy consentManagement module > add `usp_supported: true`
     - Add support for userId module > add `userId: pubCommon, digitrust, newProviderHere`
     - Add support for video and/or native mediaTypes > add `media_types: video, native`
     - Add support for COPPA > add `coppa_supported: true`
+    - Add support for SChain > add `schain_supported: true`
 - If all above is good, add a `LGTM` comment and request 1 additional core member to review.
 - Once there is 2 `LGTM` on the PR, merge to master
 - Ask the submitter to add a PR for documentation if applicable.
@@ -29,7 +31,7 @@ For modules and core platform updates, the initial reviewer should request an ad
 - Follow steps above for general review process. In addition, please verify the following:
 - Verify that bidder has submitted valid bid params and that bids are being received.
 - Verify that bidder is not manipulating the prebid.js auction in any way or doing things that go against the principles of the project. If unsure check with the Tech Lead.
-- Verify that  the bidder is being as efficient as possible, ideally not loading an external library, however if they do load a library it should be cached.
+- Verify that the bidder is being as efficient as possible, ideally not loading an external library, however if they do load a library it should be cached.
 - Verify that code re-use is being done properly and that changes introduced by a bidder don't impact other bidders.
 - If the adapter being submitted is an alias type, check with the bidder contact that is being aliased to make sure it's allowed.
 - If the adapter is triggering any user syncs make sure they are using the user sync module in the Prebid.js core.

allowedModules.js

@@ -11,6 +11,7 @@ const sharedWhiteList = [
 module.exports = {
   'modules': [
     ...sharedWhiteList,
+    'criteo-direct-rsa-validate',
     'jsencrypt',
     'crypto-js'
   ],

integrationExamples/gpt/cmp_files/purposes.json

@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "purposes": [
+	{
+	  "id": 25,
+	  "name": "Custom Purpose 1",
+	  "description": "Here's a description of the first purpose"
+	},
+	{
+	  "id": 26,
+	  "name": "Custom Purpose 2",
+	  "description": "Here's a description of the second purpose"
+	},
+	{
+	  "id": 27,
+	  "name": "Custom Purpose 3",
+	  "description": "Here's a description of the third purpose"
+	},
+	{
+	  "id": 28,
+	  "name": "Custom Purpose 4",
+	  "description": "Here's a description of the fourth purpose"
+	}
+  ]
+}

integrationExamples/gpt/digitrust_Simple.html

@@ -86,6 +86,7 @@
             {
                 code: 'test-div',
                 sizes: [[300, 250], [300, 600], [728, 90]],
+                mediaTypes: { banner: { sizes: [400, 600], name: 'testAdUnit'}},
                 bids: [
                     {
                         bidder: 'rubicon',

integrationExamples/gpt/digitrust_cmp_test.html

@@ -0,0 +1,192 @@
+<html>
+<head>
+    <title>CMP Simple DigiTrust Prebid - No Framework</title>
+    <script>
+        (function (window) {
+            window.__cmp = (function () {
+                window.addEventListener('message', function (event) {
+                    window.__cmp.receiveMessage(event);
+                });
+
+                var commandQueue = [];
+                var cmp = function (command, parameter, callback) {
+                    commandQueue.push({
+                        command: command,
+                        parameter: parameter,
+                        callback: callback
+                    });
+                };
+                cmp.commandQueue = commandQueue;
+                cmp.receiveMessage = function (event) {
+                    var data = event && event.data && event.data.__cmpCall;
+                    if (data) {
+                        commandQueue.push({
+                            callId: data.callId,
+                            command: data.command,
+                            parameter: data.parameter,
+                            event: event
+                        });
+                    }
+                };
+                cmp.config = {
+                    customPurposeListLocation: './cmp_files/purposes.json',
+                    globalVendorListLocation: 'https://vendorlist.consensu.org/vendorlist.json',
+                    globalConsentLocation: 'http://cmp-origin-release.digitru.st/1/docs/portal.html',
+                    storeConsentGlobally: false,
+                    storePublisherConsentGlobally: false,
+                    storePublisherData: true,
+                    layout: 'footer',
+                    logging: "debug",
+                    blockBrowsing: false,
+                    forceLocale: 'en',
+                    testingMode: 'always show',
+                    showFooterAfterSubmit: true,
+                };
+                return cmp;
+            }());
+        })(window);
+
+        window.__cmp('renderCmpIfNeeded');
+    </script>
+
+    <script>
+        var FAILSAFE_TIMEOUT = 2000;
+
+        var adUnits = [
+            {
+                code: 'test-div',
+                sizes: [[300, 250], [300, 600], [728, 90]],
+                mediaTypes: { banner: { sizes: [400, 600], name: 'testAdUnit' } },
+                bids: [
+                    {
+                        bidder: 'rubicon',
+                        params: {
+                            accountId: '1001',
+                            siteId: '113932',
+                            zoneId: '535510'
+                        }
+                    }
+                ]
+            }
+        ];
+
+        var pbjs = pbjs || {};
+        pbjs.que = pbjs.que || [];
+    </script>
+    <script src="../../build/dev/prebid.js" async></script>
+
+    <script>
+        var googletag = googletag || {};
+        googletag.cmd = googletag.cmd || [];
+        googletag.cmd.push(function () {
+            googletag.pubads().disableInitialLoad();
+        });
+
+        pbjs.que.push(function () {
+            pbjs.setConfig({
+                debug: true,
+                consentManagement: {
+                    cmpApi: 'iab',
+                    timeout: 1000,
+                    allowAuctionWithoutConsent: true
+                },
+                usersync: {
+                    userIds: [{
+                        name: "digitrust",
+                        params: {
+                            init: {
+                                member: 'example_member_id',
+                                site: 'example_site_id'
+                            },
+                            callback: function (digiTrustResult) {
+                                // This callback can be used by publisher page to react to error conditions
+                                // Or pass the DigiTrust ID on.
+                                // If the Prebid userId system already has a managed copy of the DigiTrust ID
+                                // this callback will not be invoked.
+                                var elem = document.getElementById('idDiv');
+                                var msg;
+                                if (digiTrustResult.success) {
+                                    console.log('Success in Digitrust init');
+                                    if (digiTrustResult.identity && digiTrustResult.identity.id != null) {
+                                        msg = 'DigiTrust Id (encrypted): ' + digiTrustResult.identity.id;
+                                        elem.innerHTML = msg;
+                                        console.log(msg);
+                                    }
+                                    else {
+                                        console.error('Digitrust gave success, but no identity returned');
+                                    }
+                                }
+                                else {
+                                    console.error('Digitrust init failed');
+                                }
+                            }
+                        },
+                        storage: {
+                            type: "html5",
+                            name: "pbjsdigitrust",
+                            expires: 60
+                        }
+                    }]
+                }
+            });
+            pbjs.addAdUnits(adUnits);
+            pbjs.requestBids({
+                bidsBackHandler: sendAdserverRequest
+            });
+        });
+
+        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>
+        (function () {
+            var gads = document.createElement('script');
+            gads.async = true;
+            gads.type = 'text/javascript';
+            var useSSL = 'https:' == document.location.protocol;
+            gads.src = (useSSL ? 'https:' : 'http:') +
+                '//www.googletagservices.com/tag/js/gpt.js';
+            var node = document.getElementsByTagName('script')[0];
+            node.parentNode.insertBefore(gads, node);
+        })();
+    </script>
+
+    <script>
+        googletag.cmd.push(function () {
+            googletag.defineSlot('/112115922/FL_PB_MedRect', [[300, 250], [300, 600]], 'test-div').addService(googletag.pubads());
+            googletag.pubads().enableSingleRequest();
+            googletag.enableServices();
+        });
+    </script>
+</head>
+
+<body>
+    <h2>DigiTrust Prebid Sample - No Framework</h2>
+
+    <p>
+        This sample tests cmp behavior with simple integration path for using DigiTrust ID with Prebid.
+        You can use DigiTrust ID without integrating the entire DigiTrust suite.
+    </p>
+    <div id="idDiv"></div>
+
+    <div id='test-div'>
+        <script>
+            googletag.cmd.push(function () { googletag.display('test-div'); });
+        </script>
+    </div>
+    <script src="http://cmp-origin-release.digitru.st/1/cmp.bundle.js"></script>
+</body>
+</html>

integrationExamples/gpt/prebidServer_example.html

@@ -36,7 +36,11 @@
     pbjs.que.push(function() {
         var adUnits = [{
             code: 'div-gpt-ad-1460505748561-0',
-            sizes: [[300, 250]],
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 250]]
+              } 
+            },
             bids: [
               {
                 bidder: 'appnexus',

integrationExamples/gpt/revcontent_example.html

@@ -0,0 +1,109 @@
+<html>
+
+    <head>
+        <link rel="icon" type="image/png" href="/favicon.png">
+        <script async src="//www.googletagservices.com/tag/js/gpt.js"></script>
+        <script async src="../../build/dev/prebid.js"></script>
+        <script>
+            /*
+            Supported sizes:
+            ----------------
+            300x250 - Medium rectangle
+            728x90 - Leaderboard
+            300x600 - Half page or large skyscraper
+            */
+            var size = {width: 300, height: 250};
+
+            var PREBID_TIMEOUT = 10000;
+            var FAILSAFE_TIMEOUT = 30000;
+
+            var adUnits = [{
+                code: '/19968336/header-bid-tag-1',
+                mediaTypes: {
+                    native: {
+                        image: {
+                            required: false
+                        },
+                        title: {
+                            required: false,
+                            len: 140
+                        },
+                        clickUrl: {
+                            required: false
+                        },
+                        sponsoredBy: {
+                            id: 5,
+                            name: 'data',
+                            type: 1
+                        }
+                    }
+                },
+                bids: [{
+                    bidder: 'revcontent',
+                    params: {
+                        size: size,
+                        apiKey: '8a33fa9cf220ae685dcc3544f847cdda858d3b1c',
+                        userId: 673,
+                        domain: 'test.com',
+                        endpoint: 'trends-s0.revcontent.com'
+                    }
+                }]
+            }];
+
+            // ======== 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.setTargetingForGPTAsync && 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-1', [[size.width, size.height]], 'div-1')
+                	.addService(googletag.pubads());
+                googletag.pubads().enableSingleRequest();
+                googletag.enableServices();
+            });
+
+        </script>
+
+    </head>
+
+    <body>
+        <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>