|
1 | | -from django.conf import settings |
2 | 1 | from django.contrib.auth.base_user import BaseUserManager |
3 | 2 | from django.contrib.auth.models import AbstractUser |
4 | 3 | from django.db import models |
@@ -75,29 +74,12 @@ class Meta(AbstractUser.Meta): |
75 | 74 | ("anonymize", "Can anonymize user"), |
76 | 75 | ] |
77 | 76 |
|
78 | | - def _legacy_get_session_auth_hash(self): |
79 | | - # RemovedInDjango40Warning: pre-Django 3.1 hashes will be invalid. |
80 | | - key_salt = "mailauth.contrib.user.models.EmailUserManager.get_session_auth_hash" |
81 | | - if not self.session_salt: |
82 | | - raise ValueError("'session_salt' must be set") |
83 | | - return salted_hmac(key_salt, self.session_salt, algorithm="sha1").hexdigest() |
84 | | - |
85 | 77 | def get_session_auth_hash(self): |
86 | 78 | """Return an HMAC of the :attr:`.session_salt` field.""" |
87 | 79 | key_salt = "mailauth.contrib.user.models.EmailUserManager.get_session_auth_hash" |
88 | 80 | if not self.session_salt: |
89 | 81 | raise ValueError("'session_salt' must be set") |
90 | | - algorithm = getattr(settings, "DEFAULT_HASHING_ALGORITHM", None) |
91 | | - if algorithm is None: |
92 | | - return salted_hmac(key_salt, self.session_salt).hexdigest() |
93 | | - return salted_hmac( |
94 | | - key_salt, |
95 | | - self.session_salt, |
96 | | - # RemovedInDjango40Warning: when the deprecation ends, replace |
97 | | - # with: |
98 | | - # algorithm='sha256', |
99 | | - algorithm=algorithm, |
100 | | - ).hexdigest() |
| 82 | + return salted_hmac(key_salt, self.session_salt, algorithm="sha256").hexdigest() |
101 | 83 |
|
102 | 84 | def anonymize(self, commit=True): |
103 | 85 | """ |
|
0 commit comments