Skip to content

Commit f179c55

Browse files
sanderPostmasanderPostma
committed
chore: reorg imports
1 parent 8d112cd commit f179c55

10 files changed

Lines changed: 76 additions & 37 deletions

File tree

‎packages/client/lib/__tests__/OpenID4VCIClient.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import {
44
determineSpecVersionFromOffer,
55
determineSpecVersionFromURI,
66
OpenId4VCIVersion,
7-
WellKnownEndpoints,
8-
} from '@sphereon/oid4vci-common';
7+
WellKnownEndpoints
8+
} from '@sphereon/oid4vci-common'
99
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
1010
// @ts-ignore
11-
import nock from 'nock';
11+
import nock from 'nock'
1212

13-
import { createCredentialOfferURIFromObject } from '../../../issuer/lib';
14-
import { OpenID4VCIClient } from '../OpenID4VCIClient';
13+
import { createCredentialOfferURIFromObject } from '../../../issuer/lib'
14+
import { OpenID4VCIClient } from '../OpenID4VCIClient'
1515

1616
const MOCK_URL = 'https://server.example.com/';
1717

‎packages/client/lib/__tests__/SdJwt.spec.ts‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,19 @@ import {
22
AccessTokenRequest,
33
CredentialConfigurationSupportedSdJwtVcV1_0_13,
44
CredentialConfigurationSupportedV1_0_13,
5-
CredentialSupportedSdJwtVc,
6-
} from '@sphereon/oid4vci-common';
5+
CredentialSupportedSdJwtVc
6+
} from '@sphereon/oid4vci-common'
77
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
88
// @ts-ignore
9-
import nock from 'nock';
9+
import nock from 'nock'
1010

11-
import { OpenID4VCIClientV1_0_13 } from '..';
12-
import { AuthorizationServerMetadataBuilder, createAccessTokenResponse, IssuerMetadataBuilderV1_13, VcIssuerBuilder } from '../../../issuer';
11+
import { OpenID4VCIClientV1_0_13 } from '..'
12+
import {
13+
AuthorizationServerMetadataBuilder,
14+
createAccessTokenResponse,
15+
IssuerMetadataBuilderV1_13,
16+
VcIssuerBuilder
17+
} from '../../../issuer'
1318

1419
export const UNIT_TEST_TIMEOUT = 30000;
1520

‎packages/issuer-rest/lib/OID4VCIServer.ts‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
import {
22
AuthorizationRequest,
3-
CredentialConfigurationSupportedV1_0_13, CredentialOfferPayloadMode,
3+
CredentialConfigurationSupportedV1_0_13,
4+
CredentialOfferPayloadMode,
45
IssuerCredentialSubjectDisplay,
56
OID4VCICredentialFormat,
67
QRCodeOpts,
78
TxCode
89
} from '@sphereon/oid4vci-common'
9-
import { CredentialSupportedBuilderV1_13, ITokenEndpointOpts, VcIssuer, VcIssuerBuilder } from '@sphereon/oid4vci-issuer'
10+
import {
11+
CredentialSupportedBuilderV1_13,
12+
ITokenEndpointOpts,
13+
VcIssuer,
14+
VcIssuerBuilder
15+
} from '@sphereon/oid4vci-issuer'
1016
import { ExpressSupport, HasEndpointOpts, ISingleEndpointOpts } from '@sphereon/ssi-express-support'
1117
import express, { Express } from 'express'
1218

@@ -17,7 +23,8 @@ import {
1723
deleteCredentialOfferEndpoint,
1824
getBasePath,
1925
getCredentialEndpoint,
20-
getCredentialOfferEndpoint, getIssuePayloadEndpoint,
26+
getCredentialOfferEndpoint,
27+
getIssuePayloadEndpoint,
2128
getIssueStatusEndpoint,
2229
getMetadataEndpoints,
2330
pushedAuthorizationEndpoint

‎packages/issuer-rest/lib/__tests__/ClientIssuerIT.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
JWTPayload,
1414
OpenId4VCIVersion,
1515
PRE_AUTH_CODE_LITERAL,
16-
PRE_AUTH_GRANT_LITERAL,
16+
PRE_AUTH_GRANT_LITERAL
1717
} from '@sphereon/oid4vci-common'
1818
import { AuthorizationServerMetadataBuilder } from '@sphereon/oid4vci-issuer'
1919
import { VcIssuer } from '@sphereon/oid4vci-issuer/dist/VcIssuer'

