@openid4vc/openid4vp 0.3.0-alpha-20250225095929 → 0.3.0-alpha-20250225204254

package/dist/index.d.mts

@@ -7803,7 +7803,7 @@ interface CreateOpenid4vpAuthorizationRequestOptions {
     scheme?: string;
     requestParams: Openid4vpAuthorizationRequest | Openid4vpAuthorizationRequestDcApi;
     jar?: {
-        requestUri: string;
+        requestUri?: string;
         jwtSigner: JwtSigner;
         additionalJwtPayload?: Record<string, unknown>;
     };
@@ -7917,7 +7917,7 @@ declare function createOpenid4vpAuthorizationRequest(options: CreateOpenid4vpAut
             x5u: zod.ZodOptional<zod.ZodString>;
         }, zod.ZodTypeAny, "passthrough"> | undefined;
         requestObjectJwt: string;
-        requestUri: string;
+        requestUri?: string;
         jwtSigner: JwtSigner;
         additionalJwtPayload?: Record<string, unknown>;
     };
@@ -23341,7 +23341,7 @@ declare class Openid4vpVerifier {
                 x5u: zod.ZodOptional<zod.ZodString>;
             }, zod.ZodTypeAny, "passthrough"> | undefined;
             requestObjectJwt: string;
-            requestUri: string;
+            requestUri?: string;
             jwtSigner: _openid4vc_oauth2.JwtSigner;
             additionalJwtPayload?: Record<string, unknown>;
         };
@@ -31973,4 +31973,4 @@ type CredentialFormat = z.infer<typeof zCredentialFormat>;
 declare const zProofFormat: z.ZodEnum<["jwt_vp_json", "ldc_vp", "ac_vp", "dc+sd-jwt", "mso_mdoc"]>;
 type ProofFormat = z.infer<typeof zProofFormat>;
 
