diff --git a/include/bank_api.h b/include/bank_api.h index 16b879b..fb33ab1 100644 --- a/include/bank_api.h +++ b/include/bank_api.h @@ -13,7 +13,7 @@ class api : public HttpController public: api(Bank &b); -#if API_VERSION == 1 +#if API_VERSION >= 1 void GetBal(req_args, const std::string &name) const; void GetLog(req_args); void SendFunds(req_args) const; @@ -35,14 +35,14 @@ public: METHOD_LIST_BEGIN //Usage - METHOD_ADD(api::GetBal, "/v1/user/bal?name={name}", Get, Options); - METHOD_ADD(api::GetLog, "/v1/user/log", Get, Options, "UserFilter"); //(could be optimized further) - METHOD_ADD(api::SendFunds, "/v1/user/transfer", Post, Options, "UserFilter"); + METHOD_ADD(api::GetBal, "/v1/user/balance?name={name}", Get, Options); + METHOD_ADD(api::GetLog, "/v1/user/log", Get, Options, "UserFilter"); + METHOD_ADD(api::SendFunds, "/v1/user/transfer", Post, Options, "UserFilter"); //expects ["to"](string) and ["amount"](32 bits) METHOD_ADD(api::VerifyPassword, "/v1/user/verify_password", Get, Options, "UserFilter"); //Meta Usage - METHOD_ADD(api::ChangePassword, "/v1/user/change_password", Patch, Options, "UserFilter"); - METHOD_ADD(api::SetBal, "/v1/admin/bal", Patch, Options, "AdminFilter"); + METHOD_ADD(api::ChangePassword, "/v1/user/change_password", Patch, Options, "UserFilter"); //expects ["new_pass"](string) + METHOD_ADD(api::SetBal, "/v1/admin/set_balance", Patch, Options, "AdminFilter"); //expects ["amount"](32 bits) //System Usage METHOD_ADD(api::Help, "/v1/help", Get, Options); @@ -52,10 +52,10 @@ public: METHOD_ADD(api::AdminVerifyPass, "/v1/admin/verify_password", Get, Options, "AdminFilter"); //User Managment - METHOD_ADD(api::AddUser, "/v1/user/register", Post, Options); - METHOD_ADD(api::AdminAddUser, "/v1/admin/user/register", Post, Options, "AdminFilter"); + METHOD_ADD(api::AddUser, "/v1/user/register", Post, Options); //expects ["name"](string) ["pass"](string) + METHOD_ADD(api::AdminAddUser, "/v1/admin/user/register", Post, Options, "AdminFilter"); //expects ["name"](string) ["balance"](32 bits) ["pass"](string) METHOD_ADD(api::DelUser, "/v1/delete", Delete, Options, "UserFilter"); - METHOD_ADD(api::AdminDelUser, "/v1/admin/delete", Delete, Options, "AdminFilter"); + METHOD_ADD(api::AdminDelUser, "/v1/admin/delete", Delete, Options, "AdminFilter"); //expects ["name"](string) METHOD_LIST_END #endif diff --git a/src/bank_api.cpp b/src/bank_api.cpp index 7833205..63b853e 100644 --- a/src/bank_api.cpp +++ b/src/bank_api.cpp @@ -43,7 +43,7 @@ api::api(Bank &b) : bank(b) { } -#if API_VERSION == 1 +#if API_VERSION >= 1 //Usage void api::GetBal(req_args, const std::string &name) const