updates

Signed-off-by: Timo Glastra <timo@animo.id>

Author: TimoGlastra

packages/openid4vc/src/openid4vc-holder/OpenId4vpHolderService.ts

@@ -12,8 +12,8 @@ import type {
 import type {
   OpenId4VpAcceptAuthorizationRequestOptions,
   OpenId4VpFetchEntityConfigurationOptions,
-  OpenId4VpResolvedAuthorizationRequest,
   OpenId4VpResolveTrustChainsOptions,
+  OpenId4VpResolvedAuthorizationRequest,
   ParsedTransactionDataEntry,
   ResolveOpenId4VpAuthorizationRequestOptions,
 } from './OpenId4vpHolderServiceOptions'
@@ -30,6 +30,10 @@ import {
   getJwkFromJson,
   injectable,
 } from '@credo-ts/core'
+import {
+  fetchEntityConfiguration as federationFetchEntityConfiguration,
+  resolveTrustChains as federationResolveTrustChains,
+} from '@openid-federation/core'
 import {
   Openid4vpAuthorizationResponse,
   Openid4vpClient,
@@ -39,10 +43,6 @@ import {
   isOpenid4vpAuthorizationRequestDcApi,
   parseTransactionData,
 } from '@openid4vc/openid4vp'
-import {
-  fetchEntityConfiguration as federationFetchEntityConfiguration,
-  resolveTrustChains as federationResolveTrustChains,
-} from '@openid-federation/core'
 
 import { getOid4vcCallbacks } from '../shared/callbacks'
 

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

@@ -1,8 +1,8 @@
-import type { OpenId4VcIssuanceRequest } from './requestContext'
 import type { Buffer } from '@credo-ts/core'
-import type { Router, Response } from 'express'
+import type { Response, Router } from 'express'
+import type { OpenId4VcIssuanceRequest } from './requestContext'
 
-import { Key, getJwkFromKey, KeyType } from '@credo-ts/core'
+import { Key, KeyType, getJwkFromKey } from '@credo-ts/core'
 import { createEntityConfiguration } from '@openid-federation/core'
 
 import { getRequestContext, sendErrorResponse } from '../../shared/router'

packages/openid4vc/src/openid4vc-verifier/OpenId4VcVerifierModuleConfig.ts

@@ -1,7 +1,7 @@
 import type { Router } from 'express'
 
-import { importExpress } from '../shared/router'
 import { AgentContext } from '@credo-ts/core'
+import { importExpress } from '../shared/router'
 
 export interface OpenId4VcVerifierModuleConfigOptions {
   /**

packages/openid4vc/src/openid4vc-verifier/router/federationEndpoint.ts

@@ -1,8 +1,8 @@
+import type { Buffer, Key } from '@credo-ts/core'
+import type { Response, Router } from 'express'
 import type { OpenId4VcVerificationRequest } from './requestContext'
-import type { Key, Buffer } from '@credo-ts/core'
-import type { Router, Response } from 'express'
 
-import { getJwkFromJson, getJwkFromKey, JwsService, KeyType } from '@credo-ts/core'
+import { JwsService, KeyType, getJwkFromJson, getJwkFromKey } from '@credo-ts/core'
 import { createEntityConfiguration, createEntityStatement, fetchEntityConfiguration } from '@openid-federation/core'
 
 import { getRequestContext, sendErrorResponse } from '../../shared/router'

packages/openid4vc/src/shared/callbacks.ts

@@ -27,8 +27,8 @@ import {
 } from '@credo-ts/core'
 import { clientAuthenticationDynamic, clientAuthenticationNone, decodeJwtHeader } from '@openid4vc/oauth2'
 
-import { getKeyFromDid } from './utils'
 import { fetchEntityConfiguration, resolveTrustChains } from '@openid-federation/core'
+import { getKeyFromDid } from './utils'
 
 export function getOid4vcJwtVerifyCallback(
   agentContext: AgentContext,

packages/openid4vc/tests/openid4vc-federation.e2e.test.ts

@@ -1,16 +1,16 @@
-import type { AgentType, TenantType } from './utils'
-import type { OpenId4VcVerifierModuleConfig } from '../src'
 import type { Server } from 'http'
+import type { OpenId4VcVerifierModuleConfig } from '../src'
+import type { AgentType, TenantType } from './utils'
 
 import {
   ClaimFormat,
   DidsApi,
+  DifPresentationExchangeService,
   JwaSignatureAlgorithm,
   W3cCredential,
   W3cCredentialSubject,
-  w3cDate,
   W3cIssuer,
-  DifPresentationExchangeService,
+  w3cDate,
 } from '@credo-ts/core'
 import express, { type Express } from 'express'
 
@@ -96,9 +96,8 @@ describe('OpenId4Vc-federation', () => {
                   disclosureFrame: { _sd: ['university', 'degree'] },
                 })),
               }
-            } else {
-              throw new Error('Invalid request')
             }
+            throw new Error('Invalid request')
           },
         }),
         askar: new AskarModule(askarModuleConfig),
@@ -127,13 +126,13 @@ describe('OpenId4Vc-federation', () => {
           baseUrl: verificationBaseUrl,
           federation: {
             async isSubordinateEntity(agentContext, options) {
-              if (federationConfig && federationConfig.isSubordinateEntity) {
+              if (federationConfig?.isSubordinateEntity) {
                 return federationConfig.isSubordinateEntity(agentContext, options)
               }
               return false
             },
             async getAuthorityHints(agentContext, options) {
-              if (federationConfig && federationConfig.getAuthorityHints) {
+              if (federationConfig?.getAuthorityHints) {
                 return federationConfig.getAuthorityHints(agentContext, options)
               }
               return undefined
@@ -493,11 +492,11 @@ describe('OpenId4Vc-federation', () => {
     await verifierTenant2.endSession()
 
     federationConfig = {
-      isSubordinateEntity: async (agentContext, options) => {
+      isSubordinateEntity: async (_agentContext, options) => {
         // When the verifier 2 gets asked if verifier 1 is a subordinate entity, it should return true
         return options.verifierId === openIdVerifierTenant2.verifierId
       },
-      getAuthorityHints: async (agentContext, options) => {
+      getAuthorityHints: async (_agentContext, options) => {
         // The verifier 1 says that the verifier 2 is above him
         return options.verifierId === openIdVerifierTenant1.verifierId
           ? [`http://localhost:1234/oid4vp/${openIdVerifierTenant2.verifierId}`]
@@ -766,13 +765,13 @@ describe('OpenId4Vc-federation', () => {
 
     // TODO: Look into this error see if we can make it more specific
     await expect(resolvedProofRequestWithFederationPromise).rejects.toThrow(
-      `Error verifying the DID Auth Token signature.`
+      'Error verifying the DID Auth Token signature.'
     )
 
     const resolvedProofRequestWithoutFederationPromise =
       holderTenant.modules.openId4VcHolder.resolveSiopAuthorizationRequest(authorizationRequestUri2)
     await expect(resolvedProofRequestWithoutFederationPromise).rejects.toThrow(
-      `Error verifying the DID Auth Token signature.`
+      'Error verifying the DID Auth Token signature.'
     )
   })
 })