refactor(account): Centralize references to EMAIL_VERIFICATION

Author: pennersr

allauth/account/forms.py

@@ -210,7 +210,6 @@ def login(self, request, redirect_url=None):
         ret = perform_login(
             request,
             self.user,
-            email_verification=app_settings.EMAIL_VERIFICATION,
             redirect_url=redirect_url,
             email=credentials.get("email"),
         )

allauth/account/utils.py

@@ -142,7 +142,7 @@ def has_verified_email(user, email=None):
 def perform_login(
     request,
     user,
-    email_verification,
+    email_verification=None,
     redirect_url=None,
     signal_kwargs=None,
     signup=False,
@@ -155,6 +155,8 @@ def perform_login(
     email is essential (during signup), or if it can be skipped (e.g. in
     case email verification is optional and we are only logging in).
     """
+    if not email_verification:
+        email_verification = app_settings.EMAIL_VERIFICATION
     login = Login(
         user=user,
         email_verification=email_verification,

allauth/account/views.py

@@ -273,8 +273,8 @@ def form_valid(self, form):
             return complete_signup(
                 self.request,
                 self.user,
-                app_settings.EMAIL_VERIFICATION,
-                self.get_success_url(),
+                email_verification=None,
+                success_url=self.get_success_url(),
             )
         except ImmediateHttpResponse as e:
             return e.response
@@ -425,7 +425,7 @@ def login_on_confirm(self, confirmation):
             return perform_login(
                 self.request,
                 user,
-                app_settings.EmailVerificationMethod.NONE,
+                email_verification=app_settings.EmailVerificationMethod.NONE,
                 # passed as callable, as this method
                 # depends on the authenticated state
                 redirect_url=self.get_redirect_url,
@@ -940,7 +940,6 @@ def form_valid(self, form):
             return perform_login(
                 self.request,
                 self.reset_user,
-                email_verification=app_settings.EMAIL_VERIFICATION,
             )
 
         return super(PasswordResetFromKeyView, self).form_valid(form)

allauth/socialaccount/app_settings.py

@@ -73,11 +73,10 @@ def EMAIL_REQUIRED(self):
     @property
     def EMAIL_VERIFICATION(self):
         """
-        See email verification method
+        See email verification method.  When `None`, the default
+        `allauth.account` logic kicks in.
         """
-        from allauth.account import app_settings as account_settings
-
-        return self._setting("EMAIL_VERIFICATION", account_settings.EMAIL_VERIFICATION)
+        return self._setting("EMAIL_VERIFICATION", None)
 
     @property
     def EMAIL_AUTHENTICATION(self):