From 7c0b4f48bdef794c3f57931f7673084a28721210 Mon Sep 17 00:00:00 2001 From: EntireTwix Date: Sat, 3 Jul 2021 17:31:27 -0700 Subject: [PATCH] :truck: moved CORS header --- main.cpp | 4 ---- src/bank_api.cpp | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/main.cpp b/main.cpp index 1279c46..f1a7413 100644 --- a/main.cpp +++ b/main.cpp @@ -101,10 +101,6 @@ int main(int argc, char **argv) auto user_filter = std::make_shared(bank); auto admin_filter = std::make_shared(bank); - app().registerPostHandlingAdvice( - [](const drogon::HttpRequestPtr &req, const drogon::HttpResponsePtr &resp) { - resp->addHeader("Access-Control-Allow-Origin", "*"); //CORS - }); app() .loadConfigFile(config_location) .registerFilter(user_filter) diff --git a/src/bank_api.cpp b/src/bank_api.cpp index fa79282..15a6273 100644 --- a/src/bank_api.cpp +++ b/src/bank_api.cpp @@ -8,12 +8,14 @@ const auto r = R; \ auto resp = HttpResponse::newHttpJsonResponse(JsonCast(std::move(r.second))); \ resp->setStatusCode(r.first); \ + resp->addHeader("Access-Control-Allow-Origin", "*"); \ callback(resp); #define RESPOND_TRUE \ auto resp = HttpResponse::newHttpJsonResponse(JsonCast(true)); \ resp->setStatusCode(k200OK); \ resp->setExpiredTime(0); \ + resp->addHeader("Access-Control-Allow-Origin", "*"); \ callback(resp); #define NAME_PARAM req->getBody().data() @@ -60,6 +62,7 @@ void api::GetLog(req_args) { auto resp = HttpResponse::newHttpJsonResponse("Logs are Disabled"); resp->setStatusCode(k404NotFound); + resp->addHeader("Access-Control-Allow-Origin", "*"); resp->setExpiredTime(0); //cached forever callback(resp); } @@ -98,6 +101,7 @@ void api::Help(req_args) const { auto resp = HttpResponse::newHttpResponse(); resp->setBody(""); //will be filled in with docs + resp->addHeader("Access-Control-Allow-Origin", "*"); resp->setExpiredTime(0); callback(resp); } @@ -105,6 +109,7 @@ void api::Ping(req_args) const { auto resp = HttpResponse::newHttpResponse(); resp->setBody("pong"); + resp->addHeader("Access-Control-Allow-Origin", "*"); resp->setExpiredTime(0); callback(resp); } @@ -118,6 +123,7 @@ void api::Contains(req_args, const std::string &name) const { auto resp = HttpResponse::newHttpJsonResponse(JsonCast(bank.Contains(name))); resp->setStatusCode(k200OK); + resp->addHeader("Access-Control-Allow-Origin", "*"); callback(resp); } void api::AdminVerifyAccount(req_args) @@ -128,6 +134,7 @@ void api::ApiVersion(req_args) const { auto resp = HttpResponse::newHttpJsonResponse(API_VERSION); resp->setStatusCode(k200OK); + resp->addHeader("Access-Control-Allow-Origin", "*"); resp->setExpiredTime(0); //cached forever callback(resp); }