refac: V1ProofService

Signed-off-by: NB Prasad Katkar <[email protected]>

Author: NB-PrasadKatkar

packages/core/src/modules/proofs/ProofService.ts

@@ -1,17 +1,17 @@
 import type { AgentMessage } from '../../agent/AgentMessage'
 import type { InboundMessageContext } from '../../agent/models/InboundMessageContext'
-import type { CreateRequestAsResponseOptions } from './interface'
+import type { ProofFormatService } from './formats/ProofFormatService'
 import type { ProofProtocolVersion } from './models/ProofProtocolVersion'
 import type {
-  CreatePresentationOptions,
   CreateProposalAsResponseOptions,
   CreateProposalOptions,
+  CreateRequestAsResponseOptions,
+  PresentationOptions,
   RequestProofOptions,
 } from './models/ServiceOptions'
 import type { RetrievedCredentials } from './protocol/v1/models'
 import type { ProofRecord } from './repository'
 import type { PresentationRecordType } from './repository/PresentationExchangeRecord'
-import type { ProofFormatService } from './v2/formats/ProofFormatService'
 
 import { ConsoleLogger, LogLevel } from '../../logger'
 
@@ -78,7 +78,7 @@ export abstract class ProofService {
   abstract processRequest(messageContext: InboundMessageContext<AgentMessage>): Promise<ProofRecord>
 
   abstract createPresentation(
-    options: CreatePresentationOptions
+    options: PresentationOptions
   ): Promise<{ proofRecord: ProofRecord; message: AgentMessage }>
 
   abstract processPresentation(messageContext: InboundMessageContext<AgentMessage>): Promise<ProofRecord>

packages/core/src/modules/proofs/formats/indy/IndyProofFormatService.ts

@@ -1,10 +1,9 @@
-import type { ProofAttributeInfo, ProofRequest, RequestedCredentials } from '../..'
-import type { CredentialRepository } from '../../../credentials'
 import type { CreateProposalOptions } from '../../models/ServiceOptions'
 import type {
   CreatePresentationOptions,
   CreateRequestOptions,
   ProcessProposalOptions,
+  ProcessRequestOptions,
   ProofAttachmentFormat,
   ProofFormatSpec,
 } from '../ProofFormatService'
@@ -15,13 +14,6 @@ import { ProofFormatService } from '../ProofFormatService'
 import { ATTACHMENT_FORMAT } from '../ProofFormats'
 
 export class IndyProofFormatService extends ProofFormatService {
-  private credentialRepository: CredentialRepository
-
-  public constructor(credentialRepository: CredentialRepository) {
-    super()
-    this.credentialRepository = credentialRepository
-  }
-
   public createProposal(options: CreateProposalOptions): ProofAttachmentFormat {
     // Handle format in service
     throw new Error('Method not implemented.')
@@ -74,56 +66,4 @@ export class IndyProofFormatService extends ProofFormatService {
   public getFormatIdentifier(messageType: string): ProofFormatSpec {
     return ATTACHMENT_FORMAT[messageType].indy
   }
-
-  public async getRequestedAttachmentsForRequestedCredentials(
-    indyProofRequest: ProofRequest,
-    requestedCredentials: RequestedCredentials
-  ): Promise<Attachment[] | undefined> {
-    const attachments: Attachment[] = []
-    const credentialIds = new Set<string>()
-    const requestedAttributesNames: (string | undefined)[] = []
-
-    // Get the credentialIds if it contains a hashlink
-    for (const [referent, requestedAttribute] of Object.entries(requestedCredentials.requestedAttributes)) {
-      // Find the requested Attributes
-      const requestedAttributes = indyProofRequest.requestedAttributes.get(referent) as ProofAttributeInfo
-
-      // List the requested attributes
-      requestedAttributesNames.push(...(requestedAttributes.names ?? [requestedAttributes.name]))
-
-      // Find the attributes that have a hashlink as a value
-      for (const attribute of Object.values(requestedAttribute.credentialInfo.attributes)) {
-        if (attribute.toLowerCase().startsWith('hl:')) {
-          credentialIds.add(requestedAttribute.credentialId)
-        }
-      }
-    }
-
-    // Only continues if there is an attribute value that contains a hashlink
-    for (const credentialId of credentialIds) {
-      // Get the credentialRecord that matches the ID
-
-      const credentialRecord = await this.credentialRepository.getSingleByQuery({ credentialId })
-
-      if (credentialRecord.linkedAttachments) {
-        // Get the credentials that have a hashlink as value and are requested
-        const requestedCredentials = credentialRecord.credentialAttributes?.filter(
-          (credential) =>
-            credential.value.toLowerCase().startsWith('hl:') && requestedAttributesNames.includes(credential.name)
-        )
-
-        // Get the linked attachments that match the requestedCredentials
-        const linkedAttachments = credentialRecord.linkedAttachments.filter((attachment) =>
-          requestedCredentials?.map((credential) => credential.value.split(':')[1]).includes(attachment.id)
-        )
-
-        if (linkedAttachments) {
-          attachments.push(...linkedAttachments)
-        }
-      }
-    }
-
-    return attachments.length ? attachments : undefined
-  }
-
 }

packages/core/src/modules/proofs/models/ServiceOptions.ts

@@ -43,3 +43,7 @@ export interface PresentationOptions {
   comment?: string
   // TODO: add other options such as comment, etc...
 }
+
+export interface CreateAckOptions {
+  proofRecord: ProofRecord
+}