@sphereon/ssi-sdk.siopv2-oid4vp-op-auth 0.32.1-feature.VDX.341.56 → 0.32.1-feature.oid4vp.rest.api.improv.bootcamp.187

package/src/types/IDidAuthSiopOpAuthenticator.ts

@@ -1,5 +1,5 @@
 import {
-  DcqlQueryResponseOpts,
+  DcqlResponseOpts,
   PresentationDefinitionWithLocation,
   PresentationSignCallback,
   ResponseMode,
@@ -123,8 +123,9 @@ export interface IOpsSendSiopAuthorizationResponseArgs {
   // verifiedAuthorizationRequest: VerifiedAuthorizationRequest
   presentationSubmission?: PresentationSubmission
   verifiablePresentations?: W3CVerifiablePresentation[]
-  dcqlQuery?: DcqlQueryResponseOpts
+  dcqlResponse?: DcqlResponseOpts
   hasher?: Hasher
+  isFirstParty?: boolean
 }
 
 export enum events {
@@ -199,4 +200,15 @@ export interface IGetPresentationExchangeArgs {
   hasher?: Hasher
 }
 
+// It was added here because it's not exported from DCQL anymore
+export type Json =
+  | string
+  | number
+  | boolean
+  | null
+  | {
+      [key: string]: Json
+    }
+  | Json[]
+
 export const DEFAULT_JWT_PROOF_TYPE = 'JwtProof2020'

package/src/types/machine/index.ts

@@ -18,6 +18,7 @@ export type Siopv2MachineContext = {
   contactAlias: string
   selectableCredentialsMap?: SelectableCredentialsMap
   selectedCredentials: Array<UniqueDigitalCredential>
+  isFirstParty?: boolean
   error?: ErrorDetails
 }
 

package/src/types/siop-service/index.ts

@@ -1,4 +1,8 @@
-import { PresentationDefinitionWithLocation, RPRegistrationMetadataPayload } from '@sphereon/did-auth-siop'
+import {
+  PresentationDefinitionWithLocation,
+  PresentationSignCallback,
+  RPRegistrationMetadataPayload, VerifiedAuthorizationRequest
+} from '@sphereon/did-auth-siop'
 import { IIdentifierResolution, ManagedIdentifierOptsOrResult } from '@sphereon/ssi-sdk-ext.identifier-resolution'
 import { IContactManager } from '@sphereon/ssi-sdk.contact-manager'
 import { ICredentialStore, UniqueDigitalCredential } from '@sphereon/ssi-sdk.credential-store'
@@ -8,10 +12,14 @@ import { IAgentContext, IDIDManager, IIdentifier, IResolver } from '@veramo/core
 import { IDidAuthSiopOpAuthenticator } from '../IDidAuthSiopOpAuthenticator'
 import { Siopv2MachineContext, Siopv2MachineInterpreter, Siopv2MachineState } from '../machine'
 import { DcqlQuery } from 'dcql'
+import { Hasher } from '@sphereon/ssi-types'
 
 export type DidAuthSiopOpAuthenticatorOptions = {
+  presentationSignCallback?: PresentationSignCallback
+  customApprovals?: Record<string, (verifiedAuthorizationRequest: VerifiedAuthorizationRequest, sessionId: string) => Promise<void>>
   onContactIdentityCreated?: (args: OnContactIdentityCreatedArgs) => Promise<void>
   onIdentifierCreated?: (args: OnIdentifierCreatedArgs) => Promise<void>
+  hasher?: Hasher
 }
 
 export type GetMachineArgs = {
@@ -20,12 +28,21 @@ export type GetMachineArgs = {
   stateNavigationListener?: (siopv2Machine: Siopv2MachineInterpreter, state: Siopv2MachineState, navigation?: any) => Promise<void>
 }
 
-export type CreateConfigArgs = Pick<Siopv2MachineContext, 'url'>
+export type CreateConfigArgs = { url: string }
 export type CreateConfigResult = Omit<DidAuthConfig, 'stateId' | 'idOpts'>
-export type GetSiopRequestArgs = Pick<Siopv2MachineContext, 'didAuthConfig' | 'url'>
+export type GetSiopRequestArgs = { didAuthConfig?: Omit<DidAuthConfig, 'identifier'>, url: string }
+// FIXME it would be nicer if these function are not tied to a certain machine so that we can start calling them for anywhere
 export type RetrieveContactArgs = Pick<Siopv2MachineContext, 'url' | 'authorizationRequestData'>
+// FIXME it would be nicer if these function are not tied to a certain machine so that we can start calling them for anywhere
 export type AddIdentityArgs = Pick<Siopv2MachineContext, 'contact' | 'authorizationRequestData'>
-export type SendResponseArgs = Pick<Siopv2MachineContext, 'didAuthConfig' | 'authorizationRequestData' | 'selectedCredentials' | 'idOpts'>
+export type SendResponseArgs = {
+  didAuthConfig?: Omit<DidAuthConfig, 'identifier'>,
+  authorizationRequestData?: Siopv2AuthorizationRequestData,
+  selectedCredentials: Array<UniqueDigitalCredential>
+  idOpts?: ManagedIdentifierOptsOrResult
+  isFirstParty?: boolean
+}
+// FIXME it would be nicer if these function are not tied to a certain machine so that we can start calling them for anywhere
 export type GetSelectableCredentialsArgs = Pick<Siopv2MachineContext, 'authorizationRequestData'>
 
 export enum Siopv2HolderEvent {
@@ -39,7 +56,7 @@ export enum SupportedLanguage {
 }
 
 export type Siopv2AuthorizationResponseData = {
-  body?: string
+  body?: string | Record<string, any>
   url?: string
   queryParams?: Record<string, any>
 }