@sphereon/ssi-sdk.siopv2-oid4vp-op-auth 0.33.1-next.3 → 0.33.1-next.73

package/package.json

@@ -1,39 +1,51 @@
 {
   "name": "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth",
-  "version": "0.33.1-next.3+fd1a6fba",
+  "version": "0.33.1-next.73+be17b2cb",
   "source": "src/index.ts",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "type": "module",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    "react-native": "./dist/index.js",
+    "import": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    },
+    "require": {
+      "types": "./dist/index.d.cts",
+      "require": "./dist/index.cjs"
+    }
+  },
   "veramo": {
     "pluginInterfaces": {
       "IDidAuthSiopOpAuthenticator": "./src/types/IDidAuthSiopOpAuthenticator.ts"
     }
   },
   "scripts": {
-    "build": "tsc --build",
-    "build:clean": "tsc --build --clean && tsc --build"
+    "build": "tsup --config ../../tsup.config.ts --tsconfig ../../tsconfig.tsup.json"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.17.0",
-    "@sphereon/did-auth-siop-adapter": "0.17.0",
-    "@sphereon/oid4vc-common": "0.17.0",
+    "@sphereon/did-auth-siop": "0.17.1-next.39",
+    "@sphereon/did-auth-siop-adapter": "0.17.1-next.39",
+    "@sphereon/oid4vc-common": "0.17.1-next.39",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
-    "@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.contact-manager": "0.33.1-next.3+fd1a6fba",
-    "@sphereon/ssi-sdk.core": "0.33.1-next.3+fd1a6fba",
-    "@sphereon/ssi-sdk.credential-store": "0.33.1-next.3+fd1a6fba",
-    "@sphereon/ssi-sdk.credential-validation": "0.33.1-next.3+fd1a6fba",
-    "@sphereon/ssi-sdk.data-store": "0.33.1-next.3+fd1a6fba",
-    "@sphereon/ssi-sdk.issuance-branding": "0.33.1-next.3+fd1a6fba",
-    "@sphereon/ssi-sdk.pd-manager": "0.33.1-next.3+fd1a6fba",
-    "@sphereon/ssi-sdk.presentation-exchange": "0.33.1-next.3+fd1a6fba",
-    "@sphereon/ssi-sdk.sd-jwt": "0.33.1-next.3+fd1a6fba",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.33.1-next.3+fd1a6fba",
-    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.33.1-next.3+fd1a6fba",
-    "@sphereon/ssi-types": "0.33.1-next.3+fd1a6fba",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.28.1-next.53",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.28.1-next.53",
+    "@sphereon/ssi-sdk-ext.jwt-service": "0.28.1-next.53",
+    "@sphereon/ssi-sdk.contact-manager": "0.33.1-next.73+be17b2cb",
+    "@sphereon/ssi-sdk.core": "0.33.1-next.73+be17b2cb",
+    "@sphereon/ssi-sdk.credential-store": "0.33.1-next.73+be17b2cb",
+    "@sphereon/ssi-sdk.credential-validation": "0.33.1-next.73+be17b2cb",
+    "@sphereon/ssi-sdk.data-store": "0.33.1-next.73+be17b2cb",
+    "@sphereon/ssi-sdk.issuance-branding": "0.33.1-next.73+be17b2cb",
+    "@sphereon/ssi-sdk.pd-manager": "0.33.1-next.73+be17b2cb",
+    "@sphereon/ssi-sdk.presentation-exchange": "0.33.1-next.73+be17b2cb",
+    "@sphereon/ssi-sdk.sd-jwt": "0.33.1-next.73+be17b2cb",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.33.1-next.73+be17b2cb",
+    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.33.1-next.73+be17b2cb",
+    "@sphereon/ssi-types": "0.33.1-next.73+be17b2cb",
     "@sphereon/wellknown-dids-client": "^0.1.3",
     "@veramo/core": "4.2.0",
     "@veramo/credential-w3c": "4.2.0",
@@ -47,8 +59,8 @@
   },
   "devDependencies": {
     "@sphereon/did-uni-client": "^0.6.3",
-    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.28.0",
-    "@sphereon/ssi-sdk.agent-config": "0.33.1-next.3+fd1a6fba",
+    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.28.1-next.53",
+    "@sphereon/ssi-sdk.agent-config": "0.33.1-next.73+be17b2cb",
     "@types/i18n-js": "^3.8.9",
     "@types/lodash.memoize": "^4.1.9",
     "@types/sha.js": "^2.4.4",
@@ -61,11 +73,11 @@
     "@veramo/utils": "4.2.0",
     "did-resolver": "^4.1.0",
     "nock": "^13.5.4",
-    "typeorm": "^0.3.21"
+    "typeorm": "0.3.20"
   },
   "files": [
-    "dist/**/*",
-    "src/**/*",
+    "dist",
+    "src",
     "src/localization/translations/*",
     "README.md",
     "plugin.schema.json",
@@ -90,6 +102,5 @@
     "OpenID Connect",
     "Authenticator"
   ],
