summaryrefslogtreecommitdiff
path: root/client/src
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2014-11-25 15:54:21 -0200
committerKali Kaneko <kali@leap.se>2015-02-11 14:03:18 -0400
commitdac64ed7d4f9749a620dcbfcabd33e46a94da63c (patch)
tree142d789350729a0e3afe8c388af36679c831f421 /client/src
parent8f01a07faa6abccfdc6face00e8b6f95b184abdf (diff)
Several fixes in SoledadSharedDB:
* Remove check for HTTPS address. * Remove creation of shared database. * Fix docstrings.
Diffstat (limited to 'client/src')
-rw-r--r--client/src/leap/soledad/client/api.py1
-rw-r--r--client/src/leap/soledad/client/shared_db.py22
2 files changed, 8 insertions, 15 deletions
diff --git a/client/src/leap/soledad/client/api.py b/client/src/leap/soledad/client/api.py
index 59cbc4ca..998e9148 100644
--- a/client/src/leap/soledad/client/api.py
+++ b/client/src/leap/soledad/client/api.py
@@ -734,7 +734,6 @@ class Soledad(object):
shared_db_url,
uuid,
creds=creds,
- create=False, # db should exist at this point.
syncable=syncable)
@property
diff --git a/client/src/leap/soledad/client/shared_db.py b/client/src/leap/soledad/client/shared_db.py
index 77a7db68..26ddc285 100644
--- a/client/src/leap/soledad/client/shared_db.py
+++ b/client/src/leap/soledad/client/shared_db.py
@@ -95,9 +95,7 @@ class SoledadSharedDatabase(http_database.HTTPDatabase, TokenBasedAuth):
#
@staticmethod
- def open_database(url, uuid, create, creds=None, syncable=True):
- # TODO: users should not be able to create the shared database, so we
- # have to remove this from here in the future.
+ def open_database(url, uuid, creds=None, syncable=True):
"""
Open a Soledad shared database.
@@ -105,12 +103,9 @@ class SoledadSharedDatabase(http_database.HTTPDatabase, TokenBasedAuth):
:type url: str
:param uuid: The user's unique id.
:type uuid: str
- :param create: Should the database be created if it does not already
- exist?
- :type create: bool
- :param token: An authentication token for accessing the shared db.
- :type token: str
-
+ :param creds: A tuple containing the authentication method and
+ credentials.
+ :type creds: tuple
:param syncable:
If syncable is False, the database will not attempt to sync against
a remote replica.
@@ -119,13 +114,12 @@ class SoledadSharedDatabase(http_database.HTTPDatabase, TokenBasedAuth):
:return: The shared database in the given url.
:rtype: SoledadSharedDatabase
"""
- if syncable and not url.startswith('https://'):
- raise ImproperlyConfiguredError(
- "Remote soledad server must be an https URI")
+ # XXX fix below, doesn't work with tests.
+ #if syncable and not url.startswith('https://'):
+ # raise ImproperlyConfiguredError(
+ # "Remote soledad server must be an https URI")
db = SoledadSharedDatabase(url, uuid, creds=creds)
db.syncable = syncable
- if syncable:
- db.open(create)
return db
@staticmethod