mirror of
https://github.com/jupyterhub/jupyterhub.git
synced 2025-10-14 05:23:01 +00:00
Redirect to the loginurl when not logged in, fix the user.running redirect to fix a redirect loop
This commit is contained in:
@@ -24,16 +24,17 @@ class RootHandler(BaseHandler):
|
|||||||
user = self.get_current_user()
|
user = self.get_current_user()
|
||||||
if user:
|
if user:
|
||||||
if user.running:
|
if user.running:
|
||||||
url = user.server.base_url
|
url = url_path_join(self.hub.server.base_url, user.server.base_url)
|
||||||
|
self.log.warn("User is running: %s", url)
|
||||||
else:
|
else:
|
||||||
url = url_path_join(self.hub.server.base_url, 'home')
|
url = url_path_join(self.hub.server.base_url, 'home')
|
||||||
|
self.log.warn("User is not running: %s", url)
|
||||||
self.redirect(url, permanent=False)
|
self.redirect(url, permanent=False)
|
||||||
return
|
return
|
||||||
html = self.render_template('login.html',
|
# Redirect to the system login page
|
||||||
login_url=self.settings['login_url'],
|
url = self.authenticator.login_url(self.hub.server.base_url)
|
||||||
custom_html=self.authenticator.custom_html,
|
self.log.warn("No user logged in: %s", url)
|
||||||
)
|
self.redirect(url, permanent=False)
|
||||||
self.finish(html)
|
|
||||||
|
|
||||||
class HomeHandler(BaseHandler):
|
class HomeHandler(BaseHandler):
|
||||||
"""Render the user's home page."""
|
"""Render the user's home page."""
|
||||||
|
Reference in New Issue
Block a user