From ef51cef6a0ca832baa1d49e5e8a34b6c0eb99155 Mon Sep 17 00:00:00 2001 From: Andrew Buss Date: Tue, 2 Jun 2015 11:24:38 -0700 Subject: [PATCH] log a user in after resetting their password --- flashcards/models.py | 12 ------------ flashcards/views.py | 3 +++ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/flashcards/models.py b/flashcards/models.py index 0770746..ef94449 100644 --- a/flashcards/models.py +++ b/flashcards/models.py @@ -18,18 +18,6 @@ from simple_email_confirmation import SimpleEmailConfirmationUserMixin, EmailAdd from fields import MaskField from cached_property import cached_property - - - - - - - - - - - - # Hack to fix AbstractUser before subclassing it AbstractUser._meta.get_field('email')._unique = True diff --git a/flashcards/views.py b/flashcards/views.py index 3a2bb27..624c816 100644 --- a/flashcards/views.py +++ b/flashcards/views.py @@ -309,6 +309,9 @@ def reset_password(request, format=None): if default_token_generator.check_token(user, data['token'].value): user.set_password(data['new_password'].value) user.save() + user = authenticate(email=user.email, password=data['new_password'].value) + auth.login(request, user) + log_event(request) else: raise ValidationError('Could not verify reset token') -- 1.9.1