@sphereon/ssi-sdk.oid4vci-issuer 0.32.1-next.54 → 0.33.1-feature.vcdm2.4

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,MAAM,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AACtC,wBAAM;AACf,uDAAqD;AAA5C,8GAAA,aAAa,OAAA;AACtB,8CAA2B;AAC3B,mDAAgC;AAChC,yDAAsC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAE,CAAA;AACjB,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,cAAc,aAAa,CAAA;AAC3B,cAAc,kBAAkB,CAAA;AAChC,cAAc,wBAAwB,CAAA"}

package/dist/state-manager/TypeOrmStateManager.d.ts

@@ -0,0 +1 @@
+//# sourceMappingURL=TypeOrmStateManager.d.ts.map

package/dist/state-manager/TypeOrmStateManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TypeOrmStateManager.d.ts","sourceRoot":"","sources":["../../src/state-manager/TypeOrmStateManager.ts"],"names":[],"mappings":""}

package/dist/state-manager/TypeOrmStateManager.js

@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=TypeOrmStateManager.js.map

package/dist/state-manager/TypeOrmStateManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TypeOrmStateManager.js","sourceRoot":"","sources":["../../src/state-manager/TypeOrmStateManager.ts"],"names":[],"mappings":""}

package/dist/state-manager/oid4vcState/IAbstractMachineStateStore.d.ts

@@ -0,0 +1,39 @@
+import { StateType } from '@sphereon/oid4vci-common';
+import { Oid4vcStateEntity } from '@sphereon/ssi-sdk.data-store';
+export interface IOid4vcStateStore<StateType> {
+    persistOid4vcState(args: Oid4vcStateStoreParams<StateType>): Promise<Oid4vcStatePersisted<StateType>>;
+    findOid4vcStates(args: StoreOid4vcFindActiveArgs): Promise<Array<Oid4vcStatePersisted<StateType>>>;
+    getOid4vcState(args: StoreOid4vcGetArgs): Promise<Oid4vcStatePersisted<StateType>>;
+    deleteOid4vcState(args: StoreOid4vcDeleteArgs): Promise<boolean>;
+    deleteExpiredOid4vcStates(args: StoreOid4vcDeleteExpiredArgs): Promise<number>;
+}
+export type StoreMachineStatePersistArgs<StateType> = Omit<Oid4vcStateStoreParams<StateType>, 'createdAt' | 'updatedAt'>;
+export type StoreOid4vcFindActiveArgs = Partial<Pick<Oid4vcStateStoreParams<StateType>, 'expiresAt' | 'tenantId' | 'stateId'>>;
+export type FindMachineStatesFilterArgs = Array<Partial<Omit<Oid4vcStateStoreParams<StateType>, 'state'>>>;
+export type StoreFindMachineStatesArgs = {
+    filter: FindMachineStatesFilterArgs;
+};
+export type StoreOid4vcGetArgs = Pick<Oid4vcStateEntity<StateType>, 'id' | 'stateId' | 'correlationId' | 'lookups' | 'tenantId'>;
+export type Oid4vcStateStore<StateType> = Pick<Oid4vcStateEntity<StateType>, 'id' | 'stateId' | 'correlationId' | 'lookups'>;
+export type StoreOid4vcDeleteArgs = StoreOid4vcGetArgs;
+export type StoreOid4vcDeleteExpiredArgs = {
+    id?: string;
+    correlationId?: string;
+    sessionId?: string;
+    lookups?: Array<string>;
+    tenantId?: string;
+};
+export type Oid4vcStatePersisted<StateType> = {
+    id: string;
+    stateId?: string;
+    correlationId?: string;
+    type: string;
+    state: StateType;
+    lookups?: Array<string>;
+    createdAt: Date;
+    lastUpdatedAt: Date;
+    expiresAt?: Date;
+    tenantId?: string;
+};
+export type Oid4vcStateStoreParams<StateType> = Omit<Oid4vcStatePersisted<StateType>, 'id'>;
+//# sourceMappingURL=IAbstractMachineStateStore.d.ts.map

