Merge pull request #461 from MasoniteFramework/fix/460

fixed cookie jar

config/database.py

@@ -1,8 +1,8 @@
 """Database Settings """
-from masonite import env
+from src.masonite import env
 from masoniteorm.query import QueryBuilder
 from masoniteorm.connections import ConnectionResolver
-from masonite.environment import LoadEnvironment
+from src.masonite.environment import LoadEnvironment
 
 
 LoadEnvironment()

config/providers.py

@@ -7,8 +7,6 @@
                                 UploadProvider, ViewProvider,
                                 WhitenoiseProvider)
 
-from masoniteorm.providers.ORMProvider import ORMProvider
-
 """Providers List
 Providers are a simple way to remove or add functionality for Masonite
 The providers in this list are either ran on server start or when a
@@ -26,7 +24,6 @@
     WhitenoiseProvider,
     ViewProvider,
     AuthenticationProvider,
-    ORMProvider,
 
     # Optional Framework Providers
     MailProvider,

src/masonite/cookies/CookieJar.py

@@ -1,5 +1,7 @@
+import pendulum
 from .Cookie import Cookie
-from ..helpers import cookie_expire_time
+
+from ..helpers.time import cookie_expire_time
 
 
 class CookieJar:
@@ -12,26 +14,37 @@ def add(self, name, value, **options):
         self.cookies.update({name: Cookie(name, value, **options)})
 
     def all(self):
+        cookies = self.loaded_cookies
+        cookies.update(self.cookies)
+        return cookies
+
+    def all_added(self):
         return self.cookies
 
     def get(self, name):
-        aggregate = self.loaded_cookies
-        aggregate.update(self.cookies)
+        aggregate = self.all()
         return aggregate.get(name)
 
     def exists(self, name):
         return name in self.cookies or name in self.loaded_cookies
 
+    def is_expired(self, name):
+        cookie = self.get(name)
+        return cookie.expires < pendulum.now()
+
     def delete(self, name):
         self.deleted_cookies.update(
             {
                 name: Cookie(
-                    name, "", expires=cookie_expire_time("2 months"), timezone="GMT"
+                    name, "", expires=cookie_expire_time("expired"), timezone="GMT"
                 )
             }
         )
         if name in self.cookies:
-            return self.cookies.pop(name)
+            self.cookies.pop(name)
+
+        if name in self.loaded_cookies:
+            self.loaded_cookies.pop(name)
 
     def load_cookie(self, key, value):
         self.loaded_cookies.update({key: Cookie(key, value)})
@@ -47,13 +60,14 @@ def to_dict(self):
 
     def load(self, cookie_string):
         for compound_value in cookie_string.split("; "):
-            key, value = compound_value.split("=", 1)
-            self.load_cookie(key, value)
+            if "=" in compound_value:
+                key, value = compound_value.split("=", 1)
+                self.load_cookie(key, value)
         return self
 
     def render_response(self):
         cookies = []
-        for name, cookie in self.all().items():
+        for name, cookie in {**self.deleted_cookies, **self.all_added()}.items():
             cookies.append(("Set-Cookie", cookie.render()))
 
         return cookies

src/masonite/drivers/session/SessionCookieDriver.py

@@ -122,7 +122,7 @@ def __collect_data(self, flash_only=False):
             dict
         """
         cookies = {}
-        all_cookies = self.request.get_cookies().to_dict()
+        all_cookies = self.request.get_cookies()
         for key, value in all_cookies.items():
             if not (key.startswith("f_") or key.startswith("s_")):
                 continue

src/masonite/request.py

@@ -699,7 +699,7 @@ def get_cookies(self):
         Returns:
             dict -- Returns all the cookies.
         """
-        return self.cookie_jar
+        return self.cookie_jar.all()
 
     def get_raw_cookie(self, provided_cookie):
         return self.cookie_jar.get(provided_cookie)

tests/core/test_requests.py

@@ -176,7 +176,10 @@ def test_request_mini_field_storage_returns_a_list(self):
         self.assertEqual(self.request.input('test'), ['1', '2'])
 
     def test_request_get_cookies_returns_cookies(self):
-        self.assertEqual(self.request.get_cookies(), self.request.cookie_jar)
+        wsgi = generate_wsgi()
+        request = Request(wsgi)
+        print(request.get_cookies())
+        self.assertTrue('setcookie' in self.request.get_cookies())
 
     def test_request_set_user_sets_object(self):
         self.assertEqual(self.request.set_user(object), self.request)