From ca555d334117abe97a6082291a873ac171147174 Mon Sep 17 00:00:00 2001
From: Cadent Aperture MX <43830380+EMXDigital@users.noreply.github.com>
Date: Thu, 14 Sep 2023 14:02:34 -0400
Subject: [PATCH] Cadent Aperture MX Bid Adapter: address
 auctionId/transactionId leak (#10485)

---
 modules/cadentApertureMXBidAdapter.js           |  4 ++--
 .../modules/cadentApertureMXBidAdapter_spec.js  | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/modules/cadentApertureMXBidAdapter.js b/modules/cadentApertureMXBidAdapter.js
index 32c0a4e4643..079ca592160 100644
--- a/modules/cadentApertureMXBidAdapter.js
+++ b/modules/cadentApertureMXBidAdapter.js
@@ -277,7 +277,7 @@ export const spec = {
       let isVideo = !!bid.mediaTypes.video;
       let data = {
         id: bid.bidId,
-        tid: bid.transactionId,
+        tid: bid.ortb2Imp?.ext?.tid,
         tagid,
         secure
       };
@@ -297,7 +297,7 @@ export const spec = {
     });
 
     let cadentData = {
-      id: bidderRequest.auctionId,
+      id: bidderRequest.auctionId ?? bidderRequest.bidderRequestId,
       imp: cadentImps,
       device,
       site,
diff --git a/test/spec/modules/cadentApertureMXBidAdapter_spec.js b/test/spec/modules/cadentApertureMXBidAdapter_spec.js
index 202659641f9..3ccb5405552 100644
--- a/test/spec/modules/cadentApertureMXBidAdapter_spec.js
+++ b/test/spec/modules/cadentApertureMXBidAdapter_spec.js
@@ -237,6 +237,11 @@ describe('cadent_aperture_mx Adapter', function () {
         'bidId': '30b31c2501de1e',
         'auctionId': 'e19f1eff-8b27-42a6-888d-9674e5a6130c',
         'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
+        'ortb2Imp': {
+          'ext': {
+            'tid': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ed',
+          },
+        },
       }]
     };
     let request = spec.buildRequests(bidderRequest.bids, bidderRequest);
@@ -297,12 +302,22 @@ describe('cadent_aperture_mx Adapter', function () {
         expect(data.id).to.equal(bidderRequest.auctionId);
         expect(data.imp.length).to.equal(1);
         expect(data.imp[0].id).to.equal('30b31c2501de1e');
-        expect(data.imp[0].tid).to.equal('d7b773de-ceaa-484d-89ca-d9f51b8d61ec');
+        expect(data.imp[0].tid).to.equal('d7b773de-ceaa-484d-89ca-d9f51b8d61ed');
         expect(data.imp[0].tagid).to.equal('25251');
         expect(data.imp[0].secure).to.equal(0);
         expect(data.imp[0].vastXml).to.equal(undefined);
       });
 
+      it('populates id even when auctionId is not available', function () {
+        // addressing https://github.com/prebid/Prebid.js/issues/9781
+        bidderRequest.auctionId = null;
+        request = spec.buildRequests(bidderRequest.bids, bidderRequest);
+
+        const data = JSON.parse(request.data);
+        expect(data.id).not.to.be.null;
+        expect(data.id).not.to.equal(bidderRequest.auctionId);
+      });
+
       it('properly sends site information and protocol', function () {
         request = spec.buildRequests(bidderRequest.bids, bidderRequest);
         request = JSON.parse(request.data);