package/dist/state-manager/oid4vcState/IAbstractMachineStateStore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"IAbstractMachineStateStore.d.ts","sourceRoot":"","sources":["../../../src/state-manager/oid4vcState/IAbstractMachineStateStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAEhE,MAAM,WAAW,iBAAiB,CAAC,SAAS;IAC1C,kBAAkB,CAAC,IAAI,EAAE,sBAAsB,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAA;IAErG,gBAAgB,CAAC,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;IAElG,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAA;IAElF,iBAAiB,CAAC,IAAI,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAEhE,yBAAyB,CAAC,IAAI,EAAE,4BAA4B,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;CAC/E;AAED,MAAM,MAAM,4BAA4B,CAAC,SAAS,IAAI,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC,CAAA;AAExH,MAAM,MAAM,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,WAAW,GAAG,UAAU,GAAG,SAAS,CAAC,CAAC,CAAA;AAE9H,MAAM,MAAM,2BAA2B,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;AAE1G,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,2BAA2B,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,eAAe,GAAG,SAAS,GAAG,UAAU,CAAC,CAAA;AAChI,MAAM,MAAM,gBAAgB,CAAC,SAAS,IAAI,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,eAAe,GAAG,SAAS,CAAC,CAAA;AAE5H,MAAM,MAAM,qBAAqB,GAAG,kBAAkB,CAAA;AACtD,MAAM,MAAM,4BAA4B,GAAG;IACzC,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,oBAAoB,CAAC,SAAS,IAAI;IAC5C,EAAE,EAAE,MAAM,CAAA;IACV,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,SAAS,CAAA;IAChB,OAAO,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IACvB,SAAS,EAAE,IAAI,CAAA;IACf,aAAa,EAAE,IAAI,CAAA;IACnB,SAAS,CAAC,EAAE,IAAI,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,sBAAsB,CAAC,SAAS,IAAI,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAA"}

package/dist/state-manager/oid4vcState/IAbstractMachineStateStore.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=IAbstractMachineStateStore.js.map

package/dist/state-manager/oid4vcState/IAbstractMachineStateStore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IAbstractMachineStateStore.js","sourceRoot":"","sources":["../../../src/state-manager/oid4vcState/IAbstractMachineStateStore.ts"],"names":[],"mappings":""}

package/dist/state-manager/oid4vcState/MachineStateStore.d.ts

@@ -0,0 +1 @@
+//# sourceMappingURL=MachineStateStore.d.ts.map

package/dist/state-manager/oid4vcState/MachineStateStore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MachineStateStore.d.ts","sourceRoot":"","sources":["../../../src/state-manager/oid4vcState/MachineStateStore.ts"],"names":[],"mappings":""}

package/dist/state-manager/oid4vcState/MachineStateStore.js

