[refactor] Use auth for fewer parameters

3 files changed, 9 insertions, 9 deletions

diff --git a/service/pixelated/bitmask_libraries/session.py b/service/pixelated/bitmask_libraries/session.py
index a7da7614..a9cb15f2 100644
--- a/service/pixelated/bitmask_libraries/session.py
+++ b/service/pixelated/bitmask_libraries/session.py
@@ -122,7 +122,7 @@ class LeapSessionFactory(object):
         account = self._create_account(auth.uuid, soledad)
         incoming_mail_fetcher = self._create_incoming_mail_fetcher(nicknym, soledad, account, account_email)
 
-        smtp = LeapSmtp(self._provider, auth.username, auth.session_id, auth.token, nicknym.keymanager)
+        smtp = LeapSmtp(self._provider, auth, nicknym.keymanager)
 
         return LeapSession(self._provider, auth, soledad, nicknym, account, incoming_mail_fetcher, smtp)
 
diff --git a/service/pixelated/bitmask_libraries/smtp.py b/service/pixelated/bitmask_libraries/smtp.py
index 3e2d1b21..31e56995 100644
--- a/service/pixelated/bitmask_libraries/smtp.py
+++ b/service/pixelated/bitmask_libraries/smtp.py
@@ -26,12 +26,12 @@ logger = logging.getLogger(__name__)
 
 class LeapSmtp(object):
 
-    def __init__(self, provider, username, session_id, user_token, keymanager=None):
+    def __init__(self, provider, auth, keymanager=None):
         self.local_smtp_port_number = random.randrange(12000, 16000)
         self._provider = provider
-        self.username = username
-        self.session_id = session_id
-        self.user_token = user_token
+        self.username = auth.username
+        self.session_id = auth.session_id
+        self.user_token = auth.token
         self._keymanager = keymanager
         self._remote_hostname, self._remote_port = self._discover_remote_smtp_server()
         self._local_smtp_service_socket = None
diff --git a/service/test/unit/bitmask_libraries/test_smtp.py b/service/test/unit/bitmask_libraries/test_smtp.py
index 535b1e7a..ec51c56b 100644
--- a/service/test/unit/bitmask_libraries/test_smtp.py
+++ b/service/test/unit/bitmask_libraries/test_smtp.py
@@ -53,7 +53,7 @@ class LeapSmtpTest(AbstractLeapTest):
         self.config.timeout_in_s = 15
 
     def test_that_client_cert_gets_downloaded(self):
-        smtp = LeapSmtp(self.provider, self.auth.username, self.auth.session_id, self.keymanager)
+        smtp = LeapSmtp(self.provider, self.auth, self.keymanager)
 
         with HTTMock(ca_cert_mock, not_found_mock):
             smtp._download_client_certificates()
@@ -66,7 +66,7 @@ class LeapSmtpTest(AbstractLeapTest):
 
     @patch('pixelated.bitmask_libraries.smtp.setup_smtp_gateway')
     def test_that_start_calls_setup_smtp_gateway(self, gateway_mock):
-        smtp = LeapSmtp(self.provider, self.auth.username, self.auth.session_id, self.auth.token, self.keymanager)
+        smtp = LeapSmtp(self.provider, self.auth, self.keymanager)
 
         port = 500
         smtp.local_smtp_port_number = port
@@ -78,14 +78,14 @@ class LeapSmtpTest(AbstractLeapTest):
         gateway_mock.assert_called_with(keymanager=self.keymanager, smtp_cert=cert_path, smtp_key=cert_path, userid='test_user@some-server.test', smtp_port='1234', encrypted_only=False, smtp_host='smtp.some-sever.test', port=port)
 
     def test_that_client_stop_does_nothing_if_not_started(self):
-        smtp = LeapSmtp(self.provider, self.auth.username, self.auth.session_id, self.keymanager)
+        smtp = LeapSmtp(self.provider, self.auth, self.keymanager)
 
         with HTTMock(not_found_mock):
             smtp.stop()
 
     @patch('pixelated.bitmask_libraries.smtp.setup_smtp_gateway')
     def test_that_running_smtp_sevice_is_stopped(self, gateway_mock):
-        smtp = LeapSmtp(self.provider, self.auth.username, self.auth.session_id, self.keymanager)
+        smtp = LeapSmtp(self.provider, self.auth, self.keymanager)
 
         smtp_service = MagicMock()
         smtp_port = MagicMock()