Merge pull request openwallet-foundation#4 from shaangill025/pr#1938_updates

PR#1970 revert updates + int test fix

Author: ianco

aries_cloudagent/core/conductor.py

@@ -26,7 +26,6 @@
 from ..config.logging import LoggingConfigurator
 from ..config.provider import ClassProvider
 from ..config.wallet import wallet_config
-from ..connections.models.conn_record import ConnRecord
 from ..core.profile import Profile
 from ..indy.verifier import IndyVerifier
 from ..ledger.base import BaseLedger
@@ -451,33 +450,23 @@ async def start(self) -> None:
                         if mediation_connections_invite
                         else OutOfBandManager(self.root_profile)
                     )
-                    async with self.root_profile.session() as session:
-                        invitation = invitation_handler.from_url(
+                    record = await mgr.receive_invitation(
+                        invitation=invitation_handler.from_url(
                             mediation_invite_record.invite
-                        )
-                        if isinstance(mgr, OutOfBandManager):
-                            oob_record = await mgr.receive_invitation(
-                                invitation=invitation,
-                                auto_accept=True,
-                            )
-                            conn_record = await ConnRecord.retrieve_by_id(
-                                session, oob_record.connection_id
-                            )
-                        else:
-                            conn_record = await mgr.receive_invitation(
-                                invitation=invitation,
-                                auto_accept=True,
-                            )
+                        ),
+                        auto_accept=True,
+                    )
+                    async with self.root_profile.session() as session:
                         await (
                             MediationInviteStore(
                                 session.context.inject(BaseStorage)
                             ).mark_default_invite_as_used()
                         )
 
-                        await conn_record.metadata_set(
+                        await record.metadata_set(
                             session, MediationManager.SEND_REQ_AFTER_CONNECTION, True
                         )
-                        await conn_record.metadata_set(
+                        await record.metadata_set(
                             session, MediationManager.SET_TO_DEFAULT_ON_GRANTED, True
                         )
 

aries_cloudagent/core/tests/test_conductor.py

@@ -24,6 +24,7 @@
 from ...protocols.coordinate_mediation.v1_0.models.mediation_record import (
     MediationRecord,
 )
+from ...protocols.out_of_band.v1_0.models.oob_record import OobRecord
 from ...resolver.did_resolver import DIDResolver
 from ...multitenant.base import BaseMultitenantManager
 from ...multitenant.manager import MultitenantManager
@@ -1172,8 +1173,13 @@ async def test_mediator_invitation_0434(self, mock_from_url, _):
         )
         conn_record.accept = ConnRecord.ACCEPT_MANUAL
         await conn_record.save(await conductor.root_profile.session())
-        oob_record = async_mock.MagicMock(
+        invitation = test_module.InvitationMessage()
+        oob_record = OobRecord(
+            invitation=invitation,
+            invi_msg_id=invitation._id,
+            role=OobRecord.ROLE_RECEIVER,
             connection_id=conn_record.connection_id,
+            state=OobRecord.STATE_INITIAL,
         )
         with async_mock.patch.object(
             test_module,
@@ -1194,6 +1200,7 @@ async def test_mediator_invitation_0434(self, mock_from_url, _):
             await conductor.start()
             await conductor.stop()
             mock_from_url.assert_called_once_with("test-invite")
+            mock_mgr.return_value.receive_invitation.assert_called_once()
 
     @async_mock.patch.object(test_module, "MediationInviteStore")
     @async_mock.patch.object(test_module.ConnectionInvitation, "from_url")