@@ -0,0 +1,137 @@
+"use strict";
+// import Debug from 'debug'
+//
+//
+// const debug = Debug('sphereon:ssi-sdk:machine-state:store')
+//
+// /**
+//  * Represents a data store for managing machine states.
+//  */
+// export class MachineStateStore extends IAbstractMachineStateStore {
+// private readonly _dbConnection: OrPromise<DataSource>
+//
+// constructor(dbConnection: OrPromise<DataSource>) {
+//   super()
+//   this._dbConnection = dbConnection
+// }
+// async persistMachineState(state: StoreMachineStatePersistArgs): Promise<StoreMachineStateInfo> {
+//   const connection: DataSource = await this._dbConnection
+//   const { machineName, instanceId, tenantId } = state
+//   debug(`Executing persistMachineState for machine ${machineName}, instance ${instanceId}, tenantId: ${tenantId}...`)
+//   const entity = MachineStateStore.machineStateInfoEntityFrom(state)
+//   const existing = await connection.getRepository(MachineStateInfoEntity).findOne({
+//     where: {
+//       instanceId: state.instanceId,
+//     },
+//   })
+//   if (existing && existing.updatedCount > state.updatedCount) {
+//     const error = `Updating machine state with an older version is not allowed. Machine ${existing.machineName}, last count: ${
+//       existing.updatedCount
+//     }, new count: ${existing.updatedCount}, last updated: ${existing.updatedAt}, current: ${new Date()}, instance: ${existing.instanceId}`
+//     console.log(error)
+//     return Promise.reject(new Error(error))
+//   }
+//   // No need for a transaction. This is a single entity. We don't want to be surprised by an isolation level hiding the state from others
+//   const result = await connection.getRepository(MachineStateInfoEntity).save(entity, { transaction: false })
+//   debug(`Done persistMachineState machine ${machineName}, instance ${instanceId}, tenantId: ${tenantId}`)
+//   return MachineStateStore.machineInfoFrom(result)
+// }
+//
+// async findActiveMachineStates(args: StoreMachineStatesFindActiveArgs): Promise<Array<StoreMachineStateInfo>> {
+//   const { tenantId, machineName, instanceId } = args
+//   const connection: DataSource = await this._dbConnection
+//   debug(`Executing findActiveMachineStates query with machineName: ${machineName}, tenantId: ${tenantId}`)
+//   const queryBuilder = connection
+//     .getRepository(MachineStateInfoEntity)
+//     .createQueryBuilder('state')
+//     .where('state.completedAt IS NULL')
+//     .andWhere(
+//       new Brackets((qb) => {
+//         qb.where('state.expiresAt IS NULL').orWhere('state.expiresAt > :now', { now: new Date() })
+//       }),
+//     )
+//
+//   if (instanceId) {
+//     queryBuilder.andWhere('state.instanceId = :instanceId', { instanceId })
+//   }
+//   if (tenantId) {
+//     queryBuilder.andWhere('state.tenantId = :tenantId', { tenantId })
+//   }
+//   if (machineName) {
+//     queryBuilder.andWhere('state.machineName = :machineName', { machineName })
+//   }
+//
+//   return (
+//     (await queryBuilder
+//       .orderBy('state.updatedAt', 'DESC')
+//       .getMany()
+//       .then((entities) => entities.map(MachineStateStore.machineInfoFrom))) ?? []
+//   )
+// }
+//
+// async findMachineStates(args?: StoreFindMachineStatesArgs): Promise<Array<StoreMachineStateInfo>> {
+//   const connection: DataSource = await this._dbConnection
+//   debug('findMachineStates', args)
+//   const result: Array<MachineStateInfoEntity> = await connection.getRepository(MachineStateInfoEntity).find({
+//     ...(args?.filter && { where: args?.filter }),
+//     transaction: false,
+//   })
+//
+//   return result.map((event: MachineStateInfoEntity) => MachineStateStore.machineInfoFrom(event))
+// }
+//
+// async getMachineState(args: StoreMachineStateGetArgs): Promise<StoreMachineStateInfo> {
+//   const connection: DataSource = await this._dbConnection
+//   debug('getMachineState', args)
+//   return connection.getRepository(MachineStateInfoEntity).findOneOrFail({ where: { instanceId: args.instanceId } })
+// }
+//
+// async deleteMachineState(args: StoreMachineStateDeleteArgs): Promise<boolean> {
+//   debug(`Executing deleteMachineState query with id: ${args.instanceId}`)
+//   if (!args.instanceId) {
+//     throw new Error('No instanceId parameter is provided.')
+//   }
+//   try {
+//     const connection: DataSource = await this._dbConnection
+//
+//     const result = await connection.getRepository(MachineStateInfoEntity).delete(args.instanceId)
+//     return result.affected != null && result.affected > 0
+//   } catch (error) {
+//     debug(`Error deleting state: ${error}`)
+//     return false
+//   }
+// }
+//
+// async deleteExpiredMachineStates(args: StoreMachineStateDeleteExpiredArgs): Promise<number> {
+//   const { machineName, tenantId, deleteDoneStates } = args
+//   debug(`Executing deleteExpiredMachineStates query with params: ${JSON.stringify(args)}`)
+//   try {
+//     const connection: DataSource = await this._dbConnection
+//
+//     const deleteCriteria: FindOptionsWhere<MachineStateInfoEntity> = {
+//       ...(machineName && { machineName }),
+//       ...(tenantId && { tenantId }),
+//       // When deleteOnDone state is set we only look at completedAt, in other cases we compare current time with expiresAt
+//       ...(!deleteDoneStates && { expiresAt: LessThan(new Date()) }),
+//       ...(deleteDoneStates && { completedAt: Not(IsNull()) }),
+//     }
+//     const result = await connection.getRepository(MachineStateInfoEntity).delete(deleteCriteria)
+//     return result.affected ?? 0
+//   } catch (error) {
+//     debug(`Error deleting machine info: ${error}`)
+//     return Promise.reject(new Error(`Error deleting expired machine states for machine type ${machineName}`))
+//   }
+// }
+//
+// protected static machineInfoFrom = (machineStateInfoEntity: MachineStateInfoEntity): StoreMachineStateInfo => {
+//   // We are making sure no entity function get copied
+//   return JSON.parse(JSON.stringify(machineStateInfoEntity))
+// }
+//
+// static machineStateInfoEntityFrom = (machineStateInfo: StoreMachineStateInfo | StoreMachineStatePersistArgs): MachineStateInfoEntity => {
+//   const entity = new MachineStateInfoEntity()
+//   Object.assign(entity, machineStateInfo)
+//   return entity
+// }
+// }
+//# sourceMappingURL=MachineStateStore.js.map

