Delaying ref headers fetch until after startup

app/browser/api/ledger.js

@@ -91,6 +91,7 @@ let promotionTimeoutId
 let togglePromotionTimeoutId
 let publisherInfoTimeoutId = false
 let publisherInfoUpdateIntervalId
+let promoRefFetchTimeoutId = false
 
 // Database
 let v2RulesetDB
@@ -133,6 +134,8 @@ let referralAPI = 'key'
 if (clientOptions.environment === 'production') {
   referralServer = 'https://laptop-updates.brave.com'
   referralAPI = config.referralAPI || process.env.LEDGER_REFERRAL_API_KEY || ''
+} else {
+  referralAPI = process.env.LEDGER_REFERRAL_API_KEY || referralAPI
 }
 
 const fileTypes = {
@@ -2366,22 +2369,6 @@ const initialize = (state, paymentsEnabled) => {
     }
   }
 
-  if (updateState.getUpdateProp(state, 'referralDownloadId') == null) {
-    promoCodeFirstRunStorage
-      .readFirstRunPromoCode()
-      .then((code) => {
-        onReferralCodeRead(code)
-      })
-      .catch(error => {
-        if (clientOptions.verboseP) {
-          console.error('read error: ' + error.toString())
-        }
-        fetchReferralHeaders()
-      })
-  } else {
-    fetchReferralHeaders()
-  }
-
   // Get referral headers every day
   setInterval(() => fetchReferralHeaders, (24 * ledgerUtil.milliseconds.hour))
 
@@ -2453,6 +2440,39 @@ const initialize = (state, paymentsEnabled) => {
   }
 }
 
+const schedulePromoRefFetch = () => {
+  if (promoRefFetchTimeoutId) {
+    clearTimeout(promoRefFetchTimeoutId)
+  }
+
+  promoRefFetchTimeoutId = setTimeout(() => {
+    appActions.onPromoRefFetch()
+  }, random.randomInt({min: 50 * ledgerUtil.milliseconds.second, max: 70 * ledgerUtil.milliseconds.second}))
+}
+
+const onRunPromoRefFetch = (state) => {
+  if (updateState.getUpdateProp(state, 'referralDownloadId') == null) {
+    module.exports.firstRunPromoCode()
+  } else {
+    module.exports.fetchReferralHeaders()
+  }
+  return state
+}
+
+const firstRunPromoCode = () => {
+  promoCodeFirstRunStorage
+    .readFirstRunPromoCode()
+    .then((code) => {
+      onReferralCodeRead(code)
+    })
+    .catch(error => {
+      if (clientOptions.verboseP) {
+        console.error('read error: ' + error.toString())
+      }
+      fetchReferralHeaders()
+    })
+}
+
 const getContributionAmount = (state) => {
   return ledgerState.getContributionAmount(state)
 }
@@ -3405,7 +3425,11 @@ const getMethods = () => {
     checkPublisherInfoUpdate,
     updatePublishersInfo,
     runPublishersUpdate,
-    checkBrowserActivityTime
+    checkBrowserActivityTime,
+    firstRunPromoCode,
+    fetchReferralHeaders,
+    schedulePromoRefFetch,
+    onRunPromoRefFetch
   }
 
   let privateMethods = {}

app/browser/reducers/ledgerReducer.js

@@ -609,12 +609,18 @@ const ledgerReducer = (state, action, immutableAction) => {
         state = ledgerApi.checkBrowserActivityTime(state)
         break
       }
+    case appConstants.APP_ON_PROMO_REF_FETCH:
+      {
+        state = ledgerApi.onRunPromoRefFetch(state)
+        break
+      }
   }
   return state
 }
 
 process.on(messages.APP_INITIALIZED, () => {
   ledgerApi.runPromotionCheck()
+  ledgerApi.schedulePromoRefFetch()
 })
 
 module.exports = ledgerReducer

js/actions/appActions.js

