feat: added setDefaultTokenEndpoint to VcIssuer constructor

Sphereon-Opensource · Jun 13, 2024 · f16affc · f16affc
1 parent 96608ec
commit f16affc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/packages/issuer/lib/VcIssuer.ts b/packages/issuer/lib/VcIssuer.ts
@@ -5,6 +5,7 @@ import {
   CreateCredentialOfferURIResult,
   CREDENTIAL_MISSING_ERROR,
   CredentialDataSupplierInput,
+  CredentialIssuerMetadata,
   CredentialIssuerMetadataOpts,
   CredentialOfferFormat,
   CredentialOfferPayloadV1_0_11,
@@ -69,6 +70,7 @@ export class VcIssuer<DIDDoc extends object> {
       cNonceExpiresIn?: number | undefined // expiration duration in seconds
     },
   ) {
+    this.setDefaultTokenEndpoint(issuerMetadata)
     this._issuerMetadata = issuerMetadata
     this._defaultCredentialOfferBaseUri = args.defaultCredentialOfferBaseUri
     this._credentialOfferSessions = args.credentialOfferSessions
@@ -603,6 +605,12 @@ export class VcIssuer<DIDDoc extends object> {
     return credential
   }
 
+  private setDefaultTokenEndpoint(issuerMetadata: Partial<CredentialIssuerMetadata>) {
+    if (!issuerMetadata.token_endpoint) {
+      issuerMetadata.token_endpoint = `${issuerMetadata.credential_issuer}/token`
+    }
+  }
+
   get userPinRequired(): boolean {
     return this._userPinRequired
   }

diff --git a/packages/issuer/lib/builder/VcIssuerBuilder.ts b/packages/issuer/lib/builder/VcIssuerBuilder.ts
@@ -145,12 +145,6 @@ export class VcIssuerBuilder<DIDDoc extends object> {
     return this
   }
 
-  private setDefaultTokenEndpoint(issuerMetadata: Partial<CredentialIssuerMetadata>) {
-    if (!issuerMetadata.token_endpoint) {
-      issuerMetadata.token_endpoint = `${issuerMetadata.credential_issuer}/token`
-    }
-  }
-
   public build(): VcIssuer<DIDDoc> {
     if (!this.credentialOfferStateManager) {
       throw new Error(TokenErrorResponse.invalid_request)
@@ -161,7 +155,6 @@ export class VcIssuerBuilder<DIDDoc extends object> {
 
     const builder = this.issuerMetadataBuilder?.build()
     const metadata: Partial<CredentialIssuerMetadata> = { ...this.issuerMetadata, ...builder }
-    this.setDefaultTokenEndpoint(metadata)
     // Let's make sure these get merged correctly:
     metadata.credentials_supported = [...(this.issuerMetadata.credentials_supported ?? []), ...(builder?.credentials_supported ?? [])]
     metadata.display = [...(this.issuerMetadata.display ?? []), ...(builder?.display ?? [])]