-export { type ClientIdScheme, type ClientMetadata, type CreateOpenid4vpAuthorizationRequestOptions, type CreateOpenid4vpAuthorizationResponseOptions, type CreateOpenid4vpAuthorizationResponseResult, type CredentialFormat, type JarmClientMetadata, type Openid4vpAuthorizationRequest, type Openid4vpAuthorizationRequestDcApi, type Openid4vpAuthorizationResponse, Openid4vpClient, Openid4vpVerifier, type ParseJarmAuthorizationResponseOptions, type ParseOpenid4vpAuthRequestPayloadOptions, type ParseOpenid4vpAuthorizationResponseOptions, type ParsePresentationsFromVpTokenOptions, type ParseTransactionDataOptions, type ParsedOpenid4vpAuthorizationResponse, type ProofFormat, type ResolveOpenid4vpAuthorizationRequestOptions, type ResolvedOpenid4vpAuthRequest, type SubmitOpenid4vpAuthorizationResponseOptions, type TransactionDataEntry, type ValidateOpenid4VpAuthorizationResponseResult, type ValidateOpenid4VpDcqlAuthorizationResponseResult, type ValidateOpenid4VpPexAuthorizationResponseResult, type ValidateOpenid4vpAuthorizationRequestPayloadOptions, type ValidateOpenid4vpAuthorizationResponseOptions, type VerifyJarmAuthorizationResponseOptions, type VpTokenPresentationParseResult, type WalletMetadata, type WalletVerificationOptions, createOpenid4vpAuthorizationRequest, createOpenid4vpAuthorizationResponse, isJarmResponseMode, isOpenid4vpAuthorizationRequestDcApi, parseJarmAuthorizationResponse, parseOpenid4vpAuthorizationRequestPayload, parseOpenid4vpAuthorizationResponse, parsePresentationsFromVpToken, parseTransactionData, resolveOpenid4vpAuthorizationRequest, submitOpenid4vpAuthorizationResponse, validateOpenid4vpAuthorizationRequestPayload, validateOpenid4vpAuthorizationResponse, verifyJarmAuthorizationResponse, zClientIdScheme, zClientMetadata, zCredentialFormat, zJarmClientMetadata, zOpenid4vpAuthorizationResponse, zProofFormat, zWalletMetadata };
+export { type ClientIdScheme, type ClientMetadata, type CreateOpenid4vpAuthorizationRequestOptions, type CreateOpenid4vpAuthorizationResponseOptions, type CreateOpenid4vpAuthorizationResponseResult, type CredentialFormat, type JarmClientMetadata, JarmMode, type Openid4vpAuthorizationRequest, type Openid4vpAuthorizationRequestDcApi, type Openid4vpAuthorizationResponse, Openid4vpClient, Openid4vpVerifier, type ParseJarmAuthorizationResponseOptions, type ParseOpenid4vpAuthRequestPayloadOptions, type ParseOpenid4vpAuthorizationResponseOptions, type ParsePresentationsFromVpTokenOptions, type ParseTransactionDataOptions, type ParsedOpenid4vpAuthorizationResponse, type ProofFormat, type ResolveOpenid4vpAuthorizationRequestOptions, type ResolvedOpenid4vpAuthRequest, type SubmitOpenid4vpAuthorizationResponseOptions, type TransactionDataEntry, type ValidateOpenid4VpAuthorizationResponseResult, type ValidateOpenid4VpDcqlAuthorizationResponseResult, type ValidateOpenid4VpPexAuthorizationResponseResult, type ValidateOpenid4vpAuthorizationRequestPayloadOptions, type ValidateOpenid4vpAuthorizationResponseOptions, type VerifyJarmAuthorizationResponseOptions, type VpTokenPresentationParseResult, type WalletMetadata, type WalletVerificationOptions, createOpenid4vpAuthorizationRequest, createOpenid4vpAuthorizationResponse, isJarmResponseMode, isOpenid4vpAuthorizationRequestDcApi, parseJarmAuthorizationResponse, parseOpenid4vpAuthorizationRequestPayload, parseOpenid4vpAuthorizationResponse, parsePresentationsFromVpToken, parseTransactionData, resolveOpenid4vpAuthorizationRequest, submitOpenid4vpAuthorizationResponse, validateOpenid4vpAuthorizationRequestPayload, validateOpenid4vpAuthorizationResponse, verifyJarmAuthorizationResponse, zClientIdScheme, zClientMetadata, zCredentialFormat, zJarmClientMetadata, zOpenid4vpAuthorizationResponse, zProofFormat, zWalletMetadata };

package/dist/index.d.ts

@@ -7803,7 +7803,7 @@ interface CreateOpenid4vpAuthorizationRequestOptions {
     scheme?: string;
     requestParams: Openid4vpAuthorizationRequest | Openid4vpAuthorizationRequestDcApi;
     jar?: {
-        requestUri: string;
+        requestUri?: string;
         jwtSigner: JwtSigner;
         additionalJwtPayload?: Record<string, unknown>;
     };
@@ -7917,7 +7917,7 @@ declare function createOpenid4vpAuthorizationRequest(options: CreateOpenid4vpAut
             x5u: zod.ZodOptional<zod.ZodString>;
         }, zod.ZodTypeAny, "passthrough"> | undefined;
         requestObjectJwt: string;
-        requestUri: string;
+        requestUri?: string;
         jwtSigner: JwtSigner;
         additionalJwtPayload?: Record<string, unknown>;
     };
@@ -23341,7 +23341,7 @@ declare class Openid4vpVerifier {
                 x5u: zod.ZodOptional<zod.ZodString>;
             }, zod.ZodTypeAny, "passthrough"> | undefined;
             requestObjectJwt: string;
-            requestUri: string;
+            requestUri?: string;
             jwtSigner: _openid4vc_oauth2.JwtSigner;
             additionalJwtPayload?: Record<string, unknown>;
         };
@@ -31973,4 +31973,4 @@ type CredentialFormat = z.infer<typeof zCredentialFormat>;
 declare const zProofFormat: z.ZodEnum<["jwt_vp_json", "ldc_vp", "ac_vp", "dc+sd-jwt", "mso_mdoc"]>;
 type ProofFormat = z.infer<typeof zProofFormat>;
 
