Upstream/VIAaaS
1
0
Fork 0
mirror of https://github.com/ViaVersion/VIAaaS.git synced 2024-11-24 12:25:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

handle null result from prompt(), fetch

Browse Source
This commit is contained in:
creeper123123321 2021-01-17 11:28:51 -03:00 committed by GitHub
parent 1222411fba
commit 5ecb2b49e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/resources/web/auth.js
View File

@ -7,7 +7,8 @@ if (urlParams.get("mcauth_success") == "false") {
}
function askWsUrl() {
let url = prompt("VIAaaS instance websocket", localStorage.getItem("ws-url") || "wss://localhost:25543/ws");
let url = localStorage.getItem("ws-url") || "wss://localhost:25543/ws";
url = prompt("VIAaaS instance websocket", url) || url;
localStorage.setItem("ws-url", url);
return url;
}
@ -25,19 +26,18 @@ function getCorsProxy() {
function loginMc() {
var clientToken = uuid.v4();
$.ajax({type: "post",
url: getCorsProxy() + "https://authserver.mojang.com/authenticate",
data: JSON.stringify({
fetch(getCorsProxy() + "https://authserver.mojang.com/authenticate", {method: "post",
body: JSON.stringify({
agent: {name: "Minecraft", version: 1},
username: $("#email").val(),
password: $("#password").val(),
clientToken: clientToken,
}),
contentType: "application/json",
dataType: "json"
}).done((data) => {
storeMcAccount(data.accessToken, data.clientToken, data.selectedProfile.name, data.selectedProfile.id);
}).fail(() => alert("Failed to login"));
headers: {"content-type": "application/json"}
}).then((data) => {
if (data.status != 200) throw "not 200";
storeMcAccount(data.json().accessToken, data.json().clientToken, data.json().selectedProfile.name, data.json().selectedProfile.id);
}).catch(() => alert("Failed to login"));
$("#email").val("");
$("#password").val("");
}