Merge pull request #658 from uport-project/next

chore: new release

__tests__/localAgent.test.ts

@@ -78,6 +78,7 @@ let dbConnection: Promise<Connection>
 
 const setup = async (options?: IAgentOptions): Promise<boolean> => {
   dbConnection = createConnection({
+    name: 'test',
     type: 'sqlite',
     database: databaseFile,
     synchronize: true,

__tests__/localMemoryStoreAgent.test.ts

@@ -65,6 +65,7 @@ let dbConnection: Promise<Connection>
 
 const setup = async (options?: IAgentOptions): Promise<boolean> => {
   dbConnection = createConnection({
+    name: 'test',
     type: 'sqlite',
     database: databaseFile,
     synchronize: true,

__tests__/restAgent.test.ts

@@ -101,6 +101,7 @@ const getAgent = (options?: IAgentOptions) =>
 
 const setup = async (options?: IAgentOptions): Promise<boolean> => {
   dbConnection = createConnection({
+    name: 'test',
     type: 'sqlite',
     database: databaseFile,
     synchronize: true,

__tests__/shared/didDiscovery.ts

@@ -103,7 +103,7 @@ export default (testContext: {
 
     // THIS HAS TO BE THE LAST TEST IN THIS FILE!
     it('should return errors', async () => {
-      const connection = getConnection()
+      const connection = getConnection('test')
       await connection.query('PRAGMA foreign_keys = OFF;')
       await connection.query('DROP TABLE claim;')
 

__tests__/shared/saveClaims.ts

@@ -101,5 +101,18 @@ export default (testContext: {
       })
       expect(credentials).toHaveLength(2)
     })
+
+    it('should be able to delete credential', async () => {
+      const credentials = await agent.dataStoreORMGetVerifiableCredentials()
+      expect(credentials).toHaveLength(3)
+
+      const result = await agent.dataStoreDeleteVerifiableCredential({hash: credentials[0].hash})
+      expect(result).toEqual(true)
+
+      const credentials2 = await agent.dataStoreORMGetVerifiableCredentials()
+      expect(credentials2).toHaveLength(2)
+
+    })
+
   })
 }

package.json

@@ -18,7 +18,7 @@
     "build-clean": "rimraf ./packages/*/build ./packages/*/api ./packages/*/node_modules ./packages/*/tsconfig.tsbuildinfo && jest --clearCache",
     "publish:latest": "lerna publish --conventional-commits --include-merged-tags --create-release github --yes --dist-tag latest --registry https://registry.npmjs.org/:_authToken=${NPM_TOKEN}",
     "publish:next": "lerna publish --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid next --pre-dist-tag next --yes --registry https://registry.npmjs.org/:_authToken=${NPM_TOKEN}",
-    "publish:unstable": "lerna publish --repo-version 0.0.42 --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid unstable --pre-dist-tag unstable --yes --registry https://registry.npmjs.org/:_authToken=${NPM_TOKEN}"
+    "publish:unstable": "lerna publish --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid unstable --pre-dist-tag unstable --yes --registry https://registry.npmjs.org/:_authToken=${NPM_TOKEN}"
   },
   "workspaces": [
     "packages/*"
@@ -30,28 +30,28 @@
     }
   },
   "devDependencies": {
-    "@commitlint/cli": "12.1.4",
-    "@commitlint/config-conventional": "12.1.4",
-    "@microsoft/api-documenter": "7.13.31",
-    "@microsoft/api-extractor": "7.18.2",
+    "@commitlint/cli": "13.1.0",
+    "@commitlint/config-conventional": "13.1.0",
+    "@microsoft/api-documenter": "7.13.34",
+    "@microsoft/api-extractor": "7.18.4",
     "@microsoft/api-extractor-model": "7.13.4",
     "@types/jest": "26.0.24",
-    "codecov": "3.8.2",
+    "codecov": "3.8.3",
     "cross-fetch": "3.1.4",
     "husky": "7.0.1",
     "jest": "27.0.6",
     "jest-fetch-mock": "3.0.3",
     "json-schema": "0.3.0",
     "lerna": "4.0.0",
-    "lerna-changelog": "1.0.1",
+    "lerna-changelog": "2.1.0",
     "oas-resolver": "2.5.6",
     "openapi-types": "9.1.0",
     "prettier": "2.3.2",
     "pretty-quick": "3.1.1",
     "rimraf": "3.0.2",
     "semantic-release": "17.4.4",
-    "ts-jest": "27.0.3",
-    "ts-json-schema-generator": "0.94.1",
+    "ts-jest": "27.0.4",
+    "ts-json-schema-generator": "0.95.0",
     "ts-node": "10.1.0",
     "typescript": "4.3.5"
   },

packages/cli/package.json

@@ -14,7 +14,7 @@
     "update-veramo-latest": "yarn add @veramo/core@latest @veramo/discovery@latest @veramo/remote-client@latest @veramo/remote-server@latest @veramo/did-provider-key@latest @veramo/did-resolver@latest @veramo/did-jwt@latest @veramo/credential-w3c@latest @veramo/did-provider-ethr@latest @veramo/did-provider-web@latest @veramo/did-comm@latest @veramo/kms-local@latest @veramo/selective-disclosure@latest @veramo/data-store@latest @veramo/key-manager@latest @veramo/message-handler@latest @veramo/did-manager@latest @veramo/url-handler@latest"
   },
   "dependencies": {
-    "@microsoft/api-extractor": "7.18.2",
+    "@microsoft/api-extractor": "7.18.4",
     "@microsoft/api-extractor-model": "7.13.4",
     "@types/blessed": "^0.1.17",
     "@types/swagger-ui-express": "^4.1.2",
@@ -62,19 +62,19 @@
     "qrcode-terminal": "^0.12.0",
     "sqlite3": "^5.0.0",
     "swagger-ui-express": "^4.1.5",
-    "ts-json-schema-generator": "^0.94.0",
+    "ts-json-schema-generator": "^0.95.0",
     "typeorm": "0.2.34",
     "url-parse": "^1.5.1",
     "web-did-resolver": "2.0.4",
-    "ws": "^7.4.1",
+    "ws": "^8.0.0",
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@types/debug": "4.1.6",
+    "@types/debug": "4.1.7",
     "@types/inquirer": "7.3.3",
-    "@types/node-fetch": "2.5.11",
+    "@types/node-fetch": "2.5.12",
     "@types/passport-http-bearer": "1.0.37",
-    "@types/ws": "7.4.6",
+    "@types/ws": "7.4.7",
     "typescript": "4.3.5"
   },
   "files": [

packages/core/package.json

@@ -19,12 +19,12 @@
   },
   "dependencies": {
     "debug": "^4.1.1",
-    "did-jwt-vc": "2.1.3",
+    "did-jwt-vc": "2.1.6",
     "events": "^3.2.0",
     "z-schema": "^5.0.0"
   },
   "devDependencies": {
-    "@types/debug": "4.1.6",
+    "@types/debug": "4.1.7",
     "did-resolver": "3.1.0",
     "typescript": "4.3.5"
   },

packages/core/plugin.schema.json

@@ -1308,6 +1308,19 @@
   "IDataStore": {
     "components": {
       "schemas": {
+        "IDataStoreDeleteVerifiableCredentialArgs": {
+          "type": "object",
+          "properties": {
+            "hash": {
+              "type": "string",
+              "description": "Required. VerifiableCredential hash"
+            }
+          },
+          "required": [
+            "hash"
+          ],
+          "description": "Input arguments for  {@link  IDataStore.IDataStoreDeleteVerifiableCredentialArgs| IDataStoreDeleteVerifiableCredentialArgs }"
+        },
         "IDataStoreGetMessageArgs": {
           "type": "object",
           "properties": {
@@ -1560,7 +1573,6 @@
             "@context",
             "type",
             "verifier",
-            "verifiableCredential",
             "proof"
           ],
           "description": "Verifiable Presentation  {@link  https://github.com/decentralized-identifier/did-jwt-vc }"
@@ -1632,6 +1644,15 @@
         }
       },
       "methods": {
+        "dataStoreDeleteVerifiableCredential": {
+          "description": "Deletes verifiable credential from the data store",
+          "arguments": {
+            "$ref": "#/components/schemas/IDataStoreDeleteVerifiableCredentialArgs"
+          },
+          "returnType": {
+            "type": "boolean"
+          }
+        },
         "dataStoreGetMessage": {
           "description": "Gets message from the data store",
           "arguments": {
@@ -1955,7 +1976,6 @@
             "@context",
             "type",
             "verifier",
-            "verifiableCredential",
             "proof"
           ],
           "description": "Verifiable Presentation  {@link  https://github.com/decentralized-identifier/did-jwt-vc }"

packages/core/src/types/IDataStore.ts

@@ -45,6 +45,17 @@ export interface IDataStoreGetVerifiableCredentialArgs {
   hash: string
 }
 
+/**
+ * Input arguments for {@link IDataStore.IDataStoreDeleteVerifiableCredentialArgs | IDataStoreDeleteVerifiableCredentialArgs}
+ * @public
+ */
+export interface IDataStoreDeleteVerifiableCredentialArgs {
+  /**
+   * Required. VerifiableCredential hash
+   */
+  hash: string
+}
+
 /**
  * Input arguments for {@link IDataStore.dataStoreSaveVerifiablePresentation | dataStoreSaveVerifiablePresentation}
  * @public
@@ -93,6 +104,14 @@ export interface IDataStore extends IPluginMethodMap {
    */
   dataStoreSaveVerifiableCredential(args: IDataStoreSaveVerifiableCredentialArgs): Promise<string>
 
+
+  /**
+   * Deletes verifiable credential from the data store
+   * @param args - verifiable credential
+   * @returns a promise that resolves to a boolean
+   */
+  dataStoreDeleteVerifiableCredential(args: IDataStoreDeleteVerifiableCredentialArgs): Promise<boolean>
+
   /**
    * Gets verifiable credential from the data store
    * @param args - arguments for getting verifiable credential

packages/core/src/types/IMessage.ts

@@ -36,7 +36,7 @@ export interface VerifiablePresentation {
   '@context': string[]
   type: string[]
   verifier: string[]
-  verifiableCredential: VerifiableCredential[]
+  verifiableCredential?: VerifiableCredential[]
   proof: {
     type?: string
     [x: string]: any
@@ -78,7 +78,7 @@ export interface W3CPresentation {
   '@context': string[]
   type: string[]
   verifier: string[]
-  verifiableCredential: VerifiableCredential[]
+  verifiableCredential?: VerifiableCredential[]
   [x: string]: any
 }
 

packages/credential-w3c/package.json

@@ -20,11 +20,11 @@
     "@veramo/message-handler": "^2.0.0",
     "blakejs": "^1.1.0",
     "debug": "^4.1.1",
-    "did-jwt-vc": "2.1.3",
+    "did-jwt-vc": "2.1.6",
     "did-resolver": "3.1.0"
   },
   "devDependencies": {
-    "@types/debug": "4.1.6",
+    "@types/debug": "4.1.7",
     "typescript": "4.3.5"
   },
   "files": [

packages/credential-w3c/plugin.schema.json

@@ -293,7 +293,6 @@
             "@context",
             "type",
             "verifier",
-            "verifiableCredential",
             "proof"
           ],
           "description": "Verifiable Presentation  {@link  https://github.com/decentralized-identifier/did-jwt-vc }"