Merge pull request #1894 from rmnre/fix/SchemasInputDescriptorFilter-deserialization

Fix: SchemasInputDescriptorFilter: broken deserialization renders generated clients unusable

Author: andrewwhitehead

Diff for: aries_cloudagent/protocols/present_proof/dif/pres_exch.py

@@ -237,7 +237,9 @@ def extract_info(self, data, **kwargs):
         """deserialize."""
         new_data = {}
         if isinstance(data, dict):
-            if "oneof_filter" in data:
+            if "uri_groups" in data:
+                return data
+            elif "oneof_filter" in data and isinstance(data["oneof_filter"], list):
                 new_data["oneof_filter"] = True
                 uri_group_list_of_list = []
                 uri_group_list = data.get("oneof_filter")

Diff for: aries_cloudagent/protocols/present_proof/dif/tests/test_pres_exch.py

@@ -395,6 +395,10 @@ def test_schemas_input_desc_filter(self):
         deser_schema_filter = SchemasInputDescriptorFilter.deserialize(
             test_schemas_filter
         )
+        ser_schema_filter = deser_schema_filter.serialize()
+        deser_schema_filter = SchemasInputDescriptorFilter.deserialize(
+            ser_schema_filter
+        )
         assert deser_schema_filter.oneof_filter
         assert deser_schema_filter.uri_groups[0][0].uri == test_schema_list[0][0].get(
             "uri"
@@ -418,6 +422,10 @@ def test_schemas_input_desc_filter(self):
         deser_schema_filter = SchemasInputDescriptorFilter.deserialize(
             test_schemas_filter
         )
+        ser_schema_filter = deser_schema_filter.serialize()
+        deser_schema_filter = SchemasInputDescriptorFilter.deserialize(
+            ser_schema_filter
+        )
         assert deser_schema_filter.oneof_filter
         assert deser_schema_filter.uri_groups[0][0].uri == test_schema_list[0].get(
             "uri"
@@ -428,6 +436,10 @@ def test_schemas_input_desc_filter(self):
         assert isinstance(deser_schema_filter, SchemasInputDescriptorFilter)
 
         deser_schema_filter = SchemasInputDescriptorFilter.deserialize(test_schema_list)
+        ser_schema_filter = deser_schema_filter.serialize()
+        deser_schema_filter = SchemasInputDescriptorFilter.deserialize(
+            ser_schema_filter
+        )
         assert not deser_schema_filter.oneof_filter
         assert deser_schema_filter.uri_groups[0][0].uri == test_schema_list[0].get(
             "uri"