Merge remote-tracking branch 'origin/master' into master

sovrn · Aug 20, 2021 · 1ad90c0 · 1ad90c0
2 parents a2d1760 + 5ea0e1a
commit 1ad90c0
Show file tree

Hide file tree

Showing 46 changed files with 3,247 additions and 597 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,50 +1,53 @@
 
-const allowedModules = require("./allowedModules");
+const allowedModules = require('./allowedModules.js');
 
 module.exports = {
-  "env": {
-    "browser": true,
-    "commonjs": true
+  env: {
+    browser: true,
+    commonjs: true
   },
-  "settings": {
-    "import/resolver": {
-      "node": {
-        "moduleDirectory": ["node_modules", "./"]
+  settings: {
+    'import/resolver': {
+      node: {
+        moduleDirectory: ['node_modules', './']
       }
     }
   },
-  "extends": "standard",
-  "plugins": [
-    "prebid",
-    "import"
+  extends: 'standard',
+  plugins: [
+    'prebid',
+    'import'
   ],
-  "globals": {
-    "$$PREBID_GLOBAL$$": false
+  globals: {
+    '$$PREBID_GLOBAL$$': false,
+    'BROWSERSTACK_USERNAME': false,
+    'BROWSERSTACK_KEY': false
   },
-  "parserOptions": {
-    "sourceType": "module"
+  parserOptions: {
+    sourceType: 'module',
+    ecmaVersion: 2018,
   },
-  "rules": {
-    "comma-dangle": "off",
-    "semi": "off",
-    "space-before-function-paren": "off",
-    "import/extensions": ["error", "ignorePackages"],
+  rules: {
+    'comma-dangle': 'off',
+    semi: 'off',
+    'space-before-function-paren': 'off',
+    'import/extensions': ['error', 'ignorePackages'],
 
     // Exceptions below this line are temporary, so that eslint can be added into the CI process.
     // Violations of these styles should be fixed, and the exceptions removed over time.
     //
     // See Issue #1111.
-    "eqeqeq": "off",
-    "no-return-assign": "off",
-    "no-throw-literal": "off",
-    "no-undef": 2,
-    "no-useless-escape": "off",
-    "no-console": "error"
+    eqeqeq: 'off',
+    'no-return-assign': 'off',
+    'no-throw-literal': 'off',
+    'no-undef': 2,
+    'no-useless-escape': 'off',
+    'no-console': 'error'
   },
-  "overrides": Object.keys(allowedModules).map((key) => ({
-    "files": key + "/**/*.js",
-    "rules": {
-      "prebid/validate-imports": ["error", allowedModules[key]]
+  overrides: Object.keys(allowedModules).map((key) => ({
+    files: key + '/**/*.js',
+    rules: {
+      'prebid/validate-imports': ['error', allowedModules[key]]
     }
   }))
 };
diff --git a/gulpHelpers.js b/gulpHelpers.js
@@ -34,7 +34,6 @@ module.exports = {
   },
 
   jsonifyHTML: function (str) {
-    console.log(arguments);
     return str.replace(/\n/g, '')
       .replace(/<\//g, '<\\/')
       .replace(/\/>/g, '\\/>');

diff --git a/gulpfile.js b/gulpfile.js
@@ -11,10 +11,10 @@ var webpackStream = require('webpack-stream');
 var terser = require('gulp-terser');
 var gulpClean = require('gulp-clean');
 var KarmaServer = require('karma').Server;
-var karmaConfMaker = require('./karma.conf.maker');
+var karmaConfMaker = require('./karma.conf.maker.js');
 var opens = require('opn');
-var webpackConfig = require('./webpack.conf');
-var helpers = require('./gulpHelpers');
+var webpackConfig = require('./webpack.conf.js');
+var helpers = require('./gulpHelpers.js');
 var concat = require('gulp-concat');
 var header = require('gulp-header');
 var footer = require('gulp-footer');
@@ -71,7 +71,13 @@ function lint(done) {
   const isFixed = function (file) {
     return file.eslint != null && file.eslint.fixed;
   }
-  return gulp.src(['src/**/*.js', 'modules/**/*.js', 'test/**/*.js'], { base: './' })
+  return gulp.src([
+    'src/**/*.js',
+    'modules/**/*.js',
+    'test/**/*.js',
+    'plugins/**/*.js',
+    './*.js'
+  ], { base: './' })
     .pipe(gulpif(argv.nolintfix, eslint(), eslint({ fix: true })))
     .pipe(eslint.format('stylish'))
     .pipe(eslint.failAfterError())

diff --git a/integrationExamples/gpt/adloox.html b/integrationExamples/gpt/adloox.html
@@ -112,6 +112,7 @@
 
                 var videoBids = bids[videoAdUnit.code];
                 if (videoBids) {
+// DEMO NOTES: your environment likely will use the commented section ////
                     var videoUrl = videoBids.bids[0].vastUrl;
 //                    var videoUrl = pbjs.adServers.dfp.buildVideoUrl({
 //                        adUnit: videoAdUnit,
@@ -124,7 +125,12 @@
 //                            output: 'vast'
 //                        }
 //                    });
-                    invokeVideoPlayer(videoUrl);
+//////////////////////////////////////////////////////////////////////////
+                    var ret = pbjs.adServers.adloox.buildVideoUrl({
+                        adUnit: videoAdUnit,
+                        url: videoUrl
+                    }, invokeVideoPlayer);
+                    if (!ret) console.log('Error building Adloox video URL');
                 }
             }
 

diff --git a/karma.conf.maker.js b/karma.conf.maker.js
@@ -3,7 +3,7 @@
 // For more information, see http://karma-runner.github.io/1.0/config/configuration-file.html
 
 var _ = require('lodash');
-var webpackConf = require('./webpack.conf');
+var webpackConf = require('./webpack.conf.js');
 var karmaConstants = require('karma').constants;
 
 function newWebpackConfig(codeCoverage) {

diff --git a/modules/adagioBidAdapter.js b/modules/adagioBidAdapter.js
@@ -340,6 +340,16 @@ function isNewSession(adagioStorage) {
   )
 }
 
+function setPlayerName(bidRequest) {
+  const playerName = (internal.isRendererPreferredFromPublisher(bidRequest)) ? 'other' : 'adagio';
+
+  if (playerName === 'other') {
+    utils.logWarn(`${LOG_PREFIX} renderer.backupOnly has not been set. Adagio recommends to use its own player to get expected behavior.`);
+  }
+
+  return playerName;
+}
+
 export const internal = {
   enqueue,
   getPageviewId,
@@ -414,11 +424,7 @@ function _buildVideoBidRequest(bidRequest) {
   };
 
   if (videoParams.context && videoParams.context === OUTSTREAM) {
-    bidRequest.mediaTypes.video.playerName = (internal.isRendererPreferredFromPublisher(bidRequest)) ? 'other' : 'adagio';
-
-    if (bidRequest.mediaTypes.video.playerName === 'other') {
-      utils.logWarn(`${LOG_PREFIX} renderer.backupOnly has not been set. Adagio recommends to use its own player to get expected behavior.`);
-    }
+    bidRequest.mediaTypes.video.playerName = setPlayerName(bidRequest);
   }
 
   // Only whitelisted OpenRTB options need to be validated.
@@ -1071,6 +1077,8 @@ export const spec = {
     if (isOrtb) {
       autoFillParams(adagioBid);
 
+      adagioBid.params.auctionId = utils.deepAccess(adagioBidderRequest, 'auctionId');
+
       const globalFeatures = GlobalExchange.getOrSetGlobalFeatures();
       adagioBid.params.features = {
         ...globalFeatures,
@@ -1082,6 +1090,10 @@ export const spec = {
       adagioBid.params.prebidVersion = '$prebid.version$';
       adagioBid.params.data = GlobalExchange.getExchangeData();
 
+      if (utils.deepAccess(adagioBid, 'mediaTypes.video.context') === OUTSTREAM) {
+        adagioBid.params.playerName = setPlayerName(adagioBid);
+      }
+
       storeRequestInAdagioNS(adagioBid);
     }