Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve master merge conflicts

Browse source
This commit is contained in:
Griatch 2018-02-08 21:10:23 +01:00
commit 495078a49d
3 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
evennia/web/webclient/views.py
View file

@ -34,7 +34,13 @@ def _shared_login(request):
if webclient_uid:
# The webclient has previously registered a login to this browser_session
if not account.is_authenticated() and not website_uid:
account = AccountDB.objects.get(id=webclient_uid)
try:
account = AccountDB.objects.get(id=webclient_uid)
except AccountDB.DoesNotExist:
# this can happen e.g. for guest accounts or deletions
csession["website_authenticated_uid"] = False
csession["webclient_authenticated_uid"] = False
return
try:
# calls our custom authenticate in web/utils/backends.py
account = authenticate(autologin=account)