[pull] master from prebid:master

modules/jixieBidAdapter.js

@@ -295,6 +295,21 @@ export const spec = {
       }
       return bidResponses;
     } else { return []; }
+  },
+
+  getUserSyncs: function(syncOptions, serverResponses) {
+    if (!serverResponses.length || !serverResponses[0].body || !serverResponses[0].body.userSyncs) {
+      return false;
+    }
+    let syncs = [];
+    serverResponses[0].body.userSyncs.forEach(function(sync) {
+      if (syncOptions.iframeEnabled) {
+        syncs.push(sync.uf ? { url: sync.uf, type: 'iframe' } : { url: sync.up, type: 'image' });
+      } else if (syncOptions.pixelEnabled && sync.up) {
+        syncs.push({url: sync.up, type: 'image'})
+      }
+    })
+    return syncs;
   }
 }
 

modules/nextMillenniumBidAdapter.js

@@ -31,18 +31,24 @@ const REPORT_ENDPOINT = 'https://report2.hb.brainlyads.com/statistics/metric';
 const TIME_TO_LIVE = 360;
 const DEFAULT_CURRENCY = 'USD';
 
-const VIDEO_PARAMS = [
-  'api',
-  'linearity',
-  'maxduration',
-  'mimes',
-  'minduration',
-  'placement',
-  'playbackmethod',
-  'protocols',
-  'startdelay',
-];
+const VIDEO_PARAMS_DEFAULT = {
+  api: undefined,
+  linearity: undefined,
+  maxduration: undefined,
+  mimes: [
+    'video/mp4',
+    'video/x-ms-wmv',
+    'application/javascript',
+  ],
+
+  minduration: undefined,
+  placement: undefined,
+  playbackmethod: undefined,
+  protocols: undefined,
+  startdelay: undefined,
+};
 
+const VIDEO_PARAMS = Object.keys(VIDEO_PARAMS_DEFAULT);
 const ALLOWED_ORTB2_PARAMETERS = [
   'site.pagecat',
   'site.content.cat',
@@ -267,33 +273,46 @@ export function getImp(bid, id, mediaTypes) {
     },
   };
 
-  if (banner) {
-    if (banner.bidfloorcur) imp.bidfloorcur = banner.bidfloorcur;
-    if (banner.bidfloor) imp.bidfloor = banner.bidfloor;
+  getImpBanner(imp, banner);
+  getImpVideo(imp, video);
 
-    const format = (banner.data?.sizes || []).map(s => { return {w: s[0], h: s[1]} })
-    const {w, h} = (format[0] || {})
-    imp.banner = {
-      w,
-      h,
-      format,
-    };
-  };
+  return imp;
+};
 
-  if (video) {
-    if (video.bidfloorcur) imp.bidfloorcur = video.bidfloorcur;
-    if (video.bidfloor) imp.bidfloor = video.bidfloor;
+export function getImpBanner(imp, banner) {
+  if (!banner) return;
 
-    imp.video = getDefinedParams(video, VIDEO_PARAMS);
-    if (video.data.playerSize) {
-      imp.video = Object.assign(imp.video, parseGPTSingleSizeArrayToRtbSize(video.data.playerSize) || {});
-    } else if (video.w && video.h) {
-      imp.video.w = video.w;
-      imp.video.h = video.h;
-    };
+  if (banner.bidfloorcur) imp.bidfloorcur = banner.bidfloorcur;
+  if (banner.bidfloor) imp.bidfloor = banner.bidfloor;
+
+  const format = (banner.data?.sizes || []).map(s => { return {w: s[0], h: s[1]} })
+  const {w, h} = (format[0] || {})
+  imp.banner = {
+    w,
+    h,
+    format,
   };
+};
 
-  return imp;
+export function getImpVideo(imp, video) {
+  if (!video) return;
+
+  if (video.bidfloorcur) imp.bidfloorcur = video.bidfloorcur;
+  if (video.bidfloor) imp.bidfloor = video.bidfloor;
+
+  imp.video = getDefinedParams(video.data, VIDEO_PARAMS);
+  Object.keys(VIDEO_PARAMS_DEFAULT)
+    .filter(videoParamName => VIDEO_PARAMS_DEFAULT[videoParamName])
+    .forEach(videoParamName => {
+      if (typeof imp.video[videoParamName] === 'undefined') imp.video[videoParamName] = VIDEO_PARAMS_DEFAULT[videoParamName];
+    });
+
+  if (video.data.playerSize) {
+    imp.video = Object.assign(imp.video, parseGPTSingleSizeArrayToRtbSize(video.data?.playerSize) || {});
+  } else if (video.data.w && video.data.h) {
+    imp.video.w = video.data.w;
+    imp.video.h = video.data.h;
+  };
 };
 
 export function setConsentStrings(postBody = {}, bidderRequest) {

modules/userId/index.js

@@ -1096,7 +1096,7 @@ export function init(config, {delay = GreedyPromise.timeout} = {}) {
 // init config update listener to start the application
 init(config);
 
-module('userId', attachIdSystem);
+module('userId', attachIdSystem, { postInstallAllowed: true });
 
 export function setOrtbUserExtEids(ortbRequest, bidderRequest, context) {
   const eids = deepAccess(context, 'bidRequests.0.userIdAsEids');

modules/yieldmoBidAdapter.js

@@ -654,14 +654,6 @@ function validateVideoParams(bid) {
     }
 
     validate('video.protocols', val => isDefined(val), paramRequired);
-    validate(
-      'video.protocols',
-      (val) =>
-        isArrayOfNums(val) &&
-        val.every((v) => v >= 1 && v <= 12 && v != 9 && v != 10), // 9 and 10 are for DAST which are not supported.
-      paramInvalid,
-      'array of numbers between 1 and 12 except for 9 or 10 , ex: [2,3, 7, 11]'
-    );
 
     validate('video.api', val => isDefined(val), paramRequired);
     validate('video.api', val => isArrayOfNums(val) && val.every(v => (v >= 1 && v <= 6)),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "8.41.0-pre",
+  "version": "8.42.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

test/spec/modules/jixieBidAdapter_spec.js

@@ -707,4 +707,67 @@ describe('jixie Adapter', function () {
       expect(jixieaux.ajax.calledWith(TRACKINGURL_)).to.equal(true);
     })
   }); // describe
+
+  describe('getUserSyncs', function () {
+    it('it should favour iframe over pixel if publisher allows iframe usersync', function () {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': true,
+      }
+      const response = {
+        'userSyncs': [
+          {
+            'uf': 'https://syncstuff.jixie.io/',
+            'up': 'https://syncstuff.jixie.io/image.gif'
+          },
+          {
+            'up': 'https://syncstuff.jixie.io/image1.gif'
+          }
+        ]
+      }
+      let result = spec.getUserSyncs(syncOptions, [{ body: response }]);
+      expect(result[0].type).to.equal('iframe')
+      expect(result[1].type).to.equal('image')
+    })
+
+    it('it should pick pixel if publisher not allow iframe', function () {
+      const syncOptions = {
+        'iframeEnabled': false,
+        'pixelEnabled': true,
+      }
+      const response = {
+        'userSyncs': [
+          {
+            'uf': 'https://syncstuff.jixie.io/',
+            'up': 'https://syncstuff.jixie.io/image.gif'
+          },
+          {
+            'up': 'https://syncstuff.jixie.io/image1.gif'
+          }
+        ]
+      }
+      let result = spec.getUserSyncs(syncOptions, [{ body: response }]);
+      expect(result[0].type).to.equal('image')
+      expect(result[1].type).to.equal('image')
+    })
+
+    it('it should return nothing if pub only allow pixel but all usersyncs are iframe only', function () {
+      const syncOptions = {
+        'iframeEnabled': false,
+        'pixelEnabled': true,
+      }
+      const response = {
+        'userSyncs': [
+          {
+            'uf': 'https://syncstuff.jixie.io/',
+          },
+          {
+            'uf': 'https://syncstuff2.jixie.io/',
+          }
+        ]
+      }
+      let result = spec.getUserSyncs(syncOptions, [{ body: response }]);
+      expect(result.length).to.equal(0)
+    })
+  })
 });

