fix: SOCIALACCOUNT_ENABLED wrong when using custom AppConfig

allauth/account/models.py

@@ -1,5 +1,6 @@
 import datetime
 
+from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core import signing
 from django.db import models
@@ -9,15 +10,14 @@
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
-from .. import app_settings as allauth_app_settings
 from . import app_settings, signals
 from .adapter import get_adapter
 from .managers import EmailAddressManager, EmailConfirmationManager
 
 
 class EmailAddress(models.Model):
     user = models.ForeignKey(
-        allauth_app_settings.USER_MODEL,
+        settings.AUTH_USER_MODEL,
         verbose_name=_("user"),
         on_delete=models.CASCADE,
     )

allauth/app_settings.py

@@ -1,10 +1,31 @@
-from django.conf import settings
+from django.apps import apps
 
 
-SITES_ENABLED = "django.contrib.sites" in settings.INSTALLED_APPS
-SOCIALACCOUNT_ENABLED = "allauth.socialaccount" in settings.INSTALLED_APPS
-MFA_ENABLED = "allauth.mfa" in settings.INSTALLED_APPS
+class AppSettings(object):
+    def __init__(self, prefix):
+        self.prefix = prefix
 
-LOGIN_REDIRECT_URL = getattr(settings, "LOGIN_REDIRECT_URL", "/")
+    def _setting(self, name, dflt):
+        from allauth.utils import get_setting
 
-USER_MODEL = getattr(settings, "AUTH_USER_MODEL", "auth.User")
+        return get_setting(self.prefix + name, dflt)
+
+    @property
+    def SITES_ENABLED(self):
+        return apps.is_installed("django.contrib.sites")
+
+    @property
+    def SOCIALACCOUNT_ENABLED(self):
+        return apps.is_installed("allauth.socialaccount")
+
+    @property
+    def MFA_ENABLED(self):
+        return apps.is_installed("allauth.mfa")
+
+
+_app_settings = AppSettings("ALLAUTH_")
+
+
+def __getattr__(name):
+    # See https://peps.python.org/pep-0562/
+    return getattr(_app_settings, name)

allauth/socialaccount/models.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 
+from django.conf import settings
 from django.contrib.auth import authenticate, get_user_model
 from django.contrib.sites.shortcuts import get_current_site
 from django.core.exceptions import PermissionDenied
@@ -88,7 +89,7 @@ def get_provider(self, request):
 
 
 class SocialAccount(models.Model):
-    user = models.ForeignKey(allauth.app_settings.USER_MODEL, on_delete=models.CASCADE)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     # Given a `SocialApp` from which this account originates, this field equals
     # the app's `app.provider_id` if available, `app.provider` otherwise.
     provider = models.CharField(