mirror of
https://github.com/jupyterhub/jupyterhub.git
synced 2025-10-09 11:03:00 +00:00
Merge pull request #969 from minrk/logout-redirect
redirect to `/hub/login` to avoid automatically starting login process
This commit is contained in:
@@ -8,6 +8,7 @@ from urllib.parse import urlparse
|
|||||||
from tornado.escape import url_escape
|
from tornado.escape import url_escape
|
||||||
from tornado import gen
|
from tornado import gen
|
||||||
|
|
||||||
|
from ..utils import url_path_join
|
||||||
from .base import BaseHandler
|
from .base import BaseHandler
|
||||||
|
|
||||||
|
|
||||||
@@ -22,7 +23,8 @@ class LogoutHandler(BaseHandler):
|
|||||||
self.clear_login_cookie(name)
|
self.clear_login_cookie(name)
|
||||||
user.other_user_cookies = set([])
|
user.other_user_cookies = set([])
|
||||||
self.statsd.incr('logout')
|
self.statsd.incr('logout')
|
||||||
self.redirect(self.hub.server.base_url, permanent=False)
|
|
||||||
|
self.redirect(url_path_join(self.hub.server.base_url, 'login'), permanent=False)
|
||||||
|
|
||||||
|
|
||||||
class LoginHandler(BaseHandler):
|
class LoginHandler(BaseHandler):
|
||||||
|
@@ -52,7 +52,7 @@ class RootHandler(BaseHandler):
|
|||||||
url = url_path_join(self.hub.server.base_url, 'home')
|
url = url_path_join(self.hub.server.base_url, 'home')
|
||||||
self.log.debug("User is not running: %s", url)
|
self.log.debug("User is not running: %s", url)
|
||||||
else:
|
else:
|
||||||
url = self.authenticator.login_url(self.base_url)
|
url = url_path_join(self.hub.server.base_url, 'login')
|
||||||
self.redirect(url)
|
self.redirect(url)
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user