package/dist/state-manager/oid4vcState/MachineStateStore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MachineStateStore.js","sourceRoot":"","sources":["../../../src/state-manager/oid4vcState/MachineStateStore.ts"],"names":[],"mappings":";AAAA,4BAA4B;AAC5B,EAAE;AACF,EAAE;AACF,8DAA8D;AAC9D,EAAE;AACF,MAAM;AACN,0DAA0D;AAC1D,MAAM;AACN,sEAAsE;AACtE,wDAAwD;AACxD,EAAE;AACF,qDAAqD;AACrD,YAAY;AACZ,sCAAsC;AACtC,IAAI;AACJ,mGAAmG;AACnG,4DAA4D;AAC5D,wDAAwD;AACxD,wHAAwH;AACxH,uEAAuE;AACvE,sFAAsF;AACtF,eAAe;AACf,sCAAsC;AACtC,SAAS;AACT,OAAO;AACP,kEAAkE;AAClE,kIAAkI;AAClI,8BAA8B;AAC9B,6IAA6I;AAC7I,yBAAyB;AACzB,8CAA8C;AAC9C,MAAM;AACN,4IAA4I;AAC5I,+GAA+G;AAC/G,4GAA4G;AAC5G,qDAAqD;AACrD,IAAI;AACJ,EAAE;AACF,iHAAiH;AACjH,uDAAuD;AACvD,4DAA4D;AAC5D,6GAA6G;AAC7G,oCAAoC;AACpC,6CAA6C;AAC7C,mCAAmC;AACnC,0CAA0C;AAC1C,iBAAiB;AACjB,+BAA+B;AAC/B,qGAAqG;AACrG,YAAY;AACZ,QAAQ;AACR,EAAE;AACF,sBAAsB;AACtB,8EAA8E;AAC9E,MAAM;AACN,oBAAoB;AACpB,wEAAwE;AACxE,MAAM;AACN,uBAAuB;AACvB,iFAAiF;AACjF,MAAM;AACN,EAAE;AACF,aAAa;AACb,0BAA0B;AAC1B,4CAA4C;AAC5C,mBAAmB;AACnB,oFAAoF;AACpF,MAAM;AACN,IAAI;AACJ,EAAE;AACF,sGAAsG;AACtG,4DAA4D;AAC5D,qCAAqC;AACrC,gHAAgH;AAChH,oDAAoD;AACpD,0BAA0B;AAC1B,OAAO;AACP,EAAE;AACF,mGAAmG;AACnG,IAAI;AACJ,EAAE;AACF,0FAA0F;AAC1F,4DAA4D;AAC5D,mCAAmC;AACnC,sHAAsH;AACtH,IAAI;AACJ,EAAE;AACF,kFAAkF;AAClF,4EAA4E;AAC5E,4BAA4B;AAC5B,8DAA8D;AAC9D,MAAM;AACN,UAAU;AACV,8DAA8D;AAC9D,EAAE;AACF,oGAAoG;AACpG,4DAA4D;AAC5D,sBAAsB;AACtB,8CAA8C;AAC9C,mBAAmB;AACnB,MAAM;AACN,IAAI;AACJ,EAAE;AACF,gGAAgG;AAChG,6DAA6D;AAC7D,6FAA6F;AAC7F,UAAU;AACV,8DAA8D;AAC9D,EAAE;AACF,yEAAyE;AACzE,6CAA6C;AAC7C,uCAAuC;AACvC,6HAA6H;AAC7H,uEAAuE;AACvE,iEAAiE;AACjE,QAAQ;AACR,mGAAmG;AACnG,kCAAkC;AAClC,sBAAsB;AACtB,qDAAqD;AACrD,gHAAgH;AAChH,MAAM;AACN,IAAI;AACJ,EAAE;AACF,kHAAkH;AAClH,wDAAwD;AACxD,8DAA8D;AAC9D,IAAI;AACJ,EAAE;AACF,4IAA4I;AAC5I,gDAAgD;AAChD,4CAA4C;AAC5C,kBAAkB;AAClB,IAAI;AACJ,IAAI"}

package/dist/types/IOID4VCIIssuer.d.ts

