Merge pull request #70 from didx-xyz/issue_61

Major refactor of tutorial folder structure.

Author: wip-abramson

configuration/aries-args-multitenant.yaml

@@ -0,0 +1,60 @@
+# see: https://pypi.org/project/ConfigArgParse/ for file format overview
+# before running aca-py, run the following (the commands are embedded below, next to the related parameters):
+#    - run a local postgres database
+#    - run a local instance of von-network
+#    - register your did (seed) on the network
+# run aca-py as:
+#    ACAPY_WALLET_SEED=my_seed_000000000000000000000000 ACAPY_WALLET_KEY=key ./bin/aca-py start --arg-file ./demo/local-indy-args.yaml
+
+log-level: info
+genesis-url: !ENV ${GENESIS_URL}
+# Admin insecure mode and api key will come from the following two variables
+# which is parsed and used automatically by ACA-Py
+# ACAPY_ADMIN_API_KEY
+# ACAPY_ADMIN_INSECURE_MODE
+admin: [0.0.0.0, !ENV '${ADMIN_PORT}']
+label: !ENV ${AGENT_NAME}
+# the following is the callback url for your controller
+webhook-url: !ENV ${WEBHOOK_URL}
+# assumes you are running a local von-network, like:
+#    cd von-network
+#    ./manage start <my local ip>
+inbound-transport:
+   - [http, 0.0.0.0, !ENV '${HTTP_PORT}']
+#   - [ws, 0.0.0.0, !ENV '${HTTP_PORT}']
+outbound-transport: http
+# the following is the public endpoint advertised by the agent
+endpoint: !ENV ${AGENT_ENDPOINT}
+auto-ping-connection: true
+# register your did using (this example is for von-network):
+#    curl -d '{"seed":"my_seed_000000000000000000000000", "role":"TRUST_ANCHOR", "alias":"My Agent"}' -X POST http://localhost:9000/register
+# note that the env var name is configured in argparse.py
+# seed = comes from ACAPY_WALLET_SEED
+wallet-type: !ENV ${WALLET_TYPE}
+wallet-name: !ENV ${WALLET_NAME}
+wallet-key: !ENV ${WALLET_KEY}
+seed: !ENV ${WALLET_SEED}
+
+## run a local postgres (docker) like:
+##    docker run --name some-postgres -e POSTGRES_PASSWORD=mysecretpassword -d -p 5432:5432 postgres:10
+#wallet-storage-type: postgres_storage
+## could be sent using env var ACAPY_WALLET_STORAGE_CONFIG
+#wallet-storage-config: '{"url":"localhost:5432","max_connections":5}'
+## could be sent using env var ACAPY_WALLET_STORAGE_CREDS
+#wallet-storage-creds: '{"account":"postgres","password":"mysecretpassword","admin_account":"postgres","admin_password":"mysecretpassword"}'
+
+
+auto-accept-requests: true
+auto-provision: true
+auto-respond-credential-proposal: false
+auto-respond-credential-offer: false
+auto-respond-credential-request: false
+auto-store-credential: false
+auto-respond-presentation-proposal: true
+auto-respond-presentation-request: true
+preserve-exchange-records: true
+debug-connections: true
+debug-credentials: true
+debug-presentations: true
+enable-undelivered-queue: true
+open-mediation: true

dockerfiles/controllers/Dockerfile.attachmentcontroller

@@ -6,8 +6,8 @@ ARG jupyter_port
 ENV env_jupyter_port=jupyter_port
 # Setup workspace environment
 RUN apt-get update && apt-get install -y gcc
-# RUN conda install jupyter notebook=5.7.8
-RUN conda install jupyter notebook=6.1.5
+# RUN conda install -c conda-forge jupyterlab==3.0.11
+RUN conda install -c conda-forge jupyterlab==3.0.11
 
 ADD libs/attachment-controller attachment-controller
 

dockerfiles/controllers/Dockerfile.basiccontroller

@@ -7,8 +7,8 @@ ENV env_jupyter_port=jupyter_port
 
 # Setup workspace environment
 RUN apt-get update && apt-get install -y gcc
-# RUN conda install jupyter notebook=5.7.8
-RUN conda install jupyter notebook=6.1.5
+# RUN conda install -c conda-forge jupyterlab==3.0.11
+RUN conda install -c conda-forge jupyterlab==3.0.11
 ADD libs/aries-basic-controller .
 
 #

