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

add orm.User.find and orm.[Foo]Token.find

Browse Source 
for simple get-by-name access
This commit is contained in:
MinRK
2014-09-20 12:09:23 -07:00
parent cf64828d32
commit 2eb42eb0b3
3 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jupyterhub/handlers/base.py
View File

@@ -73,7 +73,7 @@ class BaseHandler(RequestHandler):
if not match:
return None
token = match.group(1)
orm_token = self.db.query(orm.APIToken).filter(orm.APIToken.token == token).first()
orm_token = orm.APIToken.find(self.db, token)
if orm_token is None:
return None
else:
@@ -83,8 +83,7 @@ class BaseHandler(RequestHandler):
"""get_current_user from a cookie token"""
token = self.get_cookie(self.hub.server.cookie_name, None)
if token:
cookie_token = self.db.query(orm.CookieToken).filter(
orm.CookieToken.token==token).first()
cookie_token = orm.CookieToken.find(self.db, token)
if cookie_token:
return cookie_token.user
else:
@@ -103,7 +102,7 @@ class BaseHandler(RequestHandler):
return None if no such user
"""
return self.db.query(orm.User).filter(orm.User.name==name).first()
return orm.User.find(self.db, name)
def user_from_username(self, username):
"""Get ORM User for username"""