From 41fe997af449c46a6b6c439f419068b5e877f3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 6 Oct 2016 15:25:13 +0200 Subject: [PATCH] Make sure to also delete any un-suffixed cookies when deleting a cookie Follow-up to a161feb --- src/octoprint/server/util/flask.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py index baca2c75..d16237de 100644 --- a/src/octoprint/server/util/flask.py +++ b/src/octoprint/server/util/flask.py @@ -410,6 +410,14 @@ class OctoPrintFlaskResponse(flask.Response): # add request specific cookie suffix to name flask.Response.set_cookie(self, key + flask.request.cookie_suffix, *args, **kwargs) + def delete_cookie(self, key, path='/', domain=None): + flask.Response.delete_cookie(self, key, path=path, domain=domain) + + # we also still might have a cookie left over from before we started prefixing, delete that manually + # without any pre processing (no path prefix, no key suffix) + flask.Response.set_cookie(self, key, expires=0, max_age=0, path=path, domain=domain) + + #~~ passive login helper def passive_login():