@credo-ts/openid4vc 0.6.0-pr-2134-20241217213340 → 0.6.0-pr-2195-20250217170804

package/build/openid4vc-holder/OpenId4VcHolderApi.d.ts

@@ -1,6 +1,6 @@
-import type { OpenId4VciResolvedCredentialOffer, OpenId4VciAuthCodeFlowOptions, OpenId4VciTokenRequestOptions as OpenId4VciRequestTokenOptions, OpenId4VciCredentialRequestOptions as OpenId4VciRequestCredentialOptions, OpenId4VciSendNotificationOptions, OpenId4VciRequestTokenResponse, OpenId4VciRetrieveAuthorizationCodeUsingPresentationOptions } from './OpenId4VciHolderServiceOptions';
+import type { OpenId4VciAuthCodeFlowOptions, OpenId4VciCredentialRequestOptions as OpenId4VciRequestCredentialOptions, OpenId4VciTokenRequestOptions as OpenId4VciRequestTokenOptions, OpenId4VciRequestTokenResponse, OpenId4VciResolvedCredentialOffer, OpenId4VciRetrieveAuthorizationCodeUsingPresentationOptions, OpenId4VciSendNotificationOptions } from './OpenId4VciHolderServiceOptions';
 import type { OpenId4VcSiopAcceptAuthorizationRequestOptions } from './OpenId4vcSiopHolderServiceOptions';
-import { AgentContext, DifPresentationExchangeService, DifPexCredentialsForRequest } from '@credo-ts/core';
+import { AgentContext, DcqlQueryResult, DcqlService, DifPexCredentialsForRequest, DifPresentationExchangeService, TransactionDataRequest } from '@credo-ts/core';
 import { OpenId4VciMetadata } from '../shared';
 import { OpenId4VciHolderService } from './OpenId4VciHolderService';
 import { OpenId4VcSiopHolderService } from './OpenId4vcSiopHolderService';
