Fix missing next URL from initial login form data

mailauth/contrib/user/models.py

@@ -48,11 +48,11 @@ class AbstractEmailUser(AbstractUser):
     email = CIEmailField(_('email address'), unique=True, db_index=True)
     """The field is unique and case insensitive to serve as a better username."""
 
+    # Salt for the session hash replacing the password in this function.
     session_salt = models.CharField(
         max_length=12, editable=False,
         default=get_random_string,
     )
-    """Salt for the session hash replacing the password in this function."""
 
     def has_usable_password(self):
         return False
@@ -63,7 +63,7 @@ class Meta(AbstractUser.Meta):
         abstract = True
 
     def get_session_auth_hash(self):
-        """Return an HMAC of the session_salt field."""
+        """Return an HMAC of the :attr:`.session_salt` field."""
         key_salt = "mailauth.contrib.user.models.EmailUserManager.get_session_auth_hash"
         if not self.session_salt:
             raise ValueError("'session_salt' must be set")

mailauth/views.py

@@ -35,6 +35,12 @@ def form_valid(self, form):
     def get_success_url(self):
         return resolve_url(self.success_url)
 
+    def get_initial(self):
+        return {
+            self.redirect_field_name: self.request.GET.get(self.redirect_field_name),
+            **super().get_initial(),
+        }
+
 
 INTERNAL_LOGIN_URL_TOKEN = 'login-token'
 

tests/test_views.py

@@ -1,5 +1,16 @@
 from django.urls import reverse
 
+from mailauth.views import LoginView
+
+
+class TestLoginView:
+
+    def test_get_initial(self, rf):
+        view = LoginView()
+        view.request = rf.get("/", data={"next": "foo/bar"})
+
+        assert view.get_initial() == {"next": "foo/bar"}
+
 
 class TestLoginTokenView: