Skip to content

improve: HTTP login error handling to display login.php error messages #886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luanluciano93 merged 5 commits into from
Sep 21, 2024
Merged

improve: HTTP login error handling to display login.php error messages #886

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca3d2a0
test
kokekanon Sep 21, 2024
a0c4904
Update src/framework/net/httplogin.cpp
kokekanon Sep 21, 2024
58a327e
Update src/framework/net/httplogin.cpp
kokekanon Sep 21, 2024
601c93b
Merge branch 'main' into kokekanon/testHttps
Nottinghster Sep 21, 2024
32d7548
Merge branch 'main' into kokekanon/testHttps
Nottinghster Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/framework/net/httplogin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,19 @@ void LoginHttp::httpLogin(const std::string& host, const std::string& path,
std::string msg = "";
if (result) {
status = result->status;
msg = httplib::to_string(result.error());
try {
const auto body = json::parse(result->body);
if (body.contains("errorMessage")) {
msg = body["errorMessage"];
} else {
msg = "Unexpected JSON format.";
}
} catch (const std::exception&) {
msg = httplib::to_string(result.error());
}
} else {
status = -1;
msg = "Unknown error";
msg = "Unknown error.\nCheck: \n-Enable Http login\n-Check Apache\n-Check login.php\n-check port 80/8080\n-Check Cloudflare";
}

g_dispatcher.addEvent([this, request_id, status, msg] {
Expand Down