fix: add vp request to return of initiate exchange

energywebfoundation · Jun 2, 2022 · ddecbaf · ddecbaf
1 parent 0dc14d1
commit ddecbaf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/e2e/verifiable-credentials.service.e2e.ts b/e2e/verifiable-credentials.service.e2e.ts
@@ -424,20 +424,22 @@ describe('Verifiable credentials tests', () => {
         }
       );
 
-      const [{ selectResults }] =
-        await verifiableCredentialsService.initiateExchange({
-          type: VC_API_EXCHANGE,
-          url: exchangeUrl,
-        });
+      const {
+        selections: [{ selectResults }],
+      } = await verifiableCredentialsService.initiateExchange({
+        type: VC_API_EXCHANGE,
+        url: exchangeUrl,
+      });
       expect(selectResults.verifiableCredential).toHaveLength(1);
     });
 
     test('continueExchange() should return issued credentials', async () => {
-      const [{ selectResults }] =
-        await verifiableCredentialsService.initiateExchange({
-          type: VC_API_EXCHANGE,
-          url: exchangeUrl,
-        });
+      const {
+        selections: [{ selectResults }],
+      } = await verifiableCredentialsService.initiateExchange({
+        type: VC_API_EXCHANGE,
+        url: exchangeUrl,
+      });
 
       (axios as jest.Mocked<typeof axios>).put.mockImplementationOnce((url) =>
         Promise.resolve({

diff --git a/src/modules/verifiable-credentials/verifiable-credentials-base.service.ts b/src/modules/verifiable-credentials/verifiable-credentials-base.service.ts
@@ -162,7 +162,7 @@ export abstract class VerifiableCredentialsServiceBase {
       (q) => q.type === VpRequestQueryType.presentationDefinition
     )?.credentialQuery as VpRequestPresentationDefinitionQuery[];
 
-    return Promise.all(
+    const selections = await Promise.all(
       credentialQuery.map(async ({ presentationDefinition }) => {
         const selectResults = await this.getCredentialsByDefinition(
           presentationDefinition
@@ -173,6 +173,7 @@ export abstract class VerifiableCredentialsServiceBase {
         };
       })
     );
+    return { vpRequest, selections };
   }
 
   /**