-export { type ClientIdScheme, type ClientMetadata, type CreateOpenid4vpAuthorizationRequestOptions, type CreateOpenid4vpAuthorizationResponseOptions, type CreateOpenid4vpAuthorizationResponseResult, type CredentialFormat, type JarmClientMetadata, type Openid4vpAuthorizationRequest, type Openid4vpAuthorizationRequestDcApi, type Openid4vpAuthorizationResponse, Openid4vpClient, Openid4vpVerifier, type ParseJarmAuthorizationResponseOptions, type ParseOpenid4vpAuthRequestPayloadOptions, type ParseOpenid4vpAuthorizationResponseOptions, type ParsePresentationsFromVpTokenOptions, type ParseTransactionDataOptions, type ParsedOpenid4vpAuthorizationResponse, type ProofFormat, type ResolveOpenid4vpAuthorizationRequestOptions, type ResolvedOpenid4vpAuthRequest, type SubmitOpenid4vpAuthorizationResponseOptions, type TransactionDataEntry, type ValidateOpenid4VpAuthorizationResponseResult, type ValidateOpenid4VpDcqlAuthorizationResponseResult, type ValidateOpenid4VpPexAuthorizationResponseResult, type ValidateOpenid4vpAuthorizationRequestPayloadOptions, type ValidateOpenid4vpAuthorizationResponseOptions, type VerifyJarmAuthorizationResponseOptions, type VpTokenPresentationParseResult, type WalletMetadata, type WalletVerificationOptions, createOpenid4vpAuthorizationRequest, createOpenid4vpAuthorizationResponse, isJarmResponseMode, isOpenid4vpAuthorizationRequestDcApi, parseJarmAuthorizationResponse, parseOpenid4vpAuthorizationRequestPayload, parseOpenid4vpAuthorizationResponse, parsePresentationsFromVpToken, parseTransactionData, resolveOpenid4vpAuthorizationRequest, submitOpenid4vpAuthorizationResponse, validateOpenid4vpAuthorizationRequestPayload, validateOpenid4vpAuthorizationResponse, verifyJarmAuthorizationResponse, zClientIdScheme, zClientMetadata, zCredentialFormat, zJarmClientMetadata, zOpenid4vpAuthorizationResponse, zProofFormat, zWalletMetadata };
+export { type ClientIdScheme, type ClientMetadata, type CreateOpenid4vpAuthorizationRequestOptions, type CreateOpenid4vpAuthorizationResponseOptions, type CreateOpenid4vpAuthorizationResponseResult, type CredentialFormat, type JarmClientMetadata, JarmMode, type Openid4vpAuthorizationRequest, type Openid4vpAuthorizationRequestDcApi, type Openid4vpAuthorizationResponse, Openid4vpClient, Openid4vpVerifier, type ParseJarmAuthorizationResponseOptions, type ParseOpenid4vpAuthRequestPayloadOptions, type ParseOpenid4vpAuthorizationResponseOptions, type ParsePresentationsFromVpTokenOptions, type ParseTransactionDataOptions, type ParsedOpenid4vpAuthorizationResponse, type ProofFormat, type ResolveOpenid4vpAuthorizationRequestOptions, type ResolvedOpenid4vpAuthRequest, type SubmitOpenid4vpAuthorizationResponseOptions, type TransactionDataEntry, type ValidateOpenid4VpAuthorizationResponseResult, type ValidateOpenid4VpDcqlAuthorizationResponseResult, type ValidateOpenid4VpPexAuthorizationResponseResult, type ValidateOpenid4vpAuthorizationRequestPayloadOptions, type ValidateOpenid4vpAuthorizationResponseOptions, type VerifyJarmAuthorizationResponseOptions, type VpTokenPresentationParseResult, type WalletMetadata, type WalletVerificationOptions, createOpenid4vpAuthorizationRequest, createOpenid4vpAuthorizationResponse, isJarmResponseMode, isOpenid4vpAuthorizationRequestDcApi, parseJarmAuthorizationResponse, parseOpenid4vpAuthorizationRequestPayload, parseOpenid4vpAuthorizationResponse, parsePresentationsFromVpToken, parseTransactionData, resolveOpenid4vpAuthorizationRequest, submitOpenid4vpAuthorizationResponse, validateOpenid4vpAuthorizationRequestPayload, validateOpenid4vpAuthorizationResponse, verifyJarmAuthorizationResponse, zClientIdScheme, zClientMetadata, zCredentialFormat, zJarmClientMetadata, zOpenid4vpAuthorizationResponse, zProofFormat, zWalletMetadata };

