mirror of
https://github.com/jupyterhub/jupyterhub.git
synced 2025-10-16 06:22:59 +00:00
redirect root to *regular* login page
shows "Login with..." button for external services instead of auto-redirecting to login service (no good for oauth)
This commit is contained in:
@@ -8,6 +8,7 @@ from tornado import web
|
|||||||
from .. import orm
|
from .. import orm
|
||||||
from ..utils import admin_only, url_path_join
|
from ..utils import admin_only, url_path_join
|
||||||
from .base import BaseHandler
|
from .base import BaseHandler
|
||||||
|
from .login import LoginHandler
|
||||||
|
|
||||||
|
|
||||||
class RootHandler(BaseHandler):
|
class RootHandler(BaseHandler):
|
||||||
@@ -29,13 +30,11 @@ class RootHandler(BaseHandler):
|
|||||||
else:
|
else:
|
||||||
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)
|
||||||
self.redirect(url, permanent=False)
|
self.redirect(url)
|
||||||
return
|
return
|
||||||
# Redirect to the authenticator login page instead of rendering the
|
url = url_path_join(self.hub.server.base_url, 'login')
|
||||||
# login html page
|
self.redirect(url)
|
||||||
url = self.authenticator.login_url(self.hub.server.base_url)
|
|
||||||
self.log.debug("No user logged in: %s", url)
|
|
||||||
self.redirect(url, permanent=False)
|
|
||||||
|
|
||||||
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