Update send email

Author: CTY-git

patchwork/steps/SendEmail/SendEmail.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import imaplib
+import poplib
 import smtplib
 from email.mime.text import MIMEText
 
@@ -16,10 +18,12 @@ def __init__(self, inputs):
         self.body = inputs.get("body", "Patchwork Execution Email")
         self.sender_email = inputs["sender_email"]
         self.recipient_email = inputs["recipient_email"]
-        self.password = inputs["sender_email_password"]
         self.smtp_host = inputs.get("smtp_host", "smtp.gmail.com")
-        self.smtp_port = int(inputs.get("smtp_port", 465))
+        self.smtp_username = inputs["smtp_username"]
+        self.smtp_password = inputs["smtp_password"]
+        self.smtp_port = int(inputs.get("smtp_port", 25))
         self.reply_message_id = inputs.get("reply_message_id")
+        self.is_ssl = bool(inputs.get("is_smtp_ssl", False))
 
     def run(self) -> dict:
         msg = MIMEText(mustache_render(self.body, self.email_template_value))
@@ -30,9 +34,12 @@ def run(self) -> dict:
             msg.add_header("Reference", self.reply_message_id)
             msg.add_header("In-Reply-To", self.reply_message_id)
 
-        # TODO: support smtp without ssl
-        with smtplib.SMTP_SSL(self.smtp_host, self.smtp_port) as smtp_server:
-            smtp_server.login(self.sender_email, self.password)
-            smtp_server.sendmail(self.sender_email, self.recipient_email, msg.as_string())
+        smtp_clazz = smtplib.SMTP
+        if self.is_ssl:
+            smtp_clazz = smtplib.SMTP_SSL
+
+        with smtp_clazz(host=self.smtp_host, port=self.smtp_port) as mailserver:
+            mailserver.login(self.smtp_username, self.smtp_password)
+            mailserver.sendmail(self.sender_email, self.recipient_email, msg.as_string())
 
         return dict()

patchwork/steps/SendEmail/typed.py

@@ -4,7 +4,8 @@
 class __SendEmailRequiredInputs(TypedDict):
     sender_email: str
     recipient_email: str
-    sender_email_password: str
+    smtp_username: str
+    smtp_password: str
 
 
 class SendEmailInputs(__SendEmailRequiredInputs, total=False):
@@ -14,6 +15,7 @@ class SendEmailInputs(__SendEmailRequiredInputs, total=False):
     smtp_host: str
     smtp_port: int
     reply_message_id: str
+    is_smtp_ssl: str
 
 
 class SendEmailOutputs(TypedDict):

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "patchwork-cli"
-version = "0.0.99.dev5"
+version = "0.0.99.dev6"
 description = ""
 authors = ["patched.codes"]
 license = "AGPL"