Mitigate some allauth bugs

pennersr/django-allauth#2826 pennersr/django-allauth#2853
UCBerkeleySETI · Jun 6, 2021 · 60fc249 · 60fc249
1 parent 15115a7
commit 60fc249
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/daiquiri/core/apps.py b/daiquiri/core/apps.py
@@ -0,0 +1,11 @@
+from allauth.account.apps import AccountConfig
+from allauth.socialaccount.apps import SocialAccountConfig
+
+# See https://github.com/pennersr/django-allauth/issues/2826
+
+class ModifiedAccountConfig(AccountConfig):
+    default_auto_field = 'django.db.models.AutoField'
+
+class ModifiedSocialAccountConfig(SocialAccountConfig):
+    default_auto_field = 'django.db.models.AutoField'
+
diff --git a/daiquiri/core/settings/django.py b/daiquiri/core/settings/django.py
@@ -83,11 +83,18 @@
     'compressor',
     'widget_tweaks',
     'allauth',
-    'allauth.account',
-    'allauth.socialaccount',
+    # Replaced with the two below to fix https://github.com/pennersr/django-allauth/issues/2826
+    # 'allauth.account',
+    # 'allauth.socialaccount',
+    'daiquiri.core.apps.ModifiedAccountConfig',
+    'daiquiri.core.apps.ModifiedSocialAccountConfig',
     'rules'
 ]
 
+# To fix https://github.com/pennersr/django-allauth/issues/2853
+import allauth.app_settings
+allauth.app_settings.SOCIALACCOUNT_ENABLED = True
+
 MIDDLEWARE = [
     'daiquiri.core.middleware.MultipleProxyMiddleware',
     'django.middleware.security.SecurityMiddleware',

diff --git a/daiquiri/metadata/apps.py b/daiquiri/metadata/apps.py
@@ -5,6 +5,7 @@ class MetadataConfig(AppConfig):
     name = 'daiquiri.metadata'
     label = 'daiquiri_metadata'
     verbose_name = 'Metadata'
+    default_auto_field = 'django.db.models.AutoField'
 
     def ready(self):
         from . import handlers
diff --git a/daiquiri/tap/apps.py b/daiquiri/tap/apps.py
@@ -5,6 +5,7 @@ class TapConfig(AppConfig):
     name = 'daiquiri.tap'
     label = 'daiquiri_tap'
     verbose_name = 'Tap'
+    default_auto_field = 'django.db.models.AutoField'
 
     def ready(self):
         from . import handlers