fix: check groupnames

packages/core/src/modules/proofs/services/ProofService.ts

@@ -254,6 +254,9 @@ export class ProofService {
       comment?: string
     }
   ): Promise<ProofProtocolMsgReturnType<RequestPresentationMessage>> {
+    // Check if Attribute names match Predicate names
+    this.checkAttributePredicateMatch(proofRequest)
+
     // Assert
     proofRecord.assertState(ProofState.ProposalReceived)
 
@@ -299,6 +302,9 @@ export class ProofService {
   ): Promise<ProofProtocolMsgReturnType<RequestPresentationMessage>> {
     this.logger.debug(`Creating proof request`)
 
+    // Check if Attribute names match Predicate names
+    this.checkAttributePredicateMatch(proofRequest)
+
     // Assert
     connectionRecord?.assertReady()
 
@@ -360,6 +366,9 @@ export class ProofService {
     }
     await validateOrReject(proofRequest)
 
+    // Check if Attribute names match Predicate names
+    this.checkAttributePredicateMatch(proofRequest)
+
     this.logger.debug('received proof request', proofRequest)
 
     try {
@@ -1037,6 +1046,16 @@ export class ProofService {
 
     return credentialDefinitions
   }
+
+  public checkAttributePredicateMatch(proofRequest: ProofRequest) {
+    for (const attribute of proofRequest.requestedAttributes.keys()) {
+      for (const predicate of proofRequest.requestedPredicates.keys()) {
+        if (attribute === predicate) {
+          throw new AriesFrameworkError(`The proof request contains attributes that match the predicates: ${attribute}`)
+        }
+      }
+    }
+  }
 }
 
 export interface ProofRequestTemplate {

packages/core/tests/proofs.test.ts

@@ -331,4 +331,40 @@ describe('Present Proof', () => {
       presentationMessage: expect.any(PresentationMessage),
     })
   })
+
+  test('Faber starts with proof request to Alice, but the attributes match with the predicates', async () => {
+    // Age attribute
+    const attributes = {
+      age: new ProofAttributeInfo({
+        name: 'age',
+        restrictions: [
+          new AttributeFilter({
+            credentialDefinitionId: credDefId,
+          }),
+        ],
+      }),
+    }
+
+    // Age predicate
+    const predicates = {
+      age: new ProofPredicateInfo({
+        name: 'age',
+        predicateType: PredicateType.GreaterThanOrEqualTo,
+        predicateValue: 50,
+        restrictions: [
+          new AttributeFilter({
+            credentialDefinitionId: credDefId,
+          }),
+        ],
+      }),
+    }
+
+    await expect(
+      faberAgent.proofs.requestProof(faberConnection.id, {
+        name: 'test-proof-request',
+        requestedAttributes: attributes,
+        requestedPredicates: predicates,
+      })
+    ).rejects.toThrowError(`The proof request contains attributes that match the predicates: age`)
+  })
 })