Rename FRACTAL_EMAIL_SETTINGS->mail_settings

fractal-analytics-platform · Feb 4, 2025 · 3013d86 · 3013d86
1 parent 11ed043
commit 3013d86
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/fractal_server/app/security/__init__.py b/fractal_server/app/security/__init__.py
@@ -252,18 +252,15 @@ async def on_after_register(
             # Send mail section
             settings = Inject(get_settings)
 
-            if (
-                this_user.oauth_accounts
-                and settings.FRACTAL_EMAIL_SETTINGS is not None
-            ):
+            if this_user.oauth_accounts and settings.mail_settings is not None:
                 try:
                     logger.info(
                         "START sending email about new signup to "
-                        f"{settings.FRACTAL_EMAIL_SETTINGS.recipients}."
+                        f"{settings.mail_settings.recipients}."
                     )
                     mail_new_oauth_signup(
                         msg=f"New user registered: '{this_user.email}'.",
-                        mail_settings=settings.FRACTAL_EMAIL_SETTINGS,
+                        mail_settings=settings.mail_settings,
                     )
                     logger.info("END sending email about new signup.")
                 except Exception as e:

diff --git a/fractal_server/config.py b/fractal_server/config.py
@@ -613,7 +613,7 @@ def PIP_CACHE_DIR_ARG(self) -> str:
     """
     TBD
     """
-    FRACTAL_EMAIL_SETTINGS: Optional[MailSettings] = None
+    mail_settings: Optional[MailSettings] = None
 
     @root_validator(pre=True)
     def validate_email_settings(cls, values):

diff --git a/tests/no_version/test_unit_config.py b/tests/no_version/test_unit_config.py
@@ -409,7 +409,7 @@ def test_fractal_email():
     )
     # 1: no mail settings
     settings = Settings(**common_attributes)
-    assert settings.FRACTAL_EMAIL_SETTINGS is None
+    assert settings.mail_settings is None
     # 2: FRACTAL_EMAIL_USE_LOGIN is true, but no password settings
     with pytest.raises(ValidationError):
         Settings(
@@ -437,15 +437,17 @@ def test_fractal_email():
         FRACTAL_EMAIL_PASSWORD=FRACTAL_EMAIL_PASSWORD,
         FRACTAL_EMAIL_PASSWORD_KEY=FRACTAL_EMAIL_PASSWORD_KEY,
     )
-    assert settings.FRACTAL_EMAIL_SETTINGS is not None
-    assert len(settings.FRACTAL_EMAIL_SETTINGS.recipients) == 2
+    assert settings.mail_settings is not None
+    assert len(settings.mail_settings.recipients) == 2
     # 5: FRACTAL_EMAIL_USE_LOGIN is false and no password needed
-    Settings(
+    settings = Settings(
         **common_attributes,
         **required_mail_args,
         FRACTAL_EMAIL_USE_LOGIN=False,
     )
-    # 6: missing mandatory arguments
+    assert settings.mail_settings is not None
+
+    # 6: missing required arguments
     for arg in required_mail_args:
         with pytest.raises(ValidationError):
             Settings(