@@ -1,4 +1,4 @@
-import { AccessTokenRequest, AccessTokenResponse, CredentialConfigurationSupported, CredentialDataSupplierInput, CredentialIssuerMetadataOpts, CredentialOfferSession, CredentialRequest, CredentialResponse, Grant, JsonLdIssuerCredentialDefinition } from '@sphereon/oid4vci-common';
+import { AccessTokenRequest, AccessTokenResponse, ClientMetadata, CredentialConfigurationSupported, CredentialDataSupplierInput, CredentialIssuerMetadataOpts, CredentialOfferMode, CredentialOfferSession, CredentialRequest, CredentialResponse, Grant, JsonLdIssuerCredentialDefinition, QRCodeOpts, StatusListOpts } from '@sphereon/oid4vci-common';
 import { CredentialDataSupplier } from '@sphereon/oid4vci-issuer';
 import { IDIDOptions, ResolveOpts } from '@sphereon/ssi-sdk-ext.did-utils';
 import { IIdentifierResolution, ManagedIdentifierOptsOrResult } from '@sphereon/ssi-sdk-ext.identifier-resolution';
@@ -6,7 +6,7 @@ import { IOID4VCIStore } from '@sphereon/ssi-sdk.oid4vci-issuer-store';
 import { ICredential } from '@sphereon/ssi-types/dist';
 import { IAgentContext, ICredentialIssuer, IDIDManager, IKeyManager, IPluginMethodMap, IResolver } from '@veramo/core';
 import { IssuerInstance } from '../IssuerInstance';
