Merge branch '242-verify-email-issue' into 'main'

fix: Fixed verify email page appearing when neither email confirmation nor SMTP server are enabled

Closes #242

See merge request yaal/canaille!247

Author: azmeuk

canaille/core/configuration.py

@@ -260,7 +260,7 @@ class CoreSettings(BaseModel):
     HTMX: bool = True
     """Accelerates webpages loading with asynchronous requests."""
 
-    EMAIL_CONFIRMATION: bool = True
+    EMAIL_CONFIRMATION: bool | None = None
     """If :py:data:`True`, users will need to click on a confirmation link sent
     by email when they want to add a new email.
 

canaille/core/endpoints/account.py

@@ -79,7 +79,7 @@ def join():
     if not current_app.features.has_registration:
         abort(404)
 
-    if not current_app.config["CANAILLE"]["EMAIL_CONFIRMATION"]:
+    if not current_app.features.has_email_confirmation:
         return redirect(url_for(".registration"))
 
     if current_user():

tests/app/fixtures/current-app-config.toml

@@ -79,7 +79,7 @@ JAVASCRIPT = false
 #
 # By default, this is true if SMTP is configured, else this is false. If
 # explicitly set to true and SMTP is disabled, the email field will be read-only.
-# EMAIL_CONFIRMATION = true
+# EMAIL_CONFIRMATION =
 
 # If True, then users can freely create an account at this instance.
 #

tests/app/fixtures/default-config.toml

@@ -73,7 +73,7 @@
 #
 # By default, this is true if SMTP is configured, else this is false. If
 # explicitly set to true and SMTP is disabled, the email field will be read-only.
-# EMAIL_CONFIRMATION = true
+# EMAIL_CONFIRMATION =
 
 # If True, then users can freely create an account at this instance.
 #