Adjust mail provider class

app/mail_provider.py

@@ -2,6 +2,7 @@ import email
 import imaplib
 import smtplib
 from email.message import EmailMessage
+from enum import Enum
 
 from pydantic import BaseModel
 
@@ -10,17 +11,26 @@ from app.user import User
 from app.utils import subject_identifier
 
 
+class Encryption(Enum):
+    SSL_TLS = "ssl_tls"
+    STARTTLS = "starttls"
+
+
 class MailProvider(BaseModel):
+    name: str
     base_url: str
     imap_url: str
+    imap_port: int = 993
+    imap_encryption: Encryption = Encryption.STARTTLS
     smtp_url: str
-    smtp_port: int
+    smtp_port: int = 587
+    smtp_encryption: Encryption = Encryption.STARTTLS
 
     def send_mail(self, from_user: User, to_user: User, message: EmailMessage):
         try:
             with smtplib.SMTP(self.smtp_url, self.smtp_port) as server:
-                server.ehlo()
                 server.starttls()
+                server.ehlo()
                 server.login(from_user.mail, from_user.password)
                 server.sendmail(from_user.mail, to_user.mail, message.as_string())
                 return True
@@ -54,7 +64,9 @@ class MailProvider(BaseModel):
                     print(e)
 
     def imap_login(self, user: User) -> imaplib.IMAP4_SSL:
-        imap = imaplib.IMAP4_SSL(self.imap_url)
+        imap = imaplib.IMAP4_SSL(self.imap_url, self.smtp_port)
+        imap.starttls()
+        imap.ehlo()
         imap.login(user.mail, user.password)
         return imap