heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We should always have a request.user object, even if None.

Browse Source
This commit is contained in:
Christopher Allan Webber 2011-04-03 18:35:52 -05:00
parent 58dec5efe5
commit 5d6840a010
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mediagoblin/util.py
View File

@ -36,12 +36,12 @@ def setup_user_in_request(request):
if not request.session.has_key('user_id'): if not request.session.has_key('user_id'):
return return
user = None
try: try:
user = request.db.User.one({'_id': request.session['user_id']}) user = request.db.User.one({'_id': request.session['user_id']})
if user: if not user:
request.user = user
else:
# Something's wrong... this user doesn't exist? Invalidate # Something's wrong... this user doesn't exist? Invalidate
# this session. # this session.
request.session.invalidate() request.session.invalidate()
@ -50,3 +50,5 @@ def setup_user_in_request(request):
# Something's wrong... we shouldn't have multiple users with # Something's wrong... we shouldn't have multiple users with
# the same user id. Invalidate this session. # the same user id. Invalidate this session.
request.session.invalidate() request.session.invalidate()
request.user = user