0.63.x [ Do not merge ]

allauth/account/adapter.py

@@ -609,7 +609,10 @@ def send_account_already_exists_mail(self, email):
             "signup_url": signup_url,
             "password_reset_url": password_reset_url,
         }
-        self.send_mail("account/email/account_already_exists", email, ctx)
+        if app_settings.SIGNUP_WITH_PASSWORD:
+            self.send_mail("account/email/account_already_exists", email, ctx)
+        else:
+            self.send_mail("account/email/account_already_exists_nopass", email, ctx)
 
     def send_confirmation_mail(self, request, emailconfirmation, signup):
         activate_url = self.get_email_confirmation_url(request, emailconfirmation)

allauth/account/app_settings.py

@@ -428,6 +428,10 @@ def LOGIN_BY_CODE_MAX_ATTEMPTS(self):
     def LOGIN_BY_CODE_TIMEOUT(self):
         return self._setting("LOGIN_BY_CODE_TIMEOUT", 3 * 60)
 
+    @property
+    def SIGNUP_WITH_PASSWORD(self):
+        return self._setting("SIGNUP_WITH_PASSWORD", True)
+
 
 _app_settings = AppSettings("ACCOUNT_")
 

allauth/account/internal/flows/login_by_code.py

@@ -24,8 +24,13 @@ def request_login_code(request, email):
         "email": email,
         "failed_attempts": 0,
     }
+
+    email_sent = messages.SUCCESS
     if not users:
-        send_unknown_account_mail(request, email)
+        if app_settings.EMAIL_UNKNOWN_ACCOUNTS:
+            send_unknown_account_mail(request, email)
+        else:
+            email_sent = messages.ERROR
     else:
         user = users[0]
         code = adapter.generate_login_code()
@@ -39,12 +44,22 @@ def request_login_code(request, email):
         )
 
     request.session[LOGIN_CODE_SESSION_KEY] = pending_login
-    adapter.add_message(
-        request,
-        messages.SUCCESS,
-        "account/messages/login_code_sent.txt",
-        {"email": email},
-    )
+    if email_sent == messages.SUCCESS:
+        adapter.add_message(
+            request,
+            email_sent,
+            "account/messages/login_code_sent.txt",
+            {"email": email},
+        )
+        return True
+    else:
+        adapter.add_message(
+            request,
+            email_sent,
+            "account/messages/login_code_failed.txt",
+            {"email": email},
+        )
+        return False
 
 
 def get_pending_login(request, peek=False):

allauth/account/views.py

@@ -840,8 +840,12 @@ def get_form_class(self):
         return get_form_class(app_settings.FORMS, "request_login_code", self.form_class)
 
     def form_valid(self, form):
-        flows.login_by_code.request_login_code(self.request, form.cleaned_data["email"])
-        return super().form_valid(form)
+        if flows.login_by_code.request_login_code(
+            self.request, form.cleaned_data["email"]
+        ):
+            return super().form_valid(form)
+        else:
+            return HttpResponseRedirect(reverse("account_request_login_code"))
 
     def get_success_url(self):
         if self.request.user.is_authenticated:

allauth/templates/account/email/account_already_exists_nopass_message.txt

@@ -0,0 +1,13 @@
+{% extends "account/email/base_message.txt" %}
+{% load i18n %}
+
+{% block content %}{% autoescape off %}{% blocktrans %}You are receiving this email because you or someone else tried to signup for an
+account using email address:
+
+{{ email }}
+
+However, an account using that email address already exists.
+You can safely ignore this message if you have signed-up using a different authentication method.
+
+{% endblocktrans %}{% endautoescape %}{% endblock content %}
+

allauth/templates/account/email/account_already_exists_nopass_subject.txt

@@ -0,0 +1,4 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}Account Already Exists{% endblocktrans %}
+{% endautoescape %}

allauth/templates/account/messages/login_code_failed.txt

@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Failed to send sign-in code to {{email}}.{% endblocktrans %}