update django and allauth

backface · backface · commit bb0cec0f8ca7 · 2025-10-15T12:40:33.000+02:00
diff --git a/api/api_v1.py b/api/api_v1.py
@@ -19,7 +19,8 @@
 from ninja import Schema
 from ninja.errors import HttpError
 from allauth.account.forms import ResetPasswordForm
-from allauth.account.utils import send_email_confirmation
+from allauth.account.models import EmailAddress
+# removed from allauth.account.utils import send_email_confirmation
 
 from apps.projects.models import Project
 from apps.classrooms.models import Group, SelectedProject
@@ -180,7 +181,10 @@ def signup_user(
     user = User(username=username, email=email, password=password)
     user.set_password(password)
     user.save()
-    send_email_confirmation(request, user, user.email)
+
+    # removed see https://codeberg.org/allauth/django-allauth/issues/4507#issuecomment-6046162
+    # send_email_confirmation(request, user, user.email)
+    EmailAddress.objects.add_email(request, user, user.email, confirm=True)
 
     return {
         "redirect": "/login",
@@ -203,7 +207,11 @@ def resend_verification(request, username: str):
         return HttpResponse(status=200)
 
     if not user.is_email_verified():
-        send_email_confirmation(request, user, user.email)
+        # removed see https://codeberg.org/allauth/django-allauth/issues/4507    
+        # send_email_confirmation(request, user, user.email)
+        email_address = user.emailaddress_set.first()
+        email_address.send_confirmation()        
+        pass
     else:
         # return Message(message = f"Email already verified.")
         return HttpResponse(status=200)
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -123,4 +123,5 @@ volumes:
 
 networks:
   public_proxy:
-    driver: bridge
+    external: true
+#     driver: bridge
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,7 @@ dependencies = [
     "beautifulsoup4>=4.12.3",
     "celery>=5.4.0",
     "crispy-tailwind>=1.0.3",
-    "django-allauth[socialaccount]>=65.1.0",
+    "django-allauth[socialaccount]>=65.12.0",
     "django-browser-reload>=1.17.0",
     "django-cleanup>=9.0.0",
     "django-cors-headers>=4.6.0",
@@ -27,7 +27,7 @@ dependencies = [
     "django-taggit>=6.1.0",
     "django-tailwind>=3.8.0",
     "django-template-partials>=24.4",
-    "django>=5.1.2",
+    "django>=5.2.7",
     "fastembed>=0.4.1",
     "gunicorn>=23.0.0",
     "lxml>=5.3.0",
diff --git a/turtlenest/settings.py b/turtlenest/settings.py
@@ -234,12 +234,18 @@
 # Allauth settings
 # ----------------------------------------------------------
 
-ACCOUNT_EMAIL_REQUIRED = True
+# deprecated: ACCOUNT_EMAIL_REQUIRED = True
+ACCOUNT_SIGNUP_FIELDS = ['email*', 'username*', 'password1*', 'password2*']
+
 ACCOUNT_UNIQUE_EMAIL = True
 ACCOUNT_EMAIL_VERIFICATION = "mandatory"
 SOCIALACCOUNT_EMAIL_VERIFICATION = "none"
-ACCOUNT_AUTHENTICATION_METHOD = "username_email"
+
+#deprecated: ACCOUNT_AUTHENTICATION_METHOD = "username_email"
+ACCOUNT_LOGIN_METHODS = {'email', 'username'}
+
 #ACCOUNT_SIGNUP_FORM_CLASS = "apps.users.forms.MySignupForm"
+
 ACCOUNT_EMAIL_SUBJECT_PREFIX = ""
 ACCOUNT_SESSION_REMEMBER = True
 ACCOUNT_CHANGE_EMAIL=True
