From dc4c40414e6fb76d3c56aa771752dd6ade61c280 Mon Sep 17 00:00:00 2001
From: pldespaigne <pldespaigne@cascade8.com>
Date: Thu, 4 Apr 2019 17:15:57 +0200
Subject: issue#5742

---
 app/scripts/lib/ens-ipfs/setup.js | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

(limited to 'app/scripts/lib/ens-ipfs/setup.js')

diff --git a/app/scripts/lib/ens-ipfs/setup.js b/app/scripts/lib/ens-ipfs/setup.js
index df756d0f7..43194afbd 100644
--- a/app/scripts/lib/ens-ipfs/setup.js
+++ b/app/scripts/lib/ens-ipfs/setup.js
@@ -38,23 +38,29 @@ function setupEnsIpfsResolver ({ provider }) {
   async function attemptResolve ({ tabId, name, path, search }) {
     extension.tabs.update(tabId, { url: `loading.html` })
     try {
-      const ipfsContentId = await resolveEnsToIpfsContentId({ provider, name })
-      const url = `https://gateway.ipfs.io/ipfs/${ipfsContentId}${path}${search || ''}`
-      try {
-        // check if ipfs gateway has result
-        const response = await fetch(url, { method: 'HEAD' })
-        // if failure, redirect to 404 page
-        if (response.status !== 200) {
-          extension.tabs.update(tabId, { url: '404.html' })
-          return
+      let url = '400.html'
+      const {type, hash} = await resolveEnsToIpfsContentId({ provider, name })
+      if (type === 'ipfs-ns') {
+        url = `https://gateway.ipfs.io/ipfs/${hash}${path}${search || ''}`
+        try {
+          // check if ipfs gateway has result
+          const response = await fetch(url, { method: 'HEAD' })
+          // if failure, redirect to 404 page
+          if (response.status !== 200) {
+            extension.tabs.update(tabId, { url: '404.html' })
+            return
+          }
+          // otherwise redirect to the correct page
+          extension.tabs.update(tabId, { url })
+        } catch (err) {
+          console.warn(err)
+          // if HEAD fetch failed, redirect so user can see relevant error page
+          extension.tabs.update(tabId, { url })
         }
-        // otherwise redirect to the correct page
-        extension.tabs.update(tabId, { url })
-      } catch (err) {
-        console.warn(err)
-        // if HEAD fetch failed, redirect so user can see relevant error page
-        extension.tabs.update(tabId, { url })
+      } else if (type === 'swarm-ns') {
+        url = `https://swarm-gateways.net/bzz:/${hash}${path}${search || ''}`
       }
+      extension.tabs.update(tabId, { url })
     } catch (err) {
       console.warn(err)
       extension.tabs.update(tabId, { url: `error.html?name=${name}` })
-- 
cgit v1.2.3


From 2d58cfc7a0768a5d635a12811ed2632b640eca24 Mon Sep 17 00:00:00 2001
From: pldespaigne <pl.despaigne@gmail.com>
Date: Sat, 4 May 2019 18:57:19 +0200
Subject: refactor & change html pages

---
 app/scripts/lib/ens-ipfs/setup.js | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'app/scripts/lib/ens-ipfs/setup.js')

diff --git a/app/scripts/lib/ens-ipfs/setup.js b/app/scripts/lib/ens-ipfs/setup.js
index 43194afbd..82679db5d 100644
--- a/app/scripts/lib/ens-ipfs/setup.js
+++ b/app/scripts/lib/ens-ipfs/setup.js
@@ -37,33 +37,25 @@ function setupEnsIpfsResolver ({ provider }) {
 
   async function attemptResolve ({ tabId, name, path, search }) {
     extension.tabs.update(tabId, { url: `loading.html` })
+    let url = `https://manager.ens.domains/name/${name}`
     try {
-      let url = '400.html'
       const {type, hash} = await resolveEnsToIpfsContentId({ provider, name })
       if (type === 'ipfs-ns') {
-        url = `https://gateway.ipfs.io/ipfs/${hash}${path}${search || ''}`
+        const resolvedUrl = `https://gateway.ipfs.io/ipfs/${hash}${path}${search || ''}`
         try {
           // check if ipfs gateway has result
-          const response = await fetch(url, { method: 'HEAD' })
-          // if failure, redirect to 404 page
-          if (response.status !== 200) {
-            extension.tabs.update(tabId, { url: '404.html' })
-            return
-          }
-          // otherwise redirect to the correct page
-          extension.tabs.update(tabId, { url })
+          const response = await fetch(resolvedUrl, { method: 'HEAD' })
+          if (response.status === 200) url = resolvedUrl
         } catch (err) {
           console.warn(err)
-          // if HEAD fetch failed, redirect so user can see relevant error page
-          extension.tabs.update(tabId, { url })
         }
       } else if (type === 'swarm-ns') {
         url = `https://swarm-gateways.net/bzz:/${hash}${path}${search || ''}`
       }
-      extension.tabs.update(tabId, { url })
     } catch (err) {
       console.warn(err)
-      extension.tabs.update(tabId, { url: `error.html?name=${name}` })
+    } finally {
+      extension.tabs.update(tabId, { url })
     }
   }
 }
-- 
cgit v1.2.3