From d1b75c2883a6d76ea2760636b421378c24423a2b Mon Sep 17 00:00:00 2001
From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com>
Date: Tue, 18 Jun 2019 12:04:44 -0400
Subject: [PATCH] Fix #3813 move auctionEnd events so it always executes when
 auction completes (#3841)

* move auctionEnd events so it always executes

* remove some commented code
---
 src/auction.js                   | 25 +++++++++++++------------
 test/spec/auctionmanager_spec.js | 11 +++++++++--
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/auction.js b/src/auction.js
index 1d758997035..a1e8c33adfb 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -140,7 +140,7 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
       clearTimeout(_timer);
     }
 
-    if (_callback != null) {
+    if (_auctionEnd === undefined) {
       let timedOutBidders = [];
       if (timedOut) {
         utils.logMessage(`Auction ${_auctionId} timedOut`);
@@ -150,17 +150,19 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
         }
       }
 
-      try {
-        _auctionStatus = AUCTION_COMPLETED;
-        _auctionEnd = Date.now();
-
-        events.emit(CONSTANTS.EVENTS.AUCTION_END, getProperties());
+      _auctionStatus = AUCTION_COMPLETED;
+      _auctionEnd = Date.now();
 
-        const adUnitCodes = _adUnitCodes;
-        const bids = _bidsReceived
-          .filter(utils.bind.call(adUnitsFilter, this, adUnitCodes))
-          .reduce(groupByPlacement, {});
-        _callback.apply($$PREBID_GLOBAL$$, [bids, timedOut]);
+      events.emit(CONSTANTS.EVENTS.AUCTION_END, getProperties());
+      try {
+        if (_callback != null) {
+          const adUnitCodes = _adUnitCodes;
+          const bids = _bidsReceived
+            .filter(utils.bind.call(adUnitsFilter, this, adUnitCodes))
+            .reduce(groupByPlacement, {});
+          _callback.apply($$PREBID_GLOBAL$$, [bids, timedOut]);
+          _callback = null;
+        }
       } catch (e) {
         utils.logError('Error executing bidsBackHandler', null, e);
       } finally {
@@ -175,7 +177,6 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
           syncUsers(userSyncConfig.syncDelay);
         }
       }
-      _callback = null;
     }
   }
 
diff --git a/test/spec/auctionmanager_spec.js b/test/spec/auctionmanager_spec.js
index 2d8ee562ce4..577b1bec333 100644
--- a/test/spec/auctionmanager_spec.js
+++ b/test/spec/auctionmanager_spec.js
@@ -1,4 +1,4 @@
-import { getKeyValueTargetingPairs, auctionCallbacks } from 'src/auction';
+import { getKeyValueTargetingPairs, auctionCallbacks, AUCTION_COMPLETED } from 'src/auction';
 import CONSTANTS from 'src/constants.json';
 import { adjustBids } from 'src/auction';
 import * as auctionModule from 'src/auction';
@@ -783,7 +783,8 @@ describe('auctionmanager.js', function () {
         server.restore();
         events.emit.restore();
       });
-      it('should emit BID_TIMEOUT for timed out bids', function (done) {
+
+      it('should emit BID_TIMEOUT and AUCTION_END for timed out bids', function (done) {
         const spec1 = mockBidder(BIDDER_CODE, [bids[0]]);
         registerBidder(spec1);
         const spec2 = mockBidder(BIDDER_CODE1, [bids[1]]);
@@ -797,6 +798,12 @@ describe('auctionmanager.js', function () {
           const timedOutBids = bidTimeoutCall.args[1];
           assert.equal(timedOutBids.length, 1);
           assert.equal(timedOutBids[0].bidder, BIDDER_CODE1);
+
+          const auctionEndCall = eventsEmitSpy.withArgs(CONSTANTS.EVENTS.AUCTION_END).getCalls()[0];
+          const auctionProps = auctionEndCall.args[1];
+          assert.equal(auctionProps.adUnits, adUnits);
+          assert.equal(auctionProps.timeout, 20);
+          assert.equal(auctionProps.auctionStatus, AUCTION_COMPLETED)
           done();
         }
         auction = auctionModule.newAuction({adUnits, adUnitCodes, callback: auctionCallback, cbTimeout: 20});