Merge pull request openwallet-foundation#2089 from ianco/master

Multitenancy demo (docker-compose with postgres and ngrok)

Author: ianco

aries_cloudagent/admin/server.py

@@ -491,7 +491,7 @@ async def start(self) -> None:
 
         def sort_dict(raw: dict) -> dict:
             """Order (JSON, string keys) dict asciibetically by key, recursively."""
-            for (k, v) in raw.items():
+            for k, v in raw.items():
                 if isinstance(v, dict):
                     raw[k] = sort_dict(v)
             return dict(sorted([item for item in raw.items()], key=lambda x: x[0]))

aries_cloudagent/askar/didcomm/v2.py

@@ -33,7 +33,7 @@ def ecdh_es_encrypt(to_verkeys: Mapping[str, Key], message: bytes) -> bytes:
     except AskarError:
         raise DidcommEnvelopeError("Error creating content encryption key")
 
-    for (kid, recip_key) in to_verkeys.items():
+    for kid, recip_key in to_verkeys.items():
         try:
             epk = Key.generate(recip_key.algorithm, ephemeral=True)
         except AskarError:
@@ -145,7 +145,7 @@ def ecdh_1pu_encrypt(
 
     apu = b64url(sender_kid)
     apv = []
-    for (kid, recip_key) in to_verkeys.items():
+    for kid, recip_key in to_verkeys.items():
         if agree_alg:
             if agree_alg != recip_key.algorithm:
                 raise DidcommEnvelopeError("Recipient key types must be consistent")
@@ -173,7 +173,7 @@ def ecdh_1pu_encrypt(
         raise DidcommEnvelopeError("Error encrypting message payload")
     wrapper.set_payload(payload.ciphertext, payload.nonce, payload.tag)
 
-    for (kid, recip_key) in to_verkeys.items():
+    for kid, recip_key in to_verkeys.items():
         enc_key = ecdh.Ecdh1PU(alg_id, apu, apv).sender_wrap_key(
             wrap_alg, epk, sender_key, recip_key, cek, cc_tag=payload.tag
         )

aries_cloudagent/config/tests/test_wallet.py

@@ -187,7 +187,6 @@ async def test_wallet_config_bad_seed_x(self):
         ) as mock_seed_to_did, async_mock.patch.object(
             test_module, "add_or_update_version_to_storage", async_mock.CoroutineMock()
         ):
-
             with self.assertRaises(test_module.ConfigError):
                 await test_module.wallet_config(self.context, provision=True)
 

aries_cloudagent/connections/base_manager.py

@@ -150,7 +150,7 @@ async def create_did_document(
                 routing_keys = [*routing_keys, *mediator_routing_keys]
                 svc_endpoints = [mediation_record.endpoint]
 
-        for (endpoint_index, svc_endpoint) in enumerate(svc_endpoints or []):
+        for endpoint_index, svc_endpoint in enumerate(svc_endpoints or []):
             endpoint_ident = "indy" if endpoint_index == 0 else f"indy{endpoint_index}"
             service = Service(
                 did_info.did,

aries_cloudagent/connections/models/diddoc/diddoc.py

@@ -176,7 +176,6 @@ def add_service_pubkeys(
 
         rv = []
         for tag in [tags] if isinstance(tags, str) else list(tags):
-
             for svc_key in service.get(tag, {}):
                 canon_key = canon_ref(self.did, svc_key)
                 pubkey = None

aries_cloudagent/connections/models/diddoc/tests/test_diddoc.py

@@ -26,7 +26,6 @@
 
 class TestDIDDoc(AsyncTestCase):
     async def test_basic(self):
-
         # One authn key by reference
         dd_in = {
             "@context": "https://w3id.org/did/v1",

aries_cloudagent/core/conductor.py

@@ -455,11 +455,9 @@ async def start(self) -> None:
                         auto_accept=True,
                     )
                     async with self.root_profile.session() as session:
-                        await (
-                            MediationInviteStore(
-                                session.context.inject(BaseStorage)
-                            ).mark_default_invite_as_used()
-                        )
+                        await MediationInviteStore(
+                            session.context.inject(BaseStorage)
+                        ).mark_default_invite_as_used()
 
                         await record.metadata_set(
                             session, MediationManager.SEND_REQ_AFTER_CONNECTION, True

aries_cloudagent/core/in_memory/didcomm/tests/test_1pu.py

@@ -6,7 +6,6 @@
 
 
 def test_1pu_hex_example():
-
     # Previously randomly generated 3 sets of keys
     aliceSecretKey = "23832cbef38641b8754a35f1f79bbcbc248e09ac93b01c2eaf12474f2ac406b6"
     alicePublicKey = "04fd4ca9eb7954a03517ac8249e6070aa3112e582f596b10f0d45d757b56d5dc0395a7d207d06503a4d6ad6e2ad3a1fd8cc233c072c0dc0f32213deb712c32cbdf"
@@ -41,7 +40,6 @@ def test_1pu_hex_example():
 
 # Example key exchange in https://tools.ietf.org/id/draft-madden-jose-ecdh-1pu-03.html#rfc.appendix.A
 def test_1pu_appendix_example():
-
     # Convert the three JWK keys into hex encoded byte format
 
     # Alice Key
@@ -106,7 +104,6 @@ def test_1pu_appendix_example():
 
 
 def main():
-
     test_1pu_hex_example()
     test_1pu_appendix_example()
 

aries_cloudagent/core/in_memory/didcomm/tests/test_ecdh.py

@@ -2,9 +2,9 @@
 
 from ..derive_ecdh import *
 
+
 # Generate the same shared secret from imported generated keys
 def test_ecdh_derive_shared_secret():
-
     # Import keys for two participating users
     aliceSecretKey = "23832cbef38641b8754a35f1f79bbcbc248e09ac93b01c2eaf12474f2ac406b6"
     alicePublicKey = "04fd4ca9eb7954a03517ac8249e6070aa3112e582f596b10f0d45d757b56d5dc0395a7d207d06503a4d6ad6e2ad3a1fd8cc233c072c0dc0f32213deb712c32cbdf"
@@ -23,7 +23,6 @@ def test_ecdh_derive_shared_secret():
 
 # Generate the same shared secret from random keys
 def test_ecdh_derive_shared_secret_random():
-
     # Generate random keys for the two participating users
     aliceSecretKey = SigningKey.generate(curve=NIST256p)
     alice = ECDH(curve=NIST256p)
@@ -46,7 +45,6 @@ def test_ecdh_derive_shared_secret_random():
 
 # Test the entire key generation flow, DeriveECDHSecret() into ConcatKDF()
 def test_ecdh_generate_key():
-
     aliceSecretKey = "23832cbef38641b8754a35f1f79bbcbc248e09ac93b01c2eaf12474f2ac406b6"
     alicePublicKey = "04fd4ca9eb7954a03517ac8249e6070aa3112e582f596b10f0d45d757b56d5dc0395a7d207d06503a4d6ad6e2ad3a1fd8cc233c072c0dc0f32213deb712c32cbdf"
 
@@ -78,7 +76,6 @@ def test_ecdh_generate_key():
 
 # Test the entire key generation flow, derive_shared_secret() into concat_kdf()
 def test_ecdh_generate_key_random():
-
     aliceSecretKey = SigningKey.generate(curve=NIST256p)
     alice = ECDH(curve=NIST256p)
     alice.load_private_key(aliceSecretKey)
@@ -113,7 +110,6 @@ def test_ecdh_generate_key_random():
 
 
 def main():
-
     test_ecdh_derive_shared_secret()
     test_ecdh_derive_shared_secret_random()
     test_ecdh_generate_key()

aries_cloudagent/core/tests/test_conductor.py

@@ -222,7 +222,6 @@ async def test_stats(self):
         ) as mock_outbound_mgr, async_mock.patch.object(
             test_module, "LoggingConfigurator", autospec=True
         ) as mock_logger:
-
             mock_inbound_mgr.return_value.sessions = ["dummy"]
             mock_outbound_mgr.return_value.outbound_buffer = [
                 async_mock.MagicMock(state=QueuedOutboundMessage.STATE_ENCODE),
@@ -263,7 +262,6 @@ async def test_inbound_message_handler(self):
         with async_mock.patch.object(
             conductor.dispatcher, "queue_message", autospec=True
         ) as mock_dispatch_q:
-
             message_body = "{}"
             receipt = MessageReceipt(direct_response_mode="snail mail")
             message = InboundMessage(message_body, receipt)