@sphereon/oid4vci-client 0.12.1-unstable.4 → 0.12.1-unstable.7

package/dist/CredentialRequestClientBuilder.d.ts

@@ -1,28 +1,43 @@
-import { CredentialOfferRequestWithBaseUrl, EndpointMetadata, OpenId4VCIVersion, UniformCredentialOfferRequest } from '@sphereon/oid4vci-common';
-import { CredentialRequestClientBuilderV1_0_11 } from './CredentialRequestClientBuilderV1_0_11';
-import { CredentialRequestClientBuilderV1_0_13 } from './CredentialRequestClientBuilderV1_0_13';
+import { AccessTokenResponse, CredentialIssuerMetadata, CredentialIssuerMetadataV1_0_13, CredentialOfferRequestWithBaseUrl, EndpointMetadata, ExperimentalSubjectIssuance, OID4VCICredentialFormat, OpenId4VCIVersion, UniformCredentialOfferRequest } from '@sphereon/oid4vci-common';
+import { CredentialFormat } from '@sphereon/ssi-types';
 export declare class CredentialRequestClientBuilder {
+    private _builder;
+    private constructor();
     static fromCredentialIssuer({ credentialIssuer, metadata, version, credentialIdentifier, credentialTypes, }: {
         credentialIssuer: string;
         metadata?: EndpointMetadata;
         version?: OpenId4VCIVersion;
         credentialIdentifier?: string;
         credentialTypes?: string | string[];
-    }): CredentialRequestClientBuilderV1_0_13 | CredentialRequestClientBuilderV1_0_11;
-    static fromURI({ uri, metadata, }: {
+    }): CredentialRequestClientBuilder;
+    static fromURI({ uri, metadata }: {
         uri: string;
         metadata?: EndpointMetadata;
-    }): Promise<CredentialRequestClientBuilderV1_0_11 | CredentialRequestClientBuilderV1_0_13>;
+    }): Promise<CredentialRequestClientBuilder>;
     static fromCredentialOfferRequest(opts: {
         request: UniformCredentialOfferRequest;
         scheme?: string;
         baseUrl?: string;
         version?: OpenId4VCIVersion;
         metadata?: EndpointMetadata;
-    }): CredentialRequestClientBuilderV1_0_11 | CredentialRequestClientBuilderV1_0_13;
+    }): CredentialRequestClientBuilder;
     static fromCredentialOffer({ credentialOffer, metadata, }: {
         credentialOffer: CredentialOfferRequestWithBaseUrl;
         metadata?: EndpointMetadata;
-    }): CredentialRequestClientBuilderV1_0_11 | CredentialRequestClientBuilderV1_0_13;
+    }): CredentialRequestClientBuilder;
+    getVersion(): OpenId4VCIVersion | undefined;
+    withCredentialEndpointFromMetadata(metadata: CredentialIssuerMetadata | CredentialIssuerMetadataV1_0_13): this;
+    withCredentialEndpoint(credentialEndpoint: string): this;
+    withDeferredCredentialEndpointFromMetadata(metadata: CredentialIssuerMetadata | CredentialIssuerMetadataV1_0_13): this;
+    withDeferredCredentialEndpoint(deferredCredentialEndpoint: string): this;
+    withDeferredCredentialAwait(deferredCredentialAwait: boolean, deferredCredentialIntervalInMS?: number): this;
+    withCredentialIdentifier(credentialIdentifier: string): this;
+    withCredentialType(credentialTypes: string | string[]): this;
+    withFormat(format: CredentialFormat | OID4VCICredentialFormat): this;
+    withSubjectIssuance(subjectIssuance: ExperimentalSubjectIssuance): this;
+    withToken(accessToken: string): this;
+    withTokenFromResponse(response: AccessTokenResponse): this;
+    withVersion(version: OpenId4VCIVersion): this;
+    build(): import("./CredentialRequestClientV1_0_11").CredentialRequestClientV1_0_11 | import("./CredentialRequestClient").CredentialRequestClient;
 }
 //# sourceMappingURL=CredentialRequestClientBuilder.d.ts.map

