From e55bcfaa8b8685129c2ca3694b7e3072bb06d465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andra=C5=BE=20Cuderman?= <andraz.cuderman@global.id>
Date: Mon, 8 Nov 2021 09:56:36 +0100
Subject: [PATCH] Demo schema not validated

---
 .../present_proof/dif/pres_exch_handler.py     |  2 +-
 .../present_proof/v2_0/formats/dif/handler.py  | 18 ++++++++++--------
 .../protocols/present_proof/v2_0/routes.py     |  6 ++++--
 demo/runners/faber.py                          |  2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/aries_cloudagent/protocols/present_proof/dif/pres_exch_handler.py b/aries_cloudagent/protocols/present_proof/dif/pres_exch_handler.py
index be33ca5c60..26e9646da8 100644
--- a/aries_cloudagent/protocols/present_proof/dif/pres_exch_handler.py
+++ b/aries_cloudagent/protocols/present_proof/dif/pres_exch_handler.py
@@ -959,7 +959,7 @@ async def filter_schema(
             applicable = False
             for schema in schemas:
                 applicable = self.credential_match_schema(
-                    credential=credential, schema_id=schema.uri
+                    credential=credential, schema_id="https://w3id.org/citizenship#PermanentResident"
                 )
                 if schema.required and not applicable:
                     break
diff --git a/aries_cloudagent/protocols/present_proof/v2_0/formats/dif/handler.py b/aries_cloudagent/protocols/present_proof/v2_0/formats/dif/handler.py
index 937ee4acd0..02697d8dbd 100644
--- a/aries_cloudagent/protocols/present_proof/v2_0/formats/dif/handler.py
+++ b/aries_cloudagent/protocols/present_proof/v2_0/formats/dif/handler.py
@@ -197,14 +197,14 @@ async def create_pres(
                     input_descriptor.constraint.limit_disclosure == "required"
                 )
                 uri_list = []
-                for schema in input_descriptor.schemas:
-                    uri = schema.uri
-                    if schema.required is None:
-                        required = True
-                    else:
-                        required = schema.required
-                    if required:
-                        uri_list.append(uri)
+                # for schema in input_descriptor.schemas:
+                #     uri = schema.uri
+                #     if schema.required is None:
+                #         required = True
+                #     else:
+                #         required = schema.required
+                #     if required:
+                #         uri_list.append(uri)
                 if len(uri_list) == 0:
                     uri_list = None
                 if limit_disclosure:
@@ -297,6 +297,8 @@ async def create_pres(
                     vcrecord_list,
                     vcrecord_ids_set,
                 ) = await self.process_vcrecords_return_list(records, record_ids)
+                # print(records)
+                print(vcrecord_list)
                 record_ids = vcrecord_ids_set
                 credentials_list = credentials_list + vcrecord_list
         except StorageNotFoundError as err:
diff --git a/aries_cloudagent/protocols/present_proof/v2_0/routes.py b/aries_cloudagent/protocols/present_proof/v2_0/routes.py
index 296bbcf9c8..d9494f3d7c 100644
--- a/aries_cloudagent/protocols/present_proof/v2_0/routes.py
+++ b/aries_cloudagent/protocols/present_proof/v2_0/routes.py
@@ -515,8 +515,8 @@ async def present_proof_credentials_list(request: web.BaseRequest):
                         required = True
                     else:
                         required = schema.required
-                    if required:
-                        uri_list.append(uri)
+                    #if required:
+                        #uri_list.append(uri)
                 if len(uri_list) == 0:
                     uri_list = None
                 if limit_disclosure:
@@ -629,6 +629,8 @@ async def present_proof_credentials_list(request: web.BaseRequest):
             outbound_handler,
         )
     credentials = list(indy_credentials) + dif_cred_value_list
+
+    print(credentials)
     return web.json_response(credentials)
 
 
diff --git a/demo/runners/faber.py b/demo/runners/faber.py
index 8fb4022d43..3f3b479de2 100644
--- a/demo/runners/faber.py
+++ b/demo/runners/faber.py
@@ -322,7 +322,7 @@ def generate_proof_request_web_request(
                                                 "uri": "https://www.w3.org/2018/credentials#VerifiableCredential"
                                             },
                                             {
-                                                "uri": "https://w3id.org/citizenship#PermanentResident"
+                                                "uri": "https://w3id.org/test#test"
                                             },
                                         ],
                                         "constraints": {