Merge pull request #448 from paysni/main

SMB and smtp fix
atlas-bi · Dec 18, 2023 · 32ed190 · 32ed190
2 parents f6ef2f3 + cc3e046
commit 32ed190
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-2.12.0-alpha.2
+2.12.3
diff --git a/pyproject.toml b/pyproject.toml
@@ -97,7 +97,7 @@ packages = [
 ]
 readme = "readme.md"
 repository = "https://github.com/atlas-bi/Hub"
-version = "2.12.1"
+version = "2.12.3"
 
 [tool.poetry.dependencies]
 Flask = "^2.0.1"

diff --git a/runner/scripts/em_smb.py b/runner/scripts/em_smb.py
@@ -310,8 +310,8 @@ def save(self, overwrite: int, file_name: str) -> str:  # type: ignore[return]
                     Path(
                         (
                             Path(
-                                sanitize_filename(self.subfolder)
-                                / sanitize_filename(self.task.project.name or "")
+                                Path(sanitize_filename(self.subfolder or ""))
+                                / Path(sanitize_filename(self.task.project.name or ""))
                             )
                             if self.subfolder
                             else Path(sanitize_filename(self.task.project.name or ""))

diff --git a/runner/scripts/em_smtp.py b/runner/scripts/em_smtp.py
@@ -73,8 +73,6 @@ def __send_ssms(self) -> None:
                 if app.config.get("SMTP_USE_TLS", False):
                     mail_server.starttls()
                     mail_server.ehlo()
-
-                if app.config.get("SMTP_USERNAME"):
                     mail_server.login(
                         app.config["SMTP_USERNAME"],
                         app.config.get("SMTP_PASSWORD", None),
@@ -145,6 +143,13 @@ def __send_mail(self) -> None:
             )
 
             mail_server.ehlo()
+            if app.config.get("SMTP_USE_TLS", False):
+                mail_server.starttls()
+                mail_server.ehlo()
+                mail_server.login(
+                    app.config["SMTP_USERNAME"],
+                    app.config.get("SMTP_PASSWORD", None),
+                )
             mail_server.sendmail(
                 app.config["SMTP_SENDER_EMAIL"], self.mailto, self.msg.as_string()
             )