Upgrade django-allauth (#5012)

* Upgrade django-allauth

* Update username signup

Author: dimasciput

bims/forms/sign_up.py

@@ -23,9 +23,6 @@ class CustomSignupForm(SignupForm):
         queryset=Role.objects.all().order_by('order'),
         required=True
     )
-    username = forms.CharField(
-        widget=forms.HiddenInput(),
-        required=False)
 
     def __init__(self, *args, **kwargs):
         super(CustomSignupForm, self).__init__(*args, **kwargs)
@@ -35,35 +32,49 @@ def __init__(self, *args, **kwargs):
                 self.fields['role'].initial = first_role
         except Role.DoesNotExist:
             pass
+        # For django-allauth 65.x: properly configure username field
+        if 'username' in self.fields:
+            self.fields['username'].required = False
+            self.fields['username'].widget = forms.HiddenInput()
 
-    def clean_username(self):
-        username = self.cleaned_data.get('username')
-        if not username:
-            new_username = '{first_name}_{last_name}'.format(
-                first_name=self.data.get('first_name').lower(),
-                last_name=self.data.get('last_name').lower()
-            )
-            if Profile.objects.filter(user__username=new_username).exists():
+    def clean(self):
+        """Override clean to generate username before form validation completes."""
+        cleaned_data = super().clean()
+
+        # Generate username from first_name and last_name if not provided
+        if not cleaned_data.get('username'):
+            first_name = cleaned_data.get('first_name', '').lower()
+            last_name = cleaned_data.get('last_name', '').lower()
+
+            if first_name and last_name:
+                base_username = f'{first_name}_{last_name}'
+                username = base_username
+
+                # Ensure uniqueness
+                from django.contrib.auth import get_user_model
+                User = get_user_model()
                 counter = 1
-                unique_username = new_username
-                while Profile.objects.filter(user__username=unique_username).exists():
-                    unique_username = f'{new_username}_{counter}'
+                while User.objects.filter(username=username).exists():
+                    username = f'{base_username}_{counter}'
                     counter += 1
-                return unique_username
-            return new_username
-        return username
+
+                cleaned_data['username'] = username
+
+        return cleaned_data
 
     def custom_signup(self, request, user):
+        """Called after the user is created to set additional fields."""
         user.first_name = self.cleaned_data['first_name']
         user.last_name = self.cleaned_data['last_name']
         user.organization = self.cleaned_data['organization']
-        user.username = self.cleaned_data.get('username', user.email)
+        # Username is already set from clean() method
         user.save()
-        bims_profile, created = Profile.objects.get_or_create(
-            user=user
-        )
+
+        # Create or get the BIMS profile
+        bims_profile, created = Profile.objects.get_or_create(user=user)
         bims_profile.role = self.cleaned_data['role']
         bims_profile.save()
+
         return user
 
 

bims/urls.py

@@ -228,7 +228,8 @@ def login_redirect(request):
             name='add-source-reference'),
     re_path(r'^summary-report/$', SummaryReportView.as_view(),
             name='summary-report'),
-    re_path(r'^profile/(?P<slug>\w+)/$', ProfileView.as_view(),
+    # Updated pattern to accept email addresses as usernames (after allauth upgrade)
+    re_path(r'^profile/(?P<slug>[^/]+)/$', ProfileView.as_view(),
             name='profile'),
     re_path(r'^download-request/$', DownloadRequestListView.as_view(),
             name='download-request'),

core/settings/contrib.py

@@ -536,9 +536,11 @@
     'signup': 'bims.forms.CustomSignupForm',
 }
 ACCOUNT_UNIQUE_EMAIL = True
-ACCOUNT_USERNAME_REQUIRED = True
-ACCOUNT_EMAIL_REQUIRED = True
-ACCOUNT_AUTHENTICATION_METHOD = 'username_email'
+# For django-allauth 65.x: Updated to new settings format
+# No username field in signup form - it's auto-generated from first_name and last_name
+ACCOUNT_SIGNUP_FIELDS = ['email*', 'password1*', 'password2*']
+# Replaced ACCOUNT_AUTHENTICATION_METHOD = 'username_email' with:
+ACCOUNT_LOGIN_METHODS = {'email', 'username'}
 ACCOUNT_AUTHENTICATED_LOGIN_REDIRECTS = False
 ACCOUNT_LOGOUT_REDIRECT_URL = '/'
 

deployment/docker/REQUIREMENTS-dev.txt

@@ -7,3 +7,7 @@ wrapt==1.16.0
 # pdb plus plus
 pdbpp
 django-debug-toolbar==4.4.2
+debugpy>=1.8.0
+
+# Auto-reload for celery worker
+watchdog>=3.0.0

deployment/docker/REQUIREMENTS.txt

@@ -10,7 +10,7 @@ requests>=2.23.0
 pytz
 # support special characters
 
-django-allauth==0.63.3
+django-allauth==65.13.0
 
 # Django Easy Audit
 # https://github.com/soynatan/django-easy-audit

deployment/docker/temp/REQUIREMENTS.txt

@@ -10,7 +10,7 @@ requests>=2.23.0
 pytz
 # support special characters
 
-django-allauth==0.63.3
+django-allauth==65.13.0
 
 # Django Easy Audit
 # https://github.com/soynatan/django-easy-audit