Browser+LibWeb: Move the cookie structure into LibWeb

4 files changed, 52 insertions, 16 deletions

diff --git a/Userland/Applications/Browser/CookieJar.cpp b/Userland/Applications/Browser/CookieJar.cpp
index ce4383deab..97b100f034 100644
--- a/Userland/Applications/Browser/CookieJar.cpp
+++ b/Userland/Applications/Browser/CookieJar.cpp
@@ -157,7 +157,7 @@ void CookieJar::store_cookie(Web::Cookie::ParsedCookie& parsed_cookie, const URL
     // https://tools.ietf.org/html/rfc6265#section-5.3
 
     // 2. Create a new cookie with name cookie-name, value cookie-value. Set the creation-time and the last-access-time to the current date and time.
-    Cookie cookie { move(parsed_cookie.name), move(parsed_cookie.value) };
+    Web::Cookie::Cookie cookie { move(parsed_cookie.name), move(parsed_cookie.value) };
     cookie.creation_time = Core::DateTime::now();
     cookie.last_access_time = cookie.creation_time;
 
diff --git a/Userland/Applications/Browser/CookieJar.h b/Userland/Applications/Browser/CookieJar.h
index 08095c8dd1..1b2d17aa1b 100644
--- a/Userland/Applications/Browser/CookieJar.h
+++ b/Userland/Applications/Browser/CookieJar.h
@@ -31,24 +31,11 @@
 #include <AK/String.h>
 #include <AK/Traits.h>
 #include <LibCore/DateTime.h>
+#include <LibWeb/Cookie/Cookie.h>
 #include <LibWeb/Forward.h>
 
 namespace Browser {
 
-struct Cookie {
-    String name;
-    String value;
-    Core::DateTime creation_time {};
-    Core::DateTime last_access_time {};
-    Core::DateTime expiry_time {};
-    String domain {};
-    String path {};
-    bool secure { false };
-    bool http_only { false };
-    bool host_only { false };
-    bool persistent { false };
-};
-
 struct CookieStorageKey {
     bool operator==(const CookieStorageKey&) const = default;
 
@@ -71,7 +58,7 @@ private:
     void store_cookie(Web::Cookie::ParsedCookie& parsed_cookie, const URL& url, String canonicalized_domain);
     void purge_expired_cookies();
 
-    HashMap<CookieStorageKey, Cookie> m_cookies;
+    HashMap<CookieStorageKey, Web::Cookie::Cookie> m_cookies;
 };
 
 }
diff --git a/Userland/Libraries/LibWeb/Cookie/Cookie.h b/Userland/Libraries/LibWeb/Cookie/Cookie.h
new file mode 100644
index 0000000000..48f06569fa
--- /dev/null
+++ b/Userland/Libraries/LibWeb/Cookie/Cookie.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2021, Tim Flynn <trflynn89@pm.me>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <AK/String.h>
+#include <LibCore/DateTime.h>
+
+namespace Web::Cookie {
+
+struct Cookie {
+    String name;
+    String value;
+    Core::DateTime creation_time {};
+    Core::DateTime last_access_time {};
+    Core::DateTime expiry_time {};
+    String domain {};
+    String path {};
+    bool secure { false };
+    bool http_only { false };
+    bool host_only { false };
+    bool persistent { false };
+};
+
+}
diff --git a/Userland/Libraries/LibWeb/Forward.h b/Userland/Libraries/LibWeb/Forward.h
index 0e6933ffe8..8bc90a2320 100644
--- a/Userland/Libraries/LibWeb/Forward.h
+++ b/Userland/Libraries/LibWeb/Forward.h
@@ -28,6 +28,7 @@
 #pragma once
 
 namespace Web::Cookie {
+struct Cookie;
 struct ParsedCookie;
 }