pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-03 13:22:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add response codes to loginserver api reponses

Browse Source
This commit is contained in:
Akkadius 2019-09-16 23:40:06 -05:00
parent ae0eebe043
commit 4e2b2aca6a
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
loginserver/loginserver_webserver.cpp
View File

@ -29,6 +29,10 @@ extern LoginServer server;
namespace LoginserverWebserver { namespace LoginserverWebserver {
constexpr static int HTTP_RESPONSE_OK = 200;
constexpr static int HTTP_RESPONSE_BAD_REQUEST = 400;
constexpr static int HTTP_RESPONSE_UNAUTHORIZED = 401;
/** /**
* @param api * @param api
*/ */
@ -77,6 +81,7 @@ namespace LoginserverWebserver {
Json::Value response; Json::Value response;
if (username.empty() || password.empty()) { if (username.empty() || password.empty()) {
response["error"] = "Username or password not set"; response["error"] = "Username or password not set";
res.status = HTTP_RESPONSE_BAD_REQUEST;
LoginserverWebserver::SendResponse(response, res); LoginserverWebserver::SendResponse(response, res);
return; return;
} }
@ -87,9 +92,11 @@ namespace LoginserverWebserver {
response["data"]["account_id"] = account_created_id; response["data"]["account_id"] = account_created_id;
} }
else if (account_created_id == -1) { else if (account_created_id == -1) {
res.status = HTTP_RESPONSE_BAD_REQUEST;
response["error"] = "Account already exists!"; response["error"] = "Account already exists!";
} }
else { else {
res.status = HTTP_RESPONSE_BAD_REQUEST;
response["error"] = "Account failed to create!"; response["error"] = "Account failed to create!";
} }
@ -111,6 +118,7 @@ namespace LoginserverWebserver {
Json::Value response; Json::Value response;
if (username.empty() || password.empty()) { if (username.empty() || password.empty()) {
res.status = HTTP_RESPONSE_BAD_REQUEST;
response["error"] = "Username or password not set"; response["error"] = "Username or password not set";
LoginserverWebserver::SendResponse(response, res); LoginserverWebserver::SendResponse(response, res);
return; return;
@ -130,9 +138,11 @@ namespace LoginserverWebserver {
response["data"]["account_id"] = account_created_id; response["data"]["account_id"] = account_created_id;
} }
else if (account_created_id == -1) { else if (account_created_id == -1) {
res.status = HTTP_RESPONSE_BAD_REQUEST;
response["error"] = "Account already exists!"; response["error"] = "Account already exists!";
} }
else { else {
res.status = HTTP_RESPONSE_BAD_REQUEST;
response["error"] = "Account failed to create!"; response["error"] = "Account failed to create!";
} }
@ -152,6 +162,7 @@ namespace LoginserverWebserver {
Json::Value response; Json::Value response;
if (username.empty() || password.empty()) { if (username.empty() || password.empty()) {
res.status = HTTP_RESPONSE_BAD_REQUEST;
response["error"] = "Username or password not set"; response["error"] = "Username or password not set";
LoginserverWebserver::SendResponse(response, res); LoginserverWebserver::SendResponse(response, res);
return; return;
@ -167,6 +178,7 @@ namespace LoginserverWebserver {
response["data"]["account_id"] = login_account_id; response["data"]["account_id"] = login_account_id;
} }
else { else {
res.status = HTTP_RESPONSE_BAD_REQUEST;
response["error"] = "Credentials invalid!"; response["error"] = "Credentials invalid!";
} }
@ -186,6 +198,7 @@ namespace LoginserverWebserver {
Json::Value response; Json::Value response;
if (username.empty() || password.empty()) { if (username.empty() || password.empty()) {
res.status = HTTP_RESPONSE_BAD_REQUEST;
response["error"] = "Username or password not set"; response["error"] = "Username or password not set";
LoginserverWebserver::SendResponse(response, res); LoginserverWebserver::SendResponse(response, res);
return; return;
@ -197,6 +210,7 @@ namespace LoginserverWebserver {
); );
if (!login_server_account.loaded) { if (!login_server_account.loaded) {
res.status = HTTP_RESPONSE_BAD_REQUEST;
response["error"] = "Failed to find associated loginserver account!"; response["error"] = "Failed to find associated loginserver account!";
LoginserverWebserver::SendResponse(response, res); LoginserverWebserver::SendResponse(response, res);
return; return;
@ -211,6 +225,7 @@ namespace LoginserverWebserver {
response["message"] = "Loginserver account credentials updated!"; response["message"] = "Loginserver account credentials updated!";
} }
else { else {
res.status = HTTP_RESPONSE_BAD_REQUEST;
response["error"] = "Failed to update loginserver account credentials!"; response["error"] = "Failed to update loginserver account credentials!";
} }
@ -295,6 +310,7 @@ namespace LoginserverWebserver {
} }
else { else {
response["error"] = "Credentials invalid!"; response["error"] = "Credentials invalid!";
res.status = HTTP_RESPONSE_BAD_REQUEST;
} }
LoginserverWebserver::SendResponse(response, res); LoginserverWebserver::SendResponse(response, res);
@ -363,6 +379,8 @@ namespace LoginserverWebserver {
std::stringstream response_payload; std::stringstream response_payload;
response["message"] = "Authorization token is either invalid or cannot read!"; response["message"] = "Authorization token is either invalid or cannot read!";
response_payload << response; response_payload << response;
res.status = HTTP_RESPONSE_UNAUTHORIZED;
res.set_content(response_payload.str(), "application/json"); res.set_content(response_payload.str(), "application/json");
res.set_header("response_set", "true"); res.set_header("response_set", "true");
@ -392,6 +410,8 @@ namespace LoginserverWebserver {
std::stringstream response_payload; std::stringstream response_payload;
response["message"] = "Authorization token is either invalid or cannot write!"; response["message"] = "Authorization token is either invalid or cannot write!";
response_payload << response; response_payload << response;
res.status = HTTP_RESPONSE_UNAUTHORIZED;
res.set_content(response_payload.str(), "application/json"); res.set_content(response_payload.str(), "application/json");
res.set_header("response_set", "true"); res.set_header("response_set", "true");
@ -457,6 +477,7 @@ namespace LoginserverWebserver {
void TokenManager::LoadApiTokens() void TokenManager::LoadApiTokens()
{ {
auto results = server.db->GetLoginserverApiTokens(); auto results = server.db->GetLoginserverApiTokens();
int token_count = 0;
for (auto row = results.begin(); row != results.end(); ++row) { for (auto row = results.begin(); row != results.end(); ++row) {
LoginserverWebserver::TokenManager::token_data token_data; LoginserverWebserver::TokenManager::token_data token_data;
token_data.token = row[0]; token_data.token = row[0];
@ -476,7 +497,11 @@ namespace LoginserverWebserver {
token_data token_data
) )
); );
token_count++;
} }
LogInfo("Loaded [{}] API tokens", token_count);
} }
/** /**