Merge branch 'develop' of https://github.com/credebl/platform into qa

credebl · Feb 27, 2024 · 0395c95 · 0395c95
2 parents 4364dbb + 17af01f
commit 0395c95
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/apps/api-gateway/src/dtos/create-schema.dto.ts b/apps/api-gateway/src/dtos/create-schema.dto.ts
@@ -50,7 +50,7 @@ export class CreateSchemaDto {
                 attributeName: 'name',
                 schemaDataType: 'string',
                 displayName: 'Name',
-                isRequired: 'true'
+                isRequired: true
             }
         ]
     })

diff --git a/apps/api-gateway/src/ecosystem/dtos/request-schema.dto.ts b/apps/api-gateway/src/ecosystem/dtos/request-schema.dto.ts
@@ -53,7 +53,7 @@ export class RequestSchemaDto {
         attributeName: 'name',
         schemaDataType: 'string',
         displayName: 'Name',
-        isRequired: 'true'
+        isRequired: true
       }
     ]
   })

diff --git a/apps/api-gateway/src/verification/dto/request-proof.dto.ts b/apps/api-gateway/src/verification/dto/request-proof.dto.ts
@@ -10,7 +10,7 @@ export class ProofRequestAttribute {
 
     @ValidateIf((obj) => obj.attributeNames === undefined)
     @IsNotEmpty()
-    @IsString({each:true})
+    @IsString()
     attributeName?: string;
 
     @ValidateIf((obj) => obj.attributeName === undefined)

diff --git a/apps/verification/src/interfaces/verification.interface.ts b/apps/verification/src/interfaces/verification.interface.ts
@@ -2,7 +2,8 @@ import { AutoAccept } from "@credebl/enum/enum";
 import { IUserRequest } from "@credebl/user-request/user-request.interface";
 
 interface IProofRequestAttribute {
-    attributeName: string;
+    attributeName?: string;
+    attributeNames?:string[];
     condition?: string;
     value?: string;
     credDefId?: string;

diff --git a/apps/verification/src/verification.service.ts b/apps/verification/src/verification.service.ts
@@ -348,7 +348,10 @@ export class VerificationService {
       ]);
 
       const imageUrl = getOrganization?.logoUrl;
+      const label = getOrganization?.name;
+
       outOfBandRequestProof['imageUrl'] = imageUrl;
+      outOfBandRequestProof['label'] = label;
 
       const orgAgentType = await this.verificationRepository.getOrgAgentType(getAgentDetails?.orgAgentTypeId);
       let apiKey: string = await this.cacheService.get(CommonConstants.CACHE_APIKEY_KEY);
@@ -515,20 +518,21 @@ export class VerificationService {
     requestedPredicates;
   }> {
     try {
-      let requestedAttributes = {};
+      let requestedAttributes = {}; 
       const requestedPredicates = {};
       const {attributes} = proofRequestpayload;
       if (attributes) {
-        requestedAttributes = Object.fromEntries(proofRequestpayload.attributes.map((attribute, index) => {
-
-          const attributeElement = attribute.attributeName;
+        requestedAttributes = Object.fromEntries(attributes.map((attribute, index) => {
+          const attributeElement = attribute.attributeName || attribute.attributeNames;
           const attributeReferent = `additionalProp${index + 1}`;
+          const attributeKey = attribute.attributeName ? 'name' : 'names';
+
           if (!attribute.condition && !attribute.value) {
 
             return [
               attributeReferent,
               {
-                name: attributeElement,
+                [attributeKey]: attributeElement,
                 restrictions: [
                   {
                     cred_def_id: proofRequestpayload.attributes[index].credDefId ? proofRequestpayload.attributes[index].credDefId : undefined,
@@ -541,7 +545,13 @@ export class VerificationService {
             requestedPredicates[attributeReferent] = {
               p_type: attribute.condition,
               name: attributeElement,
-              p_value: parseInt(attribute.value)
+              p_value: parseInt(attribute.value),
+              restrictions: [
+                {
+                  cred_def_id: proofRequestpayload.attributes[index].credDefId ? proofRequestpayload.attributes[index].credDefId : undefined,
+                  schema_id: proofRequestpayload.attributes[index].schemaId
+                }
+              ]
             };
           }