From f04ca463fe8a0c04d52d73f6453469315a607f8a Mon Sep 17 00:00:00 2001 From: EntireTwix Date: Sat, 3 Jul 2021 17:48:11 -0700 Subject: [PATCH] :fire: reverted noexcept as drogon doesnt like it --- include/bank_api.h | 18 +++++++++--------- src/bank_api.cpp | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/bank_api.h b/include/bank_api.h index 4c2e55e..a858986 100644 --- a/include/bank_api.h +++ b/include/bank_api.h @@ -14,21 +14,21 @@ class api : public HttpController public: api(Bank &b) noexcept; #if API_VERSION >= 1 - void GetBal(req_args, const std::string &name) const noexcept; - void GetLog(req_args) const noexcept; + void GetBal(req_args, const std::string &name) const; + void GetLog(req_args); void SendFunds(req_args) const; - void VerifyPassword(req_args) const noexcept; + void VerifyPassword(req_args) const; void ChangePassword(req_args) const; void AdminChangePassword(req_args) const; void SetBal(req_args) const; - void Help(req_args) const noexcept; - void Ping(req_args) const noexcept; - void Close(req_args) const noexcept; - void Contains(req_args, const std::string &name) const noexcept; - void AdminVerifyAccount(req_args) noexcept; - void ApiVersion(req_args) const noexcept; + void Help(req_args) const; + void Ping(req_args) const; + void Close(req_args) const; + void Contains(req_args, const std::string &name) const; + void AdminVerifyAccount(req_args) const; + void ApiVersion(req_args) const; void AddUser(req_args) const; void AdminAddUser(req_args) const; diff --git a/src/bank_api.cpp b/src/bank_api.cpp index 6b1825d..362dc80 100644 --- a/src/bank_api.cpp +++ b/src/bank_api.cpp @@ -49,11 +49,11 @@ api::api(Bank &b) noexcept : bank(b) {} #if API_VERSION >= 1 //Usage -void api::GetBal(req_args, const std::string &name) const noexcept +void api::GetBal(req_args, const std::string &name) const { RESPONSE_PARSE(bank.GetBal(name)); } -void api::GetLog(req_args) noexcept +void api::GetLog(req_args) { if constexpr (MAX_LOG_SIZE > 0) { @@ -73,7 +73,7 @@ void api::SendFunds(req_args) const GEN_BODY RESPONSE_PARSE(bank.SendFunds(NAME_PARAM, body["to"].asCString(), body["amount"].asUInt())); } -void api::VerifyPassword(req_args) const noexcept { RESPOND_TRUE } +void api::VerifyPassword(req_args) const { RESPOND_TRUE } //Meta Usage void api::ChangePassword(req_args) const @@ -95,7 +95,7 @@ void api::SetBal(req_args) const } //System Usage -void api::Help(req_args) const noexcept +void api::Help(req_args) const { auto resp = HttpResponse::newHttpResponse(); resp->setBody(""); //will be filled in with docs @@ -103,7 +103,7 @@ void api::Help(req_args) const noexcept CACHE_FOREVER; callback(resp); } -void api::Ping(req_args) const noexcept +void api::Ping(req_args) const { auto resp = HttpResponse::newHttpResponse(); resp->setBody("pong"); @@ -111,24 +111,24 @@ void api::Ping(req_args) const noexcept CACHE_FOREVER; callback(resp); } -void api::Close(req_args) const noexcept +void api::Close(req_args) const { bank.Save(); app().quit(); RESPOND_TRUE //filter handles admin creds } -void api::Contains(req_args, const std::string &name) const noexcept +void api::Contains(req_args, const std::string &name) const { auto resp = HttpResponse::newHttpJsonResponse(JsonCast(bank.Contains(name))); resp->setStatusCode(k200OK); CORS; callback(resp); } -void api::AdminVerifyAccount(req_args) const noexcept +void api::AdminVerifyAccount(req_args) const { RESPOND_TRUE //filter handles admin creds } -void api::ApiVersion(req_args) const noexcept +void api::ApiVersion(req_args) const { auto resp = HttpResponse::newHttpJsonResponse(API_VERSION); resp->setStatusCode(k200OK);