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 +4 -3
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 61cc4a19f3 - Show all commits

7
src/js/login.js
View file

@ -119,19 +119,20 @@ class Form extends ElemJS {
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
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().catch(()=>{}) const versions = await versionsReq.json()
if (Array.isArray(versions.versions)) { if (Array.isArray(versions.versions)) {
return address return address
} }