Merge branch 'master' into update-url

 Conflicts:
	CHANGELOG.md

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 * Allow VerifyUserEmailView get_redirect_url function to accept an extra string.
 
+* Allow user login after email verification providing a setting is true in an apps settings file.
+  This works in Django 1.10.
+
 ## 16.0.1
 
 * Fix email verification when `LOGIN_URL` is a url name.

user_management/ui/tests/test_views.py

@@ -3,6 +3,7 @@
 from user_management.models.tests.factories import VerifyEmailUserFactory
 from user_management.models.tests.models import VerifyEmailUser
 from user_management.models.tests.utils import RequestTestCase
+
 from .. import views
 
 
@@ -32,6 +33,20 @@ def test_get(self):
             str(request._messages.store[0]),
         )
 
+    @override_settings(LOGIN_ON_EMAIL_VERIFICATION=True)
+    def test_auto_login_get(self):
+        """A user is automatically logged in when they activate their account."""
+        user = VerifyEmailUserFactory.create(email_verified=False)
+        token = user.generate_validation_token()
+
+        request = self.create_request('get', auth=False)
+        self.add_session_to_request(request)
+
+        view = self.view_class.as_view()
+        view(request, token=token)
+
+        self.assertEqual(int(request.session['_auth_user_id']), user.pk)
+
     @override_settings(LOGIN_URL='login')
     def test_get_named_login_url(self):
         """A user clicks the link in their email and activates their account."""

user_management/ui/views.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.contrib import messages
+from django.contrib import auth, messages
 from django.shortcuts import resolve_url
 from django.utils.translation import ugettext_lazy as _
 from django.views import generic
@@ -44,7 +44,12 @@ def dispatch(self, request, *args, **kwargs):
         return super(VerifyUserEmailView, self).dispatch(request, *args, **kwargs)
 
     def get(self, request, *args, **kwargs):
+        auto_login = getattr(settings, 'LOGIN_ON_EMAIL_VERIFICATION', False)
+
         if not self.already_verified:
             self.activate_user()
+            if auto_login is True:
+                self.user.backend = settings.AUTHENTICATION_BACKENDS[0]
+                auth.login(request=request, user=self.user)
         messages.success(request, self.success_message)
         return super(VerifyUserEmailView, self).get(request, *args, **kwargs)