@@ -12,7 +12,8 @@ export declare class OpenId4VcHolderApi {
     private openId4VciHolderService;
     private openId4VcSiopHolderService;
     private difPresentationExchangeService;
-    constructor(agentContext: AgentContext, openId4VciHolderService: OpenId4VciHolderService, openId4VcSiopHolderService: OpenId4VcSiopHolderService, difPresentationExchangeService: DifPresentationExchangeService);
+    private dcqlService;
+    constructor(agentContext: AgentContext, openId4VciHolderService: OpenId4VciHolderService, openId4VcSiopHolderService: OpenId4VcSiopHolderService, difPresentationExchangeService: DifPresentationExchangeService, dcqlService: DcqlService);
     /**
      * Resolves the authentication request given as URI or JWT to a unified format, and
      * verifies the validity of the request.
@@ -27,7 +28,7 @@ export declare class OpenId4VcHolderApi {
      * @param requestJwtOrUri JWT or an SIOPv2 request URI
      * @returns the resolved and verified authentication request.
      */
-    resolveSiopAuthorizationRequest(requestJwtOrUri: string): Promise<import("./OpenId4vcSiopHolderServiceOptions").OpenId4VcSiopResolvedAuthorizationRequest>;
+    resolveSiopAuthorizationRequest(requestJwtOrUri: string, origin?: string): Promise<import("./OpenId4vcSiopHolderServiceOptions").OpenId4VcSiopResolvedAuthorizationRequest>;
     /**
      * Accepts the authentication request after it has been resolved and verified with {@link resolveSiopAuthorizationRequest}.
      *
@@ -39,27 +40,76 @@ export declare class OpenId4VcHolderApi {
     acceptSiopAuthorizationRequest(options: OpenId4VcSiopAcceptAuthorizationRequestOptions): Promise<{
         readonly ok: false;
         readonly serverResponse: {
-            readonly status: number;
-            readonly body: string | Record<string, unknown> | null;
+            readonly status: any;
+            readonly body: any;
+        };
+        readonly submittedResponse: (import("zod").objectOutputType<{
+            state: import("zod").ZodOptional<import("zod").ZodString>;
+            id_token: import("zod").ZodOptional<import("zod").ZodString>;
+            vp_token: import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">, import("zod").ZodRecord<import("zod").ZodString, import("zod").ZodUnknown>]>;
+            presentation_submission: import("zod").ZodOptional<import("zod").ZodUnknown>;
+            refresh_token: import("zod").ZodOptional<import("zod").ZodString>;
+            token_type: import("zod").ZodOptional<import("zod").ZodString>;
+            access_token: import("zod").ZodOptional<import("zod").ZodString>;
+            expires_in: import("zod").ZodOptional<import("zod").ZodNumber>;
+        }, import("zod").ZodTypeAny, "passthrough"> | ({
+            vp_token: string | string[] | Record<string, unknown>;
+            presentation_submission?: unknown;
+            access_token?: string | undefined;
+            token_type?: string | undefined;
+            expires_in?: number | undefined;
+            state?: string | undefined;
+            refresh_token?: string | undefined;
+            id_token?: string | undefined;
+        } & {
+            [k: string]: unknown;
+        })) & {
+            presentation_submission?: import("@credo-ts/core").DifPresentationExchangeSubmission;
         };
-        readonly submittedResponse: import("@sphereon/did-auth-siop").AuthorizationResponsePayload;
         readonly redirectUri?: undefined;
         readonly presentationDuringIssuanceSession?: undefined;
     } | {
         readonly ok: true;
         readonly serverResponse: {
-            readonly status: number;
+            readonly status: any;
             readonly body: Record<string, unknown>;
         };
-        readonly submittedResponse: import("@sphereon/did-auth-siop").AuthorizationResponsePayload;
+        readonly submittedResponse: (import("zod").objectOutputType<{
+            state: import("zod").ZodOptional<import("zod").ZodString>;
+            id_token: import("zod").ZodOptional<import("zod").ZodString>;
+            vp_token: import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">, import("zod").ZodRecord<import("zod").ZodString, import("zod").ZodUnknown>]>;
+            presentation_submission: import("zod").ZodOptional<import("zod").ZodUnknown>;
+            refresh_token: import("zod").ZodOptional<import("zod").ZodString>;
+            token_type: import("zod").ZodOptional<import("zod").ZodString>;
+            access_token: import("zod").ZodOptional<import("zod").ZodString>;
+            expires_in: import("zod").ZodOptional<import("zod").ZodNumber>;
+        }, import("zod").ZodTypeAny, "passthrough"> | ({
+            vp_token: string | string[] | Record<string, unknown>;
+            presentation_submission?: unknown;
+            access_token?: string | undefined;
+            token_type?: string | undefined;
+            expires_in?: number | undefined;
+            state?: string | undefined;
+            refresh_token?: string | undefined;
+            id_token?: string | undefined;
+        } & {
+            [k: string]: unknown;
+        })) & {
+            presentation_submission?: import("@credo-ts/core").DifPresentationExchangeSubmission;
+        };
         readonly redirectUri: string | undefined;
         readonly presentationDuringIssuanceSession: string | undefined;
     }>;
     /**
-     * Automatically select credentials from available credentials for a request. Can be called after calling
+     * Automatically select credentials from available credentials for a presentation exchange request. Can be called after calling
+     * @see resolveSiopAuthorizationRequest.
+     */
+    selectCredentialsForPresentationExchangeRequest(credentialsForRequest: DifPexCredentialsForRequest, transactionData?: TransactionDataRequest): import("@credo-ts/core").DifPexInputDescriptorToCredentials;
+    /**
+     * Automatically select credentials from available credentials for a dcql request. Can be called after calling
      * @see resolveSiopAuthorizationRequest.
      */
-    selectCredentialsForRequest(credentialsForRequest: DifPexCredentialsForRequest): import("@credo-ts/core").DifPexInputDescriptorToCredentials;
+    selectCredentialsForDcqlRequest(dcqlQueryResult: DcqlQueryResult): import("@credo-ts/core").DcqlCredentialsForRequest;
     resolveIssuerMetadata(credentialIssuer: string): Promise<OpenId4VciMetadata>;
     /**
      * Resolves a credential offer given as credential offer URL, or issuance initiation URL,

package/build/openid4vc-holder/OpenId4VcHolderApi.js

@@ -8,17 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenId4VcHolderApi = void 0;
 const core_1 = require("@credo-ts/core");
@@ -28,11 +17,12 @@ const OpenId4vcSiopHolderService_1 = require("./OpenId4vcSiopHolderService");
  * @public
  */
 let OpenId4VcHolderApi = class OpenId4VcHolderApi {
-    constructor(agentContext, openId4VciHolderService, openId4VcSiopHolderService, difPresentationExchangeService) {
+    constructor(agentContext, openId4VciHolderService, openId4VcSiopHolderService, difPresentationExchangeService, dcqlService) {
         this.agentContext = agentContext;
         this.openId4VciHolderService = openId4VciHolderService;
         this.openId4VcSiopHolderService = openId4VcSiopHolderService;
         this.difPresentationExchangeService = difPresentationExchangeService;
+        this.dcqlService = dcqlService;
     }
     /**
      * Resolves the authentication request given as URI or JWT to a unified format, and
@@ -48,8 +38,8 @@ let OpenId4VcHolderApi = class OpenId4VcHolderApi {
      * @param requestJwtOrUri JWT or an SIOPv2 request URI
      * @returns the resolved and verified authentication request.
      */
-    async resolveSiopAuthorizationRequest(requestJwtOrUri) {
-        return this.openId4VcSiopHolderService.resolveAuthorizationRequest(this.agentContext, requestJwtOrUri);
+    async resolveSiopAuthorizationRequest(requestJwtOrUri, origin) {
+        return this.openId4VcSiopHolderService.resolveAuthorizationRequest(this.agentContext, requestJwtOrUri, undefined, origin);
     }
     /**
      * Accepts the authentication request after it has been resolved and verified with {@link resolveSiopAuthorizationRequest}.
@@ -63,11 +53,18 @@ let OpenId4VcHolderApi = class OpenId4VcHolderApi {
         return await this.openId4VcSiopHolderService.acceptAuthorizationRequest(this.agentContext, options);
     }
     /**
-     * Automatically select credentials from available credentials for a request. Can be called after calling
+     * Automatically select credentials from available credentials for a presentation exchange request. Can be called after calling
+     * @see resolveSiopAuthorizationRequest.
+     */
+    selectCredentialsForPresentationExchangeRequest(credentialsForRequest, transactionData) {
+        return this.difPresentationExchangeService.selectCredentialsForRequest(credentialsForRequest, transactionData);
+    }
+    /**
+     * Automatically select credentials from available credentials for a dcql request. Can be called after calling
      * @see resolveSiopAuthorizationRequest.
      */
-    selectCredentialsForRequest(credentialsForRequest) {
-        return this.difPresentationExchangeService.selectCredentialsForRequest(credentialsForRequest);
+    selectCredentialsForDcqlRequest(dcqlQueryResult) {
+        return this.dcqlService.selectCredentialsForRequest(dcqlQueryResult);
     }
     async resolveIssuerMetadata(credentialIssuer) {
         return await this.openId4VciHolderService.resolveIssuerMetadata(this.agentContext, credentialIssuer);
@@ -132,7 +129,7 @@ let OpenId4VcHolderApi = class OpenId4VcHolderApi {
      * Can be used with both the pre-authorized code flow and the authorization code flow.
      */
     async requestCredentials(options) {
-        const { resolvedCredentialOffer, cNonce, accessToken, dpop, clientId } = options, credentialRequestOptions = __rest(options, ["resolvedCredentialOffer", "cNonce", "accessToken", "dpop", "clientId"]);
+        const { resolvedCredentialOffer, cNonce, accessToken, dpop, clientId, ...credentialRequestOptions } = options;
         return this.openId4VciHolderService.acceptCredentialOffer(this.agentContext, {
             resolvedCredentialOffer,
             acceptCredentialOfferOptions: credentialRequestOptions,
@@ -155,6 +152,7 @@ exports.OpenId4VcHolderApi = OpenId4VcHolderApi = __decorate([
     __metadata("design:paramtypes", [core_1.AgentContext,
         OpenId4VciHolderService_1.OpenId4VciHolderService,
         OpenId4vcSiopHolderService_1.OpenId4VcSiopHolderService,
-        core_1.DifPresentationExchangeService])
+        core_1.DifPresentationExchangeService,
+        core_1.DcqlService])
 ], OpenId4VcHolderApi);
 //# sourceMappingURL=OpenId4VcHolderApi.js.map

package/build/openid4vc-holder/OpenId4VcHolderApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"OpenId4VcHolderApi.js","sourceRoot":"","sources":["../../src/openid4vc-holder/OpenId4VcHolderApi.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OpenId4VcHolderApi.js","sourceRoot":"","sources":["../../src/openid4vc-holder/OpenId4VcHolderApi.ts"],"names":[],"mappings":"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"}

package/build/openid4vc-holder/OpenId4VcHolderModule.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenId4VcHolderModule = void 0;
-const oauth2_1 = require("@animo-id/oauth2");
+const oauth2_1 = require("@openid4vc/oauth2");
 const core_1 = require("@credo-ts/core");
 const OpenId4VcHolderApi_1 = require("./OpenId4VcHolderApi");
 const OpenId4VciHolderService_1 = require("./OpenId4VciHolderService");

package/build/openid4vc-holder/OpenId4VcHolderModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"OpenId4VcHolderModule.js","sourceRoot":"","sources":["../../src/openid4vc-holder/OpenId4VcHolderModule.ts"],"names":[],"mappings":";;;AAEA,6CAAkD;AAClD,yCAA4C;AAE5C,6DAAyD;AACzD,uEAAmE;AACnE,6EAAyE;AAEzE;;;GAGG;AACH,MAAa,qBAAqB;IAAlC;QACkB,QAAG,GAAG,uCAAkB,CAAA;IAuB1C,CAAC;IArBC;;OAEG;IACI,QAAQ,CAAC,iBAAoC;QAClD,MAAM,WAAW,GAAG,iBAAiB,CAAC,OAAO,CAAC,kBAAW,CAAC,CAAA;QAE1D,iCAAiC;QACjC,WAAW,CAAC,MAAM,CAAC,IAAI,CACrB,0LAA0L,CAC3L,CAAA;QAED,IAAI,WAAW,CAAC,qBAAqB,EAAE,CAAC;YACtC,IAAA,wBAAe,EAAC;gBACd,iBAAiB,EAAE,IAAI;aACxB,CAAC,CAAA;QACJ,CAAC;QAED,WAAW;QACX,iBAAiB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,CAAA;QAC5D,iBAAiB,CAAC,iBAAiB,CAAC,uDAA0B,CAAC,CAAA;IACjE,CAAC;CACF;AAxBD,sDAwBC"}
+{"version":3,"file":"OpenId4VcHolderModule.js","sourceRoot":"","sources":["../../src/openid4vc-holder/OpenId4VcHolderModule.ts"],"names":[],"mappings":";;;AAEA,8CAAmD;AACnD,yCAA4C;AAE5C,6DAAyD;AACzD,uEAAmE;AACnE,6EAAyE;AAEzE;;;GAGG;AACH,MAAa,qBAAqB;IAAlC;QACkB,QAAG,GAAG,uCAAkB,CAAA;IAuB1C,CAAC;IArBC;;OAEG;IACI,QAAQ,CAAC,iBAAoC;QAClD,MAAM,WAAW,GAAG,iBAAiB,CAAC,OAAO,CAAC,kBAAW,CAAC,CAAA;QAE1D,iCAAiC;QACjC,WAAW,CAAC,MAAM,CAAC,IAAI,CACrB,0LAA0L,CAC3L,CAAA;QAED,IAAI,WAAW,CAAC,qBAAqB,EAAE,CAAC;YACtC,IAAA,wBAAe,EAAC;gBACd,iBAAiB,EAAE,IAAI;aACxB,CAAC,CAAA;QACJ,CAAC;QAED,WAAW;QACX,iBAAiB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,CAAA;QAC5D,iBAAiB,CAAC,iBAAiB,CAAC,uDAA0B,CAAC,CAAA;IACjE,CAAC;CACF;AAxBD,sDAwBC"}

package/build/openid4vc-holder/OpenId4VciHolderService.d.ts

@@ -1,13 +1,12 @@
-import type { OpenId4VciAcceptCredentialOfferOptions, OpenId4VciAuthCodeFlowOptions, OpenId4VciCredentialResponse, OpenId4VciDpopRequestOptions, OpenId4VciNotificationEvent, OpenId4VciResolvedAuthorizationRequest, OpenId4VciResolvedCredentialOffer, OpenId4VciRetrieveAuthorizationCodeUsingPresentationOptions, OpenId4VciTokenRequestOptions } from './OpenId4VciHolderServiceOptions';
-import type { OpenId4VciMetadata } from '../shared';
 import type { AgentContext, JwaSignatureAlgorithm } from '@credo-ts/core';
-import { IssuerMetadataResult } from '@animo-id/oid4vci';
-import { Jwk, JwsService, Logger, W3cCredentialService } from '@credo-ts/core';
+import type { OpenId4VciMetadata } from '../shared';
+import type { OpenId4VciAcceptCredentialOfferOptions, OpenId4VciAuthCodeFlowOptions, OpenId4VciCredentialResponse, OpenId4VciDpopRequestOptions, OpenId4VciNotificationEvent, OpenId4VciResolvedAuthorizationRequest, OpenId4VciResolvedCredentialOffer, OpenId4VciRetrieveAuthorizationCodeUsingPresentationOptions, OpenId4VciTokenRequestOptions } from './OpenId4VciHolderServiceOptions';
+import { IssuerMetadataResult } from '@openid4vc/oid4vci';
+import { Jwk, Logger, W3cCredentialService } from '@credo-ts/core';
 export declare class OpenId4VciHolderService {
     private logger;
     private w3cCredentialService;
-    private jwsService;
-    constructor(logger: Logger, w3cCredentialService: W3cCredentialService, jwsService: JwsService);
+    constructor(logger: Logger, w3cCredentialService: W3cCredentialService);
     resolveIssuerMetadata(agentContext: AgentContext, credentialIssuer: string): Promise<OpenId4VciMetadata>;
     resolveCredentialOffer(agentContext: AgentContext, credentialOffer: string): Promise<OpenId4VciResolvedCredentialOffer>;
     resolveAuthorizationRequest(agentContext: AgentContext, resolvedCredentialOffer: OpenId4VciResolvedCredentialOffer, authCodeFlowOptions: OpenId4VciAuthCodeFlowOptions): Promise<OpenId4VciResolvedAuthorizationRequest>;
@@ -31,10 +30,10 @@ export declare class OpenId4VciHolderService {
             alg: JwaSignatureAlgorithm;
             jwk: Jwk;
             nonce?: string;
-            signer?: import("@animo-id/oauth2").JwtSignerJwk | undefined;
+            signer?: import("@openid4vc/oauth2").JwtSignerJwk | undefined;
         } | undefined;
         authorizationServer: string;
-        accessTokenResponse: import("@animo-id/oauth2").AccessTokenResponse;
+        accessTokenResponse: import("@openid4vc/oauth2").AccessTokenResponse;
     }>;
     acceptCredentialOffer(agentContext: AgentContext, options: {
         resolvedCredentialOffer: OpenId4VciResolvedCredentialOffer;

package/build/openid4vc-holder/OpenId4VciHolderService.js

@@ -13,8 +13,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenId4VciHolderService = void 0;
-const oauth2_1 = require("@animo-id/oauth2");
-const oid4vci_1 = require("@animo-id/oid4vci");
+const oauth2_1 = require("@openid4vc/oauth2");
+const oid4vci_1 = require("@openid4vc/oid4vci");
 const core_1 = require("@credo-ts/core");
 const shared_1 = require("../shared");
 const callbacks_1 = require("../shared/callbacks");
@@ -22,9 +22,8 @@ const issuerMetadataUtils_1 = require("../shared/issuerMetadataUtils");
 const utils_1 = require("../shared/utils");
 const OpenId4VciHolderServiceOptions_1 = require("./OpenId4VciHolderServiceOptions");
 let OpenId4VciHolderService = class OpenId4VciHolderService {
-    constructor(logger, w3cCredentialService, jwsService) {
+    constructor(logger, w3cCredentialService) {
         this.w3cCredentialService = w3cCredentialService;
-        this.jwsService = jwsService;
         this.logger = logger;
     }
     async resolveIssuerMetadata(agentContext, credentialIssuer) {
@@ -48,12 +47,11 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
         };
     }
     async resolveAuthorizationRequest(agentContext, resolvedCredentialOffer, authCodeFlowOptions) {
-        var _a, _b;
         const { clientId, redirectUri } = authCodeFlowOptions;
         const { metadata, credentialOfferPayload, offeredCredentialConfigurations } = resolvedCredentialOffer;
         const client = this.getClient(agentContext);
         // If scope is not provided, we request scope for all offered credentials
-        const scope = (_a = authCodeFlowOptions.scope) !== null && _a !== void 0 ? _a : (0, issuerMetadataUtils_1.getScopesFromCredentialConfigurationsSupported)(offeredCredentialConfigurations);
+        const scope = authCodeFlowOptions.scope ?? (0, issuerMetadataUtils_1.getScopesFromCredentialConfigurationsSupported)(offeredCredentialConfigurations);
         const authorizationResult = await client.initiateAuthorization({
             clientId,
             issuerMetadata: metadata,
@@ -71,7 +69,7 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
         // Normal Oauth2Redirect flow
         return {
             authorizationFlow: oid4vci_1.AuthorizationFlow.Oauth2Redirect,
-            codeVerifier: (_b = authorizationResult.pkce) === null || _b === void 0 ? void 0 : _b.codeVerifier,
+            codeVerifier: authorizationResult.pkce?.codeVerifier,
             authorizationRequestUrl: authorizationResult.authorizationRequestUrl,
         };
     }
@@ -80,7 +78,10 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
         await client.sendNotification({
             accessToken: options.accessToken,
             dpop: options.dpop
-                ? await this.getDpopOptions(agentContext, Object.assign(Object.assign({}, options.dpop), { dpopSigningAlgValuesSupported: [options.dpop.alg] }))
+                ? await this.getDpopOptions(agentContext, {
+                    ...options.dpop,
+                    dpopSigningAlgValuesSupported: [options.dpop.alg],
+                })
                 : undefined,
             issuerMetadata: options.metadata,
             notification: {
@@ -141,14 +142,13 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
         };
     }
     async requestAccessToken(agentContext, options) {
-        var _a, _b, _c, _d;
         const { metadata, credentialOfferPayload } = options.resolvedCredentialOffer;
         const client = this.getClient(agentContext);
         const oauth2Client = this.getOauth2Client(agentContext);
         const authorizationServer = options.code
-            ? (_b = (_a = credentialOfferPayload.grants) === null || _a === void 0 ? void 0 : _a.authorization_code) === null || _b === void 0 ? void 0 : _b.authorization_server
-            : (_d = (_c = credentialOfferPayload.grants) === null || _c === void 0 ? void 0 : _c[oauth2_1.preAuthorizedCodeGrantIdentifier]) === null || _d === void 0 ? void 0 : _d.authorization_server;
-        const authorizationServerMetadata = (0, oauth2_1.getAuthorizationServerMetadataFromList)(metadata.authorizationServers, authorizationServer !== null && authorizationServer !== void 0 ? authorizationServer : metadata.authorizationServers[0].issuer);
+            ? credentialOfferPayload.grants?.authorization_code?.authorization_server
+            : credentialOfferPayload.grants?.[oauth2_1.preAuthorizedCodeGrantIdentifier]?.authorization_server;
+        const authorizationServerMetadata = (0, oauth2_1.getAuthorizationServerMetadataFromList)(metadata.authorizationServers, authorizationServer ?? metadata.authorizationServers[0].issuer);
         // TODO: should allow dpop input parameter for if it was already bound earlier
         const isDpopSupported = oauth2Client.isDpopSupported({
             authorizationServerMetadata,
@@ -178,16 +178,23 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
                 dpop,
                 txCode: options.txCode,
             });
-        return Object.assign(Object.assign({}, result), { dpop: dpop
-                ? Object.assign(Object.assign({}, result.dpop), { alg: dpop.signer.alg, jwk: (0, core_1.getJwkFromJson)(dpop.signer.publicJwk) }) : undefined });
+        return {
+            ...result,
+            dpop: dpop
+                ? {
+                    ...result.dpop,
+                    alg: dpop.signer.alg,
+                    jwk: (0, core_1.getJwkFromJson)(dpop.signer.publicJwk),
+                }
+                : undefined,
+        };
     }
     async acceptCredentialOffer(agentContext, options) {
-        var _a, _b, _c, _d;
         const { resolvedCredentialOffer, acceptCredentialOfferOptions } = options;
         const { metadata, offeredCredentialConfigurations } = resolvedCredentialOffer;
         const { credentialConfigurationIds, credentialBindingResolver, verifyCredentialStatus, requestBatch } = acceptCredentialOfferOptions;
         const client = this.getClient(agentContext);
-        if ((credentialConfigurationIds === null || credentialConfigurationIds === void 0 ? void 0 : credentialConfigurationIds.length) === 0) {
+        if (credentialConfigurationIds?.length === 0) {
             throw new core_1.CredoError(`'credentialConfigurationIds' may not be empty`);
         }
         const supportedJwaSignatureAlgorithms = (0, utils_1.getSupportedJwaSignatureAlgorithms)(agentContext);
@@ -199,19 +206,19 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
             throw new core_1.CredoError([
                 `No possible proof of possession signature algorithm found.`,
                 `Signature algorithms supported by the Agent '${supportedJwaSignatureAlgorithms.join(', ')}'`,
-                `Allowed Signature algorithms '${allowedProofOfPossessionSigAlgs === null || allowedProofOfPossessionSigAlgs === void 0 ? void 0 : allowedProofOfPossessionSigAlgs.join(', ')}'`,
+                `Allowed Signature algorithms '${allowedProofOfPossessionSigAlgs?.join(', ')}'`,
             ].join('\n'));
         }
         const receivedCredentials = [];
         let cNonce = options.cNonce;
-        let dpopNonce = (_a = options.dpop) === null || _a === void 0 ? void 0 : _a.nonce;
-        const credentialConfigurationsToRequest = (_b = credentialConfigurationIds === null || credentialConfigurationIds === void 0 ? void 0 : credentialConfigurationIds.map((id) => {
+        let dpopNonce = options.dpop?.nonce;
+        const credentialConfigurationsToRequest = credentialConfigurationIds?.map((id) => {
             if (!offeredCredentialConfigurations[id]) {
                 const offeredCredentialIds = Object.keys(offeredCredentialConfigurations).join(', ');
                 throw new core_1.CredoError(`Credential to request '${id}' is not present in offered credentials. Offered credentials are ${offeredCredentialIds}`);
             }
             return [id, offeredCredentialConfigurations[id]];
-        })) !== null && _b !== void 0 ? _b : Object.entries(offeredCredentialConfigurations);
+        }) ?? Object.entries(offeredCredentialConfigurations);
         // If we don't have a nonce yet, we need to first get one
         if (!cNonce) {
             // Best option is to use nonce endpoint (draft 14+)
@@ -227,13 +234,16 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
                     accessToken: options.accessToken,
                     credentialConfigurationId: credentialConfigurationsToRequest[0][0],
                     dpop: options.dpop
-                        ? await this.getDpopOptions(agentContext, Object.assign(Object.assign({}, options.dpop), { nonce: dpopNonce, dpopSigningAlgValuesSupported: [options.dpop.alg] }))
+                        ? await this.getDpopOptions(agentContext, {
+                            ...options.dpop,
+                            nonce: dpopNonce,
+                            dpopSigningAlgValuesSupported: [options.dpop.alg],
+                        })
                         : undefined,
                 })
                     .catch((e) => {
-                    var _a;
-                    if (e instanceof oid4vci_1.Oid4vciRetrieveCredentialsError && ((_a = e.response.credentialErrorResponseResult) === null || _a === void 0 ? void 0 : _a.success)) {
-                        cNonce = e.response.credentialErrorResponseResult.output.c_nonce;
+                    if (e instanceof oid4vci_1.Oid4vciRetrieveCredentialsError && e.response.credentialErrorResponseResult?.success) {
+                        cNonce = e.response.credentialErrorResponseResult.data.c_nonce;
                     }
                 });
             }
@@ -244,7 +254,7 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
         // If true: use max from issuer or otherwise 1
         // If number not 0: use the number
         // Else: use 1
-        const batchSize = requestBatch === true ? (_d = (_c = metadata.credentialIssuer.batch_credential_issuance) === null || _c === void 0 ? void 0 : _c.batch_size) !== null && _d !== void 0 ? _d : 1 : requestBatch || 1;
+        const batchSize = requestBatch === true ? metadata.credentialIssuer.batch_credential_issuance?.batch_size ?? 1 : requestBatch || 1;
         if (typeof requestBatch === 'number' && requestBatch > 1 && !metadata.credentialIssuer.batch_credential_issuance) {
             throw new core_1.CredoError(`Credential issuer '${metadata.credentialIssuer.credential_issuer}' does not support batch credential issuance using the 'proofs' request property. Onlt 'proof' supported.`);
         }
@@ -277,7 +287,11 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
                 accessToken: options.accessToken,
                 credentialConfigurationId: offeredCredentialId,
                 dpop: options.dpop
-                    ? await this.getDpopOptions(agentContext, Object.assign(Object.assign({}, options.dpop), { nonce: dpopNonce, dpopSigningAlgValuesSupported: [options.dpop.alg] }))
+                    ? await this.getDpopOptions(agentContext, {
+                        ...options.dpop,
+                        nonce: dpopNonce,
+                        dpopSigningAlgValuesSupported: [options.dpop.alg],
+                    })
                     : undefined,
                 proofs: batchSize > 1 ? { jwt: jwts } : undefined,
                 proof: batchSize === 1
@@ -289,21 +303,25 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
             });
             // Set new nonce values
             cNonce = credentialResponse.c_nonce;
-            dpopNonce = dpop === null || dpop === void 0 ? void 0 : dpop.nonce;
+            dpopNonce = dpop?.nonce;
             // Create credential, but we don't store it yet (only after the user has accepted the credential)
             const credential = await this.handleCredentialResponse(agentContext, credentialResponse, {
-                verifyCredentialStatus: verifyCredentialStatus !== null && verifyCredentialStatus !== void 0 ? verifyCredentialStatus : false,
+                verifyCredentialStatus: verifyCredentialStatus ?? false,
                 credentialIssuerMetadata: metadata.credentialIssuer,
                 format: offeredCredentialConfiguration.format,
                 credentialConfigurationId: offeredCredentialId,
             });
             this.logger.debug('received credential', credential.credentials.map((c) => c instanceof core_1.Mdoc ? { issuerSignedNamespaces: c.issuerSignedNamespaces, base64Url: c.base64Url } : c));
-            receivedCredentials.push(Object.assign(Object.assign({}, credential), { credentialConfigurationId: offeredCredentialId }));
+            receivedCredentials.push({ ...credential, credentialConfigurationId: offeredCredentialId });
         }
         return {
             credentials: receivedCredentials,
             dpop: options.dpop
-                ? Object.assign(Object.assign({}, options.dpop), { nonce: dpopNonce }) : undefined,
+                ? {
+                    ...options.dpop,
+                    nonce: dpopNonce,
+                }
+                : undefined,
             cNonce,
         };
     }
@@ -398,7 +416,6 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
      * algorithm to use, based on the order of preference.
      */
     getProofOfPossessionRequirements(agentContext, options) {
-        var _a, _b, _c, _d, _e;
         const { credentialToRequest } = options;
         if (!OpenId4VciHolderServiceOptions_1.openId4VciSupportedCredentialFormats.includes(credentialToRequest.configuration.format)) {
             throw new core_1.CredoError([
@@ -415,7 +432,7 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
                 throw new core_1.CredoError(`Unsupported proof type(s) ${Object.keys(credentialToRequest.configuration.proof_types_supported).join(', ')}. Supported proof type(s) are: jwt`);
             }
         }
-        const proofSigningAlgsSupported = (_b = (_a = credentialToRequest.configuration.proof_types_supported) === null || _a === void 0 ? void 0 : _a.jwt) === null || _b === void 0 ? void 0 : _b.proof_signing_alg_values_supported;
+        const proofSigningAlgsSupported = credentialToRequest.configuration.proof_types_supported?.jwt?.proof_signing_alg_values_supported;
         // If undefined, it means the issuer didn't include the cryptographic suites in the metadata
         // We just guess that the first one is supported
         if (proofSigningAlgsSupported === undefined) {
@@ -445,14 +462,14 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
             }
         }
         if (signatureAlgorithms.length === 0) {
-            throw new core_1.CredoError(`Could not establish signature algorithm for format ${credentialToRequest.configuration.format} and id ${credentialToRequest.id}. Server supported signature algorithms are '${(_c = proofSigningAlgsSupported === null || proofSigningAlgsSupported === void 0 ? void 0 : proofSigningAlgsSupported.join(', ')) !== null && _c !== void 0 ? _c : 'Not defined'}', available are '${options.possibleProofOfPossessionSignatureAlgorithms.join(', ')}'`);
+            throw new core_1.CredoError(`Could not establish signature algorithm for format ${credentialToRequest.configuration.format} and id ${credentialToRequest.id}. Server supported signature algorithms are '${proofSigningAlgsSupported?.join(', ') ?? 'Not defined'}', available are '${options.possibleProofOfPossessionSignatureAlgorithms.join(', ')}'`);
         }
         const issuerSupportedBindingMethods = credentialToRequest.configuration.cryptographic_binding_methods_supported;
-        const supportsAllDidMethods = (_d = issuerSupportedBindingMethods === null || issuerSupportedBindingMethods === void 0 ? void 0 : issuerSupportedBindingMethods.includes('did')) !== null && _d !== void 0 ? _d : false;
-        const supportedDidMethods = issuerSupportedBindingMethods === null || issuerSupportedBindingMethods === void 0 ? void 0 : issuerSupportedBindingMethods.filter((method) => method.startsWith('did:'));
+        const supportsAllDidMethods = issuerSupportedBindingMethods?.includes('did') ?? false;
+        const supportedDidMethods = issuerSupportedBindingMethods?.filter((method) => method.startsWith('did:'));
         // The cryptographic_binding_methods_supported describe the cryptographic key material that the issued Credential is bound to.
-        const supportsCoseKey = (_e = issuerSupportedBindingMethods === null || issuerSupportedBindingMethods === void 0 ? void 0 : issuerSupportedBindingMethods.includes('cose_key')) !== null && _e !== void 0 ? _e : false;
-        const supportsJwk = (issuerSupportedBindingMethods === null || issuerSupportedBindingMethods === void 0 ? void 0 : issuerSupportedBindingMethods.includes('jwk')) || supportsCoseKey;
+        const supportsCoseKey = issuerSupportedBindingMethods?.includes('cose_key') ?? false;
+        const supportsJwk = issuerSupportedBindingMethods?.includes('jwk') || supportsCoseKey;
         return {
             signatureAlgorithms,
             supportedDidMethods,
@@ -461,10 +478,9 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
         };
     }
     async handleCredentialResponse(agentContext, credentialResponse, options) {
-        var _a;
         const { verifyCredentialStatus, credentialConfigurationId } = options;
         this.logger.debug('Credential response', credentialResponse);
-        const credentials = (_a = credentialResponse.credentials) !== null && _a !== void 0 ? _a : (credentialResponse.credential ? [credentialResponse.credential] : undefined);
+        const credentials = credentialResponse.credentials ?? (credentialResponse.credential ? [credentialResponse.credential] : undefined);
         if (!credentials) {
             throw new core_1.CredoError(`Credential response returned neither 'credentials' nor 'credential' parameter.`);
         }
@@ -506,7 +522,7 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
             if (!result.every((c) => c.result.isValid)) {
                 agentContext.config.logger.error('Failed to validate credentials', { result });
                 throw new core_1.CredoError(`Failed to validate credential, error = ${result
-                    .map((e) => { var _a; return (_a = e.result.error) === null || _a === void 0 ? void 0 : _a.message; })
+                    .map((e) => e.result.error?.message)
                     .filter(Boolean)
                     .join(', ')}`);
             }
@@ -527,7 +543,7 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
             if (!result.every((c) => c.result.isValid)) {
                 agentContext.config.logger.error('Failed to validate credentials', { result });
                 throw new core_1.CredoError(`Failed to validate credential, error = ${result
-                    .map((e) => { var _a; return (_a = e.result.error) === null || _a === void 0 ? void 0 : _a.message; })
+                    .map((e) => e.result.error?.message)
                     .filter(Boolean)
                     .join(', ')}`);
             }
@@ -559,12 +575,12 @@ let OpenId4VciHolderService = class OpenId4VciHolderService {
     }
     getClient(agentContext) {
         return new oid4vci_1.Oid4vciClient({
-            callbacks: (0, callbacks_1.getOid4vciCallbacks)(agentContext),
+            callbacks: (0, callbacks_1.getOid4vcCallbacks)(agentContext),
         });
     }
     getOauth2Client(agentContext) {
         return new oauth2_1.Oauth2Client({
-            callbacks: (0, callbacks_1.getOid4vciCallbacks)(agentContext),
+            callbacks: (0, callbacks_1.getOid4vcCallbacks)(agentContext),
         });
     }
 };
@@ -572,7 +588,6 @@ exports.OpenId4VciHolderService = OpenId4VciHolderService;
 exports.OpenId4VciHolderService = OpenId4VciHolderService = __decorate([
     (0, core_1.injectable)(),
     __param(0, (0, core_1.inject)(core_1.InjectionSymbols.Logger)),
-    __metadata("design:paramtypes", [Object, core_1.W3cCredentialService,
-        core_1.JwsService])
+    __metadata("design:paramtypes", [Object, core_1.W3cCredentialService])
 ], OpenId4VciHolderService);
 //# sourceMappingURL=OpenId4VciHolderService.js.map