prebid.js 9.53.2 → 9.53.4

package/test/spec/modules/timeoutRtdProvider_spec.js

@@ -1,208 +1,8 @@
-import { timeoutRtdFunctions, timeoutSubmodule } from '../../../modules/timeoutRtdProvider'
+import { timeoutRtdFunctions, timeoutSubmodule } from '../../../modules/timeoutRtdProvider.js'
 import { expect } from 'chai';
 import * as ajax from 'src/ajax.js';
 import * as prebidGlobal from 'src/prebidGlobal.js';
 
-const DEFAULT_USER_AGENT = window.navigator.userAgent;
-const DEFAULT_CONNECTION = window.navigator.connection;
-
-const PC_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.246';
-const MOBILE_USER_AGENT = 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/10.0 Mobile/14E304 Safari/602.1';
-const TABLET_USER_AGENT = 'Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148';
-
-function resetUserAgent() {
-  window.navigator.__defineGetter__('userAgent', () => DEFAULT_USER_AGENT);
-};
-
-function setUserAgent(userAgent) {
-  window.navigator.__defineGetter__('userAgent', () => userAgent);
-}
-
-function resetConnection() {
-  window.navigator.__defineGetter__('connection', () => DEFAULT_CONNECTION);
-}
-function setConnectionType(connectionType) {
-  window.navigator.__defineGetter__('connection', () => { return {'type': connectionType} });
-}
-
-describe('getDeviceType', () => {
-  afterEach(() => {
-    resetUserAgent();
-  });
-
-  [
-    // deviceType, userAgent, deviceTypeNum
-    ['pc', PC_USER_AGENT, 2],
-    ['mobile', MOBILE_USER_AGENT, 4],
-    ['tablet', TABLET_USER_AGENT, 5],
-  ].forEach(function(args) {
-    const [deviceType, userAgent, deviceTypeNum] = args;
-    it(`should be able to recognize ${deviceType} devices`, () => {
-      setUserAgent(userAgent);
-      const res = timeoutRtdFunctions.getDeviceType();
-      expect(res).to.equal(deviceTypeNum)
-    })
-  })
-});
-
-describe('getConnectionSpeed', () => {
-  afterEach(() => {
-    resetConnection();
-  });
-  [
-    // connectionType, connectionSpeed
-    ['slow-2g', 'slow'],
-    ['2g', 'slow'],
-    ['3g', 'medium'],
-    ['bluetooth', 'fast'],
-    ['cellular', 'fast'],
-    ['ethernet', 'fast'],
-    ['wifi', 'fast'],
-    ['wimax', 'fast'],
-    ['4g', 'fast'],
-    ['not known', 'unknown'],
-    [undefined, 'unknown'],
-  ].forEach(function(args) {
-    const [connectionType, connectionSpeed] = args;
-    it(`should be able to categorize connection speed when the connection type is ${connectionType}`, () => {
-      setConnectionType(connectionType);
-      const res = timeoutRtdFunctions.getConnectionSpeed();
-      expect(res).to.equal(connectionSpeed)
-    })
-  })
-});
-
-describe('Timeout modifier calculations', () => {
-  let sandbox;
-  beforeEach(() => {
-    sandbox = sinon.createSandbox();
-  });
-
-  afterEach(() => {
-    sandbox.restore();
-  });
-
-  it('should be able to detect video ad units', () => {
-    let adUnits = []
-    let res = timeoutRtdFunctions.checkVideo(adUnits);
-    expect(res).to.be.false;
-
-    adUnits = [{
-      mediaTypes: {
-        video: []
-      }
-    }];
-    res = timeoutRtdFunctions.checkVideo(adUnits);
-    expect(res).to.be.true;
-
-    adUnits = [{
-      mediaTypes: {
-        banner: []
-      }
-    }];
-    res = timeoutRtdFunctions.checkVideo(adUnits);
-    expect(res).to.be.false;
-  });
-
-  it('should calculate the timeout modifier for video', () => {
-    sandbox.stub(timeoutRtdFunctions, 'checkVideo').returns(true);
-    const rules = {
-      includesVideo: {
-        'true': 200,
-        'false': 50
-      }
-    }
-    const res = timeoutRtdFunctions.calculateTimeoutModifier([], rules);
-    expect(res).to.equal(200)
-  });
-
-  it('should calculate the timeout modifier for connectionSpeed', () => {
-    sandbox.stub(timeoutRtdFunctions, 'getConnectionSpeed').returns('slow');
-    const rules = {
-      connectionSpeed: {
-        'slow': 200,
-        'medium': 100,
-        'fast': 50
-      }
-    }
-    const res = timeoutRtdFunctions.calculateTimeoutModifier([], rules);
-    expect(res).to.equal(200);
-  });
-
-  it('should calculate the timeout modifier for deviceType', () => {
-    sandbox.stub(timeoutRtdFunctions, 'getDeviceType').returns(4);
-    const rules = {
-      deviceType: {
-        '2': 50,
-        '4': 100,
-        '5': 200
-      },
-    }
-    const res = timeoutRtdFunctions.calculateTimeoutModifier([], rules);
-    expect(res).to.equal(100)
-  });
-
-  it('should calculate the timeout modifier for ranged numAdunits', () => {
-    const rules = {
-      numAdUnits: {
-        '1-5': 100,
-        '6-10': 200,
-        '11-15': 300,
-      }
-    }
-    const adUnits = [1, 2, 3, 4, 5, 6];
-    const res = timeoutRtdFunctions.calculateTimeoutModifier(adUnits, rules);
-    expect(res).to.equal(200)
-  });
-
-  it('should calculate the timeout modifier for exact numAdunits', () => {
-    const rules = {
-      numAdUnits: {
-        '1': 100,
-        '2': 200,
-        '3': 300,
-        '4-5': 400,
-      }
-    }
-    const adUnits = [1, 2];
-    const res = timeoutRtdFunctions.calculateTimeoutModifier(adUnits, rules);
-    expect(res).to.equal(200);
-  });
-
-  it('should add up all the modifiers when all the rules are present', () => {
-    sandbox.stub(timeoutRtdFunctions, 'getConnectionSpeed').returns('slow');
-    sandbox.stub(timeoutRtdFunctions, 'getDeviceType').returns(4);
-    const rules = {
-      connectionSpeed: {
-        'slow': 200,
-        'medium': 100,
-        'fast': 50
-      },
-      deviceType: {
-        '2': 50,
-        '4': 100,
-        '5': 200
-      },
-      includesVideo: {
-        'true': 200,
-        'false': 50
-      },
-      numAdUnits: {
-        '1': 100,
-        '2': 200,
-        '3': 300,
-        '4-5': 400,
-      }
-    }
-    const res = timeoutRtdFunctions.calculateTimeoutModifier([{
-      mediaTypes: {
-        video: []
-      }
-    }], rules);
-    expect(res).to.equal(600);
-  });
-});
-
 describe('Timeout RTD submodule', () => {
   let sandbox;
   beforeEach(() => {

package/test/spec/modules/ttdBidAdapter_spec.js

@@ -559,17 +559,6 @@ describe('ttdBidAdapter', function () {
       expect(requestBody.source.ext.schain).to.deep.equal(schain);
     });
 
-    it('no longer uses userId', function () {
-      const TDID = '00000000-0000-0000-0000-000000000000';
-      let clonedBannerRequests = deepClone(baseBannerBidRequests);
-      clonedBannerRequests[0].userId = {
-        tdid: TDID
-      };
-
-      const requestBody = testBuildRequests(clonedBannerRequests, baseBidderRequest).data;
-      expect(requestBody.user.buyeruid).to.be.undefined;
-    });
-
     it('adds unified ID and UID2 info to user.ext.eids in the request', function () {
       const TDID = '00000000-0000-0000-0000-000000000000';
       const UID2 = '99999999-9999-9999-9999-999999999999';
@@ -601,28 +590,6 @@ describe('ttdBidAdapter', function () {
 
       const requestBody = testBuildRequests(clonedBannerRequests, baseBidderRequest).data;
       expect(requestBody.user.ext.eids).to.deep.equal(expectedEids);
-      expect(requestBody.user.buyeruid).to.equal(TDID);
-    });
-
-    it('has an empty buyeruid if tdid not found in userIdAsEids', function () {
-      const UID2 = '99999999-9999-9999-9999-999999999999';
-      let clonedBannerRequests = deepClone(baseBannerBidRequests);
-      clonedBannerRequests[0].userIdAsEids = [
-        {
-          source: 'uidapi.com',
-          uids: [
-            {
-              atype: 3,
-              id: UID2
-            }
-          ]
-        }
-      ];
-      const expectedEids = clonedBannerRequests[0].userIdAsEids;
-
-      const requestBody = testBuildRequests(clonedBannerRequests, baseBidderRequest).data;
-      expect(requestBody.user.ext.eids).to.deep.equal(expectedEids);
-      expect(requestBody.user.buyeruid).to.be.undefined;
     });
 
     it('adds first party site data to the request', function () {

package/test/spec/modules/userId_spec.js

@@ -11,7 +11,7 @@ import {
   requestDataDeletion,
   setStoredValue,
   setSubmoduleRegistry,
-  syncDelay,
+  syncDelay, adUnitEidsHook,
 } from 'modules/userId/index.js';
 import {UID1_EIDS} from 'libraries/uid1Eids/uid1Eids.js';
 import {createEidsArray, EID_CONFIG} from 'modules/userId/eids.js';
@@ -419,6 +419,34 @@ describe('User ID', function () {
         ]);
       });
 
+      it('should not alter values returned by adapters', () => {
+        let eid = {
+          source: 'someid.org',
+          uids: [{id: 'id-1'}]
+        };
+        const config = new Map([
+          ['someId', function () {
+            return eid;
+          }]
+        ]);
+        const userid = {
+          someId: 'id-1',
+          pubProvidedId: [{
+            source: 'someid.org',
+            uids: [{id: 'id-2'}]
+          }],
+        }
+        createEidsArray(userid, config);
+        const allEids = createEidsArray(userid, config);
+        expect(allEids).to.eql([
+          {
+            source: 'someid.org',
+            uids: [{id: 'id-1'}, {id: 'id-2'}]
+          }
+        ])
+        expect(eid.uids).to.eql([{'id': 'id-1'}])
+      });
+
       it('should filter out entire EID if none of the uids are strings', () => {
         const eids = createEidsArray({
           mockId2v3: [null],
@@ -2976,4 +3004,90 @@ describe('User ID', function () {
       });
     })
   });
+  describe('adUnitEidsHook', () => {
+    let next, auction, adUnits, ortb2Fragments;
+    beforeEach(() => {
+      next = sinon.stub();
+      adUnits = [
+        {
+          code: 'au1',
+          bids: [
+            {
+              bidder: 'bidderA'
+            },
+            {
+              bidder: 'bidderB'
+            }
+          ]
+        },
+        {
+          code: 'au2',
+          bids: [
+            {
+              bidder: 'bidderC'
+            }
+          ]
+        }
+      ]
+      ortb2Fragments = {}
+      auction = {
+        getAdUnits: () => adUnits,
+        getFPD: () => ortb2Fragments
+      }
+    });
+    it('should not set userIdAsEids when no eids are provided', () => {
+      adUnitEidsHook(next, auction);
+      auction.getAdUnits().flatMap(au => au.bids).forEach(bid => {
+        expect(bid.userIdAsEids).to.not.exist;
+      })
+    });
+    it('should add global eids', () => {
+      ortb2Fragments.global = {
+        user: {
+          ext: {
+            eids: ['some-eid']
+          }
+        }
+      };
+      adUnitEidsHook(next, auction);
+      auction.getAdUnits().flatMap(au => au.bids).forEach(bid => {
+        expect(bid.userIdAsEids).to.eql(['some-eid']);
+      })
+    })
+    it('should add bidder-specific eids', () => {
+      ortb2Fragments.global = {
+        user: {
+          ext: {
+            eids: ['global']
+          }
+        }
+      };
+      ortb2Fragments.bidder = {
+        bidderA: {
+          user: {
+            ext: {
+              eids: ['bidder']
+            }
+          }
+        }
+      }
+      adUnitEidsHook(next, auction);
+      auction.getAdUnits().flatMap(au => au.bids).forEach(bid => {
+        const expected = bid.bidder === 'bidderA' ? ['global', 'bidder'] : ['global'];
+        expect(bid.userIdAsEids).to.eql(expected);
+      })
+    });
+    it('should add global eids to bidderless bids', () => {
+      ortb2Fragments.global = {
+        user: {
+          ext: {
+            eids: ['global']
+          }
+        }
+      }
+      delete adUnits[0].bids[0].bidder;
+      adUnitEidsHook(next, auction);
+      expect(adUnits[0].bids[0].userIdAsEids).to.eql(['global']);
+    })
+  });
 });