Split authentication views into login and register

bookwyrm/tests/views/test_authentication.py

@@ -63,7 +63,7 @@ class AuthenticationViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.anonymous_user
 
-        with patch("bookwyrm.views.authentication.login"):
+        with patch("bookwyrm.views.login.login"):
             result = view(request)
         self.assertEqual(result.url, "/")
         self.assertEqual(result.status_code, 302)
@@ -77,7 +77,7 @@ class AuthenticationViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.anonymous_user
 
-        with patch("bookwyrm.views.authentication.login"):
+        with patch("bookwyrm.views.login.login"):
             result = view(request)
         self.assertEqual(result.url, "/")
         self.assertEqual(result.status_code, 302)
@@ -91,7 +91,7 @@ class AuthenticationViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.anonymous_user
 
-        with patch("bookwyrm.views.authentication.login"):
+        with patch("bookwyrm.views.login.login"):
             result = view(request)
         self.assertEqual(result.url, "/")
         self.assertEqual(result.status_code, 302)
@@ -105,7 +105,7 @@ class AuthenticationViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.anonymous_user
 
-        with patch("bookwyrm.views.authentication.login"):
+        with patch("bookwyrm.views.login.login"):
             result = view(request)
         result.render()
         self.assertEqual(result.status_code, 200)
@@ -126,7 +126,7 @@ class AuthenticationViews(TestCase):
                 "email": "aa@bb.cccc",
             },
         )
-        with patch("bookwyrm.views.authentication.login"):
+        with patch("bookwyrm.views.login.login"):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
         self.assertEqual(response.status_code, 302)
@@ -151,7 +151,7 @@ class AuthenticationViews(TestCase):
                 "email": "aa@bb.cccc",
             },
         )
-        with patch("bookwyrm.views.authentication.login"):
+        with patch("bookwyrm.views.login.login"):
             response = view(request)
         self.assertEqual(response.status_code, 302)
         nutria = models.User.objects.get(localname="nutria")
@@ -169,7 +169,7 @@ class AuthenticationViews(TestCase):
             "register/",
             {"localname": "nutria ", "password": "mouseword", "email": "aa@bb.ccc"},
         )
-        with patch("bookwyrm.views.authentication.login"):
+        with patch("bookwyrm.views.login.login"):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
         self.assertEqual(response.status_code, 302)
@@ -248,7 +248,7 @@ class AuthenticationViews(TestCase):
                 "invite_code": "testcode",
             },
         )
-        with patch("bookwyrm.views.authentication.login"):
+        with patch("bookwyrm.views.login.login"):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
         self.assertEqual(response.status_code, 302)

bookwyrm/views/__init__.py

@@ -1,7 +1,5 @@
 """ make sure all our nice views are available """
 from .announcements import Announcements, Announcement, delete_announcement
-from .authentication import Login, Register, Logout
-from .authentication import ConfirmEmail, ConfirmEmailCode, resend_link
 from .author import Author, EditAuthor
 from .block import Block, unblock
 from .books import Book, EditBook, ConfirmEditBook
@@ -28,11 +26,13 @@ from .landing import About, Home, Landing
 from .list import Lists, SavedLists, List, Curate, UserLists
 from .list import save_list, unsave_list
 from .list import delete_list
+from .login import Login, Logout
 from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough
 from .reading import delete_readthrough, delete_progressupdate
 from .reading import ReadingStatus
+from .register import Register, ConfirmEmail, ConfirmEmailCode, resend_link
 from .reports import Report, Reports, make_report, resolve_report, suspend_user
 from .rss_feed import RssFeed
 from .password import PasswordResetRequest, PasswordReset, ChangePassword

bookwyrm/views/invite.py

@@ -83,7 +83,7 @@ class Invite(View):
         }
         return TemplateResponse(request, "invite.html", data)
 
-    # post handling is in views.authentication.Register
+    # post handling is in views.register.Register
 
 
 class ManageInviteRequests(View):

bookwyrm/views/login.py

