Minor adjustments
This commit is contained in:
parent
7fbe592529
commit
589a58d458
20
js/auth.js
20
js/auth.js
@ -30,7 +30,7 @@ async function registerKey(key) { // Posts key to server and listens for respons
|
||||
})
|
||||
const data = await res.json();
|
||||
return res.status === 201
|
||||
? (localStorage.setItem("uuid", data.uuid), true)
|
||||
? (localStorage.setItem("uuid", data.api_key), true)
|
||||
: false;
|
||||
}
|
||||
|
||||
@ -47,16 +47,24 @@ async function checkAuth(key) {
|
||||
}
|
||||
|
||||
async function init(){ // Reads registration key from query, and calls registerKey(key)
|
||||
cmdOut("Reading registration key");
|
||||
cmdOut("Reading authorisation code");
|
||||
const key = await getQuery("key");
|
||||
cmdOut(`Temporary: ${key}`)
|
||||
cmdOut("Requesting API Key from server");
|
||||
if (!await registerKey(key)) {
|
||||
cmdOut("Failed to register key")
|
||||
hideLoading()
|
||||
return
|
||||
}
|
||||
await checkAuth(localStorage.getItem("uuid"))
|
||||
? cmdOut("Authentication succesful")
|
||||
: cmdOut("Authentication failed")
|
||||
showLoading()
|
||||
if (! await checkAuth(localStorage.getItem("uuid"))) {
|
||||
cmdOut("Authentication Check failed")
|
||||
cmdOut("Please try again")
|
||||
hideLoading()
|
||||
await delay(2000)
|
||||
location.replace("./")
|
||||
}
|
||||
hideLoading();
|
||||
cmdOut("Authentication succesful")
|
||||
await delay(2000)
|
||||
location.replace("./")
|
||||
}
|
@ -87,7 +87,7 @@ async function hideLoading() {
|
||||
/* DEPRECIATED: Alias for hideLoading() - Marked for removal*/
|
||||
async function clearLoading() {
|
||||
log("Depreciated function called - clearLoading() - Alias to hideLoading()", "WARN")
|
||||
await hideLoading();
|
||||
hideLoading();
|
||||
}
|
||||
|
||||
async function showLoading() {
|
||||
|
Reference in New Issue
Block a user