fix/transport connection id

.eslintrc.js

@@ -99,7 +99,16 @@ module.exports = {
       },
     },
     {
-      files: ['*.test.ts', '**/__tests__/**', '**/tests/**', 'jest.*.ts', 'samples/**', 'demo/**', 'scripts/**'],
+      files: [
+        '*.test.ts',
+        '**/__tests__/**',
+        '**/tests/**',
+        'jest.*.ts',
+        'samples/**',
+        'demo/**',
+        'scripts/**',
+        '**/tests/**',
+      ],
       env: {
         jest: true,
         node: false,

.github/actions/setup-postgres-wallet-plugin/action.yml

@@ -5,11 +5,15 @@ author: 'sairanjit.tummalapalli@ayanworks.com'
 runs:
   using: composite
   steps:
+    # cargo build failing on latest release of rust due to
+    # socket2 dependency in the plugin https://users.rust-lang.org/t/build-broken-with-parse-quote-spanned-is-ambiguous/80280/2
+    # so pointing rust version to 1.63.0
     - name: Setup Postgres wallet plugin
       run: |
         sudo apt-get install -y libzmq3-dev libsodium-dev pkg-config libssl-dev
         curl https://sh.rustup.rs -sSf | bash -s -- -y
         export PATH="/root/.cargo/bin:${PATH}"
+        rustup default 1.63.0
         cd ../
         git clone https://github.com/hyperledger/indy-sdk.git
         cd indy-sdk/experimental/plugins/postgres_storage/

.gitignore

@@ -8,5 +8,4 @@ coverage
 .DS_Store
 logs.txt
 logs/
-packages/core/src/__tests__/genesis-von.txn
 lerna-debug.log

DEVREADME.md

@@ -71,7 +71,7 @@ GENESIS_TXN_PATH=network/genesis/local-genesis.txn TEST_AGENT_PUBLIC_DID_SEED=00
 Locally, you might want to run the tests without postgres tests. You can do that by ignoring the tests:
 
 ```sh
-yarn test --testPathIgnorePatterns ./packages/core/tests/postgres.test.ts -u
+yarn test --testPathIgnorePatterns ./packages/core/tests/postgres.e2e.test.ts -u
 ```
 
 In case you run into trouble running the tests, e.g. complaining about snapshots not being up-to-date, you can try and remove the data stored for the indy-client. On a Unix system with default setup you achieve this by running:

Dockerfile

@@ -35,6 +35,9 @@ RUN apt-get install -y --no-install-recommends yarn
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
+# cargo build failing on latest release of rust due to socket2 dependency in the plugin https://users.rust-lang.org/t/build-broken-with-parse-quote-spanned-is-ambiguous/80280/2 so pointing rust version to 1.63.0
+RUN rustup default 1.63.0
+
 # clone indy-sdk and build postgres plugin
 RUN git clone https://github.com/hyperledger/indy-sdk.git
 WORKDIR /indy-sdk/experimental/plugins/postgres_storage/

MAINTAINERS.md

@@ -10,3 +10,4 @@
 | Karim Stekelenburg | [@karimStekelenburg](https://github.com/karimStekelenburg) | ssi_karim#3505   |
 | Timo Glastra       | [@TimoGlastra](https://github.com/TimoGlastra)             | TimoGlastra#2988 |
 | Ariel Gentile      | [@genaris](https://github.com/genaris)                     | GenAris#4962     |
+| Jan Rietveld       | [@janrtvld](https://github.com/janrtvld)                   | janrtvld#3868    |

README.md

@@ -67,7 +67,7 @@ Some features are not yet supported, but are on our roadmap. Check [the roadmap]
 - ✅ Smart Auto Acceptance of Connections, Credentials and Proofs
 - 🚧 Receiving and Verifying revocable Indy Credentials
 - 🚧 W3C Linked Data VCs, BBS+ Signatures
-- 🚧 Multi Tenancy
+- ✅ Multi Tenancy
 - ❌ Browser
 
 ### Packages
@@ -101,6 +101,29 @@ Some features are not yet supported, but are on our roadmap. Check [the roadmap]
       </a>
     </td>
   </tr>
+   <tr>
+    <td>@aries-framework/action-menu</td>
+    <td>
+      <a href="https://npmjs.com/package/@aries-framework/action-menu">
+        <img alt="@aries-framework/action-menu version" src="https://img.shields.io/npm/v/@aries-framework/action-menu"/>
+      </a>
+    </td>
+  </tr>
+    <td>@aries-framework/question-answer</td>
+    <td>
+      <a href="https://npmjs.com/package/@aries-framework/question-answer">
+        <img alt="@aries-framework/question-answer version" src="https://img.shields.io/npm/v/@aries-framework/question-answer"/>
+      </a>
+    </td>
+  </tr>
+  <tr>
+    <td>@aries-framework/tenants</td>
+    <td>
+      <a href="https://npmjs.com/package/@aries-framework/tenants">
+        <img alt="@aries-framework/tenants version" src="https://img.shields.io/npm/v/@aries-framework/tenants"/>
+      </a>
+    </td>
+  </tr>
 </table>
 
 ## Getting Started

demo/README.md

@@ -17,7 +17,7 @@ Alice, a former student of Faber College, connects with the College, is issued a
 
 In order to use Aries Framework JavaScript some platform specific dependencies and setup is required. See our guides below to quickly set up you project with Aries Framework JavaScript for NodeJS, React Native and Electron.
 
-- [NodeJS](https:/aries.js.org/guides/getting-started/prerequisites/nodejs)
+- [NodeJS](https://aries.js.org/guides/getting-started/installation/nodejs)
 
 ### Run the demo
 
@@ -57,16 +57,16 @@ yarn faber
 
 To set up a connection:
 
-- Select 'setup connection' in both Agents
-- Alice will print a invitation link which you then copy and paste to Faber
+- Select 'receive connection invitation' in Alice and 'create connection invitation' in Faber
+- Faber will print a invitation link which you then copy and paste to Alice
 - You have now set up a connection!
 
 To offer a credential:
 
 - Select 'offer credential' in Faber
 - Faber will start with registering a schema and the credential definition accordingly
 - You have now send a credential offer to Alice!
-- Go to Alice to accept the incoming credential offer
+- Go to Alice to accept the incoming credential offer by selecting 'yes'.
 
 To request a proof:
 

demo/src/Alice.ts

@@ -1,18 +1,11 @@
-import type {
-  ConnectionRecord,
-  ConnectionStateChangedEvent,
-  CredentialExchangeRecord,
-  ProofRecord,
-} from '@aries-framework/core'
-
-import { ConnectionEventTypes } from '@aries-framework/core'
+import type { ConnectionRecord, CredentialExchangeRecord, ProofExchangeRecord } from '@aries-framework/core'
 
 import { BaseAgent } from './BaseAgent'
 import { greenText, Output, redText } from './OutputClass'
 
 export class Alice extends BaseAgent {
-  public outOfBandId?: string
   public connected: boolean
+  public connectionRecordFaberId?: string
 
   public constructor(port: number, name: string) {
     super(port, name)
@@ -26,74 +19,30 @@ export class Alice extends BaseAgent {
   }
 
   private async getConnectionRecord() {
-    if (!this.outOfBandId) {
-      throw Error(redText(Output.MissingConnectionRecord))
-    }
-
-    const [connection] = await this.agent.connections.findAllByOutOfBandId(this.outOfBandId)
-
-    if (!connection) {
+    if (!this.connectionRecordFaberId) {
       throw Error(redText(Output.MissingConnectionRecord))
     }
-
-    return connection
+    return await this.agent.connections.getById(this.connectionRecordFaberId)
   }
 
-  private async printConnectionInvite() {
-    const outOfBand = await this.agent.oob.createInvitation()
-    this.outOfBandId = outOfBand.id
-
-    console.log(
-      Output.ConnectionLink,
-      outOfBand.outOfBandInvitation.toUrl({ domain: `http://localhost:${this.port}` }),
-      '\n'
-    )
-  }
-
-  private async waitForConnection() {
-    if (!this.outOfBandId) {
-      throw new Error(redText(Output.MissingConnectionRecord))
+  private async receiveConnectionRequest(invitationUrl: string) {
+    const { connectionRecord } = await this.agent.oob.receiveInvitationFromUrl(invitationUrl)
+    if (!connectionRecord) {
+      throw new Error(redText(Output.NoConnectionRecordFromOutOfBand))
     }
+    return connectionRecord
+  }
 
-    console.log('Waiting for Faber to finish connection...')
-
-    const getConnectionRecord = (outOfBandId: string) =>
-      new Promise<ConnectionRecord>((resolve, reject) => {
-        // Timeout of 20 seconds
-        const timeoutId = setTimeout(() => reject(new Error(redText(Output.MissingConnectionRecord))), 20000)
-
-        // Start listener
-        this.agent.events.on<ConnectionStateChangedEvent>(ConnectionEventTypes.ConnectionStateChanged, (e) => {
-          if (e.payload.connectionRecord.outOfBandId !== outOfBandId) return
-
-          clearTimeout(timeoutId)
-          resolve(e.payload.connectionRecord)
-        })
-
-        // Also retrieve the connection record by invitation if the event has already fired
-        void this.agent.connections.findAllByOutOfBandId(outOfBandId).then(([connectionRecord]) => {
-          if (connectionRecord) {
-            clearTimeout(timeoutId)
-            resolve(connectionRecord)
-          }
-        })
-      })
-
-    const connectionRecord = await getConnectionRecord(this.outOfBandId)
-
-    try {
-      await this.agent.connections.returnWhenIsConnected(connectionRecord.id)
-    } catch (e) {
-      console.log(redText(`\nTimeout of 20 seconds reached.. Returning to home screen.\n`))
-      return
-    }
-    console.log(greenText(Output.ConnectionEstablished))
+  private async waitForConnection(connectionRecord: ConnectionRecord) {
+    connectionRecord = await this.agent.connections.returnWhenIsConnected(connectionRecord.id)
     this.connected = true
+    console.log(greenText(Output.ConnectionEstablished))
+    return connectionRecord.id
   }
 
-  public async setupConnection() {
-    await this.printConnectionInvite()
-    await this.waitForConnection()
+  public async acceptConnection(invitation_url: string) {
+    const connectionRecord = await this.receiveConnectionRequest(invitation_url)
+    this.connectionRecordFaberId = await this.waitForConnection(connectionRecord)
   }
 
   public async acceptCredentialOffer(credentialRecord: CredentialExchangeRecord) {
@@ -102,12 +51,18 @@ export class Alice extends BaseAgent {
     })
   }
 
-  public async acceptProofRequest(proofRecord: ProofRecord) {
-    const retrievedCredentials = await this.agent.proofs.getRequestedCredentialsForProofRequest(proofRecord.id, {
-      filterByPresentationPreview: true,
+  public async acceptProofRequest(proofRecord: ProofExchangeRecord) {
+    const requestedCredentials = await this.agent.proofs.autoSelectCredentialsForProofRequest({
+      proofRecordId: proofRecord.id,
+      config: {
+        filterByPresentationPreview: true,
+      },
+    })
+
+    await this.agent.proofs.acceptRequest({
+      proofRecordId: proofRecord.id,
+      proofFormats: requestedCredentials.proofFormats,
     })
-    const requestedCredentials = this.agent.proofs.autoSelectCredentialsForProofRequest(retrievedCredentials)
-    await this.agent.proofs.acceptRequest(proofRecord.id, requestedCredentials)
     console.log(greenText('\nProof request accepted!\n'))
   }
 

demo/src/AliceInquirer.ts

@@ -1,8 +1,8 @@
-import type { CredentialExchangeRecord, ProofRecord } from '@aries-framework/core'
+import type { CredentialExchangeRecord, ProofExchangeRecord } from '@aries-framework/core'
 
 import { clear } from 'console'
 import { textSync } from 'figlet'
-import inquirer from 'inquirer'
+import { prompt } from 'inquirer'
 
 import { Alice } from './Alice'
 import { BaseInquirer, ConfirmOptions } from './BaseInquirer'
@@ -17,7 +17,7 @@ export const runAlice = async () => {
 }
 
 enum PromptOptions {
-  CreateConnection = 'Create connection invitation',
+  ReceiveConnectionUrl = 'Receive connection invitation',
   SendMessage = 'Send message',
   Exit = 'Exit',
   Restart = 'Restart',
@@ -42,18 +42,18 @@ export class AliceInquirer extends BaseInquirer {
   }
 
   private async getPromptChoice() {
-    if (this.alice.outOfBandId) return inquirer.prompt([this.inquireOptions(this.promptOptionsString)])
+    if (this.alice.connectionRecordFaberId) return prompt([this.inquireOptions(this.promptOptionsString)])
 
-    const reducedOption = [PromptOptions.CreateConnection, PromptOptions.Exit, PromptOptions.Restart]
-    return inquirer.prompt([this.inquireOptions(reducedOption)])
+    const reducedOption = [PromptOptions.ReceiveConnectionUrl, PromptOptions.Exit, PromptOptions.Restart]
+    return prompt([this.inquireOptions(reducedOption)])
   }
 
   public async processAnswer() {
     const choice = await this.getPromptChoice()
     if (this.listener.on) return
 
     switch (choice.options) {
-      case PromptOptions.CreateConnection:
+      case PromptOptions.ReceiveConnectionUrl:
         await this.connection()
         break
       case PromptOptions.SendMessage:
@@ -70,16 +70,16 @@ export class AliceInquirer extends BaseInquirer {
   }
 
   public async acceptCredentialOffer(credentialRecord: CredentialExchangeRecord) {
-    const confirm = await inquirer.prompt([this.inquireConfirmation(Title.CredentialOfferTitle)])
+    const confirm = await prompt([this.inquireConfirmation(Title.CredentialOfferTitle)])
     if (confirm.options === ConfirmOptions.No) {
       await this.alice.agent.credentials.declineOffer(credentialRecord.id)
     } else if (confirm.options === ConfirmOptions.Yes) {
       await this.alice.acceptCredentialOffer(credentialRecord)
     }
   }
 
-  public async acceptProofRequest(proofRecord: ProofRecord) {
-    const confirm = await inquirer.prompt([this.inquireConfirmation(Title.ProofRequestTitle)])
+  public async acceptProofRequest(proofRecord: ProofExchangeRecord) {
+    const confirm = await prompt([this.inquireConfirmation(Title.ProofRequestTitle)])
     if (confirm.options === ConfirmOptions.No) {
       await this.alice.agent.proofs.declineRequest(proofRecord.id)
     } else if (confirm.options === ConfirmOptions.Yes) {
@@ -88,7 +88,9 @@ export class AliceInquirer extends BaseInquirer {
   }
 
   public async connection() {
-    await this.alice.setupConnection()
+    const title = Title.InvitationTitle
+    const getUrl = await prompt([this.inquireInput(title)])
+    await this.alice.acceptConnection(getUrl.input)
     if (!this.alice.connected) return
 
     this.listener.credentialOfferListener(this.alice, this)
@@ -103,7 +105,7 @@ export class AliceInquirer extends BaseInquirer {
   }
 
   public async exit() {
-    const confirm = await inquirer.prompt([this.inquireConfirmation(Title.ConfirmTitle)])
+    const confirm = await prompt([this.inquireConfirmation(Title.ConfirmTitle)])
     if (confirm.options === ConfirmOptions.No) {
       return
     } else if (confirm.options === ConfirmOptions.Yes) {
@@ -112,7 +114,7 @@ export class AliceInquirer extends BaseInquirer {
   }
 
   public async restart() {
-    const confirm = await inquirer.prompt([this.inquireConfirmation(Title.ConfirmTitle)])
+    const confirm = await prompt([this.inquireConfirmation(Title.ConfirmTitle)])
     if (confirm.options === ConfirmOptions.No) {
       await this.processAnswer()
       return

demo/src/BaseAgent.ts

@@ -31,6 +31,7 @@ export class BaseAgent {
         {
           genesisTransactions: bcovrin,
           id: 'greenlights' + name,
+          indyNamespace: 'greenlights' + name,
           isProduction: false,
         },
       ],
@@ -42,7 +43,7 @@ export class BaseAgent {
 
     this.config = config
 
-    this.agent = new Agent(config, agentDependencies)
+    this.agent = new Agent({ config, dependencies: agentDependencies })
     this.agent.registerInboundTransport(new HttpInboundTransport({ port }))
     this.agent.registerOutboundTransport(new HttpOutboundTransport())
   }

demo/src/BaseInquirer.ts

@@ -1,4 +1,4 @@
-import inquirer from 'inquirer'
+import { prompt } from 'inquirer'
 
 import { Title } from './OutputClass'
 
@@ -48,7 +48,7 @@ export class BaseInquirer {
 
   public async inquireMessage() {
     this.inputInquirer.message = Title.MessageTitle
-    const message = await inquirer.prompt([this.inputInquirer])
+    const message = await prompt([this.inputInquirer])
 
     return message.input[0] === 'q' ? null : message.input
   }