@@ -0,0 +1,80 @@
+""" class views for login/register views """
+from django.contrib.auth import authenticate, login, logout
+from django.contrib.auth.decorators import login_required
+from django.shortcuts import redirect
+from django.template.response import TemplateResponse
+from django.utils import timezone
+from django.utils.decorators import method_decorator
+from django.utils.translation import gettext_lazy as _
+from django.views.decorators.csrf import csrf_exempt
+from django.views import View
+
+from bookwyrm import forms, models
+from bookwyrm.settings import DOMAIN
+
+
+# pylint: disable=no-self-use
+@method_decorator(csrf_exempt, name="dispatch")
+class Login(View):
+    """authenticate an existing user"""
+
+    def get(self, request, confirmed=None):
+        """login page"""
+        if request.user.is_authenticated:
+            return redirect("/")
+        # send user to the login page
+        data = {
+            "show_confirmed_email": confirmed,
+            "login_form": forms.LoginForm(),
+            "register_form": forms.RegisterForm(),
+        }
+        return TemplateResponse(request, "login.html", data)
+
+    def post(self, request):
+        """authentication action"""
+        if request.user.is_authenticated:
+            return redirect("/")
+        login_form = forms.LoginForm(request.POST)
+
+        localname = login_form.data["localname"]
+        if "@" in localname:  # looks like an email address to me
+            try:
+                username = models.User.objects.get(email=localname).username
+            except models.User.DoesNotExist:  # maybe it's a full username?
+                username = localname
+        else:
+            username = "%s@%s" % (localname, DOMAIN)
+        password = login_form.data["password"]
+
+        # perform authentication
+        user = authenticate(request, username=username, password=password)
+        if user is not None:
+            # successful login
+            login(request, user)
+            user.last_active_date = timezone.now()
+            user.save(broadcast=False, update_fields=["last_active_date"])
+            if request.POST.get("first_login"):
+                return redirect("get-started-profile")
+            return redirect(request.GET.get("next", "/"))
+
+        # maybe the user is pending email confirmation
+        if models.User.objects.filter(
+            username=username, is_active=False, deactivation_reason="pending"
+        ).exists():
+            return redirect("confirm-email")
+
+        # login errors
+        login_form.non_field_errors = _("Username or password are incorrect")
+        register_form = forms.RegisterForm()
+        data = {"login_form": login_form, "register_form": register_form}
+        return TemplateResponse(request, "login.html", data)
+
+
+@method_decorator(login_required, name="dispatch")
+class Logout(View):
+    """log out"""
+
+    def get(self, request):
+        """done with this place! outa here!"""
+        logout(request)
+        return redirect("/")

bookwyrm/views/register.py

@@ -1,13 +1,8 @@
 """ class views for login/register views """
-from django.contrib.auth import authenticate, login, logout
+from django.contrib.auth import login
-from django.contrib.auth.decorators import login_required
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
-from django.utils import timezone
-from django.utils.decorators import method_decorator
-from django.utils.translation import gettext_lazy as _
-from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_POST
 from django.views import View
 
@@ -16,72 +11,6 @@ from bookwyrm.settings import DOMAIN
 
 
 # pylint: disable=no-self-use
-@method_decorator(csrf_exempt, name="dispatch")
-class Login(View):
-    """authenticate an existing user"""
-
-    def get(self, request, confirmed=None):
-        """login page"""
-        if request.user.is_authenticated:
-            return redirect("/")
-        # send user to the login page
-        data = {
-            "show_confirmed_email": confirmed,
-            "login_form": forms.LoginForm(),
-            "register_form": forms.RegisterForm(),
-        }
-        return TemplateResponse(request, "login.html", data)
-
-    def post(self, request):
-        """authentication action"""
-        if request.user.is_authenticated:
-            return redirect("/")
-        login_form = forms.LoginForm(request.POST)
-
-        localname = login_form.data["localname"]
-        if "@" in localname:  # looks like an email address to me
-            try:
-                username = models.User.objects.get(email=localname).username
-            except models.User.DoesNotExist:  # maybe it's a full username?
-                username = localname
-        else:
-            username = "%s@%s" % (localname, DOMAIN)
-        password = login_form.data["password"]
-
-        # perform authentication
-        user = authenticate(request, username=username, password=password)
-        if user is not None:
-            # successful login
-            login(request, user)
-            user.last_active_date = timezone.now()
-            user.save(broadcast=False, update_fields=["last_active_date"])
-            if request.POST.get("first_login"):
-                return redirect("get-started-profile")
-            return redirect(request.GET.get("next", "/"))
-
-        # maybe the user is pending email confirmation
-        if models.User.objects.filter(
-            username=username, is_active=False, deactivation_reason="pending"
-        ).exists():
-            return redirect("confirm-email")
-
-        # login errors
-        login_form.non_field_errors = _("Username or password are incorrect")
-        register_form = forms.RegisterForm()
-        data = {"login_form": login_form, "register_form": register_form}
-        return TemplateResponse(request, "login.html", data)
-
-
-@method_decorator(login_required, name="dispatch")
-class Logout(View):
-    """log out"""
-
-    def get(self, request):
-        """done with this place! outa here!"""
-        logout(request)
-        return redirect("/")
-
-
 class Register(View):
     """register a user"""