diff --git a/include/bank_api.h b/include/bank_api.h index 1d14b4a..d510e7d 100644 --- a/include/bank_api.h +++ b/include/bank_api.h @@ -49,12 +49,12 @@ public: #else METHOD_ADD(api::GetLog, "/v1/user/log", Get, Options, "JsonFilter"); #endif - METHOD_ADD(api::SendFunds, "/v1/user/transfer", Post, Options, "JsonFilter", "UserFilter"); //expects ["to"](string) and ["amount"](32 bits) + METHOD_ADD(api::SendFunds, "/v1/user/transfer", Post, Options, "JsonFilter", "UserFilter"); //expects ["name"](string) and ["amount"](32 bits) METHOD_ADD(api::VerifyPassword, "/v1/user/verify_password", Post, Options, "UserFilter", "JsonFilter"); - //Meta Usage - METHOD_ADD(api::ChangePassword, "/v1/user/change_password", Patch, Options, "JsonFilter", "UserFilter"); //expects ["new_pass"](string) - METHOD_ADD(api::AdminChangePassword, "/v1/admin/user/change_password", Patch, Options, "JsonFilter", "UserFilter"); //expects ["name"](string) and ["new_pass"](string) + //Meta Usage1 + METHOD_ADD(api::ChangePassword, "/v1/user/change_password", Patch, Options, "JsonFilter", "UserFilter"); //expects ["pass"](string) + METHOD_ADD(api::AdminChangePassword, "/v1/admin/user/change_password", Patch, Options, "JsonFilter", "UserFilter"); //expects ["name"](string) and ["pass"](string) METHOD_ADD(api::SetBal, "/v1/admin/set_balance", Patch, Options, "JsonFilter", "UserFilter"); //expects ["name"](string) and ["amount"](32 bits) METHOD_ADD(api::ImpactBal, "/v1/admin/impact_balance", Post, Options, "JsonFilter", "UserFilter"); //expects ["name"](string) and ["amount"](32 bits) @@ -66,7 +66,7 @@ public: //User Managment METHOD_ADD(api::AddUser, "/v1/user/register", Post, Options); //expects ["name"](string) ["pass"](string) - METHOD_ADD(api::AdminAddUser, "/v1/admin/user/register", Post, Options, "JsonFilter", "UserFilter"); //expects ["name"](string) ["balance"](32 bits) ["pass"](string) + METHOD_ADD(api::AdminAddUser, "/v1/admin/user/register", Post, Options, "JsonFilter", "UserFilter"); //expects ["name"](string) ["amount"](32 bits) ["pass"](string) METHOD_ADD(api::DelUser, "/v1/user/delete", Delete, Options, "UserFilter", "JsonFilter"); METHOD_ADD(api::AdminDelUser, "/v1/admin/user/delete", Delete, Options, "JsonFilter", "UserFilter"); //expects ["name"](string) #endif diff --git a/src/bank_api.cpp b/src/bank_api.cpp index 509d14e..fb5de0a 100644 --- a/src/bank_api.cpp +++ b/src/bank_api.cpp @@ -64,7 +64,7 @@ void api::GetLog(req_args) void api::SendFunds(req_args) const { GEN_BODY - RESPONSE_PARSE(bank.SendFunds(NAME_PARAM, body["to"].asCString(), body["amount"].asUInt())); + RESPONSE_PARSE(bank.SendFunds(NAME_PARAM, body["name"].asCString(), body["amount"].asUInt())); } void api::VerifyPassword(req_args) const { RESPOND_TRUE } @@ -72,13 +72,13 @@ void api::VerifyPassword(req_args) const { RESPOND_TRUE } void api::ChangePassword(req_args) const { GEN_BODY - bank.ChangePassword(NAME_PARAM, std::move(body["new_pass"].asCString())); + bank.ChangePassword(NAME_PARAM, std::move(body["pass"].asCString())); RESPOND_TRUE } void api::AdminChangePassword(req_args) const { GEN_BODY - bank.ChangePassword(body["name"].asCString(), std::move(body["new_pass"].asCString())); + bank.ChangePassword(body["name"].asCString(), std::move(body["pass"].asCString())); RESPOND_TRUE } void api::SetBal(req_args) const