Instantiate new MailSender in Services

- Issue #499
- Some smaller refactorings
- Extract smtp cert download to own class

1 files changed, 16 insertions, 17 deletions

diff --git a/service/pixelated/bitmask_libraries/smtp.py b/service/pixelated/bitmask_libraries/smtp.py
index 63d2d310..f4ab00f7 100644
--- a/service/pixelated/bitmask_libraries/smtp.py
+++ b/service/pixelated/bitmask_libraries/smtp.py
@@ -14,41 +14,40 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 import logging
-import os
-import requests
 import random
 from leap.mail.smtp import setup_smtp_gateway
-from pixelated.bitmask_libraries.certs import LeapCertificate
 
 
 logger = logging.getLogger(__name__)
 
 
+class LeapSMTPConfig(object):
+
+    def __init__(self, account_email, cert_path, remote_smtp_host, remote_smtp_port):
+        self.account_email = account_email
+        self.cert_path = cert_path
+        self.remote_smtp_host = remote_smtp_host
+        self.remote_smtp_port = remote_smtp_port
+
+
 class LeapSmtp(object):
 
-    def __init__(self, provider, auth, keymanager=None):
+    def __init__(self, smtp_config, keymanager=None):
         self.local_smtp_port_number = random.randrange(12000, 16000)
-        self._provider = provider
-        self.username = auth.username
-        self.session_id = auth.session_id
-        self.user_token = auth.token
+        self._smtp_config = smtp_config
         self._keymanager = keymanager
-        self._remote_hostname, self._remote_port = provider.smtp_info()
         self._local_smtp_service_socket = None
         self._local_smtp_service = None
 
     def start(self):
-        cert_path = self._provider._client_cert_path()
-        email = '%s@%s' % (self.username, self._provider.domain)
-
         self._local_smtp_service, self._local_smtp_service_socket = setup_smtp_gateway(
             port=self.local_smtp_port_number,
-            userid=str(email),
+            userid=str(self._smtp_config.account_email),
             keymanager=self._keymanager,
-            smtp_host=self._remote_hostname.encode('UTF-8'),
-            smtp_port=self._remote_port,
-            smtp_cert=cert_path,
-            smtp_key=cert_path,
+            smtp_host=self._smtp_config.remote_smtp_host.encode('UTF-8'),
+            smtp_port=self._smtp_config.remote_smtp_port,
+            smtp_cert=self._smtp_config.cert_path,
+            smtp_key=self._smtp_config.cert_path,
             encrypted_only=False
         )