@lighthouse/common 4.37.0-canary-10 → 4.37.0-canary-12

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

@@ -10,7 +10,7 @@ function buildFetchUrl(url, options) {
     awsS3BaseUrl,
     cloudfrontBaseUrl = '',
     cloudinaryBaseUrl,
-    fit,
+    fit = 'contain',
     height,
     width,
     quality
@@ -25,13 +25,12 @@ function buildFetchUrl(url, options) {
   if (shouldUseCloudfront) {
     console.info('Using CloudFront base URL', cloudfrontBaseUrl);
     const transformations = [];
-    let transformationsString = '';
-    if (width) transformations.push(`w_${width.toString()}`);
-    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}`;
+    if (width) transformations.push(`width=${width.toString()}`);
+    if (height) transformations.push(`height=${height.toString()}`);
+    if (quality) transformations.push(`quality=${quality.toString()}`);
+    if (fit) transformations.push(`fit=${fit.toString()}`);
+    const transformationsString = transformations.join('&');
+    const fetchUrl = `${cloudfrontBaseUrl}/${url}?${transformationsString}`;
     return fetchUrl;
   }
 

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

@@ -50,7 +50,8 @@ function fetchImage(url, options = {}) {
     headers: { ...(options.headers || {})
     }
   };
-  const applicationId = options.applicationId;
+  const urlMatch = url && url.match(/([a-f0-9]{24})\//);
+  const applicationId = urlMatch && urlMatch[1];
   const shouldUseCloudfront = url && url.includes('.cloudfront.net');
   const {
     isHeader = false

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

@@ -15,6 +15,10 @@ const lambda = new _awsSdk.default.Lambda({
 });
 
 async function generateCloudFrontJWT(applicationId) {
+  if (!applicationId) {
+    throw new Error('applicationId is required for CloudFront JWT generation');
+  }
+
   const params = {
     FunctionName: `arn:aws:lambda:${region}:649076221710:function:image-optimisation-jwt-generation`,
     InvocationType: 'RequestResponse',
@@ -25,11 +29,12 @@ async function generateCloudFrontJWT(applicationId) {
 
   try {
     const result = await lambda.invoke(params).promise();
-    const response = JSON.parse(result.Payload);
     console.dir(result, {
       depth: null
     });
-    console.info('GenerateCloudFrontJWT: JWT Lambda response:', response);
+    console.info('GenerateCloudFrontJWT: Raw Lambda result:', result);
+    const response = JSON.parse(result.Payload);
+    console.info('GenerateCloudFrontJWT: Parsed Lambda response:', response);
     return {
       expiration: response.expiration,
       token: response.token

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

@@ -3,7 +3,8 @@ export function buildFetchUrl(url, options) {
       _options$cloudfrontBa = options.cloudfrontBaseUrl,
       cloudfrontBaseUrl = _options$cloudfrontBa === void 0 ? '' : _options$cloudfrontBa,
       cloudinaryBaseUrl = options.cloudinaryBaseUrl,
-      fit = options.fit,
+      _options$fit = options.fit,
+      fit = _options$fit === void 0 ? 'contain' : _options$fit,
       height = options.height,
       width = options.width,
       quality = options.quality;
@@ -17,14 +18,14 @@ export function buildFetchUrl(url, options) {
   if (shouldUseCloudfront) {
     console.info('Using CloudFront base URL', cloudfrontBaseUrl);
     var _transformations = [];
-    var _transformationsString = '';
-    if (width) _transformations.push("w_".concat(width.toString()));
-    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(','), "/");
+    if (width) _transformations.push("width=".concat(width.toString()));
+    if (height) _transformations.push("height=".concat(height.toString()));
+    if (quality) _transformations.push("quality=".concat(quality.toString()));
+    if (fit) _transformations.push("fit=".concat(fit.toString()));
 
-    var _fetchUrl = "".concat(cloudfrontBaseUrl, "/").concat(_transformationsString).concat(awsS3BaseUrl, "/").concat(url);
+    var _transformationsString = _transformations.join('&');
+
+    var _fetchUrl = "".concat(cloudfrontBaseUrl, "/").concat(url, "?").concat(_transformationsString);
 
     return _fetchUrl;
   }

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","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"}
+{"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","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,qBAStCH,OATsC,CAKxCI,GALwC;AAAA,MAKxCA,GALwC,6BAKlC,SALkC;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;AAEA,QAAIN,KAAJ,EAAWM,gBAAe,CAACC,IAAhB,iBAA8BP,KAAK,CAACQ,QAAN,EAA9B;AACX,QAAIT,MAAJ,EAAYO,gBAAe,CAACC,IAAhB,kBAA+BR,MAAM,CAACS,QAAP,EAA/B;AACZ,QAAIP,OAAJ,EAAaK,gBAAe,CAACC,IAAhB,mBAAgCN,OAAO,CAACO,QAAR,EAAhC;AACb,QAAIV,GAAJ,EAASQ,gBAAe,CAACC,IAAhB,eAA4BT,GAAG,CAACU,QAAJ,EAA5B;;AAET,QAAMC,sBAAqB,GAAGH,gBAAe,CAACI,IAAhB,CAAqB,GAArB,CAA9B;;AAEA,QAAMC,SAAQ,aAAMf,iBAAN,cAA2BH,GAA3B,cAAkCgB,sBAAlC,CAAd;;AACA,WAAOE,SAAP;AACD;;AAED,MAAML,eAAe,GAAG,EAAxB;AACA,MAAIG,qBAAqB,GAAG,EAA5B;AAEA,MAAIT,KAAJ,EAAWM,eAAe,CAACC,IAAhB,aAA0BP,KAAK,CAACQ,QAAN,EAA1B;AACX,MAAIT,MAAJ,EAAYO,eAAe,CAACC,IAAhB,aAA0BR,MAAM,CAACS,QAAP,EAA1B;AACZ,MAAIP,OAAJ,EAAaK,eAAe,CAACC,IAAhB,aAA0BN,OAAO,CAACO,QAAR,EAA1B;AACb,MAAIV,GAAJ,EAASQ,eAAe,CAACC,IAAhB,CAAqB,OAArB;AAETE,EAAAA,qBAAqB,aAAMH,eAAe,CAACI,IAAhB,CAAqB,GAArB,CAAN,MAArB;AAEA,MAAMC,QAAQ,aAAMd,iBAAN,cAA2BY,qBAA3B,SAAmDd,YAAnD,cAAmEF,GAAnE,CAAd;AAEA,SAAOkB,QAAP;AACD","sourcesContent":["export function buildFetchUrl(url, options) {\n  const {\n    awsS3BaseUrl,\n    cloudfrontBaseUrl = '',\n    cloudinaryBaseUrl,\n    fit = 'contain',\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\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    if (fit) transformations.push(`fit=${fit.toString()}`)\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

@@ -41,7 +41,8 @@ export function fetchImage(url) {
     headers: _objectSpread({}, options.headers || {})
   });
 
-  var applicationId = options.applicationId;
+  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;

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","generateCloudFrontJWT","fetch","self","contentTypes","defaultOptions","cache","fetchImage","url","options","encodedUrl","encodeURI","fetchOptions","headers","applicationId","shouldUseCloudfront","includes","isHeader","console","info","credentials","token","Authorization","then","response","contentHeader","get","contentType","reject","Error","ok","imageType","arrayBuffer","buffer","base64Flag","imageStr","arrayBufferToBase64","base64","isValid","validateBase64Image","catch","error","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    headers: {\n      ...(options.headers || {}),\n    },\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    console.info('Fetching image via CloudFront')\n    return (async () => {\n      fetchOptions.credentials = 'include' // Ensure cookies are sent with the request\n      const { token } = await generateCloudFrontJWT(applicationId)\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"}
+{"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","headers","urlMatch","match","applicationId","shouldUseCloudfront","includes","isHeader","console","info","credentials","token","Authorization","then","response","contentHeader","get","contentType","reject","Error","ok","imageType","arrayBuffer","buffer","base64Flag","imageStr","arrayBufferToBase64","base64","isValid","validateBase64Image","catch","error","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    headers: {\n      ...(options.headers || {}),\n    },\n  }\n\n  const urlMatch = url && url.match(/([a-f0-9]{24})\\//)\n  const applicationId = urlMatch && urlMatch[1]\n\n  const shouldUseCloudfront = url && url.includes('.cloudfront.net')\n\n  const { isHeader = false } = options\n\n  if (shouldUseCloudfront) {\n    console.info('Fetching image via CloudFront')\n    return (async () => {\n      fetchOptions.credentials = 'include' // Ensure cookies are sent with the request\n      const { token } = await generateCloudFrontJWT(applicationId)\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

@@ -16,6 +16,14 @@ function _generateCloudFrontJWT() {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
+            if (applicationId) {
+              _context.next = 2;
+              break;
+            }
+
+            throw new Error('applicationId is required for CloudFront JWT generation');
+
+          case 2:
             params = {
               FunctionName: "arn:aws:lambda:".concat(region, ":649076221710:function:image-optimisation-jwt-generation"),
               InvocationType: 'RequestResponse',
@@ -23,34 +31,35 @@ function _generateCloudFrontJWT() {
                 applicationId: applicationId
               })
             };
-            _context.prev = 1;
-            _context.next = 4;
+            _context.prev = 3;
+            _context.next = 6;
             return lambda.invoke(params).promise();
 
-          case 4:
+          case 6:
             result = _context.sent;
-            response = JSON.parse(result.Payload);
             console.dir(result, {
               depth: null
             });
-            console.info('GenerateCloudFrontJWT: JWT Lambda response:', response);
+            console.info('GenerateCloudFrontJWT: Raw Lambda result:', result);
+            response = JSON.parse(result.Payload);
+            console.info('GenerateCloudFrontJWT: Parsed Lambda response:', response);
             return _context.abrupt("return", {
               expiration: response.expiration,
               token: response.token
             });
 
-          case 11:
-            _context.prev = 11;
-            _context.t0 = _context["catch"](1);
+          case 14:
+            _context.prev = 14;
+            _context.t0 = _context["catch"](3);
             console.error('Error invoking JWT Lambda:', _context.t0);
             throw new Error('Failed to generate CloudFront JWT');
 
-          case 15:
+          case 18:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[1, 11]]);
+    }, _callee, null, [[3, 14]]);
   }));
   return _generateCloudFrontJWT.apply(this, arguments);
 }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/helpers/generate-cloudfront-jwt/index.js"],"names":["AWS","region","process","env","AWS_REGION","lambda","Lambda","generateCloudFrontJWT","applicationId","params","FunctionName","InvocationType","Payload","JSON","stringify","invoke","promise","result","response","parse","console","dir","depth","info","expiration","token","error","Error"],"mappings":";;AAAA,OAAOA,GAAP,MAAgB,SAAhB;AAEA,IAAMC,MAAM,GAAGC,OAAO,CAACC,GAAR,CAAYC,UAAZ,IAA0B,WAAzC;AACA,IAAMC,MAAM,GAAG,IAAIL,GAAG,CAACM,MAAR,CAAe;AAC5BL,EAAAA,MAAM,EAANA;AAD4B,CAAf,CAAf;AAIA,gBAAsBM,qBAAtB;AAAA;AAAA;;;oFAAO,iBAAqCC,aAArC;AAAA;AAAA;AAAA;AAAA;AAAA;AACCC,YAAAA,MADD,GACU;AACbC,cAAAA,YAAY,2BAAoBT,MAApB,6DADC;AAEbU,cAAAA,cAAc,EAAE,iBAFH;AAGbC,cAAAA,OAAO,EAAEC,IAAI,CAACC,SAAL,CAAe;AAAEN,gBAAAA,aAAa,EAAbA;AAAF,eAAf;AAHI,aADV;AAAA;AAAA;AAAA,mBAQkBH,MAAM,CAACU,MAAP,CAAcN,MAAd,EAAsBO,OAAtB,EARlB;;AAAA;AAQGC,YAAAA,MARH;AASGC,YAAAA,QATH,GAScL,IAAI,CAACM,KAAL,CAAWF,MAAM,CAACL,OAAlB,CATd;AAWHQ,YAAAA,OAAO,CAACC,GAAR,CAAYJ,MAAZ,EAAoB;AAAEK,cAAAA,KAAK,EAAE;AAAT,aAApB;AACAF,YAAAA,OAAO,CAACG,IAAR,CAAa,6CAAb,EAA4DL,QAA5D;AAZG,6CAcI;AACLM,cAAAA,UAAU,EAAEN,QAAQ,CAACM,UADhB;AAELC,cAAAA,KAAK,EAAEP,QAAQ,CAACO;AAFX,aAdJ;;AAAA;AAAA;AAAA;AAmBHL,YAAAA,OAAO,CAACM,KAAR,CAAc,4BAAd;AAnBG,kBAoBG,IAAIC,KAAJ,CAAU,mCAAV,CApBH;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G","sourcesContent":["import AWS from 'aws-sdk'\n\nconst region = process.env.AWS_REGION || 'us-east-1'\nconst lambda = new AWS.Lambda({\n  region,\n})\n\nexport async function generateCloudFrontJWT(applicationId) {\n  const params = {\n    FunctionName: `arn:aws:lambda:${region}:649076221710:function:image-optimisation-jwt-generation`,\n    InvocationType: 'RequestResponse',\n    Payload: JSON.stringify({ applicationId }),\n  }\n\n  try {\n    const result = await lambda.invoke(params).promise()\n    const response = JSON.parse(result.Payload)\n\n    console.dir(result, { depth: null })\n    console.info('GenerateCloudFrontJWT: JWT Lambda response:', response)\n\n    return {\n      expiration: response.expiration,\n      token: response.token,\n    }\n  } catch (error) {\n    console.error('Error invoking JWT Lambda:', error)\n    throw new Error('Failed to generate CloudFront JWT')\n  }\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../../../src/helpers/generate-cloudfront-jwt/index.js"],"names":["AWS","region","process","env","AWS_REGION","lambda","Lambda","generateCloudFrontJWT","applicationId","Error","params","FunctionName","InvocationType","Payload","JSON","stringify","invoke","promise","result","console","dir","depth","info","response","parse","expiration","token","error"],"mappings":";;AAAA,OAAOA,GAAP,MAAgB,SAAhB;AAEA,IAAMC,MAAM,GAAGC,OAAO,CAACC,GAAR,CAAYC,UAAZ,IAA0B,WAAzC;AACA,IAAMC,MAAM,GAAG,IAAIL,GAAG,CAACM,MAAR,CAAe;AAC5BL,EAAAA,MAAM,EAANA;AAD4B,CAAf,CAAf;AAIA,gBAAsBM,qBAAtB;AAAA;AAAA;;;oFAAO,iBAAqCC,aAArC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBACAA,aADA;AAAA;AAAA;AAAA;;AAAA,kBAEG,IAAIC,KAAJ,CAAU,yDAAV,CAFH;;AAAA;AAKCC,YAAAA,MALD,GAKU;AACbC,cAAAA,YAAY,2BAAoBV,MAApB,6DADC;AAEbW,cAAAA,cAAc,EAAE,iBAFH;AAGbC,cAAAA,OAAO,EAAEC,IAAI,CAACC,SAAL,CAAe;AAAEP,gBAAAA,aAAa,EAAbA;AAAF,eAAf;AAHI,aALV;AAAA;AAAA;AAAA,mBAYkBH,MAAM,CAACW,MAAP,CAAcN,MAAd,EAAsBO,OAAtB,EAZlB;;AAAA;AAYGC,YAAAA,MAZH;AAcHC,YAAAA,OAAO,CAACC,GAAR,CAAYF,MAAZ,EAAoB;AAAEG,cAAAA,KAAK,EAAE;AAAT,aAApB;AACAF,YAAAA,OAAO,CAACG,IAAR,CAAa,2CAAb,EAA0DJ,MAA1D;AAEMK,YAAAA,QAjBH,GAiBcT,IAAI,CAACU,KAAL,CAAWN,MAAM,CAACL,OAAlB,CAjBd;AAkBHM,YAAAA,OAAO,CAACG,IAAR,CAAa,gDAAb,EAA+DC,QAA/D;AAlBG,6CAoBI;AACLE,cAAAA,UAAU,EAAEF,QAAQ,CAACE,UADhB;AAELC,cAAAA,KAAK,EAAEH,QAAQ,CAACG;AAFX,aApBJ;;AAAA;AAAA;AAAA;AAyBHP,YAAAA,OAAO,CAACQ,KAAR,CAAc,4BAAd;AAzBG,kBA0BG,IAAIlB,KAAJ,CAAU,mCAAV,CA1BH;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G","sourcesContent":["import AWS from 'aws-sdk'\n\nconst region = process.env.AWS_REGION || 'us-east-1'\nconst lambda = new AWS.Lambda({\n  region,\n})\n\nexport async function generateCloudFrontJWT(applicationId) {\n  if (!applicationId) {\n    throw new Error('applicationId is required for CloudFront JWT generation')\n  }\n\n  const params = {\n    FunctionName: `arn:aws:lambda:${region}:649076221710:function:image-optimisation-jwt-generation`,\n    InvocationType: 'RequestResponse',\n    Payload: JSON.stringify({ applicationId }),\n  }\n\n  try {\n    const result = await lambda.invoke(params).promise()\n\n    console.dir(result, { depth: null })\n    console.info('GenerateCloudFrontJWT: Raw Lambda result:', result)\n\n    const response = JSON.parse(result.Payload)\n    console.info('GenerateCloudFrontJWT: Parsed Lambda response:', response)\n\n    return {\n      expiration: response.expiration,\n      token: response.token,\n    }\n  } catch (error) {\n    console.error('Error invoking JWT Lambda:', error)\n    throw new Error('Failed to generate CloudFront JWT')\n  }\n}\n"],"file":"index.js"}

package/package.json

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