priceFloors: fix bug where floors are not set when TIDs are disabled

dgirardi · dgirardi · commit 765031051f93 · 2023-07-20T06:27:02.000-07:00
diff --git a/integrationExamples/gpt/adUnitFloors.html b/integrationExamples/gpt/adUnitFloors.html
@@ -10,7 +10,7 @@
 <html>
 
 <head>
-    <script async src="../../build/dist/prebid.js"></script>
+    <script async src="../../build/dev/prebid.js"></script>
     <script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js"></script>
     <script>
         var FAILSAFE_TIMEOUT = 3300;
@@ -109,4 +109,3 @@ <h5>Div-1</h5>
 </body>
 
 </html>
-
diff --git a/src/adapters/bidderFactory.js b/src/adapters/bidderFactory.js
@@ -184,7 +184,7 @@ export function registerBidder(spec) {
   }
 }
 
-function guardTids(bidderCode) {
+export function guardTids(bidderCode) {
   if (isActivityAllowed(ACTIVITY_TRANSMIT_TID, activityParams(MODULE_TYPE_BIDDER, bidderCode))) {
     return {
       bidRequest: (br) => br,
@@ -197,7 +197,15 @@ function guardTids(bidderCode) {
     }
     return Reflect.get(target, prop, receiver);
   }
-  const bidRequest = memoize((br) => new Proxy(br, {get}), (arg) => arg.bidId)
+  function privateAccessProxy(target, handler) {
+    const proxy = new Proxy(target, handler);
+    // always allow methods (such as getFloor) private access to TIDs
+    Object.entries(target)
+      .filter(([_, v]) => typeof v === 'function')
+      .forEach(([prop, fn]) => proxy[prop] = fn.bind(target));
+    return proxy;
+  }
+  const bidRequest = memoize((br) => privateAccessProxy(br, {get}), (arg) => arg.bidId);
   /**
    * Return a view on bidd(er) requests where auctionId/transactionId are nulled if the bidder is not allowed `transmitTid`.
    *
@@ -207,7 +215,7 @@ function guardTids(bidderCode) {
    */
   return {
     bidRequest,
-    bidderRequest: (br) => new Proxy(br, {
+    bidderRequest: (br) => privateAccessProxy(br, {
       get(target, prop, receiver) {
         if (prop === 'bids') return br.bids.map(bidRequest);
         return get(target, prop, receiver);
diff --git a/test/spec/modules/priceFloors_spec.js b/test/spec/modules/priceFloors_spec.js
@@ -20,6 +20,8 @@ import 'src/prebid.js';
 import {createBid} from '../../../src/bidfactory.js';
 import {auctionManager} from '../../../src/auctionManager.js';
 import {stubAuctionIndex} from '../../helpers/indexStub.js';
+import {guardTids} from '../../../src/adapters/bidderFactory.js';
+import * as activities from '../../../src/activities/rules.js';
 
 describe('the price floors module', function () {
   let logErrorSpy;
@@ -1369,6 +1371,18 @@ describe('the price floors module', function () {
           floor: 2.5
         });
       });
+
+      it('works when TIDs are disabled', () => {
+        sandbox.stub(activities, 'isActivityAllowed').returns(false);
+        const req = utils.deepClone(bidRequest);
+        _floorDataForAuction[req.auctionId] = utils.deepClone(basicFloorConfig);
+
+        expect(guardTids('mock-bidder').bidRequest(req).getFloor({})).to.deep.equal({
+          currency: 'USD',
+          floor: 1.0
+        });
+      });
+
       it('picks the right rule with more complex rules', function () {
         _floorDataForAuction[bidRequest.auctionId] = {
           ...basicFloorConfig,
diff --git a/test/spec/unit/core/bidderFactory_spec.js b/test/spec/unit/core/bidderFactory_spec.js
@@ -13,7 +13,6 @@ import {stubAuctionIndex} from '../../../helpers/indexStub.js';
 import {bidderSettings} from '../../../../src/bidderSettings.js';
 import {decorateAdUnitsWithNativeParams} from '../../../../src/native.js';
 import * as activityRules from 'src/activities/rules.js';
-import {sandbox} from 'sinon';
 import {MODULE_TYPE_BIDDER} from '../../../../src/activities/modules.js';
 import {ACTIVITY_TRANSMIT_TID} from '../../../../src/activities/activities.js';
 
@@ -141,6 +140,21 @@ describe('bidders created by newBidder', function () {
     });
 
     describe('transaction IDs', () => {
+      beforeEach(() => {
+        activityRules.isActivityAllowed.reset();
+        ajaxStub.callsFake((_, callback) => callback.success(null, {getResponseHeader: sinon.stub()}));
+        spec.interpretResponse.callsFake(() => [
+          {
+            requestId: 'bid',
+            cpm: 123,
+            ttl: 300,
+            creativeId: 'crid',
+            netRevenue: true,
+            currency: 'USD'
+          }
+        ])
+      });
+
       Object.entries({
         'be hidden': false,
         'not be hidden': true,
@@ -166,21 +180,8 @@ describe('bidders created by newBidder', function () {
             bidReqs.forEach(checkBidRequest);
             return {method: 'POST'};
           });
-          spec.interpretResponse.callsFake(() => [
-            {
-              requestId: 'bid',
-              cpm: 123,
-              ttl: 300,
-              creativeId: 'crid',
-              netRevenue: true,
-              currency: 'USD'
-            }
-          ])
-          activityRules.isActivityAllowed.reset();
           activityRules.isActivityAllowed.callsFake(() => allowed);
 
-          ajaxStub.callsFake((_, callback) => callback.success(null, {getResponseHeader: sinon.stub()}));
-
           const bidder = newBidder(spec);
 
           bidder.callBids({
@@ -206,6 +207,33 @@ describe('bidders created by newBidder', function () {
           })
         });
       });
+
+      it('should not be hidden from request methods', (done) => {
+        const bidderRequest = {
+          bidderCode: 'mockBidder',
+          auctionId: 'aid',
+          getAID() { return this.auctionId },
+          bids: [
+            {
+              adUnitCode: 'mockAU',
+              bidId: 'bid',
+              transactionId: 'tid',
+              auctionId: 'aid',
+              getTIDs() {
+                return [this.auctionId, this.transactionId]
+              }
+            }
+          ]
+        };
+        activityRules.isActivityAllowed.callsFake(() => false);
+        spec.isBidRequestValid.returns(true);
+        spec.buildRequests.callsFake((reqs, bidderReq) => {
+          expect(bidderReq.getAID()).to.eql('aid');
+          expect(reqs[0].getTIDs()).to.eql(['aid', 'tid']);
+          done();
+        });
+        newBidder(spec).callBids(bidderRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+      })
     });
 
     it('should handle bad bid requests gracefully', function () {
