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

Fix setting cookie for services

Browse Source 
and exercise it in tests
This commit is contained in:
Min RK
2016-09-26 14:30:00 +02:00
parent eb3252da28
commit 729b608eff
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jupyterhub/handlers/base.py
View File

@@ -241,7 +241,10 @@ class BaseHandler(RequestHandler):
def set_service_cookie(self, user):
"""set the login cookie for services"""
self._set_user_cookie(user, self.service_server)
self._set_user_cookie(user, orm.Server(
cookie_name='jupyterhub-services',
base_url=url_path_join(self.base_url, 'services')
))
def set_server_cookie(self, user):
"""set the login cookie for the single-user server"""
@@ -262,7 +265,7 @@ class BaseHandler(RequestHandler):
self.set_server_cookie(user)
# set single cookie for services
if self.db.query(orm.Service).first():
if self.db.query(orm.Service).filter(orm.Service.server != None).first():
self.set_service_cookie(user)
# create and set a new cookie token for the hub