@@ -2141,6 +2141,12 @@ const appActions = {
     dispatch({
       actionType: appConstants.APP_ON_CHECK_BROWSER_ACTIVITY_TIME
     })
+  },
+
+  onPromoRefFetch: function () {
+    dispatch({
+      actionType: appConstants.APP_ON_PROMO_REF_FETCH
+    })
   }
 }
 

js/constants/appConstants.js

@@ -219,7 +219,8 @@ const appConstants = {
   APP_ON_PUBLISHERS_INFO_RECEIVED: _,
   APP_ON_PUBLISHERS_INFO_WRITE: _,
   APP_ON_PUBLISHERS_INFO_READ: _,
-  APP_ON_CHECK_BROWSER_ACTIVITY_TIME: _
+  APP_ON_CHECK_BROWSER_ACTIVITY_TIME: _,
+  APP_ON_PROMO_REF_FETCH: _
 }
 
 module.exports = mapValuesByKeys(appConstants)

test/unit/app/browser/api/ledgerTest.js

@@ -2715,6 +2715,75 @@ describe('ledger api unit tests', function () {
     })
   })
 
+  describe('schedulePromoRefFetch', function () {
+    const fortySeconds = 40000
+    const seventySeconds = 70000
+    let fakeClock, onPromoRefFetchSpy
+
+    before(function () {
+      fakeClock = sinon.useFakeTimers()
+      onPromoRefFetchSpy = sinon.spy(appActions, 'onPromoRefFetch')
+    })
+
+    after(function () {
+      fakeClock.restore()
+      onPromoRefFetchSpy.restore()
+    })
+
+    afterEach(function () {
+      onPromoRefFetchSpy.reset()
+    })
+
+    it('dispatches onPromoRefFetch after 50 - 70 seconds', function () {
+      ledgerApi.schedulePromoRefFetch(defaultAppState)
+      fakeClock.tick(seventySeconds)
+      assert(onPromoRefFetchSpy.calledOnce)
+    })
+
+    it('does not dispatch onPromoRefFetch after 40 seconds', function () {
+      ledgerApi.schedulePromoRefFetch(defaultAppState)
+      fakeClock.tick(fortySeconds)
+      assert(onPromoRefFetchSpy.notCalled)
+    })
+  })
+
+  describe('onRunPromoRefFetch', function () {
+    let fakeRoundtrip, firstRunPromoCodeSpy, fetchReferralHeadersSpy
+
+    before(function () {
+      fakeRoundtrip = sinon.stub(ledgerApi, 'roundtrip')
+      firstRunPromoCodeSpy = sinon.spy(ledgerApi, 'firstRunPromoCode')
+      fetchReferralHeadersSpy = sinon.spy(ledgerApi, 'fetchReferralHeaders')
+    })
+
+    after(function () {
+      fakeRoundtrip.restore()
+      firstRunPromoCodeSpy.restore()
+      fetchReferralHeadersSpy.restore()
+    })
+
+    afterEach(function () {
+      fakeRoundtrip.reset()
+      firstRunPromoCodeSpy.reset()
+      fetchReferralHeadersSpy.reset()
+    })
+
+    it('calls firstRunPromoCode when download id is null', function () {
+      const state = defaultAppState
+        .setIn(['updates', 'referralDownloadId'], null)
+      ledgerApi.onRunPromoRefFetch(state)
+      assert(firstRunPromoCodeSpy.calledOnce)
+    })
+
+    it('does not call firstRunPromoCode and delays fetchReferralHeaders when download id exists', function () {
+      const state = defaultAppState
+        .setIn(['updates', 'referralDownloadId'], 9999)
+      ledgerApi.onRunPromoRefFetch(state)
+      assert(firstRunPromoCodeSpy.notCalled)
+      assert(fetchReferralHeadersSpy.calledOnce)
+    })
+  })
+
   describe('checkReferralActivity', function () {
     let checkForUpdateSpy, roundtripSpy, fakeClock