fix: some imports

Sphereon-Opensource · Jul 25, 2024 · 5034468 · 5034468
1 parent 9202667
commit 5034468
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 31 deletions.
diff --git a/packages/siop-oid4vp/lib/__tests__/AuthenticationRequest.request.spec.ts b/packages/siop-oid4vp/lib/__tests__/AuthenticationRequest.request.spec.ts
@@ -1,5 +1,6 @@
 import { parse } from 'querystring'
 
+import { SigningAlgo } from '@sphereon/oid4vci-common'
 import { IPresentationDefinition } from '@sphereon/pex'
 import { IProofType } from '@sphereon/ssi-types'
 
@@ -9,7 +10,6 @@ import {
   RequestObject,
   ResponseType,
   Scope,
-  SigningAlgo,
   SubjectIdentifierType,
   SubjectType,
   SupportedVersion,

diff --git a/packages/siop-oid4vp/lib/__tests__/AuthenticationRequest.verify.spec.ts b/packages/siop-oid4vp/lib/__tests__/AuthenticationRequest.verify.spec.ts
@@ -1,3 +1,4 @@
+import { SigningAlgo } from '@sphereon/oid4vci-common'
 import { IProofType } from '@sphereon/ssi-types'
 import Ajv from 'ajv'
 import * as dotenv from 'dotenv'
@@ -9,7 +10,6 @@ import {
   RequestObject,
   ResponseType,
   Scope,
-  SigningAlgo,
   SubjectType,
   SupportedVersion,
   VerifyAuthorizationRequestOpts,

diff --git a/packages/siop-oid4vp/lib/__tests__/AuthenticationResponse.response.spec.ts b/packages/siop-oid4vp/lib/__tests__/AuthenticationResponse.response.spec.ts
@@ -1,3 +1,4 @@
+import { SigningAlgo } from '@sphereon/oid4vci-common'
 import { IPresentationDefinition } from '@sphereon/pex'
 import {
   ICredential,
@@ -20,7 +21,6 @@ import {
   ResponseMode,
   ResponseType,
   Scope,
-  SigningAlgo,
   SubjectIdentifierType,
   SubjectType,
   SupportedVersion,

diff --git a/packages/siop-oid4vp/lib/__tests__/DidJwtTestUtils.ts b/packages/siop-oid4vp/lib/__tests__/DidJwtTestUtils.ts
@@ -1,10 +1,9 @@
+import { JwtPayload, parseJWT, SigningAlgo } from '@sphereon/oid4vci-common'
 import { VerifyCallback } from '@sphereon/wellknown-dids-client'
 import { createJWT, EdDSASigner, ES256KSigner, ES256Signer, hexToBytes, JWTOptions, JWTVerifyOptions, Signer, verifyJWT } from 'did-jwt'
 import { Resolvable } from 'did-resolver'
 
-import { parseJWT } from '../helpers/jwtUtils'
-import { DEFAULT_EXPIRATION_TIME, JwtPayload, ResponseIss, SigningAlgo, SIOPErrors, VerifiedJWT, VerifyJwtCallback } from '../types'
-import { CreateJwtCallback } from '../types/JwtIssuer'
+import { DEFAULT_EXPIRATION_TIME, ResponseIss, SIOPErrors, VerifiedJWT, VerifyJwtCallback } from '../types'
 
 import { getResolver } from './ResolverTestUtils'
 
@@ -68,7 +67,7 @@ export const internalSignature = (hexPrivateKey: string, did: string, didUrl: st
   })
 }
 
-export function getCreateJwtCallback(signature: InternalSignature): CreateJwtCallback {
+export function getCreateJwtCallback(signature: InternalSignature) {
   return (jwtIssuer, jwt) => {
     if (jwtIssuer.method === 'did') {
       const issuer = jwtIssuer.didUrl.split('#')[0]

diff --git a/packages/siop-oid4vp/lib/__tests__/IT.spec.ts b/packages/siop-oid4vp/lib/__tests__/IT.spec.ts
@@ -1,5 +1,6 @@
 import { EventEmitter } from 'events'
 
+import { SigningAlgo } from '@sphereon/oid4vci-common'
 import { IPresentationDefinition } from '@sphereon/pex'
 import { CredentialMapper, IPresentation, IProofType, IVerifiableCredential, W3CVerifiablePresentation } from '@sphereon/ssi-types'
 import nock from 'nock'
@@ -19,7 +20,6 @@ import {
   RevocationVerification,
   RP,
   Scope,
-  SigningAlgo,
   SubjectType,
   SupportedVersion,
   verifyRevocation,

diff --git a/packages/siop-oid4vp/lib/__tests__/OP.request.spec.ts b/packages/siop-oid4vp/lib/__tests__/OP.request.spec.ts
@@ -1,3 +1,4 @@
+import { SigningAlgo } from '@sphereon/oid4vci-common'
 import { IProofType } from '@sphereon/ssi-types'
 import nock from 'nock'
 
@@ -11,7 +12,6 @@ import {
   ResponseType,
   RP,
   Scope,
-  SigningAlgo,
   SubjectIdentifierType,
   SubjectType,
   SupportedVersion,

diff --git a/packages/siop-oid4vp/lib/__tests__/PresentationExchange.spec.ts b/packages/siop-oid4vp/lib/__tests__/PresentationExchange.spec.ts
@@ -1,3 +1,4 @@
+import { SigningAlgo } from '@sphereon/oid4vci-common'
 import { PresentationDefinitionV1 } from '@sphereon/pex-models'
 import { CredentialMapper, IPresentation, IProofType, IVerifiableCredential } from '@sphereon/ssi-types'
 import { W3CVerifiablePresentation } from '@sphereon/ssi-types/src/types/w3c-vc'
@@ -14,7 +15,6 @@ import {
   PresentationSignCallback,
   ResponseType,
   Scope,
-  SigningAlgo,
   SubjectIdentifierType,
   SubjectType,
 } from '..'

diff --git a/packages/siop-oid4vp/lib/__tests__/RP.request.spec.ts b/packages/siop-oid4vp/lib/__tests__/RP.request.spec.ts
@@ -1,3 +1,4 @@
+import { SigningAlgo } from '@sphereon/oid4vci-common'
 import { IProofType } from '@sphereon/ssi-types'
 
 import {
@@ -8,7 +9,6 @@ import {
   ResponseType,
   RP,
   Scope,
-  SigningAlgo,
   SubjectIdentifierType,
   SubjectType,
   SupportedVersion,

diff --git a/packages/siop-oid4vp/lib/__tests__/SdJwt.spec.ts b/packages/siop-oid4vp/lib/__tests__/SdJwt.spec.ts
@@ -1,5 +1,6 @@
 import { createHash } from 'node:crypto'
 
+import { SigningAlgo } from '@sphereon/oid4vci-common'
 import { IPresentationDefinition, SdJwtDecodedVerifiableCredentialWithKbJwtInput } from '@sphereon/pex'
 import { OriginalVerifiableCredential } from '@sphereon/ssi-types'
 
@@ -16,7 +17,6 @@ import {
   RevocationVerification,
   RP,
   Scope,
-  SigningAlgo,
   SubjectType,
   SupportedVersion,
   VPTokenLocation,

diff --git a/packages/siop-oid4vp/lib/__tests__/TestUtils.ts b/packages/siop-oid4vp/lib/__tests__/TestUtils.ts
@@ -1,6 +1,6 @@
 import crypto from 'crypto'
 
-import { uuidv4 } from '@sphereon/oid4vci-common'
+import { JwtPayload, parseJWT, SigningAlgo, uuidv4 } from '@sphereon/oid4vci-common'
 import { IProofType } from '@sphereon/ssi-types'
 import base58 from 'bs58'
 import { ethers } from 'ethers'
@@ -11,18 +11,15 @@ import {
   assertValidMetadata,
   base64ToHexString,
   DiscoveryMetadataPayload,
-  JwtPayload,
   KeyCurve,
   KeyType,
   ResponseIss,
   ResponseType,
   RPRegistrationMetadataPayload,
   Scope,
-  SigningAlgo,
   SubjectSyntaxTypesSupportedValues,
   SubjectType,
 } from '../'
-import { parseJWT } from '../helpers/jwtUtils'
 import SIOPErrors from '../types/Errors'
 
 import { DIDDocument } from './ResolverTestUtils'

diff --git a/packages/siop-oid4vp/lib/__tests__/e2e/EBSI.spec.ts b/packages/siop-oid4vp/lib/__tests__/e2e/EBSI.spec.ts
@@ -1,13 +1,13 @@
 import { getResolver as getKeyResolver } from '@cef-ebsi/key-did-resolver'
 // import { EbsiWallet } from '@cef-ebsi/wallet-lib';
 import EbsiWallet from '@cef-ebsi/wallet-lib'
-import { uuidv4 } from '@sphereon/oid4vci-common'
+import { SigningAlgo, uuidv4 } from '@sphereon/oid4vci-common'
 import { PresentationSignCallBackParams } from '@sphereon/pex'
 import { parseDid, W3CVerifiablePresentation } from '@sphereon/ssi-types'
 import { Resolver } from 'did-resolver'
 import { importJWK, JWK, SignJWT } from 'jose'
 
-import { OP, SigningAlgo } from '../../'
+import { OP } from '../../'
 import { getCreateJwtCallback, getVerifyJwtCallback } from '../DidJwtTestUtils'
 
 const ID_TOKEN_REQUEST_URL = 'https://api-conformance.ebsi.eu/conformance/v3/auth-mock/id_token_request'

diff --git a/packages/siop-oid4vp/lib/__tests__/e2e/mattr.launchpad.spec.ts b/packages/siop-oid4vp/lib/__tests__/e2e/mattr.launchpad.spec.ts
@@ -1,3 +1,4 @@
+import { SigningAlgo } from '@sphereon/oid4vci-common'
 import { PresentationSignCallBackParams, PresentationSubmissionLocation } from '@sphereon/pex'
 import { W3CVerifiablePresentation } from '@sphereon/ssi-types'
 import * as ed25519 from '@transmute/did-key-ed25519'
@@ -6,15 +7,7 @@ import { DIDDocument, DIDResolutionResult } from 'did-resolver'
 import { importJWK, JWK, SignJWT } from 'jose'
 import * as u8a from 'uint8arrays'
 
-import {
-  AuthorizationRequest,
-  AuthorizationResponse,
-  OP,
-  PresentationDefinitionWithLocation,
-  PresentationExchange,
-  SigningAlgo,
-  SupportedVersion,
-} from '../..'
+import { AuthorizationRequest, AuthorizationResponse, OP, PresentationDefinitionWithLocation, PresentationExchange, SupportedVersion } from '../..'
 import { getCreateJwtCallback, getVerifyJwtCallback } from '../DidJwtTestUtils'
 
 export interface InitiateOfferRequest {

diff --git a/packages/siop-oid4vp/lib/__tests__/functions/DidSiopMetadata.spec.ts b/packages/siop-oid4vp/lib/__tests__/functions/DidSiopMetadata.spec.ts
@@ -1,7 +1,8 @@
+import { SigningAlgo } from '@sphereon/oid4vci-common'
 import { Format } from '@sphereon/pex-models'
 import { IProofType } from '@sphereon/ssi-types'
 
-import { SigningAlgo, SIOPErrors, supportedCredentialsFormats } from '../..'
+import { SIOPErrors, supportedCredentialsFormats } from '../..'
 
 describe('DidSiopMetadata should ', () => {
   it('find supportedCredentialsFormats correctly', async function () {

diff --git a/packages/siop-oid4vp/lib/__tests__/regressions/ClientIdIsObject.spec.ts b/packages/siop-oid4vp/lib/__tests__/regressions/ClientIdIsObject.spec.ts
@@ -1,5 +1,6 @@
-import { PassBy, ResponseType, RevocationVerification, RP, Scope, SigningAlgo, SubjectType, SupportedVersion } from '../..'
-import { parseJWT } from '../../helpers/jwtUtils'
+import { parseJWT, SigningAlgo } from '@sphereon/oid4vci-common'
+
+import { PassBy, ResponseType, RevocationVerification, RP, Scope, SubjectType, SupportedVersion } from '../..'
 import { internalSignature } from '../DidJwtTestUtils'
 
 const EXAMPLE_REDIRECT_URL = 'https://acme.com/hello'

diff --git a/packages/siop-oid4vp/lib/__tests__/spec-compliance/jwtVCPresentationProfile.spec.ts b/packages/siop-oid4vp/lib/__tests__/spec-compliance/jwtVCPresentationProfile.spec.ts
@@ -1,3 +1,4 @@
+import { SigningAlgo } from '@sphereon/oid4vci-common'
 import { PresentationSignCallBackParams } from '@sphereon/pex'
 import { IProofType } from '@sphereon/ssi-types'
 import * as jose from 'jose'
@@ -20,7 +21,6 @@ import {
   ResponseType,
   RevocationVerification,
   RP,
-  SigningAlgo,
   SupportedVersion,
   VPTokenLocation,
 } from '../..'