Merge pull request #167 from Corantin/fix-extra-slash-when-fetching-ipfs

Trim slash of gateway if already end with it

.github/workflows/ci.yml

@@ -15,13 +15,8 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 16
-      - name: Cache yarn modules
-        uses: actions/cache@v2
-        with:
-          path: "**/node_modules"
-          key: yarn-${{ hashFiles('yarn.lock') }}
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install
       - name: Lint
         run: yarn lint
       - name: Build Celeste Dashboard

src/hooks/useDisputes.js

@@ -211,12 +211,13 @@ async function processRawDisputeData(dispute) {
       // Note that in this case, we expect the agreement's location to be relative to the
       // metadata URI. For example, if the metadataUri is `<cid>/metadata.json`, the agreement's
       // location would be `<cid>/<agreement>`
+      let ipfsEndpoint = defaultIpfsEndpoint()
+      if (ipfsEndpoint.endsWith('/')) {
+        ipfsEndpoint = ipfsEndpoint.slice(0, -1)
+      }
       const agreementUrl =
         ipfsPath && agreementText
-          ? resolvePathname(
-              agreementText,
-              `${defaultIpfsEndpoint()}/${ipfsPath}`
-            )
+          ? resolvePathname(agreementText, `${ipfsEndpoint}/${ipfsPath}`)
           : ''
 
       const {

src/lib/ipfs-utils.js

@@ -7,7 +7,11 @@ const TEST_IPFS_REGEX = /(Qm[a-zA-Z0-9]{44})/
 const REQUEST_TIMEOUT = 60000
 
 export const ipfsGet = async cid => {
-  const endpoint = `${getIpfsGateway()}/${cid}`
+  let ipfsGateway = getIpfsGateway()
+  if (ipfsGateway.endsWith('/')) {
+    ipfsGateway = ipfsGateway.slice(0, -1)
+  }
+  const endpoint = `${ipfsGateway}/${cid}`
   try {
     const result = await fetch(endpoint, { timeout: REQUEST_TIMEOUT })
     const data = await result.text()