Merge pull request #124 from velocitycareerlabs/VL-8115-fxes

fixes
velocitycareerlabs · Jul 14, 2024 · c0da720 · c0da720
2 parents c468967 + dd2cbc1
commit c0da720
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 34 deletions.
diff --git a/packages/sample-app/src/repositories/GetCredentialManifestByDeepLinkRepository.ts b/packages/sample-app/src/repositories/GetCredentialManifestByDeepLinkRepository.ts
@@ -9,12 +9,13 @@ import fetcher from "../network/Fetcher";
 import { Dictionary } from "../Types";
 
 export const getCredentialManifestByDeepLink = async (
-    deepLink: Dictionary<any>
+    deepLink: Dictionary<any>,
+    didJwk: Dictionary<any>
 ): Promise<Dictionary<any>> => {
     const config = {
         url: Urls.getCredentialManifest,
         method: 'POST',
-        data: deepLink,
+        data: { deepLink, didJwk }
     };
     return await fetcher(config);
 }
diff --git a/packages/sample-app/src/repositories/PresentationRequestRepository.ts b/packages/sample-app/src/repositories/PresentationRequestRepository.ts
@@ -9,12 +9,13 @@ import fetcher from "../network/Fetcher";
 import Urls from "../network/Urls";
 
 export const getPresentationRequest = async (
-    deepLink: Dictionary<any>
+    deepLink: Dictionary<any>,
+    didJwk: Dictionary<any>
 ): Promise<Dictionary<any>> => {
     const config = {
         url: Urls.getPresentationRequest,
         method: 'POST',
-        data: deepLink,
+        data: { deepLink, didJwk }
     };
     return await fetcher(config);
 }
diff --git a/packages/sample-app/src/screens/MeinScreen.tsx b/packages/sample-app/src/screens/MeinScreen.tsx
@@ -37,7 +37,7 @@ const initialization = async () => {
             remoteCryptoServicesToken: null
         });
     }
-    console.log('didJwk: ', didJwk);
+    console.log('didJwk: ', didJwk); // Should be managed by the consumer
 };
 
 // @ts-ignore
