summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorCaio Carrara <ccarrara@thoughtworks.com>2016-04-13 16:53:40 -0300
committerCaio Carrara <ccarrara@thoughtworks.com>2016-04-13 16:56:08 -0300
commit77e374ecca7f1d5ded1c6d20059d2ff8a05e23a6 (patch)
treeec7534b8215c31435023848d5fc85b2f430e0287 /service
parent596f817d452a10da889fbfbbd7a2c74522a80a3e (diff)
Issue #674: Update Account usage to pass user_id
There is an update on leap_mail where an user id became required to create an Account. So, this change update the Account usage on user agent to pass this parameter.
Diffstat (limited to 'service')
-rw-r--r--service/pixelated/bitmask_libraries/session.py6
-rw-r--r--service/test/support/integration/app_test_client.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/service/pixelated/bitmask_libraries/session.py b/service/pixelated/bitmask_libraries/session.py
index d575a9c6..095f23cc 100644
--- a/service/pixelated/bitmask_libraries/session.py
+++ b/service/pixelated/bitmask_libraries/session.py
@@ -73,7 +73,7 @@ class LeapSession(object):
@defer.inlineCallbacks
def after_first_sync(self):
yield self.nicknym.generate_openpgp_key()
- yield self._create_account(self.soledad)
+ yield self._create_account(self.soledad, self.user_auth.uuid)
self.incoming_mail_fetcher = yield self._create_incoming_mail_fetcher(
self.nicknym,
self.soledad,
@@ -81,8 +81,8 @@ class LeapSession(object):
self.account_email())
reactor.callFromThread(self.incoming_mail_fetcher.startService)
- def _create_account(self, soledad):
- self.account = Account(soledad)
+ def _create_account(self, soledad, user_id):
+ self.account = Account(soledad, user_id)
return self.account.deferred_initialization
def _set_fresh_account(self, event, email_address):
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py
index 95facec0..49f0552a 100644
--- a/service/test/support/integration/app_test_client.py
+++ b/service/test/support/integration/app_test_client.py
@@ -111,7 +111,7 @@ class AppTestAccount(object):
shutil.rmtree(soledad_test_folder)
def _initialize_account(self):
- self.account = Account(self.soledad)
+ self.account = Account(self.soledad, self._user_id)
return self.account.deferred_initialization
def _create_mail_service(self, mail_sender, mail_store, search_engine, attachment_store):