‎packages/issuer-rest/lib/oid4vci-api-functions.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import {
88
AuthorizationChallengeErrorResponse,
99
AuthorizationRequest,
1010
CommonAuthorizationChallengeRequest,
11-
CredentialIssuerMetadataOptsV1_0_13, CredentialOfferPayloadMode,
11+
CredentialIssuerMetadataOptsV1_0_13,
12+
CredentialOfferPayloadMode,
1213
CredentialOfferRESTRequest,
1314
CredentialRequestV1_0_13,
1415
determineGrantTypes,

‎packages/issuer/lib/VcIssuer.ts‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import {
1111
CredentialEventNames,
1212
CredentialIssuerMetadata,
1313
CredentialIssuerMetadataOptsV1_0_13,
14-
CredentialOfferEventNames, CredentialOfferPayloadMode,
14+
CredentialOfferEventNames,
15+
CredentialOfferPayloadMode,
1516
CredentialOfferSession,
1617
CredentialOfferV1_0_13,
1718
CredentialRequest,
@@ -42,11 +43,28 @@ import {
4243
TYP_ERROR,
4344
URIState
4445
} from '@sphereon/oid4vci-common'
45-
import { CompactSdJwtVc, CredentialMapper, InitiatorType, SubSystem, System, W3CVerifiableCredential } from '@sphereon/ssi-types'
46+
import {
47+
CompactSdJwtVc,
48+
CredentialMapper,
49+
InitiatorType,
50+
SubSystem,
51+
System,
52+
W3CVerifiableCredential
53+
} from '@sphereon/ssi-types'
4654

47-
import { assertValidPinNumber, createCredentialOfferObject, createCredentialOfferURIFromObject, CredentialOfferGrantInput } from './functions'
55+
import {
56+
assertValidPinNumber,
57+
createCredentialOfferObject,
58+
createCredentialOfferURIFromObject,
59+
CredentialOfferGrantInput
60+
} from './functions'
4861
import { LookupStateManager } from './state-manager'
49-
import { CredentialDataSupplier, CredentialDataSupplierArgs, CredentialIssuanceInput, CredentialSignerCallback } from './types'
62+
import {
63+
CredentialDataSupplier,
64+
CredentialDataSupplierArgs,
65+
CredentialIssuanceInput,
66+
CredentialSignerCallback
67+
} from './types'
5068

5169
import { LOG } from './index'
5270

‎packages/issuer/lib/__tests__/CredentialOfferUtils.spec.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
import { CredentialOfferPayloadV1_0_11, CredentialOfferPayloadV1_0_13, PRE_AUTH_CODE_LITERAL, PRE_AUTH_GRANT_LITERAL } from '@sphereon/oid4vci-common'
1+
import {
2+
CredentialOfferPayloadV1_0_11,
3+
CredentialOfferPayloadV1_0_13,
4+
PRE_AUTH_CODE_LITERAL,
5+
PRE_AUTH_GRANT_LITERAL
6+
} from '@sphereon/oid4vci-common'
27

38
import { createCredentialOfferObject, createCredentialOfferURI, createCredentialOfferURIv1_0_11 } from '../index'
49

‎packages/issuer/lib/functions/CredentialOfferUtils.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import {
33
AssertedUniformCredentialOffer,
44
CredentialIssuerMetadataOpts,
55
CredentialIssuerMetadataOptsV1_0_13,
6-
CredentialIssuerMetadataV1_0_11, CredentialOfferPayloadMode,
6+
CredentialIssuerMetadataV1_0_11,
7+
CredentialOfferPayloadMode,
78
CredentialOfferPayloadV1_0_11,
89
CredentialOfferPayloadV1_0_13,
910
CredentialOfferSession,

‎packages/oid4vci-common/lib/types/Generic.types.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import { ICredentialContextType, IVerifiableCredential, W3CVerifiableCredential } from '@sphereon/ssi-types';
1+
import { ICredentialContextType, IVerifiableCredential, W3CVerifiableCredential } from '@sphereon/ssi-types'
22

3-
import { ExperimentalSubjectIssuance } from '../experimental/holder-vci';
3+
import { ExperimentalSubjectIssuance } from '../experimental/holder-vci'
44

5-
import { ProofOfPossession } from './CredentialIssuance.types';
6-
import { AuthorizationServerMetadata } from './ServerMetadata';
7-
import { CredentialOfferSession } from './StateManager.types';
8-
import { IssuerMetadataV1_0_08 } from './v1_0_08.types';
9-
import { CredentialRequestV1_0_11, EndpointMetadataResultV1_0_11 } from './v1_0_11.types';
5+
import { ProofOfPossession } from './CredentialIssuance.types'
6+
import { AuthorizationServerMetadata } from './ServerMetadata'
7+
import { CredentialOfferSession } from './StateManager.types'
8+
import { IssuerMetadataV1_0_08 } from './v1_0_08.types'
9+
import { CredentialRequestV1_0_11, EndpointMetadataResultV1_0_11 } from './v1_0_11.types'
1010
import {
1111
CredentialConfigurationSupportedV1_0_13,
1212
CredentialRequestV1_0_13,
1313
EndpointMetadataResultV1_0_13,
14-
IssuerMetadataV1_0_13,
15-
} from './v1_0_13.types';
14+
IssuerMetadataV1_0_13
15+
} from './v1_0_13.types'
1616

1717
export type InputCharSet = 'numeric' | 'text';
1818
export type KeyProofType = 'jwt' | 'cwt' | 'ldp_vp';

‎packages/oid4vci-common/lib/types/v1_0_13.types.ts‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
import { JWK } from '@sphereon/oid4vc-common';
1+
import { JWK } from '@sphereon/oid4vc-common'
22

3-
import { ExperimentalSubjectIssuance } from '../experimental/holder-vci';
3+
import { ExperimentalSubjectIssuance } from '../experimental/holder-vci'
44

5-
import { ProofOfPossession } from './CredentialIssuance.types';
5+
import { ProofOfPossession } from './CredentialIssuance.types'
66
import {
77
AlgValue,
88
CommonCredentialRequest,
9-
CredentialDataSupplierInput, CredentialOfferPayloadMode,
9+
CredentialDataSupplierInput,
10+
CredentialOfferPayloadMode,
1011
CredentialRequestMsoMdoc,
1112
CredentialRequestSdJwtVc,
1213
CredentialsSupportedDisplay,
@@ -17,10 +18,11 @@ import {
1718
MetadataDisplay,
1819
OID4VCICredentialFormat,
1920
ProofTypesSupported,
20-
ResponseEncryption, StatusListOpts
21+
ResponseEncryption,
22+
StatusListOpts
2123
} from './Generic.types'
22-
import { QRCodeOpts } from './QRCode.types';
23-
import { AuthorizationServerMetadata, AuthorizationServerType, EndpointMetadata } from './ServerMetadata';
24+
import { QRCodeOpts } from './QRCode.types'
25+
import { AuthorizationServerMetadata, AuthorizationServerType, EndpointMetadata } from './ServerMetadata'
2426

2527
export interface IssuerMetadataV1_0_13 {
2628
credential_configurations_supported: Record<string, CredentialConfigurationSupportedV1_0_13>; // REQUIRED. A JSON object containing a list of key value pairs, where the key is a string serving as an abstract identifier of the Credential. This identifier is RECOMMENDED to be collision resistant - it can be globally unique, but does not have to be when naming conflicts are unlikely to arise in a given use case. The value is a JSON object. The JSON object MUST conform to the structure of the Section 11.2.1.

0 commit comments

Comments
 (0)