From f6a6c23fc30da325bde76249c2aa330f24d39454 Mon Sep 17 00:00:00 2001 From: EntireTwix Date: Mon, 5 Jul 2021 13:54:30 -0700 Subject: [PATCH] :fire: removed ping :zap: transformed api version into api properties --- include/bank_api.h | 6 ++---- src/bank_api.cpp | 20 ++++++++++++++------ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/include/bank_api.h b/include/bank_api.h index 1325a26..ff14f5d 100644 --- a/include/bank_api.h +++ b/include/bank_api.h @@ -27,11 +27,10 @@ public: void SubBal(req_args) const; 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 ApiProperties(req_args) const; void AddUser(req_args) const; void AdminAddUser(req_args) const; @@ -61,7 +60,6 @@ public: //System Usage METHOD_ADD(api::Help, "/v1/help", Get, Options); - METHOD_ADD(api::Ping, "/v1/ping", Get, Options, "JsonFilter"); METHOD_ADD(api::Close, "/v1/admin/shutdown", Post, Options, "AdminFilter", "JsonFilter"); METHOD_ADD(api::Contains, "/v1/user/exists?name={name}", Get, Options, "JsonFilter"); METHOD_ADD(api::AdminVerifyAccount, "/v1/admin/verify_account", Post, Options, "AdminFilter", "JsonFilter"); @@ -72,7 +70,7 @@ public: METHOD_ADD(api::DelUser, "/v1/delete", Delete, Options, "UserFilter", "JsonFilter"); METHOD_ADD(api::AdminDelUser, "/v1/admin/delete", Delete, Options, "JsonFilter", "AdminFilter"); //expects ["name"](string) #endif - METHOD_ADD(api::ApiVersion, "/version", Get, Options); + METHOD_ADD(api::ApiProperties, "/properties", Get, Options); METHOD_LIST_END }; \ No newline at end of file diff --git a/src/bank_api.cpp b/src/bank_api.cpp index 247135b..b05dec4 100644 --- a/src/bank_api.cpp +++ b/src/bank_api.cpp @@ -113,10 +113,6 @@ void api::Help(req_args) const CACHE_FOREVER; callback(resp); } -void api::Ping(req_args) const -{ - RESPOND_TRUE -} void api::Close(req_args) const { bank.Save(); @@ -132,9 +128,21 @@ void api::AdminVerifyAccount(req_args) const { RESPOND_TRUE //filter handles admin creds } -void api::ApiVersion(req_args) const +void api::ApiProperties(req_args) const { - auto resp = HttpResponse::newHttpJsonResponse(API_VERSION); + Json::Value temp; + temp["version"] = API_VERSION; + temp["max_log"] = MAX_LOG_SIZE; + temp["pre_log"] = PRE_LOG_SIZE; + temp["min_name"] = min_name_size; + temp["max_name"] = max_name_size; + temp["return_on_del"] = RETURN_ON_DEL; + if constexpr (RETURN_ON_DEL) + { + temp["return_on_del_acc"] = return_account; + } + + auto resp = HttpResponse::newHttpJsonResponse(std::move(temp)); CACHE_FOREVER; callback(resp); }