Bug/ver 123 (#25)

* updated supportedIdentifier & updated uploadFile, makeIpfsRequest

* bumped package version

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digicatapult/veritable-cloudagent",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "main": "build/index",
   "types": "build/index",
   "files": [

src/anoncreds/index.ts

@@ -17,7 +17,9 @@ import type { AgentContext } from '@aries-framework/core'
 
 export default class VeritableAnonCredsRegistry implements AnonCredsRegistry {
   public readonly methodName = 'veritable'
-  public readonly supportedIdentifier = /^ipfs:\/\/([a-zA-Z0-9]+)$/
+  public readonly supportedIdentifier =
+    /(?:^did:key:z[a-km-zA-HJ-NP-Z1-9]+$)|(?:^ipfs:\/\/([a-zA-Z0-9]+)$)|(?:^did:web:.+$)/ //did:web matches anything but an empty string
+  private readonly ipfsIdentifier = /^ipfs:\/\/([a-zA-Z0-9]+)$/
 
   constructor(private ipfs: Ipfs) {}
 
@@ -167,7 +169,7 @@ export default class VeritableAnonCredsRegistry implements AnonCredsRegistry {
     agentContext: AgentContext,
     id: string
   ): Promise<{ type: 'success'; result: AObj } | { type: 'error'; error: AnonCredsResolutionMetadata }> {
-    const match = id.match(this.supportedIdentifier)
+    const match = id.match(this.ipfsIdentifier)
     if (!match) {
       return {
         type: 'error',

src/ipfs/__tests__/fixtures/ipfs.ts

@@ -27,7 +27,6 @@ export const withIpfsCatResponse = (responses: { cid: string; code: number; body
 
   return { ipfsOrigin }
 }
-
 export const withIpfsAddResponse = (responses: { code: number; cid: unknown; body: Buffer }[]) => {
   const ipfsOrigin = `http://ipfs`
   let originalDispatcher: Dispatcher
@@ -45,8 +44,9 @@ export const withIpfsAddResponse = (responses: { code: number; cid: unknown; bod
           method: 'POST',
           body: (calledBody) => {
             // ugly hack as undici mock doesn't allow mocking of Buffer bodies only strings
-            const asBuf = calledBody as unknown as Buffer
-            return body.compare(asBuf) === 0
+            const asBuf = calledBody as unknown as FormData
+            const asArr = [...asBuf.entries()]
+            return asArr.length === 1 && asArr[0][0] === 'file'
           },
         })
         .reply(code, { Hash: cid })

src/ipfs/index.ts

@@ -1,5 +1,10 @@
 import { addResponseParser } from './responseParser'
 
+export interface MetadataFile {
+  blob: Blob
+  filename: string
+}
+
 export default class Ipfs {
   constructor(private origin: string) {
     try {
@@ -15,9 +20,12 @@ export default class Ipfs {
     })
     return Buffer.from(await response.arrayBuffer())
   }
-
+  //needs to pass on form data
   public async uploadFile(file: Buffer): Promise<string> {
-    const response = await this.makeIpfsRequest('/api/v0/add', { 'cid-version': '1' }, file)
+    const form = new FormData()
+    const blob = new Blob([file])
+    form.append('file', blob, 'file')
+    const response = await this.makeIpfsRequest('/api/v0/add', { 'cid-version': '1' }, form)
     const responseJson = await response.json()
 
     try {
@@ -28,7 +36,7 @@ export default class Ipfs {
     }
   }
 
-  private async makeIpfsRequest(route: string, args: Record<string, string>, body?: Buffer) {
+  private async makeIpfsRequest(route: string, args: Record<string, string>, body?: FormData) {
     const url = new URL(route, this.origin)
     const search = new URLSearchParams(args)
     url.search = search.toString()

src/routes/swagger.json

@@ -1247,7 +1247,7 @@
 	},
 	"info": {
 		"title": "@digicatapult/veritable-cloudagent",
-		"version": "0.3.0",
+		"version": "0.3.1",
 		"description": "Rest endpoint wrapper for using your agent over HTTP",
 		"license": {
 			"name": "Apache-2.0"