fix: use new oob instead of connections

It fixes changes after rebase Signed-off-by: Jakub Koci <[email protected]>
openwallet-foundation · Apr 21, 2022 · 3576024 · 3576024
1 parent 1a904f1
commit 3576024
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/packages/core/src/agent/MessageReceiver.ts b/packages/core/src/agent/MessageReceiver.ts
@@ -73,7 +73,7 @@ export class MessageReceiver {
     if (this.isEncryptedMessage(inboundMessage)) {
       await this.receiveEncryptedMessage(inboundMessage as EncryptedMessage, session)
     } else if (this.isPlaintextMessage(inboundMessage)) {
-      await this.receivePlaintextMessage(inboundMessage)
+      await this.receivePlaintextMessage(inboundMessage, connection)
     } else {
       throw new AriesFrameworkError('Unable to parse incoming message: unrecognized format')
     }

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -2,7 +2,6 @@
 import 'reflect-metadata'
 
 export { Agent } from './agent/Agent'
-export { BaseEvent } from './agent/Events'
 export { EventEmitter } from './agent/EventEmitter'
 export { Handler, HandlerInboundMessage } from './agent/Handler'
 export { InboundMessageContext } from './agent/models/InboundMessageContext'

diff --git a/packages/core/src/modules/connections/services/ConnectionService.ts b/packages/core/src/modules/connections/services/ConnectionService.ts
@@ -458,7 +458,10 @@ export class ConnectionService {
       )
     }
 
-    const theirDidRecord = await this.didRepository.findSingleByQuery({ did: connectionRecord.theirDid })
+    const theirDidRecord = connectionRecord.theirDid && (await this.didRepository.findById(connectionRecord.theirDid))
+    if (!theirDidRecord) {
+      throw new AriesFrameworkError(`Did record with id ${connectionRecord.theirDid} not found.`)
+    }
 
     if (senderVerkey) {
       if (!theirDidRecord?.getTags().recipientKeys?.includes(senderVerkey)) {

diff --git a/packages/core/src/modules/dids/DidsModule.ts b/packages/core/src/modules/dids/DidsModule.ts
@@ -32,6 +32,6 @@ export class DidsModule {
   }
 
   public findByDid(did: string) {
-    return this.didRepository.findSingleByQuery({ did })
+    return this.didRepository.findById(did)
   }
 }
diff --git a/samples/extension-module/requester.ts b/samples/extension-module/requester.ts
@@ -1,6 +1,6 @@
 import type { DummyRecord, DummyStateChangedEvent } from './dummy'
 
-import { Agent, ConsoleLogger, LogLevel, WsOutboundTransport } from '@aries-framework/core'
+import { Agent, AriesFrameworkError, ConsoleLogger, LogLevel, WsOutboundTransport } from '@aries-framework/core'
 import { agentDependencies } from '@aries-framework/node'
 import { filter, first, firstValueFrom, map, ReplaySubject, timeout } from 'rxjs'
 
@@ -38,7 +38,10 @@ const run = async () => {
 
   // Connect to responder using its invitation endpoint
   const invitationUrl = await (await agentDependencies.fetch(`http://localhost:${port}/invitation`)).text()
-  const connection = await agent.connections.receiveInvitationFromUrl(invitationUrl)
+  const { connectionRecord: connection } = await agent.oob.receiveInvitationFromUrl(invitationUrl)
+  if (!connection) {
+    throw new AriesFrameworkError('Connection record for out-of-band invitation was not created.')
+  }
   await agent.connections.returnWhenIsConnected(connection.id)
 
   // Create observable for Response Received event

diff --git a/samples/extension-module/responder.ts b/samples/extension-module/responder.ts
@@ -40,8 +40,8 @@ const run = async () => {
 
   // Allow to create invitation, no other way to ask for invitation yet
   app.get('/invitation', async (req, res) => {
-    const { invitation } = await agent.connections.createConnection()
-    res.send(invitation.toUrl({ domain: `http://localhost:${port}/invitation` }))
+    const { outOfBandMessage } = await agent.oob.createInvitation()
+    res.send(outOfBandMessage.toUrl({ domain: `http://localhost:${port}/invitation` }))
   })
 
   // Inject DummyModule