diff --git a/src/core/config.py b/src/core/config.py index cc107f0..4987896 100644 --- a/src/core/config.py +++ b/src/core/config.py @@ -12,7 +12,7 @@ class BaseAppSettings(BaseSettings): SECRET_KEY: str EXPIRE_MINUTES: int - EMAIL_PORT: str + EMAIL_PORT: int EMAIL_HOST: str EMAIL_USER: str EMAIL_PASSWORD: str diff --git a/src/core/server.py b/src/core/server.py index d0c436e..e7d4a6a 100644 --- a/src/core/server.py +++ b/src/core/server.py @@ -86,7 +86,12 @@ def _configurate_db(self) -> None: def _configure_services(self): """SMTP server configuration for sending email messages.""" - self._smpt_server = create_server() + self._smpt_server = create_server( + host=self.settings.EMAIL_HOST, + port=self.settings.EMAIL_PORT, + password=self.settings.EMAIL_PASSWORD, + user=self.settings.EMAIL_USER + ) self.app.state.email_service = EmailService(smtp_server=self._smpt_server) async def _load_data(self): diff --git a/src/services/email.py b/src/services/email.py index 6d004fc..a822195 100644 --- a/src/services/email.py +++ b/src/services/email.py @@ -23,17 +23,16 @@ def send_message(self, subject: str, to_addrs: list, body: str) -> None: ) -def create_server() -> SMTPServer: - settings = get_app_settings() +def create_server(host: str, port: int, user: str, password: str) -> SMTPServer: server_ = SMTPServer( - port=settings.EMAIL_PORT, - host=settings.EMAIL_HOST, - from_addr=settings.EMAIL_USER, + port=port, + host=host, + from_addr=user, ) server_.ehlo() server_.login( - user=settings.EMAIL_USER, - password=settings.EMAIL_PASSWORD + user=user, + password=password ) return server_