fix: incorporate parts of the feedback

openwallet-foundation · Jul 26, 2024 · cb3e749 · cb3e749
1 parent 8765c0b
commit cb3e749
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/packages/openid4vc/src/openid4vc-holder/OpenId4VciHolderService.ts b/packages/openid4vc/src/openid4vc-holder/OpenId4VciHolderService.ts
@@ -285,9 +285,7 @@ export class OpenId4VciHolderService {
 
     if (!dPoPSigningAlgValuesSupported) return undefined
 
-    const alg = dPoPSigningAlgValuesSupported
-      .flatMap((alg) => alg)
-      .find((alg) => getJwkClassFromJwaSignatureAlgorithm(alg))
+    const alg = dPoPSigningAlgValuesSupported.find((alg) => getJwkClassFromJwaSignatureAlgorithm(alg))
 
     const JwkClass = alg ? getJwkClassFromJwaSignatureAlgorithm(alg) : undefined
 
@@ -323,7 +321,6 @@ export class OpenId4VciHolderService {
     const createDPoPOptions = await this.getCreateDPoPOptions(agentContext, metadata)
     const dPoPJwk = createDPoPOptions ? getJwkFromJson(createDPoPOptions.jwtIssuer.jwk) : undefined
 
-    resolvedCredentialOffer.metadata.credentialIssuerMetadata
     if (resolvedAuthorizationRequest) {
       const { codeVerifier, redirectUri } = resolvedAuthorizationRequest
       accessTokenResponse = await accessTokenClient.acquireAccessToken({

diff --git a/packages/openid4vc/src/openid4vc-issuer/router/accessTokenEndpoint.ts b/packages/openid4vc/src/openid4vc-issuer/router/accessTokenEndpoint.ts
@@ -3,7 +3,16 @@ import type { AgentContext } from '@credo-ts/core'
 import type { AccessTokenRequest, JWK, JWTSignerCallback, SigningAlgo } from '@sphereon/oid4vci-common'
 import type { NextFunction, Response, Router } from 'express'
 
-import { getJwkFromKey, CredoError, JwsService, JwtPayload, getJwkClassFromKeyType, Key } from '@credo-ts/core'
+import {
+  getJwkFromKey,
+  CredoError,
+  JwsService,
+  JwtPayload,
+  getJwkClassFromKeyType,
+  Key,
+  joinUriParts,
+  Jwt,
+} from '@credo-ts/core'
 import {
   GrantTypes,
   IssueStatus,
@@ -17,6 +26,7 @@ import { assertValidAccessTokenRequest, createAccessTokenResponse } from '@spher
 
 import { getRequestContext, sendErrorResponse } from '../../shared/router'
 import { getVerifyJwtCallback } from '../../shared/utils'
+import { OpenId4VcIssuerModuleConfig } from '../OpenId4VcIssuerModuleConfig'
 import { OpenId4VcIssuerService } from '../OpenId4VcIssuerService'
 import { OpenId4VcCNonceStateManager } from '../repository/OpenId4VcCNonceStateManager'
 import { OpenId4VcCredentialOfferSessionStateManager } from '../repository/OpenId4VcCredentialOfferSessionStateManager'
@@ -125,7 +135,9 @@ export function handleTokenRequest(config: OpenId4VciAccessTokenEndpointConfig)
     let dPoPJwk: JWK | undefined
     if (request.headers.dpop) {
       try {
-        const fullUrl = request.protocol + '://' + request.get('host') + request.originalUrl
+        const issuerConfig = agentContext.dependencyManager.resolve(OpenId4VcIssuerModuleConfig)
+        const fullUrl = joinUriParts(issuerConfig.baseUrl, [requestContext.issuer.issuerId, request.url])
+
         dPoPJwk = await verifyDPoP(
           { method: request.method, headers: request.headers, fullUrl },
           {

diff --git a/packages/openid4vc/src/openid4vc-issuer/router/verifyResourceRequest.ts b/packages/openid4vc/src/openid4vc-issuer/router/verifyResourceRequest.ts
@@ -3,10 +3,11 @@ import type { OpenId4VcIssuerRecord } from '../repository'
 import type { AgentContext } from '@credo-ts/core'
 import type { SigningAlgo } from '@sphereon/oid4vci-common'
 
-import { CredoError, JwsService, Jwt } from '@credo-ts/core'
+import { CredoError, joinUriParts, JwsService, Jwt } from '@credo-ts/core'
 import { verifyResourceDPoP } from '@sphereon/oid4vci-common'
 
 import { getVerifyJwtCallback } from '../../shared/utils'
+import { OpenId4VcIssuerModuleConfig } from '../OpenId4VcIssuerModuleConfig'
 import { OpenId4VcIssuerService } from '../OpenId4VcIssuerService'
 
 export async function verifyResourceRequest(
@@ -36,7 +37,8 @@ export async function verifyResourceRequest(
     },
   })
 
-  const fullUrl = request.protocol + '://' + request.get('host') + request.originalUrl
+  const issuerConfig = agentContext.dependencyManager.resolve(OpenId4VcIssuerModuleConfig)
+  const fullUrl = joinUriParts(issuerConfig.baseUrl, [issuer.issuerId, request.url])
   await verifyResourceDPoP(
     { method: request.method, headers: request.headers, fullUrl },
     {

diff --git a/packages/openid4vc/tests/openid4vc.e2e.test.ts b/packages/openid4vc/tests/openid4vc.e2e.test.ts
@@ -192,7 +192,7 @@ describe('OpenId4Vc', () => {
     const issuerTenant2 = await issuer.agent.modules.tenants.getTenantAgent({ tenantId: issuer2.tenantId })
 
     const openIdIssuerTenant1 = await issuerTenant1.modules.openId4VcIssuer.createIssuer({
-      dPoPSigningAlgValuesSupported: ['EdDSA'],
+      dPoPSigningAlgValuesSupported: [JwaSignatureAlgorithm.EdDSA],
       credentialConfigurationsSupported: {
         universityDegree: universityDegreeCredentialConfigurationSupported,
       },
@@ -223,7 +223,7 @@ describe('OpenId4Vc', () => {
       },
     })
     const openIdIssuerTenant2 = await issuerTenant2.modules.openId4VcIssuer.createIssuer({
-      dPoPSigningAlgValuesSupported: ['EdDSA'],
+      dPoPSigningAlgValuesSupported: [JwaSignatureAlgorithm.EdDSA],
       credentialsSupported: [universityDegreeCredentialSdJwt2],
     })