libs/acapy-protocol-example/entrypoint.sh

@@ -10,4 +10,4 @@ fi
 
 cd $WORKSPACE
 echo "HELLO THIS IS PORT $1"
-jupyter notebook --ip=0.0.0.0 --port="$1" --allow-root
+jupyter lab --ip=0.0.0.0 --port="$1" --allow-root

libs/aries-basic-controller/aries_basic_controller/aries_controller.py

@@ -7,13 +7,15 @@
 
 from .controllers.connections import ConnectionsController
 from .controllers.messaging import MessagingController
+from .controllers.mediation import MediationController
 from .controllers.schema import SchemaController
 from .controllers.wallet import WalletController
 from .controllers.definitions import DefinitionsController
 from .controllers.issuer import IssuerController
 from .controllers.proof import ProofController
 from .controllers.ledger import LedgerController
 from .controllers.credential import CredentialController
+from .controllers.multitenant import MultitenancyController
 from .controllers.server import ServerController
 from .controllers.oob import OOBController
 from .controllers.action_menu import ActionMenuController
@@ -35,10 +37,13 @@ def __init__(
         webhook_base: str = "",
         connections: bool = True,
         messaging: bool = True,
+        multitenant: bool = False,
+        mediation: bool = False,
         issuer: bool = True,
         action_menu: bool = True,
         revocations: bool = True,
         api_key: str = None,
+        tennant_jwt: str = None,
     ):
 
         self.webhook_site = None
