Skip to content
Snippets Groups Projects
Commit ebbb4c0a authored by Ben Adida's avatar Ben Adida
Browse files

Merge pull request #105 from shirlei/upstream_password

Fix user object not JSON serializable
parents 2c100241 45795782
No related branches found
No related tags found
No related merge requests found
...@@ -57,7 +57,7 @@ def password_login_view(request): ...@@ -57,7 +57,7 @@ def password_login_view(request):
try: try:
user = User.get_by_type_and_id('password', username) user = User.get_by_type_and_id('password', username)
if password_check(user, password): if password_check(user, password):
request.session['password_user'] = user request.session['password_user_id'] = user.user_id
return HttpResponseRedirect(reverse(after)) return HttpResponseRedirect(reverse(after))
except User.DoesNotExist: except User.DoesNotExist:
pass pass
...@@ -104,9 +104,9 @@ def get_auth_url(request, redirect_url = None): ...@@ -104,9 +104,9 @@ def get_auth_url(request, redirect_url = None):
return reverse(password_login_view) return reverse(password_login_view)
def get_user_info_after_auth(request): def get_user_info_after_auth(request):
user = request.session['password_user'] from helios_auth.models import User
del request.session['password_user'] user = User.get_by_type_and_id('password', request.session['password_user_id'])
user_info = user.info del request.session['password_user_id']
return {'type': 'password', 'user_id' : user.user_id, 'name': user.name, 'info': user.info, 'token': None} return {'type': 'password', 'user_id' : user.user_id, 'name': user.name, 'info': user.info, 'token': None}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment