From 371c5c3225477dae7889ea966291c6d3e499daea Mon Sep 17 00:00:00 2001
From: robertrmartinez <rrmartinez1552@gmail.com>
Date: Fri, 18 Sep 2020 13:09:43 -0700
Subject: [PATCH] Only set dimensions if can be resolved

---
 modules/rubiconAnalyticsAdapter.js            |  9 ++---
 .../modules/rubiconAnalyticsAdapter_spec.js   | 35 +++++++++++++++++++
 test/spec/modules/rubiconAnalyticsSchema.json |  1 -
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index 54aa108ed78..362c56b698a 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -328,10 +328,11 @@ export function parseBidResponse(bid, previousBidResponse, auctionFloorData) {
     'dealId',
     'status',
     'mediaType',
-    'dimensions', () => utils.pick(bid, [
-      'width',
-      'height'
-    ]),
+    'dimensions', () => {
+      const width = bid.width || bid.playerWidth;
+      const height = bid.height || bid.playerHeight;
+      return (width && height) ? {width, height} : undefined;
+    },
     'seatBidId',
     'floorValue', () => utils.deepAccess(bid, 'floorData.floorValue'),
     'floorRule', () => utils.debugTurnedOn() ? utils.deepAccess(bid, 'floorData.floorRule') : undefined
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index a2999dfed8c..344f08823f8 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -687,6 +687,41 @@ describe('rubicon analytics adapter', function () {
       expect(message).to.deep.equal(ANALYTICS_MESSAGE);
     });
 
+    it('should handle bidResponse dimensions correctly', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      // mock bid response with playerWidth and playerHeight (NO width and height)
+      let bidResponse1 = utils.deepClone(MOCK.BID_RESPONSE[0]);
+      delete bidResponse1.width;
+      delete bidResponse1.height;
+      bidResponse1.playerWidth = 640;
+      bidResponse1.playerHeight = 480;
+
+      // mock bid response with no width height or playerwidth playerheight
+      let bidResponse2 = utils.deepClone(MOCK.BID_RESPONSE[1]);
+      delete bidResponse2.width;
+      delete bidResponse2.height;
+      delete bidResponse2.playerWidth;
+      delete bidResponse2.playerHeight;
+
+      events.emit(BID_RESPONSE, bidResponse1);
+      events.emit(BID_RESPONSE, bidResponse2);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+      expect(message.auctions[0].adUnits[0].bids[0].bidResponse.dimensions).to.deep.equal({
+        width: 640,
+        height: 480
+      });
+      expect(message.auctions[0].adUnits[1].bids[0].bidResponse.dimensions).to.equal(undefined);
+    });
+
     function performFloorAuction(provider) {
       let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
       auctionInit.bidderRequests[0].bids[0].floorData = {
diff --git a/test/spec/modules/rubiconAnalyticsSchema.json b/test/spec/modules/rubiconAnalyticsSchema.json
index 407dfd18be3..13d39e46cd0 100644
--- a/test/spec/modules/rubiconAnalyticsSchema.json
+++ b/test/spec/modules/rubiconAnalyticsSchema.json
@@ -409,7 +409,6 @@
         "bidResponse": {
           "type": "object",
           "required": [
-            "dimensions",
             "mediaType",
             "bidPriceUSD"
           ],