Merge pull request #4 from hyperledger/master

[pull] master from hyperledger:master

Author: JamesKEbert

.github/settings.yml

@@ -0,0 +1,19 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+repository:
+  name: aries-acapy-plugin-toolbox
+  description: Hyperledger Aries
+  homepage: https://wiki.hyperledger.org/display/aries
+  default_branch: master
+  has_downloads: true
+  has_issues: true
+  has_projects: false
+  has_wiki: false
+  archived: false
+  private: false
+  allow_squash_merge: true
+  allow_merge_commit: false
+  allow_rebase_merge: true
+

acapy_plugin_toolbox/basicmessage.py

@@ -21,8 +21,8 @@
     BaseRecord, BaseRecordSchema
 )
 from aries_cloudagent.messaging.valid import INDY_ISO8601_DATETIME
-from aries_cloudagent.protocols.connections.manager import ConnectionManager
-from aries_cloudagent.protocols.problem_report.message import ProblemReport
+from aries_cloudagent.protocols.connections.v1_0.manager import ConnectionManager
+from aries_cloudagent.protocols.problem_report.v1_0.message import ProblemReport
 from aries_cloudagent.storage.error import StorageNotFoundError
 
 from .util import (
@@ -238,7 +238,7 @@ async def handle(self, context: RequestContext, responder: BaseResponder):
 
         connection_mgr = ConnectionManager(context)
         admins = await ConnectionRecord.query(
-            context, post_filter={'their_role': 'admin'}
+            context, post_filter_positive={'their_role': 'admin'}
         )
 
         if not admins:

acapy_plugin_toolbox/connections.py

@@ -10,14 +10,14 @@
 from aries_cloudagent.config.injection_context import InjectionContext
 from aries_cloudagent.core.protocol_registry import ProtocolRegistry
 from aries_cloudagent.messaging.base_handler import BaseHandler, BaseResponder, RequestContext
-from aries_cloudagent.protocols.connections.manager import ConnectionManager
+from aries_cloudagent.protocols.connections.v1_0.manager import ConnectionManager
 from aries_cloudagent.connections.models.connection_record import (
     ConnectionRecord
 )
-from aries_cloudagent.protocols.connections.messages.connection_invitation import (
+from aries_cloudagent.protocols.connections.v1_0.messages.connection_invitation import (
     ConnectionInvitation,
 )
-from aries_cloudagent.protocols.problem_report.message import ProblemReport
+from aries_cloudagent.protocols.problem_report.v1_0.message import ProblemReport
 from aries_cloudagent.storage.error import StorageNotFoundError
 
 from .util import generate_model_schema, admin_only
@@ -153,15 +153,15 @@ async def handle(self, context: RequestContext, responder: BaseResponder):
                 'their_did': context.message.their_did,
             }.items())
         )
