UnknownObject/WebCC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework the body of request and response

Browse Source
This commit is contained in:
Chunting Gu
2019-07-03 17:37:44 +08:00
parent b9f2ba6a41
commit 98aeeae012
39 changed files with 1122 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/client_basics.cc
+7 -22
View File
@@ -3,49 +3,34 @@
#include "webcc/client_session.h"
#include "webcc/logger.h"
static void PrintSeparator() {
static const std::string s_line(80, '-');
std::cout << s_line << std::endl;
}
int main() {
WEBCC_LOG_INIT("", webcc::LOG_CONSOLE);
webcc::ClientSession session;
try {
PrintSeparator();
// Using request builder:
auto r = session.Request(webcc::RequestBuilder{}.Get().
Url("http://httpbin.org/get").
auto r = session.Request(webcc::RequestBuilder{}.
Get("http://httpbin.org/get").
Query("key1", "value1").
Query("key2", "value2").
Date().
Header("Accept", "application/json")
());
std::cout << r->content() << std::endl;
PrintSeparator();
// Using shortcut:
r = session.Get("http://httpbin.org/get",
{ "key1", "value1", "key2", "value2" },
{ "Accept", "application/json" });
std::cout << r->content() << std::endl;
r = session.Request(webcc::RequestBuilder{}.
Post("http://httpbin.org/post").
Body("{'name'='Adam', 'age'=20}").
Json().Utf8()
());
#if WEBCC_ENABLE_SSL
PrintSeparator();
// HTTPS support.
r = session.Get("https://httpbin.org/get");
std::cout << r->content() << std::endl;
#endif // WEBCC_ENABLE_SSL
} catch (const webcc::Error& error) {
examples/file_upload_client.cc
+2 -2
View File
@@ -42,8 +42,8 @@ int main(int argc, char* argv[]) {
webcc::ClientSession session;
try {
auto r = session.Request(webcc::RequestBuilder{}.Post().
Url(url).
auto r = session.Request(webcc::RequestBuilder{}.
Post(url).
File("file", upload_dir / "remember.txt").
Form("json", "{}", "application/json")
());
examples/file_upload_server.cc
+14 -10
View File
@@ -11,18 +11,22 @@ class FileUploadView : public webcc::View {
public:
webcc::ResponsePtr Handle(webcc::RequestPtr request) override {
if (request->method() == "POST") {
std::cout << "files: " << request->form_parts().size() << std::endl;
for (auto& part : request->form_parts()) {
std::cout << "name: " << part->name() << std::endl;
std::cout << "data: " << std::endl << part->data() << std::endl;
}
// TODO: media_type: webcc::media_types::kTextPlain; charset = "utf-8";
return webcc::ResponseBuilder{}.Created().Data("OK")();
return Post(request);
}
return webcc::ResponseBuilder{}.NotImplemented()();
return {};
}
private:
webcc::ResponsePtr Post(webcc::RequestPtr request) {
std::cout << "form parts: " << request->form_parts().size() << std::endl;
for (auto& part : request->form_parts()) {
std::cout << "name: " << part->name() << std::endl;
std::cout << "data: " << std::endl << part->data() << std::endl;
}
return webcc::ResponseBuilder{}.Created().Body("OK")();
}
};
examples/github_client.cc
+10 -10
View File
@@ -57,7 +57,7 @@ void ListEvents(webcc::ClientSession& session) {
try {
auto r = session.Get(kUrlRoot + "/events");
PRINT_JSON_STRING(r->content());
PRINT_JSON_STRING(r->data());
} catch (const webcc::Error& error) {
std::cout << error << std::endl;
@@ -71,7 +71,7 @@ void ListUserFollowers(webcc::ClientSession& session, const std::string& user) {
try {
auto r = session.Get(kUrlRoot + "/users/" + user + "/followers");
PRINT_JSON_STRING(r->content());
PRINT_JSON_STRING(r->data());
} catch (const webcc::Error& error) {
std::cout << error << std::endl;
@@ -85,12 +85,12 @@ void ListAuthUserFollowers(webcc::ClientSession& session,
const std::string& login,
const std::string& password) {
try {
auto r = session.Request(webcc::RequestBuilder{}.Get().
Url(kUrlRoot + "/user/followers").
auto r = session.Request(webcc::RequestBuilder{}.
Get(kUrlRoot + "/user/followers").
AuthBasic(login, password)
());
PRINT_JSON_STRING(r->content());
PRINT_JSON_STRING(r->data());
} catch (const webcc::Error& error) {
std::cout << error << std::endl;
@@ -107,14 +107,14 @@ void CreateAuthorization(webcc::ClientSession& session,
" 'scopes': ['public_repo', 'repo', 'repo:status', 'user']\n"
"}";
auto r = session.Request(webcc::RequestBuilder{}.Post().
Url(kUrlRoot + "/authorizations").
Data(std::move(data)).
Json(true).
auto r = session.Request(webcc::RequestBuilder{}.
Post(kUrlRoot + "/authorizations").
Body(std::move(data)).
Json().Utf8().
AuthBasic(login, password)
());
std::cout << r->content() << std::endl;
std::cout << r->data() << std::endl;
} catch (const webcc::Error& error) {
std::cout << error << std::endl;
examples/rest_book_client.cc
+7 -7
View File
@@ -62,7 +62,7 @@ public:
return false;
}
Json::Value rsp_json = StringToJson(r->content());
Json::Value rsp_json = StringToJson(r->data());
if (!rsp_json.isArray()) {
return false; // Should be a JSON array of books.
@@ -92,7 +92,7 @@ public:
return false;
}
Json::Value rsp_json = StringToJson(r->content());
Json::Value rsp_json = StringToJson(r->data());
*id = rsp_json["id"].asString();
return !id->empty();
@@ -120,7 +120,7 @@ public:
return false;
}
return JsonStringToBook(r->content(), book);
return JsonStringToBook(r->data(), book);
} catch (const webcc::Error& error) {
std::cerr << error << std::endl;
@@ -211,11 +211,11 @@ int main(int argc, char* argv[]) {
// Share the same session.
webcc::ClientSession session;
// Session-level settings.
session.set_timeout(timeout);
// TODO
//session.set_content_type("application/json");
//session.set_charset("utf-8");
// If the request has body, default to this content type.
session.set_media_type("application/json");
session.set_charset("utf-8");
BookListClient list_client(session, url);
BookDetailClient detail_client(session, url);
examples/rest_book_server.cc
+29 -33
View File
@@ -41,19 +41,19 @@ public:
webcc::ResponsePtr Handle(webcc::RequestPtr request) override {
if (request->method() == "GET") {
return Get(request->query());
return Get(request);
}
if (request->method() == "POST") {
return Post(request);
}
return{};
return {};
}
protected:
private:
// Get a list of books based on query parameters.
webcc::ResponsePtr Get(const webcc::UrlQuery& query);
webcc::ResponsePtr Get(webcc::RequestPtr request);
// Create a new book.
webcc::ResponsePtr Post(webcc::RequestPtr request);
@@ -75,31 +75,29 @@ public:
webcc::ResponsePtr Handle(webcc::RequestPtr request) override {
if (request->method() == "GET") {
return Get(request->args(), request->query());
return Get(request);
}
if (request->method() == "PUT") {
return Put(request, request->args());
return Put(request);
}
if (request->method() == "DELETE") {
return Delete(request->args());
return Delete(request);
}
return {};
}
protected:
private:
// Get the detailed information of a book.
webcc::ResponsePtr Get(const webcc::UrlArgs& args,
const webcc::UrlQuery& query);
webcc::ResponsePtr Get(webcc::RequestPtr request);
// Update a book.
webcc::ResponsePtr Put(webcc::RequestPtr request,
const webcc::UrlArgs& args);
webcc::ResponsePtr Put(webcc::RequestPtr request);
// Delete a book.
webcc::ResponsePtr Delete(const webcc::UrlArgs& args);
webcc::ResponsePtr Delete(webcc::RequestPtr request);
private:
// Sleep some seconds before send back the response.
@@ -110,7 +108,7 @@ private:
// -----------------------------------------------------------------------------
// Return all books as a JSON array.
webcc::ResponsePtr BookListView::Get(const webcc::UrlQuery& /*query*/) {
webcc::ResponsePtr BookListView::Get(webcc::RequestPtr request) {
Sleep(sleep_seconds_);
Json::Value json(Json::arrayValue);
@@ -119,22 +117,22 @@ webcc::ResponsePtr BookListView::Get(const webcc::UrlQuery& /*query*/) {
json.append(BookToJson(book));
}
// TODO: charset = "utf-8"
return webcc::ResponseBuilder{}.OK().Data(JsonToString(json)).Json()();
return webcc::ResponseBuilder{}.OK().Body(JsonToString(json)).Json().
Utf8()();
}
webcc::ResponsePtr BookListView::Post(webcc::RequestPtr request) {
Sleep(sleep_seconds_);
Book book;
if (JsonStringToBook(request->content(), &book)) {
if (JsonStringToBook(request->data(), &book)) {
std::string id = g_book_store.AddBook(book);
Json::Value json;
json["id"] = id;
// TODO: charset = "utf-8"
return webcc::ResponseBuilder{}.Created().Data(JsonToString(json)).Json()();
return webcc::ResponseBuilder{}.Created().Body(JsonToString(json)).
Json().Utf8()();
} else {
// Invalid JSON
return webcc::ResponseBuilder{}.BadRequest()();
@@ -143,39 +141,37 @@ webcc::ResponsePtr BookListView::Post(webcc::RequestPtr request) {
// -----------------------------------------------------------------------------
webcc::ResponsePtr BookDetailView::Get(const webcc::UrlArgs& args,
const webcc::UrlQuery& query) {
webcc::ResponsePtr BookDetailView::Get(webcc::RequestPtr request) {
Sleep(sleep_seconds_);
if (args.size() != 1) {
if (request->args().size() != 1) {
// Using kNotFound means the resource specified by the URL cannot be found.
// kBadRequest could be another choice.
return webcc::ResponseBuilder{}.NotFound()();
}
const std::string& book_id = args[0];
const std::string& book_id = request->args()[0];
const Book& book = g_book_store.GetBook(book_id);
if (book.IsNull()) {
return webcc::ResponseBuilder{}.NotFound()();
}
// TODO: charset = "utf-8"
return webcc::ResponseBuilder{}.OK().Data(BookToJsonString(book)).Json()();
return webcc::ResponseBuilder{}.OK().Body(BookToJsonString(book)).Json().
Utf8()();
}
webcc::ResponsePtr BookDetailView::Put(webcc::RequestPtr request,
const webcc::UrlArgs& args) {
webcc::ResponsePtr BookDetailView::Put(webcc::RequestPtr request) {
Sleep(sleep_seconds_);
if (args.size() != 1) {
if (request->args().size() != 1) {
return webcc::ResponseBuilder{}.NotFound()();
}
const std::string& book_id = args[0];
const std::string& book_id = request->args()[0];
Book book;
if (!JsonStringToBook(request->content(), &book)) {
if (!JsonStringToBook(request->data(), &book)) {
return webcc::ResponseBuilder{}.BadRequest()();
}
@@ -185,14 +181,14 @@ webcc::ResponsePtr BookDetailView::Put(webcc::RequestPtr request,
return webcc::ResponseBuilder{}.OK()();
}
webcc::ResponsePtr BookDetailView::Delete(const webcc::UrlArgs& args) {
webcc::ResponsePtr BookDetailView::Delete(webcc::RequestPtr request) {
Sleep(sleep_seconds_);
if (args.size() != 1) {
if (request->args().size() != 1) {
return webcc::ResponseBuilder{}.NotFound()();
}
const std::string& book_id = args[0];
const std::string& book_id = request->args()[0];
if (!g_book_store.DeleteBook(book_id)) {
return webcc::ResponseBuilder{}.NotFound()();