]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Make authdemo's logout less confusing.
authorBen Darnell <ben@bendarnell.com>
Sun, 26 Aug 2012 23:23:30 +0000 (16:23 -0700)
committerBen Darnell <ben@bendarnell.com>
Sun, 26 Aug 2012 23:27:24 +0000 (16:27 -0700)
Closes #376.

demos/auth/authdemo.py

index 0196a3be7bdab01a48371e605b4b0ff9d3e1f70e..cca7d378673b225538fc786542d8e32f031caf43 100755 (executable)
@@ -62,17 +62,24 @@ class AuthHandler(BaseHandler, tornado.auth.GoogleMixin):
             self.get_authenticated_user(self.async_callback(self._on_auth))
             return
         self.authenticate_redirect()
-    
+
     def _on_auth(self, user):
         if not user:
             raise tornado.web.HTTPError(500, "Google auth failed")
         self.set_secure_cookie("user", tornado.escape.json_encode(user))
         self.redirect("/")
 
+
 class LogoutHandler(BaseHandler):
     def get(self):
+        # This logs the user out of this demo app, but does not log them
+        # out of Google.  Since Google remembers previous authorizations,
+        # returning to this app will log them back in immediately with no
+        # interaction (unless they have separately logged out of Google in
+        # the meantime).
         self.clear_cookie("user")
-        self.redirect("/")
+        self.write('You are now logged out. '
+                   'Click <a href="/">here</a> to log back in.')
 
 def main():
     tornado.options.parse_command_line()