package/dist/CredentialRequestClientBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CredentialRequestClientBuilder.d.ts","sourceRoot":"","sources":["../lib/CredentialRequestClientBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iCAAiC,EAEjC,gBAAgB,EAChB,iBAAiB,EACjB,6BAA6B,EAC9B,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,qCAAqC,EAAE,MAAM,yCAAyC,CAAC;AAChG,OAAO,EAAE,qCAAqC,EAAE,MAAM,yCAAyC,CAAC;AAEhG,qBAAa,8BAA8B;WAC3B,oBAAoB,CAAC,EACjC,gBAAgB,EAChB,QAAQ,EACR,OAAO,EACP,oBAAoB,EACpB,eAAe,GAChB,EAAE;QACD,gBAAgB,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;QAC5B,OAAO,CAAC,EAAE,iBAAiB,CAAC;QAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;KACrC,GAAG,qCAAqC,GAAG,qCAAqC;WAkB7D,OAAO,CAAC,EAC1B,GAAG,EACH,QAAQ,GACT,EAAE;QACD,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,CAAC,EAAE,gBAAgB,CAAC;KAC7B,GAAG,OAAO,CAAC,qCAAqC,GAAG,qCAAqC,CAAC;WAK5E,0BAA0B,CAAC,IAAI,EAAE;QAC7C,OAAO,EAAE,6BAA6B,CAAC;QACvC,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,iBAAiB,CAAC;QAC5B,QAAQ,CAAC,EAAE,gBAAgB,CAAC;KAC7B,GAAG,qCAAqC,GAAG,qCAAqC;WASnE,mBAAmB,CAAC,EAChC,eAAe,EACf,QAAQ,GACT,EAAE;QACD,eAAe,EAAE,iCAAiC,CAAC;QACnD,QAAQ,CAAC,EAAE,gBAAgB,CAAC;KAC7B,GAAG,qCAAqC,GAAG,qCAAqC;CAalF"}
+{"version":3,"file":"CredentialRequestClientBuilder.d.ts","sourceRoot":"","sources":["../lib/CredentialRequestClientBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,+BAA+B,EAC/B,iCAAiC,EAEjC,gBAAgB,EAChB,2BAA2B,EAC3B,uBAAuB,EACvB,iBAAiB,EACjB,6BAA6B,EAC9B,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAYtD,qBAAa,8BAA8B;IACzC,OAAO,CAAC,QAAQ,CAAgD;IAEhE,OAAO;WAIO,oBAAoB,CAAC,EACE,gBAAgB,EAChB,QAAQ,EACR,OAAO,EACP,oBAAoB,EACpB,eAAe,GAChB,EAAE;QACpC,gBAAgB,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;QAC5B,OAAO,CAAC,EAAE,iBAAiB,CAAC;QAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;KACrC,GAAG,8BAA8B;WA2Bd,OAAO,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,gBAAgB,CAAA;KAAE,GAAG,OAAO,CAAC,8BAA8B,CAAC;WAUvH,0BAA0B,CAAC,IAAI,EAAE;QAC7C,OAAO,EAAE,6BAA6B,CAAC;QACvC,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,iBAAiB,CAAC;QAC5B,QAAQ,CAAC,EAAE,gBAAgB,CAAC;KAC7B,GAAG,8BAA8B;WAcpB,mBAAmB,CAAC,EACE,eAAe,EACf,QAAQ,GACT,EAAE;QACnC,eAAe,EAAE,iCAAiC,CAAC;QACnD,QAAQ,CAAC,EAAE,gBAAgB,CAAC;KAC7B,GAAG,8BAA8B;IAmB3B,UAAU,IAAI,iBAAiB,GAAG,SAAS;IAI3C,kCAAkC,CAAC,QAAQ,EAAE,wBAAwB,GAAG,+BAA+B,GAAG,IAAI;IAS9G,sBAAsB,CAAC,kBAAkB,EAAE,MAAM,GAAG,IAAI;IAKxD,0CAA0C,CAAC,QAAQ,EAAE,wBAAwB,GAAG,+BAA+B,GAAG,IAAI;IAStH,8BAA8B,CAAC,0BAA0B,EAAE,MAAM,GAAG,IAAI;IAKxE,2BAA2B,CAAC,uBAAuB,EAAE,OAAO,EAAE,8BAA8B,CAAC,EAAE,MAAM,GAAG,IAAI;IAK5G,wBAAwB,CAAC,oBAAoB,EAAE,MAAM,GAAG,IAAI;IAQ5D,kBAAkB,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAK5D,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,uBAAuB,GAAG,IAAI;IAKpE,mBAAmB,CAAC,eAAe,EAAE,2BAA2B,GAAG,IAAI;IAKvE,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAKpC,qBAAqB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI;IAK1D,WAAW,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI;IAK7C,KAAK;CAGb"}

package/dist/CredentialRequestClientBuilder.js

@@ -14,11 +14,18 @@ const oid4vci_common_1 = require("@sphereon/oid4vci-common");
 const CredentialOfferClient_1 = require("./CredentialOfferClient");
 const CredentialRequestClientBuilderV1_0_11_1 = require("./CredentialRequestClientBuilderV1_0_11");
 const CredentialRequestClientBuilderV1_0_13_1 = require("./CredentialRequestClientBuilderV1_0_13");
+function isV1_0_13(builder) {
+    return builder.withCredentialIdentifier !== undefined;
+}
 class CredentialRequestClientBuilder {
+    constructor(builder) {
+        this._builder = builder;
+    }
     static fromCredentialIssuer({ credentialIssuer, metadata, version, credentialIdentifier, credentialTypes, }) {
-        const specVersion = version ? version : oid4vci_common_1.OpenId4VCIVersion.VER_1_0_13;
+        const specVersion = version !== null && version !== void 0 ? version : oid4vci_common_1.OpenId4VCIVersion.VER_1_0_13;
+        let builder;
         if (specVersion >= oid4vci_common_1.OpenId4VCIVersion.VER_1_0_13) {
-            return CredentialRequestClientBuilderV1_0_13_1.CredentialRequestClientBuilderV1_0_13.fromCredentialIssuer({
+            builder = CredentialRequestClientBuilderV1_0_13_1.CredentialRequestClientBuilderV1_0_13.fromCredentialIssuer({
                 credentialIssuer,
                 metadata,
                 version,
@@ -30,10 +37,16 @@ class CredentialRequestClientBuilder {
             if (!credentialTypes || credentialTypes.length === 0) {
                 throw new Error('CredentialTypes must be provided for v1_0_11');
             }
-            return CredentialRequestClientBuilderV1_0_11_1.CredentialRequestClientBuilderV1_0_11.fromCredentialIssuer({ credentialIssuer, metadata, version, credentialTypes });
+            builder = CredentialRequestClientBuilderV1_0_11_1.CredentialRequestClientBuilderV1_0_11.fromCredentialIssuer({
+                credentialIssuer,
+                metadata,
+                version,
+                credentialTypes,
+            });
         }
+        return new CredentialRequestClientBuilder(builder);
     }
-    static fromURI({ uri, metadata, }) {
+    static fromURI({ uri, metadata }) {
         return __awaiter(this, void 0, void 0, function* () {
             const offer = yield CredentialOfferClient_1.CredentialOfferClient.fromURI(uri);
             return CredentialRequestClientBuilder.fromCredentialOfferRequest(Object.assign(Object.assign({ request: offer }, offer), { metadata, version: offer.version }));
@@ -43,23 +56,98 @@ class CredentialRequestClientBuilder {
         var _a, _b;
         const { request } = opts;
         const version = (_b = (_a = opts.version) !== null && _a !== void 0 ? _a : request.version) !== null && _b !== void 0 ? _b : (0, oid4vci_common_1.determineSpecVersionFromOffer)(request.original_credential_offer);
+        let builder;
         if (version < oid4vci_common_1.OpenId4VCIVersion.VER_1_0_13) {
-            return CredentialRequestClientBuilderV1_0_11_1.CredentialRequestClientBuilderV1_0_11.fromCredentialOfferRequest(opts);
+            builder = CredentialRequestClientBuilderV1_0_11_1.CredentialRequestClientBuilderV1_0_11.fromCredentialOfferRequest(opts);
+        }
+        else {
+            builder = CredentialRequestClientBuilderV1_0_13_1.CredentialRequestClientBuilderV1_0_13.fromCredentialOfferRequest(opts);
         }
-        return CredentialRequestClientBuilderV1_0_13_1.CredentialRequestClientBuilderV1_0_13.fromCredentialOfferRequest(opts);
+        return new CredentialRequestClientBuilder(builder);
     }
     static fromCredentialOffer({ credentialOffer, metadata, }) {
         const version = (0, oid4vci_common_1.determineSpecVersionFromOffer)(credentialOffer.credential_offer);
+        let builder;
         if (version < oid4vci_common_1.OpenId4VCIVersion.VER_1_0_13) {
-            return CredentialRequestClientBuilderV1_0_11_1.CredentialRequestClientBuilderV1_0_11.fromCredentialOffer({
+            builder = CredentialRequestClientBuilderV1_0_11_1.CredentialRequestClientBuilderV1_0_11.fromCredentialOffer({
                 credentialOffer,
                 metadata,
             });
         }
-        return CredentialRequestClientBuilderV1_0_13_1.CredentialRequestClientBuilderV1_0_13.fromCredentialOffer({
-            credentialOffer,
-            metadata,
-        });
+        else {
+            builder = CredentialRequestClientBuilderV1_0_13_1.CredentialRequestClientBuilderV1_0_13.fromCredentialOffer({
+                credentialOffer,
+                metadata,
+            });
+        }
+        return new CredentialRequestClientBuilder(builder);
+    }
+    getVersion() {
+        return this._builder.version;
+    }
+    withCredentialEndpointFromMetadata(metadata) {
+        if (isV1_0_13(this._builder)) {
+            this._builder.withCredentialEndpointFromMetadata(metadata);
+        }
+        else {
+            this._builder.withCredentialEndpointFromMetadata(metadata);
+        }
+        return this;
+    }
+    withCredentialEndpoint(credentialEndpoint) {
+        this._builder.withCredentialEndpoint(credentialEndpoint);
+        return this;
+    }
+    withDeferredCredentialEndpointFromMetadata(metadata) {
+        if (isV1_0_13(this._builder)) {
+            this._builder.withDeferredCredentialEndpointFromMetadata(metadata);
+        }
+        else {
+            this._builder.withDeferredCredentialEndpointFromMetadata(metadata);
+        }
+        return this;
+    }
+    withDeferredCredentialEndpoint(deferredCredentialEndpoint) {
+        this._builder.withDeferredCredentialEndpoint(deferredCredentialEndpoint);
+        return this;
+    }
+    withDeferredCredentialAwait(deferredCredentialAwait, deferredCredentialIntervalInMS) {
+        this._builder.withDeferredCredentialAwait(deferredCredentialAwait, deferredCredentialIntervalInMS);
+        return this;
+    }
+    withCredentialIdentifier(credentialIdentifier) {
+        if (this._builder.version === undefined || this._builder.version < oid4vci_common_1.OpenId4VCIVersion.VER_1_0_13) {
+            throw new Error('Version of spec should be equal or higher than v1_0_13');
+        }
+        this._builder.withCredentialIdentifier(credentialIdentifier);
+        return this;
+    }
+    withCredentialType(credentialTypes) {
+        this._builder.withCredentialType(credentialTypes);
+        return this;
+    }
+    withFormat(format) {
+        this._builder.withFormat(format);
+        return this;
+    }
+    withSubjectIssuance(subjectIssuance) {
+        this._builder.withSubjectIssuance(subjectIssuance);
+        return this;
+    }
+    withToken(accessToken) {
+        this._builder.withToken(accessToken);
+        return this;
+    }
+    withTokenFromResponse(response) {
+        this._builder.withTokenFromResponse(response);
+        return this;
+    }
+    withVersion(version) {
+        this._builder.withVersion(version);
+        return this;
+    }
+    build() {
+        return this._builder.build();
     }
 }
 exports.CredentialRequestClientBuilder = CredentialRequestClientBuilder;

package/dist/CredentialRequestClientBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"CredentialRequestClientBuilder.js","sourceRoot":"","sources":["../lib/CredentialRequestClientBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAMkC;AAElC,mEAAgE;AAChE,mGAAgG;AAChG,mGAAgG;AAEhG,MAAa,8BAA8B;IAClC,MAAM,CAAC,oBAAoB,CAAC,EACjC,gBAAgB,EAChB,QAAQ,EACR,OAAO,EACP,oBAAoB,EACpB,eAAe,GAOhB;QACC,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,kCAAiB,CAAC,UAAU,CAAC;QACrE,IAAI,WAAW,IAAI,kCAAiB,CAAC,UAAU,EAAE,CAAC;YAChD,OAAO,6EAAqC,CAAC,oBAAoB,CAAC;gBAChE,gBAAgB;gBAChB,QAAQ;gBACR,OAAO;gBACP,oBAAoB;gBACpB,eAAe;aAChB,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,eAAe,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACrD,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;YAClE,CAAC;YACD,OAAO,6EAAqC,CAAC,oBAAoB,CAAC,EAAE,gBAAgB,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;QAC9H,CAAC;IACH,CAAC;IAEM,MAAM,CAAO,OAAO,CAAC,EAC1B,GAAG,EACH,QAAQ,GAIT;;YACC,MAAM,KAAK,GAAG,MAAM,6CAAqB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACvD,OAAO,8BAA8B,CAAC,0BAA0B,+BAAG,OAAO,EAAE,KAAK,IAAK,KAAK,KAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,IAAG,CAAC;QACnI,CAAC;KAAA;IAEM,MAAM,CAAC,0BAA0B,CAAC,IAMxC;;QACC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,OAAO,GAAG,MAAA,MAAA,IAAI,CAAC,OAAO,mCAAI,OAAO,CAAC,OAAO,mCAAI,IAAA,8CAA6B,EAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;QACpH,IAAI,OAAO,GAAG,kCAAiB,CAAC,UAAU,EAAE,CAAC;YAC3C,OAAO,6EAAqC,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;QAChF,CAAC;QACD,OAAO,6EAAqC,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;IAChF,CAAC;IAEM,MAAM,CAAC,mBAAmB,CAAC,EAChC,eAAe,EACf,QAAQ,GAIT;QACC,MAAM,OAAO,GAAG,IAAA,8CAA6B,EAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;QAChF,IAAI,OAAO,GAAG,kCAAiB,CAAC,UAAU,EAAE,CAAC;YAC3C,OAAO,6EAAqC,CAAC,mBAAmB,CAAC;gBAC/D,eAAe;gBACf,QAAQ;aACT,CAAC,CAAC;QACL,CAAC;QACD,OAAO,6EAAqC,CAAC,mBAAmB,CAAC;YAC/D,eAAe;YACf,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;CACF;AA5ED,wEA4EC"}
+{"version":3,"file":"CredentialRequestClientBuilder.js","sourceRoot":"","sources":["../lib/CredentialRequestClientBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAWiC;AAGjC,mEAAgE;AAChE,mGAAgG;AAChG,mGAAgG;AAIhG,SAAS,SAAS,CAAC,OAAsD;IACvE,OAAQ,OAAiD,CAAC,wBAAwB,KAAK,SAAS,CAAC;AACnG,CAAC;AAED,MAAa,8BAA8B;IAGzC,YAAoB,OAAsD;QACxE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAEM,MAAM,CAAC,oBAAoB,CAAC,EACE,gBAAgB,EAChB,QAAQ,EACR,OAAO,EACP,oBAAoB,EACpB,eAAe,GAOnD;QACC,MAAM,WAAW,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,kCAAiB,CAAC,UAAU,CAAC;QAC5D,IAAI,OAAO,CAAC;QAEZ,IAAI,WAAW,IAAI,kCAAiB,CAAC,UAAU,EAAE,CAAC;YAChD,OAAO,GAAG,6EAAqC,CAAC,oBAAoB,CAAC;gBACnE,gBAAgB;gBAChB,QAAQ;gBACR,OAAO;gBACP,oBAAoB;gBACpB,eAAe;aAChB,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,eAAe,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACrD,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;YAClE,CAAC;YACD,OAAO,GAAG,6EAAqC,CAAC,oBAAoB,CAAC;gBACnE,gBAAgB;gBAChB,QAAQ;gBACR,OAAO;gBACP,eAAe;aAChB,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,8BAA8B,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,MAAM,CAAO,OAAO,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAgD;;YACzF,MAAM,KAAK,GAAG,MAAM,6CAAqB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACvD,OAAO,8BAA8B,CAAC,0BAA0B,+BAC9D,OAAO,EAAE,KAAK,IACX,KAAK,KACR,QAAQ,EACR,OAAO,EAAE,KAAK,CAAC,OAAO,IACtB,CAAC;QACL,CAAC;KAAA;IAEM,MAAM,CAAC,0BAA0B,CAAC,IAMxC;;QACC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,OAAO,GAAG,MAAA,MAAA,IAAI,CAAC,OAAO,mCAAI,OAAO,CAAC,OAAO,mCAAI,IAAA,8CAA6B,EAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;QACpH,IAAI,OAAO,CAAC;QAEZ,IAAI,OAAO,GAAG,kCAAiB,CAAC,UAAU,EAAE,CAAC;YAC3C,OAAO,GAAG,6EAAqC,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;QACnF,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,6EAAqC,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;QACnF,CAAC;QAED,OAAO,IAAI,8BAA8B,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,MAAM,CAAC,mBAAmB,CAAC,EACE,eAAe,EACf,QAAQ,GAI3C;QACC,MAAM,OAAO,GAAG,IAAA,8CAA6B,EAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;QAChF,IAAI,OAAO,CAAC;QAEZ,IAAI,OAAO,GAAG,kCAAiB,CAAC,UAAU,EAAE,CAAC;YAC3C,OAAO,GAAG,6EAAqC,CAAC,mBAAmB,CAAC;gBAClE,eAAe;gBACf,QAAQ;aACT,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,6EAAqC,CAAC,mBAAmB,CAAC;gBAClE,eAAe;gBACf,QAAQ;aACT,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,8BAA8B,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IAC/B,CAAC;IAEM,kCAAkC,CAAC,QAAoE;QAC5G,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,QAAQ,CAAC,kCAAkC,CAAC,QAA2C,CAAC,CAAA;QAC/F,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,CAAC,kCAAkC,CAAC,QAAoC,CAAC,CAAA;QACxF,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,sBAAsB,CAAC,kBAA0B;QACtD,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,0CAA0C,CAAC,QAAoE;QACpH,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,QAAQ,CAAC,0CAA0C,CAAC,QAA2C,CAAC,CAAC;QACxG,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,CAAC,0CAA0C,CAAC,QAAoC,CAAC,CAAC;QACjG,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,8BAA8B,CAAC,0BAAkC;QACtE,IAAI,CAAC,QAAQ,CAAC,8BAA8B,CAAC,0BAA0B,CAAC,CAAC;QACzE,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,2BAA2B,CAAC,uBAAgC,EAAE,8BAAuC;QAC1G,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC,uBAAuB,EAAE,8BAA8B,CAAC,CAAC;QACnG,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,wBAAwB,CAAC,oBAA4B;QAC1D,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,kCAAiB,CAAC,UAAU,EAAE,CAAC;YAChG,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC5E,CAAC;QACA,IAAI,CAAC,QAAkD,CAAC,wBAAwB,CAAC,oBAAoB,CAAC,CAAC;QACxG,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,kBAAkB,CAAC,eAAkC;QAC1D,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,UAAU,CAAC,MAAkD;QAClE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,mBAAmB,CAAC,eAA4C;QACrE,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,SAAS,CAAC,WAAmB;QAClC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,qBAAqB,CAAC,QAA6B;QACxD,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,WAAW,CAAC,OAA0B;QAC3C,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK;QACV,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;CACF;AAnLD,wEAmLC"}

package/lib/CredentialRequestClientBuilder.ts

@@ -1,32 +1,52 @@
 import {
+  AccessTokenResponse,
+  CredentialIssuerMetadata,
+  CredentialIssuerMetadataV1_0_13,
   CredentialOfferRequestWithBaseUrl,
   determineSpecVersionFromOffer,
   EndpointMetadata,
+  ExperimentalSubjectIssuance,
+  OID4VCICredentialFormat,
   OpenId4VCIVersion,
-  UniformCredentialOfferRequest,
-} from '@sphereon/oid4vci-common';
+  UniformCredentialOfferRequest
+} from '@sphereon/oid4vci-common'
+import { CredentialFormat } from '@sphereon/ssi-types'
 
 import { CredentialOfferClient } from './CredentialOfferClient';
 import { CredentialRequestClientBuilderV1_0_11 } from './CredentialRequestClientBuilderV1_0_11';
 import { CredentialRequestClientBuilderV1_0_13 } from './CredentialRequestClientBuilderV1_0_13';
 
+type CredentialRequestClientBuilderVersionSpecific = CredentialRequestClientBuilderV1_0_11 | CredentialRequestClientBuilderV1_0_13;
+
+function isV1_0_13(builder: CredentialRequestClientBuilderVersionSpecific): builder is CredentialRequestClientBuilderV1_0_13 {
+  return (builder as CredentialRequestClientBuilderV1_0_13).withCredentialIdentifier !== undefined;
+}
+
 export class CredentialRequestClientBuilder {
+  private _builder: CredentialRequestClientBuilderVersionSpecific;
+
+  private constructor(builder: CredentialRequestClientBuilderVersionSpecific) {
+    this._builder = builder;
+  }
+
   public static fromCredentialIssuer({
-    credentialIssuer,
-    metadata,
-    version,
-    credentialIdentifier,
-    credentialTypes,
-  }: {
+                                       credentialIssuer,
+                                       metadata,
+                                       version,
+                                       credentialIdentifier,
+                                       credentialTypes,
+                                     }: {
     credentialIssuer: string;
     metadata?: EndpointMetadata;
     version?: OpenId4VCIVersion;
     credentialIdentifier?: string;
     credentialTypes?: string | string[];
-  }): CredentialRequestClientBuilderV1_0_13 | CredentialRequestClientBuilderV1_0_11 {
-    const specVersion = version ? version : OpenId4VCIVersion.VER_1_0_13;
+  }): CredentialRequestClientBuilder {
+    const specVersion = version ?? OpenId4VCIVersion.VER_1_0_13;
+    let builder;
+
     if (specVersion >= OpenId4VCIVersion.VER_1_0_13) {
-      return CredentialRequestClientBuilderV1_0_13.fromCredentialIssuer({
+      builder = CredentialRequestClientBuilderV1_0_13.fromCredentialIssuer({
         credentialIssuer,
         metadata,
         version,
@@ -37,19 +57,25 @@ export class CredentialRequestClientBuilder {
       if (!credentialTypes || credentialTypes.length === 0) {
         throw new Error('CredentialTypes must be provided for v1_0_11');
       }
-      return CredentialRequestClientBuilderV1_0_11.fromCredentialIssuer({ credentialIssuer, metadata, version, credentialTypes });
+      builder = CredentialRequestClientBuilderV1_0_11.fromCredentialIssuer({
+        credentialIssuer,
+        metadata,
+        version,
+        credentialTypes,
+      });
     }
+
+    return new CredentialRequestClientBuilder(builder);
   }
 
-  public static async fromURI({
-    uri,
-    metadata,
-  }: {
-    uri: string;
-    metadata?: EndpointMetadata;
-  }): Promise<CredentialRequestClientBuilderV1_0_11 | CredentialRequestClientBuilderV1_0_13> {
+  public static async fromURI({ uri, metadata }: { uri: string; metadata?: EndpointMetadata }): Promise<CredentialRequestClientBuilder> {
     const offer = await CredentialOfferClient.fromURI(uri);
-    return CredentialRequestClientBuilder.fromCredentialOfferRequest({ request: offer, ...offer, metadata, version: offer.version });
+    return CredentialRequestClientBuilder.fromCredentialOfferRequest({
+      request: offer,
+      ...offer,
+      metadata,
+      version: offer.version,
+    });
   }
 
   public static fromCredentialOfferRequest(opts: {
@@ -58,32 +84,121 @@ export class CredentialRequestClientBuilder {
     baseUrl?: string;
     version?: OpenId4VCIVersion;
     metadata?: EndpointMetadata;
-  }): CredentialRequestClientBuilderV1_0_11 | CredentialRequestClientBuilderV1_0_13 {
+  }): CredentialRequestClientBuilder {
     const { request } = opts;
     const version = opts.version ?? request.version ?? determineSpecVersionFromOffer(request.original_credential_offer);
+    let builder;
+
     if (version < OpenId4VCIVersion.VER_1_0_13) {
-      return CredentialRequestClientBuilderV1_0_11.fromCredentialOfferRequest(opts);
+      builder = CredentialRequestClientBuilderV1_0_11.fromCredentialOfferRequest(opts);
+    } else {
+      builder = CredentialRequestClientBuilderV1_0_13.fromCredentialOfferRequest(opts);
     }
-    return CredentialRequestClientBuilderV1_0_13.fromCredentialOfferRequest(opts);
+
+    return new CredentialRequestClientBuilder(builder);
   }
 
   public static fromCredentialOffer({
-    credentialOffer,
-    metadata,
-  }: {
+                                      credentialOffer,
+                                      metadata,
+                                    }: {
     credentialOffer: CredentialOfferRequestWithBaseUrl;
     metadata?: EndpointMetadata;
-  }): CredentialRequestClientBuilderV1_0_11 | CredentialRequestClientBuilderV1_0_13 {
+  }): CredentialRequestClientBuilder {
     const version = determineSpecVersionFromOffer(credentialOffer.credential_offer);
+    let builder;
+
     if (version < OpenId4VCIVersion.VER_1_0_13) {
-      return CredentialRequestClientBuilderV1_0_11.fromCredentialOffer({
+      builder = CredentialRequestClientBuilderV1_0_11.fromCredentialOffer({
+        credentialOffer,
+        metadata,
+      });
+    } else {
+      builder = CredentialRequestClientBuilderV1_0_13.fromCredentialOffer({
         credentialOffer,
         metadata,
       });
     }
-    return CredentialRequestClientBuilderV1_0_13.fromCredentialOffer({
-      credentialOffer,
-      metadata,
-    });
+
+    return new CredentialRequestClientBuilder(builder);
+  }
+
+  public getVersion(): OpenId4VCIVersion | undefined {
+    return this._builder.version;
+  }
+
+  public withCredentialEndpointFromMetadata(metadata: CredentialIssuerMetadata | CredentialIssuerMetadataV1_0_13): this {
+    if (isV1_0_13(this._builder)) {
+      this._builder.withCredentialEndpointFromMetadata(metadata as CredentialIssuerMetadataV1_0_13)
+    } else {
+      this._builder.withCredentialEndpointFromMetadata(metadata as CredentialIssuerMetadata)
+    }
+    return this;
+  }
+
+  public withCredentialEndpoint(credentialEndpoint: string): this {
+    this._builder.withCredentialEndpoint(credentialEndpoint);
+    return this;
+  }
+
+  public withDeferredCredentialEndpointFromMetadata(metadata: CredentialIssuerMetadata | CredentialIssuerMetadataV1_0_13): this {
+    if (isV1_0_13(this._builder)) {
+      this._builder.withDeferredCredentialEndpointFromMetadata(metadata as CredentialIssuerMetadataV1_0_13);
+    } else {
+      this._builder.withDeferredCredentialEndpointFromMetadata(metadata as CredentialIssuerMetadata);
+    }
+    return this;
+  }
+
+  public withDeferredCredentialEndpoint(deferredCredentialEndpoint: string): this {
+    this._builder.withDeferredCredentialEndpoint(deferredCredentialEndpoint);
+    return this;
+  }
+
+  public withDeferredCredentialAwait(deferredCredentialAwait: boolean, deferredCredentialIntervalInMS?: number): this {
+    this._builder.withDeferredCredentialAwait(deferredCredentialAwait, deferredCredentialIntervalInMS);
+    return this;
+  }
+
+  public withCredentialIdentifier(credentialIdentifier: string): this {
+    if (this._builder.version === undefined || this._builder.version < OpenId4VCIVersion.VER_1_0_13) {
+      throw new Error('Version of spec should be equal or higher than v1_0_13');
+    }
+    (this._builder as CredentialRequestClientBuilderV1_0_13).withCredentialIdentifier(credentialIdentifier);
+    return this;
+  }
+
+  public withCredentialType(credentialTypes: string | string[]): this {
+    this._builder.withCredentialType(credentialTypes);
+    return this;
+  }
+
+  public withFormat(format: CredentialFormat | OID4VCICredentialFormat): this {
+    this._builder.withFormat(format);
+    return this;
+  }
+
+  public withSubjectIssuance(subjectIssuance: ExperimentalSubjectIssuance): this {
+    this._builder.withSubjectIssuance(subjectIssuance);
+    return this;
+  }
+
+  public withToken(accessToken: string): this {
+    this._builder.withToken(accessToken);
+    return this;
+  }
+
+  public withTokenFromResponse(response: AccessTokenResponse): this {
+    this._builder.withTokenFromResponse(response);
+    return this;
+  }
+
+  public withVersion(version: OpenId4VCIVersion): this {
+    this._builder.withVersion(version);
+    return this;
+  }
+
+  public build() {
+    return this._builder.build();
   }
 }

package/lib/__tests__/CredentialRequestClient.spec.ts

@@ -20,7 +20,7 @@ import * as jose from 'jose';
 // @ts-ignore
 import nock from 'nock';
 
-import { CredentialOfferClient, CredentialRequestClientBuilderV1_0_13, MetadataClient, ProofOfPossessionBuilder } from '..';
+import { CredentialOfferClient, MetadataClient, ProofOfPossessionBuilder } from '..';
 import { CredentialRequestClientBuilder } from '../CredentialRequestClientBuilder';
 
 import { IDENTIPROOF_ISSUER_URL, IDENTIPROOF_OID4VCI_METADATA, INITIATION_TEST, WALT_OID4VCI_METADATA } from './MetadataMocks';
@@ -114,9 +114,7 @@ describe('Credential Request Client ', () => {
   });
 
   it('should fail with invalid url', async () => {
-    const credReqClient = (
-      CredentialRequestClientBuilder.fromCredentialOfferRequest({ request: INITIATION_TEST }) as CredentialRequestClientBuilderV1_0_13
-    )
+    const credReqClient = CredentialRequestClientBuilder.fromCredentialOfferRequest({ request: INITIATION_TEST })
       .withCredentialEndpoint('httpsf://oidc4vci.demo.spruceid.com/credential')
       .withFormat('jwt_vc')
       .withCredentialIdentifier('https://imsglobal.github.io/openbadges-specification/ob_v3p0.html#OpenBadgeCredential')

package/lib/__tests__/CredentialRequestClientBuilder.spec.ts

@@ -11,7 +11,7 @@ import {
 } from '@sphereon/oid4vci-common';
 import * as jose from 'jose';
 
-import { CredentialRequestClientBuilderV1_0_13, ProofOfPossessionBuilder } from '..';
+import { CredentialRequestOpts, ProofOfPossessionBuilder } from '..';
 import { CredentialRequestClientBuilder } from '../CredentialRequestClientBuilder';
 
 import { IDENTIPROOF_ISSUER_URL, IDENTIPROOF_OID4VCI_METADATA, INITIATION_TEST_URI, WALT_ISSUER_URL, WALT_OID4VCI_METADATA } from './MetadataMocks';
@@ -82,7 +82,7 @@ async function proofOfPossessionVerifierCallbackFunction(args: { jwt: string; ki
 
 describe('Credential Request Client Builder', () => {
   it('should build correctly provided with correct params', async function () {
-    const credReqClient = ((await CredentialRequestClientBuilder.fromURI({ uri: INITIATION_TEST_URI })) as CredentialRequestClientBuilderV1_0_13)
+    const credReqClient = (await CredentialRequestClientBuilder.fromURI({ uri: INITIATION_TEST_URI }))
       .withCredentialEndpoint('https://oidc4vci.demo.spruceid.com/credential')
       .withFormat('jwt_vc')
       .withCredentialIdentifier('credentialType')
@@ -90,12 +90,12 @@ describe('Credential Request Client Builder', () => {
       .build();
     expect(credReqClient.credentialRequestOpts.credentialEndpoint).toBe('https://oidc4vci.demo.spruceid.com/credential');
     expect(credReqClient.credentialRequestOpts.format).toBe('jwt_vc');
-    expect(credReqClient.credentialRequestOpts.credentialIdentifier).toStrictEqual('credentialType');
+    expect((credReqClient.credentialRequestOpts as CredentialRequestOpts).credentialIdentifier).toStrictEqual('credentialType');
     expect(credReqClient.credentialRequestOpts.token).toBe('token');
   });
 
   it('should build credential request correctly', async () => {
-    const credReqClient = ((await CredentialRequestClientBuilder.fromURI({ uri: INITIATION_TEST_URI })) as CredentialRequestClientBuilderV1_0_13)
+    const credReqClient = (await CredentialRequestClientBuilder.fromURI({ uri: INITIATION_TEST_URI }))
       .withCredentialEndpoint('https://oidc4vci.demo.spruceid.com/credential')
       .withFormat('jwt_vc')
       .withCredentialIdentifier('OpenBadgeCredential')

package/lib/__tests__/IT.spec.ts

@@ -1,12 +1,12 @@
 import {
   AccessTokenResponse,
-  Alg,
+  Alg, CredentialOfferPayloadV1_0_13,
   CredentialOfferRequestWithBaseUrl,
   Jwt,
   OpenId4VCIVersion,
-  ProofOfPossession,
-  WellKnownEndpoints,
-} from '@sphereon/oid4vci-common';
+  ProofOfPossession, resolveCredentialOfferURI,
+  WellKnownEndpoints
+} from '@sphereon/oid4vci-common'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import nock from 'nock';
@@ -36,11 +36,27 @@ const jwtWithoutDid = {
   payload: { iss: 'test-clientId', nonce: 'tZignsnFbp', jti: 'tZignsnFbp223', aud: ISSUER_URL },
 };
 
+const mockedVC =
+  'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2YyI6eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vd3d3LnczLm9yZy8yMDE4L2NyZWRlbnRpYWxzL2V4YW1wbGVzL3YxIl0sImlkIjoiaHR0cDovL2V4YW1wbGUuZWR1L2NyZWRlbnRpYWxzLzM3MzIiLCJ0eXBlIjpbIlZlcmlmaWFibGVDcmVkZW50aWFsIiwiVW5pdmVyc2l0eURlZ3JlZUNyZWRlbnRpYWwiXSwiaXNzdWVyIjoiaHR0cHM6Ly9leGFtcGxlLmVkdS9pc3N1ZXJzLzU2NTA0OSIsImlzc3VhbmNlRGF0ZSI6IjIwMTAtMDEtMDFUMDA6MDA6MDBaIiwiY3JlZGVudGlhbFN1YmplY3QiOnsiaWQiOiJkaWQ6ZXhhbXBsZTplYmZlYjFmNzEyZWJjNmYxYzI3NmUxMmVjMjEiLCJkZWdyZWUiOnsidHlwZSI6IkJhY2hlbG9yRGVncmVlIiwibmFtZSI6IkJhY2hlbG9yIG9mIFNjaWVuY2UgYW5kIEFydHMifX19LCJpc3MiOiJodHRwczovL2V4YW1wbGUuZWR1L2lzc3VlcnMvNTY1MDQ5IiwibmJmIjoxMjYyMzA0MDAwLCJqdGkiOiJodHRwOi8vZXhhbXBsZS5lZHUvY3JlZGVudGlhbHMvMzczMiIsInN1YiI6ImRpZDpleGFtcGxlOmViZmViMWY3MTJlYmM2ZjFjMjc2ZTEyZWMyMSJ9.z5vgMTK1nfizNCg5N-niCOL3WUIAL7nXy-nGhDZYO_-PNGeE-0djCpWAMH8fD8eWSID5PfkPBYkx_dfLJnQ7NA';
+
+// Access token mocks
+const mockedAccessTokenResponse: AccessTokenResponse = {
+  access_token: 'ey6546.546654.64565',
+  authorization_pending: false,
+  c_nonce: 'c_nonce2022101300',
+  c_nonce_expires_in: 2025101300,
+  interval: 2025101300,
+  token_type: 'Bearer',
+};
+
+const INITIATE_QR_V1_0_13 =
+  'openid-credential-offer://?credential_offer=%7B%22credential_issuer%22:%22https://issuer.research.identiproof.io%22,%22credential_configuration_ids%22:%5B%22OpenBadgeCredentialUrl%22%5D,%22grants%22:%7B%22urn:ietf:params:oauth:grant-type:pre-authorized_code%22:%7B%22pre-authorized_code%22:%22oaKazRN8I0IbtZ0C7JuMn5%22,%22tx_code%22:%7B%22input_mode%22:%22text%22,%22length%22:22,%22description%22:%22Please%20enter%20the%20serial%20number%20of%20your%20physical%20drivers%20license%22%7D%7D%7D%7D';
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+async function proofOfPossessionCallbackFunction(_args: Jwt, _kid?: string): Promise<string> {
+  return 'ey.val.ue';
+}
 describe('OID4VCI-Client should', () => {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async function proofOfPossessionCallbackFunction(_args: Jwt, _kid?: string): Promise<string> {
-    return 'ey.val.ue';
-  }
   beforeEach(() => {
     nock.cleanAll();
   });
@@ -57,8 +73,6 @@ describe('OID4VCI-Client should', () => {
     interval: 2025101300,
     token_type: 'Bearer',
   };
-  const mockedVC =
-    'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2YyI6eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vd3d3LnczLm9yZy8yMDE4L2NyZWRlbnRpYWxzL2V4YW1wbGVzL3YxIl0sImlkIjoiaHR0cDovL2V4YW1wbGUuZWR1L2NyZWRlbnRpYWxzLzM3MzIiLCJ0eXBlIjpbIlZlcmlmaWFibGVDcmVkZW50aWFsIiwiVW5pdmVyc2l0eURlZ3JlZUNyZWRlbnRpYWwiXSwiaXNzdWVyIjoiaHR0cHM6Ly9leGFtcGxlLmVkdS9pc3N1ZXJzLzU2NTA0OSIsImlzc3VhbmNlRGF0ZSI6IjIwMTAtMDEtMDFUMDA6MDA6MDBaIiwiY3JlZGVudGlhbFN1YmplY3QiOnsiaWQiOiJkaWQ6ZXhhbXBsZTplYmZlYjFmNzEyZWJjNmYxYzI3NmUxMmVjMjEiLCJkZWdyZWUiOnsidHlwZSI6IkJhY2hlbG9yRGVncmVlIiwibmFtZSI6IkJhY2hlbG9yIG9mIFNjaWVuY2UgYW5kIEFydHMifX19LCJpc3MiOiJodHRwczovL2V4YW1wbGUuZWR1L2lzc3VlcnMvNTY1MDQ5IiwibmJmIjoxMjYyMzA0MDAwLCJqdGkiOiJodHRwOi8vZXhhbXBsZS5lZHUvY3JlZGVudGlhbHMvMzczMiIsInN1YiI6ImRpZDpleGFtcGxlOmViZmViMWY3MTJlYmM2ZjFjMjc2ZTEyZWMyMSJ9.z5vgMTK1nfizNCg5N-niCOL3WUIAL7nXy-nGhDZYO_-PNGeE-0djCpWAMH8fD8eWSID5PfkPBYkx_dfLJnQ7NA';
   const INITIATE_QR_V1_0_08 =
     'openid-initiate-issuance://?issuer=https%3A%2F%2Fissuer.research.identiproof.io&credential_type=OpenBadgeCredentialUrl&pre-authorized_code=4jLs9xZHEfqcoow0kHE7d1a8hUk6Sy-5bVSV2MqBUGUgiFFQi-ImL62T-FmLIo8hKA1UdMPH0lM1xAgcFkJfxIw9L-lI3mVs0hRT8YVwsEM1ma6N3wzuCdwtMU4bcwKp&user_pin_required=true';
   const OFFER_QR_V1_0_08 =
@@ -72,9 +86,6 @@ describe('OID4VCI-Client should', () => {
   const HTTPS_OFFER_QR_PRE_AUTHORIZED_v13 =
     'https://issuer.research.identiproof.io?credential_offer=%7B%0A%20%20%20%20%22credential_issuer%22%3A%20%22https%3A%2F%2Fissuer.research.identiproof.io%22%2C%0A%20%20%20%20%22credential_configuration_ids%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%22UniversityDegreeCredential%22%0A%20%20%20%20%5D%2C%0A%20%20%20%20%22grants%22%3A%20%7B%0A%20%20%20%20%20%20%20%20%22urn%3Aietf%3Aparams%3Aoauth%3Agrant-type%3Apre-authorized_code%22%3A%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%22pre-authorized_code%22%3A%20%22adhjhdjajkdkhjhdj%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%22tx_code%22%3A%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22length%22%3A%204%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22input_mode%22%3A%20%22numeric%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%22description%22%3A%20%22Please%20provide%20the%20one-time%20code%20that%20was%20sent%20via%20e-mail%22%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%0A%20%20%20%20%20%20%20%20%7D%0A%20%20%20%20%7D%0A%7D';
 
-  const INITIATE_QR_V1_0_13 =
-    'openid-credential-offer://?credential_offer=%7B%22credential_issuer%22:%22https://issuer.research.identiproof.io%22,%22credential_configuration_ids%22:%5B%22OpenBadgeCredentialUrl%22%5D,%22grants%22:%7B%22urn:ietf:params:oauth:grant-type:pre-authorized_code%22:%7B%22pre-authorized_code%22:%22oaKazRN8I0IbtZ0C7JuMn5%22,%22tx_code%22:%7B%22input_mode%22:%22text%22,%22length%22:22,%22description%22:%22Please%20enter%20the%20serial%20number%20of%20your%20physical%20drivers%20license%22%7D%7D%7D%7D';
-
   function succeedWithAFullFlowWithClientSetup() {
     nock(IDENTIPROOF_ISSUER_URL).get('/.well-known/openid-credential-issuer').reply(200, JSON.stringify(IDENTIPROOF_OID4VCI_METADATA));
     nock(IDENTIPROOF_AS_URL).get('/.well-known/oauth-authorization-server').reply(200, JSON.stringify(IDENTIPROOF_AS_METADATA));
@@ -225,7 +236,7 @@ describe('OID4VCI-Client should', () => {
   }
 
   it(
-    'succeed with a full flow without the client',
+    'succeed with a full flow without the client v1_0_11',
     async () => {
       /* Convert the URI into an object */
       const credentialOffer: CredentialOfferRequestWithBaseUrl = await CredentialOfferClient.fromURI(INITIATE_QR_V1_0_08);
@@ -284,6 +295,125 @@ describe('OID4VCI-Client should', () => {
     UNIT_TEST_TIMEOUT,
   );
 
+  it(
+    'succeed with a full flow without the client v1_0_13',
+    async () => {
+      /* Convert the URI into an object */
+      const credentialOffer: CredentialOfferRequestWithBaseUrl = await CredentialOfferClient.fromURI(INITIATE_QR_V1_0_13);
+      const preAuthorizedCode = 'oaKazRN8I0IbtZ0C7JuMn5';
+      expect(credentialOffer.baseUrl).toEqual('openid-credential-offer://');
+      expect((credentialOffer.credential_offer as CredentialOfferPayloadV1_0_13).credential_configuration_ids).toEqual(['OpenBadgeCredentialUrl']);
+      expect(credentialOffer.original_credential_offer.grants).toEqual({
+        'urn:ietf:params:oauth:grant-type:pre-authorized_code': {
+          'pre-authorized_code': preAuthorizedCode,
+          tx_code: {
+            input_mode: 'text',
+            description: 'Please enter the serial number of your physical drivers license',
+            length: preAuthorizedCode.length,
+          },
+        },
+      });
+
+      nock(ISSUER_URL)
+      .post(/token.*/)
+      .reply(200, JSON.stringify(mockedAccessTokenResponse));
+
+      /* The actual access token calls */
+      const accessTokenClient: AccessTokenClient = new AccessTokenClient();
+      const accessTokenResponse = await accessTokenClient.acquireAccessToken({ credentialOffer: credentialOffer, pin: '1234' });
+      expect(accessTokenResponse.successBody).toEqual(mockedAccessTokenResponse);
+      // Get the credential
+      nock(ISSUER_URL)
+      .post(/credential/)
+      .reply(200, {
+        format: 'jwt-vc',
+        credential: mockedVC,
+      });
+      const credReqClient = CredentialRequestClientBuilder.fromCredentialOffer({ credentialOffer: credentialOffer })
+      .withFormat('jwt_vc')
+
+      .withTokenFromResponse(accessTokenResponse.successBody!)
+      .build();
+
+      //TS2322: Type '(args: ProofOfPossessionCallbackArgs) => Promise<string>'
+      // is not assignable to type 'ProofOfPossessionCallback'.
+      // Types of parameters 'args' and 'args' are incompatible.
+      // Property 'kid' is missing in type '{ header: unknown; payload: unknown; }' but required in type 'ProofOfPossessionCallbackArgs'.
+      const proof: ProofOfPossession = await ProofOfPossessionBuilder.fromJwt({
+        jwt: jwtDid,
+        callbacks: {
+          signCallback: proofOfPossessionCallbackFunction,
+        },
+        version: OpenId4VCIVersion.VER_1_0_11,
+      })
+      .withEndpointMetadata({
+        issuer: 'https://issuer.research.identiproof.io',
+        credential_endpoint: 'https://issuer.research.identiproof.io/credential',
+        token_endpoint: 'https://issuer.research.identiproof.io/token',
+      })
+      .withKid('did:example:ebfeb1f712ebc6f1c276e12ec21/keys/1')
+      .build();
+      const credResponse = await credReqClient.acquireCredentialsUsingProof({
+        proofInput: proof,
+        credentialTypes: credentialOffer.original_credential_offer.credential_configuration_ids[0],
+      });
+      expect(credResponse.successBody?.credential).toEqual(mockedVC);
+    },
+    UNIT_TEST_TIMEOUT,
+  );
+});
+
+describe('OIDVCI-Client for v1_0_13 should', () => {
+  const mockedCredentialOffer = {
+    credential_issuer: 'https://mijnkvk.acc.credenco.com',
+    credential_configuration_ids: ['BevoegdheidUittreksel_jwt_vc_json'],
+    grants: {
+      authorization_code: {
+        issuer_state: '32fc4ebf-9e31-4149-9877-e3c0b602d559',
+      },
+      'urn:ietf:params:oauth:grant-type:pre-authorized_code': {
+        'pre-authorized_code':
+          'eyJhbGciOiJFZERTQSJ9.eyJzdWIiOiIzMmZjNGViZi05ZTMxLTQxNDktOTg3Ny1lM2MwYjYwMmQ1NTkiLCJpc3MiOiJodHRwczovL21pam5rdmsuYWNjLmNyZWRlbmNvLmNvbSIsImF1ZCI6IlRPS0VOIn0.754aiQ87O0vHYSpRvPqAS9cLOgf-pewdeXbpLziRwsxEp9mENfaXpY62muYpzOaWcYmTOydkzhFul-NDYXJZCA',
+      },
+    },
+  };
+
+  beforeEach(() => {
+    // Mock the HTTP GET request to the credential offer URI
+    nock('https://mijnkvk.acc.credenco.com')
+      .get('/openid4vc/credentialOffer?id=32fc4ebf-9e31-4149-9877-e3c0b602d559')
+      .reply(200, mockedCredentialOffer)
+      .persist(); // Use .persist() if you want the mock to remain active for multiple tests
+  });
+
+  afterEach(() => {
+    // Clean up all mocks
+    nock.cleanAll();
+  });
+
+  /*function succeedWithAFullFlowWithClientSetup() {
+    nock(IDENTIPROOF_ISSUER_URL).get('/.well-known/openid-credential-issuer').reply(200, JSON.stringify(IDENTIPROOF_OID4VCI_METADATA));
+    nock(IDENTIPROOF_AS_URL).get('/.well-known/oauth-authorization-server').reply(200, JSON.stringify(IDENTIPROOF_AS_METADATA));
+    nock(IDENTIPROOF_AS_URL).get(WellKnownEndpoints.OPENID_CONFIGURATION).reply(404, {});
+    nock(IDENTIPROOF_AS_URL)
+    .post(/oauth2\/token.*!/)
+    .reply(200, JSON.stringify(mockedAccessTokenResponse));
+    nock(ISSUER_URL)
+    .post(/credential/)
+    .reply(200, {
+      format: 'jwt-vc',
+      credential: mockedVC,
+    });
+  }*/
+
+  it('should successfully resolve the credential offer URI', async () => {
+    const uri = 'https://mijnkvk.acc.credenco.com/openid4vc/credentialOffer?id=32fc4ebf-9e31-4149-9877-e3c0b602d559';
+
+    const credentialOffer = await resolveCredentialOfferURI(uri);
+
+    expect(credentialOffer).toEqual(mockedCredentialOffer);
+  });
+
   it(
     'succeed with a full flow without the client and without did',
     async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/oid4vci-client",
-  "version": "0.12.1-unstable.4+30cddd3",
+  "version": "0.12.1-unstable.7+f655bf0",
   "description": "OpenID for Verifiable Credential Issuance (OpenID4VCI) client",
   "source": "lib/index.ts",
   "main": "dist/index.js",
@@ -15,7 +15,7 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.12.1-unstable.4+30cddd3",
+    "@sphereon/oid4vci-common": "0.12.1-unstable.7+f655bf0",
     "@sphereon/ssi-types": "0.25.1-unstable.87",
     "cross-fetch": "^3.1.8",
     "debug": "^4.3.4"
@@ -69,5 +69,5 @@
     "OIDC4VCI",
     "OID4VCI"
   ],
-  "gitHead": "30cddd3af544e97047d27f48d1d76ce16f80a79b"
+  "gitHead": "f655bf063128e94e0f6e4b54a2437ea975bc0d34"
 }