@@ -68,7 +68,10 @@ const onGetCredentialTypeSchemas = () => {
 };
 
 const onGetPresentationRequest = () => {
-    getPresentationRequest({value: Constants.PresentationRequestDeepLinkStrDev} )
+    getPresentationRequest(
+        {value: Constants.PresentationRequestDeepLinkStrDev},
+        didJwk
+    )
         .then((presentationRequest) => {
         console.log('presentation request: ', presentationRequest);
             onSubmitPresentation(presentationRequest);
@@ -92,7 +95,8 @@ const onSubmitPresentation = (presentationRequest: Dictionary<any>) => {
 
 const onGetCredentialManifestByDeepLink = () => {
     getCredentialManifestByDeepLink(
-        { value: Constants.CredentialManifestDeepLinkStrDev }
+        { value: Constants.CredentialManifestDeepLinkStrDev },
+        didJwk
     ).then((credentialManifest) => {
         console.log('credential manifest: ', credentialManifest);
         onGenerateOffers(credentialManifest);

diff --git a/packages/sample-server/src/plugins/VclSdkPlugin.ts b/packages/sample-server/src/plugins/VclSdkPlugin.ts
@@ -6,7 +6,7 @@
  */
 import fastifyPlugin from "fastify-plugin";
 import {
-    VCLCryptoServicesDescriptor, VCLDidJwkDescriptor,
+    VCLCryptoServicesDescriptor,
     VCLInitializationDescriptor,
     VCLProvider
 } from "@velocitycareerlabs/vnf-nodejs-wallet-sdk/src";
@@ -29,22 +29,12 @@ const vclSdkPlugin = async (fastify) => {
     try {
         await vclSdk.initialize(initializationDescriptor)
         console.log('VCL SDK initialized successfully');
-        try {
-            const didJwk = await vclSdk.generateDidJwk(new VCLDidJwkDescriptor())
-            console.log(`DID JWK generated successfully: ${JSON.stringify(didJwk)}`);
-            fastify.decorate('vclSdk', vclSdk);
-            fastify.decorate('didJwk', didJwk);
-            const addHooks = async (req, reply) => {
-                req.vclSdk = vclSdk;
-                req.didJwk = didJwk;
-                reply.vclSdk = vclSdk;
-                reply.didJwk = didJwk;
-            };
-            fastify.addHook('preHandler', addHooks);
-        } catch (e) {
-            console.error('Failed to generate DID JWK', e);
-            throw e;
-        }
+        fastify.decorate('vclSdk', vclSdk);
+        const addHooks = async (req, reply) => {
+            req.vclSdk = vclSdk;
+            reply.vclSdk = vclSdk;
+        };
+        fastify.addHook('preHandler', addHooks);
     } catch (e) {
         console.error('Failed to initialize VCL SDK', e);
         throw e;

diff --git a/packages/sample-server/src/routes/Inspection.ts b/packages/sample-server/src/routes/Inspection.ts
@@ -16,7 +16,7 @@ export default async function inspectionRoutes(fastify) {
         "/getPresentationRequest",
         async (req, reply) => {
             reply.send(
-                await req.vclSdk.getPresentationRequest(presentationRequestDescriptorFrom(req.body, req.didJwk))
+                await req.vclSdk.getPresentationRequest(presentationRequestDescriptorFrom(req.body))
             );
         }
     );

diff --git a/packages/sample-server/src/utils/Converter.ts b/packages/sample-server/src/utils/Converter.ts
@@ -8,33 +8,34 @@
 import {
     Dictionary,
     issuingTypeFromString,
+    Nullish,
     VCLCredentialManifest,
     VCLCredentialManifestDescriptor,
     VCLCredentialManifestDescriptorByDeepLink,
     VCLCredentialManifestDescriptorByService,
     VCLCredentialManifestDescriptorRefresh,
+    VCLCredentialTypesUIFormSchemaDescriptor,
     VCLDeepLink,
     VCLDidJwk,
+    VCLDidJwkDescriptor,
     VCLExchange,
     VCLFilter,
+    VCLFinalizeOffersDescriptor,
     VCLGenerateOffersDescriptor,
     VCLIssuingType,
     VCLJwt,
+    VCLJwtDescriptor,
     VCLOrganizationsSearchDescriptor,
     VCLPresentationRequest,
     VCLPresentationRequestDescriptor,
     VCLPresentationSubmission,
+    VCLPublicJwk,
     VCLServiceCredentialAgentIssuer,
     VCLSubmissionResult,
     VCLToken,
     VCLVerifiableCredential,
     VCLVerifiedProfile,
-    VCLFinalizeOffersDescriptor,
-    VCLCredentialTypesUIFormSchemaDescriptor,
-    VCLVerifiedProfileDescriptor,
-    VCLPublicJwk,
-    VCLJwtDescriptor,
-    VCLDidJwkDescriptor, Nullish
+    VCLVerifiedProfileDescriptor
 } from "@velocitycareerlabs/vnf-nodejs-wallet-sdk/src";
 
 export const deepLinkFrom = (deepLink: any): VCLDeepLink => {
@@ -58,8 +59,9 @@ export const didJwkFrom = (json: Dictionary<any>): VCLDidJwk => {
     return VCLDidJwk.fromJSON(json);
 }
 
-export const presentationRequestDescriptorFrom = (json: Dictionary<any>, didJwk: VCLDidJwk): VCLPresentationRequestDescriptor => {
-    const deepLink = deepLinkFrom(json)
+export const presentationRequestDescriptorFrom = (json: Dictionary<any>): VCLPresentationRequestDescriptor => {
+    const deepLink = deepLinkFrom(json.deepLink);
+    const didJwk = didJwkFrom(json.didJwk);
     return new VCLPresentationRequestDescriptor(
         deepLink,
         null,
@@ -134,7 +136,7 @@ const credentialManifestDescriptorRefreshFrom = (json: Dictionary<any>): VCLCred
 export const credentialManifestDescriptorFrom = (json: Dictionary<any>): VCLCredentialManifestDescriptor => {
     return json.credentialIds ? credentialManifestDescriptorRefreshFrom(json) : (
         json.service ? credentialManifestDescriptorByServiceFrom(json) : credentialManifestDescriptorByDeepLinkFrom(json)
-    )
+    );
 }
 
 export const credentialManifestFrom = (json: Dictionary<any>): VCLCredentialManifest => {