Remember metering entitlements were checked

extensions/amp-subscriptions-google/0.1/amp-subscriptions-google.js

@@ -652,12 +652,12 @@ export class GoogleSubscriptionsPlatform {
           this.runtime_.clear();
 
           entitlementsParams.metering = {state: meteringState};
-
-          // Remember we requested metering entitlements.
-          // This helps avoid redundant fetches for metering entitlements.
-          this.serviceAdapter_.rememberMeteringEntitlementsWereFetched();
         }
 
+        // Remember we checked for metering entitlements.
+        // This helps avoid redundant fetches for metering entitlements.
+        this.serviceAdapter_.rememberMeteringEntitlementsWereChecked();
+
         return this.runtime_
           .getEntitlements(entitlementsParams)
           .then((swgEntitlements) =>

extensions/amp-subscriptions/0.1/amp-subscriptions.js

@@ -633,7 +633,7 @@ export class SubscriptionService {
         return;
       }
 
-      if (this.metering_.entitlementsWereFetchedWithCurrentMeteringState) {
+      if (this.metering_.checkedForEntitlements) {
         // Move along.
         // The current metering state isn't granting.
         continueAuthorizationFlow();
@@ -770,7 +770,7 @@ export class SubscriptionService {
     this.renderer_.toggleLoading(true);
 
     if (this.metering_) {
-      this.metering_.entitlementsWereFetchedWithCurrentMeteringState = false;
+      this.metering_.checkedForEntitlements = false;
     }
 
     this.platformStore_

extensions/amp-subscriptions/0.1/metering.js

@@ -31,7 +31,7 @@ export class Metering {
      * This helps avoid redundant fetches.
      * @type {boolean}
      */
-    this.entitlementsWereFetchedWithCurrentMeteringState = false;
+    this.checkedForEntitlements = false;
 
     /**
      * Key for the subscription platform with metering enabled.
@@ -80,7 +80,7 @@ export class Metering {
       }
 
       this.meteringStateString_ = meteringStateString;
-      this.entitlementsWereFetchedWithCurrentMeteringState = false;
+      this.checkedForEntitlements = false;
     });
   }
 

extensions/amp-subscriptions/0.1/service-adapter.js

@@ -141,16 +141,16 @@ export class ServiceAdapter {
   }
 
   /**
-   * Remembers metering entitlements were fetched
+   * Remembers metering entitlements were checked
    * with the current metering state.
    *
    * This helps avoid redundant fetches.
    */
-  rememberMeteringEntitlementsWereFetched() {
+  rememberMeteringEntitlementsWereChecked() {
     if (!this.subscriptionService_.metering_) {
       return;
     }
 
-    this.subscriptionService_.metering_.entitlementsWereFetchedWithCurrentMeteringState = true;
+    this.subscriptionService_.metering_.checkedForEntitlements = true;
   }
 }

extensions/amp-subscriptions/0.1/test/test-amp-subscriptions.js

@@ -718,7 +718,7 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, (env) => {
 
       env.sandbox.stub(platform, 'activate');
       env.sandbox.stub(platform, 'getEntitlements').callsFake(() => {
-        subscriptionService.metering_.entitlementsWereFetchedWithCurrentMeteringState = true;
+        subscriptionService.metering_.checkedForEntitlements = true;
         return Promise.resolve();
       });
       env.sandbox.stub(renderer, 'setGrantState');
@@ -790,7 +790,7 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, (env) => {
         platformStore.getGrantStatus.resolves(false);
 
         // We already fetched entitlements with the current metering state.
-        subscriptionService.metering_.entitlementsWereFetchedWithCurrentMeteringState = true;
+        subscriptionService.metering_.checkedForEntitlements = true;
 
         subscriptionService.startAuthorizationFlow_();
         await flush();
@@ -881,14 +881,11 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, (env) => {
     });
 
     it('should clear metering flag(s), if metering is enabled', async () => {
-      subscriptionService.metering_.entitlementsWereFetchedWithCurrentMeteringState = true;
+      subscriptionService.metering_.checkedForEntitlements = true;
 
       await subscriptionService.resetPlatforms();
 
-      expect(
-        subscriptionService.metering_
-          .entitlementsWereFetchedWithCurrentMeteringState
-      ).to.be.false;
+      expect(subscriptionService.metering_.checkedForEntitlements).to.be.false;
     });
   });
 

extensions/amp-subscriptions/0.1/test/test-metering.js

@@ -23,12 +23,11 @@ describes.fakeWin('Metering', {amp: true}, () => {
     });
 
     it('resets flag', async () => {
-      metering.entitlementsWereFetchedWithCurrentMeteringState = true;
+      metering.checkedForEntitlements = true;
 
       await metering.saveMeteringState({new: true});
 
-      expect(metering.entitlementsWereFetchedWithCurrentMeteringState).to.be
-        .false;
+      expect(metering.checkedForEntitlements).to.be.false;
     });
   });
 

extensions/amp-subscriptions/0.1/test/test-service-adapter.js

@@ -185,17 +185,12 @@ describes.realWin(
 
     describe('rememberMeteringEntitlementsWereFetched', () => {
       it('should update flag', async () => {
-        expect(
-          subscriptionService.metering_
-            .entitlementsWereFetchedWithCurrentMeteringState
-        ).to.be.false;
+        expect(subscriptionService.metering_.checkedForEntitlements).to.be
+          .false;
 
         serviceAdapter.rememberMeteringEntitlementsWereFetched();
 
-        expect(
-          subscriptionService.metering_
-            .entitlementsWereFetchedWithCurrentMeteringState
-        ).to.be.true;
+        expect(subscriptionService.metering_.checkedForEntitlements).to.be.true;
       });
 
       it('should handle metering being disabled', async () => {