From e0d86462c861d39e5200469b48dedeac7b06476f Mon Sep 17 00:00:00 2001 From: Hardirc Date: Wed, 6 Apr 2016 22:41:03 -0400 Subject: [PATCH] New logout_bare() for shell logout and refactor test using it --- gluon/tests/test_tools.py | 2 +- gluon/tools.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gluon/tests/test_tools.py b/gluon/tests/test_tools.py index 1a4a8242..32b08fe4 100644 --- a/gluon/tests/test_tools.py +++ b/gluon/tests/test_tools.py @@ -250,7 +250,7 @@ class TestAuth(unittest.TestCase): self.assertTrue('name="_formkey"' in html_form) # NOTE: Not sure it is the proper way to logout_bare() as there is not methods for that and auth.logout() failed - self.auth.user = None + self.auth.logout_bare() # self.assertTrue(self.auth.is_logged_in()) for f in ['logout', 'verify_email', 'reset_password', diff --git a/gluon/tools.py b/gluon/tools.py index a4972e4a..28ba7a27 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -3251,12 +3251,16 @@ class Auth(object): next = cas.logout_url(next) current.session.auth = None + self.user = None if self.settings.renew_session_onlogout: current.session.renew(clear_session=not self.settings.keep_session_onlogout) current.session.flash = self.messages.logged_out if next is not None: redirect(next) + def logout_bare(self): + self.logout(next=None, onlogout=None, log=None) + def register(self, next=DEFAULT, onvalidation=DEFAULT,