Merge branch 'master' into feature/orm-graphql

decentralized-identity · Mar 19, 2020 · 210e898 · 210e898
2 parents 29bf414 + 886d592
commit 210e898
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.4](https://github.com/uport-project/daf/compare/v3.1.3...v3.1.4) (2020-03-19)
+
+
+### Bug Fixes
+
+* Fetching credentials for SDR ([e91668e](https://github.com/uport-project/daf/commit/e91668e664fca7d9826fd45e179cafe1b3cbe975))
+
+
+
+
+
 ## [3.1.3](https://github.com/uport-project/daf/compare/v3.1.2...v3.1.3) (2020-03-18)
 
 

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.3",
+  "version": "3.1.4",
   "packages": [
     "packages/*"
   ],

diff --git a/packages/daf-cli/CHANGELOG.md b/packages/daf-cli/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.4](https://github.com/uport-project/daf/compare/v3.1.3...v3.1.4) (2020-03-19)
+
+
+### Bug Fixes
+
+* Fetching credentials for SDR ([e91668e](https://github.com/uport-project/daf/commit/e91668e664fca7d9826fd45e179cafe1b3cbe975))
+
+
+
+
+
 ## [3.1.3](https://github.com/uport-project/daf/compare/v3.1.2...v3.1.3) (2020-03-18)
 
 **Note:** Version bump only for package daf-cli

diff --git a/packages/daf-cli/package.json b/packages/daf-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "daf-cli",
   "description": "DAF command line tool",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "main": "build/cli.js",
   "types": "build/cli.d.ts",
   "bin": {
@@ -16,7 +16,7 @@
     "commander": "^4.0.1",
     "console-table-printer": "^1.1.15",
     "daf-core": "^3.1.3",
-    "daf-data-store": "^3.1.3",
+    "daf-data-store": "^3.1.4",
     "daf-debug": "^3.1.3",
     "daf-did-comm": "^3.1.3",
     "daf-did-jwt": "^3.1.3",
@@ -25,7 +25,7 @@
     "daf-libsodium": "^3.1.3",
     "daf-resolver": "^3.0.1",
     "daf-resolver-universal": "^3.0.1",
-    "daf-selective-disclosure": "^3.1.3",
+    "daf-selective-disclosure": "^3.1.4",
     "daf-trust-graph": "^3.1.3",
     "daf-url": "^3.1.3",
     "daf-w3c": "^3.1.3",

diff --git a/packages/daf-cli/src/setup.ts b/packages/daf-cli/src/setup.ts
@@ -85,7 +85,7 @@ export const initializeDb = async () => {
     type: 'sqlite',
     database: defaultPath + 'database-v2.sqlite',
     synchronize: true,
-    logging: true,
+    logging: process.env.DEBUG_DAF_DB ? true : false,
     entities: [...Daf.Entities],
   })
 }

diff --git a/packages/daf-data-store/CHANGELOG.md b/packages/daf-data-store/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.4](https://github.com/uport-project/daf/compare/v3.1.3...v3.1.4) (2020-03-19)
+
+
+### Bug Fixes
+
+* Fetching credentials for SDR ([e91668e](https://github.com/uport-project/daf/commit/e91668e664fca7d9826fd45e179cafe1b3cbe975))
+
+
+
+
+
 ## [3.1.3](https://github.com/uport-project/daf/compare/v3.1.2...v3.1.3) (2020-03-18)
 
 **Note:** Version bump only for package daf-data-store

diff --git a/packages/daf-data-store/package.json b/packages/daf-data-store/package.json
@@ -1,7 +1,7 @@
 {
   "name": "daf-data-store",
   "description": "DID Agent Framework Data Store",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "scripts": {

diff --git a/packages/daf-data-store/src/data-store.ts b/packages/daf-data-store/src/data-store.ts
@@ -67,11 +67,11 @@ export class DataStore {
     claim_type: string
   }) {
     let where = {}
-
-    if (iss) {
+    
+    if (iss && iss.length > 0) {
       where['issuer'] = In(iss)
     }
-    if (sub) {
+    if (sub && iss.length > 0) {
       where['subject'] = In(sub)
     }
 

diff --git a/packages/daf-selective-disclosure/CHANGELOG.md b/packages/daf-selective-disclosure/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.4](https://github.com/uport-project/daf/compare/v3.1.3...v3.1.4) (2020-03-19)
+
+**Note:** Version bump only for package daf-selective-disclosure
+
+
+
+
+
 ## [3.1.3](https://github.com/uport-project/daf/compare/v3.1.2...v3.1.3) (2020-03-18)
 
 **Note:** Version bump only for package daf-selective-disclosure

diff --git a/packages/daf-selective-disclosure/package.json b/packages/daf-selective-disclosure/package.json
@@ -1,7 +1,7 @@
 {
   "name": "daf-selective-disclosure",
   "description": "DAF selective disclosure",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "scripts": {
@@ -10,7 +10,7 @@
   "dependencies": {
     "blakejs": "^1.1.0",
     "daf-core": "^3.1.3",
-    "daf-data-store": "^3.1.3",
+    "daf-data-store": "^3.1.4",
     "daf-did-jwt": "^3.1.3",
     "debug": "^4.1.1",
     "did-jwt": "^4.0.0"