Implement allauth

back/Pipfile

@@ -24,6 +24,7 @@ croniter = "*" # Needed for django-q scheduled tasks
 slack-bolt = "*"
 django-q2 = "*" # Background tasks
 psycopg = {extras = ["binary"], version = "*"}
+django-allauth = {extras = ["mfa"], version = "*"}
 
 [dev-packages]
 coverage = "*"

back/admin/admin_tasks/views.py

@@ -1,3 +1,4 @@
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect
@@ -7,7 +8,7 @@
 from django.views.generic.edit import CreateView, UpdateView
 from django.views.generic.list import ListView
 
-from users.mixins import LoginRequiredMixin, ManagerPermMixin
+from users.mixins import ManagerPermMixin
 
 from .forms import AdminTaskCommentForm, AdminTaskCreateForm, AdminTaskUpdateForm
 from .models import AdminTask, AdminTaskComment

back/admin/appointments/views.py

@@ -1,10 +1,11 @@
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
 from django.urls import reverse_lazy
 from django.utils.translation import gettext as _
 from django.views.generic.edit import CreateView, DeleteView, UpdateView
 from django.views.generic.list import ListView
 
-from users.mixins import LoginRequiredMixin, ManagerPermMixin
+from users.mixins import ManagerPermMixin
 
 from .forms import AppointmentForm
 from .models import Appointment

back/admin/badges/views.py

@@ -1,10 +1,11 @@
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
 from django.urls import reverse_lazy
 from django.utils.translation import gettext as _
 from django.views.generic.edit import CreateView, DeleteView, UpdateView
 from django.views.generic.list import ListView
 
-from users.mixins import LoginRequiredMixin, ManagerPermMixin
+from users.mixins import ManagerPermMixin
 
 from .forms import BadgeForm
 from .models import Badge

back/admin/hardware/views.py

@@ -1,3 +1,4 @@
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
 from django.urls import reverse_lazy
 from django.utils.translation import gettext_lazy as _
@@ -6,7 +7,7 @@
 
 from admin.hardware.forms import HardwareForm
 from admin.hardware.models import Hardware
-from users.mixins import LoginRequiredMixin, ManagerPermMixin
+from users.mixins import ManagerPermMixin
 
 
 class HardwareListView(LoginRequiredMixin, ManagerPermMixin, ListView):

back/admin/integrations/tests.py

