chore: use authorization_code for acquiring the access token

Sphereon-Opensource · Jan 13, 2025 · 3a426b5 · 3a426b5
1 parent b97ff27
commit 3a426b5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/packages/client/lib/AuthorizationCodeClient.ts b/packages/client/lib/AuthorizationCodeClient.ts
@@ -1,6 +1,5 @@
 import {
   AuthorizationChallengeCodeResponse,
-  AuthorizationChallengeErrorResponse,
   AuthorizationChallengeRequestOpts,
   AuthorizationDetails,
   AuthorizationRequestOpts,
@@ -278,13 +277,13 @@ const handleLocations = (endpointMetadata: EndpointMetadataResultV1_0_13, author
   return authorizationDetails;
 };
 
-export const acquireAuthorizationChallengeAuthCode = async (opts: AuthorizationChallengeRequestOpts): Promise<OpenIDResponse<AuthorizationChallengeCodeResponse | AuthorizationChallengeErrorResponse>> => {
+export const acquireAuthorizationChallengeAuthCode = async (opts: AuthorizationChallengeRequestOpts): Promise<OpenIDResponse<AuthorizationChallengeCodeResponse>> => { //AuthorizationChallengeErrorResponse
   return await acquireAuthorizationChallengeAuthCodeUsingRequest({
     authorizationChallengeRequest: await createAuthorizationChallengeRequest(opts)
   });
 }
 
-export const acquireAuthorizationChallengeAuthCodeUsingRequest = async (opts: { authorizationChallengeRequest: CommonAuthorizationChallengeRequest }): Promise<OpenIDResponse<AuthorizationChallengeCodeResponse | AuthorizationChallengeErrorResponse>> => {
+export const acquireAuthorizationChallengeAuthCodeUsingRequest = async (opts: { authorizationChallengeRequest: CommonAuthorizationChallengeRequest }): Promise<OpenIDResponse<AuthorizationChallengeCodeResponse>> => { //AuthorizationChallengeErrorResponse
   const { authorizationChallengeRequest } = opts
   // TODO validate request
   const authorizationChallengeCodeUrl = '' // TODO
@@ -326,7 +325,7 @@ export const sendAuthorizationChallengeRequest = async (
   authorizationChallengeCodeUrl: string,
   authorizationChallengeRequest: CommonAuthorizationChallengeRequest,
   opts?: { headers?: Record<string, string> }
-): Promise<OpenIDResponse<AuthorizationChallengeCodeResponse | AuthorizationChallengeErrorResponse>> => {
+): Promise<OpenIDResponse<AuthorizationChallengeCodeResponse>> => { //AuthorizationChallengeErrorResponse
   return await formPost(authorizationChallengeCodeUrl, convertJsonToURI(authorizationChallengeRequest, { mode: JsonURIMode.X_FORM_WWW_URLENCODED }), { // TODO check encoding
     customHeaders: opts?.headers ? opts.headers : undefined,
   });

diff --git a/packages/client/lib/OpenID4VCIClient.ts b/packages/client/lib/OpenID4VCIClient.ts
@@ -4,7 +4,6 @@ import {
   AccessTokenResponse,
   Alg,
   AuthorizationChallengeCodeResponse,
-  AuthorizationChallengeErrorResponse,
   AuthorizationChallengeRequestOpts,
   AuthorizationRequestOpts,
   AuthorizationResponse,
@@ -277,11 +276,16 @@ 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<OpenIDResponse<AuthorizationChallengeCodeResponse>> { //AuthorizationChallengeErrorResponse
     const response = await acquireAuthorizationChallengeAuthCode({
       clientId: this._state.clientId ?? this._state.authorizationRequestOpts?.clientId,
       ...opts
     })
+
+    if (!this._state.authorizationCodeResponse) {
+      this._state.authorizationCodeResponse = response.successBody;
+    }
+
     return response
   }
 
@@ -299,7 +303,7 @@ export class OpenID4VCIClient {
     } else if (opts?.code) {
       this._state.authorizationCodeResponse = { code: opts.code };
     }
-    const code = this._state.authorizationCodeResponse?.code;
+    const code = (this._state.authorizationCodeResponse as AuthorizationResponse)?.code ?? (this._state.authorizationCodeResponse as AuthorizationChallengeCodeResponse)?.authorization_code;
 
     if (opts?.codeVerifier) {
       this._state.pkce.codeVerifier = opts.codeVerifier;

diff --git a/packages/client/lib/OpenID4VCIClientV1_0_11.ts b/packages/client/lib/OpenID4VCIClientV1_0_11.ts
@@ -58,7 +58,7 @@ export interface OpenID4VCIClientStateV1_0_11 {
   accessTokenResponse?: AccessTokenResponse;
   dpopResponseParams?: DPoPResponseParams;
   authorizationRequestOpts?: AuthorizationRequestOpts;
-  authorizationCodeResponse?: AuthorizationResponse;
+  authorizationCodeResponse?: AuthorizationResponse | AuthorizationChallengeCodeResponse;
   pkce: PKCEOpts;
   accessToken?: string;
   authorizationURL?: string;
@@ -283,7 +283,7 @@ export class OpenID4VCIClientV1_0_11 {
     } else if (opts?.code) {
       this._state.authorizationCodeResponse = { code: opts.code };
     }
-    const code = this._state.authorizationCodeResponse?.code;
+    const code = (this._state.authorizationCodeResponse as AuthorizationResponse)?.code ?? (this._state.authorizationCodeResponse as AuthorizationChallengeCodeResponse)?.authorization_code;
 
     if (opts?.codeVerifier) {
       this._state.pkce.codeVerifier = opts.codeVerifier;

diff --git a/packages/client/lib/OpenID4VCIClientV1_0_13.ts b/packages/client/lib/OpenID4VCIClientV1_0_13.ts
@@ -61,7 +61,7 @@ export interface OpenID4VCIClientStateV1_0_13 {
   accessTokenResponse?: AccessTokenResponse;
   dpopResponseParams?: DPoPResponseParams;
   authorizationRequestOpts?: AuthorizationRequestOpts;
-  authorizationCodeResponse?: AuthorizationResponse;
+  authorizationCodeResponse?: AuthorizationResponse | AuthorizationChallengeCodeResponse;
   pkce: PKCEOpts;
   accessToken?: string;
   authorizationURL?: string;
@@ -290,7 +290,7 @@ export class OpenID4VCIClientV1_0_13 {
     } else if (opts?.code) {
       this._state.authorizationCodeResponse = { code: opts.code };
     }
-    const code = this._state.authorizationCodeResponse?.code;
+    const code = (this._state.authorizationCodeResponse as AuthorizationResponse)?.code ?? (this._state.authorizationCodeResponse as AuthorizationChallengeCodeResponse)?.authorization_code;
 
     if (opts?.codeVerifier) {
       this._state.pkce.codeVerifier = opts.codeVerifier;