Merge pull request #3532 from kristenwang/dev

Add previewKey in article query param based on url param

src/runtime/entitlements-manager-test.js

@@ -1825,6 +1825,61 @@ describes.realWin('EntitlementsManager', (env) => {
       );
     });
 
+    it('should use the article endpoint with preview key param', async () => {
+      manager = new EntitlementsManager(
+        win,
+        pageConfig,
+        fetcher,
+        deps,
+        /* useArticleEndpoint */ true
+      );
+
+      const article = {
+        entitlements: {},
+        clientConfig: {
+          id: 'foo',
+        },
+      };
+      const encodedParams = base64UrlEncodeFromBytes(
+        utf8EncodeSync(
+          `{"metering":{"clientTypes":[1],"owner":"pub1","resource":{"hashedCanonicalUrl":"${HASHED_CANONICAL_URL}"},"state":{"id":"u1","attributes":[]},"token":"token"}}`
+        )
+      );
+      const configId = 'test_id';
+      const previewKey = 'test_key';
+      win.location.hash = `#swg.debug=1&rrmPromptRequested=${configId}&rrmPreviewKey=${previewKey}`;
+      fetcherMock
+        .expects('fetch')
+        .withExactArgs(
+          `https://news.google.com/swg/_/api/v1/publication/pub1/article?previewConfigId=${configId}&previewKey=${previewKey}&locked=true&encodedEntitlementsParams=${encodedParams}`,
+          {
+            method: 'GET',
+            headers: {'Accept': 'text/plain, application/json'},
+            credentials: 'include',
+          }
+        )
+        .returns(
+          Promise.resolve({
+            text: () => Promise.resolve(JSON.stringify(article)),
+          })
+        );
+      expectGetSwgUserTokenToBeCalled();
+
+      const ents = await manager.getEntitlements({
+        metering: {
+          state: {
+            id: 'u1',
+          },
+        },
+      });
+
+      expect(ents.entitlements).to.deep.equal([]);
+      expect(await manager.getArticle()).to.deep.equal(
+        article,
+        'getArticle should return the article endpoint response'
+      );
+    });
+
     it('should only include METERED_BY_GOOGLE client type if explicitly enabled', async () => {
       expectGetSwgUserTokenToBeCalled();
       fetcherMock

src/runtime/entitlements-manager.ts

@@ -778,6 +778,8 @@ export class EntitlementsManager {
 
     url = addPreviewConfigIdToUrl(this.win_.location, url);
 
+    url = addPreviewKeyToUrl(this.win_.location, url);
+
     // Add encryption param.
     if (params?.encryption) {
       url = addQueryParam(url, 'crypt', params.encryption.encryptedDocumentKey);
@@ -990,6 +992,19 @@ function addPreviewConfigIdToUrl(location: Location, url: string): string {
   return addQueryParam(url, 'previewConfigId', previewConfigIdRequested);
 }
 
+/**
+ * Parses preview security key params from the given hash fragment and adds it
+ * to the given URL.
+ */
+function addPreviewKeyToUrl(location: Location, url: string): string {
+  const hashParams = parseQueryString(location.hash);
+  const previewKeyRequested = hashParams['rrmPreviewKey'];
+  if (previewKeyRequested === undefined) {
+    return url;
+  }
+  return addQueryParam(url, 'previewKey', previewKeyRequested);
+}
+
 /**
  * Convert String value of isReadyToPay
  * (from JSON or Cache) to a boolean value.