no caching for now

Author: Micajuine Ho

extensions/amp-consent/0.1/amp-consent.js

@@ -420,6 +420,7 @@ export class AmpConsent extends AMP.BaseElement {
    */
   init_() {
     this.passSharedData_();
+    this.setGdprApplies();
     this.syncRemoteConsentState_();
 
     this.getConsentRequiredPromise_()
@@ -482,6 +483,28 @@ export class AmpConsent extends AMP.BaseElement {
     this.consentStateManager_.setConsentInstanceSharedData(sharedDataPromise);
   }
 
+  /**
+   * Create and set gdprApplies promise form consent manager.
+   * Default value to `consentRequired`, if no `gdprApplies`
+   * value is provided.
+   *
+   */
+  setGdprApplies() {
+    const responsePromise = this.getConsentRemote_();
+    const gdprAppliesPromise = responsePromise.then((response) => {
+      if (
+        !response ||
+        response['gdprApplies'] === undefined ||
+        typeof response['gdprApplies'] !== 'boolean'
+      ) {
+        return this.getConsentRequiredPromise_();
+      }
+      return response['gdprApplies'];
+    });
+
+    this.consentStateManager_.setConsentInstanceGdprApplies(gdprAppliesPromise);
+  }
+
   /**
    * Clear cache for server side decision and then sync.
    */
@@ -504,34 +527,24 @@ export class AmpConsent extends AMP.BaseElement {
       ) {
         this.updateCacheIfNotNull_(
           response['consentStateValue'],
-          response['consentString'] || undefined,
-          response['gdprApplies'] !== undefined
-            ? response['gdprApplies']
-            : !!response['consentRequired']
+          response['consentString'] || undefined
         );
       }
     });
   }
 
   /**
    * Sync with local storage if consentRequired is true.
-   * Treat all three values as a grouping, only update cache
-   * if responseStateValue is not null
    * @param {string=} responseStateValue
    * @param {string=} responseConsentString
-   * @param {boolean=} responseGdprApplies
    */