@@ -162,26 +162,6 @@ def test_update_integration(client, django_user_model, custom_integration_factor
     assert integration.name in response.content.decode()
 
 
-@pytest.mark.django_db
-def test_create_google_login_integration(client, django_user_model):
-    client.force_login(
-        django_user_model.objects.create(role=get_user_model().Role.ADMIN)
-    )
-
-    url = reverse("integrations:create-google")
-    response = client.get(url)
-
-    assert "client_id" in response.content.decode()
-    assert "client_secret" in response.content.decode()
-
-    response = client.post(url, data={"client_id": "12", "client_secret": "233"})
-
-    assert (
-        Integration.objects.filter(integration=Integration.Type.GOOGLE_LOGIN).count()
-        == 1
-    )
-
-
 @pytest.mark.django_db
 def test_delete_integration(client, django_user_model, custom_integration_factory):
     client.force_login(

back/admin/integrations/urls.py

@@ -12,11 +12,6 @@
         name="delete",
     ),
     path("update/<int:pk>/", views.IntegrationUpdateView.as_view(), name="update"),
-    path(
-        "create/google_login/",
-        views.IntegrationCreateGoogleLoginView.as_view(),
-        name="create-google",
-    ),
     path("oauth/<int:pk>/", views.IntegrationOauthRedirectView.as_view(), name="oauth"),
     path(
         "oauth/<int:pk>/callback/",

back/admin/integrations/views.py

@@ -4,6 +4,7 @@
 
 import requests
 from django.contrib import messages
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse_lazy
@@ -13,7 +14,7 @@
 from django.views.generic.base import RedirectView
 from django.views.generic.edit import CreateView, DeleteView, UpdateView
 
-from users.mixins import AdminPermMixin, LoginRequiredMixin
+from users.mixins import AdminPermMixin
 
 from .forms import IntegrationExtraArgsForm, IntegrationForm
 from .models import Integration
@@ -39,27 +40,6 @@ def form_valid(self, form):
         return super().form_valid(form)
 
 
-class IntegrationCreateGoogleLoginView(
-    LoginRequiredMixin, AdminPermMixin, CreateView, SuccessMessageMixin
-):
-    template_name = "token_create.html"
-    fields = ["client_id", "client_secret"]
-    queryset = Integration.objects.filter(integration=Integration.Type.GOOGLE_LOGIN)
-    success_message = _("Integration has been updated!")
-    success_url = reverse_lazy("settings:integrations")
-
-    def form_valid(self, form):
-        form.instance.integration = Integration.Type.GOOGLE_LOGIN
-        return super().form_valid(form)
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["title"] = _("Change Google login credentials")
-        context["subtitle"] = _("settings")
-        context["button_text"] = _("Update")
-        return context
-
-
 class IntegrationUpdateView(
     LoginRequiredMixin, AdminPermMixin, UpdateView, SuccessMessageMixin
 ):

back/admin/introductions/views.py

@@ -1,11 +1,12 @@
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
 from django.urls import reverse_lazy
 from django.utils.translation import gettext as _
 from django.views.generic.detail import DetailView
 from django.views.generic.edit import CreateView, DeleteView, UpdateView
 from django.views.generic.list import ListView
 
-from users.mixins import LoginRequiredMixin, ManagerPermMixin
+from users.mixins import ManagerPermMixin
 from users.models import User
 
 from .forms import IntroductionForm

back/admin/people/access_views.py

@@ -1,5 +1,6 @@
 from django.contrib import messages
 from django.contrib.auth import get_user_model
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse_lazy
@@ -10,10 +11,7 @@
 
 from admin.integrations.forms import IntegrationExtraUserInfoForm
 from admin.integrations.models import Integration
-from users.mixins import (
-    IsAdminOrNewHireManagerMixin,
-    LoginRequiredMixin,
-)
+from users.mixins import IsAdminOrNewHireManagerMixin
 from users.models import IntegrationUser
 
 

back/admin/people/new_hire_views.py

@@ -4,6 +4,7 @@
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth import get_user_model
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
@@ -35,7 +36,6 @@
 )
 from users.mixins import (
     IsAdminOrNewHireManagerMixin,
-    LoginRequiredMixin,
     ManagerPermMixin,
 )
 from users.models import NewHireWelcomeMessage, PreboardingUser, ResourceUser, ToDoUser

back/admin/people/tests.py

@@ -2638,8 +2638,8 @@ def test_employee_can_only_login_with_access(
 ):
     employee1 = employee_factory()
 
-    url = reverse("login")
-    data = {"username": employee1.email, "password": "test"}
+    url = reverse("account_login")
+    data = {"login": employee1.email, "password": "test"}
     client.post(url, data=data, follow=True)
 
     user = auth.get_user(client)
@@ -2662,7 +2662,7 @@ def test_employee_can_only_login_with_access(
     assert not user.is_authenticated
 
     # Try logging in again with employee account
-    url = reverse("login")
+    url = reverse("account_login")
     client.post(url, data=data, follow=True)
 
     user = auth.get_user(client)

back/admin/people/views.py

@@ -1,4 +1,5 @@
 from django.contrib.auth import get_user_model
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
 from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404, redirect, render
@@ -30,7 +31,6 @@
 from users.mixins import (
     AdminPermMixin,
     IsAdminOrNewHireManagerMixin,
-    LoginRequiredMixin,
     ManagerPermMixin,
 )
 from users.models import ToDoUser

back/admin/preboarding/views.py

@@ -1,10 +1,11 @@
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
 from django.urls import reverse_lazy
 from django.utils.translation import gettext as _
 from django.views.generic.edit import CreateView, DeleteView, UpdateView
 from django.views.generic.list import ListView
 
-from users.mixins import LoginRequiredMixin, ManagerPermMixin
+from users.mixins import ManagerPermMixin
 
 from .forms import PreboardingForm
 from .models import Preboarding

back/admin/resources/views.py

@@ -1,10 +1,11 @@
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
 from django.urls import reverse_lazy
 from django.utils.translation import gettext as _
 from django.views.generic.edit import CreateView, DeleteView, UpdateView
 from django.views.generic.list import ListView
 
-from users.mixins import LoginRequiredMixin, ManagerPermMixin
+from users.mixins import ManagerPermMixin
 
 from .forms import ResourceForm
 from .models import Resource

back/admin/sequences/offboarding_views.py

@@ -1,9 +1,10 @@
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.urls import reverse_lazy
 from django.utils.translation import gettext as _
 from django.views.generic.list import ListView
 
 from admin.sequences.models import Sequence
-from users.mixins import LoginRequiredMixin, ManagerPermMixin
+from users.mixins import ManagerPermMixin
 
 
 class OffboardingSequenceListView(LoginRequiredMixin, ManagerPermMixin, ListView):