@lighthouse/common 4.37.0-canary-19 → 4.38.0-canary-1

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

@@ -23,7 +23,7 @@ function buildFetchUrl(url, options) {
     if (height) transformations.push(`height=${height.toString()}`);
     if (quality) transformations.push(`quality=${quality.toString()}`);
     transformations.push(`fit=contain`);
-    const transformationsString = transformations.join(',');
+    const transformationsString = transformations.join('&');
     const fetchUrl = `${cloudfrontBaseUrl}/${url}?${transformationsString}`;
     return fetchUrl;
   }

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

@@ -20,7 +20,7 @@ var _constants = require("../../constants");
 
 var _images = require("../../images");
 
-var _fetchJwt = require("../fetch-jwt");
+var _fetchImageForPdfGeneratorService = require("../fetch-image-for-pdf-generator-service");
 
 // 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
@@ -44,80 +44,74 @@ const defaultOptions = {
 };
 
 function fetchImage(url, options = {}) {
-  const encodedUrl = encodeURI(url);
-  const fetchOptions = { ...defaultOptions,
-    ...options,
-    headers: { ...(options.headers || {})
-    }
-  };
-  const urlMatch = url && url.match(/([a-f0-9]{24})\//);
-  const applicationId = urlMatch && urlMatch[1];
-  const shouldUseCloudfront = url && url.includes('.cloudfront.net');
+  const isWebContext = typeof window === 'object';
   const {
     isHeader = false
   } = options;
+  const shouldUseCloudfront = url && url.includes('.cloudfront.net');
 
-  if (shouldUseCloudfront) {
-    console.info('Fetching image via CloudFront');
-    return (async () => {
-      const isWebContext = typeof window === 'object';
-      const token = isWebContext ? options.imageAuthToken : await (0, _fetchJwt.fetchJWTFromGenerator)(applicationId)?.token;
-      const webFetchOptions = {
-        headers: {
-          Authorization: `Bearer ${token}`
-        }
-      };
-      const serverlessFetchOptions = { ...defaultOptions,
-        ...options,
-        headers: { ...(options.headers || {})
-        }
-      };
-      const fetchOptions = isWebContext ? webFetchOptions : serverlessFetchOptions;
-      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(({
+  if (shouldUseCloudfront && isWebContext) {
+    const {
+      signature,
+      expiresAt,
+      'Key-Pair-Id': keyPairId
+    } = options;
+    const firstParamConnector = new URL(url).searchParams.size > 0 ? '&' : '?';
+    const urlToEncode = `${url}${firstParamConnector}Signature=${signature}&ExpiresAt=${expiresAt}&Key-Pair-Id=${keyPairId}`;
+    const encodedUrl = encodeURI(urlToEncode);
+    console.info('Fetching image via CloudFront For Web');
+    return fetch(encodedUrl).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
-      }) => {
-        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;
-      });
-    })();
+      }));
+    }).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);
+      }
+
+      console.error(error);
+      return _images.imageNotFound;
+    });
+  } else if (shouldUseCloudfront && !isWebContext) {
+    return (0, _fetchImageForPdfGeneratorService.fetchImageForPdfGeneratorService)(url);
   }
 
+  const encodedUrl = encodeURI(url);
+  const fetchOptions = { ...defaultOptions,
+    ...options,
+    headers: { ...(options.headers || {})
+    }
+  };
   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

package/dist/helpers/fetch-image-for-pdf-generator-service/index.js

