refactor: migrate OpenId4VcIssuerModuleConfig to BaseOpenId4VcIssuerModuleConfig

Signed-off-by: sloops77 <[email protected]>

Author: sloops77

packages/openid4vc/src/openid4vc-issuer/router/accessTokenEndpoint.ts

@@ -1,6 +1,6 @@
 import type { HttpMethod, VerifyAccessTokenRequestReturn } from '@animo-id/oauth2'
 import type { NextFunction, Response, Router } from 'express'
-import type { OpenId4VcIssuerModuleConfig } from '../OpenId4VcIssuerModuleConfig'
+import { BaseOpenId4VcIssuerModuleConfig } from '../OpenId4VcIssuerModuleConfig'
 import type { OpenId4VcIssuanceRequest } from './requestContext'
 
 import {
@@ -22,11 +22,11 @@ import { OpenId4VcIssuanceSessionState } from '../OpenId4VcIssuanceSessionState'
 import { OpenId4VcIssuerService } from '../OpenId4VcIssuerService'
 import { OpenId4VcIssuanceSessionRepository } from '../repository'
 
-export function configureAccessTokenEndpoint(router: Router, config: OpenId4VcIssuerModuleConfig) {
+export function configureAccessTokenEndpoint(router: Router, config: BaseOpenId4VcIssuerModuleConfig) {
   router.post(config.accessTokenEndpointPath, handleTokenRequest(config))
 }
 
-export function handleTokenRequest(config: OpenId4VcIssuerModuleConfig) {
+export function handleTokenRequest(config: BaseOpenId4VcIssuerModuleConfig) {
   return async (request: OpenId4VcIssuanceRequest, response: Response, next: NextFunction) => {
     response.set({ 'Cache-Control': 'no-store', Pragma: 'no-cache' })
     const requestContext = getRequestContext(request)

packages/openid4vc/src/openid4vc-issuer/router/authorizationChallengeEndpoint.ts

@@ -27,10 +27,10 @@ import {
 } from '../../shared/router'
 import { addSecondsToDate } from '../../shared/utils'
 import { OpenId4VcIssuanceSessionState } from '../OpenId4VcIssuanceSessionState'
-import { OpenId4VcIssuerModuleConfig } from '../OpenId4VcIssuerModuleConfig'
+import { BaseOpenId4VcIssuerModuleConfig } from '../OpenId4VcIssuerModuleConfig'
 import { OpenId4VcIssuerService } from '../OpenId4VcIssuerService'
 
-export function configureAuthorizationChallengeEndpoint(router: Router, config: OpenId4VcIssuerModuleConfig) {
+export function configureAuthorizationChallengeEndpoint(router: Router, config: BaseOpenId4VcIssuerModuleConfig) {
   router.post(
     config.authorizationChallengeEndpointPath,
     async (request: OpenId4VcIssuanceRequest, response: Response, next: NextFunction) => {
@@ -85,7 +85,7 @@ async function handleAuthorizationChallengeNoAuthSession(options: {
   // First call, no auth_sesion yet
 
   const openId4VcIssuerService = agentContext.dependencyManager.resolve(OpenId4VcIssuerService)
-  const config = agentContext.dependencyManager.resolve(OpenId4VcIssuerModuleConfig)
+  const config = agentContext.dependencyManager.resolve(BaseOpenId4VcIssuerModuleConfig)
   const issuerMetadata = await openId4VcIssuerService.getIssuerMetadata(agentContext, issuer)
   const authorizationServer = openId4VcIssuerService.getOauth2AuthorizationServer(agentContext)
 
@@ -227,7 +227,7 @@ async function handleAuthorizationChallengeWithAuthSession(options: {
   const { agentContext, issuer, authorizationChallengeRequest, response, next } = options
 
   const openId4VcIssuerService = agentContext.dependencyManager.resolve(OpenId4VcIssuerService)
-  const config = agentContext.dependencyManager.resolve(OpenId4VcIssuerModuleConfig)
+  const config = agentContext.dependencyManager.resolve(BaseOpenId4VcIssuerModuleConfig)
   const authorizationServer = openId4VcIssuerService.getOauth2AuthorizationServer(agentContext)
   const verifierApi = agentContext.dependencyManager.resolve(OpenId4VcVerifierApi)
 

packages/openid4vc/src/openid4vc-issuer/router/credentialEndpoint.ts

@@ -10,12 +10,12 @@ import {
 import { CredentialRequest, getCredentialConfigurationsMatchingRequestFormat } from '@animo-id/oid4vci'
 import { joinUriParts } from '@credo-ts/core'
 
-import { BaseOpenId4VcIssuerModuleConfig } from '@credo-ts/openid4vc'
 import createHttpError from 'http-errors'
 import { getCredentialConfigurationsSupportedForScopes } from '../../shared'
 import { CredoRouter, getRequestContext } from '../../shared/router'
 import { addSecondsToDate } from '../../shared/utils'
 import { OpenId4VcIssuanceSessionState } from '../OpenId4VcIssuanceSessionState'
+import type { BaseOpenId4VcIssuerModuleConfig } from '../OpenId4VcIssuerModuleConfig'
 import { OpenId4VcIssuerService } from '../OpenId4VcIssuerService'
 import { OpenId4VcIssuanceSessionRecord, OpenId4VcIssuanceSessionRepository } from '../repository'
 

packages/openid4vc/src/openid4vc-issuer/router/credentialOfferEndpoint.ts

@@ -1,5 +1,5 @@
 import type { Response, Router } from 'express'
-import type { OpenId4VcIssuerModuleConfig } from '../OpenId4VcIssuerModuleConfig'
+import type { BaseOpenId4VcIssuerModuleConfig } from '../OpenId4VcIssuerModuleConfig'
 import type { OpenId4VcIssuanceRequest } from './requestContext'
 
 import { joinUriParts } from '@credo-ts/core'
@@ -15,7 +15,7 @@ import { OpenId4VcIssuanceSessionState } from '../OpenId4VcIssuanceSessionState'
 import { OpenId4VcIssuerService } from '../OpenId4VcIssuerService'
 import { OpenId4VcIssuanceSessionRepository } from '../repository'
 
-export function configureCredentialOfferEndpoint(router: Router, config: OpenId4VcIssuerModuleConfig) {
+export function configureCredentialOfferEndpoint(router: Router, config: BaseOpenId4VcIssuerModuleConfig) {
   router.get(
     joinUriParts(config.credentialOfferEndpointPath, [':credentialOfferId']),
     async (request: OpenId4VcIssuanceRequest, response: Response, next) => {

packages/openid4vc/src/openid4vc-issuer/router/jwksEndpoint.ts

@@ -1,13 +1,13 @@
 import type { JwkSet } from '@animo-id/oauth2'
 import type { Response, Router } from 'express'
-import type { OpenId4VcIssuerModuleConfig } from '../OpenId4VcIssuerModuleConfig'
+import { BaseOpenId4VcIssuerModuleConfig } from '../OpenId4VcIssuerModuleConfig'
 import type { OpenId4VcIssuanceRequest } from './requestContext'
 
 import { Key, getJwkFromKey } from '@credo-ts/core'
 
 import { getRequestContext, sendJsonResponse, sendUnknownServerErrorResponse } from '../../shared/router'
 
-export function configureJwksEndpoint(router: Router, config: OpenId4VcIssuerModuleConfig) {
+export function configureJwksEndpoint(router: Router, config: BaseOpenId4VcIssuerModuleConfig) {
   router.get(config.jwksEndpointPath, async (_request: OpenId4VcIssuanceRequest, response: Response, next) => {
     const { agentContext, issuer } = getRequestContext(_request)
     try {

packages/openid4vc/src/openid4vc-issuer/router/nonceEndpoint.ts

@@ -1,11 +1,11 @@
 import type { NextFunction, Response, Router } from 'express'
-import type { OpenId4VcIssuerModuleConfig } from '../OpenId4VcIssuerModuleConfig'
+import { BaseOpenId4VcIssuerModuleConfig } from '../OpenId4VcIssuerModuleConfig'
 import type { OpenId4VcIssuanceRequest } from './requestContext'
 
 import { getRequestContext, sendJsonResponse, sendUnknownServerErrorResponse } from '../../shared/router'
 import { OpenId4VcIssuerService } from '../OpenId4VcIssuerService'
 
-export function configureNonceEndpoint(router: Router, config: OpenId4VcIssuerModuleConfig) {
+export function configureNonceEndpoint(router: Router, config: BaseOpenId4VcIssuerModuleConfig) {
   router.post(
     config.nonceEndpointPath,
     async (request: OpenId4VcIssuanceRequest, response: Response, next: NextFunction) => {