Merge branch 'master' of github.com:britepool/Prebid.js into Add-brit…

…epool-userid-submodule

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: circleci/node:9.0.0
+      - image: circleci/node:7.10
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images

.eslintrc.js

@@ -1,12 +1,5 @@
 
-const sharedWhiteList = [
-  "core-js/library/fn/array/find", // no ie11
-  "core-js/library/fn/array/includes", // no ie11
-  "core-js/library/fn/set", // ie11 supports Set but not Set#values
-  "core-js/library/fn/string/includes", // no ie11
-  "core-js/library/fn/number/is-integer", // no ie11,
-  "core-js/library/fn/array/from" // no ie11
-];
+const allowedModules = require("./allowedModules");
 
 module.exports = {
   "env": {
@@ -45,25 +38,10 @@ module.exports = {
     "no-undef": "off",
     "no-useless-escape": "off",
   },
-  "overrides": [{
-    "files": "modules/**/*.js",
+  "overrides": Object.keys(allowedModules).map((key) => ({
+    "files": key + "/**/*.js",
     "rules": {
-      "prebid/validate-imports": ["error", [
-        ...sharedWhiteList,
-        "jsencrypt",
-        "crypto-js"
-      ]]
+      "prebid/validate-imports": ["error", allowedModules[key]]
     }
-  }, {
-    "files": "src/**/*.js",
-    "rules": {
-      "prebid/validate-imports": ["error", [
-        ...sharedWhiteList,
-        "fun-hooks/no-eval",
-        "just-clone",
-        "dlv",
-        "dset"
-      ]]
-    }
-  }]
+  }))
 };

README.md

@@ -66,7 +66,7 @@ module.exports = {
 }
 ```
 
-Or for Babel 6:
+Or for Babel 6 and/or Node v8.6.0 and less:
 ```javascript
             // you must manually install and specify the presets and plugins yourself
             options: {
@@ -112,7 +112,7 @@ prebid.requestBids({
     $ cd Prebid.js
     $ npm install
 
-*Note:* You need to have `NodeJS` 9.x or greater installed.
+*Note:* You need to have `NodeJS` 6.x or greater installed.
 
 *Note:* In the 1.24.0 release of Prebid.js we have transitioned to using gulp 4.0 from using gulp 3.9.1.  To compily with gulp's recommended setup for 4.0, you'll need to have `gulp-cli` installed globally prior to running the general `npm install`.  This shouldn't impact any other projects you may work on that use an earlier version of gulp in it's setup.
 

allowedModules.js

@@ -0,0 +1,24 @@
+
+const sharedWhiteList = [
+  "core-js/library/fn/array/find", // no ie11
+  "core-js/library/fn/array/includes", // no ie11
+  "core-js/library/fn/set", // ie11 supports Set but not Set#values
+  "core-js/library/fn/string/includes", // no ie11
+  "core-js/library/fn/number/is-integer", // no ie11,
+  "core-js/library/fn/array/from" // no ie11
+];
+
+module.exports = {
+  'modules': [
+    ...sharedWhiteList,
+    'jsencrypt',
+    'crypto-js'
+  ],
+  'src': [
+    ...sharedWhiteList,
+    'fun-hooks/no-eval',
+    'just-clone',
+    'dlv',
+    'dset'
+  ]
+};

modules/adyoulikeBidAdapter.js

@@ -18,7 +18,7 @@ export const spec = {
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: function (bid) {
-    const sizes = getSize(bid.sizes);
+    const sizes = getSize(getSizeArray(bid));
     if (!bid.params || !bid.params.placement || !sizes.width || !sizes.height) {
       return false;
     }
@@ -34,12 +34,14 @@ export const spec = {
     const payload = {
       Version: VERSION,
       Bids: bidRequests.reduce((accumulator, bid) => {
-        let size = getSize(bid.sizes);
+        let sizesArray = getSizeArray(bid);
+        let size = getSize(sizesArray);
         accumulator[bid.bidId] = {};
         accumulator[bid.bidId].PlacementID = bid.params.placement;
         accumulator[bid.bidId].TransactionID = bid.transactionId;
         accumulator[bid.bidId].Width = size.width;
         accumulator[bid.bidId].Height = size.height;
+        accumulator[bid.bidId].AvaiableSizes = sizesArray.join(',');
         return accumulator;
       }, {}),
       PageRefreshed: getPageRefreshed()
@@ -156,10 +158,20 @@ function createEndpointQS(bidderRequest) {
   return qs;
 }
 
+function getSizeArray(bid) {
+  let inputSize = bid.sizes;
+  if (bid.mediaTypes && bid.mediaTypes.banner) {
+    inputSize = bid.mediaTypes.banner.sizes;
+  }
+
+  return utils.parseSizesInput(inputSize);
+}
+
 /* Get parsed size from request size */
-function getSize(requestSizes) {
+function getSize(sizesArray) {
   const parsed = {};
-  const size = utils.parseSizesInput(requestSizes)[0];
+  // the main requested size is the first one
+  const size = sizesArray[0];
 
   if (typeof size !== 'string') {
     return parsed;

modules/cedatoBidAdapter.js

@@ -107,15 +107,10 @@ export const spec = {
 
   getUserSyncs: function(syncOptions, resps, gdprConsent) {
     const syncs = [];
-    if (syncOptions.pixelEnabled) {
-      resps.forEach(() => {
-        syncs.push(getSync('image', gdprConsent));
-      });
-    }
     if (syncOptions.iframeEnabled) {
-      resps.forEach(() => {
-        syncs.push(getSync('iframe', gdprConsent));
-      });
+      syncs.push(getSync('iframe', gdprConsent));
+    } else if (syncOptions.pixelEnabled) {
+      syncs.push(getSync('image', gdprConsent));
     }
     return syncs;
   }