Resolve credential offer is throwing an error (#836)

* fix. update controller

* fix: update usecases

* fix: get rid of more anys

* fix: properly parse message

Author: jkoenig134

packages/consumption/src/modules/openid4vc/OpenId4VcController.ts

@@ -9,7 +9,7 @@ export class OpenId4VcController extends ConsumptionBaseController {
         super(ConsumptionControllerName.OpenId4VcController, parent);
     }
 
-    public async fetchCredentialOffer(credentialOfferUrl: string): Promise<any> {
+    public async fetchCredentialOffer(credentialOfferUrl: string): Promise<{ data: string }> {
         const holder = new Holder(this.parent.accountController, this.parent.attributes);
         await holder.initializeAgent("96213c3d7fc8d4d6754c7a0fd969598e");
         const res = await holder.resolveCredentialOffer(credentialOfferUrl);
@@ -40,19 +40,25 @@ export class OpenId4VcController extends ConsumptionBaseController {
         };
     }
 
-    public async processCredentialOffer(credentialOffer: string): Promise<any> {
+    public async processCredentialOffer(credentialOffer: string): Promise<{ data: string; id: string; type: string; displayInformation: string | undefined }> {
         const holder = new Holder(this.parent.accountController, this.parent.attributes);
         await holder.initializeAgent("96213c3d7fc8d4d6754c7a0fd969598e");
         const res = await holder.resolveCredentialOffer(credentialOffer);
-        const credentials = await holder.requestAndStoreCredentials(res, { credentialsToRequest: ["EmployeeIdCard-sdjwt"] });
+        const credentials = await holder.requestAndStoreCredentials(res, { credentialsToRequest: Object.keys(res.offeredCredentialConfigurations) });
+
+        // TODO: support multiple credentials
+        const credential = credentials[0].content.value as VerifiableCredential;
 
         return {
-            id: credentials.length > 0 ? credentials[0].id : undefined,
-            data: JSON.stringify(credentials)
+            data: credential.value,
+            // multi credentials not supported yet
+            id: credentials[0].id.toString(),
+            type: credential.type,
+            displayInformation: credential.displayInformation
         };
     }
 
-    public async fetchProofRequest(proofRequestUrl: string): Promise<any> {
+    public async fetchProofRequest(proofRequestUrl: string): Promise<{ data: string }> {
         const holder = new Holder(this.parent.accountController, this.parent.attributes);
         await holder.initializeAgent("96213c3d7fc8d4d6754c7a0fd969598e");
         const res = await holder.resolveProofRequest(proofRequestUrl);
@@ -61,17 +67,16 @@ export class OpenId4VcController extends ConsumptionBaseController {
         };
     }
 
-    public async acceptProofRequest(jsonEncodedRequest: string): Promise<any> {
+    public async acceptProofRequest(jsonEncodedRequest: string): Promise<{ status: number; message: string | Record<string, unknown> | null }> {
         const holder = new Holder(this.parent.accountController, this.parent.attributes);
         await holder.initializeAgent("96213c3d7fc8d4d6754c7a0fd969598e");
         const fetchedRequest = JSON.parse(jsonEncodedRequest);
         // parse the credential type to be sdjwt
 
         const serverResponse = await holder.acceptPresentationRequest(fetchedRequest);
-        return {
-            status: serverResponse.status,
-            message: serverResponse.body
-        };
+        if (!serverResponse) throw new Error("No response from server");
+
+        return { status: serverResponse.status, message: serverResponse.body };
     }
 
     public async getVerifiableCredentials(ids: string[] | undefined): Promise<any[]> {

packages/consumption/src/modules/openid4vc/local/Holder.ts

@@ -15,6 +15,7 @@ import {
 import {
     OpenId4VcModule,
     OpenId4VciAuthorizationFlow,
+    OpenId4VciDpopRequestOptions,
     authorizationCodeGrantIdentifier,
     preAuthorizedCodeGrantIdentifier,
     type OpenId4VciMetadata,
@@ -66,7 +67,29 @@ export class Holder extends BaseAgent<ReturnType<typeof getOpenIdHolderModules>>
         return await this.agent.openid4vc.holder.resolveIssuerMetadata(credentialIssuer);
     }
 
-    public async initiateAuthorization(resolvedCredentialOffer: OpenId4VciResolvedCredentialOffer, credentialsToRequest: string[]): Promise<any> {
+    public async initiateAuthorization(
+        resolvedCredentialOffer: OpenId4VciResolvedCredentialOffer,
+        credentialsToRequest: string[]
+    ): Promise<
+        | {
+              readonly authorizationFlow: "PreAuthorized";
+              readonly preAuthorizedCode: string;
+          }
+        | {
+              readonly authorizationFlow: "PresentationDuringIssuance";
+              readonly openid4vpRequestUrl: string;
+              readonly authSession: string;
+              readonly dpop?: OpenId4VciDpopRequestOptions;
+              readonly preAuthorizedCode?: undefined;
+          }
+        | {
+              readonly authorizationFlow: "Oauth2Redirect";
+              readonly authorizationRequestUrl: string;
+              readonly codeVerifier?: string;
+              readonly dpop?: OpenId4VciDpopRequestOptions;
+              readonly preAuthorizedCode?: undefined;
+          }
+    > {
         const grants = resolvedCredentialOffer.credentialOfferPayload.grants;
         if (grants?.[preAuthorizedCodeGrantIdentifier]) {
             return {
@@ -232,13 +255,23 @@ export class Holder extends BaseAgent<ReturnType<typeof getOpenIdHolderModules>>
         return storedCredentials;
     }
 
-    public async resolveProofRequest(proofRequest: string): Promise<any> {
+    public async resolveProofRequest(proofRequest: string): Promise<OpenId4VpResolvedAuthorizationRequest> {
         const resolvedProofRequest = await this.agent.openid4vc.holder.resolveOpenId4VpAuthorizationRequest(proofRequest);
 
         return resolvedProofRequest;
     }
 
-    public async acceptPresentationRequest(resolvedPresentationRequest: OpenId4VpResolvedAuthorizationRequest): Promise<any> {
+    public async acceptPresentationRequest(resolvedPresentationRequest: OpenId4VpResolvedAuthorizationRequest): Promise<
+        | {
+              readonly status: number;
+              readonly body: string | Record<string, unknown> | null;
+          }
+        | {
+              readonly status: number;
+              readonly body: Record<string, unknown>;
+          }
+        | undefined
+    > {
         if (!resolvedPresentationRequest.presentationExchange && !resolvedPresentationRequest.dcql) {
             throw new Error("Missing presentation exchange or dcql on resolved authorization request");
         }
@@ -293,12 +326,11 @@ export class Holder extends BaseAgent<ReturnType<typeof getOpenIdHolderModules>>
         return submissionResult.serverResponse;
     }
 
-    public async exit(): Promise<any> {
+    public async exit(): Promise<void> {
         await this.shutdown();
-        process.exit(0);
     }
 
-    public async restart(): Promise<any> {
+    public async restart(): Promise<void> {
         await this.shutdown();
     }
 }

packages/runtime/src/useCases/consumption/openid4vc/AcceptProofRequestUseCase.ts

@@ -24,6 +24,6 @@ export class AcceptProofRequestUseCase extends UseCase<AcceptProofRequestRequest
 
     protected override async executeInternal(request: AcceptProofRequestRequest): Promise<Result<AcceptProofRequestDTO>> {
         const result = await this.openId4VcContoller.acceptProofRequest(request.jsonEncodedRequest);
-        return Result.ok({ status: result.status, message: result.success } as AcceptProofRequestDTO);
+        return Result.ok({ status: result.status, message: JSON.stringify(result.message) } as AcceptProofRequestDTO);
     }
 }

packages/runtime/src/useCases/consumption/openid4vc/FetchCredentialOfferUseCase.ts

@@ -10,7 +10,7 @@ export interface FetchCredentialOfferRequest {
 
 class Validator extends SchemaValidator<FetchCredentialOfferRequest> {
     public constructor(@Inject schemaRepository: SchemaRepository) {
-        super(schemaRepository.getSchema("ResolveCredentialOfferRequest"));
+        super(schemaRepository.getSchema("FetchCredentialOfferRequest"));
     }
 }
 

packages/runtime/src/useCases/consumption/openid4vc/ResolveCredentialOfferUseCase.ts

@@ -24,6 +24,6 @@ export class ResolveCredentialOfferUseCase extends UseCase<ResolveCredentialOffe
 
     protected override async executeInternal(request: ResolveCredentialOfferRequest): Promise<Result<VerifiableCredentialDTO>> {
         const result = await this.openId4VcContoller.processCredentialOffer(request.credentialOfferUrl);
-        return Result.ok({ id: result.value.id, data: result.value.data } as VerifiableCredentialDTO);
+        return Result.ok(result);
     }
 }