hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-13 13:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into rbac

Browse Source
This commit is contained in:
Min RK
2021-01-27 12:39:02 +01:00
parent 490a6503cc e526f36b81
commit 4dac580d3d
27 changed files with 328 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jupyterhub/handlers/base.py
View File

@@ -498,6 +498,11 @@ class BaseHandler(RequestHandler):
path=url_path_join(self.base_url, 'services'),
**kwargs,
)
# clear tornado cookie
self.clear_cookie(
'_xsrf',
**self.settings.get('xsrf_cookie_kwargs', {}),
)
# Reset _jupyterhub_user
self._jupyterhub_user = None
@@ -1192,8 +1197,8 @@ class BaseHandler(RequestHandler):
"""
Render jinja2 template
If sync is set to True, we return an awaitable
If sync is set to False, we render the template & return a string
If sync is set to True, we render the template & return a string
If sync is set to False, we return an awaitable
"""
template_ns = {}
template_ns.update(self.template_namespace)