package/dist/index.js

@@ -633,7 +633,7 @@ function parseClientIdentifier(options, parserConfig) {
         error_description: 'Using client identifier scheme "redirect_uri" the request MUST NOT be signed.'
       });
     }
-    if (isDcApiRequest) {
+    if (isOpenid4vpAuthorizationRequestDcApi(request)) {
       throw new import_oauth212.Oauth2ServerErrorResponseError({
         error: import_oauth212.Oauth2ErrorCodes.InvalidRequest,
         error_description: `The client identifier scheme 'redirect_uri' is not supported when using the dc_api response mode.`
@@ -709,12 +709,14 @@ function parseClientIdentifier(options, parserConfig) {
           error_description: "Invalid client identifier. Client identifier must be a valid DNS name."
         });
       }
-      const requestUri = jar.authRequestParams.request_uri ?? jar.authRequestParams.response_uri;
-      if (getDomainFromUrl(requestUri) !== identifierPart) {
-        throw new import_oauth212.Oauth2ServerErrorResponseError({
-          error: import_oauth212.Oauth2ErrorCodes.InvalidRequest,
-          error_description: "Invalid client identifier. The fully qualified domain name of the redirect_uri value MUST match the Client Identifier without the prefix x509_san_dns."
-        });
+      if (!isOpenid4vpAuthorizationRequestDcApi(request)) {
+        const uri = request.redirect_uri ?? request.response_uri;
+        if (!uri || getDomainFromUrl(uri) !== identifierPart) {
+          throw new import_oauth212.Oauth2ServerErrorResponseError({
+            error: import_oauth212.Oauth2ErrorCodes.InvalidRequest,
+            error_description: "Invalid client identifier. The fully qualified domain name of the redirect_uri value MUST match the Client Identifier without the prefix x509_san_dns."
+          });
+        }
       }
     } else if (scheme === "x509_san_uri") {
       if (!options.callbacks.getX509CertificateMetadata) {
@@ -734,11 +736,14 @@ function parseClientIdentifier(options, parserConfig) {
           error_description: "Invalid client identifier. Client identifier must be a valid URI."
         });
       }
-      if ((jar.authRequestParams.request_uri ?? jar.authRequestParams.response_uri) !== identifierPart) {
-        throw new import_oauth212.Oauth2ServerErrorResponseError({
-          error: import_oauth212.Oauth2ErrorCodes.InvalidRequest,
-          error_description: "The redirect_uri value MUST match the Client Identifier without the prefix x509_san_uri"
-        });
+      if (!isOpenid4vpAuthorizationRequestDcApi(request)) {
+        const uri = request.redirect_uri || request.response_uri;
+        if (!uri || uri !== identifierPart) {
+          throw new import_oauth212.Oauth2ServerErrorResponseError({
+            error: import_oauth212.Oauth2ErrorCodes.InvalidRequest,
+            error_description: "The redirect_uri value MUST match the Client Identifier without the prefix x509_san_uri"
+          });
+        }
       }
     }
     return {
@@ -771,9 +776,16 @@ function parseClientIdentifier(options, parserConfig) {
   };
 }
 function getDomainFromUrl(url) {
-  const regex = /[#/?]/;
-  const domain = url.split("://")[1].split(regex)[0];
-  return domain;
+  try {
+    const regex = /[#/?]/;
+    const domain = url.split("://")[1].split(regex)[0];
+    return domain;
+  } catch (error) {
+    throw new import_oauth212.Oauth2ServerErrorResponseError({
+      error: import_oauth212.Oauth2ErrorCodes.ServerError,
+      error_description: `Url '${url}' is not a valid URL`
+    });
+  }
 }
 
 // src/jar/handle-jar-request/verify-jar-request.ts