PAAPI: fix bug where configuration is not picked up correctly by the …

…PBS adapter (prebid#11899)
adhese · Jul 19, 2024 · ce40079 · ce40079
1 parent e5dd5ac
commit ce40079
Show file tree

Hide file tree

Showing 5 changed files with 246 additions and 150 deletions.
diff --git a/modules/paapi.js b/modules/paapi.js
@@ -54,6 +54,7 @@ export function init(cfg) {
 }
 
 getHook('addPaapiConfig').before(addPaapiConfigHook);
+getHook('makeBidRequests').before(addPaapiData);
 getHook('makeBidRequests').after(markForFledge);
 events.on(EVENTS.AUCTION_END, onAuctionEnd);
 
@@ -332,38 +333,50 @@ function getRequestedSize(adUnit) {
   })();
 }
 
+export function addPaapiData(next, adUnits, ...args) {
+  if (isFledgeSupported() && moduleConfig.enabled) {
+    adUnits.forEach(adUnit => {
+      // https://github.com/InteractiveAdvertisingBureau/openrtb/blob/main/extensions/community_extensions/Protected%20Audience%20Support.md
+      const igsAe = adUnit.ortb2Imp?.ext?.igs != null
+        ? adUnit.ortb2Imp.ext.igs.ae || 1
+        : null;
+      const extAe = adUnit.ortb2Imp?.ext?.ae;
+      if (igsAe !== extAe && igsAe != null && extAe != null) {
+        logWarn(MODULE, `Ad unit defines conflicting ortb2Imp.ext.ae and ortb2Imp.ext.igs, using the latter`, adUnit);
+      }
+      const ae = igsAe ?? extAe ?? moduleConfig.defaultForSlots;
+      if (ae) {
+        deepSetValue(adUnit, 'ortb2Imp.ext.ae', ae);
+        adUnit.ortb2Imp.ext.igs = Object.assign({
+          ae: ae,
+          biddable: 1
+        }, adUnit.ortb2Imp.ext.igs);
+        const requestedSize = getRequestedSize(adUnit);
+        if (requestedSize) {
+          deepSetValue(adUnit, 'ortb2Imp.ext.paapi.requestedSize', requestedSize);
+        }
+        adUnit.bids.forEach(bidReq => {
+          if (!getFledgeConfig(bidReq.bidder).enabled) {
+            deepSetValue(bidReq, 'ortb2Imp.ext.ae', 0);
+            bidReq.ortb2Imp.ext.igs = {ae: 0, biddable: 0};
+          }
+        })
+      }
+    })
+  }
+  next(adUnits, ...args);
+}
+
 export function markForFledge(next, bidderRequests) {
   if (isFledgeSupported()) {
     bidderRequests.forEach((bidderReq) => {
-      const {enabled, ae} = getFledgeConfig(bidderReq.bidderCode);
+      const {enabled} = getFledgeConfig(bidderReq.bidderCode);
       Object.assign(bidderReq, {
         paapi: {
           enabled,
           componentSeller: !!moduleConfig.componentSeller?.auctionConfig
         }
       });
-      bidderReq.bids.forEach(bidReq => {
-        // https://github.com/InteractiveAdvertisingBureau/openrtb/blob/main/extensions/community_extensions/Protected%20Audience%20Support.md
-        const igsAe = bidReq.ortb2Imp?.ext?.igs != null
-          ? bidReq.ortb2Imp.ext.igs.ae || 1
-          : null;
-        const extAe = bidReq.ortb2Imp?.ext?.ae;
-        if (igsAe !== extAe && igsAe != null && extAe != null) {
-          logWarn(MODULE, `Bid request defines conflicting ortb2Imp.ext.ae and ortb2Imp.ext.igs, using the latter`, bidReq);
-        }
-        const bidAe = igsAe ?? extAe ?? ae;
-        if (bidAe) {
-          deepSetValue(bidReq, 'ortb2Imp.ext.ae', bidAe);
-          bidReq.ortb2Imp.ext.igs = Object.assign({
-            ae: bidAe,
-            biddable: 1
-          }, bidReq.ortb2Imp.ext.igs);
-          const requestedSize = getRequestedSize(bidReq);
-          if (requestedSize) {
-            deepSetValue(bidReq, 'ortb2Imp.ext.paapi.requestedSize', requestedSize);
-          }
-        }
-      });
     });
   }
   next(bidderRequests);
@@ -378,18 +391,6 @@ export function setImpExtAe(imp, bidRequest, context) {
 
 registerOrtbProcessor({type: IMP, name: 'impExtAe', fn: setImpExtAe});
 
-function paapiResponseParser(configs, response, context) {
-  configs.forEach((config) => {
-    const impCtx = context.impContext[config.impid];
-    if (!impCtx?.imp?.ext?.ae) {
-      logWarn(MODULE, 'Received auction configuration for an impression that was not in the request or did not ask for it', config, impCtx?.imp);
-    } else {
-      impCtx.paapiConfigs = impCtx.paapiConfigs || [];
-      impCtx.paapiConfigs.push(config);
-    }
-  });
-}
-
 export function parseExtIgi(response, ortbResponse, context) {
   paapiResponseParser(
     (ortbResponse.ext?.igi || []).flatMap(igi => {
@@ -411,6 +412,18 @@ export function parseExtIgi(response, ortbResponse, context) {
   )
 }
 
+function paapiResponseParser(configs, response, context) {
+  configs.forEach((config) => {
+    const impCtx = context.impContext[config.impid];
+    if (!impCtx?.imp?.ext?.ae) {
+      logWarn(MODULE, 'Received auction configuration for an impression that was not in the request or did not ask for it', config, impCtx?.imp);
+    } else {
+      impCtx.paapiConfigs = impCtx.paapiConfigs || [];
+      impCtx.paapiConfigs.push(config);
+    }
+  });
+}
+
 // to make it easier to share code between the PBS adapter and adapters whose backend is PBS, break up
 // fledge response processing in two steps: first aggregate all the auction configs by their imp...
 

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
@@ -515,7 +515,9 @@ export function PrebidServer() {
           }
         },
         onFledge: (params) => {
-          addPaapiConfig({auctionId: bidRequests[0].auctionId, ...params}, {config: params.config});
+          config.runWithBidder(params.bidder, () => {
+            addPaapiConfig({auctionId: bidRequests[0].auctionId, ...params}, {config: params.config});
+          })
         }
       })
     }

diff --git a/modules/prebidServerBidAdapter/ortbConverter.js b/modules/prebidServerBidAdapter/ortbConverter.js
@@ -241,6 +241,7 @@ const PBS_CONVERTER = ortbConverter({
               adUnitCode: impCtx.adUnit.code,
               ortb2: bidderReq?.ortb2,
               ortb2Imp: bidReq?.ortb2Imp,
+              bidder: cfg.bidder,
               config: cfg.config
             };
           }));