Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-02 08:32:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: check on responseJSON when wrong password (#3693)

Browse Source
This commit is contained in:
Dominik
2026-03-25 06:34:14 +01:00
committed by GitHub
parent 1fbc41768c 0b4cf3c7bb
commit 5d16e2c44a
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/js/login.js
View File

@@ -25,31 +25,34 @@ function redirect() {
globalThis.location.replace(target);
}
function showErrorMessage(errorMessage) {
$("#error-message").text(errorMessage);
$("#error-label").show();
}
function wrongPassword(isError = false, isSuccess = false, data = null) {
if (isError) {
let isErrorResponse = false;
let isInvalidTOTP = false;
let errorMessage = "Wrong password!";
// Reset hint and error message
$("#error-message").text("");
$("#error-hint").hide();
$("#error-hint").text("");
if (data !== null && "error" in data.responseJSON && "message" in data.responseJSON.error) {
if ("error" in data.responseJSON && "message" in data.responseJSON.error) {
// This is an error, highlight both the password and the TOTP field
isErrorResponse = true;
// Check if the error is caused by an invalid TOTP token
isInvalidTOTP = data.responseJSON.error.message === "Invalid 2FA token";
$("#error-message").text(data.responseJSON.error.message);
errorMessage = data.responseJSON.error.message;
if ("hint" in data.responseJSON.error && data.responseJSON.error.hint !== null) {
$("#error-hint").text(data.responseJSON.error.hint);
$("#error-hint").show();
}
} else {
$("#error-message").text("Wrong password!");
}
$("#error-label").show();
showErrorMessage(errorMessage);
// Always highlight the TOTP field on error
if (isErrorResponse) $("#totp_input").addClass("has-error");
@@ -105,7 +108,12 @@ function doLogin(password) {
redirect();
})
.fail(data => {
wrongPassword(true, false, data);
if (!data || !data.responseJSON) {
showErrorMessage("Server unreachable!");
} else {
wrongPassword(true, false, data);
}
NProgress.done();
utils.enableAll();
});