Merge branch 'main' into fix/askar-memory

Author: dbluhm

aries_cloudagent/core/profile.py

@@ -315,14 +315,14 @@ def __init__(self):
 
     def provide(self, settings: BaseSettings, injector: BaseInjector):
         """Create the profile manager instance."""
+        mgr_type = settings.get_value("wallet.type", default="in_memory")
 
-        mgr_type = settings.get_value("wallet.type", default="in_memory").lower()
-        if mgr_type == "basic":
+        if mgr_type.lower() == "basic":
             # map previous value
             mgr_type = "in_memory"
 
         # mgr_type may be a fully qualified class name
-        mgr_class = self.MANAGER_TYPES.get(mgr_type, mgr_type)
+        mgr_class = self.MANAGER_TYPES.get(mgr_type.lower(), mgr_type)
 
         if mgr_class not in self._inst:
             LOGGER.info("Create profile manager: %s", mgr_type)

aries_cloudagent/protocols/didexchange/v1_0/manager.py

@@ -477,7 +477,10 @@ async def receive_request(
             conn_rec.their_did = request.did
             conn_rec.state = ConnRecord.State.REQUEST.rfc23
             conn_rec.request_id = request._id
-
+            async with self.profile.session() as session:
+                await conn_rec.save(
+                    session, reason="Received connection request from invitation"
+                )
         else:
             # request is against implicit invitation on public DID
             async with self.profile.session() as session:

aries_cloudagent/protocols/out_of_band/v1_0/routes.py

@@ -9,7 +9,6 @@
 from marshmallow.exceptions import ValidationError
 
 from ....admin.request_context import AdminRequestContext
-from ....connections.models.conn_record import ConnRecordSchema
 from ....messaging.models.base import BaseModelError
 from ....messaging.models.openapi import OpenAPISchema
 from ....messaging.valid import UUID4
@@ -22,6 +21,7 @@
 from .messages.invitation import HSProto, InvitationMessage, InvitationMessageSchema
 from .message_types import SPEC_URI
 from .models.invitation import InvitationRecordSchema
+from .models.oob_record import OobRecordSchema
 
 LOGGER = logging.getLogger(__name__)
 
@@ -188,7 +188,7 @@ async def invitation_create(request: web.BaseRequest):
 )
 @querystring_schema(InvitationReceiveQueryStringSchema())
 @request_schema(InvitationMessageSchema())
-@response_schema(ConnRecordSchema(), 200, description="")
+@response_schema(OobRecordSchema(), 200, description="")
 async def invitation_receive(request: web.BaseRequest):
     """
     Request handler for receiving a new connection invitation.