test/spec/modules/nextMillenniumBidAdapter_spec.js

@@ -43,13 +43,13 @@ describe('nextMillenniumBidAdapterTests', () => {
         data: {
           id: '234',
           bid: {
-            mediaTypes: {video: {playerSize: [400, 300]}},
+            mediaTypes: {video: {playerSize: [400, 300], api: [2], placement: 1, plcmt: 1}},
             adUnitCode: 'test-video-1',
           },
 
           mediaTypes: {
             video: {
-              data: {playerSize: [400, 300]},
+              data: {playerSize: [400, 300], api: [2], placement: 1, plcmt: 1},
               bidfloorcur: 'USD',
             },
           },
@@ -59,7 +59,38 @@ describe('nextMillenniumBidAdapterTests', () => {
           id: 'test-video-1',
           bidfloorcur: 'USD',
           ext: {prebid: {storedrequest: {id: '234'}}},
-          video: {w: 400, h: 300},
+          video: {
+            mimes: ['video/mp4', 'video/x-ms-wmv', 'application/javascript'],
+            api: [2],
+            placement: 1,
+            w: 400,
+            h: 300,
+          },
+        },
+      },
+
+      {
+        title: 'imp - mediaTypes.video is empty',
+        data: {
+          id: '234',
+          bid: {
+            mediaTypes: {video: {w: 640, h: 480}},
+            adUnitCode: 'test-video-2',
+          },
+
+          mediaTypes: {
+            video: {
+              data: {w: 640, h: 480},
+              bidfloorcur: 'USD',
+            },
+          },
+        },
+
+        expected: {
+          id: 'test-video-2',
+          bidfloorcur: 'USD',
+          ext: {prebid: {storedrequest: {id: '234'}}},
+          video: {w: 640, h: 480, mimes: ['video/mp4', 'video/x-ms-wmv', 'application/javascript']},
         },
       },
     ];

test/spec/modules/yieldmoBidAdapter_spec.js

@@ -512,20 +512,6 @@ describe('YieldmoAdapter', function () {
         expect(buildVideoBidAndGetVideoParam().mimes).to.deep.equal(['video/mkv']);
       });
 
-      it('should validate protocol in video bid request', function () {
-        expect(
-          spec.isBidRequestValid(
-            mockVideoBid({}, {}, { protocols: [2, 3, 11] })
-          )
-        ).to.be.true;
-
-        expect(
-          spec.isBidRequestValid(
-            mockVideoBid({}, {}, { protocols: [2, 3, 10] })
-          )
-        ).to.be.false;
-      });
-
       describe('video.skip state check', () => {
         it('should not set video.skip if neither *.video.skip nor *.video.skippable is present', function () {
           utils.deepAccess(videoBid, 'mediaTypes.video')['skippable'] = false;