Eng 1760

README.md

@@ -4,6 +4,7 @@
 [![Code Climate](https://codeclimate.com/github/prebid/Prebid.js/badges/gpa.svg)](https://codeclimate.com/github/prebid/Prebid.js)
 [![Coverage Status](https://coveralls.io/repos/github/prebid/Prebid.js/badge.svg)](https://coveralls.io/github/prebid/Prebid.js)
 [![devDependencies Status](https://david-dm.org/prebid/Prebid.js/dev-status.svg)](https://david-dm.org/prebid/Prebid.js?type=dev)
+[![Total Alerts](https://img.shields.io/lgtm/alerts/g/prebid/Prebid.js.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/prebid/Prebid.js/alerts/)
 
 # Prebid.js 1.9
 

RELEASE_SCHEDULE.md

@@ -17,7 +17,7 @@ Announcements regarding releases will be made to the #headerbidding-dev channel
 
 ## Release Process
 
-1. Make Sure all browserstack tests are passing. On PR merge to master travis will run unit tests on browserstack. Checking the last travis build [here](https://travis-ci.org/prebid/Prebid.js/branches) for master branch will show you detailed results. 
+1. Make Sure all browserstack tests are passing. On PR merge to master CircleCI will run unit tests on browserstack. Checking the last CircleCI build [here](https://circleci.com/gh/prebid) for master branch will show you detailed results. 
 
    In case of failure do following, 
      - Try to fix the failing tests.

governance.md

@@ -2,10 +2,10 @@
 
 This document describes the governance model for the Prebid project. The Prebid project’s stated mission is to facilitate fair, transparent, and effective header bidding across the industry, and is responsible for creating and maintaining such projects as [Prebid.js](https://github.com/prebid/Prebid.js).
 
-1.	A single Tech Lead oversees the technical direction of the project and appoints Core Team members
+1.	A single Tech Lead (PMC Chair) oversees the technical direction of the project and appoints Core Team members
 2.	The Core Team members maintain the project on an ongoing basis with direction from the Tech Lead.
 3.	In the event of any disagreements, the Tech Lead will make a final decision.
-4.	If there is no Tech Lead available to perform his/her duties, AppNexus Inc. will appoint one.
+4.	If there is no Tech Lead available to perform his/her duties, Prebid.org will appoint one.
 
 ### Roles and Responsibilities:
 - **User:** Any individual who consumes / uses the Prebid.js library.
@@ -15,9 +15,9 @@ This document describes the governance model for the Prebid project. The Prebid
 
 ### Current Prebid.js Core Team
 - @mkendall07 (Tech Lead)
-- @protonate
+- @jsnellbaker
 - @matthewlane
 - @jaiminpanchal27
 - @snapwich
 - @harpere
-- @dbemiller
+- @mike-chowla

gulpfile.js

@@ -39,7 +39,7 @@ var port = 9999;
 // Tasks
 gulp.task('default', ['webpack']);
 
-gulp.task('serve', ['lint', 'build-bundle-dev', 'watch', 'test']);
+gulp.task('serve', ['build-bundle-dev', 'watch', 'test']);
 
 gulp.task('serve-nw', ['lint', 'watch', 'e2etest']);
 
@@ -49,8 +49,8 @@ gulp.task('build', ['build-bundle-prod']);
 
 gulp.task('clean', function () {
   return gulp.src(['build'], {
-      read: false
-    })
+    read: false
+  })
     .pipe(clean());
 });
 
@@ -78,13 +78,13 @@ var explicitModules = [
 
 function bundle(dev, moduleArr) {
   var modules = moduleArr || helpers.getArgModules(),
-      allModules = helpers.getModuleNames(modules);
+    allModules = helpers.getModuleNames(modules);
 
-  if(modules.length === 0) {
+  if (modules.length === 0) {
     modules = allModules.filter(module => !explicitModules.includes(module));
   } else {
     var diff = _.difference(modules, allModules);
-    if(diff.length !== 0) {
+    if (diff.length !== 0) {
       throw new gutil.PluginError({
         plugin: 'bundle',
         message: 'invalid modules: ' + diff.join(', ')
@@ -106,13 +106,13 @@ function bundle(dev, moduleArr) {
   gutil.log('Generating bundle:', outputFileName);
 
   return gulp.src(
-      entries
-    )
+    entries
+  )
     .pipe(gulpif(dev, sourcemaps.init({loadMaps: true})))
     .pipe(concat(outputFileName))
     .pipe(gulpif(!argv.manualEnable, footer('\n<%= global %>.processQueue();', {
-        global: prebid.globalVarName
-      }
+      global: prebid.globalVarName
+    }
     )))
     .pipe(gulpif(dev, sourcemaps.write('.')));
 }
@@ -186,7 +186,7 @@ gulp.task('webpack', ['clean'], function () {
 // If --file "<path-to-test-file>" is given, the task will only run tests in the specified file.
 // If --browserstack is given, it will run the full suite of currently supported browsers.
 // If --browsers is given, browsers can be chosen explicitly. e.g. --browsers=chrome,firefox,ie9
-gulp.task('test', ['clean'], function (done) {
+gulp.task('test', ['clean', 'lint'], function (done) {
   var karmaConf = karmaConfMaker(false, argv.browserstack, argv.watch, argv.file);
 
   var browserOverride = helpers.parseBrowserArgs(argv).map(helpers.toCapitalCase);
@@ -229,7 +229,7 @@ gulp.task('watch', function () {
     'modules/**/*.js',
     'test/spec/**/*.js',
     '!test/spec/loaders/**/*.js'
-  ], ['lint', 'build-bundle-dev', 'test']);
+  ], ['build-bundle-dev', 'test']);
   gulp.watch([
     'loaders/**/*.js',
     'test/spec/loaders/**/*.js'
@@ -264,7 +264,7 @@ gulp.task('docs', ['clean-docs'], function () {
 
 gulp.task('e2etest', ['devpack', 'webpack'], function() {
   var cmdQueue = [];
-  if(argv.browserstack) {
+  if (argv.browserstack) {
     var browsers = require('./browsers.json');
     delete browsers['bs_ie_9_windows_7'];
 
@@ -276,11 +276,11 @@ gulp.task('e2etest', ['devpack', 'webpack'], function() {
 
     var startWith = 'bs';
 
-    Object.keys(browsers).filter(function(v){
+    Object.keys(browsers).filter(function(v) {
       return v.substring(0, startWith.length) === startWith && browsers[v].browser !== 'iphone';
-    }).map(function(v,i,arr) {
-      var newArr = (i%2 === 0) ? arr.slice(i,i+2) : null;
-      if(newArr) {
+    }).map(function(v, i, arr) {
+      var newArr = (i % 2 === 0) ? arr.slice(i, i + 2) : null;
+      if (newArr) {
         var cmd = 'nightwatch --env ' + newArr.join(',') + cmdStr;
         cmdQueue.push(cmd);
       }

integrationExamples/gpt/prebidServer_example.html

@@ -4,7 +4,6 @@
     var PREBID_TIMEOUT = 3000;
 
     var googletag = googletag || {};
-    var sizes = [[728, 90],[300, 250], [300,600]];
     googletag.cmd = googletag.cmd || [];
 
     function initAdserver() {
@@ -37,12 +36,12 @@
     pbjs.que.push(function() {
         var adUnits = [{
             code: 'div-gpt-ad-1460505748561-0',
-            sizes: [[300, 250], [300,600]],
+            sizes: [[300, 250]],
             bids: [
               {
                 bidder: 'appnexus',
                 params: {
-                   placementId: '10433394'
+                   placementId: '13144370'
                 }
               }
             ]
@@ -56,7 +55,7 @@
             bidders : ['appnexus'],
             timeout : 1000, //default value is 1000
             adapter : 'prebidServer', //if we have any other s2s adapter, default value is s2s
-            endpoint : 'https://prebid.adnxs.com/pbs/v1/auction?url_override=http%3A%2F%2Fwww.nytimes.com'
+            endpoint : 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
           }
         });
 
@@ -72,7 +71,7 @@
 
 <script>
     googletag.cmd.push(function() {
-        var rightSlot = googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
+        var rightSlot = googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
 
         pbjs.que.push(function() {
             pbjs.setTargetingForGPTAsync();

karma.conf.maker.js

@@ -92,7 +92,19 @@ function setBrowsers(karmaConf, browserstack) {
     karmaConf.customLaunchers = require('./browsers.json')
     karmaConf.browsers = Object.keys(karmaConf.customLaunchers);
   } else {
-    karmaConf.browsers = ['ChromeHeadless'];
+    var isDocker = require('is-docker')();
+    if (isDocker) {
+      karmaConf.customLaunchers = karmaConf.customLaunchers || {};
+      karmaConf.customLaunchers.ChromeCustom = {
+        base: 'ChromeHeadless',
+        // We must disable the Chrome sandbox when running Chrome inside Docker (Chrome's sandbox needs
+        // more permissions than Docker allows by default)
+        flags: ['--no-sandbox']
+      }
+      karmaConf.browsers = ['ChromeCustom'];
+    } else {
+      karmaConf.browsers = ['ChromeHeadless'];
+    }
   }
 }
 

modules/33acrossBidAdapter.js

@@ -23,8 +23,9 @@ function _createBidResponse(response) {
   }
 }
 
-// infer the necessary data from valid bid for a minimal ttxRequest and create HTTP request
-function _createServerRequest(bidRequest) {
+// Infer the necessary data from valid bid for a minimal ttxRequest and create HTTP request
+// NOTE: At this point, TTX only accepts request for a single impression
+function _createServerRequest(bidRequest, gdprConsent) {
   const ttxRequest = {};
   const params = bidRequest.params;
 
@@ -48,6 +49,18 @@ function _createServerRequest(bidRequest) {
   // therefore in ad targetting process
   ttxRequest.id = bidRequest.bidId;
 
+  // Set GDPR related fields
+  ttxRequest.user = {
+    ext: {
+      consent: gdprConsent.consentString
+    }
+  }
+  ttxRequest.regs = {
+    ext: {
+      gdpr: (gdprConsent.gdprApplies === true) ? 1 : 0
+    }
+  }
+
   // Finally, set the openRTB 'test' param if this is to be a test bid
   if (params.test === 1) {
     ttxRequest.test = 1;
@@ -104,11 +117,18 @@ function isBidRequestValid(bid) {
   return true;
 }
 
-// NOTE: At this point, TTX only accepts request for a single impression
-function buildRequests(bidRequests) {
+// NOTE: With regards to gdrp consent data,
+// - the server independently infers gdpr applicability therefore, setting the default value to false
+// - the server, at this point, also doesn't need the consent string to handle gdpr compliance. So passing
+//    value whether set or not, for the sake of future dev.
+function buildRequests(bidRequests, bidderRequest) {
+  const gdprConsent = Object.assign({ consentString: undefined, gdprApplies: false }, bidderRequest && bidderRequest.gdprConsent)
+
   adapterState.uniqueSiteIds = bidRequests.map(req => req.params.siteId).filter(uniques);
 
-  return bidRequests.map(_createServerRequest);
+  return bidRequests.map((req) => {
+    return _createServerRequest(req, gdprConsent);
+  });
 }
 
 // NOTE: At this point, the response from 33exchange will only ever contain one bid i.e. the highest bid
@@ -124,8 +144,13 @@ function interpretResponse(serverResponse, bidRequest) {
 }
 
 // Register one sync per unique guid
-function getUserSyncs(syncOptions) {
-  return (syncOptions.iframeEnabled) ? adapterState.uniqueSiteIds.map(_createSync) : ([]);
+// NOTE: If gdpr applies do not sync
+function getUserSyncs(syncOptions, responses, gdprConsent) {
+  if (gdprConsent && gdprConsent.gdprApplies === true) {
+    return []
+  } else {
+    return (syncOptions.iframeEnabled) ? adapterState.uniqueSiteIds.map(_createSync) : ([]);
+  }
 }
 
 const spec = {

modules/adformBidAdapter.js

@@ -15,6 +15,7 @@ export const spec = {
     var request = [];
     var globalParams = [ [ 'adxDomain', 'adx.adform.net' ], [ 'fd', 1 ], [ 'url', null ], [ 'tid', null ] ];
     var bids = JSON.parse(JSON.stringify(validBidRequests));
+    var bidder = (bids[0] && bids[0].bidder) || BIDDER_CODE
     for (i = 0, l = bids.length; i < l; i++) {
       bid = bids[i];
       if ((bid.params.priceType === 'net') || (bid.params.pt === 'net')) {
@@ -60,7 +61,7 @@ export const spec = {
       url: request.join('&'),
       bids: validBidRequests,
       netRevenue: netRevenue,
-      bidder: 'adform',
+      bidder,
       gdpr: gdprObject
     };
 

modules/adoceanBidAdapter.js

@@ -15,11 +15,15 @@ function buildEndpointUrl(emiter, payload) {
   return 'https://' + emiter + '/ad.json?' + payloadString;
 }
 
-function buildRequest(masterBidRequests, masterId) {
+function buildRequest(masterBidRequests, masterId, gdprConsent) {
   const firstBid = masterBidRequests[0];
   const payload = {
     id: masterId,
   };
+  if (gdprConsent) {
+    payload.gdpr_consent = gdprConsent.consentString || undefined;
+    payload.gdpr = gdprConsent.gdprApplies ? 1 : 0;
+  }
 
   const bidIdMap = {};
 
@@ -72,15 +76,15 @@ export const spec = {
     return !!(bid.params.slaveId && bid.params.masterId && bid.params.emiter);
   },
 
-  buildRequests: function(validBidRequests) {
+  buildRequests: function(validBidRequests, bidderRequest) {
     const bidRequestsByMaster = {};
     let requests = [];
 
-    utils._each(validBidRequests, function(v) {
-      assignToMaster(v, bidRequestsByMaster);
+    utils._each(validBidRequests, function(bidRequest) {
+      assignToMaster(bidRequest, bidRequestsByMaster);
     });
-    requests = utils._map(bidRequestsByMaster, function(v, k) {
-      return buildRequest(v, k);
+    requests = utils._map(bidRequestsByMaster, function(requests, masterId) {
+      return buildRequest(requests, masterId, bidderRequest.gdprConsent);
     });
 
     return requests;