From 1c57dc48ca91407186d1d4f63b4dc190672e07c1 Mon Sep 17 00:00:00 2001
From: Nayan <nsavla@yieldmo.com>
Date: Fri, 7 Jun 2024 12:25:15 -0700
Subject: [PATCH 1/2] Prevent Consent Override

Bug fix where we do not override consent with eids.
---
 modules/yieldmoBidAdapter.js                |  2 +-
 test/spec/modules/yieldmoBidAdapter_spec.js | 45 ++++++++++++++++++++-
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/modules/yieldmoBidAdapter.js b/modules/yieldmoBidAdapter.js
index fe99adcec5f..f54de789d68 100644
--- a/modules/yieldmoBidAdapter.js
+++ b/modules/yieldmoBidAdapter.js
@@ -177,7 +177,7 @@ export const spec = {
         serverRequest.topics = topicsData;
       }
       if (eids.length) {
-        serverRequest.user = { eids };
+        deepSetValue(serverRequest, 'user.eids', eids);
       };
       serverRequests.push({
         method: 'POST',
diff --git a/test/spec/modules/yieldmoBidAdapter_spec.js b/test/spec/modules/yieldmoBidAdapter_spec.js
index f37ef9178dd..6dc053c59e8 100644
--- a/test/spec/modules/yieldmoBidAdapter_spec.js
+++ b/test/spec/modules/yieldmoBidAdapter_spec.js
@@ -264,7 +264,11 @@ describe('YieldmoAdapter', function () {
           vendorData: {blerp: 1},
           gdprApplies: true,
         };
-        const data = buildAndGetData([mockBannerBid()], 0, mockBidderRequest({gdprConsent}));
+        const data = buildAndGetData(
+          [mockBannerBid()],
+          0,
+          mockBidderRequest({ gdprConsent })
+        );
         expect(data.userConsent).equal(
           JSON.stringify({
             gdprApplies: true,
@@ -640,6 +644,45 @@ describe('YieldmoAdapter', function () {
         expect(buildAndGetData([mockVideoBid({ortb2Imp})]).imp[0].ext.gpid).to.be.equal(ortb2Imp.ext.data.pbadslot);
       });
 
+      it('should pass consent in video bid along with eids', () => {
+        const params = {
+          userIdAsEids: [
+            {
+              source: 'pubcid.org',
+              uids: [
+                {
+                  id: 'fake_pubcid',
+                  atype: 1,
+                },
+              ],
+            },
+          ],
+          fakeUserIdAsEids: [
+            {
+              source: 'pubcid.org',
+              uids: [
+                {
+                  id: 'fake_pubcid',
+                  atype: 1,
+                },
+              ],
+            },
+          ],
+        };
+        let videoBidder = mockBidderRequest(
+          {
+            gdprConsent: {
+              gdprApplies: 1,
+              consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
+            },
+          },
+          [mockVideoBid()]
+        );
+        let payload = buildAndGetData([mockVideoBid({...params})], 0, videoBidder);
+        expect(payload.user.ext.consent).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==');
+        expect(payload.user.eids).to.eql(params.fakeUserIdAsEids);
+      });
+
       it('should add eids to the video bid request', function () {
         const params = {
           userIdAsEids: [{

From 936cba64eb15a4b996b37d5aef21d41f78f27965 Mon Sep 17 00:00:00 2001
From: Nayan <nsavla@yieldmo.com>
Date: Fri, 7 Jun 2024 12:35:24 -0700
Subject: [PATCH 2/2] Eids fix

Adding eids to user.ext instead of user
---
 modules/yieldmoBidAdapter.js                | 2 +-
 test/spec/modules/yieldmoBidAdapter_spec.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/yieldmoBidAdapter.js b/modules/yieldmoBidAdapter.js
index f54de789d68..2801a1b80bf 100644
--- a/modules/yieldmoBidAdapter.js
+++ b/modules/yieldmoBidAdapter.js
@@ -177,7 +177,7 @@ export const spec = {
         serverRequest.topics = topicsData;
       }
       if (eids.length) {
-        deepSetValue(serverRequest, 'user.eids', eids);
+        deepSetValue(serverRequest, 'user.ext.eids', eids);
       };
       serverRequests.push({
         method: 'POST',
diff --git a/test/spec/modules/yieldmoBidAdapter_spec.js b/test/spec/modules/yieldmoBidAdapter_spec.js
index 6dc053c59e8..ca48c2955a3 100644
--- a/test/spec/modules/yieldmoBidAdapter_spec.js
+++ b/test/spec/modules/yieldmoBidAdapter_spec.js
@@ -680,7 +680,7 @@ describe('YieldmoAdapter', function () {
         );
         let payload = buildAndGetData([mockVideoBid({...params})], 0, videoBidder);
         expect(payload.user.ext.consent).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==');
-        expect(payload.user.eids).to.eql(params.fakeUserIdAsEids);
+        expect(payload.user.ext.eids).to.eql(params.fakeUserIdAsEids);
       });
 
       it('should add eids to the video bid request', function () {
@@ -702,7 +702,7 @@ describe('YieldmoAdapter', function () {
             }]
           }]
         };
-        expect(buildAndGetData([mockVideoBid({...params})]).user.eids).to.eql(params.fakeUserIdAsEids);
+        expect(buildAndGetData([mockVideoBid({...params})]).user.ext.eids).to.eql(params.fakeUserIdAsEids);
       });
 
       it('should add topics to the bid request', function () {