From f72070ae0da949dc163347330f7cb95dc2afe24b Mon Sep 17 00:00:00 2001
From: Xavier Maysonnave <x.maysonnave@gmail.com>
Date: Mon, 2 Dec 2019 19:26:02 +0530
Subject: [PATCH] Process URL fragment for ens-ipfs redirects (#7604)

Also use app.ens.domains instead of manager.ens.domains
---
 app/scripts/lib/ens-ipfs/setup.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/scripts/lib/ens-ipfs/setup.js b/app/scripts/lib/ens-ipfs/setup.js
index a3711c5f9..8f19510c7 100644
--- a/app/scripts/lib/ens-ipfs/setup.js
+++ b/app/scripts/lib/ens-ipfs/setup.js
@@ -26,22 +26,22 @@ function setupEnsIpfsResolver ({ provider }) {
     if (tabId === -1) return
     // parse ens name
     const urlData = urlUtil.parse(url)
-    const { hostname: name, path, search } = urlData
+    const { hostname: name, path, search, hash: fragment } = urlData
     const domainParts = name.split('.')
     const topLevelDomain = domainParts[domainParts.length - 1]
     // if unsupported TLD, abort
     if (!supportedTopLevelDomains.includes(topLevelDomain)) return
     // otherwise attempt resolve
-    attemptResolve({ tabId, name, path, search })
+    attemptResolve({ tabId, name, path, search, fragment })
   }
 
-  async function attemptResolve ({ tabId, name, path, search }) {
+  async function attemptResolve ({ tabId, name, path, search, fragment }) {
     extension.tabs.update(tabId, { url: `loading.html` })
-    let url = `https://manager.ens.domains/name/${name}`
+    let url = `https://app.ens.domains/name/${name}`
     try {
       const {type, hash} = await resolveEnsToIpfsContentId({ provider, name })
       if (type === 'ipfs-ns') {
-        const resolvedUrl = `https://gateway.ipfs.io/ipfs/${hash}${path}${search || ''}`
+        const resolvedUrl = `https://gateway.ipfs.io/ipfs/${hash}${path}${search || ''}${fragment || ''}`
         try {
           // check if ipfs gateway has result
           const response = await fetch(resolvedUrl, { method: 'HEAD' })
@@ -50,11 +50,11 @@ function setupEnsIpfsResolver ({ provider }) {
           console.warn(err)
         }
       } else if (type === 'swarm-ns') {
-        url = `https://swarm-gateways.net/bzz:/${hash}${path}${search || ''}`
+        url = `https://swarm-gateways.net/bzz:/${hash}${path}${search || ''}${fragment || ''}`
       } else if (type === 'onion' || type === 'onion3') {
-        url = `http://${hash}.onion${path}${search || ''}`
+        url = `http://${hash}.onion${path}${search || ''}${fragment || ''}`
       } else if (type === 'zeronet') {
-        url = `http://127.0.0.1:43110/${hash}${path}${search || ''}`
+        url = `http://127.0.0.1:43110/${hash}${path}${search || ''}${fragment || ''}`
       }
     } catch (err) {
       console.warn(err)