-  updateCacheIfNotNull_(
-    responseStateValue,
-    responseConsentString,
-    responseGdprApplies
-  ) {
+  updateCacheIfNotNull_(responseStateValue, responseConsentString) {
     const consentStateValue = convertEnumValueToState(responseStateValue);
+    // consentStateValue and consentString are treated as a pair that will update together
     if (consentStateValue !== null) {
       this.consentStateManager_.updateConsentInstanceState(
         consentStateValue,
-        responseConsentString,
-        responseGdprApplies
+        responseConsentString
       );
     }
   }

extensions/amp-consent/0.1/consent-info.js

@@ -23,14 +23,12 @@ import {isEnumValue, isObject} from '../../../src/types';
  * STATE: Set when user accept or reject consent.
  * STRING: Set when a consent string is used to store more granular consent info
  * on vendors.
- * GDPR: Set when the gdprApplies value of TCF v2 is sent from vendors.
  * DITRYBIT: Set when the stored consent info need to be revoked next time.
  * @enum {string}
  */
 export const STORAGE_KEY = {
   STATE: 's',
   STRING: 'r',
-  GDPR: 'g',
   IS_DIRTY: 'd',
 };
 
@@ -52,7 +50,6 @@ export const CONSENT_ITEM_STATE = {
  * @typedef {{
  *  consentState: CONSENT_ITEM_STATE,
  *  consentString: (string|undefined),
- *  gdprApplies: (boolean|undefined)
  *  isDirty: (boolean|undefined),
  * }}
  */
@@ -68,7 +65,6 @@ export function getStoredConsentInfo(value) {
     return constructConsentInfo(
       CONSENT_ITEM_STATE.UNKNOWN,
       undefined,
-      undefined,
       undefined
     );
   }
@@ -84,9 +80,6 @@ export function getStoredConsentInfo(value) {
   return constructConsentInfo(
     consentState,
     value[STORAGE_KEY.STRING],
-    value[STORAGE_KEY.GDPR] !== undefined
-      ? value[STORAGE_KEY.GDPR] === 1
-      : undefined,
     value[STORAGE_KEY.IS_DIRTY] && value[STORAGE_KEY.IS_DIRTY] === 1
   );
 }
@@ -148,11 +141,6 @@ export function composeStoreValue(consentInfo) {
     obj[STORAGE_KEY.STRING] = consentInfo['consentString'];
   }
 
-  // g:(0|1|undefined)
-  if (consentInfo['gdprApplies'] !== undefined) {
-    obj[STORAGE_KEY.GDPR] = consentInfo['gdprApplies'] ? 1 : 0;
-  }
-
   if (consentInfo['isDirty'] === true) {
     obj[STORAGE_KEY.IS_DIRTY] = 1;
   }
@@ -197,14 +185,13 @@ export function isConsentInfoStoredValueSame(infoA, infoB, opt_isDirty) {
       calculateLegacyStateValue(infoB['consentState']);
     const stringEqual =
       (infoA['consentString'] || '') === (infoB['consentString'] || '');
-    const gdprAppliesEqual = infoA['gdprApplies'] === infoB['gdprApplies'];
     let isDirtyEqual;
     if (opt_isDirty) {
       isDirtyEqual = !!infoA['isDirty'] === !!opt_isDirty;
     } else {
       isDirtyEqual = !!infoA['isDirty'] === !!infoB['isDirty'];
     }
-    return stateEqual && stringEqual && gdprAppliesEqual && isDirtyEqual;
+    return stateEqual && stringEqual && isDirtyEqual;
   }
   return false;
 }
@@ -216,27 +203,24 @@ export function isConsentInfoStoredValueSame(infoA, infoB, opt_isDirty) {
  */
 function getLegacyStoredConsentInfo(value) {
   const state = convertValueToState(value);
-  return constructConsentInfo(state, undefined, undefined, undefined);
+  return constructConsentInfo(state, undefined, undefined);
 }
 
 /**
  * Construct the consentInfo object from values
  * @param {CONSENT_ITEM_STATE} consentState
  * @param {string=} opt_consentString
- * @param {boolean=} opt_gdprApplies
  * @param {boolean=} opt_isDirty
  * @return {!ConsentInfoDef}
  */
 export function constructConsentInfo(
   consentState,
   opt_consentString,
-  opt_gdprApplies,
   opt_isDirty
 ) {
   return {
     'consentState': consentState,
     'consentString': opt_consentString,
-    'gdprApplies': opt_gdprApplies,
     'isDirty': opt_isDirty,
   };
 }

extensions/amp-consent/0.1/consent-policy-manager.js

@@ -76,9 +76,6 @@ export class ConsentPolicyManager {
 
     /** @private {?string} */
     this.consentString_ = null;
-
-    /** @private {?string} */
-    this.gdprApplies_ = null;
   }
 
   /**
@@ -182,14 +179,9 @@ export class ConsentPolicyManager {
   consentStateChangeHandler_(info) {
     const state = info['consentState'];
     const consentStr = info['consentString'];
-    const gdprApplies = info['gdprApplies'];
-    const {
-      consentString_: prevConsentStr,
-      gdprApplies_: prevGdprApplies,
-    } = this;
+    const {consentString_: prevConsentStr} = this;
 
     this.consentString_ = consentStr;
-    this.gdprApplies_ = gdprApplies;
     if (state === CONSENT_ITEM_STATE.UNKNOWN) {
       // consent state has not been resolved yet.
       return;
@@ -208,9 +200,8 @@ export class ConsentPolicyManager {
       if (this.consentState_ === null) {
         this.consentState_ = CONSENT_ITEM_STATE.UNKNOWN;
       }
-      // consentString and gdprApplies doesn't change with dismiss action
+      // consentString doesn't change with dismiss action
       this.consentString_ = prevConsentStr;
-      this.gdprApplies_ = prevGdprApplies;
     } else {
       this.consentState_ = state;
     }
@@ -279,26 +270,28 @@ export class ConsentPolicyManager {
   }
 
   /**
-   * Get the consent string value of a policy. Return a promise that resolves
-   * when the policy resolves.
+   * Get gdprApplies value of a policy.
+   *
    * @param {string} policyId
-   * @return {!Promise<?string>}
+   * @return {!Promise<Object>}
    */
-  getConsentStringInfo(policyId) {
-    return this.whenPolicyResolved(policyId).then(() => {
-      return this.consentString_;
-    });
+  getGdprAppliesInfo(policyId) {
+    return this.whenPolicyResolved(policyId)
+      .then(() => this.ConsentStateManagerPromise_)
+      .then((manager) => {
+        return manager.getConsentInstanceGdprApplies();
+      });
   }
 
   /**
-   * Get the gdprApplies value of a policy. Return a promise that resolves
+   * Get the consent string value of a policy. Return a promise that resolves
    * when the policy resolves.
    * @param {string} policyId
-   * @return {!Promise<?boolean>}
+   * @return {!Promise<?string>}
    */
-  getGdprAppliesInfo(policyId) {
+  getConsentStringInfo(policyId) {
     return this.whenPolicyResolved(policyId).then(() => {
-      return this.gdprApplies_;
+      return this.consentString_;
     });
   }
 

extensions/amp-consent/0.1/consent-state-manager.js

@@ -94,19 +94,16 @@ export class ConsentStateManager {
    *
    * @param {CONSENT_ITEM_STATE} state
    * @param {string=} consentStr
-   * @param {boolean=} gdprApplies
    */
-  updateConsentInstanceState(state, consentStr, gdprApplies) {
+  updateConsentInstanceState(state, consentStr) {
     if (!this.instance_) {
       dev().error(TAG, 'instance not registered');
       return;
     }
-    this.instance_.update(state, consentStr, gdprApplies, false);
+    this.instance_.update(state, consentStr, false);
 
     if (this.consentChangeHandler_) {
-      this.consentChangeHandler_(
-        constructConsentInfo(state, consentStr, gdprApplies)
-      );
+      this.consentChangeHandler_(constructConsentInfo(state, consentStr));
     }
   }
 
@@ -165,6 +162,17 @@ export class ConsentStateManager {
     this.instance_.sharedDataPromise = sharedDataPromise;
   }
 
+  /**
+   * Sets a promise which resolves to a shareData object that is to be returned
+   * from the remote endpoint.
+   *
+   * @param {!Promise<boolean>} gdprAppliesPromise
+   */
+  setConsentInstanceGdprApplies(gdprAppliesPromise) {
+    devAssert(this.instance_, '%s: cannot find the instance', TAG);
+    this.instance_.gdprAppliesPromise = gdprAppliesPromise;
+  }
+
   /**
    * Sets the dirty bit so current consent info won't be used for
    * decision making on next visit
@@ -184,6 +192,16 @@ export class ConsentStateManager {
     return this.instance_.sharedDataPromise;
   }
 
+  /**
+   * Returns a promise that resolves to a gdprApplies value
+   *
+   * @return {?Promise<?Object>}
+   */
+  getConsentInstanceGdprApplies() {
+    devAssert(this.instance_, '%s: cannot find the instance', TAG);
+    return this.instance_.gdprAppliesPromise;
+  }
+
   /**
    * Returns a promise that's resolved when consent instance is ready.
    * @return {*} TODO(#23582): Specify return type
@@ -230,6 +248,9 @@ export class ConsentInstance {
     /** @public {?Promise<Object>} */
     this.sharedDataPromise = null;
 
+    /** @public {?Promise<boolean>} */
+    this.gdprAppliesPromise = null;
+
     /** @private {Promise<!../../../src/service/storage-impl.Storage>} */
     this.storagePromise_ = Services.storageForDoc(ampdoc);
 
@@ -267,37 +288,28 @@ export class ConsentInstance {
         // No need to update with dirtyBit
         return;
       }
-      this.update(
-        info['consentState'],
-        info['consentString'],
-        info['gdprApplies'],
-        true
-      );
+      this.update(info['consentState'], info['consentString'], true);
     });
   }
 
   /**
    * Update the local consent state list
    * @param {!CONSENT_ITEM_STATE} state
    * @param {string=} consentString
-   * @param {boolean=} gdprApplies
    * @param {boolean=} opt_systemUpdate
    */
-  update(state, consentString, gdprApplies, opt_systemUpdate) {
+  update(state, consentString, opt_systemUpdate) {
     const localState =
       this.localConsentInfo_ && this.localConsentInfo_['consentState'];
     const calculatedState = recalculateConsentStateValue(state, localState);
 
     if (state === CONSENT_ITEM_STATE.DISMISSED) {
       const localConsentStr =
         this.localConsentInfo_ && this.localConsentInfo_['consentString'];
-      const localGdprApplies =
-        this.localConsentInfo_ && this.localConsentInfo_['gdprApplies'];
       // If state is dismissed, use the old consent string.
       this.localConsentInfo_ = constructConsentInfo(
         calculatedState,
-        localConsentStr,
-        localGdprApplies
+        localConsentStr
       );
       return;
     }
@@ -309,23 +321,20 @@ export class ConsentInstance {
       this.localConsentInfo_ = constructConsentInfo(
         calculatedState,
         consentString,
-        gdprApplies,
         true
       );
     } else {
       // Any user update makes the current state valid, thus remove dirtyBit
       // from localConsentInfo_
       this.localConsentInfo_ = constructConsentInfo(
         calculatedState,
-        consentString,
-        gdprApplies
+        consentString
       );
     }
 
     const newConsentInfo = constructConsentInfo(
       calculatedState,
       consentString,
-      gdprApplies,
       this.hasDirtyBitNext_
     );
 
@@ -476,9 +485,6 @@ export class ConsentInstance {
       if (consentInfo['consentString']) {
         request['consentString'] = consentInfo['consentString'];
       }
-      if (consentInfo['gdprApplies'] !== undefined) {
-        request['gdprApplies'] = consentInfo['gdprApplies'];
-      }
       const init = {
         credentials: 'include',
         method: 'POST',