cadence/Carbon
3
9
Fork 1
Code Issues 14 Pull requests 1 Releases Wiki Activity

Refactor homeserver lookup code #12

Merged
bad merged 10 commits from refactor-homeserver-lookup into princess 2020-10-23 08:57:01 +00:00
Conversation 0 Commits 10 Files changed 1 +6 -11
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 16de7edd19 - Show all commits

17
src/js/login.js
View file

@ -71,7 +71,6 @@ class Form extends ElemJS {
this.on("submit", this.submit.bind(this))
}
async submit() {
if (this.processing) return
this.processing = true
@ -114,12 +113,12 @@ class Form extends ElemJS {
}
async findHomeserver(address, maxDepth = 5) {
//Protects us from servers sending us on a redirect loop
//Protects from servers sending us on a redirect loop
maxDepth--
if(maxDepth<=0) throw new Error(`Failed to look up homeserver, maximum search depth reached`)
if (maxDepth <= 0) throw new Error(`Failed to look up homeserver, maximum search depth reached`)
//Preprocess the address
//Normalise the address
if (!address.match(/^https?:\/\//)) {
console.warn(`${address} doesn't specify the protocol, assuming https`)
address = "https://" + address
@ -133,13 +132,13 @@ class Form extends ElemJS {
/* jshint ignore:start */
//JsHint doesn't support optional chaining
// https://github.com/jshint/jshint/issues/3448
if(versionsReq?.ok) {
if (versionsReq?.ok) {
const versions = await versionsReq.json().catch(()=>{})
if (Array.isArray(versions?.versions)) return address
}
/* jshint ignore:end */
// find the next matrix server in the chain
// Find the next matrix server in the chain
const root = await fetch(`${address}/.well-known/matrix/client`).then(res => res.json()).catch(e => {
console.error(e)
throw new Error(`Failed to look up server ${address}`)
@ -155,7 +154,6 @@ class Form extends ElemJS {
return this.findHomeserver(nextAddress, maxDepth)
}
status(message) {
feedback.setLoading(true)
feedback.message(message)
@ -169,6 +167,3 @@ class Form extends ElemJS {
}
const form = new Form()