@@ -16,6 +16,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 option(USE_INSTALL_RESOURCE_PATH "Set resource path to install location" OFF)
 
 add_executable(server
+  ./src/core/cookie.cpp
   ./src/core/request.cpp
   ./src/core/response.cpp
   ./src/core/router.cpp
 
@@ -38,6 +38,11 @@ void helloWorldHandler(Request &req, Response &res) {
   resp["submodules"][2]["location"] = "lib/json";
   resp["submodules"][2]["name"] = "JSON";
 
+  Cookie *cookie = new Cookie();
+  cookie->name = "hello";
+  cookie->value = "world";
+  res.setCookie(cookie);
+
   res.json(resp).status(200);
   return;
 }
 
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <string>
+
+#include <expresso/utils/sterlize.h>
+
+namespace expresso {
+
+namespace core {
+
+class Cookie {
+public:
+  bool secure;
+  bool httpOnly;
+
+  std::string name;
+  std::string value;
+  std::string domain;
+  std::string path;
+  std::string expires;
+  std::string maxAge;
+  std::string sameSite;
+
+  Cookie();
+  ~Cookie();
+
+  std::string serialize();
+};
+
+} // namespace core
+
+} // namespace expresso
@@ -29,7 +29,7 @@ class Request {
   std::string tempPath;
 
   json::object body;
-  std::map<std::string, std::string> cookies;
+  std::vector<Cookie *> cookies;
   std::map<std::string, std::string> headers;
   std::map<std::string, std::string> params;
   std::map<std::string, std::string> queries;
 
@@ -8,6 +8,7 @@
 #include <json/object.h>
 #include <logger/log.h>
 
+#include <expresso/core/cookie.h>
 #include <expresso/core/status_code.h>
 #include <expresso/sys.h>
 #include <expresso/utils/common.h>
@@ -26,6 +27,7 @@ class Response {
 
   std::string message;
 
+  std::vector<Cookie *> cookies;
   std::map<std::string, std::string> headers;
 
   void sendToClient();
@@ -36,6 +38,7 @@ class Response {
   ~Response();
 
   void set(std::string headerName, std::string headerValue);
+  void setCookie(Cookie *cookie);
   std::string get(std::string headerName);
 
   Response status(int code);
 
@@ -0,0 +1,44 @@
+#include <expresso/core/cookie.h>
+
+expresso::core::Cookie::Cookie() {
+  this->secure = false;
+  this->httpOnly = false;
+  this->name = "";
+  this->value = "";
+  this->domain = "";
+  this->path = "";
+  this->expires = "";
+  this->maxAge = "";
+  this->sameSite = "";
+
+  return;
+}
+
+expresso::core::Cookie::~Cookie() { return; }
+
+std::string expresso::core::Cookie::serialize() {
+  std::string cookieString = this->name + "=" + utils::urlEncode(this->value);
+  if (!this->domain.empty()) {
+    cookieString += "; Domain=" + this->domain;
+  }
+  if (!this->path.empty()) {
+    cookieString += "; Path=" + this->path;
+  }
+  if (!this->expires.empty()) {
+    cookieString += "; Expires=" + this->expires;
+  }
+  if (!this->maxAge.empty()) {
+    cookieString += "; Max-Age=" + this->maxAge;
+  }
+  if (!this->sameSite.empty()) {
+    cookieString += "; SameSite=" + this->sameSite;
+  }
+  if (this->secure) {
+    cookieString += "; Secure";
+  }
+  if (this->httpOnly) {
+    cookieString += "; HttpOnly";
+  }
+
+  return cookieString;
+}
@@ -21,8 +21,8 @@ void expresso::core::Request::print() {
   logger::info(this->body.dumps(2, 2));
 
   logger::info("  cookies: ");
-  for (const std::pair<std::string, std::string> &cookie : this->cookies) {
-    logger::info("    " + cookie.first + ": " + cookie.second);
+  for (expresso::core::Cookie *cookie : this->cookies) {
+    logger::info("    " + cookie->serialize());
   }
 
   logger::info("  headers: ");
 
@@ -23,6 +23,12 @@ void expresso::core::Response::set(std::string headerName,
   return;
 }
 
+void expresso::core::Response::setCookie(Cookie *cookie) {
+  this->cookies.push_back(cookie);
+
+  return;
+}
+
 std::string expresso::core::Response::get(std::string headerName) {
   if (this->headers.find(headerName) != this->headers.end()) {
     return this->headers[headerName];
@@ -86,6 +92,9 @@ void expresso::core::Response::sendFile(std::string path) {
   for (std::pair<const std::string, std::string> it : this->headers) {
     header += it.first + ": " + it.second + "\r\n";
   }
+  for (Cookie *cookie : this->cookies) {
+    header += "Set-Cookie: " + cookie->serialize() + "\r\n";
+  }
   header += "\r\n";
   sys::send(this->socket, header.c_str(), header.length(), 0);
 
@@ -155,6 +164,9 @@ void expresso::core::Response::sendToClient() {
   for (std::pair<const std::string, std::string> it : this->headers) {
     header += it.first + ": " + it.second + "\r\n";
   }
+  for (Cookie *cookie : this->cookies) {
+    header += "Set-Cookie: " + cookie->serialize() + "\r\n";
+  }
   header += "\r\n";
 
   sys::send(this->socket, header.c_str(), header.length(), 0);
 
@@ -12,9 +12,14 @@ bool expresso::middleware::CookieParser::use(expresso::core::Request &req,
   }
 
   std::vector<std::string> cookies = utils::split(cookieString, ";");
-  for (std::string &cookie : cookies) {
-    std::vector<std::string> cookiePair = utils::split(cookie, "=");
-    req.cookies[utils::trim(cookiePair[0])] = utils::trim(cookiePair[1]);
+  std::vector<std::string> cookiePair;
+  for (std::string &cookieStr : cookies) {
+    expresso::core::Cookie *cookie = new expresso::core::Cookie();
+    cookiePair = utils::split(cookieStr, "=");
+    cookie->name = utils::trim(cookiePair[0]);
+    cookie->value = utils::trim(cookiePair[1]);
+    cookie->value = utils::urlDecode(cookie->value);
+    req.cookies.push_back(cookie);
   }
 
   return true;
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ void expresso::core::Request::print() {`
`21`	`21`	`logger::info(this->body.dumps(2, 2));`
`22`	`22`
`23`	`23`	`logger::info(" cookies: ");`
`24`		`- for (const std::pair<std::string, std::string> &cookie : this->cookies) {`
`25`		`- logger::info(" " + cookie.first + ": " + cookie.second);`
	`24`	`+ for (expresso::core::Cookie *cookie : this->cookies) {`
	`25`	`+ logger::info(" " + cookie->serialize());`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`logger::info(" headers: ");`