User ID auctionDelay timeout bugfix (prebid#4982)

* auctiontimeout bugfix * move clearTimeout outside forEach * move setTimout above the function call * increase auctionDelay
happypancake · Jun 22, 2020 · a8d9038 · a8d9038
1 parent c4cdc66
commit a8d9038
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/modules/userId/index.js b/modules/userId/index.js
@@ -144,6 +144,9 @@ let configRegistry = [];
 /** @type {Submodule[]} */
 let submoduleRegistry = [];
 
+/** @type {(number|undefined)} */
+let timeoutID;
+
 /** @type {(number|undefined)} */
 export let syncDelay;
 
@@ -256,6 +259,7 @@ function processSubmoduleCallbacks(submodules, cb) {
     // clear callback, this prop is used to test if all submodule callbacks are complete below
     submodule.callback = undefined;
   });
+  clearTimeout(timeoutID);
 }
 
 /**
@@ -322,9 +326,9 @@ function initializeSubmodulesAndExecuteCallbacks(continueAuction) {
             }
           }
           utils.logInfo(`${MODULE_NAME} - auction delayed by ${auctionDelay} at most to fetch ids`);
-          processSubmoduleCallbacks(submodulesWithCallbacks, continueCallback);
 
-          setTimeout(continueCallback, auctionDelay);
+          timeoutID = setTimeout(continueCallback, auctionDelay);
+          processSubmoduleCallbacks(submodulesWithCallbacks, continueCallback);
         } else {
           // wait for auction complete before processing submodule callbacks
           events.on(CONSTANTS.EVENTS.AUCTION_END, function auctionEndHandler() {

diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
@@ -419,7 +419,7 @@ describe('User ID', function() {
 
     beforeEach(function() {
       sandbox = sinon.createSandbox();
-      sandbox.stub(global, 'setTimeout');
+      sandbox.stub(global, 'setTimeout').returns(2);
       sandbox.stub(events, 'on');
 
       // remove cookie
@@ -597,8 +597,8 @@ describe('User ID', function() {
       coreStorage.setCookie('MOCKID', JSON.stringify({'MOCKID': '123456778'}), new Date(Date.now() + 5000).toUTCString());
 
       config.setConfig({
-        userSync: {
-          auctionDelay: 33,
+        usersync: {
+          auctionDelay: 200,
           syncDelay: 77,
           userIds: [{
             name: 'mockId', storage: { name: 'MOCKID', type: 'cookie' }