Merge pull request #246 from lukso-network/fix/repair-ipfs-decode

fix: Repair ipfs decoding when using custom authenticated gateway.
lukso-network · Jan 5, 2024 · f55d0e1 · f55d0e1
2 parents 58edb58 + 2ae904a
commit f55d0e1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1 @@
+nodejs 16.14.2
diff --git a/src/lib/helpers/uploader.helper.ts b/src/lib/helpers/uploader.helper.ts
@@ -186,17 +186,24 @@ export function isMetadataEncoded(metdata: string): boolean {
 
 export function formatIPFSUrl(ipfsGateway: IPFSGateway, ipfsHash: string) {
   let ipfsUrl: string;
-
   if (typeof ipfsGateway === 'string') {
     ipfsUrl = ipfsGateway.endsWith('/')
       ? `${ipfsGateway}${ipfsHash}`
       : `${ipfsGateway}/${ipfsHash}`;
+  } else if (
+    ipfsGateway?.url &&
+    (typeof ipfsGateway.url === 'string' || ipfsGateway.url instanceof URL)
+  ) {
+    const url = new URL(ipfsGateway.url);
+    ipfsUrl = new URL(`/ipfs/${ipfsHash}`, url).toString();
+  } else if (ipfsGateway?.host) {
+    const url = new URL(ipfsGateway.host);
+    url.protocol = 'https:';
+    ipfsUrl = new URL(`/ipfs/${ipfsHash}`, url).toString();
+  } else if (ipfsGateway?.url) {
+    throw new Error('IPFS gateway as Multiaddr is currently not supported');
   } else {
-    const protocol = ipfsGateway?.host ?? 'https';
-    const host = ipfsGateway?.host ?? '2eff.lukso.dev';
-
-    ipfsUrl = `${[protocol]}://${host}/ipfs/${ipfsHash}`;
+    ipfsUrl = new URL(`/ipfs/${ipfsHash}`, 'https://api.universalprofile.cloud').toString();
   }
-
   return ipfsUrl;
 }