@sanity/export 3.0.0-v3-pte.16 → 3.0.0-v3-pte.57

package/lib/AssetHandler.js

@@ -199,7 +199,7 @@ class AssetHandler {
     const isImage = assetDoc._type === 'sanity.imageAsset';
     const url = parseUrl(assetDoc.url, true);
 
-    if (isImage && ['cdn.sanity.io', 'cdn.sanity.work'].includes(url.hostname)) {
+    if (isImage && ['cdn.sanity.io', 'cdn.sanity.work'].includes(url.hostname) && token) {
       headers.Authorization = "Bearer ".concat(token);
       url.query = { ...(url.query || {}),
         dlRaw: 'true'
@@ -253,14 +253,13 @@ class AssetHandler {
     const remoteSha1 = stream.headers['x-sanity-sha1'];
     const remoteMd5 = stream.headers['x-sanity-md5'];
     const hasHash = Boolean(remoteSha1 || remoteMd5);
-    const method = md5 ? 'md5' : 'sha1';
-    let differs = false;
+    const method = sha1 ? 'sha1' : 'md5'; // Asset validity is primarily determined by the sha1 hash. However, the sha1 hash is computed
+    // before certain processes (i.e. svg sanitization) which can result in a different hash.
+    // When the sha1 hashes don't match, fallback to using the md5 hash.
 
-    if (remoteMd5 && md5) {
-      differs = remoteMd5 !== md5;
-    } else if (remoteSha1 && sha1) {
-      differs = remoteSha1 !== sha1;
-    }
+    const sha1Differs = remoteSha1 && sha1 !== remoteSha1;
+    const md5Differs = remoteMd5 && md5 !== remoteMd5;
+    const differs = sha1Differs && md5Differs;
 
     if (differs && attemptNum < 3) {
       debug('%s does not match downloaded asset, retrying (#%d) [%s]', method, attemptNum + 1, url);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/export",
-  "version": "3.0.0-v3-pte.16+977ddf893d",
+  "version": "3.0.0-v3-pte.57+7e5edfd5b4",
   "description": "Export Sanity documents and assets",
   "main": "./lib/export.js",
   "types": "./lib/dts/src/export.d.ts",
@@ -49,5 +49,5 @@
     "url": "https://github.com/sanity-io/sanity/issues"
   },
   "homepage": "https://www.sanity.io/",
-  "gitHead": "977ddf893dd61309debc999743d207f05eb76d4d"
+  "gitHead": "7e5edfd5b4cef754b471f7d20f1d598ebf6532a1"
 }

package/src/AssetHandler.js

@@ -125,7 +125,7 @@ class AssetHandler {
     const isImage = assetDoc._type === 'sanity.imageAsset'
 
     const url = parseUrl(assetDoc.url, true)
-    if (isImage && ['cdn.sanity.io', 'cdn.sanity.work'].includes(url.hostname)) {
+    if (isImage && ['cdn.sanity.io', 'cdn.sanity.work'].includes(url.hostname) && token) {
       headers.Authorization = `Bearer ${token}`
       url.query = {...(url.query || {}), dlRaw: 'true'}
     }
@@ -168,14 +168,14 @@ class AssetHandler {
     const remoteSha1 = stream.headers['x-sanity-sha1']
     const remoteMd5 = stream.headers['x-sanity-md5']
     const hasHash = Boolean(remoteSha1 || remoteMd5)
-    const method = md5 ? 'md5' : 'sha1'
-
-    let differs = false
-    if (remoteMd5 && md5) {
-      differs = remoteMd5 !== md5
-    } else if (remoteSha1 && sha1) {
-      differs = remoteSha1 !== sha1
-    }
+    const method = sha1 ? 'sha1' : 'md5'
+
+    // Asset validity is primarily determined by the sha1 hash. However, the sha1 hash is computed
+    // before certain processes (i.e. svg sanitization) which can result in a different hash.
+    // When the sha1 hashes don't match, fallback to using the md5 hash.
+    const sha1Differs = remoteSha1 && sha1 !== remoteSha1
+    const md5Differs = remoteMd5 && md5 !== remoteMd5
+    const differs = sha1Differs && md5Differs
 
     if (differs && attemptNum < 3) {
       debug('%s does not match downloaded asset, retrying (#%d) [%s]', method, attemptNum + 1, url)