-import { IJwtService } from '@sphereon/ssi-sdk-ext.identifier-resolution/src/types/IJwtService';
+import { IJwtService } from '@sphereon/ssi-sdk-ext.jwt-service';
 export type IssuerCredentialDefinition = JsonLdIssuerCredentialDefinition;
 export interface IOID4VCIIssuer extends IPluginMethodMap {
     oid4vciCreateOfferURI(createArgs: ICreateOfferArgs, context: IRequiredContext): Promise<ICreateCredentialOfferURIResult>;
@@ -26,6 +26,13 @@ export interface ICreateOfferArgs extends IIssuerInstanceArgs {
     credentialDefinition?: IssuerCredentialDefinition;
     credentialOfferUri?: string;
     credentialDataSupplierInput?: CredentialDataSupplierInput;
+    redirectUri?: string;
+    correlationId?: string;
+    sessionLifeTimeInSec?: number;
+    qrCodeOpts?: QRCodeOpts;
+    client_id?: string;
+    statusListOpts?: Array<StatusListOpts>;
+    offerMode?: CredentialOfferMode;
     baseUri?: string;
     scheme?: string;
     pinLength?: number;
@@ -54,6 +61,7 @@ export interface IIssuerInstanceOptions extends IMetadataOptions {
     metadataOpts?: CredentialIssuerMetadataOpts;
 }
 export interface IIssuerOptions {
+    asClientOpts?: ClientMetadata;
     idOpts?: ManagedIdentifierOptsOrResult;
     resolveOpts?: ResolveOpts;
     /**

package/dist/types/IOID4VCIIssuer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IOID4VCIIssuer.d.ts","sourceRoot":"","sources":["../../src/types/IOID4VCIIssuer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,gCAAgC,EAChC,2BAA2B,EAC3B,4BAA4B,EAC5B,sBAAsB,EACtB,iBAAiB,EACjB,kBAAkB,EAClB,KAAK,EACL,gCAAgC,EACjC,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAC1E,OAAO,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAA;AAClH,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAA;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACtH,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,mEAAmE,CAAA;AAE/F,MAAM,MAAM,0BAA0B,GAAG,gCAAgC,CAAA;AAEzE,MAAM,WAAW,cAAe,SAAQ,gBAAgB;IACtD,qBAAqB,CAAC,UAAU,EAAE,gBAAgB,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;IACxH,sBAAsB,CAAC,SAAS,EAAE,oBAAoB,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;IAC/G,gCAAgC,CAAC,eAAe,EAAE,2BAA2B,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;IACvI,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;CAClG;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED,MAAM,WAAW,gBAAiB,SAAQ,mBAAmB;IAC3D,MAAM,CAAC,EAAE,KAAK,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAA;IAC9D,oBAAoB,CAAC,EAAE,0BAA0B,CAAA;IACjD,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,2BAA2B,CAAC,EAAE,2BAA2B,CAAA;IACzD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,oBAAqB,SAAQ,mBAAmB;IAC/D,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,UAAU,CAAC,EAAE,WAAW,CAAA;IACxB,sBAAsB,CAAC,EAAE,sBAAsB,CAAA;IAC/C,2BAA2B,CAAC,EAAE,2BAA2B,CAAA;IACzD,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,WAAW,2BAA4B,SAAQ,mBAAmB;IACtE,OAAO,EAAE,kBAAkB,CAAA;IAC3B,kBAAkB,EAAE,MAAM,CAAA;CAC3B;AAED,MAAM,WAAW,mBAAmB;IAClC,gBAAgB,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,sBAAuB,SAAQ,gBAAgB;IAC9D,UAAU,CAAC,EAAE,cAAc,CAAA;IAC3B,YAAY,CAAC,EAAE,4BAA4B,CAAA;CAC5C;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,6BAA6B,CAAA;IACtC,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB;;OAEG;IACH,OAAO,CAAC,EAAE,WAAW,CAAA;IACrB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;IAExB;;OAEG;IAEH,wBAAwB,CAAC,EAAE,MAAM,CAAA;CAClC;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,MAAM,+BAA+B,GAAG;IAC5C,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,CAAC,EAAE,sBAAsB,CAAA;IAChC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,aAAa,CAC1C,qBAAqB,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW,GAAG,iBAAiB,GAAG,aAAa,GAAG,WAAW,CAChH,CAAA"}
+{"version":3,"file":"IOID4VCIIssuer.d.ts","sourceRoot":"","sources":["../../src/types/IOID4VCIIssuer.ts"],"names":[],"mappings":"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"}

package/dist/types/IOID4VCIIssuer.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=IOID4VCIIssuer.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.oid4vci-issuer",
-  "version": "0.32.1-next.54+3b988a2b",
+  "version": "0.33.1-feature.vcdm2.4+9f634bdb",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,19 +14,22 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-next.339",
-    "@sphereon/oid4vci-issuer": "0.16.1-next.339",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
-    "@sphereon/ssi-sdk.agent-config": "0.32.1-next.54+3b988a2b",
-    "@sphereon/ssi-sdk.core": "0.32.1-next.54+3b988a2b",
-    "@sphereon/ssi-sdk.kv-store-temp": "0.32.1-next.54+3b988a2b",
-    "@sphereon/ssi-sdk.mdl-mdoc": "0.32.1-next.54+3b988a2b",
-    "@sphereon/ssi-sdk.oid4vci-issuer-store": "0.32.1-next.54+3b988a2b",
-    "@sphereon/ssi-sdk.sd-jwt": "0.32.1-next.54+3b988a2b",
-    "@sphereon/ssi-sdk.vc-status-list": "0.32.1-next.54+3b988a2b",
-    "@sphereon/ssi-sdk.vc-status-list-issuer": "0.32.1-next.54+3b988a2b",
-    "@sphereon/ssi-types": "0.32.1-next.54+3b988a2b",
+    "@sphereon/oid4vci-client": "0.17.0",
+    "@sphereon/oid4vci-common": "0.17.0",
+    "@sphereon/oid4vci-issuer": "0.17.0",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.28.0",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.28.0",
+    "@sphereon/ssi-sdk-ext.jwt-service": "0.28.0",
+    "@sphereon/ssi-sdk.agent-config": "0.33.1-feature.vcdm2.4+9f634bdb",
+    "@sphereon/ssi-sdk.core": "0.33.1-feature.vcdm2.4+9f634bdb",
+    "@sphereon/ssi-sdk.data-store": "0.33.1-feature.vcdm2.4+9f634bdb",
+    "@sphereon/ssi-sdk.kv-store-temp": "0.33.1-feature.vcdm2.4+9f634bdb",
+    "@sphereon/ssi-sdk.mdl-mdoc": "0.33.1-feature.vcdm2.4+9f634bdb",
+    "@sphereon/ssi-sdk.oid4vci-issuer-store": "0.33.1-feature.vcdm2.4+9f634bdb",
+    "@sphereon/ssi-sdk.sd-jwt": "0.33.1-feature.vcdm2.4+9f634bdb",
+    "@sphereon/ssi-sdk.vc-status-list": "0.33.1-feature.vcdm2.4+9f634bdb",
+    "@sphereon/ssi-sdk.vc-status-list-issuer": "0.33.1-feature.vcdm2.4+9f634bdb",
+    "@sphereon/ssi-types": "0.33.1-feature.vcdm2.4+9f634bdb",
     "@types/uuid": "^9.0.8",
     "@veramo/core": "4.2.0",
     "@veramo/credential-w3c": "4.2.0",
@@ -35,7 +38,7 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-next.339",
+    "@sphereon/did-auth-siop": "0.17.0",
     "@sphereon/did-uni-client": "^0.6.3",
     "@veramo/did-provider-key": "4.2.0",
     "@veramo/did-resolver": "4.2.0",
@@ -71,5 +74,5 @@
     "Authenticator"
   ],
   "nx": {},
-  "gitHead": "3b988a2bb62a7c4534a2670ea3a0985fd93d00f2"
+  "gitHead": "9f634bdb714061141e277508c124b08d626f6036"
 }

package/src/IssuerInstance.ts

@@ -1,16 +1,13 @@
-import { VcIssuer } from '@sphereon/oid4vci-issuer'
-import { DIDDocument } from '@veramo/core'
+import { CredentialDataSupplier, VcIssuer } from '@sphereon/oid4vci-issuer'
 import { createVciIssuerBuilder } from './functions'
 import { AuthorizationServerMetadata, IssuerMetadata } from '@sphereon/oid4vci-common'
-
-import { CredentialDataSupplier } from '@sphereon/oid4vci-issuer'
 import { IIssuerOptions, IMetadataOptions, IRequiredContext } from './types/IOID4VCIIssuer'
 
 export class IssuerInstance {
-  private _issuer: VcIssuer<DIDDocument> | undefined
+  private _issuer: VcIssuer | undefined
   private readonly _metadataOptions: IMetadataOptions
   private readonly _issuerOptions: IIssuerOptions
-  private readonly _issuerMetadata: IssuerMetadata
+  private _issuerMetadata: IssuerMetadata
   private readonly _authorizationServerMetadata: AuthorizationServerMetadata
 
   public constructor({
@@ -30,7 +27,7 @@ export class IssuerInstance {
     this._authorizationServerMetadata = authorizationServerMetadata
   }
 
-  public async get(opts: { context: IRequiredContext; credentialDataSupplier?: CredentialDataSupplier }): Promise<VcIssuer<DIDDocument>> {
+  public async get(opts: { context: IRequiredContext; credentialDataSupplier?: CredentialDataSupplier }): Promise<VcIssuer> {
     if (!this._issuer) {
       const builder = await createVciIssuerBuilder(
         {
@@ -58,6 +55,10 @@ export class IssuerInstance {
     return this._issuerMetadata
   }
 
+  set issuerMetadata(value: IssuerMetadata) {
+    this._issuerMetadata = value
+  }
+
   get authorizationServerMetadata() {
     return this._authorizationServerMetadata
   }

package/src/agent/OID4VCIIssuer.ts

@@ -1,8 +1,16 @@
-import { AccessTokenResponse, AuthorizationServerMetadata, CredentialResponse, IssuerMetadata } from '@sphereon/oid4vci-common'
+import {
+  AccessTokenResponse,
+  AuthorizationServerMetadata,
+  CredentialResponse,
+  IssuerMetadata,
+  OpenIDResponse,
+  WellKnownEndpoints,
+} from '@sphereon/oid4vci-common'
 import { assertValidAccessTokenRequest, createAccessTokenResponse, VcIssuer } from '@sphereon/oid4vci-issuer'
+import { retrieveWellknown } from '@sphereon/oid4vci-client'
 import { getAgentResolver } from '@sphereon/ssi-sdk-ext.did-utils'
 import { IMetadataOptions } from '@sphereon/ssi-sdk.oid4vci-issuer-store'
-import { DIDDocument, IAgentPlugin } from '@veramo/core'
+import { IAgentPlugin } from '@veramo/core'
 import { getAccessTokenSignerCallback } from '../functions'
 import {
   IAssertValidAccessTokenArgs,
@@ -39,7 +47,7 @@ export class OID4VCIIssuer implements IAgentPlugin {
   private async oid4vciCreateOfferURI(createArgs: ICreateOfferArgs, context: IRequiredContext): Promise<ICreateCredentialOfferURIResult> {
     return await this.oid4vciGetInstance(createArgs, context)
       .then((instance) => instance.get({ context }))
-      .then((issuer: VcIssuer<DIDDocument>) =>
+      .then((issuer: VcIssuer) =>
         issuer.createCredentialOfferURI(createArgs).then((response) => {
           const result: ICreateCredentialOfferURIResult = response
           if (this._opts.returnSessions === false) {
@@ -53,7 +61,7 @@ export class OID4VCIIssuer implements IAgentPlugin {
   private async oid4vciIssueCredential(issueArgs: IIssueCredentialArgs, context: IRequiredContext): Promise<CredentialResponse> {
     return await this.oid4vciGetInstance(issueArgs, context)
       .then((instance) => instance.get({ context }))
-      .then((issuer: VcIssuer<DIDDocument>) => issuer.issueCredential(issueArgs))
+      .then((issuer: VcIssuer) => issuer.issueCredential(issueArgs))
   }
 
   private async oid4vciCreateAccessTokenResponse(
@@ -82,14 +90,42 @@ export class OID4VCIIssuer implements IAgentPlugin {
     })
   }
 
+  private getExternalAS(issuerMetadata: IssuerMetadata): string | undefined {
+    if ('authorization_servers' in issuerMetadata && Array.isArray(issuerMetadata.authorization_servers)) {
+      return issuerMetadata.authorization_servers.find((as) => as !== issuerMetadata.credential_issuer)
+    }
+    return undefined
+  }
+
   private async createIssuerInstance(args: IIssuerInstanceArgs, context: IRequiredContext): Promise<IssuerInstance> {
     const credentialIssuer = args.credentialIssuer ?? OID4VCIIssuer._DEFAULT_OPTS_KEY
     //todo: prob doesn't make sense as credentialIssuer is mandatory anyway
 
     const metadataOpts = await this.getMetadataOpts({ ...args, credentialIssuer }, context)
     const issuerMetadata = await this.getIssuerMetadata({ ...args, credentialIssuer }, context)
-    const authorizationServerMetadata = await this.getAuthorizationServerMetadata({ ...args, credentialIssuer }, context)
-    const issuerOpts = await this.getIssuerOpts({ ...args, credentialIssuer }, context)
+    const externalAS = this.getExternalAS(issuerMetadata)
+    let asMetadataResponse: OpenIDResponse<AuthorizationServerMetadata> | undefined = undefined
+    if (externalAS) {
+      // Let's try OIDC first and then fallback to OAuth2
+      asMetadataResponse = await retrieveWellknown(externalAS, WellKnownEndpoints.OPENID_CONFIGURATION, {
+        errorOnNotFound: false,
+      })
+      if (!asMetadataResponse) {
+        asMetadataResponse = await retrieveWellknown(externalAS, WellKnownEndpoints.OAUTH_AS, {
+          errorOnNotFound: true,
+        })
+      }
+    }
+    const authorizationServerMetadata = asMetadataResponse?.successBody
+      ? asMetadataResponse!.successBody
+      : await this.getAuthorizationServerMetadataFromStore(
+          {
+            ...args,
+            credentialIssuer,
+          },
+          context,
+        )
+    const issuerOpts = await this.getIssuerOptsFromStore({ ...args, credentialIssuer }, context)
     if (!issuerOpts.resolveOpts) {
       issuerOpts.resolveOpts = { ...issuerOpts.didOpts?.resolveOpts, ...this._opts.resolveOpts }
     }
@@ -117,7 +153,7 @@ export class OID4VCIIssuer implements IAgentPlugin {
     return this.instances.get(credentialIssuer)!
   }
 
-  private async getIssuerOpts(
+  private async getIssuerOptsFromStore(
     opts: {
       credentialIssuer: string
       storeId?: string
@@ -129,7 +165,7 @@ export class OID4VCIIssuer implements IAgentPlugin {
     const storeId = await this.storeId(opts, context)
     const namespace = await this.namespace(opts, context)
     const options = await context.agent.oid4vciStoreGetIssuerOpts({
-      metadataType: 'authorizationServer',
+      metadataType: 'issuer',
       correlationId: credentialIssuer,
       storeId,
       namespace,
@@ -170,14 +206,12 @@ export class OID4VCIIssuer implements IAgentPlugin {
       storeId: metadataOpts.storeId,
     })) as IssuerMetadata
     if (!metadata) {
-      throw Error(
-        `Authorization server metadata not found for issuer ${opts.credentialIssuer}, namespace ${opts.namespace} and store ${opts.storeId}`,
-      )
+      throw Error(`Issuer metadata not found for issuer ${opts.credentialIssuer}, namespace ${opts.namespace} and store ${opts.storeId}`)
     }
     return metadata
   }
 
-  private async getAuthorizationServerMetadata(
+  private async getAuthorizationServerMetadataFromStore(
     opts: {
       credentialIssuer: string
       storeId?: string
@@ -193,7 +227,9 @@ export class OID4VCIIssuer implements IAgentPlugin {
       storeId: metadataOpts.storeId,
     })) as AuthorizationServerMetadata
     if (!metadata) {
-      throw Error(`Credential issuer ${opts.credentialIssuer} metadata  not found for namespace ${opts.namespace} and store ${opts.storeId}`)
+      throw Error(
+        `Authorization server ${opts.credentialIssuer} metadata  not found for namespace ${metadataOpts.storeNamespace} and store ${metadataOpts.storeId}`,
+      )
     }
     return metadata
   }