rename + fix missed files

prebid · May 26, 2021 · 6d4096d · 6d4096d
1 parent ec41a92
commit 6d4096d
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 115 deletions.
diff --git 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 } from '../src/utils.js';
 import { getRefererInfo } from '../src/refererDetection.js';
 
 const BIDDER_CODE = 'between';
@@ -37,8 +37,6 @@ 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,
@@ -149,15 +147,6 @@ 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;

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
@@ -42,7 +42,6 @@ const PROVIDERS = [
   'merkleId',
   'parrableId',
   'connectid',
-  'sharedid',
   'tapadId',
   'quantcastId',
   'pubcid',

diff --git a/modules/openxBidAdapter.js b/modules/openxBidAdapter.js
@@ -27,7 +27,6 @@ export const USER_ID_CODE_TO_QUERY_ARG = {
   parrableId: 'parrableid', // Parrable ID
   pubcid: 'pubcid', // PubCommon ID
   quantcastId: 'quantcastid', // Quantcast ID
-  sharedId: 'sharedid', // Shared ID User ID
   tapadId: 'tapadid', // Tapad Id
   tdid: 'ttduuid', // The Trade Desk Unified ID
   verizonMediaId: 'verizonmediaid', // Verizon Media ConnectID

diff --git a/modules/sharedIdSystem.js b/modules/sharedIdSystem.js
@@ -1,7 +1,7 @@
 /**
- * This module adds PubCommonId to the User ID module
+ * This module adds SharedId to the User ID module
  * The {@link module:modules/userId} module is required
- * @module modules/pubCommonIdSystem
+ * @module modules/sharedIdSystem
  * @requires module:modules/userId
  */
 
@@ -14,7 +14,7 @@ const PUB_COMMON_ID = 'PublisherCommonId';
 const GVLID = 887;
 
 /** @type {Submodule} */
-export const pubCommonIdSubmodule = {
+export const sharedIdSystemSubmodule = {
   /**
    * used to link submodule with config
    * @type {string}
@@ -90,4 +90,4 @@ export const pubCommonIdSubmodule = {
   },
 };
 
-submodule('userId', pubCommonIdSubmodule);
+submodule('userId', sharedIdSystemSubmodule);
diff --git a/test/spec/modules/betweenBidAdapter_spec.js b/test/spec/modules/betweenBidAdapter_spec.js
@@ -222,51 +222,6 @@ 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: [{

diff --git a/test/spec/modules/logicadBidAdapter_spec.js b/test/spec/modules/logicadBidAdapter_spec.js
@@ -21,19 +21,14 @@ describe('LogicadAdapter', function () {
       }
     },
     userId: {
-      sharedid: {
-        id: 'fakesharedid',
-        third: 'fakesharedid'
+      pubcid: {
+        id: 'fakepubcid'
       }
     },
     userIdAsEids: [{
-      source: 'sharedid.org',
+      source: 'pubcid.org',
       uids: [{
-        id: 'fakesharedid',
-        atype: 1,
-        ext: {
-          third: 'fakesharedid'
-        }
+        id: 'fakepubcid'
       }]
     }]
   }];
@@ -63,18 +58,18 @@ describe('LogicadAdapter', function () {
       }
     },
     userId: {
-      sharedid: {
-        id: 'fakesharedid',
-        third: 'fakesharedid'
+      pubcid: {
+        id: 'fakepubcid',
+        third: 'fakepubcid'
       }
     },
     userIdAsEids: [{
-      source: 'sharedid.org',
+      source: 'pubcid.org',
       uids: [{
-        id: 'fakesharedid',
+        id: 'fakepubcid',
         atype: 1,
         ext: {
-          third: 'fakesharedid'
+          third: 'fakepubcid'
         }
       }]
     }]
@@ -176,8 +171,8 @@ describe('LogicadAdapter', function () {
 
       const data = JSON.parse(request.data);
       expect(data.auctionId).to.equal('18fd8b8b0bd757');
-      expect(data.eids[0].source).to.equal('sharedid.org');
-      expect(data.eids[0].uids[0].id).to.equal('fakesharedid');
+      expect(data.eids[0].source).to.equal('pubcid.org');
+      expect(data.eids[0].uids[0].id).to.equal('fakepubcid');
     });
   });
 

diff --git a/test/spec/modules/openxBidAdapter_spec.js b/test/spec/modules/openxBidAdapter_spec.js
@@ -1057,7 +1057,6 @@ describe('OpenxAdapter', function () {
         parrableId: { eid: 'eidVersion.encryptionKeyReference.encryptedValue' },
         pubcid: '1111-pubcid',
         quantcastId: '1111-quantcastid',
-        sharedId: '1111-sharedid',
         tapadId: '111-tapadid',
         tdid: '1111-tdid',
         verizonMediaId: '1111-verizonmediaid',