-  "nx": {},
-  "gitHead": "fd1a6fba306a83a73ff7c531db87fa207dbf436d"
+  "gitHead": "be17b2cb752a6e5368119259e89a1f2a99f56848"
 }

package/src/agent/DidAuthSiopOpAuthenticator.ts

@@ -13,32 +13,28 @@ import {
 import { HasherSync, Loggers, SdJwtDecodedVerifiableCredential } from '@sphereon/ssi-types'
 import { IAgentPlugin } from '@veramo/core'
 import { v4 as uuidv4 } from 'uuid'
-import {
-  DidAuthSiopOpAuthenticatorOptions,
-  GetSelectableCredentialsArgs,
-  IOpSessionArgs,
-  Json,
-  LOGGER_NAMESPACE,
-  RequiredContext,
-  schema,
-  SelectableCredentialsMap,
-  Siopv2AuthorizationResponseData,
-  VerifiableCredentialsWithDefinition,
-} from '../index'
-import { Siopv2Machine } from '../machine/Siopv2Machine'
-import { getSelectableCredentials, siopSendAuthorizationResponse, translateCorrelationIdToName } from '../services/Siopv2MachineService'
+
 import { OpSession } from '../session'
 import { PEX, Status } from '@sphereon/pex'
 import { computeEntryHash } from '@veramo/utils'
 import { UniqueDigitalCredential } from '@sphereon/ssi-sdk.credential-store'
 import { EventEmitter } from 'events'
 import {
+  DidAuthSiopOpAuthenticatorOptions,
+  GetSelectableCredentialsArgs,
   IDidAuthSiopOpAuthenticator,
   IGetSiopSessionArgs,
+  IOpSessionArgs,
   IRegisterCustomApprovalForSiopArgs,
   IRemoveCustomApprovalForSiopArgs,
   IRemoveSiopSessionArgs,
   IRequiredContext,
+  Json,
+  LOGGER_NAMESPACE,
+  RequiredContext,
+  SelectableCredentialsMap,
+  Siopv2AuthorizationResponseData,
+  VerifiableCredentialsWithDefinition,
 } from '../types'
 
 import {
@@ -56,6 +52,9 @@ import {
   Siopv2MachineInstanceOpts,
 } from '../types'
 import { DcqlCredential, DcqlPresentation, DcqlQuery, DcqlSdJwtVcCredential } from 'dcql'
+import { Siopv2Machine } from '../machine/Siopv2Machine'
+import { getSelectableCredentials, siopSendAuthorizationResponse, translateCorrelationIdToName } from '../services/Siopv2MachineService'
+import { schema } from '..'
 
 const logger = Loggers.DEFAULT.options(LOGGER_NAMESPACE, {}).get(LOGGER_NAMESPACE)
 

package/src/session/OpSession.ts

@@ -27,14 +27,14 @@ import {
   W3CVerifiablePresentation,
 } from '@sphereon/ssi-types'
 import { IIdentifier, IVerifyResult, TKeyType } from '@veramo/core'
-import Debug from 'debug'
 import { v4 } from 'uuid'
 import { IOPOptions, IOpSessionArgs, IOpSessionGetOID4VPArgs, IOpsSendSiopAuthorizationResponseArgs, IRequiredContext } from '../types'
 import { createOP } from './functions'
 import { OID4VP } from './OID4VP'
 import { PEX } from '@sphereon/pex'
+import { Loggers } from '@sphereon/ssi-types'
 
-const debug = Debug(`sphereon:sdk:siop:op-session`)
+const logger = Loggers.DEFAULT.get('sphereon:oid4vp:OpSession')
 
 export class OpSession {
   public readonly ts = new Date().getDate()
@@ -100,9 +100,9 @@ export class OpSession {
   public async getSupportedDIDMethods(didPrefix?: boolean): Promise<string[]> {
     const agentMethods = this.getAgentDIDMethodsSupported({ didPrefix })
     let rpMethods = await this.getRPDIDMethodsSupported({ didPrefix, agentMethods })
-    debug(`RP supports subject syntax types: ${JSON.stringify(this.getSubjectSyntaxTypesSupported())}`)
+    logger.debug(`RP supports subject syntax types: ${JSON.stringify(this.getSubjectSyntaxTypesSupported())}`)
     if (rpMethods.dids.length === 0) {
-      debug(`RP does not support DIDs. Supported: ${JSON.stringify(this.getSubjectSyntaxTypesSupported())}`)
+      logger.debug(`RP does not support DIDs. Supported: ${JSON.stringify(this.getSubjectSyntaxTypesSupported())}`)
       return []
     }
 
@@ -125,7 +125,7 @@ export class OpSession {
 
   private getAgentDIDMethodsSupported(opts: { didPrefix?: boolean }) {
     const agentMethods = this.options.supportedDIDMethods?.map((method) => convertDidMethod(method, opts.didPrefix))
-    debug(`agent methods: ${JSON.stringify(agentMethods)}`)
+    logger.debug(`agent methods: ${JSON.stringify(agentMethods)}`)
     return agentMethods
   }
 
@@ -139,17 +139,17 @@ export class OpSession {
     let keyType: TKeyType | undefined
     const agentMethods =
       (opts.agentMethods ?? this.getAgentDIDMethodsSupported(opts))?.map((method) => convertDidMethod(method, opts.didPrefix)) ?? []
-    debug(`agent methods supported: ${JSON.stringify(agentMethods)}`)
+    logger.debug(`agent methods supported: ${JSON.stringify(agentMethods)}`)
     const authReq = await this.getAuthorizationRequest()
     const subjectSyntaxTypesSupported = authReq.registrationMetadataPayload?.subject_syntax_types_supported
       ?.map((method) => convertDidMethod(method, opts.didPrefix))
       .filter((val) => !val.startsWith('did'))
-    debug(`subject syntax types supported in rp method supported: ${JSON.stringify(subjectSyntaxTypesSupported)}`)
+    logger.debug(`subject syntax types supported in rp method supported: ${JSON.stringify(subjectSyntaxTypesSupported)}`)
     const aud = await authReq.authorizationRequest.getMergedProperty<string>('aud')
     let rpMethods: string[] = []
     if (aud && aud.startsWith('did:')) {
       const didMethod = convertDidMethod(parseDid(aud).method, opts.didPrefix)
-      debug(`aud did method: ${didMethod}`)
+      logger.debug(`aud did method: ${didMethod}`)
 
       // The RP knows our DID, so we can use it to determine the supported DID methods
       // If the aud did:method is not in the supported types, there still is something wrong, unless the RP signals to support all did methods
@@ -172,7 +172,7 @@ export class OpSession {
       (authReq.issuer?.includes('.ebsi.eu') || (await authReq.authorizationRequest.getMergedProperty<string>('client_id'))?.includes('.ebsi.eu'))
     let codecName: string | undefined = undefined
     if (isEBSI && (!aud || !aud.startsWith('http'))) {
-      debug(`EBSI detected, adding did:key to supported DID methods for RP`)
+      logger.debug(`EBSI detected, adding did:key to supported DID methods for RP`)
       const didKeyMethod = convertDidMethod('did:key', opts.didPrefix)
       if (!agentMethods?.includes(didKeyMethod)) {
         throw Error(`EBSI detected, but agent did not support did:key. Please reconfigure agent`)
@@ -187,7 +187,7 @@ export class OpSession {
   public async getSupportedIdentifiers(opts?: { createInCaseNoDIDFound?: boolean }): Promise<IIdentifier[]> {
     // todo: we also need to check signature algo
     const methods = await this.getSupportedDIDMethods(true)
-    debug(`supported DID methods (did: prefix = true): ${JSON.stringify(methods)}`)
+    logger.debug(`supported DID methods (did: prefix = true): ${JSON.stringify(methods)}`)
     if (methods.length === 0) {
       throw Error(`No DID methods are supported`)
     }
@@ -195,7 +195,7 @@ export class OpSession {
       .didManagerFind()
       .then((ids: IIdentifier[]) => ids.filter((id) => methods.includes(id.provider)))
     if (identifiers.length === 0) {
-      debug(`No identifiers available in agent supporting methods ${JSON.stringify(methods)}`)
+      logger.debug(`No identifiers available in agent supporting methods ${JSON.stringify(methods)}`)
       if (opts?.createInCaseNoDIDFound !== false) {
         const { codecName, keyType } = await this.getRPDIDMethodsSupported({
           didPrefix: true,
@@ -205,11 +205,11 @@ export class OpSession {
           provider: methods[0],
           options: { codecName, keyType, type: keyType }, // both keyType and type, because not every did provider has the same param
         })
-        debug(`Created a new identifier for the SIOP interaction: ${identifier.did}`)
+        logger.debug(`Created a new identifier for the SIOP interaction: ${identifier.did}`)
         identifiers.push(identifier)
       }
     }
-    debug(`supported identifiers: ${JSON.stringify(identifiers.map((id) => id.did))}`)
+    logger.debug(`supported identifiers: ${JSON.stringify(identifiers.map((id) => id.did))}`)
     return identifiers
   }
 

package/dist/agent/DidAuthSiopOpAuthenticator.d.ts

@@ -1,36 +0,0 @@
-import { IAgentPlugin } from '@veramo/core';
-import { DidAuthSiopOpAuthenticatorOptions, RequiredContext } from '../index';
-import { IDidAuthSiopOpAuthenticator } from '../types';
-export declare const didAuthSiopOpAuthenticatorMethods: Array<string>;
-export declare class DidAuthSiopOpAuthenticator implements IAgentPlugin {
-    readonly schema: any;
-    readonly methods: IDidAuthSiopOpAuthenticator;
-    private readonly sessions;
-    private readonly customApprovals;
-    private readonly presentationSignCallback?;
-    private readonly onContactIdentityCreated?;
-    private readonly onIdentifierCreated?;
-    private readonly eventEmitter?;
-    private readonly hasher?;
-    constructor(options?: DidAuthSiopOpAuthenticatorOptions);
-    onEvent(event: any, context: RequiredContext): Promise<void>;
-    private siopGetOPSession;
-    private siopRegisterOPSession;
-    private siopRemoveOPSession;
-    private siopRegisterOPCustomApproval;
-    private siopRemoveOPCustomApproval;
-    private siopGetMachineInterpreter;
-    private siopCreateConfig;
-    private siopGetSiopRequest;
-    private determineCorrelationId;
-    private siopRetrieveContact;
-    private siopAddContactIdentity;
-    private siopSendResponse;
-    private hasMDocCredentials;
-    private isMDocCredential;
-    private hasSdJwtCredentials;
-    private isSdJwtCredential;
-    private retrieveEncodedCredential;
-    private siopGetSelectableCredentials;
-}
-//# sourceMappingURL=DidAuthSiopOpAuthenticator.d.ts.map

package/dist/agent/DidAuthSiopOpAuthenticator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DidAuthSiopOpAuthenticator.d.ts","sourceRoot":"","sources":["../../src/agent/DidAuthSiopOpAuthenticator.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAE3C,OAAO,EACL,iCAAiC,EAKjC,eAAe,EAKhB,MAAM,UAAU,CAAA;AAQjB,OAAO,EACL,2BAA2B,EAM5B,MAAM,UAAU,CAAA;AAqBjB,eAAO,MAAM,iCAAiC,EAAE,KAAK,CAAC,MAAM,CAW3D,CAAA;AAED,qBAAa,0BAA2B,YAAW,YAAY;IAC7D,QAAQ,CAAC,MAAM,MAAqC;IACpD,QAAQ,CAAC,OAAO,EAAE,2BAA2B,CAc5C;IAED,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;IACjD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkH;IAClJ,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAA0B;IACpE,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAuD;IACjG,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAkD;IACvF,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAc;IAC5C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAY;gBAExB,OAAO,CAAC,EAAE,iCAAiC;IAW1C,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;YAa3D,gBAAgB;YAShB,qBAAqB;YAcrB,mBAAmB;YAInB,4BAA4B;YAQ5B,0BAA0B;YAI1B,yBAAyB;YAyBzB,gBAAgB;YAehB,kBAAkB;YAqDlB,sBAAsB;YAsBtB,mBAAmB;YAuBnB,sBAAsB;YAuCtB,gBAAgB;IA+G9B,OAAO,CAAC,kBAAkB,CAEzB;IAED,OAAO,CAAC,gBAAgB,CAKvB;IAED,OAAO,CAAC,mBAAmB,CAE1B;IAED,OAAO,CAAC,iBAAiB,CAIxB;IAED,OAAO,CAAC,yBAAyB,CAOhC;YAEa,4BAA4B;CAgB3C"}