prebid.js 7.16.0 → 7.17.0

package/modules/rubiconBidAdapter.js

@@ -1109,15 +1109,25 @@ function mapSizes(sizes) {
 
 /**
  * Test if bid has mediaType or mediaTypes set for video.
- * Also makes sure the video object is present in the rubicon bidder params
+ * Also checks if the video object is present in the rubicon bidder params
  * @param {BidRequest} bidRequest
  * @returns {boolean}
  */
-export function hasVideoMediaType(bidRequest) {
-  if (typeof deepAccess(bidRequest, 'params.video') !== 'object') {
-    return false;
+export function classifiedAsVideo(bidRequest) {
+  let isVideo = typeof deepAccess(bidRequest, `mediaTypes.${VIDEO}`) !== 'undefined';
+  let isBanner = typeof deepAccess(bidRequest, `mediaTypes.${BANNER}`) !== 'undefined';
+  let isMissingVideoParams = typeof deepAccess(bidRequest, 'params.video') !== 'object';
+  // If an ad has both video and banner types, a legacy implementation allows choosing video over banner
+  // based on whether or not there is a video object defined in the params
+  // Given this legacy implementation, other code depends on params.video being defined
+
+  if (isBanner && isMissingVideoParams) {
+    isVideo = false;
   }
-  return (typeof deepAccess(bidRequest, `mediaTypes.${VIDEO}`) !== 'undefined');
+  if (isVideo && isMissingVideoParams) {
+    deepSetValue(bidRequest, 'params.video', {});
+  }
+  return isVideo;
 }
 
 /**
@@ -1128,7 +1138,7 @@ export function hasVideoMediaType(bidRequest) {
  */
 function bidType(bid, log = false) {
   // Is it considered video ad unit by rubicon
-  if (hasVideoMediaType(bid)) {
+  if (classifiedAsVideo(bid)) {
     // Removed legacy mediaType support. new way using mediaTypes.video object is now required
     // We require either context as instream or outstream
     if (['outstream', 'instream'].indexOf(deepAccess(bid, `mediaTypes.${VIDEO}.context`)) === -1) {

package/package.json

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

package/test/spec/modules/1plusXRtdProvider_spec.js

@@ -5,7 +5,9 @@ import {
   extractConfig,
   buildOrtb2Updates,
   updateBidderConfig,
-  setTargetingDataToConfig
+  setTargetingDataToConfig,
+  extractConsent,
+  getPapiUrl
 } from 'modules/1plusXRtdProvider';
 
 describe('1plusXRtdProvider', () => {
@@ -251,6 +253,80 @@ describe('1plusXRtdProvider', () => {
     })
   })
 
+  describe('extractConsent', () => {
+    it('extracts consent strings correctly if given', () => {
+      const consent = {
+        gdpr: {
+          gdprApplies: 1,
+          consentString: 'myConsent'
+        }
+      }
+      const output = extractConsent(consent)
+      const expectedOutput = {
+        gdpr_applies: 1,
+        consent_string: 'myConsent'
+      }
+      expect(expectedOutput).to.deep.include(output)
+      expect(output).to.deep.include(expectedOutput)
+    })
+    it('extracts null if consent object is empty', () => {
+      const consent1 = {}
+      expect(extractConsent(consent1)).to.equal(null)
+    })
+
+    it('throws an error if the consent is malformed', () => {
+      const consent1 = {
+        gdpr: {
+          gdprApplies: 1
+        }
+      }
+      const consent2 = {
+        gdpr: {
+          consentString: 'myConsent'
+        }
+      }
+      const consent3 = {
+        gdpr: {
+          gdprApplies: 1,
+          consentString: 3
+        }
+      }
+      const consent4 = {
+        gdpr: {
+          gdprApplies: 'yes',
+          consentString: 'myConsent'
+        }
+      }
+      const consent5 = {
+        gdprApplies: 1,
+        consentString: 'myConsent'
+      }
+
+      for (const consent in [consent1, consent2, consent3, consent4, consent5]) {
+        try {
+          extractConsent(consent)
+          assert(false, 'Should be throwing an exception')
+        } catch (e) { }
+      }
+    })
+  })
+
+  describe('getPapiUrl', () => {
+    const customer = 'acme'
+    const consent = {
+      gdpr: {
+        gdprApplies: 1,
+        consentString: 'myConsent'
+      }
+    }
+
+    it('correctly builds URLs based on consent', () => {
+      const url1 = getPapiUrl(customer)
+      const url2 = getPapiUrl(customer, extractConsent(consent))
+      expect(['&consent_string=myConsent&gdpr_applies=1', '&gdpr_applies=1&consent_string=myConsent']).to.contain(url2.replace(url1, ''))
+    })
+  })
+
   describe('updateBidderConfig', () => {
     const ortb2UpdatesAppNexus = {
       site: {

package/test/spec/modules/adagioBidAdapter_spec.js

@@ -150,7 +150,9 @@ describe('Adagio bid adapter', () => {
           ext: {
             data: {
               environment: 'desktop',
-              pagetype: 'abc'
+              pagetype: 'abc',
+              category: ['cat1', 'cat2', 'cat3'],
+              subcategory: []
             }
           }
         }
@@ -170,6 +172,12 @@ describe('Adagio bid adapter', () => {
 
       setExtraParam(bid, 'pagetype')
       expect(bid.params.pagetype).to.equal('article');
+
+      setExtraParam(bid, 'category');
+      expect(bid.params.category).to.equal('cat1'); // Only the first value is kept
+
+      setExtraParam(bid, 'subcategory');
+      expect(bid.params.subcategory).to.be.undefined;
     });
 
     it('should use the adUnit param unit if defined', function() {
@@ -1081,7 +1089,7 @@ describe('Adagio bid adapter', () => {
           impressionTrackers: [
             'https://eventrack.local/impression'
           ],
-          javascriptTrackers: '<script src=\"https://eventrack.local/impression\"></script>',
+          javascriptTrackers: '<script async src=\"https://eventrack.local/impression\"></script>',
           clickTrackers: [
             'https://i.am.a.clicktracker.url'
           ],
@@ -1104,6 +1112,19 @@ describe('Adagio bid adapter', () => {
         expect(r[0].native).ok;
         expect(r[0].native).to.deep.equal(expected);
       });
+
+      it('Should handle multiple javascriptTrackers in one single string', () => {
+        const serverResponseWithNativeCopy = utils.deepClone(serverResponseWithNative);
+        serverResponseWithNativeCopy.body.bids[0].admNative.eventtrackers.push(
+          {
+            event: 1,
+            method: 2,
+            url: 'https://eventrack.local/impression-2'
+          },)
+        const r = spec.interpretResponse(serverResponseWithNativeCopy, bidRequestNative);
+        const expected = '<script async src=\"https://eventrack.local/impression\"></script>\n<script async src=\"https://eventrack.local/impression-2\"></script>';
+        expect(r[0].native.javascriptTrackers).to.equal(expected);
+      });
     });
   });
 

package/test/spec/modules/appnexusBidAdapter_spec.js

@@ -757,6 +757,82 @@ describe('AppNexusAdapter', function () {
       });
     }
 
+    it('should convert keyword params (when there are no ortb keywords) to proper form and attaches to request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            keywords: {
+              single: 'val',
+              singleArr: ['val'],
+              singleArrNum: [5],
+              multiValMixed: ['value1', 2, 'value3'],
+              singleValNum: 123,
+              emptyStr: '',
+              emptyArr: [''],
+              badValue: { 'foo': 'bar' } // should be dropped
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].keywords).to.deep.equal([{
+        'key': 'single',
+        'value': ['val']
+      }, {
+        'key': 'singleArr',
+        'value': ['val']
+      }, {
+        'key': 'singleArrNum',
+        'value': ['5']
+      }, {
+        'key': 'multiValMixed',
+        'value': ['value1', '2', 'value3']
+      }, {
+        'key': 'singleValNum',
+        'value': ['123']
+      }, {
+        'key': 'emptyStr'
+      }, {
+        'key': 'emptyArr'
+      }]);
+    });
+
+    it('should convert adUnit ortb2 keywords (when there are no bid param keywords) to proper form and attaches to request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          ortb2Imp: {
+            ext: {
+              data: {
+                keywords: 'ortb2=yes,ortb2test, multiValMixed=4, singleValNum=456'
+              }
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].keywords).to.deep.equal([{
+        'key': 'ortb2',
+        'value': ['yes']
+      }, {
+        'key': 'ortb2test'
+      }, {
+        'key': 'multiValMixed',
+        'value': ['4']
+      }, {
+        'key': 'singleValNum',
+        'value': ['456']
+      }]);
+    });
+
     it('should convert keyword params and adUnit ortb2 keywords to proper form and attaches to request', function () {
       let bidRequest = Object.assign({},
         bidRequests[0],