@@ -0,0 +1,155 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.requestImageTransformation = requestImageTransformation;
+exports.fetchResourceFromS3 = fetchResourceFromS3;
+exports.fetchImageForPdfGeneratorService = void 0;
+
+var _awsSdk = _interopRequireDefault(require("aws-sdk"));
+
+const REGION = process.env.AWS_REGION;
+const lambda = new _awsSdk.default.Lambda({
+  region: REGION
+});
+const s3 = new _awsSdk.default.S3({
+  region: REGION
+});
+
+const fetchImageForPdfGeneratorService = async function (url) {
+  console.info('Fetching image via CloudFront For Serverless Pdf Generator Service');
+
+  if (!url) {
+    throw new Error('URL is required to fetch image for PDF generator service');
+  }
+
+  const urlMatch = url && url.match(/([a-f0-9]{24})\//);
+  const applicationId = urlMatch && urlMatch[1];
+
+  if (!applicationId) {
+    throw new Error('Requestor has insufficient permissions');
+  }
+
+  const key = url.split(applicationId)[1];
+  const alreadyTransformedImage = await fetchResourceFromS3({
+    bucketName: process.env.TRANSFORMED_IMAGES_S3_BUCKET,
+    key
+  });
+
+  if (alreadyTransformedImage && alreadyTransformedImage.body) {
+    return alreadyTransformedImage.body.toString('base64');
+  }
+
+  const transformerResponse = await requestImageTransformation(key);
+  const statusCode = transformerResponse.statusCode;
+
+  switch (statusCode) {
+    case 200:
+      console.log('Image transformation successful');
+      return transformerResponse.body;
+
+    case 302:
+      {
+        console.log('Image transformation successful but image is too big for lambda delivery, fetching directly from S3');
+        const redirectLocation = transformerResponse.headers?.Location;
+
+        if (redirectLocation) {
+          const newlyTransformedImage = await fetchResourceFromS3({
+            bucketName: process.env.TRANSFORMED_IMAGES_S3_BUCKET,
+            key
+          });
+          console.log('Image successfully fetched from S3 at:', redirectLocation);
+          return newlyTransformedImage.body.toString('base64');
+        }
+
+        throw new Error('Redirect response received but no location provided');
+      }
+
+    case 400:
+      throw new Error(`Bad request to image transformer: ${transformerResponse.body}`);
+
+    case 403:
+      throw new Error('Requested transformed image is too big');
+
+    case 404:
+      throw new Error('The requested image does not exist');
+
+    case 500:
+      throw new Error(`Image transformation failed: ${transformerResponse.body}`);
+
+    default:
+      throw new Error(`Unexpected response from image transformer: ${statusCode} - ${transformerResponse.body}`);
+  }
+};
+
+exports.fetchImageForPdfGeneratorService = fetchImageForPdfGeneratorService;
+
+async function requestImageTransformation(key) {
+  if (!key) {
+    throw new Error('Image Path is required for image transformation');
+  }
+
+  console.log('ImageTransformation: Invoking image transformer lambda for path:', key);
+  const lambdaEvent = {
+    requestContext: {
+      http: {
+        method: 'GET',
+        path: key
+      }
+    }
+  };
+  const params = {
+    FunctionName: process.env.IMAGE_TRANSFORMER_ARN,
+    InvocationType: 'RequestResponse',
+    Payload: JSON.stringify(lambdaEvent)
+  };
+
+  try {
+    const result = await lambda.invoke(params).promise();
+    const response = JSON.parse(result.Payload);
+    return response;
+  } catch (error) {
+    const errorMessage = `Failed to invoke image transformer lambda: ${error.message}`;
+    console.error(errorMessage, error);
+    throw new Error(errorMessage);
+  }
+}
+
+async function fetchResourceFromS3({
+  bucketName,
+  key
+}) {
+  console.log(`Fetching resource from S3 Bucket: '${bucketName}' at path: '${key}'`);
+
+  if (!bucketName || !key) {
+    throw new Error('bucketName and key are required for S3 resource fetch ' + JSON.stringify({
+      bucketName,
+      key
+    }));
+  }
+
+  const params = {
+    Bucket: bucketName,
+    Key: key
+  };
+
+  try {
+    const result = await s3.getObject(params).promise();
+    return {
+      body: result.Body,
+      contentType: result.ContentType,
+      contentLength: result.ContentLength,
+      lastModified: result.LastModified,
+      etag: result.ETag
+    };
+  } catch (error) {
+    if (error.code !== 'NoSuchKey') {
+      throw new Error(`Failed to fetch image: ${bucketName}/${key}`);
+    }
+
+    console.log('Image not found in transformed bucket, invoking transformer');
+  }
+}

package/dist/pdf/helpers/build-audit-content/index.js

@@ -25,7 +25,9 @@ const buildAuditContent = _bluebird.default.method((items, settings = {}) => {
         link
       }) => {
         return (0, _helpers.fetchImage)(assetUrl, {
-          imageAuthToken: settings.imageAuthToken
+          signature: settings.signature,
+          expiresAt: settings.expiresAt,
+          keyPairId: settings.keyPairId
         }).then(base64String => ({
           alignment: 'center',
           fit: [210, 210],

package/dist/pdf/helpers/default-footer/index.js

@@ -8,7 +8,9 @@ exports.defaultFooter = defaultFooter;
 var _helpers = require("../../../helpers");
 
 function defaultFooter({
-  imageAuthToken,
+  signature,
+  expiresAt,
+  keyPairId,
   logoUrl,
   timestamp,
   timezone,
@@ -24,7 +26,9 @@ function defaultFooter({
   const footerText = sequenceId ? `${type} ${sequenceId}` : `${type}`; // eslint-disable-next-line no-unused-vars
 
   return (0, _helpers.fetchImage)(logoUrl, {
-    imageAuthToken,
+    signature,
+    expiresAt,
+    keyPairId,
     isHeader: true
   }).then(image => _page => ({
     columns: [{

package/dist/pdf/helpers/default-header/index.js

@@ -8,7 +8,9 @@ exports.defaultHeader = defaultHeader;
 var _helpers = require("../../../helpers");
 
 function defaultHeader({
-  imageAuthToken,
+  signature,
+  expiresAt,
+  keyPairId,
   logoUrl,
   timestamp,
   timezone
@@ -20,7 +22,9 @@ function defaultHeader({
     timezone
   });
   return (0, _helpers.fetchImage)(logoUrl, {
-    imageAuthToken,
+    signature,
+    expiresAt,
+    keyPairId,
     isHeader: true
   }).then(image => ({
     columns: [{

package/dist/pdf/helpers/fields/index.js

@@ -52,8 +52,10 @@ function buildImage(options) {
     awsS3BaseUrl,
     cloudinaryBaseUrl,
     cloudfrontBaseUrl,
-    imageAuthToken
-  } = settings;
+    signature,
+    expiresAt,
+    keyPairId
+  } = settings || {};
   const isVideoType = new RegExp('.mp4$').test(filepath);
   const link = `${awsS3BaseUrl}/${filepath}`;
 
@@ -76,7 +78,9 @@ function buildImage(options) {
     quality: 50
   });
   return (0, _helpers.fetchImage)(url, {
-    imageAuthToken
+    signature,
+    expiresAt,
+    keyPairId
   }).then(base64String => ({
     alignment,
     fit: [width, height],
@@ -259,7 +263,9 @@ function buildTemplateFieldRow({
   if (isSignatureField) {
     if (!value) return [labelText, ''];
     return (0, _helpers.fetchImage)(value, {
-      imageAuthToken: settings.imageAuthToken
+      signature: settings.signature,
+      expiresAt: settings.expiresAt,
+      keyPairId: settings.keyPairId
     }).then(base64String => {
       const values = {
         alignment: 'left',

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

@@ -17,7 +17,7 @@ export function buildFetchUrl(url, options) {
 
     _transformations.push("fit=contain");
 
-    var _transformationsString = _transformations.join(',');
+    var _transformationsString = _transformations.join('&');
 
     var _fetchUrl = "".concat(cloudfrontBaseUrl, "/").concat(url, "?").concat(_transformationsString);
 

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","shouldUseCloudfront","includes","transformations","push","toString","transformationsString","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;AAW1C,MAAMC,mBAAmB,GACvBN,iBAAiB,IAAIA,iBAAiB,CAACO,QAAlB,CAA2B,iBAA3B,CADvB;;AAGA,MAAID,mBAAJ,EAAyB;AACvB,QAAME,gBAAe,GAAG,EAAxB;AAEA,QAAIJ,KAAJ,EAAWI,gBAAe,CAACC,IAAhB,iBAA8BL,KAAK,CAACM,QAAN,EAA9B;AACX,QAAIP,MAAJ,EAAYK,gBAAe,CAACC,IAAhB,kBAA+BN,MAAM,CAACO,QAAP,EAA/B;AACZ,QAAIL,OAAJ,EAAaG,gBAAe,CAACC,IAAhB,mBAAgCJ,OAAO,CAACK,QAAR,EAAhC;;AACbF,IAAAA,gBAAe,CAACC,IAAhB;;AAEA,QAAME,sBAAqB,GAAGH,gBAAe,CAACI,IAAhB,CAAqB,GAArB,CAA9B;;AAEA,QAAMC,SAAQ,aAAMb,iBAAN,cAA2BH,GAA3B,cAAkCc,sBAAlC,CAAd;;AACA,WAAOE,SAAP;AACD;;AAED,MAAML,eAAe,GAAG,EAAxB;AACA,MAAIG,qBAAqB,GAAG,EAA5B;AAEA,MAAIP,KAAJ,EAAWI,eAAe,CAACC,IAAhB,aAA0BL,KAAK,CAACM,QAAN,EAA1B;AACX,MAAIP,MAAJ,EAAYK,eAAe,CAACC,IAAhB,aAA0BN,MAAM,CAACO,QAAP,EAA1B;AACZ,MAAIL,OAAJ,EAAaG,eAAe,CAACC,IAAhB,aAA0BJ,OAAO,CAACK,QAAR,EAA1B;AACb,MAAIR,GAAJ,EAASM,eAAe,CAACC,IAAhB,CAAqB,OAArB;AAETE,EAAAA,qBAAqB,aAAMH,eAAe,CAACI,IAAhB,CAAqB,GAArB,CAAN,MAArB;AAEA,MAAMC,QAAQ,aAAMZ,iBAAN,cAA2BU,qBAA3B,SAAmDZ,YAAnD,cAAmEF,GAAnE,CAAd;AAEA,SAAOgB,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  const shouldUseCloudfront =\n    cloudfrontBaseUrl && cloudfrontBaseUrl.includes('.cloudfront.net')\n\n  if (shouldUseCloudfront) {\n    const transformations = []\n\n    if (width) transformations.push(`width=${width.toString()}`)\n    if (height) transformations.push(`height=${height.toString()}`)\n    if (quality) transformations.push(`quality=${quality.toString()}`)\n    transformations.push(`fit=contain`)\n\n    const transformationsString = transformations.join(',')\n\n    const fetchUrl = `${cloudfrontBaseUrl}/${url}?${transformationsString}`\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","shouldUseCloudfront","includes","transformations","push","toString","transformationsString","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;AAW1C,MAAMC,mBAAmB,GACvBN,iBAAiB,IAAIA,iBAAiB,CAACO,QAAlB,CAA2B,iBAA3B,CADvB;;AAGA,MAAID,mBAAJ,EAAyB;AACvB,QAAME,gBAAe,GAAG,EAAxB;AAEA,QAAIJ,KAAJ,EAAWI,gBAAe,CAACC,IAAhB,iBAA8BL,KAAK,CAACM,QAAN,EAA9B;AACX,QAAIP,MAAJ,EAAYK,gBAAe,CAACC,IAAhB,kBAA+BN,MAAM,CAACO,QAAP,EAA/B;AACZ,QAAIL,OAAJ,EAAaG,gBAAe,CAACC,IAAhB,mBAAgCJ,OAAO,CAACK,QAAR,EAAhC;;AACbF,IAAAA,gBAAe,CAACC,IAAhB;;AAEA,QAAME,sBAAqB,GAAGH,gBAAe,CAACI,IAAhB,CAAqB,GAArB,CAA9B;;AAEA,QAAMC,SAAQ,aAAMb,iBAAN,cAA2BH,GAA3B,cAAkCc,sBAAlC,CAAd;;AACA,WAAOE,SAAP;AACD;;AAED,MAAML,eAAe,GAAG,EAAxB;AACA,MAAIG,qBAAqB,GAAG,EAA5B;AAEA,MAAIP,KAAJ,EAAWI,eAAe,CAACC,IAAhB,aAA0BL,KAAK,CAACM,QAAN,EAA1B;AACX,MAAIP,MAAJ,EAAYK,eAAe,CAACC,IAAhB,aAA0BN,MAAM,CAACO,QAAP,EAA1B;AACZ,MAAIL,OAAJ,EAAaG,eAAe,CAACC,IAAhB,aAA0BJ,OAAO,CAACK,QAAR,EAA1B;AACb,MAAIR,GAAJ,EAASM,eAAe,CAACC,IAAhB,CAAqB,OAArB;AAETE,EAAAA,qBAAqB,aAAMH,eAAe,CAACI,IAAhB,CAAqB,GAArB,CAAN,MAArB;AAEA,MAAMC,QAAQ,aAAMZ,iBAAN,cAA2BU,qBAA3B,SAAmDZ,YAAnD,cAAmEF,GAAnE,CAAd;AAEA,SAAOgB,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  const shouldUseCloudfront =\n    cloudfrontBaseUrl && cloudfrontBaseUrl.includes('.cloudfront.net')\n\n  if (shouldUseCloudfront) {\n    const transformations = []\n\n    if (width) transformations.push(`width=${width.toString()}`)\n    if (height) transformations.push(`height=${height.toString()}`)\n    if (quality) transformations.push(`quality=${quality.toString()}`)\n    transformations.push(`fit=contain`)\n\n    const transformationsString = transformations.join('&')\n\n    const fetchUrl = `${cloudfrontBaseUrl}/${url}?${transformationsString}`\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,3 @@
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _typeof from "@babel/runtime/helpers/typeof";
 
@@ -12,7 +10,7 @@ import fetchPonyfill from 'fetch-ponyfill';
 import Promise from 'bluebird';
 import { LIGHTHOUSE_LOGO_URL } from '../../constants';
 import { imageNotFound } from '../../images';
-import { fetchJWTFromGenerator } from '../fetch-jwt'; // NOTE use the native fetch if it's available in the browser, because the
+import { fetchImageForPdfGeneratorService } from '../fetch-image-for-pdf-generator-service'; // 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
 
@@ -35,110 +33,74 @@ var defaultOptions = {
 };
 export function fetchImage(url) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var isWebContext = (typeof window === "undefined" ? "undefined" : _typeof(window)) === 'object';
+  var _options$isHeader = options.isHeader,
+      isHeader = _options$isHeader === void 0 ? false : _options$isHeader;
+  var shouldUseCloudfront = url && url.includes('.cloudfront.net');
+
+  if (shouldUseCloudfront && isWebContext) {
+    var signature = options.signature,
+        expiresAt = options.expiresAt,
+        keyPairId = options['Key-Pair-Id'];
+    var firstParamConnector = new URL(url).searchParams.size > 0 ? '&' : '?';
+    var urlToEncode = "".concat(url).concat(firstParamConnector, "Signature=").concat(signature, "&ExpiresAt=").concat(expiresAt, "&Key-Pair-Id=").concat(keyPairId);
+
+    var _encodedUrl = encodeURI(urlToEncode);
+
+    console.info('Fetching image via CloudFront For Web');
+    return fetch(_encodedUrl).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 (_ref) {
+      var buffer = _ref.buffer,
+          imageType = _ref.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;
+    });
+  } else if (shouldUseCloudfront && !isWebContext) {
+    return fetchImageForPdfGeneratorService(url);
+  }
+
   var encodedUrl = encodeURI(url);
 
   var fetchOptions = _objectSpread(_objectSpread(_objectSpread({}, defaultOptions), options), {}, {
     headers: _objectSpread({}, options.headers || {})
   });
 
-  var urlMatch = url && url.match(/([a-f0-9]{24})\//);
-  var applicationId = urlMatch && urlMatch[1];
-  var shouldUseCloudfront = url && url.includes('.cloudfront.net');
-  var _options$isHeader = options.isHeader,
-      isHeader = _options$isHeader === void 0 ? false : _options$isHeader;
-
-  if (shouldUseCloudfront) {
-    console.info('Fetching image via CloudFront');
-    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _fetchJWTFromGenerato;
-
-      var isWebContext, token, webFetchOptions, serverlessFetchOptions, fetchOptions;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              isWebContext = (typeof window === "undefined" ? "undefined" : _typeof(window)) === 'object';
-
-              if (!isWebContext) {
-                _context.next = 5;
-                break;
-              }
-
-              _context.t0 = options.imageAuthToken;
-              _context.next = 8;
-              break;
-
-            case 5:
-              _context.next = 7;
-              return (_fetchJWTFromGenerato = fetchJWTFromGenerator(applicationId)) === null || _fetchJWTFromGenerato === void 0 ? void 0 : _fetchJWTFromGenerato.token;
-
-            case 7:
-              _context.t0 = _context.sent;
-
-            case 8:
-              token = _context.t0;
-              webFetchOptions = {
-                headers: {
-                  Authorization: "Bearer ".concat(token)
-                }
-              };
-              serverlessFetchOptions = _objectSpread(_objectSpread(_objectSpread({}, defaultOptions), options), {}, {
-                headers: _objectSpread({}, options.headers || {})
-              });
-              fetchOptions = isWebContext ? webFetchOptions : serverlessFetchOptions;
-              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 13:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _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
@@ -159,9 +121,9 @@ export function fetchImage(url) {
         imageType: imageType
       };
     });
-  }).then(function (_ref3) {
-    var buffer = _ref3.buffer,
-        imageType = _ref3.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);