-        post_filter = dict(filter(
+        post_filter_positive = dict(filter(
             lambda item: item[1] is not None,
             {
                 'their_role': context.message.role
             }.items()
         ))
         # TODO: Filter on state (needs mapping back to ACA-Py connection states)
         records = await ConnectionRecord.query(
-            context, tag_filter, post_filter
+            context, tag_filter, post_filter_positive
         )
         results = [
             Connection(**conn_record_to_message_repr(record))
@@ -294,7 +294,7 @@ async def handle(self, context: RequestContext, responder: BaseResponder):
         invitation = ConnectionInvitation.from_url(context.message.invitation)
         connection = await connection_mgr.receive_invitation(
             invitation,
-            accept=('auto' if context.message.auto_accept else 'none')
+            auto_accept=context.message.auto_accept
         )
         connection_resp = Connection(**conn_record_to_message_repr(connection))
         await responder.send_reply(connection_resp)

acapy_plugin_toolbox/credential_definitions.py

@@ -11,8 +11,9 @@
 from aries_cloudagent.core.protocol_registry import ProtocolRegistry
 from aries_cloudagent.messaging.base_handler import BaseHandler, BaseResponder, RequestContext
 from aries_cloudagent.messaging.models.base_record import BaseRecord, BaseRecordSchema
-from aries_cloudagent.protocols.problem_report.message import ProblemReport
+from aries_cloudagent.protocols.problem_report.v1_0.message import ProblemReport
 from aries_cloudagent.ledger.base import BaseLedger
+from aries_cloudagent.issuer.base import BaseIssuer
 from aries_cloudagent.storage.error import StorageNotFoundError
 from aries_cloudagent.config.injection_context import InjectionContext
 from aries_cloudagent.messaging.util import canon
@@ -168,6 +169,7 @@ class SendCredDefHandler(BaseHandler):
     async def handle(self, context: RequestContext, responder: BaseResponder):
         """Handle received send cred def request."""
         ledger: BaseLedger = await context.inject(BaseLedger)
+        issuer: BaseIssuer = await context.inject(BaseIssuer)
         # If no schema record, make one
         try:
             schema_record = await SchemaRecord.retrieve_by_schema_id(
@@ -193,8 +195,9 @@ async def handle(self, context: RequestContext, responder: BaseResponder):
 
         try:
             async with ledger:
-                credential_definition_id = await shield(
-                    ledger.send_credential_definition(
+                credential_definition_id, credential_definition = await shield(
+                    ledger.create_and_send_credential_definition(
+                        issuer,
                         context.message.schema_id,
                         tag='{}_{}'.format(
                             schema_record.schema_name,
@@ -210,6 +213,7 @@ async def handle(self, context: RequestContext, responder: BaseResponder):
             await responder.send_reply(report)
             return
 
+        # we may not need to save the record as below
         cred_def_record = CredDefRecord(
             cred_def_id=credential_definition_id,
             schema_id=context.message.schema_id,

acapy_plugin_toolbox/group/all.py

@@ -12,8 +12,10 @@
 from ..issuer import setup as issuer_setup
 from ..basicmessage import setup as basic_message_setup
 from ..taa import setup as taa_setup
-from ..payments import setup as payment_setup
+#from ..payments import setup as payment_setup
 from ..invitations import setup as invitations_setup
+from ..mediator import setup as mediator_setup
+from ..routing import setup as routing_setup
 
 async def setup(context: InjectionContext):
     """Setup Toolbox Plugin."""
@@ -27,5 +29,7 @@ async def setup(context: InjectionContext):
     await issuer_setup(context, protocol_registry)
     await basic_message_setup(context, protocol_registry)
     await taa_setup(context, protocol_registry)
-    await payment_setup(context, protocol_registry)
+#    await payment_setup(context, protocol_registry)
     await invitations_setup(context, protocol_registry)
+    await mediator_setup(context, protocol_registry)
+    await routing_setup(context, protocol_registry)

acapy_plugin_toolbox/holder.py

@@ -4,9 +4,11 @@
 # pylint: disable=too-few-public-methods
 
 from marshmallow import fields
+import json
 
 from aries_cloudagent.config.injection_context import InjectionContext
 from aries_cloudagent.core.protocol_registry import ProtocolRegistry
+from aries_cloudagent.holder.base import BaseHolder
 from aries_cloudagent.messaging.base_handler import BaseHandler, BaseResponder, RequestContext
 from aries_cloudagent.protocols.issue_credential.v1_0.routes import (
     V10CredentialExchangeListResultSchema,
@@ -36,7 +38,7 @@
 
 from aries_cloudagent.connections.models.connection_record import ConnectionRecord
 from aries_cloudagent.storage.error import StorageNotFoundError
-from aries_cloudagent.protocols.problem_report.message import ProblemReport
+from aries_cloudagent.protocols.problem_report.v1_0.message import ProblemReport
 
 from .util import generate_model_schema, admin_only
 PROTOCOL = 'did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-holder/0.1'
@@ -236,10 +238,10 @@ async def handle(self, context: RequestContext, responder: BaseResponder):
     name='CredList',
     handler='acapy_plugin_toolbox.util.PassHandler',
     msg_type=CREDENTIALS_LIST,
-    schema=V10CredentialExchangeListResultSchema
-    # schema={
-    #     'results': fields.List(fields.Dict())
-    # }
+    #schema=V10CredentialExchangeListResultSchema
+    schema={
+        'results': fields.List(fields.Dict())
+    }
 )
 
 
@@ -255,17 +257,31 @@ async def handle(self, context: RequestContext, responder: BaseResponder):
         # cred_list = CredList(results=credentials)
         # await responder.send_reply(cred_list)
 
-        post_filter = dict(
-            filter(lambda item: item[1] is not None, {
-                # 'state': V10CredentialExchange.STATE_CREDENTIAL_RECEIVED,
-                'role': V10CredentialExchange.ROLE_HOLDER,
-                'connection_id': context.message.connection_id,
-                'credential_definition_id': context.message.credential_definition_id,
-                'schema_id': context.message.schema_id
-            }.items())
-        )
-        records = await V10CredentialExchange.query(context, {}, post_filter)
-        cred_list = CredList(results=records)
+        start = 0 #request.query.get("start")
+        count = 10 #request.query.get("count")
+
+        # url encoded json wql
+        encoded_wql = "{}" #request.query.get("wql") or "{}"
+        wql = json.loads(encoded_wql)
+
+        # defaults
+        #start = int(start) if isinstance(start, str) else 0
+        #count = int(count) if isinstance(count, str) else 10
+
+        holder: BaseHolder = await context.inject(BaseHolder)
+        credentials = await holder.get_credentials(start, count, wql)
+
+        # post_filter_positive = dict(
+        #     filter(lambda item: item[1] is not None, {
+        #         # 'state': V10CredentialExchange.STATE_CREDENTIAL_RECEIVED,
+        #         #'role': V10CredentialExchange.ROLE_HOLDER,
+        #         'connection_id': context.message.connection_id,
+        #         'credential_definition_id': context.message.credential_definition_id,
+        #         'schema_id': context.message.schema_id
+        #     }.items())
+        # )
+        # records = await V10CredentialExchange.query(context, {}, post_filter_positive)
+        cred_list = CredList(results=credentials)
         await responder.send_reply(cred_list)
 
 
@@ -297,14 +313,14 @@ class PresGetListHandler(BaseHandler):
     async def handle(self, context: RequestContext, responder: BaseResponder):
         """Handle received get cred list request."""
 
-        post_filter = dict(
+        post_filter_positive = dict(
             filter(lambda item: item[1] is not None, {
                 # 'state': V10PresentialExchange.STATE_CREDENTIAL_RECEIVED,
                 'role': V10PresentationExchange.ROLE_PROVER,
                 'connection_id': context.message.connection_id,
                 'verified': context.message.verified,
             }.items())
         )
-        records = await V10PresentationExchange.query(context, {}, post_filter)
+        records = await V10PresentationExchange.query(context, {}, post_filter_positive)
         cred_list = PresList(results=records)
         await responder.send_reply(cred_list)

acapy_plugin_toolbox/invitations.py

@@ -10,12 +10,12 @@
 from aries_cloudagent.messaging.base_handler import (
     BaseHandler, BaseResponder, RequestContext
 )
-from aries_cloudagent.protocols.connections.manager import ConnectionManager
+from aries_cloudagent.protocols.connections.v1_0.manager import ConnectionManager
 from aries_cloudagent.connections.models.connection_record import (
     ConnectionRecord
 )
 # ProblemReport will probably be needed when a delete message is implemented
-# from aries_cloudagent.protocols.problem_report.message import ProblemReport
+# from aries_cloudagent.protocols.problem_report.v1_0.message import ProblemReport
 from aries_cloudagent.storage.error import StorageNotFoundError
 from aries_cloudagent.messaging.valid import INDY_ISO8601_DATETIME
 
@@ -123,7 +123,7 @@ async def handle(self, context: RequestContext, responder: BaseResponder):
         connection, invitation = await connection_mgr.create_invitation(
             my_label=context.message.label,
             their_role=context.message.role,
-            accept="auto" if context.message.auto_accept else "none",
+            auto_accept=context.message.auto_accept,
             multi_use=bool(context.message.multi_use),
             public=False,
             alias=context.message.alias,
@@ -161,7 +161,7 @@ async def handle(self, context: RequestContext, responder: BaseResponder):
 
             }.items())
         )
-        post_filter = dict(filter(
+        post_filter_positive = dict(filter(
             lambda item: item[1] is not None,
             {
                 'state': 'invitation',
@@ -170,7 +170,7 @@ async def handle(self, context: RequestContext, responder: BaseResponder):
             }.items()
         ))
         records = await ConnectionRecord.query(
-            context, tag_filter, post_filter
+            context, tag_filter, post_filter_positive
         )
         results = []
         for connection in records:

acapy_plugin_toolbox/issuer.py

@@ -30,7 +30,7 @@
 )
 from aries_cloudagent.protocols.present_proof.v1_0.routes import (
     V10PresentationExchangeListSchema,
-    V10PresentationRequestRequestSchema
+    V10PresentationSendRequestRequestSchema
 )
 from aries_cloudagent.protocols.present_proof.v1_0.models.presentation_exchange import (
     V10PresentationExchange,
@@ -41,7 +41,7 @@
 from aries_cloudagent.protocols.issue_credential.v1_0.manager import CredentialManager
 from aries_cloudagent.connections.models.connection_record import ConnectionRecord
 from aries_cloudagent.storage.error import StorageNotFoundError
-from aries_cloudagent.protocols.problem_report.message import ProblemReport
+from aries_cloudagent.protocols.problem_report.v1_0.message import ProblemReport
 
 from .util import generate_model_schema, admin_only
 PROTOCOL = 'did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/admin-issuer/0.1'
@@ -161,7 +161,7 @@ async def handle(self, context: RequestContext, responder: BaseResponder):
     name='RequestPres',
     handler='acapy_plugin_toolbox.issuer.RequestPresHandler',
     msg_type=REQUEST_PRESENTATION,
-    schema=V10PresentationRequestRequestSchema,
+    schema=V10PresentationSendRequestRequestSchema,
 )
 IssuerPresExchange, IssuerPresExchangeSchema = generate_model_schema(
     name='IssuerPresExchange',
@@ -260,7 +260,7 @@ class CredGetListHandler(BaseHandler):
     async def handle(self, context: RequestContext, responder: BaseResponder):
         """Handle received get cred list request."""
 
-        post_filter = dict(
+        post_filter_positive = dict(
             filter(lambda item: item[1] is not None, {
                 # 'state': V10CredentialExchange.STATE_ISSUED,
                 'role': V10CredentialExchange.ROLE_ISSUER,
@@ -269,7 +269,7 @@ async def handle(self, context: RequestContext, responder: BaseResponder):
                 'schema_id': context.message.schema_id
             }.items())
         )
-        records = await V10CredentialExchange.query(context, {}, post_filter)
+        records = await V10CredentialExchange.query(context, {}, post_filter_positive)
         cred_list = CredList(results=records)
         await responder.send_reply(cred_list)
 
@@ -302,14 +302,14 @@ class PresGetListHandler(BaseHandler):
     async def handle(self, context: RequestContext, responder: BaseResponder):
         """Handle received get cred list request."""
 
-        post_filter = dict(
+        post_filter_positive = dict(
             filter(lambda item: item[1] is not None, {
                 # 'state': V10PresentialExchange.STATE_CREDENTIAL_RECEIVED,
                 'role': V10PresentationExchange.ROLE_VERIFIER,
                 'connection_id': context.message.connection_id,
                 'verified': context.message.verified,
             }.items())
         )
-        records = await V10PresentationExchange.query(context, {}, post_filter)
+        records = await V10PresentationExchange.query(context, {}, post_filter_positive)
         cred_list = PresList(results=records)
         await responder.send_reply(cred_list)