@@ -51,11 +56,16 @@ def __init__(
         self.webhook_port = webhook_port
         self.connections_controller = None
 
+        headers = {}
+
         if api_key:
-            headers = {"X-API-Key": api_key}
-            self.client_session: ClientSession = ClientSession(headers=headers)
-        else:
-            self.client_session: ClientSession = ClientSession()
+            headers.update({"X-API-Key": api_key})
+
+        if tennant_jwt:
+            headers.update({'Authorization': 'Bearer ' + tennant_jwt, 'content-type': "application/json"})
+
+        self.client_session: ClientSession = ClientSession(headers=headers)
+        
 
         if connections:
             self.connections = ConnectionsController(self.admin_url, self.client_session)
@@ -68,6 +78,12 @@ def __init__(
         self.server = ServerController(self.admin_url, self.client_session)
         self.oob = OOBController(self.admin_url, self.client_session)
 
+        if multitenant:
+            self.multitenant = MultitenancyController(self.admin_url, self.client_session)
+
+        if mediation:
+            self.mediation = MediationController(self.admin_url, self.client_session)
+
         if issuer:
             self.schema = SchemaController(self.admin_url, self.client_session)
             self.wallet = WalletController(self.admin_url, self.client_session)
@@ -77,12 +93,55 @@ def __init__(
 
         if action_menu:
             self.action_menu = ActionMenuController(self.admin_url, self.client_session)
+
         if revocations:
             self.revocations = RevocationController(
                 self.admin_url,
                 self.client_session
             )
 
+    # TODO: Determine whether we really want to essentially create a whole new ClientSession object as done below
+    # Ideally we'd just update the existing session along the lines of self.client_session(headers) 
+    # That does not work, though because it is not callable and updating cannot be achieved reliably 
+    # because headers can be of different type
+    # from https://docs.aiohttp.org/en/stable/client_reference.html :
+    # "May be either iterable of key-value pairs or Mapping (e.g. dict, CIMultiDict)."
+    # So for now let's create a new ClientSession and use all the instances current attributes 
+    # to update every attr using ClientSession
+    def update_tennant_jwt(self, tennant_jwt): 
+        self.tennant_jwt = tennant_jwt
+        headers = {'Authorization': 'Bearer ' + tennant_jwt, 'content-type': "application/json"}
+        self.client_session: ClientSession = ClientSession(headers=headers)
+
+        if self.connections:
+            self.connections = ConnectionsController(self.admin_url, self.client_session)
+
+        if self.messaging:
+            self.messaging = MessagingController(self.admin_url, self.client_session)
+
+        if self.multitenant:
+            self.multitenant = MultitenancyController(self.admin_url, self.client_session)
+            
+        if self.mediation:
+            self.mediation = MediationController(self.admin_url, self.client_session)
+
+        if self.issuer:
+            self.schema = SchemaController(self.admin_url, self.client_session)
+            self.wallet = WalletController(self.admin_url, self.client_session)
+            self.definitions = DefinitionsController(self.admin_url, self.client_session)
+            self.issuer = IssuerController(self.admin_url, self.client_session, self.connections,
+                                           self.wallet, self.definitions)
+
+        if self.action_menu:
+            self.action_menu = ActionMenuController(self.admin_url, self.client_session)
+
+        if self.revocations:
+            self.revocations = RevocationController(
+                self.admin_url,
+                self.client_session
+            )
+
+
     def register_listeners(self, listeners, defaults=True):
         if defaults:
             if self.connections:

libs/aries-basic-controller/aries_basic_controller/controllers/mediation.py

@@ -20,7 +20,7 @@ def default_handler(self, payload):
 
     # Get default mediator
     async def get_default_mediator(self):
-        return await self.admin_POST(f"{self.base_url}/default-mediator")
+        return await self.admin_GET(f"{self.base_url}/default-mediator")
 
 
     # Clear default mediator
@@ -57,12 +57,12 @@ async def send_keylist_update(self, request, mediation_id: str):
 
 
     # Request mediation from connection
-    async def request_mediation(self, request, conn_id: str):
+    async def request_mediation(self, conn_id: str, request: {} = {}):
         return await self.admin_POST(f"{self.base_url}/request/{conn_id}", json_data=request)
 
 
     # Query mediation requests, returns list of all mediation records
-    async def get_mediation_records(self, mediator_terms: [str], recipient_terms: [str], state: str = None, conn_id: str = None):
+    async def get_mediation_records(self, mediator_terms: [str] = None, recipient_terms: [str] = None, state: str = None, conn_id: str = None):
         params = {}
         if conn_id:
             params["conn_id"] = conn_id
@@ -96,6 +96,6 @@ async def grant_mediation_request_by_id(self, mediation_id: str):
         return await self.admin_POST(f"{self.base_url}/requests/{mediation_id}/grant")
 
 
-    # Grant received mediation request
+    # Set default mediator
     async def set_default_mediator(self, mediation_id: str):
-        return await self.admin_PUT(f"{self.base_url}/requests/{mediation_id}/default-mediator")
+        return await self.admin_PUT(f"{self.base_url}/{mediation_id}/default-mediator")

libs/aries-basic-controller/aries_basic_controller/controllers/multitenant.py

@@ -34,12 +34,12 @@ async def update_subwallet_by_id(self, request, wallet_id: str):
 
 
     # Remove a subwallet
-    async def remove_subwallet_by_id(self, request, wallet_id: str):
+    async def remove_subwallet_by_id(self, wallet_id: str, request=None):
         return await self.admin_POST(f"{self.base_url}/wallet/{wallet_id}/remove", json_data=request)
 
 
     # Get auth token for a subwallet
-    async def get_subwallet_authtoken_by_id(self, request, wallet_id: str):
+    async def get_subwallet_authtoken_by_id(self, wallet_id: str, request=None):
         return await self.admin_POST(f"{self.base_url}/wallet/{wallet_id}/token", json_data=request)
 
 

libs/aries-basic-controller/requirements.txt

@@ -1,4 +1,4 @@
-aiohttp~=3.6.2
+aiohttp~=3.7.3
 asyncio
 prompt_toolkit
 pygments

projects/aries-fl/Dockerfile.hospitalcontroller

@@ -7,8 +7,8 @@ ENV env_jupyter_port=jupyter_port
 
 # Setup workspace environment
 RUN apt-get update && apt-get install -y gcc
-# RUN conda install jupyter notebook=5.7.8
-RUN conda install jupyter notebook=6.1.5
+# RUN conda install -c conda-forge jupyterlab==3.0.11
+RUN conda install -c conda-forge jupyterlab==3.0.11
 
 
 ADD projects/aries-fl/requirements.txt .

projects/aries-fl/Dockerfile.ppmlcontroller

@@ -7,8 +7,8 @@ ENV env_jupyter_port=jupyter_port
 
 # Setup workspace environment
 RUN apt-get update && apt-get install -y gcc
-# RUN conda install jupyter notebook=5.7.8
-RUN conda install jupyter notebook=6.1.5
+# RUN conda install -c conda-forge jupyterlab==3.0.11
+RUN conda install -c conda-forge jupyterlab==3.0.11
 
 
 ADD projects/aries-fl/requirements.txt .