TerranQuest/Game
1
0
Fork 0
Code Issues 4 Pull Requests Releases 1 Wiki Activity

Give proper "login incorrect" error on signin page

Browse Source
This commit is contained in:
Skylar Ittner 2019-05-05 17:46:20 -06:00
parent 709540eee6
commit 332ed3e38a
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/js/api.js
View File

@ -87,16 +87,16 @@ function callAPIRawResponse(action, data, success, failure) {
} }
switch (textStatus) { switch (textStatus) {
case "timeout": case "timeout":
failure("Couldn't connect to the server (timeout)."); failure("Couldn't connect to the server (timeout).", xhr);
break; break;
case "error": case "error":
failure("Couldn't connect to the server (error)."); failure("Couldn't connect to the server (error).", xhr);
break; break;
case "parseerror": case "parseerror":
failure("The server sent a malformed response."); failure("The server sent a malformed response.", xhr);
break; break;
default: default:
failure("Couldn't connect to the server."); failure("Couldn't connect to the server.", xhr);
} }
} }
}); });

14
www/js/signin.js
View File

@ -11,7 +11,7 @@ $('#username').on("keyup", function () {
function checkAndSave(username, password) { function checkAndSave(username, password) {
app.preloader.show(); app.preloader.show();
callAPI("ping", { callAPIRawResponse("ping", {
username: username, username: username,
password: password password: password
}, function (data) { }, function (data) {
@ -32,9 +32,13 @@ function checkAndSave(username, password) {
app.preloader.hide(); app.preloader.hide();
app.dialog.alert(msg, "Error"); app.dialog.alert(msg, "Error");
}); });
}, function (msg) { }, function (msg, xhr) {
app.preloader.hide(); app.preloader.hide();
if (xhr.status == 401) {
app.dialog.alert("Login incorrect.", "Error");
} else {
app.dialog.alert(msg, "Error"); app.dialog.alert(msg, "Error");
}
}); });
} }
@ -44,3 +48,9 @@ function setupAccount() {
checkAndSave(username, password); checkAndSave(username, password);
} }
$("#password").on("keyup", function (evt) {
if (evt.keyCode == 13) {
setupAccount();
}
})