Merge branch 'revert-d594f540' into 'master'

Revert "Merge branch '665-account-adapter-overwritten-for-invitations' into 'master'"

See merge request !988

CHANGELOG.rst

@@ -9,11 +9,6 @@ and this project adheres to `Semantic Versioning`_.
 Unreleased
 ----------
 
-Fixed
-~~~~~
-
-* ACCOUNT_ADAPTER was overriden by invitations
-
 Added
 ~~~~~
 

aleksis/core/settings.py

@@ -367,6 +367,8 @@ ACCOUNT_USERNAME_VALIDATORS = "aleksis.core.util.auth_helpers.custom_username_va
 
 # Configuration for django-invitations
 
+# Use custom account adapter
+ACCOUNT_ADAPTER = "invitations.models.InvitationsAdapter"
 # Expire invitations are configured amout of days
 INVITATIONS_INVITATION_EXPIRY = _settings.get("auth.invitation.expiry", 3)
 # Use email prefix configured for django-allauth

aleksis/core/util/auth_helpers.py

@@ -7,8 +7,8 @@ from django.contrib.auth.validators import ASCIIUsernameValidator
 from django.core.validators import RegexValidator
 from django.http import HttpRequest
 
+from allauth.account.adapter import DefaultAccountAdapter
 from allauth.socialaccount.adapter import DefaultSocialAccountAdapter
-from invitations.models import InvitationsAdapter
 from oauth2_provider.models import AbstractApplication
 from oauth2_provider.oauth2_validators import OAuth2Validator
 from oauth2_provider.scopes import BaseScopes
@@ -37,7 +37,7 @@ class OurSocialAccountAdapter(DefaultSocialAccountAdapter):
         return super().validate_disconnect(account, accounts)
 
 
-class OurAccountAdapter(InvitationsAdapter):
+class OurAccountAdapter(DefaultAccountAdapter):
     """Customised adapter to allow to disable signup."""
 
     def is_open_for_signup(self, request):

aleksis/core/views.py

@@ -36,7 +36,7 @@ from django.views.generic.list import ListView
 
 import reversion
 from allauth.account.utils import _has_verified_for_login, send_email_confirmation
-from allauth.account.views import PasswordChangeView, PasswordResetView, SignupView
+from allauth.account.views import PasswordChangeView, SignupView, PasswordResetView
 from allauth.socialaccount.adapter import get_adapter
 from allauth.socialaccount.models import SocialAccount
 from celery_progress.views import get_progress