From 68137b3e154d257f4fc71190c1764715a79b76e5 Mon Sep 17 00:00:00 2001 From: Lucas Cunha Date: Fri, 12 Jul 2019 13:12:11 -0300 Subject: [PATCH 1/3] Test claim convertion for alias UCAs --- __test__/claim/Claim.test.js | 22 ++++++++++++++++++++++ package-lock.json | 5 ++--- package.json | 2 +- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/__test__/claim/Claim.test.js b/__test__/claim/Claim.test.js index 3ccb18a8..11a66d52 100644 --- a/__test__/claim/Claim.test.js +++ b/__test__/claim/Claim.test.js @@ -291,4 +291,26 @@ describe('Claim Constructions tests', () => { expect(dateOfBirthClaim.value.day).toBeDefined(); expect(dateOfBirthClaim.value.day.value).toBe(20); }); + + test('Transforming alias UCA to Claim', () => { + const identifier = 'cvc:Document:evidences'; + const aliasIdentifier = 'cvc:Validation:evidences'; + const value = { + idDocumentFront: { algorithm: 'sha256', data: 'sha256(idDocumentFront)' }, + idDocumentBack: { algorithm: 'sha256', data: 'sha256(idDocumentBack)' }, + selfie: { algorithm: 'sha256', data: 'sha256(selfie)' }, + }; + + const evidencesUCA = new UserCollectableAttribute(identifier, value); + const evidencesAliasUCA = new UserCollectableAttribute(aliasIdentifier, value); + + // converting UCAs to Claims + const evidencesClaim = new Claim(identifier, evidencesUCA.getPlainValue()); + const evidencesClaimForAliasUCA = new Claim(identifier, evidencesAliasUCA.getPlainValue()); + + // should map to the same claim + expect(evidencesClaimForAliasUCA.identifier).toEqual(evidencesClaim.identifier); + expect(evidencesClaimForAliasUCA.getPlainValue()).toEqual(evidencesClaim.getPlainValue()); + expect(evidencesClaim.identifier).toBe('claim-cvc:Document.evidences-v1'); + }); }); diff --git a/package-lock.json b/package-lock.json index f3407664..b693832b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -229,9 +229,8 @@ } }, "@identity.com/uca": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/@identity.com/uca/-/uca-1.0.12.tgz", - "integrity": "sha512-BB4R8kUpARqWtFnOksy/mfhRUFCG8/H2if3bYf0Aie5uFndGgJsrZp6D30nTXvWwiWujXIS3tRxkFJgSbl+hIg==", + "version": "git+https://github.com/identity-com/uca.git#254d3ceb68084786584fc7b09d7bf8488c715057", + "from": "git+https://github.com/identity-com/uca.git#support-alias-definition", "requires": { "flat": "^4.1.0", "lodash": "^4.17.11", diff --git a/package.json b/package.json index 5b9f7489..55a4fb14 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "rimraf": "^2.6.2" }, "dependencies": { - "@identity.com/uca": "1.0.12", + "@identity.com/uca": "git+https://github.com/identity-com/uca.git#support-alias-definition", "ajv": "^6.10.0", "babel-runtime": "^6.26.0", "bitcoinjs-lib": "git+https://github.com/dabura667/bitcoinjs-lib.git#bcash330", From eaa267e06acd63b511e3012a5d7fdf0e688a5203 Mon Sep 17 00:00:00 2001 From: Lucas Cunha Date: Fri, 12 Jul 2019 13:41:57 -0300 Subject: [PATCH 2/3] Bump version --- package-lock.json | 45 +++++++++++---------------------------------- package.json | 2 +- 2 files changed, 12 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index b693832b..e677b2f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@identity.com/credential-commons", - "version": "1.0.21", + "version": "1.0.22", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -5691,9 +5691,9 @@ "dev": true }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { "for-in": "^1.0.2", @@ -7521,9 +7521,9 @@ "dev": true }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { "extend-shallow": "^2.0.1", @@ -8215,38 +8215,15 @@ } }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "unix-timestamp": { diff --git a/package.json b/package.json index 55a4fb14..8e60cd8f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@identity.com/credential-commons", - "version": "1.0.21", + "version": "1.0.22", "author": "Identity.com Community", "license": "MIT", "description": "Verifiable Credential and Attestation Library", From 8684220c7b4ce0aa2a53ce028dc5bcc86765cb5b Mon Sep 17 00:00:00 2001 From: Lucas Cunha Date: Fri, 12 Jul 2019 16:00:01 -0300 Subject: [PATCH 3/3] Update uca version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e677b2f2..e8e60063 100644 --- a/package-lock.json +++ b/package-lock.json @@ -229,8 +229,8 @@ } }, "@identity.com/uca": { - "version": "git+https://github.com/identity-com/uca.git#254d3ceb68084786584fc7b09d7bf8488c715057", - "from": "git+https://github.com/identity-com/uca.git#support-alias-definition", + "version": "1.0.13", + "resolved": "git+https://github.com/identity-com/uca.git#254d3ceb68084786584fc7b09d7bf8488c715057", "requires": { "flat": "^4.1.0", "lodash": "^4.17.11", diff --git a/package.json b/package.json index 8e60cd8f..c922257c 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "rimraf": "^2.6.2" }, "dependencies": { - "@identity.com/uca": "git+https://github.com/identity-com/uca.git#support-alias-definition", + "@identity.com/uca": "1.0.13", "ajv": "^6.10.0", "babel-runtime": "^6.26.0", "bitcoinjs-lib": "git+https://github.com/dabura667/bitcoinjs-lib.git#bcash330",