chore: refactor authorization challenge code error handling

packages/client/lib/OpenID4VCIClient.ts

@@ -3,7 +3,7 @@ import {
   AccessTokenRequestOpts,
   AccessTokenResponse,
   Alg,
-  AuthorizationChallengeCodeResponse,
+  AuthorizationChallengeCodeResponse, AuthorizationChallengeErrorResponse,
   AuthorizationChallengeRequestOpts,
   AuthorizationRequestOpts,
   AuthorizationResponse,
@@ -33,7 +33,6 @@ import {
   NotificationResponseResult,
   OID4VCICredentialFormat,
   OpenId4VCIVersion,
-  OpenIDResponse,
   PKCEOpts,
   ProofOfPossessionCallbacks,
   toAuthorizationResponsePayload
@@ -276,17 +275,22 @@ export class OpenID4VCIClient {
     this._state.pkce = generateMissingPKCEOpts({ ...this._state.pkce, ...pkce });
   }
 
-  public async acquireAuthorizationChallengeCode(opts?: AuthorizationChallengeRequestOpts): Promise<OpenIDResponse<AuthorizationChallengeCodeResponse>> { //AuthorizationChallengeErrorResponse
+  public async acquireAuthorizationChallengeCode(opts?: AuthorizationChallengeRequestOpts): Promise<AuthorizationChallengeCodeResponse> {
     const response = await acquireAuthorizationChallengeAuthCode({
       clientId: this._state.clientId ?? this._state.authorizationRequestOpts?.clientId,
       ...opts
     })
 
-    if (!this._state.authorizationCodeResponse) {
-      this._state.authorizationCodeResponse = response.successBody;
+    if (response.errorBody) {
+      debug(`Authorization code error:\r\n${JSON.stringify(response.errorBody)}`);
+      const error = response.errorBody as AuthorizationChallengeErrorResponse
+      return Promise.reject(error)
+    } else if (!response.successBody) {
+      debug(`Authorization code error. No success body`);
+      return Promise.reject(Error(`Retrieving an authorization code token from ${this._state.endpointMetadata?.authorization_challenge_endpoint} for issuer ${this.getIssuer()} failed as there was no success response body`))
     }
 
-    return response
+    return { ...response.successBody }
   }
 
   public async acquireAccessToken(

packages/client/lib/OpenID4VCIClientV1_0_11.ts

@@ -28,7 +28,6 @@ import {
   KID_JWK_X5C_ERROR,
   OID4VCICredentialFormat,
   OpenId4VCIVersion,
-  OpenIDResponse,
   PKCEOpts,
   ProofOfPossessionCallbacks,
   toAuthorizationResponsePayload
@@ -37,13 +36,13 @@ import { CredentialFormat } from '@sphereon/ssi-types';
 import Debug from 'debug';
 
 import { AccessTokenClientV1_0_11 } from './AccessTokenClientV1_0_11';
+import { acquireAuthorizationChallengeAuthCode } from './AuthorizationCodeClient'
 import { createAuthorizationRequestUrlV1_0_11 } from './AuthorizationCodeClientV1_0_11';
 import { CredentialOfferClientV1_0_11 } from './CredentialOfferClientV1_0_11';
 import { CredentialRequestClientBuilderV1_0_11 } from './CredentialRequestClientBuilderV1_0_11';
 import { MetadataClientV1_0_11 } from './MetadataClientV1_0_11';
 import { ProofOfPossessionBuilder } from './ProofOfPossessionBuilder';
 import { generateMissingPKCEOpts } from './functions';
-import { acquireAuthorizationChallengeAuthCode } from './AuthorizationCodeClient'
 
 const debug = Debug('sphereon:oid4vci');
 
@@ -261,12 +260,22 @@ export class OpenID4VCIClientV1_0_11 {
     this._state.pkce = generateMissingPKCEOpts({ ...this._state.pkce, ...pkce });
   }
 
-  public async acquireAuthorizationChallengeCode(opts?: AuthorizationChallengeRequestOpts): Promise<OpenIDResponse<AuthorizationChallengeCodeResponse | AuthorizationChallengeErrorResponse>> {
+  public async acquireAuthorizationChallengeCode(opts?: AuthorizationChallengeRequestOpts): Promise<AuthorizationChallengeCodeResponse> {
     const response = await acquireAuthorizationChallengeAuthCode({
       clientId: this._state.clientId ?? this._state.authorizationRequestOpts?.clientId,
       ...opts
     })
-    return response
+
+    if (response.errorBody) {
+      debug(`Authorization code error:\r\n${JSON.stringify(response.errorBody)}`);
+      const error = response.errorBody as AuthorizationChallengeErrorResponse
+      return Promise.reject(error)
+    } else if (!response.successBody) {
+      debug(`Authorization code error. No success body`);
+      return Promise.reject(Error(`Retrieving an authorization code token from ${this._state.endpointMetadata?.authorization_challenge_endpoint} for issuer ${this.getIssuer()} failed as there was no success response body`))
+    }
+
+    return { ...response.successBody }
   }
 
   public async acquireAccessToken(

packages/client/lib/OpenID4VCIClientV1_0_13.ts

@@ -28,7 +28,6 @@ import {
   NotificationResponseResult,
   OID4VCICredentialFormat,
   OpenId4VCIVersion,
-  OpenIDResponse,
   PKCEOpts,
   ProofOfPossessionCallbacks,
   toAuthorizationResponsePayload
@@ -268,12 +267,22 @@ export class OpenID4VCIClientV1_0_13 {
     this._state.pkce = generateMissingPKCEOpts({ ...this._state.pkce, ...pkce });
   }
 
-  public async acquireAuthorizationChallengeCode(opts?: AuthorizationChallengeRequestOpts): Promise<OpenIDResponse<AuthorizationChallengeCodeResponse | AuthorizationChallengeErrorResponse>> {
+  public async acquireAuthorizationChallengeCode(opts?: AuthorizationChallengeRequestOpts): Promise<AuthorizationChallengeCodeResponse> {
     const response = await acquireAuthorizationChallengeAuthCode({
       clientId: this._state.clientId ?? this._state.authorizationRequestOpts?.clientId,
       ...opts
     })
-    return response
+
+    if (response.errorBody) {
+      debug(`Authorization code error:\r\n${JSON.stringify(response.errorBody)}`);
+      const error = response.errorBody as AuthorizationChallengeErrorResponse
+      return Promise.reject(error)
+    } else if (!response.successBody) {
+      debug(`Authorization code error. No success body`);
+      return Promise.reject(Error(`Retrieving an authorization code token from ${this._state.endpointMetadata?.authorization_challenge_endpoint} for issuer ${this.getIssuer()} failed as there was no success response body`))
+    }
+
+    return { ...response.successBody }
   }
 
   public async acquireAccessToken(