Backup CID in Storage for non-proxy origin

extensions/amp-access/0.1/amp-access.js

@@ -167,7 +167,11 @@ export class AccessService {
       const consent = Promise.resolve();
       this.readerIdPromise_ = this.cid_.then((cid) => {
         return cid.get(
-          {scope: 'amp-access', createCookieIfNotPresent: true},
+          {
+            scope: 'amp-access',
+            createCookieIfNotPresent: true,
+            backupToStorage: true,
+          },
           consent
         );
       });

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

@@ -373,7 +373,11 @@ describes.fakeWin(
       cidMock
         .expects('get')
         .withExactArgs(
-          {scope: 'amp-access', createCookieIfNotPresent: true},
+          {
+            scope: 'amp-access',
+            createCookieIfNotPresent: true,
+            backupToStorage: true,
+          },
           env.sandbox.match(() => true)
         )
         .returns(Promise.resolve(result))
@@ -799,7 +803,11 @@ describes.fakeWin(
       cidMock
         .expects('get')
         .withExactArgs(
-          {scope: 'amp-access', createCookieIfNotPresent: true},
+          {
+            scope: 'amp-access',
+            createCookieIfNotPresent: true,
+            backupToStorage: true,
+          },
           env.sandbox.match(() => true)
         )
         .returns(Promise.resolve(result))
@@ -1293,7 +1301,11 @@ describes.fakeWin(
       cidMock
         .expects('get')
         .withExactArgs(
-          {scope: 'amp-access', createCookieIfNotPresent: true},
+          {
+            scope: 'amp-access',
+            createCookieIfNotPresent: true,
+            backupToStorage: true,
+          },
           env.sandbox.match(() => true)
         )
         .returns(Promise.resolve('reader1'))
@@ -1314,7 +1326,11 @@ describes.fakeWin(
       cidMock
         .expects('get')
         .withExactArgs(
-          {scope: 'amp-access', createCookieIfNotPresent: true},
+          {
+            scope: 'amp-access',
+            createCookieIfNotPresent: true,
+            backupToStorage: true,
+          },
           env.sandbox.match(() => true)
         )
         .returns(Promise.resolve('reader1'))
@@ -1353,7 +1369,11 @@ describes.fakeWin(
       cidMock
         .expects('get')
         .withExactArgs(
-          {scope: 'amp-access', createCookieIfNotPresent: true},
+          {
+            scope: 'amp-access',
+            createCookieIfNotPresent: true,
+            backupToStorage: true,
+          },
           env.sandbox.match(() => true)
         )
         .returns(Promise.resolve('reader1'))
@@ -1871,7 +1891,11 @@ describes.fakeWin(
       cidMock
         .expects('get')
         .withExactArgs(
-          {scope: 'amp-access', createCookieIfNotPresent: true},
+          {
+            scope: 'amp-access',
+            createCookieIfNotPresent: true,
+            backupToStorage: true,
+          },
           env.sandbox.match(() => true)
         )
         .returns(Promise.resolve(result))

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

@@ -342,7 +342,7 @@ export function expandConsentEndpointUrl(element, url) {
 export function getConsentCID(node) {
   return Services.cidForDoc(node).then((cid) => {
     return cid.get(
-      {scope: CID_SCOPE, createCookieIfNotPresent: true},
+      {scope: CID_SCOPE, createCookieIfNotPresent: true, backupToStorage: true},
       /** consent */ Promise.resolve()
     );
   });

extensions/amp-experiment/0.1/test/test-variant.js

@@ -261,6 +261,7 @@ describes.sandboxed('allocateVariant', {}, (env) => {
       .withArgs({
         scope: 'amp-experiment',
         createCookieIfNotPresent: true,
+        backupToStorage: true,
       })
       .returns(Promise.resolve('123abc'));
     uniformStub.withArgs('name:123abc').returns(Promise.resolve(0.4));
@@ -279,6 +280,7 @@ describes.sandboxed('allocateVariant', {}, (env) => {
       .withArgs({
         scope: 'custom-scope',
         createCookieIfNotPresent: true,
+        backupToStorage: true,
       })
       .returns(Promise.resolve('123abc'));
     uniformStub.withArgs('name:123abc').returns(Promise.resolve(0.4));
@@ -298,6 +300,7 @@ describes.sandboxed('allocateVariant', {}, (env) => {
       .withArgs({
         scope: 'amp-experiment',
         createCookieIfNotPresent: true,
+        backupToStorage: true,
       })
       .returns(Promise.resolve('123abc'));
     uniformStub.withArgs('custom-group:123abc').returns(Promise.resolve(0.4));
@@ -325,6 +328,7 @@ describes.sandboxed('allocateVariant', {}, (env) => {
       .withArgs({
         scope: 'amp-experiment',
         createCookieIfNotPresent: true,
+        backupToStorage: true,
       })
       .returns(Promise.resolve('123abc'));
     uniformStub.withArgs('name:123abc').returns(Promise.resolve(0.4));

extensions/amp-experiment/0.1/variant.js

@@ -183,6 +183,7 @@ function getBucketTicket(ampdoc, group, opt_cidScope) {
       {
         scope: dev().assertString(opt_cidScope),
         createCookieIfNotPresent: true,
+        backupToStorage: true,
       },
       Promise.resolve()
     )

extensions/amp-experiment/1.0/test/test-variant.js

@@ -366,6 +366,7 @@ describes.sandboxed('allocateVariant', {}, (env) => {
       .withArgs({
         scope: 'amp-experiment',
         createCookieIfNotPresent: true,
+        backupToStorage: true,
       })
       .returns(Promise.resolve('123abc'));
     uniformStub.withArgs('name:123abc').returns(Promise.resolve(0.4));
@@ -390,6 +391,7 @@ describes.sandboxed('allocateVariant', {}, (env) => {
       .withArgs({
         scope: 'custom-scope',
         createCookieIfNotPresent: true,
+        backupToStorage: true,
       })
       .returns(Promise.resolve('123abc'));
     uniformStub.withArgs('name:123abc').returns(Promise.resolve(0.4));
@@ -415,6 +417,7 @@ describes.sandboxed('allocateVariant', {}, (env) => {
       .withArgs({
         scope: 'amp-experiment',
         createCookieIfNotPresent: true,
+        backupToStorage: true,
       })
       .returns(Promise.resolve('123abc'));
     uniformStub.withArgs('custom-group:123abc').returns(Promise.resolve(0.4));
@@ -448,6 +451,7 @@ describes.sandboxed('allocateVariant', {}, (env) => {
       .withArgs({
         scope: 'amp-experiment',
         createCookieIfNotPresent: true,
+        backupToStorage: true,
       })
       .returns(Promise.resolve('123abc'));
     uniformStub.withArgs('name:123abc').returns(Promise.resolve(0.4));

extensions/amp-experiment/1.0/variant.js

@@ -190,6 +190,7 @@ function getBucketTicket(ampdoc, group, opt_cidScope) {
       {
         scope: dev().assertString(opt_cidScope),
         createCookieIfNotPresent: true,
+        backupToStorage: true,
       },
       Promise.resolve()
     )

extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js

@@ -378,7 +378,11 @@ export class AmpStoryInteractive extends AMP.BaseElement {
     if (!this.clientIdPromise_) {
       this.clientIdPromise_ = this.clientIdService_.then((data) => {
         return data.get(
-          {scope: 'amp-story', createCookieIfNotPresent: true},
+          {
+            scope: 'amp-story',
+            createCookieIfNotPresent: true,
+            backupToStorage: true,
+          },
           /* consent */ Promise.resolve()
         );
       });

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

@@ -245,7 +245,10 @@ export class SubscriptionService {
       const scope =
         'amp-access' + (serviceId == 'local' ? '' : '-' + serviceId);
       readerIdPromise = this.cid_.then((cid) =>
-        cid.get({scope, createCookieIfNotPresent: true}, consent)
+        cid.get(
+          {scope, createCookieIfNotPresent: true, backupToStorage: true},
+          consent
+        )
       );
       this.serviceIdToReaderIdPromiseMap_[serviceId] = readerIdPromise;
     }

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

@@ -264,6 +264,7 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, (env) => {
         // Local service is default to "amp-access" scope.
         scope: 'amp-access',
         createCookieIfNotPresent: true,
+        backupToStorage: true,
       });
     });
 
@@ -272,6 +273,7 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, (env) => {
       expect(cidGet).to.be.calledOnce.calledWith({
         scope: 'amp-access-service1',
         createCookieIfNotPresent: true,
+        backupToStorage: true,
       });
     });
 

extensions/amp-user-notification/0.1/amp-user-notification.js

@@ -357,7 +357,7 @@ export class AmpUserNotification extends AMP.BaseElement {
       // the notification or have the nagging notification sitting there
       // (to never resolve).
       return cid.get(
-        {scope: TAG, createCookieIfNotPresent: true},
+        {scope: TAG, createCookieIfNotPresent: true, backupToStorage: true},
         Promise.resolve(),
         this.dialogPromise_
       );

spec/amp-var-substitutions.md

@@ -550,6 +550,7 @@ You can pass the following arguments into the Client ID variable like a function
 - `cid scope` (Required): The namespace for the Client ID.
 - `amp-user-notification id` (Optional): Use this argument to make the Client ID substitution dependent on the dismissal of a user notification shown to the visitor of the page. In amp-analytics, this is the same as using the [`data-consent-notification-id`](../extensions/amp-analytics/amp-analytics.md) attribute -- you may choose to use either one for the amp-analytics component.
 - `cookie name` (Optional): The name of the fallback cookie when the document is not served by an AMP proxy. If not provided, `cid scope` will be used as the cookie name.
+- `storage` (Optional): Whether to stored the AMP generated CID in Storage as backup, when the document is not served by an AMP proxy. Default value is `true`.
 
 #### Content Load Time
 

src/ad-cid.js

@@ -61,6 +61,7 @@ export function getOrCreateAdCid(
           scope: dev().assertString(clientIdScope),
           createCookieIfNotPresent: true,
           cookieName: opt_clientIdCookieName,
+          backupToStorage: true,
         },
         Promise.resolve(undefined)
       )