From 2e3fca498b15a5f4d3012c1a286fcab4d787c997 Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Mon, 26 Jul 2021 23:44:16 -0700
Subject: [PATCH 1/4] Add back in sharedid

#7221
---
 modules/betweenBidAdapter.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/betweenBidAdapter.js b/modules/betweenBidAdapter.js
index feb6cae437a..7bce55b029b 100644
--- a/modules/betweenBidAdapter.js
+++ b/modules/betweenBidAdapter.js
@@ -1,5 +1,5 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { getAdUnitSizes, parseSizesInput } from '../src/utils.js';
+import { getAdUnitSizes, parseSizesInput , deepAccess } from '../src/utils.js';
 import { getRefererInfo } from '../src/refererDetection.js';
 
 const BIDDER_CODE = 'between';
@@ -37,6 +37,8 @@ export const spec = {
         tz: getTz(),
         fl: getFl(),
         rr: getRr(),
+        shid: getSharedId(i)('id'),
+        shid3: getSharedId(i)('third'),
         s: i.params.s,
         bidid: i.bidId,
         transactionid: i.transactionId,
@@ -147,6 +149,15 @@ export const spec = {
   }
 }
 
+function getSharedId(bid) {
+  const id = deepAccess(bid, 'userId.sharedid.id');
+  const third = deepAccess(bid, 'userId.sharedid.third');
+  return function(kind) {
+    if (kind === 'id') return id || '';
+    return third || '';
+  }
+}
+
 function getRr() {
   try {
     var td = top.document;

From d7aaf255f53021118df44c604380b786987aaf8c Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Mon, 26 Jul 2021 23:53:43 -0700
Subject: [PATCH 2/4] fix linting

---
 modules/betweenBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/betweenBidAdapter.js b/modules/betweenBidAdapter.js
index 7bce55b029b..5a351def958 100644
--- a/modules/betweenBidAdapter.js
+++ b/modules/betweenBidAdapter.js
@@ -1,5 +1,5 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { getAdUnitSizes, parseSizesInput , deepAccess } from '../src/utils.js';
+import { getAdUnitSizes, parseSizesInput, deepAccess } from '../src/utils.js';
 import { getRefererInfo } from '../src/refererDetection.js';
 
 const BIDDER_CODE = 'between';

From dc6fdcf23f549e02741d9ff832d220cf3d333b70 Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Tue, 27 Jul 2021 03:46:09 -0700
Subject: [PATCH 3/4] add tests for sharedid

---
 test/spec/modules/betweenBidAdapter_spec.js | 49 ++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/test/spec/modules/betweenBidAdapter_spec.js b/test/spec/modules/betweenBidAdapter_spec.js
index 62f36182d55..acfb79428b1 100644
--- a/test/spec/modules/betweenBidAdapter_spec.js
+++ b/test/spec/modules/betweenBidAdapter_spec.js
@@ -221,7 +221,54 @@ describe('betweenBidAdapterTests', function () {
 
     expect(req_data.sizes).to.deep.equal(['970x250', '240x400', '728x90'])
   });
-
+  
+  it('check sharedId with id and third', function() {
+    const bidRequestData = [{
+      bidId: 'bid123',
+      bidder: 'between',
+      mediaTypes: {
+        banner: {
+          sizes: [[728, 90]]
+        }
+      },
+      params: {
+        s: 1112,
+      },
+      userId: {
+        sharedid: {
+          id: '01EXQE7JKNDRDDVATB0S2GX1NT',
+          third: '01EXQE7JKNDRDDVATB0S2GX1NT'
+        }
+      }
+    }];
+    const shid = JSON.parse(spec.buildRequests(bidRequestData).data)[0].data.shid;
+    const shid3 = JSON.parse(spec.buildRequests(bidRequestData).data)[0].data.shid3;
+    expect(shid).to.equal('01EXQE7JKNDRDDVATB0S2GX1NT') && expect(shid3).to.equal('01EXQE7JKNDRDDVATB0S2GX1NT');
+  });
+  
+  it('check sharedId with only id', function() {
+    const bidRequestData = [{
+      bidId: 'bid123',
+      bidder: 'between',
+      mediaTypes: {
+        banner: {
+          sizes: [[728, 90]]
+        }
+      },
+      params: {
+        s: 1112,
+      },
+      userId: {
+        sharedid: {
+          id: '01EXQE7JKNDRDDVATB0S2GX1NT',
+        }
+      }
+    }];
+    const shid = JSON.parse(spec.buildRequests(bidRequestData).data)[0].data.shid;
+    const shid3 = JSON.parse(spec.buildRequests(bidRequestData).data)[0].data.shid3;
+    expect(shid).to.equal('01EXQE7JKNDRDDVATB0S2GX1NT') && expect(shid3).to.equal('');
+  });
+  
   it('check adomain', function() {
     const serverResponse = {
       body: [{

From a117b4be3dfe2be71b71b161f8e845f59140eefa Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Tue, 27 Jul 2021 03:49:00 -0700
Subject: [PATCH 4/4] remove trailing spaces

---
 test/spec/modules/betweenBidAdapter_spec.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/spec/modules/betweenBidAdapter_spec.js b/test/spec/modules/betweenBidAdapter_spec.js
index acfb79428b1..44d0752d4b2 100644
--- a/test/spec/modules/betweenBidAdapter_spec.js
+++ b/test/spec/modules/betweenBidAdapter_spec.js
@@ -221,7 +221,7 @@ describe('betweenBidAdapterTests', function () {
 
     expect(req_data.sizes).to.deep.equal(['970x250', '240x400', '728x90'])
   });
-  
+
   it('check sharedId with id and third', function() {
     const bidRequestData = [{
       bidId: 'bid123',
@@ -245,7 +245,7 @@ describe('betweenBidAdapterTests', function () {
     const shid3 = JSON.parse(spec.buildRequests(bidRequestData).data)[0].data.shid3;
     expect(shid).to.equal('01EXQE7JKNDRDDVATB0S2GX1NT') && expect(shid3).to.equal('01EXQE7JKNDRDDVATB0S2GX1NT');
   });
-  
+
   it('check sharedId with only id', function() {
     const bidRequestData = [{
       bidId: 'bid123',
@@ -268,7 +268,7 @@ describe('betweenBidAdapterTests', function () {
     const shid3 = JSON.parse(spec.buildRequests(bidRequestData).data)[0].data.shid3;
     expect(shid).to.equal('01EXQE7JKNDRDDVATB0S2GX1NT') && expect(shid3).to.equal('');
   });
-  
+
   it('check adomain', function() {
     const serverResponse = {
       body: [{