@lighthouse/common 4.37.0-canary-6 → 4.37.0-canary-8

package/dist/helpers/build-fetch-url/index.js

@@ -20,8 +20,9 @@ function buildFetchUrl(url, options) {
     cloudfrontBaseUrl,
     cloudinaryBaseUrl
   });
+  const shouldUseCloudfront = cloudfrontBaseUrl && cloudfrontBaseUrl.includes('.cloudfront.net');
 
-  if (cloudfrontBaseUrl) {
+  if (shouldUseCloudfront) {
     console.info('Using CloudFront base URL', cloudfrontBaseUrl);
     const transformations = [];
     let transformationsString = '';
@@ -29,6 +30,7 @@ function buildFetchUrl(url, options) {
     if (height) transformations.push(`h_${height.toString()}`);
     if (quality) transformations.push(`q_${quality.toString()}`);
     if (fit) transformations.push('c_fit');
+    transformationsString = `${transformations.join(',')}/`;
     const fetchUrl = `${cloudfrontBaseUrl}/${transformationsString}${awsS3BaseUrl}/${url}`;
     return fetchUrl;
   }

package/dist/helpers/fetch-image/index.js

@@ -20,7 +20,7 @@ var _constants = require("../../constants");
 
 var _images = require("../../images");
 
-var _getCloudfrontCookies = require("../get-cloudfront-cookies");
+var _generateCloudfrontJwt = require("../generate-cloudfront-jwt");
 
 // NOTE use the native fetch if it's available in the browser, because the
 // ponyfill (which actually uses the github polyfill) does not support all the
@@ -53,57 +53,64 @@ function fetchImage(url, options = {}) {
   const {
     isHeader = false
   } = options;
-  return shouldUseCloudfront ? (async () => {
-    fetchOptions.credentials = 'include'; // Ensure cookies are sent with the request
-
-    const signedCookies = await (0, _getCloudfrontCookies.generateCloudFrontCookies)({
-      userId: 'anonymous',
-      applicationId
-    });
-    fetchOptions.headers.Cookie = Object.entries(signedCookies).map(([key, value]) => `${key}=${value}`).join('; ');
-    return fetch(encodedUrl, fetchOptions).then(response => {
-      const contentHeader = response.headers.get('content-length');
-      const contentType = response.headers.get('content-type'); // NOTE: the response will be ok but we won't be able to render any
-      // image meaning pdfmake will error. Raise error here and return early.
-
-      if (contentHeader === '0') {
-        return _bluebird.default.reject(new Error(`Failed to fetch image as no content length: ${encodedUrl}`));
-      }
 
-      if (!response.ok) {
-        return _bluebird.default.reject(new Error(`Failed to fetch image: ${encodedUrl}`));
+  if (shouldUseCloudfront) {
+    return (async () => {
+      fetchOptions.credentials = 'include'; // Ensure cookies are sent with the request
+
+      const token = await (0, _generateCloudfrontJwt.generateCloudFrontJWT)(applicationId);
+
+      if (!fetchOptions.headers) {
+        fetchOptions.headers = {};
       }
 
-      const imageType = contentTypes[contentType];
-      return response.arrayBuffer().then(buffer => ({
+      fetchOptions.headers.Authorization = `Bearer ${token}`;
+      return fetch(encodedUrl, fetchOptions).then(response => {
+        const contentHeader = response.headers.get('content-length');
+        const contentType = response.headers.get('content-type'); // NOTE: the response will be ok but we won't be able to render any
+        // image meaning pdfmake will error. Raise error here and return early.
+
+        if (contentHeader === '0') {
+          return _bluebird.default.reject(new Error(`Failed to fetch image as no content length: ${encodedUrl}`));
+        }
+
+        if (!response.ok) {
+          return _bluebird.default.reject(new Error(`Failed to fetch image: ${encodedUrl}`));
+        }
+
+        const imageType = contentTypes[contentType];
+        return response.arrayBuffer().then(buffer => ({
+          buffer,
+          imageType
+        }));
+      }).then(({
         buffer,
         imageType
-      }));
-    }).then(({
-      buffer,
-      imageType
-    }) => {
-      const base64Flag = `data:image/${imageType};base64,`;
-      const imageStr = arrayBufferToBase64(buffer);
-      const base64 = `${base64Flag}${imageStr}`;
-      const isValid = validateBase64Image(base64);
-
-      if (!isValid) {
-        return _bluebird.default.reject(new Error('InvalidImageError'));
-      }
-
-      return base64;
-    }).catch(error => {
-      if (isHeader) {
-        // NOTE: Replace failed headers with LH logo
-        console.error('FetchImageHeaderError', error);
-        return fetchImage(_constants.LIGHTHOUSE_LOGO_URL, defaultOptions);
-      }
+      }) => {
+        const base64Flag = `data:image/${imageType};base64,`;
+        const imageStr = arrayBufferToBase64(buffer);
+        const base64 = `${base64Flag}${imageStr}`;
+        const isValid = validateBase64Image(base64);
+
+        if (!isValid) {
+          return _bluebird.default.reject(new Error('InvalidImageError'));
+        }
+
+        return base64;
+      }).catch(error => {
+        if (isHeader) {
+          // NOTE: Replace failed headers with LH logo
+          console.error('FetchImageHeaderError', error);
+          return fetchImage(_constants.LIGHTHOUSE_LOGO_URL, defaultOptions);
+        }
+
+        console.error(error);
+        return _images.imageNotFound;
+      });
+    })();
+  }
 
-      console.error(error);
-      return _images.imageNotFound;
-    });
-  })() : fetch(encodedUrl, fetchOptions).then(response => {
+  return fetch(encodedUrl, fetchOptions).then(response => {
     const contentHeader = response.headers.get('content-length');
     const contentType = response.headers.get('content-type'); // NOTE: the response will be ok but we won't be able to render any
     // image meaning pdfmake will error. Raise error here and return early.

package/dist/helpers/generate-cloudfront-jwt/index.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.generateCloudFrontJWT = generateCloudFrontJWT;
+
+async function generateCloudFrontJWT(applicationId) {
+  return `your-generated-jwt-token-for-${applicationId}`;
+}

package/lib/helpers/build-fetch-url/index.js

@@ -12,8 +12,9 @@ export function buildFetchUrl(url, options) {
     cloudfrontBaseUrl: cloudfrontBaseUrl,
     cloudinaryBaseUrl: cloudinaryBaseUrl
   });
+  var shouldUseCloudfront = cloudfrontBaseUrl && cloudfrontBaseUrl.includes('.cloudfront.net');
 
-  if (cloudfrontBaseUrl) {
+  if (shouldUseCloudfront) {
     console.info('Using CloudFront base URL', cloudfrontBaseUrl);
     var _transformations = [];
     var _transformationsString = '';
@@ -21,6 +22,7 @@ export function buildFetchUrl(url, options) {
     if (height) _transformations.push("h_".concat(height.toString()));
     if (quality) _transformations.push("q_".concat(quality.toString()));
     if (fit) _transformations.push('c_fit');
+    _transformationsString = "".concat(_transformations.join(','), "/");
 
     var _fetchUrl = "".concat(cloudfrontBaseUrl, "/").concat(_transformationsString).concat(awsS3BaseUrl, "/").concat(url);
 

package/lib/helpers/build-fetch-url/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/helpers/build-fetch-url/index.js"],"names":["buildFetchUrl","url","options","awsS3BaseUrl","cloudfrontBaseUrl","cloudinaryBaseUrl","fit","height","width","quality","console","info","transformations","transformationsString","push","toString","fetchUrl","join"],"mappings":"AAAA,OAAO,SAASA,aAAT,CAAuBC,GAAvB,EAA4BC,OAA5B,EAAqC;AAAA,MAExCC,YAFwC,GAStCD,OATsC,CAExCC,YAFwC;AAAA,8BAStCD,OATsC,CAGxCE,iBAHwC;AAAA,MAGxCA,iBAHwC,sCAGpB,EAHoB;AAAA,MAIxCC,iBAJwC,GAStCH,OATsC,CAIxCG,iBAJwC;AAAA,MAKxCC,GALwC,GAStCJ,OATsC,CAKxCI,GALwC;AAAA,MAMxCC,MANwC,GAStCL,OATsC,CAMxCK,MANwC;AAAA,MAOxCC,KAPwC,GAStCN,OATsC,CAOxCM,KAPwC;AAAA,MAQxCC,OARwC,GAStCP,OATsC,CAQxCO,OARwC;AAW1CC,EAAAA,OAAO,CAACC,IAAR,CAAa,oBAAb,EAAmC;AACjCV,IAAAA,GAAG,EAAHA,GADiC;AAEjCG,IAAAA,iBAAiB,EAAjBA,iBAFiC;AAGjCC,IAAAA,iBAAiB,EAAjBA;AAHiC,GAAnC;;AAMA,MAAID,iBAAJ,EAAuB;AACrBM,IAAAA,OAAO,CAACC,IAAR,CAAa,2BAAb,EAA0CP,iBAA1C;AACA,QAAMQ,gBAAe,GAAG,EAAxB;AACA,QAAIC,sBAAqB,GAAG,EAA5B;AAEA,QAAIL,KAAJ,EAAWI,gBAAe,CAACE,IAAhB,aAA0BN,KAAK,CAACO,QAAN,EAA1B;AACX,QAAIR,MAAJ,EAAYK,gBAAe,CAACE,IAAhB,aAA0BP,MAAM,CAACQ,QAAP,EAA1B;AACZ,QAAIN,OAAJ,EAAaG,gBAAe,CAACE,IAAhB,aAA0BL,OAAO,CAACM,QAAR,EAA1B;AACb,QAAIT,GAAJ,EAASM,gBAAe,CAACE,IAAhB,CAAqB,OAArB;;AAET,QAAME,SAAQ,aAAMZ,iBAAN,cAA2BS,sBAA3B,SAAmDV,YAAnD,cAAmEF,GAAnE,CAAd;;AACA,WAAOe,SAAP;AACD;;AAED,MAAMJ,eAAe,GAAG,EAAxB;AACA,MAAIC,qBAAqB,GAAG,EAA5B;AAEA,MAAIL,KAAJ,EAAWI,eAAe,CAACE,IAAhB,aAA0BN,KAAK,CAACO,QAAN,EAA1B;AACX,MAAIR,MAAJ,EAAYK,eAAe,CAACE,IAAhB,aAA0BP,MAAM,CAACQ,QAAP,EAA1B;AACZ,MAAIN,OAAJ,EAAaG,eAAe,CAACE,IAAhB,aAA0BL,OAAO,CAACM,QAAR,EAA1B;AACb,MAAIT,GAAJ,EAASM,eAAe,CAACE,IAAhB,CAAqB,OAArB;AAETD,EAAAA,qBAAqB,aAAMD,eAAe,CAACK,IAAhB,CAAqB,GAArB,CAAN,MAArB;AAEA,MAAMD,QAAQ,aAAMX,iBAAN,cAA2BQ,qBAA3B,SAAmDV,YAAnD,cAAmEF,GAAnE,CAAd;AAEA,SAAOe,QAAP;AACD","sourcesContent":["export function buildFetchUrl(url, options) {\n  const {\n    awsS3BaseUrl,\n    cloudfrontBaseUrl = '',\n    cloudinaryBaseUrl,\n    fit,\n    height,\n    width,\n    quality,\n  } = options\n\n  console.info('Building fetch URL', {\n    url,\n    cloudfrontBaseUrl,\n    cloudinaryBaseUrl,\n  })\n\n  if (cloudfrontBaseUrl) {\n    console.info('Using CloudFront base URL', cloudfrontBaseUrl)\n    const transformations = []\n    let transformationsString = ''\n\n    if (width) transformations.push(`w_${width.toString()}`)\n    if (height) transformations.push(`h_${height.toString()}`)\n    if (quality) transformations.push(`q_${quality.toString()}`)\n    if (fit) transformations.push('c_fit')\n\n    const fetchUrl = `${cloudfrontBaseUrl}/${transformationsString}${awsS3BaseUrl}/${url}`\n    return fetchUrl\n  }\n\n  const transformations = []\n  let transformationsString = ''\n\n  if (width) transformations.push(`w_${width.toString()}`)\n  if (height) transformations.push(`h_${height.toString()}`)\n  if (quality) transformations.push(`q_${quality.toString()}`)\n  if (fit) transformations.push('c_fit')\n\n  transformationsString = `${transformations.join(',')}/`\n\n  const fetchUrl = `${cloudinaryBaseUrl}/${transformationsString}${awsS3BaseUrl}/${url}`\n\n  return fetchUrl\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../../../src/helpers/build-fetch-url/index.js"],"names":["buildFetchUrl","url","options","awsS3BaseUrl","cloudfrontBaseUrl","cloudinaryBaseUrl","fit","height","width","quality","console","info","shouldUseCloudfront","includes","transformations","transformationsString","push","toString","join","fetchUrl"],"mappings":"AAAA,OAAO,SAASA,aAAT,CAAuBC,GAAvB,EAA4BC,OAA5B,EAAqC;AAAA,MAExCC,YAFwC,GAStCD,OATsC,CAExCC,YAFwC;AAAA,8BAStCD,OATsC,CAGxCE,iBAHwC;AAAA,MAGxCA,iBAHwC,sCAGpB,EAHoB;AAAA,MAIxCC,iBAJwC,GAStCH,OATsC,CAIxCG,iBAJwC;AAAA,MAKxCC,GALwC,GAStCJ,OATsC,CAKxCI,GALwC;AAAA,MAMxCC,MANwC,GAStCL,OATsC,CAMxCK,MANwC;AAAA,MAOxCC,KAPwC,GAStCN,OATsC,CAOxCM,KAPwC;AAAA,MAQxCC,OARwC,GAStCP,OATsC,CAQxCO,OARwC;AAW1CC,EAAAA,OAAO,CAACC,IAAR,CAAa,oBAAb,EAAmC;AACjCV,IAAAA,GAAG,EAAHA,GADiC;AAEjCG,IAAAA,iBAAiB,EAAjBA,iBAFiC;AAGjCC,IAAAA,iBAAiB,EAAjBA;AAHiC,GAAnC;AAMA,MAAMO,mBAAmB,GACvBR,iBAAiB,IAAIA,iBAAiB,CAACS,QAAlB,CAA2B,iBAA3B,CADvB;;AAGA,MAAID,mBAAJ,EAAyB;AACvBF,IAAAA,OAAO,CAACC,IAAR,CAAa,2BAAb,EAA0CP,iBAA1C;AACA,QAAMU,gBAAe,GAAG,EAAxB;AACA,QAAIC,sBAAqB,GAAG,EAA5B;AAEA,QAAIP,KAAJ,EAAWM,gBAAe,CAACE,IAAhB,aAA0BR,KAAK,CAACS,QAAN,EAA1B;AACX,QAAIV,MAAJ,EAAYO,gBAAe,CAACE,IAAhB,aAA0BT,MAAM,CAACU,QAAP,EAA1B;AACZ,QAAIR,OAAJ,EAAaK,gBAAe,CAACE,IAAhB,aAA0BP,OAAO,CAACQ,QAAR,EAA1B;AACb,QAAIX,GAAJ,EAASQ,gBAAe,CAACE,IAAhB,CAAqB,OAArB;AAETD,IAAAA,sBAAqB,aAAMD,gBAAe,CAACI,IAAhB,CAAqB,GAArB,CAAN,MAArB;;AAEA,QAAMC,SAAQ,aAAMf,iBAAN,cAA2BW,sBAA3B,SAAmDZ,YAAnD,cAAmEF,GAAnE,CAAd;;AACA,WAAOkB,SAAP;AACD;;AAED,MAAML,eAAe,GAAG,EAAxB;AACA,MAAIC,qBAAqB,GAAG,EAA5B;AAEA,MAAIP,KAAJ,EAAWM,eAAe,CAACE,IAAhB,aAA0BR,KAAK,CAACS,QAAN,EAA1B;AACX,MAAIV,MAAJ,EAAYO,eAAe,CAACE,IAAhB,aAA0BT,MAAM,CAACU,QAAP,EAA1B;AACZ,MAAIR,OAAJ,EAAaK,eAAe,CAACE,IAAhB,aAA0BP,OAAO,CAACQ,QAAR,EAA1B;AACb,MAAIX,GAAJ,EAASQ,eAAe,CAACE,IAAhB,CAAqB,OAArB;AAETD,EAAAA,qBAAqB,aAAMD,eAAe,CAACI,IAAhB,CAAqB,GAArB,CAAN,MAArB;AAEA,MAAMC,QAAQ,aAAMd,iBAAN,cAA2BU,qBAA3B,SAAmDZ,YAAnD,cAAmEF,GAAnE,CAAd;AAEA,SAAOkB,QAAP;AACD","sourcesContent":["export function buildFetchUrl(url, options) {\n  const {\n    awsS3BaseUrl,\n    cloudfrontBaseUrl = '',\n    cloudinaryBaseUrl,\n    fit,\n    height,\n    width,\n    quality,\n  } = options\n\n  console.info('Building fetch URL', {\n    url,\n    cloudfrontBaseUrl,\n    cloudinaryBaseUrl,\n  })\n\n  const shouldUseCloudfront =\n    cloudfrontBaseUrl && cloudfrontBaseUrl.includes('.cloudfront.net')\n\n  if (shouldUseCloudfront) {\n    console.info('Using CloudFront base URL', cloudfrontBaseUrl)\n    const transformations = []\n    let transformationsString = ''\n\n    if (width) transformations.push(`w_${width.toString()}`)\n    if (height) transformations.push(`h_${height.toString()}`)\n    if (quality) transformations.push(`q_${quality.toString()}`)\n    if (fit) transformations.push('c_fit')\n\n    transformationsString = `${transformations.join(',')}/`\n\n    const fetchUrl = `${cloudfrontBaseUrl}/${transformationsString}${awsS3BaseUrl}/${url}`\n    return fetchUrl\n  }\n\n  const transformations = []\n  let transformationsString = ''\n\n  if (width) transformations.push(`w_${width.toString()}`)\n  if (height) transformations.push(`h_${height.toString()}`)\n  if (quality) transformations.push(`q_${quality.toString()}`)\n  if (fit) transformations.push('c_fit')\n\n  transformationsString = `${transformations.join(',')}/`\n\n  const fetchUrl = `${cloudinaryBaseUrl}/${transformationsString}${awsS3BaseUrl}/${url}`\n\n  return fetchUrl\n}\n"],"file":"index.js"}

package/lib/helpers/fetch-image/index.js

@@ -1,5 +1,4 @@
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _typeof from "@babel/runtime/helpers/typeof";
@@ -13,7 +12,7 @@ import fetchPonyfill from 'fetch-ponyfill';
 import Promise from 'bluebird';
 import { LIGHTHOUSE_LOGO_URL } from '../../constants';
 import { imageNotFound } from '../../images';
-import { generateCloudFrontCookies } from '../get-cloudfront-cookies'; // NOTE use the native fetch if it's available in the browser, because the
+import { generateCloudFrontJWT } from '../generate-cloudfront-jwt'; // NOTE use the native fetch if it's available in the browser, because the
 // ponyfill (which actually uses the github polyfill) does not support all the
 // same options as native fetch
 
@@ -44,80 +43,81 @@ export function fetchImage(url) {
   var shouldUseCloudfront = url && url.includes('.cloudfront.net');
   var _options$isHeader = options.isHeader,
       isHeader = _options$isHeader === void 0 ? false : _options$isHeader;
-  return shouldUseCloudfront ? _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var signedCookies;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            fetchOptions.credentials = 'include'; // Ensure cookies are sent with the request
-
-            _context.next = 3;
-            return generateCloudFrontCookies({
-              userId: 'anonymous',
-              applicationId: applicationId
-            });
-
-          case 3:
-            signedCookies = _context.sent;
-            fetchOptions.headers.Cookie = Object.entries(signedCookies).map(function (_ref2) {
-              var _ref3 = _slicedToArray(_ref2, 2),
-                  key = _ref3[0],
-                  value = _ref3[1];
-
-              return "".concat(key, "=").concat(value);
-            }).join('; ');
-            return _context.abrupt("return", fetch(encodedUrl, fetchOptions).then(function (response) {
-              var contentHeader = response.headers.get('content-length');
-              var contentType = response.headers.get('content-type'); // NOTE: the response will be ok but we won't be able to render any
-              // image meaning pdfmake will error. Raise error here and return early.
-
-              if (contentHeader === '0') {
-                return Promise.reject(new Error("Failed to fetch image as no content length: ".concat(encodedUrl)));
-              }
 
-              if (!response.ok) {
-                return Promise.reject(new Error("Failed to fetch image: ".concat(encodedUrl)));
-              }
+  if (shouldUseCloudfront) {
+    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var token;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              fetchOptions.credentials = 'include'; // Ensure cookies are sent with the request
 
-              var imageType = contentTypes[contentType];
-              return response.arrayBuffer().then(function (buffer) {
-                return {
-                  buffer: buffer,
-                  imageType: imageType
-                };
-              });
-            }).then(function (_ref4) {
-              var buffer = _ref4.buffer,
-                  imageType = _ref4.imageType;
-              var base64Flag = "data:image/".concat(imageType, ";base64,");
-              var imageStr = arrayBufferToBase64(buffer);
-              var base64 = "".concat(base64Flag).concat(imageStr);
-              var isValid = validateBase64Image(base64);
-
-              if (!isValid) {
-                return Promise.reject(new Error('InvalidImageError'));
-              }
+              _context.next = 3;
+              return generateCloudFrontJWT(applicationId);
 
-              return base64;
-            }).catch(function (error) {
-              if (isHeader) {
-                // NOTE: Replace failed headers with LH logo
-                console.error('FetchImageHeaderError', error);
-                return fetchImage(LIGHTHOUSE_LOGO_URL, defaultOptions);
-              }
+            case 3:
+              token = _context.sent;
 
-              console.error(error);
-              return imageNotFound;
-            }));
+              if (!fetchOptions.headers) {
+                fetchOptions.headers = {};
+              }
 
-          case 6:
-          case "end":
-            return _context.stop();
+              fetchOptions.headers.Authorization = "Bearer ".concat(token);
+              return _context.abrupt("return", fetch(encodedUrl, fetchOptions).then(function (response) {
+                var contentHeader = response.headers.get('content-length');
+                var contentType = response.headers.get('content-type'); // NOTE: the response will be ok but we won't be able to render any
+                // image meaning pdfmake will error. Raise error here and return early.
+
+                if (contentHeader === '0') {
+                  return Promise.reject(new Error("Failed to fetch image as no content length: ".concat(encodedUrl)));
+                }
+
+                if (!response.ok) {
+                  return Promise.reject(new Error("Failed to fetch image: ".concat(encodedUrl)));
+                }
+
+                var imageType = contentTypes[contentType];
+                return response.arrayBuffer().then(function (buffer) {
+                  return {
+                    buffer: buffer,
+                    imageType: imageType
+                  };
+                });
+              }).then(function (_ref2) {
+                var buffer = _ref2.buffer,
+                    imageType = _ref2.imageType;
+                var base64Flag = "data:image/".concat(imageType, ";base64,");
+                var imageStr = arrayBufferToBase64(buffer);
+                var base64 = "".concat(base64Flag).concat(imageStr);
+                var isValid = validateBase64Image(base64);
+
+                if (!isValid) {
+                  return Promise.reject(new Error('InvalidImageError'));
+                }
+
+                return base64;
+              }).catch(function (error) {
+                if (isHeader) {
+                  // NOTE: Replace failed headers with LH logo
+                  console.error('FetchImageHeaderError', error);
+                  return fetchImage(LIGHTHOUSE_LOGO_URL, defaultOptions);
+                }
+
+                console.error(error);
+                return imageNotFound;
+              }));
+
+            case 7:
+            case "end":
+              return _context.stop();
+          }
         }
-      }
-    }, _callee);
-  }))() : fetch(encodedUrl, fetchOptions).then(function (response) {
+      }, _callee);
+    }))();
+  }
+
+  return fetch(encodedUrl, fetchOptions).then(function (response) {
     var contentHeader = response.headers.get('content-length');
     var contentType = response.headers.get('content-type'); // NOTE: the response will be ok but we won't be able to render any
     // image meaning pdfmake will error. Raise error here and return early.
@@ -137,9 +137,9 @@ export function fetchImage(url) {
         imageType: imageType
       };
     });
-  }).then(function (_ref5) {
-    var buffer = _ref5.buffer,
-        imageType = _ref5.imageType;
+  }).then(function (_ref3) {
+    var buffer = _ref3.buffer,
+        imageType = _ref3.imageType;
     var base64Flag = "data:image/".concat(imageType, ";base64,");
     var imageStr = arrayBufferToBase64(buffer);
     var base64 = "".concat(base64Flag).concat(imageStr);

package/lib/helpers/fetch-image/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/helpers/fetch-image/index.js"],"names":["atob","btoa","fetchPonyfill","Promise","LIGHTHOUSE_LOGO_URL","imageNotFound","generateCloudFrontCookies","fetch","self","contentTypes","defaultOptions","cache","fetchImage","url","options","encodedUrl","encodeURI","fetchOptions","applicationId","shouldUseCloudfront","includes","isHeader","credentials","userId","signedCookies","headers","Cookie","Object","entries","map","key","value","join","then","response","contentHeader","get","contentType","reject","Error","ok","imageType","arrayBuffer","buffer","base64Flag","imageStr","arrayBufferToBase64","base64","isValid","validateBase64Image","catch","error","console","binary","bytes","slice","call","Uint8Array","forEach","b","String","fromCharCode","base64String","isJpeg","startsWith","validateJpegImage","isPng","validatePngImage","base64string","src","imageData","from","replace","c","charCodeAt","imageCorrupted","length","sequence","i"],"mappings":"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","sourcesContent":["import { atob, btoa } from '@lighthouse/abab'\nimport fetchPonyfill from 'fetch-ponyfill'\nimport Promise from 'bluebird'\nimport { LIGHTHOUSE_LOGO_URL } from '../../constants'\nimport { imageNotFound } from '../../images'\nimport { generateCloudFrontCookies } from '../get-cloudfront-cookies'\n// NOTE use the native fetch if it's available in the browser, because the\n// ponyfill (which actually uses the github polyfill) does not support all the\n// same options as native fetch\nconst fetch =\n  (typeof self === 'object' && self.fetch) || fetchPonyfill({ Promise }).fetch\n\nconst contentTypes = {\n  'image/png': 'png',\n  'image/jpeg': 'jpeg',\n}\n\nconst defaultOptions = {\n  // NOTE The cache: no-cache option is important to avoid an issue with CORS\n  // and caching on Chrome. Here's a good explanation of the issue:\n  // https://stackoverflow.com/a/37455118\n  // In our case, when loading the web version of a form, the signature image is\n  // cached without the correct CORS headers. If the pdf is then generated,\n  // there's a mismatch between the cached image headers and the CORS headers\n  // sent from the fetch request, causing an error\n  cache: 'no-cache',\n}\n\nexport function fetchImage(url, options = {}) {\n  const encodedUrl = encodeURI(url)\n  const fetchOptions = {\n    ...defaultOptions,\n    ...options,\n  }\n\n  const applicationId = options.applicationId\n\n  const shouldUseCloudfront = url && url.includes('.cloudfront.net')\n\n  const { isHeader = false } = options\n\n  return shouldUseCloudfront ?\n    (async () => {\n      fetchOptions.credentials = 'include' // Ensure cookies are sent with the request\n      const signedCookies = await generateCloudFrontCookies({\n        userId: 'anonymous',\n        applicationId,\n      })\n\n      fetchOptions.headers.Cookie = Object.entries(signedCookies)\n        .map(([key, value]) => `${key}=${value}`)\n        .join('; ')\n\n      return fetch(encodedUrl, fetchOptions)\n        .then(response => {\n          const contentHeader = response.headers.get('content-length')\n          const contentType = response.headers.get('content-type')\n\n          // NOTE: the response will be ok but we won't be able to render any\n          // image meaning pdfmake will error. Raise error here and return early.\n          if (contentHeader === '0') {\n            return Promise.reject(\n              new Error(`Failed to fetch image as no content length: ${encodedUrl}`)\n            )\n          }\n\n          if (!response.ok) {\n            return Promise.reject(new Error(`Failed to fetch image: ${encodedUrl}`))\n          }\n\n          const imageType = contentTypes[contentType]\n\n          return response.arrayBuffer().then(buffer => ({\n            buffer,\n            imageType,\n          }))\n        })\n        .then(({ buffer, imageType }) => {\n          const base64Flag = `data:image/${imageType};base64,`\n          const imageStr = arrayBufferToBase64(buffer)\n\n          const base64 = `${base64Flag}${imageStr}`\n          const isValid = validateBase64Image(base64)\n\n          if (!isValid) {\n            return Promise.reject(new Error('InvalidImageError'))\n          }\n\n          return base64\n        })\n        .catch(error => {\n          if (isHeader) {\n            // NOTE: Replace failed headers with LH logo\n            console.error('FetchImageHeaderError', error)\n            return fetchImage(LIGHTHOUSE_LOGO_URL, defaultOptions)\n          }\n\n          console.error(error)\n          return imageNotFound\n        })\n    })()\n    : fetch(encodedUrl, fetchOptions)\n    .then(response => {\n      const contentHeader = response.headers.get('content-length')\n      const contentType = response.headers.get('content-type')\n\n      // NOTE: the response will be ok but we won't be able to render any\n      // image meaning pdfmake will error. Raise error here and return early.\n      if (contentHeader === '0') {\n        return Promise.reject(\n          new Error(`Failed to fetch image as no content length: ${encodedUrl}`)\n        )\n      }\n\n      if (!response.ok) {\n        return Promise.reject(new Error(`Failed to fetch image: ${encodedUrl}`))\n      }\n\n      const imageType = contentTypes[contentType]\n\n      return response.arrayBuffer().then(buffer => ({\n        buffer,\n        imageType,\n      }))\n    })\n    .then(({ buffer, imageType }) => {\n      const base64Flag = `data:image/${imageType};base64,`\n      const imageStr = arrayBufferToBase64(buffer)\n\n      const base64 = `${base64Flag}${imageStr}`\n      const isValid = validateBase64Image(base64)\n\n      if (!isValid) {\n        return Promise.reject(new Error('InvalidImageError'))\n      }\n\n      return base64\n    })\n    .catch(error => {\n      if (isHeader) {\n        // NOTE: Replace failed headers with LH logo\n        console.error('FetchImageHeaderError', error)\n        return fetchImage(LIGHTHOUSE_LOGO_URL, defaultOptions)\n      }\n\n      console.error(error)\n      return imageNotFound\n    })\n}\n\nfunction arrayBufferToBase64(buffer) {\n  let binary = ''\n  const bytes = [].slice.call(new Uint8Array(buffer))\n\n  bytes.forEach(b => (binary += String.fromCharCode(b)))\n\n  return btoa(binary)\n}\n\nexport function validateBase64Image(base64String) {\n  const isJpeg = base64String.startsWith('data:image/jpeg;base64,')\n\n  if (isJpeg) return validateJpegImage(base64String)\n\n  const isPng = base64String.startsWith('data:image/png;base64,')\n\n  if (isPng) return validatePngImage(base64String)\n\n  return false\n}\n\n// See SO for more info: https://stackoverflow.com/a/41635312\n// Fiddle: https://jsfiddle.net/Lnyxuchw/\nexport function validateJpegImage(base64string) {\n  const src = base64string\n  const imageData = Uint8Array.from(\n    atob(src.replace('data:image/jpeg;base64,', '')),\n    c => c.charCodeAt(0)\n  )\n  const imageCorrupted =\n    imageData[imageData.length - 1] === 217 &&\n    imageData[imageData.length - 2] === 255\n\n  return imageCorrupted\n}\n\n// See SO for more info: https://stackoverflow.com/a/41635312\n// Fiddle: https://jsfiddle.net/Lnyxuchw/\nexport function validatePngImage(base64string) {\n  const src = base64string\n  const imageData = Uint8Array.from(\n    atob(src.replace('data:image/png;base64,', '')),\n    c => c.charCodeAt(0)\n  )\n  const sequence = [0, 0, 0, 0, 73, 69, 78, 68, 174, 66, 96, 130] // in hex:\n\n  //check last 12 elements of array so they contains needed values\n  for (let i = 12; i > 0; i--) {\n    if (imageData[imageData.length - i] !== sequence[12 - i]) {\n      return false\n    }\n  }\n\n  return true\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../../../src/helpers/fetch-image/index.js"],"names":["atob","btoa","fetchPonyfill","Promise","LIGHTHOUSE_LOGO_URL","imageNotFound","generateCloudFrontJWT","fetch","self","contentTypes","defaultOptions","cache","fetchImage","url","options","encodedUrl","encodeURI","fetchOptions","applicationId","shouldUseCloudfront","includes","isHeader","credentials","token","headers","Authorization","then","response","contentHeader","get","contentType","reject","Error","ok","imageType","arrayBuffer","buffer","base64Flag","imageStr","arrayBufferToBase64","base64","isValid","validateBase64Image","catch","error","console","binary","bytes","slice","call","Uint8Array","forEach","b","String","fromCharCode","base64String","isJpeg","startsWith","validateJpegImage","isPng","validatePngImage","base64string","src","imageData","from","replace","c","charCodeAt","imageCorrupted","length","sequence","i"],"mappings":"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","sourcesContent":["import { atob, btoa } from '@lighthouse/abab'\nimport fetchPonyfill from 'fetch-ponyfill'\nimport Promise from 'bluebird'\nimport { LIGHTHOUSE_LOGO_URL } from '../../constants'\nimport { imageNotFound } from '../../images'\nimport { generateCloudFrontJWT } from '../generate-cloudfront-jwt'\n\n// NOTE use the native fetch if it's available in the browser, because the\n// ponyfill (which actually uses the github polyfill) does not support all the\n// same options as native fetch\nconst fetch =\n  (typeof self === 'object' && self.fetch) || fetchPonyfill({ Promise }).fetch\n\nconst contentTypes = {\n  'image/png': 'png',\n  'image/jpeg': 'jpeg',\n}\n\nconst defaultOptions = {\n  // NOTE The cache: no-cache option is important to avoid an issue with CORS\n  // and caching on Chrome. Here's a good explanation of the issue:\n  // https://stackoverflow.com/a/37455118\n  // In our case, when loading the web version of a form, the signature image is\n  // cached without the correct CORS headers. If the pdf is then generated,\n  // there's a mismatch between the cached image headers and the CORS headers\n  // sent from the fetch request, causing an error\n  cache: 'no-cache',\n}\n\nexport function fetchImage(url, options = {}) {\n  const encodedUrl = encodeURI(url)\n  const fetchOptions = {\n    ...defaultOptions,\n    ...options,\n  }\n\n  const applicationId = options.applicationId\n\n  const shouldUseCloudfront = url && url.includes('.cloudfront.net')\n\n  const { isHeader = false } = options\n\n  if (shouldUseCloudfront) {\n    return (async () => {\n      fetchOptions.credentials = 'include' // Ensure cookies are sent with the request\n      const token = await generateCloudFrontJWT(applicationId)\n\n      if (!fetchOptions.headers) {\n        fetchOptions.headers = {}\n      }\n      fetchOptions.headers.Authorization = `Bearer ${token}`\n\n      return fetch(encodedUrl, fetchOptions)\n        .then(response => {\n          const contentHeader = response.headers.get('content-length')\n          const contentType = response.headers.get('content-type')\n\n          // NOTE: the response will be ok but we won't be able to render any\n          // image meaning pdfmake will error. Raise error here and return early.\n          if (contentHeader === '0') {\n            return Promise.reject(\n              new Error(\n                `Failed to fetch image as no content length: ${encodedUrl}`\n              )\n            )\n          }\n\n          if (!response.ok) {\n            return Promise.reject(\n              new Error(`Failed to fetch image: ${encodedUrl}`)\n            )\n          }\n\n          const imageType = contentTypes[contentType]\n\n          return response.arrayBuffer().then(buffer => ({\n            buffer,\n            imageType,\n          }))\n        })\n        .then(({ buffer, imageType }) => {\n          const base64Flag = `data:image/${imageType};base64,`\n          const imageStr = arrayBufferToBase64(buffer)\n\n          const base64 = `${base64Flag}${imageStr}`\n          const isValid = validateBase64Image(base64)\n\n          if (!isValid) {\n            return Promise.reject(new Error('InvalidImageError'))\n          }\n\n          return base64\n        })\n        .catch(error => {\n          if (isHeader) {\n            // NOTE: Replace failed headers with LH logo\n            console.error('FetchImageHeaderError', error)\n            return fetchImage(LIGHTHOUSE_LOGO_URL, defaultOptions)\n          }\n\n          console.error(error)\n          return imageNotFound\n        })\n    })()\n  }\n\n  return fetch(encodedUrl, fetchOptions)\n    .then(response => {\n      const contentHeader = response.headers.get('content-length')\n      const contentType = response.headers.get('content-type')\n\n      // NOTE: the response will be ok but we won't be able to render any\n      // image meaning pdfmake will error. Raise error here and return early.\n      if (contentHeader === '0') {\n        return Promise.reject(\n          new Error(`Failed to fetch image as no content length: ${encodedUrl}`)\n        )\n      }\n\n      if (!response.ok) {\n        return Promise.reject(new Error(`Failed to fetch image: ${encodedUrl}`))\n      }\n\n      const imageType = contentTypes[contentType]\n\n      return response.arrayBuffer().then(buffer => ({\n        buffer,\n        imageType,\n      }))\n    })\n    .then(({ buffer, imageType }) => {\n      const base64Flag = `data:image/${imageType};base64,`\n      const imageStr = arrayBufferToBase64(buffer)\n\n      const base64 = `${base64Flag}${imageStr}`\n      const isValid = validateBase64Image(base64)\n\n      if (!isValid) {\n        return Promise.reject(new Error('InvalidImageError'))\n      }\n\n      return base64\n    })\n    .catch(error => {\n      if (isHeader) {\n        // NOTE: Replace failed headers with LH logo\n        console.error('FetchImageHeaderError', error)\n        return fetchImage(LIGHTHOUSE_LOGO_URL, defaultOptions)\n      }\n\n      console.error(error)\n      return imageNotFound\n    })\n}\n\nfunction arrayBufferToBase64(buffer) {\n  let binary = ''\n  const bytes = [].slice.call(new Uint8Array(buffer))\n\n  bytes.forEach(b => (binary += String.fromCharCode(b)))\n\n  return btoa(binary)\n}\n\nexport function validateBase64Image(base64String) {\n  const isJpeg = base64String.startsWith('data:image/jpeg;base64,')\n\n  if (isJpeg) return validateJpegImage(base64String)\n\n  const isPng = base64String.startsWith('data:image/png;base64,')\n\n  if (isPng) return validatePngImage(base64String)\n\n  return false\n}\n\n// See SO for more info: https://stackoverflow.com/a/41635312\n// Fiddle: https://jsfiddle.net/Lnyxuchw/\nexport function validateJpegImage(base64string) {\n  const src = base64string\n  const imageData = Uint8Array.from(\n    atob(src.replace('data:image/jpeg;base64,', '')),\n    c => c.charCodeAt(0)\n  )\n  const imageCorrupted =\n    imageData[imageData.length - 1] === 217 &&\n    imageData[imageData.length - 2] === 255\n\n  return imageCorrupted\n}\n\n// See SO for more info: https://stackoverflow.com/a/41635312\n// Fiddle: https://jsfiddle.net/Lnyxuchw/\nexport function validatePngImage(base64string) {\n  const src = base64string\n  const imageData = Uint8Array.from(\n    atob(src.replace('data:image/png;base64,', '')),\n    c => c.charCodeAt(0)\n  )\n  const sequence = [0, 0, 0, 0, 73, 69, 78, 68, 174, 66, 96, 130] // in hex:\n\n  //check last 12 elements of array so they contains needed values\n  for (let i = 12; i > 0; i--) {\n    if (imageData[imageData.length - i] !== sequence[12 - i]) {\n      return false\n    }\n  }\n\n  return true\n}\n"],"file":"index.js"}

package/lib/helpers/generate-cloudfront-jwt/index.js

@@ -0,0 +1,24 @@
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+export function generateCloudFrontJWT(_x) {
+  return _generateCloudFrontJWT.apply(this, arguments);
+}
+
+function _generateCloudFrontJWT() {
+  _generateCloudFrontJWT = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(applicationId) {
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            return _context.abrupt("return", "your-generated-jwt-token-for-".concat(applicationId));
+
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _generateCloudFrontJWT.apply(this, arguments);
+}
+//# sourceMappingURL=index.js.map

package/lib/helpers/generate-cloudfront-jwt/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/helpers/generate-cloudfront-jwt/index.js"],"names":["generateCloudFrontJWT","applicationId"],"mappings":";;AAAA,gBAAsBA,qBAAtB;AAAA;AAAA;;;oFAAO,iBAAqCC,aAArC;AAAA;AAAA;AAAA;AAAA;AAAA,oFACkCA,aADlC;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G","sourcesContent":["export async function generateCloudFrontJWT(applicationId) {\n  return `your-generated-jwt-token-for-${applicationId}`\n}\n"],"file":"index.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lighthouse/common",
-  "version": "4.37.0-canary-6",
+  "version": "4.37.0-canary-8",
   "description": "",
   "main": "dist/index.js",
   "module": "lib/index.js",