diff --git a/include/bank_f.hpp b/include/bank_f.hpp index 9884010..6973b57 100644 --- a/include/bank_f.hpp +++ b/include/bank_f.hpp @@ -64,10 +64,10 @@ public: PASS_HEADER JSON(bank.AddUser(std::move(name), std::move(pass))); } - void AdminAddUser(req_args, std::string &&name, uint32_t init_bal, std::string &&init_pass) const + void AdminAddUser(req_args, std::string &&name, uint32_t init_bal) const { PASS_HEADER - JSON(bank.AdminAddUser(pass, std::move(name), init_bal, std::move(init_pass))); + JSON(bank.AdminAddUser(pass, std::move(name), init_bal, std::string(req->getBody()))); } void DelUser(req_args, const std::string &name) const { @@ -128,22 +128,28 @@ public: } METHOD_LIST_BEGIN - METHOD_ADD(BankF::Close, "/admin/close", Post, Options); - METHOD_ADD(BankF::AddUser, "/user/{name}", Post, Options); - METHOD_ADD(BankF::AdminAddUser, "/admin/user/{name}", Post, Options); - METHOD_ADD(BankF::SendFunds, "{name}/send/{to}/amount={amount}", Post, Options); + //Usage + METHOD_ADD(BankF::GetBal, "/{name}/bal", Get, Options); + METHOD_ADD(BankF::GetLog, "/{name}/log", Get, Options); + METHOD_ADD(BankF::SendFunds, "/{name}/send/{to}/amount={amount}", Post, Options); + METHOD_ADD(BankF::VerifyPassword, "/{name}/pass/verify", Get, Options); + + //Meta Usage METHOD_ADD(BankF::ChangePassword, "/{name}/pass/change", Patch, Options); METHOD_ADD(BankF::SetBal, "/admin/{name}/bal/amount={amount}", Patch, Options); + //System Usage METHOD_ADD(BankF::Help, "/help", Get, Options); - METHOD_ADD(BankF::VerifyPassword, "/{name}/pass/verify", Get, Options); + METHOD_ADD(BankF::Close, "/admin/close", Post, Options); METHOD_ADD(BankF::Contains, "/contains/{name}", Get, Options); - METHOD_ADD(BankF::GetBal, "/{name}/bal", Get, Options); METHOD_ADD(BankF::AdminVerifyPass, "/admin/verify", Get, Options); - METHOD_ADD(BankF::GetLog, "/{name}/log", Get, Options); + //User Managment + METHOD_ADD(BankF::AddUser, "/user/{name}", Post, Options); + METHOD_ADD(BankF::AdminAddUser, "/admin/user/{name}?init_bal={init_bal}", Post, Options); METHOD_ADD(BankF::DelUser, "/user/{name}", Delete, Options); METHOD_ADD(BankF::AdminDelUser, "/admin/user/{name}", Delete, Options); + METHOD_LIST_END }; \ No newline at end of file