[FIX] - Two topics of webhooks are used for connections (#2749)

* convert to TS and correct condition * commo folder sync * log payload, not entire request * do not include empty string connection_state when checking status * two webhook topics to listen for... the out of band message is completed, then the connection process finishes after. Signed-off-by: Jason Syrotuck <[email protected]> * fix conflict Signed-off-by: Jason Syrotuck <[email protected]> --------- Signed-off-by: Jason Syrotuck <[email protected]>
bcgov · Oct 26, 2023 · 85020a8 · 85020a8
1 parent 33f2050
commit 85020a8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/services/core-api/app/api/verifiable_credentials/models/connection.py b/services/core-api/app/api/verifiable_credentials/models/connection.py
@@ -27,4 +27,8 @@ def find_by_party_guid(cls, party_guid) -> "PartyVerifiableCredentialConnection"
 
     @classmethod
     def find_by_invitation_id(cls, invitation_id) -> "PartyVerifiableCredentialConnection":
-        return cls.query.filter_by(invitation_id=invitation_id).one_or_none()
+        return cls.query.filter_by(invitation_id=invitation_id).one_or_none()
+
+    @classmethod
+    def find_by_connection_id(cls, connection_id) -> "PartyVerifiableCredentialConnection":
+        return cls.query.filter_by(connection_id=connection_id).one_or_none()
diff --git a/services/core-api/app/api/verifiable_credentials/resources/verifiable_credential_webhook.py b/services/core-api/app/api/verifiable_credentials/resources/verifiable_credential_webhook.py
@@ -13,12 +13,23 @@
 PRESENT_PROOF = "present_proof"
 CONNECTIONS = "connections"
 CREDENTIAL_OFFER = "issue_credential"
+OUT_OF_BAND = "out_of_band"
 
 class VerifiableCredentialWebhookResource(Resource, UserMixin):
     @api.doc(description='Endpoint to recieve webhooks from Traction.', params={})
     def post(self, topic):
-        current_app.logger.warning(f"TRACTION WEBHOOK: {request.args}")
+        current_app.logger.warning(f"TRACTION WEBHOOK <topic={topic}>: {request.args}")
         if topic == CONNECTIONS:
+            current_app.logger.warning(f"{request.args.keys()}")
+            connection_id = request.args['connection_id']
+            vc_conn = PartyVerifiableCredentialConnection.query.unbound_unsafe().filter_by(connection_id=connection_id).first()
+            assert vc_conn, f"{connection_id} not found"
+            new_state = request.args["state"]
+            if new_state != vc_conn.connection_state:
+                vc_conn.connection_state=new_state
+                vc_conn.save()
+                current_app.logger.debug(f"Updated party_vc_conn connection_id={connection_id} with state={new_state}")
+        if topic == OUT_OF_BAND:
             invitation_id = request.args.get("invi_msg_id")
             vc_conn = PartyVerifiableCredentialConnection.query.unbound_unsafe().filter_by(invitation_id=invitation_id).first()
             assert vc_conn, f"{invitation_id} not found"
@@ -38,4 +49,4 @@ def post(self, topic):
                 current_app.logger.debug(f"Updated cred_exch_record cred_exch_id={cred_exch_id} with state={new_state}")
 
         else:
-            current_app.logger.info(f"unknown topic={topic} received, payload ={request}")
+            current_app.logger.info(f"unknown topic={topic}")