m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 09:57:02 +01:00
Code

Process URL fragment for ens-ipfs redirects (#7604)

Browse Source 
Also use app.ens.domains instead of manager.ens.domains
This commit is contained in:
Xavier Maysonnave 2019-12-02 19:26:02 +05:30 committed by Whymarrh Whitby
parent 5917da63f7
commit 86e7233bd1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/scripts/lib/ens-ipfs/setup.js
View File

@ -28,7 +28,7 @@ function setupEnsIpfsResolver ({ provider }) {
}
// 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
@ -36,16 +36,16 @@ function setupEnsIpfsResolver ({ provider }) {
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' })
@ -56,11 +56,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)