Skip to content

Bug/dash 1813 fix last login breaking verification email #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eborchert wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bug/dash 1813 fix last login breaking verification email #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1e7623
DASH-1813 Added necessary settings
eborchert Jul 28, 2021
d7c566a
DASH-1813 Updated settings logic
eborchert Jul 28, 2021
622b39a
DASH-1813 updated method for self
eborchert Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions django_email_verification/token.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ class EmailVerificationTokenGenerator:
key_salt = "django-email-verification.token"
algorithm = None
secret = settings.SECRET_KEY
try:
accounts_locked = settings.EMAIL_ACCOUNTS_LOCKED
except AttributeError:
accounts_locked = True

def make_token(self, user, expiry=None):
"""
Expand Down Expand Up @@ -112,9 +116,8 @@ def _make_token_with_timestamp(self, user, timestamp):
return f'{email_b64}-{ts_b36}-{hash_string}', \
datetime.fromtimestamp(timestamp + settings.EMAIL_TOKEN_LIFE)

@staticmethod
def _make_hash_value(user, timestamp):
login_timestamp = '' if user.last_login is None else user.last_login.replace(microsecond=0, tzinfo=None)
def _make_hash_value(self, user, timestamp):
login_timestamp = '' if user.last_login is None or not self.accounts_locked else user.last_login.replace(microsecond=0, tzinfo=None)
return str(user.pk) + user.password + str(login_timestamp) + str(timestamp)

@staticmethod
Expand Down