Skip to content

Commit d34d15c

Browse files
committed
Set request.user in addition to request.account
This makes NAV's authentication middleware more or less replace Django's authentication middleware (for now). `request.account` was initially chosen by NAV to stay out of Django's hair - but most Django stuff expects `request.user` to represent the authenticated user.
1 parent 58269b6 commit d34d15c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

python/nav/web/auth/utils.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def set_account(request, account, cycle_session_id=True):
3333
Cycles the session ID by default to avoid session fixation.
3434
"""
3535
request.session[ACCOUNT_ID_VAR] = account.id
36-
request.account = account
36+
request.account = request.user = account
3737
_logger.debug('Set active account to "%s"', account.login)
3838
if cycle_session_id:
3939
request.session.cycle_key()
@@ -44,6 +44,8 @@ def clear_session(request):
4444
"""Clears the session and logs out the current account"""
4545
if hasattr(request, "account"):
4646
del request.account
47+
if hasattr(request, "user"):
48+
del request.user
4749
request.session.flush()
4850
request.session.save()
4951

0 commit comments

Comments
 (0)