Merge pull request #6901 from readthedocs/allow-override-views

Allow to override sign in and sign out views

Author: ericholscher

readthedocs/profiles/urls/private.py

@@ -11,6 +11,16 @@
 urlpatterns = []
 
 account_urls = [
+    url(
+        r'^login',
+        views.LoginView.as_view(),
+        name='account_login',
+    ),
+    url(
+        r'^logout/',
+        views.LogoutView.as_view(),
+        name='account_logout',
+    ),
     url(
         r'^edit/',
         views.ProfileEdit.as_view(),

readthedocs/profiles/views.py

@@ -1,5 +1,7 @@
 """Views for creating, editing and viewing site-specific user profiles."""
 
+from allauth.account.views import LoginView as AllAuthLoginView
+from allauth.account.views import LogoutView as AllAuthLogoutView
 from django.contrib import messages
 from django.contrib.auth import logout
 from django.contrib.auth.models import User
@@ -27,6 +29,26 @@
 from readthedocs.core.utils.extend import SettingsOverrideObject
 
 
+class LoginViewBase(AllAuthLoginView):
+
+    pass
+
+
+class LoginView(SettingsOverrideObject):
+
+    _default_class = LoginViewBase
+
+
+class LogoutViewBase(AllAuthLogoutView):
+
+    pass
+
+
+class LogoutView(SettingsOverrideObject):
+
+    _default_class = LogoutViewBase
+
+
 class ProfileEdit(PrivateViewMixin, UpdateView):
 
     """Edit the current user's profile."""

readthedocs/rtd_tests/tests/test_privacy_urls.py

@@ -1,6 +1,6 @@
 import re
-
 from unittest import mock
+
 from allauth.socialaccount.models import SocialAccount
 from django.contrib.admindocs.views import extract_views_from_urlpatterns
 from django.test import TestCase
@@ -9,13 +9,17 @@
 from taggit.models import Tag
 
 from readthedocs.builds.constants import BRANCH
-from readthedocs.builds.models import Build, BuildCommandResult
+from readthedocs.builds.models import (
+    Build,
+    BuildCommandResult,
+    RegexAutomationRule,
+    VersionAutomationRule,
+)
 from readthedocs.core.utils.tasks import TaskNoPermission
 from readthedocs.integrations.models import HttpExchange, Integration
 from readthedocs.oauth.models import RemoteOrganization, RemoteRepository
 from readthedocs.projects.models import Domain, EnvironmentVariable, Project
 from readthedocs.rtd_tests.utils import create_user
-from readthedocs.builds.models import RegexAutomationRule, VersionAutomationRule
 
 
 class URLAccessMixin:
@@ -479,6 +483,12 @@ def test_private_urls(self):
 
 class PrivateUserProfileAdminAccessTest(PrivateUserProfileMixin, TestCase):
 
+    def setUp(self):
+        super().setUp()
+        self.response_data.update({
+            '/accounts/login/': {'status_code': 302},
+        })
+
     def login(self):
         return self.client.login(username='owner', password='test')
 
@@ -488,6 +498,12 @@ def is_admin(self):
 
 class PrivateUserProfileUserAccessTest(PrivateUserProfileMixin, TestCase):
 
+    def setUp(self):
+        super().setUp()
+        self.response_data.update({
+            '/accounts/login/': {'status_code': 302},
+        })
+
     def login(self):
         return self.client.login(username='tester', password='test')
 
@@ -506,6 +522,7 @@ def setUp(self):
         self.response_data.update({
             '/accounts/tokens/create/': {'status_code': 302},
             '/accounts/tokens/delete/': {'status_code': 302},
+            '/accounts/login/': {'status_code': 200},
         })
 
     def login(self):