Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed "Setting cookie values using the dict pattern has been deprecat… #98

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 12 additions & 17 deletions sanic_session/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,7 @@ def __init__(
self.secure = secure

def _delete_cookie(self, request, response):
req = get_request_container(request)
response.cookies[self.cookie_name] = req[self.session_name].sid

# We set expires/max-age even for session cookies to force expiration
response.cookies[self.cookie_name][
"expires"
] = datetime.datetime.utcnow()
response.cookies[self.cookie_name]["max-age"] = 0
response.delete_cookie(self.cookie_name)

@staticmethod
def _calculate_expires(expiry):
Expand All @@ -65,24 +58,26 @@ def _calculate_expires(expiry):

def _set_cookie_props(self, request, response):
req = get_request_container(request)
response.cookies[self.cookie_name] = req[self.session_name].sid
response.cookies[self.cookie_name]["httponly"] = self.httponly
cookie = response.add_cookie(
self.cookie_name,
req[self.session_name].sid,
httponly=self.httponly,
secure=False
)

# Set expires and max-age unless we are using session cookies
if not self.sessioncookie:
response.cookies[self.cookie_name][
"expires"
] = self._calculate_expires(self.expiry)
response.cookies[self.cookie_name]["max-age"] = self.expiry
cookie.expires = self._calculate_expires(self.expiry)
cookie.max_age = self.expiry

if self.domain:
response.cookies[self.cookie_name]["domain"] = self.domain
cookie.domain = self.domain

if self.samesite is not None:
response.cookies[self.cookie_name]["samesite"] = self.samesite
cookie.samesite = self.samesite

if self.secure:
response.cookies[self.cookie_name]["secure"] = True
cookie.secure = True

@abc.abstractmethod
async def _get_value(self, prefix: str, sid: str):
Expand Down