flows/: more migration progress, consolidate views

passbook/core/templates/login/factors/backend.html

@@ -4,6 +4,6 @@
 
 {% block beneath_form %}
 {% if show_password_forget_notice %}
-<a href="{% url 'passbook_core:auth-process' %}?password-forgotten">{% trans 'Forgot password?' %}</a>
+<a href="{% url 'passbook_flows:auth-process' %}?password-forgotten">{% trans 'Forgot password?' %}</a>
 {% endif %}
 {% endblock %}

passbook/core/tests/test_views_authentication.py

@@ -77,7 +77,7 @@ class TestAuthenticationViews(TestCase):
             reverse("passbook_core:auth-login"), data=self.login_data
         )
         self.assertEqual(login_response.status_code, 302)
-        self.assertEqual(login_response.url, reverse("passbook_core:auth-process"))
+        self.assertEqual(login_response.url, reverse("passbook_flows:auth-process"))
 
     def test_sign_up_view_post(self):
         """Test account.sign_up view POST (Anonymous)"""

passbook/core/urls.py

@@ -1,11 +1,7 @@
 """passbook URL Configuration"""
 from django.urls import path
-from structlog import get_logger
 
 from passbook.core.views import authentication, overview, user
-from passbook.factors import view
-
-LOGGER = get_logger()
 
 urlpatterns = [
     # Authentication views
@@ -17,22 +13,11 @@ urlpatterns = [
         authentication.SignUpConfirmView.as_view(),
         name="auth-sign-up-confirm",
     ),
-    path(
-        "auth/process/denied/",
-        view.FactorPermissionDeniedView.as_view(),
-        name="auth-denied",
-    ),
     path(
         "auth/password/reset/<uuid:nonce>/",
         authentication.PasswordResetView.as_view(),
         name="auth-password-reset",
     ),
-    path("auth/process/", view.AuthenticationView.as_view(), name="auth-process"),
-    path(
-        "auth/process/<slug:factor>/",
-        view.AuthenticationView.as_view(),
-        name="auth-process",
-    ),
     # User views
     path("_/user/", user.UserSettingsView.as_view(), name="user-settings"),
     path("_/user/delete/", user.UserDeleteView.as_view(), name="user-delete"),

passbook/core/views/authentication.py

@@ -16,7 +16,7 @@ from passbook.core.forms.authentication import LoginForm, SignUpForm
 from passbook.core.models import Invitation, Nonce, Source, User
 from passbook.core.signals import invitation_used, user_signed_up
 from passbook.factors.password.exceptions import PasswordPolicyInvalid
-from passbook.factors.view import AuthenticationView, _redirect_with_qs
+from passbook.flows.view import AuthenticationView, _redirect_with_qs
 from passbook.lib.config import CONFIG
 
 LOGGER = get_logger()
@@ -72,7 +72,7 @@ class LoginView(UserPassesTestMixin, FormView):
             # No user found
             return self.invalid_login(self.request)
         self.request.session[AuthenticationView.SESSION_PENDING_USER] = pre_user.pk
-        return _redirect_with_qs("passbook_core:auth-process", self.request.GET)
+        return _redirect_with_qs("passbook_flows:auth-process", self.request.GET)
 
     def invalid_login(
         self, request: HttpRequest, disabled_user: User = None