From b433c1ed736f5d4c19da4cdb21108a02459ca7fd Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Sat, 25 Feb 2017 08:53:38 -0300
Subject: [refactor] pass soledad object to client secrets api

In order to be able to change passphrase, token and offline status of
soledad from the bitmask client api, the secrets api also has to be able
to use up-to-date values when encrypting/decrypting secrets and
uploading/downloading them to the server. This commit makes public some
soledad attributes that were previously "private" (i.e. used to start
with "_" and were not meant to be accessed from outside), and passes the
whole soledad object to the client secrets api. This makes the code
cleaner and also allows for always getting newest values of soledad
attributes.
---
 testing/tests/client/test_aux_methods.py       | 12 ++++++------
 testing/tests/client/test_deprecated_crypto.py |  2 +-
 testing/tests/client/test_secrets.py           | 10 ++++------
 testing/tests/server/test_server.py            |  2 +-
 4 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'testing')

diff --git a/testing/tests/client/test_aux_methods.py b/testing/tests/client/test_aux_methods.py
index a08f7d36..729aa28a 100644
--- a/testing/tests/client/test_aux_methods.py
+++ b/testing/tests/client/test_aux_methods.py
@@ -33,7 +33,7 @@ class AuxMethodsTestCase(BaseSoledadTest):
     def test__init_dirs(self):
         sol = self._soledad_instance(prefix='_init_dirs')
         local_db_dir = os.path.dirname(sol.local_db_path)
-        secrets_path = os.path.dirname(sol.secrets.storage._local_path)
+        secrets_path = os.path.dirname(sol.secrets_path)
         self.assertTrue(os.path.isdir(local_db_dir))
         self.assertTrue(os.path.isdir(secrets_path))
 
@@ -63,8 +63,8 @@ class AuxMethodsTestCase(BaseSoledadTest):
         # instantiate without initializing so we just test
         # _init_config_with_defaults()
         sol = SoledadMock()
-        sol._passphrase = u''
-        sol._server_url = ''
+        sol.passphrase = u''
+        sol.server_url = ''
         sol._init_config_with_defaults()
         # assert value of local_db_path
         self.assertEquals(
@@ -84,11 +84,11 @@ class AuxMethodsTestCase(BaseSoledadTest):
             cert_file=None)
         self.assertEqual(
             os.path.join(self.tempdir, 'value_3'),
-            sol.secrets.storage._local_path)
+            sol.secrets_path)
         self.assertEqual(
             os.path.join(self.tempdir, 'value_2'),
             sol.local_db_path)
-        self.assertEqual('value_1', sol._server_url)
+        self.assertEqual('value_1', sol.server_url)
         sol.close()
 
     @inlineCallbacks
@@ -128,5 +128,5 @@ class AuxMethodsTestCase(BaseSoledadTest):
         Assert passphrase getter works fine.
         """
         sol = self._soledad_instance()
-        self.assertEqual('123', sol._passphrase)
+        self.assertEqual('123', sol.passphrase)
         sol.close()
diff --git a/testing/tests/client/test_deprecated_crypto.py b/testing/tests/client/test_deprecated_crypto.py
index 8c711c22..1af1a130 100644
--- a/testing/tests/client/test_deprecated_crypto.py
+++ b/testing/tests/client/test_deprecated_crypto.py
@@ -51,7 +51,7 @@ class DeprecatedCryptoTest(SoledadWithCouchServerMixin, TestCaseWithServer):
             self._soledad_instance(user=user, server_url=server_url))
 
         self.make_app()
-        remote = self.request_state._create_database(replica_uid=client._uuid)
+        remote = self.request_state._create_database(replica_uid=client.uuid)
         remote = CouchDatabase.open_database(
             urljoin(self.couch_url, 'user-' + user),
             create=True)
diff --git a/testing/tests/client/test_secrets.py b/testing/tests/client/test_secrets.py
index bbeb1fc2..18ff458b 100644
--- a/testing/tests/client/test_secrets.py
+++ b/testing/tests/client/test_secrets.py
@@ -121,12 +121,10 @@ class SecretsCryptoTestCase(unittest.TestCase):
     }
 
     def setUp(self):
-        def _get_pass():
-            return '123'
-        self._crypto = SecretsCrypto(_get_pass)
-
-    def test__get_pass(self):
-        self.assertEqual(self._crypto._get_pass(), '123')
+        class Soledad(object):
+            passphrase = '123'
+        soledad = Soledad()
+        self._crypto = SecretsCrypto(soledad)
 
     def test__get_key(self):
         salt = 'abc'
diff --git a/testing/tests/server/test_server.py b/testing/tests/server/test_server.py
index 647ef5a8..4a5ec43f 100644
--- a/testing/tests/server/test_server.py
+++ b/testing/tests/server/test_server.py
@@ -135,7 +135,7 @@ class EncryptedSyncTestCase(
             user=user,
             prefix='x',
             auth_token='auth-token',
-            secrets_path=sol1._secrets_path,
+            secrets_path=sol1.secrets_path,
             passphrase=passphrase)
 
         # ensure remote db exists before syncing
-- 
cgit v1.2.3