resolve conflict

Signed-off-by: shaangill025 <gill.shaaanjots@gmail.com>

Author: shaangill025

aries_cloudagent/admin/server.py

@@ -370,6 +370,7 @@ async def check_multitenant_authorization(request: web.Request, handler):
                     and not is_server_path
                     and not is_unprotected_path(path)
                     and not base_limited_access_path
+                    and not (request.method == "OPTIONS")  # CORS fix
                 ):
                     raise web.HTTPUnauthorized()
 

aries_cloudagent/core/conductor.py

@@ -28,6 +28,7 @@
 from ..config.wallet import wallet_config
 from ..core.profile import Profile
 from ..indy.verifier import IndyVerifier
+
 from ..ledger.error import LedgerConfigError, LedgerTransactionError
 from ..ledger.multiple_ledger.base_manager import (
     BaseMultipleLedgerManager,

demo/features/0586-sign-transaction.feature

@@ -25,6 +25,7 @@ Feature: RFC 0586 Aries sign (endorse) transactions functions
          | --mediation               | --mediation               | driverslicense |
          | --multitenant             | --multitenant             | driverslicense |
          | --mediation --multitenant | --mediation --multitenant | driverslicense |
+         | --multitenant --multi-ledger | --multitenant --multi-ledger | driverslicense |
 
 
    @T001.1-RFC0586 @GHA

demo/multi_ledger_config.yml

@@ -1,5 +1,9 @@
+#- id: local
+#  is_production: true
+#  genesis_url: 'http://$LEDGER_HOST:9000/genesis'
 - id: bcorvinTest
   is_production: true
+  is_write: true
   genesis_url: 'http://test.bcovrin.vonx.io/genesis'
 - id: greenlightTest
   is_production: true

demo/runners/agent_container.py

@@ -1274,9 +1274,11 @@ async def create_agent_with_args(args, ident: str = None):
         )
 
     multi_ledger_config_path = None
+    genesis = None
     if "multi_ledger" in args and args.multi_ledger:
         multi_ledger_config_path = "./demo/multi_ledger_config.yml"
-    genesis = await default_genesis_txns()
+    else:
+        genesis = await default_genesis_txns()
     if not genesis and not multi_ledger_config_path:
         print("Error retrieving ledger genesis transactions")
         sys.exit(1)

demo/runners/support/agent.py

@@ -213,6 +213,7 @@ def __init__(
             self.agency_wallet_did = self.did
             self.agency_wallet_key = self.wallet_key
 
+        self.multi_write_ledger_url = None
         if self.genesis_txn_list:
             updated_config_list = []
             with open(self.genesis_txn_list, "r") as stream:
@@ -225,6 +226,10 @@ def __init__(
                         "$LEDGER_HOST", str(self.external_host)
                     )
                 updated_config_list.append(config)
+                if "is_write" in config and config["is_write"]:
+                    self.multi_write_ledger_url = config["genesis_url"].replace(
+                        "/genesis", ""
+                    )
             with open(self.genesis_txn_list, "w") as file:
                 documents = yaml.dump(updated_config_list, file)
 
@@ -479,7 +484,10 @@ async def register_did(
             # if registering a did for issuing indy credentials, publish the did on the ledger
             self.log(f"Registering {self.ident} ...")
             if not ledger_url:
-                ledger_url = LEDGER_URL
+                if self.multi_write_ledger_url:
+                    ledger_url = self.multi_write_ledger_url
+                else:
+                    ledger_url = LEDGER_URL
             if not ledger_url:
                 ledger_url = f"http://{self.external_host}:9000"
             data = {"alias": alias or self.ident}
@@ -501,6 +509,7 @@ async def register_did(
                 await asyncio.sleep(3.0)
                 nym_info = data
             else:
+                log_msg("using ledger: " + ledger_url + "/register")
                 resp = await self.client_session.post(
                     ledger_url + "/register", json=data
                 )

docker/Dockerfile.bdd

@@ -4,5 +4,6 @@ FROM faber-alice-demo
 RUN pip3 install --no-cache-dir -r demo/requirements.behave.txt
 
 WORKDIR ./demo
+ADD demo ./demo
 RUN chmod a+w .
 ENTRYPOINT ["behave"]