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

Style cleanup
All checks were successful
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Cadence Ember 2020-10-22 17:35:48 +13:00
parent 61cc4a19f3
commit 2ff43ea801
Signed by: cadence
GPG key ID: BC1C2C61CF521B17
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/js/login.js
View file

@ -71,7 +71,6 @@ class Form extends ElemJS {
this.on("submit", this.submit.bind(this)) this.on("submit", this.submit.bind(this))
} }
async submit() { async submit() {
if (this.processing) return if (this.processing) return
this.processing = true this.processing = true
@ -114,32 +113,31 @@ class Form extends ElemJS {
} }
async findHomeserver(address, maxDepth = 5) { async findHomeserver(address, maxDepth = 5) {
// Protects us from servers sending us on a redirect loop
//Protects us from servers sending us on a redirect loop
maxDepth-- 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?:\/\//)) { if (!address.match(/^https?:\/\//)) {
console.warn(`${address} doesn't specify the protocol, assuming https`) console.warn(`${address} doesn't specify the protocol, assuming https`)
address = "https://" + address address = "https://" + address
} }
address = address.replace(/\/*$/, "") address = address.replace(/\/*$/, "")
this.status(`Looking up homeserver... trying ${address}`) this.status(`Looking up homeserver... trying ${address}`)
// Check if we found the actual matrix server // Check if we found the actual matrix server
try { try {
const versionsReq = await fetch(`${address}/_matrix/client/versions`) const versionsReq = await fetch(`${address}/_matrix/client/versions`)
if(versionsReq.ok) { if (versionsReq.ok) {
const versions = await versionsReq.json() const versions = await versionsReq.json()
if (Array.isArray(versions.versions)) { if (Array.isArray(versions.versions)) {
return address return address
} }
} }
} catch(e) {} } catch(e) {}
// 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 => { const root = await fetch(`${address}/.well-known/matrix/client`).then(res => res.json()).catch(e => {
console.error(e) console.error(e)
throw new Error(`Failed to look up server ${address}`) throw new Error(`Failed to look up server ${address}`)
@ -155,7 +153,6 @@ class Form extends ElemJS {
return this.findHomeserver(nextAddress, maxDepth) return this.findHomeserver(nextAddress, maxDepth)
} }
status(message) { status(message) {
feedback.setLoading(true) feedback.setLoading(true)
feedback.message(message) feedback.message(message)
@ -169,6 +166,3 @@ class Form extends ElemJS {
} }
const form = new Form() const form = new Form()