summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2017-03-02 13:58:49 -0300
committerdrebs <drebs@leap.se>2017-03-02 14:39:36 -0300
commitd92f1d1840d28ee6c2058556b047db75ed737f77 (patch)
tree61bdd3c85a015f6bd47492d414fa3f4890892b74
parent5139e95a65cf6094711ebf12aca01fb6e9b47c8c (diff)
[bug] fix shared database initialization
-rw-r--r--client/src/leap/soledad/client/_secrets/storage.py3
-rw-r--r--client/src/leap/soledad/client/shared_db.py6
2 files changed, 3 insertions, 6 deletions
diff --git a/client/src/leap/soledad/client/_secrets/storage.py b/client/src/leap/soledad/client/_secrets/storage.py
index 89b44266..056c4322 100644
--- a/client/src/leap/soledad/client/_secrets/storage.py
+++ b/client/src/leap/soledad/client/_secrets/storage.py
@@ -72,9 +72,8 @@ class SecretsStorage(UserDataMixin):
def _init_shared_db(self):
url = urlparse.urljoin(self._soledad.server_url, SHARED_DB_NAME)
- uuid = self._soledad.uuid
creds = self._creds
- db = SoledadSharedDatabase.open_database(url, uuid, creds)
+ db = SoledadSharedDatabase.open_database(url, creds)
return db
def _remote_doc_id(self):
diff --git a/client/src/leap/soledad/client/shared_db.py b/client/src/leap/soledad/client/shared_db.py
index b429d2cb..4f70c74b 100644
--- a/client/src/leap/soledad/client/shared_db.py
+++ b/client/src/leap/soledad/client/shared_db.py
@@ -91,14 +91,12 @@ class SoledadSharedDatabase(HTTPDatabase, TokenBasedAuth):
#
@staticmethod
- def open_database(url, uuid, creds=None):
+ def open_database(url, creds=None):
"""
Open a Soledad shared database.
:param url: URL of the remote database.
:type url: str
- :param uuid: The user's unique id.
- :type uuid: str
:param creds: A tuple containing the authentication method and
credentials.
:type creds: tuple
@@ -106,7 +104,7 @@ class SoledadSharedDatabase(HTTPDatabase, TokenBasedAuth):
:return: The shared database in the given url.
:rtype: SoledadSharedDatabase
"""
- db = SoledadSharedDatabase(url, uuid, creds=creds)
+ db = SoledadSharedDatabase(url, creds=creds)
return db
@staticmethod