Merge branch 'main' into filter-reg-created

Author: ianco

aries_cloudagent/holder/routes.py

@@ -274,6 +274,8 @@ async def credentials_remove(request: web.BaseRequest):
         async with context.profile.session() as session:
             holder = session.inject(IndyHolder)
             await holder.delete_credential(credential_id)
+        topic = "acapy::record::credential::delete"
+        await context.profile.notify(topic, {"id": credential_id, "state": "deleted"})
     except WalletNotFoundError as err:
         raise web.HTTPNotFound(reason=err.roll_up) from err
 
@@ -376,6 +378,10 @@ async def w3c_cred_remove(request: web.BaseRequest):
         try:
             vc_record = await holder.retrieve_credential_by_id(credential_id)
             await holder.delete_credential(vc_record)
+            topic = "acapy::record::w3c_credential::delete"
+            await session.profile.notify(
+                topic, {"id": credential_id, "state": "deleted"}
+            )
         except StorageNotFoundError as err:
             raise web.HTTPNotFound(reason=err.roll_up) from err
         except StorageError as err:

aries_cloudagent/messaging/models/base_record.py

@@ -418,8 +418,11 @@ async def delete_record(self, session: ProfileSession):
 
         if self._id:
             storage = session.inject(BaseStorage)
+            if self.state:
+                self._previous_state = self.state
+                self.state = "deleted"
+                await self.emit_event(session, self.serialize())
             await storage.delete_record(self.storage_record)
-        # FIXME - update state and send webhook?
 
     async def emit_event(self, session: ProfileSession, payload: Any = None):
         """

aries_cloudagent/protocols/out_of_band/v1_0/tests/test_manager.py

@@ -1321,7 +1321,8 @@ async def test_receive_invitation_connection_protocol(self):
             ]
             assert not invitation.routing_keys
 
-            assert oob_record.state == OobRecord.STATE_DONE
+            assert oob_record.state == "deleted"
+            assert oob_record._previous_state == OobRecord.STATE_DONE
 
     async def test_receive_invitation_services_with_neither_service_blocks_nor_dids(
         self,