cassproject 0.5.25 → 0.5.29

package/README.md

@@ -44,6 +44,12 @@ Development unit tests presume you have a CaSS Repository running on `localhost:
 
 # Changelog
 
+## 0.5.28
+* Bug fixes and library updates.
+
+## 0.5.26
+* Revised method of SSO based decryption.
+
 ## 0.5.23
 * Securing Proxy data structures and repository.
 * Negative assertion handling in graphs was corrected.

package/package.json

@@ -1,14 +1,15 @@
 {
 	"name": "cassproject",
-	"version": "0.5.25",
+	"version": "0.5.29",
 	"description": "Competency and Skills Service",
 	"main": "index.js",
 	"scripts": {
 		"test": "npm run test05 && npm run test14 && npm run test13 && npm run test12",
-		"test05": "npm run testkill && docker run -d --name cass-test -p80:80 cassproject/cass:0.5.4 && wait-on http://localhost/api/ping && npm run testCypressEdge && npm run testCypress && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testkill",
-		"test14": "npm run testkill && docker run -d --name cass-test -p80:80 cassproject/cass:1.4.3 && wait-on http://localhost/api/ping && npm run testCypressEdge && npm run testCypress && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testkill",
-		"test13": "npm run testkill && docker run -d --name cass-test -p80:80 cassproject/cass:1.3.17 && wait-on http://localhost/api/ping && npm run testCypressEdge && npm run testCypress && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testkill",
-		"test12": "npm run testkill && docker run -d --name cass-test -p80:80 cassproject/cass:1.2.43 && wait-on http://localhost/api/ping && npm run testCypressEdge && npm run testCypress && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testkill",
+		"testCassTest": "npm run testkill && docker run -d --name cass-test -p80:80 cass-test && wait-on http://localhost/api/ping && npm run testCypressEdge && npm run testCypress && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testkill",
+		"test05": "npm run testkill && docker run -d --name cass-test -p80:80 cassproject/cass:0.5.6 && wait-on http://localhost/api/ping && npm run testCypressEdge && npm run testCypress && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testkill",
+		"test14": "npm run testkill && docker run -d --name cass-test -p80:80 cassproject/cass:1.4.4 && wait-on http://localhost/api/ping && npm run testCypressEdge && npm run testCypress && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testkill",
+		"test13": "npm run testkill && docker run -d --name cass-test -p80:80 cassproject/cass:1.3.18 && wait-on http://localhost/api/ping && npm run testCypressEdge && npm run testCypress && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testkill",
+		"test12": "npm run testkill && docker run -d --name cass-test -p80:80 cassproject/cass:1.2.44 && wait-on http://localhost/api/ping && npm run testCypressEdge && npm run testCypress && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testkill",
 		"testkill": "docker kill cass-test | exit 0 && docker rm cass-test | exit 0",
 		"testNode16": "docker kill npm-cass & docker rm -f npm-cass & docker build --progress plain -f docker/node16 -t npm-cass . & docker run --network=\"host\" --name npm-cass npm-cass",
 		"testNode15": "docker kill npm-cass & docker rm -f npm-cass & docker build --progress plain -f docker/node15 -t npm-cass . & docker run --network=\"host\" --name npm-cass npm-cass",
@@ -21,9 +22,10 @@
 		"autoindex": "nodemon index.js",
 		"mocha": "mocha -b src/**/*.test.js",
 		"automocha": "nodemon --exec \"npm run mocha\"",
+		"automocha:clientSideCertificates": "set CASS_LOOPBACK=https://localhost/api/&& nodemon --exec \"npm run mocha\"",
 		"lint": "eslint src -c .eslintrc.js --ext .js --fix",
-		"docs": "npm install yuidocjs yuidoc-ember-cli-theme && NODE_OPTIONS=--max_old_space_size=4096 yuidoc -c yuidoc.json -o docs -e .js src",
-		"doclint": "npm install yuidocjs yuidoc-ember-cli-theme && yuidoc --lint -c yuidoc.json -o docs -e .js src",
+		"docs": "yuidoc -c yuidoc.json -o docs -e .js src",
+		"doclint": "yuidoc --lint -c yuidoc.json -o docs -e .js src",
 		"browserify:cypress:open": "cypress open --config-file cypressBrowserify.json",
 		"webpack:cypress:open": "cypress open --config-file cypressWebpack.json",
 		"browserify:cypress": "cypress run --config-file cypressBrowserify.json --headless --browser chrome",
@@ -33,11 +35,11 @@
 	},
 	"contributors": [
 		{
-			"name": "Devlin Junker",
+			"name": "Devlin Junker (Retired)",
 			"email": "devlin.junker@eduworks.com"
 		},
 		{
-			"name": "Thomas Buskirk",
+			"name": "Thomas Buskirk (Departed)",
 			"email": "tom.buskirk@eduworks.com"
 		},
 		{
@@ -50,18 +52,16 @@
 		}
 	],
 	"dependencies": {
-		"axios": "^0.21.4",
-		"base64-arraybuffer": "^0.2.0",
+		"axios": "^0.24.0",
+		"base64-arraybuffer": "^1.0.1",
 		"forge": "^2.3.0",
-		"form-data": "^2.1.2",
-		"jsonld": "1.8.1",
-		"node-forge": "^0.10.0",
+		"form-data": "^4.0.0",
+		"jsonld": "^5.2.0",
+		"node-forge": "^1.2.1",
 		"papaparse": "^5.3.1",
 		"pem-jwk": "^2.0.0",
 		"promise-worker": "^2.0.1",
-		"web-worker": "^1.1.0",
-		"yuidoc-ember-cli-theme": "^1.0.4",
-		"yuidocjs": "^0.10.2"
+		"web-worker": "^1.1.0"
 	},
 	"files": [
 		"lib/",
@@ -85,17 +85,17 @@
 	},
 	"homepage": "https://github.com/cassproject/cass-npm#readme",
 	"devDependencies": {
-		"@babel/core": "^7.14.6",
-		"@babel/preset-env": "^7.14.5",
+		"@babel/core": "^7.16.5",
+		"@babel/preset-env": "^7.16.5",
 		"@cypress/browserify-preprocessor": "^3.0.1",
-		"@cypress/webpack-preprocessor": "^5.9.0",
+		"@cypress/webpack-preprocessor": "^5.11.0",
 		"babel-eslint": "^10.1.0",
-		"babel-loader": "^8.2.2",
+		"babel-loader": "^8.2.3",
 		"babel-plugin-transform-remove-strict-mode": "^0.0.2",
 		"chai": "^4.3.4",
 		"convert-hrtime": "^5.0.0",
-		"cypress": "^8.5.0",
-		"eslint": "^7.32.0",
+		"cypress": "^9.2.0",
+		"eslint": "^8.5.0",
 		"mocha": "^9.1.2",
 		"node-polyfill-webpack-plugin": "^1.1.3",
 		"nodemon": "^2.0.7",
@@ -103,6 +103,8 @@
 		"tap": "^15.0.9",
 		"wait-on": "^6.0.0",
 		"webpack": "^5.39.1",
-		"webpack-cli": "^4.8.0"
+		"webpack-cli": "^4.8.0",
+		"yuidoc-ember-cli-theme": "^1.0.4",
+		"yuidocjs": "^0.10.2"
 	}
 }

package/src/com/eduworks/ec/graph/EcFrameworkGraph.js

@@ -143,9 +143,9 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 				assertion
 			);
 			await Promise.all(
-				this.getOutEdges(competency).map((alignment) =>
-					this.getCompetency(alignment.target).then((t) =>
-						this.processAssertionBooleanOutward(
+				await this.getOutEdges(competency).map(async (alignment) =>
+					await this.getCompetency(alignment.target).then(async (t) =>
+						await this.processAssertionBooleanOutward(
 							alignment,
 							t,
 							assertion,
@@ -154,11 +154,11 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 						)
 					)
 				)
-			).then(() =>
-				Promise.all(
-					this.getInEdges(competency).map((alignment) =>
-						this.getCompetency(alignment.source).then((s) =>
-							this.processAssertionBooleanInward(
+			).then(async() =>
+				await Promise.all(
+					this.getInEdges(competency).map(async (alignment) =>
+						await this.getCompetency(alignment.source).then(async (s) =>
+							await this.processAssertionBooleanInward(
 								alignment,
 								s,
 								assertion,
@@ -187,11 +187,11 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 						)
 					)
 				)
-			).then(() =>
-				Promise.all(
-					this.getOutEdges(competency).map((alignment) =>
-						this.getCompetency(alignment.target).then((s) =>
-							this.processAssertionBooleanInward(
+			).then(async () =>
+				await Promise.all(
+					this.getOutEdges(competency).map(async (alignment) =>
+						await this.getCompetency(alignment.target).then(async (s) =>
+							await this.processAssertionBooleanInward(
 								alignment,
 								s,
 								assertion,

package/src/com/eduworks/ec/graph/EcFrameworkGraph.test.js

@@ -11,6 +11,10 @@ const EcAlignment = require("../../../../org/cass/competency/EcAlignment.js");
 const EcRsaOaepAsyncWorker = require("../crypto/EcRsaOaepAsyncWorker.js");
 const EcIdentityManager = require("../../../../org/cassproject/ebac/identity/EcIdentityManager");
 const EcAes = require("../crypto/EcAes.js");
+const fs = require('fs');
+const https = require('https');
+const EcCrypto = require("../../../../com/eduworks/ec/crypto/EcCrypto.js");
+const EcEncryptedValue = require("../../../../org/cassproject/ebac/repository/EcEncryptedValue.js");
 
 let hrtime = function() {
     try {
@@ -44,20 +48,20 @@ var failure = function (p1) {
     console.trace(p1);
     assert.fail();
 };
+
+if (fs.readFileSync != null) {
+    https.globalAgent.options.key = fs.readFileSync('client.key');
+    https.globalAgent.options.cert = fs.readFileSync('client.crt');
+    https.globalAgent.options.ca = fs.readFileSync('ca.crt');
+}
+
 let repo = new EcRepository();
 repo.selectedServer = process.env.CASS_LOOPBACK || "http://localhost/api/";
 repo.selectedServerProxy = process.env.CASS_LOOPBACK_PROXY || null;
-let newId1 = new EcIdentity();
-newId1.ppk = EcPpk.fromPem(
-    "-----BEGIN RSA PRIVATE KEY-----MIIEpAIBAAKCAQEAz4BiFucFE9bNcKfGD+e6aPRHl402YM4Z6nrurDRNlnwsWpsCoZasPLkjC314pVtHAI2duZo+esGKDloBsiLxASRJo3R2XiXVh2Y8U1RcHA5mWL4tMG5UY2d0libpNEHbHPNBmooVYpA2yhxN/vGibIk8x69uZWxJcFOxOg6zWG8EjF8UMgGnRCVSMTY3THhTlfZ0cGUzvrfb7OvHUgdCe285XkmYkj/V9P/m7hbWoOyJAJSTOm4/s6fIKpl72lblfN7bKaxTCsJp6/rQdmUeo+PIaa2lDOfo7dWbuTMcqkZ93kispNfYYhsEGUGlCsrrVWhlve8MenO4GdLsFP+HRwIDAQABAoIBAGaQpOuBIYde44lNxJ7UAdYi+Mg2aqyK81Btl0/TQo6hriLTAAfzPAt/z4y8ZkgFyCDD3zSAw2VWCPFzF+d/UfUohKWgyWlb9iHJLQRbbHQJwhkXV6raviesWXpmnVrROocizkie/FcNxac9OmhL8+cGJt7lHgJP9jTpiW6TGZ8ZzM8KBH2l80x9AWdvCjsICuPIZRjc706HtkKZzTROtq6Z/F4Gm0uWRnwAZrHTRpnh8qjtdBLYFrdDcUoFtzOM6UVRmocTfsNe4ntPpvwY2aGTWY7EmTj1kteMJ+fCQFIS+KjyMWQHsN8yQNfD5/j2uv6/BdSkO8uorGSJT6DwmTECgYEA8ydoQ4i58+A1udqA+fujM0Zn46++NTehFe75nqIt8rfQgoduBam3lE5IWj2U2tLQeWxQyr1ZJkLbITtrAI3PgfMnuFAii+cncwFo805Fss/nbKx8K49vBuCEAq3MRhLjWy3ZvIgUHj67jWvl50dbNqc7TUguxhS4BxGr/cPPkP0CgYEA2nbJPGzSKhHTETL37NWIUAdU9q/6NVRISRRXeRqZYwE1VPzs2sIUxA8zEDBHX7OtvCKzvZy1Lg5Unx1nh4nCEVkbW/8npLlRG2jOcZJF6NRfhzwLz3WMIrP6j9SmjJaB+1mnrTjfsg36tDEPDjjJLjJHCx9z/qRJh1v4bh4aPpMCgYACG31T2IOEEZVlnvcvM3ceoqWT25oSbAEBZ6jSLyWmzOEJwJK7idUFfAg0gAQiQWF9K+snVqzHIB02FIXA43nA7pKRjmA+RiqZXJHEShFgk1y2HGiXGA8mSBvcyhTTJqbBy4vvjl5eRLzrZNwBPSUVPC3PZajCHrvZk9WhxWivIQKBgQCzCu1MH2dy4R7ZlqsIJ8zKweeJMZpfQI7pjclO0FTrhh7+Yzd+5db9A/P2jYrBTVHSwaILgTYf49DIguHJfEZXz26TzB7iapqlWxTukVHISt1ryPNo+E58VoLAhChnSiaHJ+g7GESE+d4A9cAACNwgh0YgQIvhIyW70M1e+j7KDwKBgQDQSBLFDFmvvTP3sIRAr1+0OZWd1eRcwdhs0U9GwootoCoUP/1Y64pqukT6B9oIB/No9Nyn8kUX3/ZDtCslaGKEUGMJXQ4hc5J+lq0tSi9ZWBdhqOuMPEfUF3IxW+9yeILP4ppUBn1m5MVOWg5CvuuEeCmy4bhMaUErUlHZ78t5cA==-----END RSA PRIVATE KEY-----"
-);
-EcIdentityManager.default.ids = [];
-EcIdentityManager.default.addIdentity(newId1);
 async function newAssertion(competencyToAssert) {
     var a = new EcAssertion();
     a.generateId(repo.selectedServer);
     a.addOwner(EcIdentityManager.default.ids[0].ppk.toPk());
-    a.addReader(EcIdentityManager.default.ids[0].ppk.toPk());
     await a.setSubject(EcIdentityManager.default.ids[0].ppk.toPk());
     await a.setAgent(EcIdentityManager.default.ids[0].ppk.toPk());
     await a.setCompetency(competencyToAssert.shortId());
@@ -73,7 +77,6 @@ async function newFalseAssertion(competencyToAssert) {
     a.generateId(repo.selectedServer);
     a.addOwner(EcIdentityManager.default.ids[0].ppk.toPk());
     await a.setSubject(EcIdentityManager.default.ids[0].ppk.toPk());
-    await a.addReader(EcIdentityManager.default.ids[0].ppk.toPk());
     await a.setAgent(EcIdentityManager.default.ids[0].ppk.toPk());
     await a.setCompetency(competencyToAssert.shortId());
     await a.setConfidence(1.0);
@@ -121,6 +124,22 @@ async function newFramework(frameworkName) {
 }
 
 describe("EcFrameworkGraph", () => {
+    it('init', async () => {
+        let newId1;
+        EcIdentityManager.default.clearIdentities();
+        await repo.init(process.env.CASS_LOOPBACK || "http://localhost/api/", null, null, console.log);
+        newId1 = null;
+        if (EcIdentityManager.default.ids.length > 0)
+            newId1 = EcIdentityManager.default.ids[0];
+        else {
+            newId1 = new EcIdentity();
+            newId1.ppk = EcPpk.fromPem(
+                "-----BEGIN RSA PRIVATE KEY-----MIIEpAIBAAKCAQEAz4BiFucFE9bNcKfGD+e6aPRHl402YM4Z6nrurDRNlnwsWpsCoZasPLkjC314pVtHAI2duZo+esGKDloBsiLxASRJo3R2XiXVh2Y8U1RcHA5mWL4tMG5UY2d0libpNEHbHPNBmooVYpA2yhxN/vGibIk8x69uZWxJcFOxOg6zWG8EjF8UMgGnRCVSMTY3THhTlfZ0cGUzvrfb7OvHUgdCe285XkmYkj/V9P/m7hbWoOyJAJSTOm4/s6fIKpl72lblfN7bKaxTCsJp6/rQdmUeo+PIaa2lDOfo7dWbuTMcqkZ93kispNfYYhsEGUGlCsrrVWhlve8MenO4GdLsFP+HRwIDAQABAoIBAGaQpOuBIYde44lNxJ7UAdYi+Mg2aqyK81Btl0/TQo6hriLTAAfzPAt/z4y8ZkgFyCDD3zSAw2VWCPFzF+d/UfUohKWgyWlb9iHJLQRbbHQJwhkXV6raviesWXpmnVrROocizkie/FcNxac9OmhL8+cGJt7lHgJP9jTpiW6TGZ8ZzM8KBH2l80x9AWdvCjsICuPIZRjc706HtkKZzTROtq6Z/F4Gm0uWRnwAZrHTRpnh8qjtdBLYFrdDcUoFtzOM6UVRmocTfsNe4ntPpvwY2aGTWY7EmTj1kteMJ+fCQFIS+KjyMWQHsN8yQNfD5/j2uv6/BdSkO8uorGSJT6DwmTECgYEA8ydoQ4i58+A1udqA+fujM0Zn46++NTehFe75nqIt8rfQgoduBam3lE5IWj2U2tLQeWxQyr1ZJkLbITtrAI3PgfMnuFAii+cncwFo805Fss/nbKx8K49vBuCEAq3MRhLjWy3ZvIgUHj67jWvl50dbNqc7TUguxhS4BxGr/cPPkP0CgYEA2nbJPGzSKhHTETL37NWIUAdU9q/6NVRISRRXeRqZYwE1VPzs2sIUxA8zEDBHX7OtvCKzvZy1Lg5Unx1nh4nCEVkbW/8npLlRG2jOcZJF6NRfhzwLz3WMIrP6j9SmjJaB+1mnrTjfsg36tDEPDjjJLjJHCx9z/qRJh1v4bh4aPpMCgYACG31T2IOEEZVlnvcvM3ceoqWT25oSbAEBZ6jSLyWmzOEJwJK7idUFfAg0gAQiQWF9K+snVqzHIB02FIXA43nA7pKRjmA+RiqZXJHEShFgk1y2HGiXGA8mSBvcyhTTJqbBy4vvjl5eRLzrZNwBPSUVPC3PZajCHrvZk9WhxWivIQKBgQCzCu1MH2dy4R7ZlqsIJ8zKweeJMZpfQI7pjclO0FTrhh7+Yzd+5db9A/P2jYrBTVHSwaILgTYf49DIguHJfEZXz26TzB7iapqlWxTukVHISt1ryPNo+E58VoLAhChnSiaHJ+g7GESE+d4A9cAACNwgh0YgQIvhIyW70M1e+j7KDwKBgQDQSBLFDFmvvTP3sIRAr1+0OZWd1eRcwdhs0U9GwootoCoUP/1Y64pqukT6B9oIB/No9Nyn8kUX3/ZDtCslaGKEUGMJXQ4hc5J+lq0tSi9ZWBdhqOuMPEfUF3IxW+9yeILP4ppUBn1m5MVOWg5CvuuEeCmy4bhMaUErUlHZ78t5cA==-----END RSA PRIVATE KEY-----"
+            );
+            EcIdentityManager.default.ids = [];
+            EcIdentityManager.default.addIdentity(newId1);
+        }
+    });
     it('encryption then decryption', async () => {
         var randomString = EcAes.newIv(256).substring(0, 190);
         var ppk = EcPpk.fromPem(
@@ -166,7 +185,7 @@ describe("EcFrameworkGraph", () => {
             await deleteById(a.shortId());
         });
         assert.deepEqual(result, [1]);
-    }).timeout(10000);
+    }).timeout(15000);
     it('basic false test', async () => {
         var f = await newFramework("basic false framework");
         var c = await newCompetency("Add");
@@ -181,7 +200,8 @@ describe("EcFrameworkGraph", () => {
             () => {}
         ).then(async () => {
             let assertions = [];
-            assertions.push(a);
+            let assertion = await EcAssertion.get(a.shortId());
+            assertions.push(assertion);
             let result = await fg.processAssertionsBoolean(
                 assertions,
                 () => {},
@@ -191,10 +211,12 @@ describe("EcFrameworkGraph", () => {
                 result.push(fg.getMetaStateCompetency(c)["negativeAssertion"]?.length);
                 return result;
             }).catch((err) => {
+                console.trace(err);
                 assert.fail(err);
             });
             return result;
         }).catch((err) => {
+            console.trace(err);
             assert.fail(err);
         }).finally(async () => {
             await deleteById(f.shortId());
@@ -218,8 +240,8 @@ describe("EcFrameworkGraph", () => {
             () => {}
         ).then(async () => {
             let assertions = [];
-            assertions.push(a);
-            assertions.push(a2);
+            assertions.push(await EcAssertion.get(a.shortId()));
+            assertions.push(await EcAssertion.get(a2.shortId()));
             let result = await fg.processAssertionsBoolean(
                 assertions,
                 () => {},
@@ -338,7 +360,7 @@ describe("EcFrameworkGraph", () => {
             () => {}
         ).then(async () => {
             let assertions = [];
-            assertions.push(a);
+            assertions.push(await EcAssertion.get(a.shortId()));
             let result = await fg.processAssertionsBoolean(
                 assertions,
                 () => {},
@@ -382,8 +404,8 @@ describe("EcFrameworkGraph", () => {
             () => {}
         ).then(async () => {
             let assertions = [];
-            assertions.push(a);
-            assertions.push(a2);
+            assertions.push(await EcAssertion.get(a.shortId()));
+            assertions.push(await EcAssertion.get(a2.shortId()));
             let result = await fg.processAssertionsBoolean(
                 assertions,
                 () => {},
@@ -611,7 +633,7 @@ describe("EcFrameworkGraph", () => {
             () => {}
         ).then(async () => {
             let assertions = [];
-            assertions.push(a);
+            assertions.push(await EcAssertion.get(a.shortId()));
             let result = await fg.processAssertionsBoolean(
                 assertions,
                 () => {},
@@ -654,7 +676,7 @@ describe("EcFrameworkGraph", () => {
             () => {}
         ).then(async () => {
             let assertions = [];
-            assertions.push(a);
+            assertions.push(await EcAssertion.get(a.shortId()));
             let result = await fg.processAssertionsBoolean(
                 assertions,
                 () => {},
@@ -697,7 +719,7 @@ describe("EcFrameworkGraph", () => {
             () => {}
         ).then(async () => {
             let assertions = [];
-            assertions.push(a);
+            assertions.push(await EcAssertion.get(a.shortId()));
             let result = await fg.processAssertionsBoolean(
                 assertions,
                 () => {},
@@ -794,7 +816,7 @@ describe("EcFrameworkGraph", () => {
             () => {}
         ).then(async () => {
             let assertions = [];
-            assertions.push(a);
+            assertions.push(await EcAssertion.get(a.shortId()));
             let result = await fg.processAssertionsBoolean(
                 assertions,
                 () => {},

package/src/com/eduworks/schema/ebac/EbacContact.js

@@ -59,16 +59,16 @@ module.exports = class EbacContact extends EcLinkedData {
 	source = null;
 	upgrade() {
 		super.upgrade();
-		if (EbacContact.TYPE_0_1.equals(this.type)) {
+		if (EbacContact.TYPE_0_1 == (this.type)) {
 			var me = this;
 			if (me["@context"] == null && me["@schema"] != null)
 				me["@context"] = me["@schema"];
 			this.setContextAndType(Ebac.context_0_2, EbacContact.TYPE_0_2);
 		}
-		if (EbacContact.TYPE_0_2.equals(this.getFullType())) {
+		if (EbacContact.TYPE_0_2 == (this.getFullType())) {
 			this.setContextAndType(Ebac.context_0_3, EbacContact.TYPE_0_3);
 		}
-		if (EbacContact.TYPE_0_3.equals(this.getFullType())) {
+		if (EbacContact.TYPE_0_3 == (this.getFullType())) {
 			this.setContextAndType(Ebac.context_0_4, EbacContact.TYPE_0_4);
 		}
 	}

package/src/com/eduworks/schema/ebac/EbacContactGrant.js

@@ -54,16 +54,16 @@ module.exports = class EbacContactGrant extends EcRemoteLinkedData {
 	responseSignature = null;
 	upgrade() {
 		super.upgrade();
-		if (EbacContactGrant.TYPE_0_1.equals(this.type)) {
+		if (EbacContactGrant.TYPE_0_1 == (this.type)) {
 			var me = this;
 			if (me["@context"] == null && me["@schema"] != null)
 				me["@context"] = me["@schema"];
 			this.setContextAndType(Ebac.context_0_2, EbacContactGrant.TYPE_0_2);
 		}
-		if (EbacContactGrant.TYPE_0_2.equals(this.getFullType())) {
+		if (EbacContactGrant.TYPE_0_2 == (this.getFullType())) {
 			this.setContextAndType(Ebac.context_0_3, EbacContactGrant.TYPE_0_3);
 		}
-		if (EbacContactGrant.TYPE_0_3.equals(this.getFullType())) {
+		if (EbacContactGrant.TYPE_0_3 == (this.getFullType())) {
 			this.setContextAndType(Ebac.context_0_4, EbacContactGrant.TYPE_0_4);
 		}
 	}

package/src/com/eduworks/schema/ebac/EbacCredential.js

@@ -48,16 +48,16 @@ module.exports = class EbacCredential extends EcLinkedData {
 	displayName = null;
 	upgrade() {
 		super.upgrade();
-		if (EbacCredential.TYPE_0_1.equals(this.type)) {
+		if (EbacCredential.TYPE_0_1 == (this.type)) {
 			var me = this;
 			if (me["@context"] == null && me["@schema"] != null)
 				me["@context"] = me["@schema"];
 			this.setContextAndType(Ebac.context_0_2, EbacCredential.TYPE_0_2);
 		}
-		if (EbacCredential.TYPE_0_2.equals(this.getFullType())) {
+		if (EbacCredential.TYPE_0_2 == (this.getFullType())) {
 			this.setContextAndType(Ebac.context_0_3, EbacCredential.TYPE_0_3);
 		}
-		if (EbacCredential.TYPE_0_3.equals(this.getFullType())) {
+		if (EbacCredential.TYPE_0_3 == (this.getFullType())) {
 			this.setContextAndType(Ebac.context_0_4, EbacCredential.TYPE_0_4);
 		}
 	}

package/src/com/eduworks/schema/ebac/EbacCredentialCommit.js

@@ -52,7 +52,7 @@ module.exports = class EbacCredentialCommit extends EcLinkedData {
 	credentials = null;
 	upgrade() {
 		super.upgrade();
-		if (EbacCredentialCommit.TYPE_0_1.equals(this.type)) {
+		if (EbacCredentialCommit.TYPE_0_1 == (this.type)) {
 			var me = this;
 			if (me["@context"] == null && me["@schema"] != null)
 				me["@context"] = me["@schema"];
@@ -61,13 +61,13 @@ module.exports = class EbacCredentialCommit extends EcLinkedData {
 				EbacCredentialCommit.TYPE_0_2
 			);
 		}
-		if (EbacCredentialCommit.TYPE_0_2.equals(this.getFullType())) {
+		if (EbacCredentialCommit.TYPE_0_2 == (this.getFullType())) {
 			this.setContextAndType(
 				Ebac.context_0_3,
 				EbacCredentialCommit.TYPE_0_3
 			);
 		}
-		if (EbacCredentialCommit.TYPE_0_3.equals(this.getFullType())) {
+		if (EbacCredentialCommit.TYPE_0_3 == (this.getFullType())) {
 			this.setContextAndType(
 				Ebac.context_0_4,
 				EbacCredentialCommit.TYPE_0_4

package/src/com/eduworks/schema/ebac/EbacCredentials.js

@@ -47,16 +47,16 @@ module.exports = class EbacCredentials extends EcLinkedData {
 	contacts = null;
 	upgrade() {
 		super.upgrade();
-		if (EbacCredentials.TYPE_0_1.equals(this.type)) {
+		if (EbacCredentials.TYPE_0_1 == (this.type)) {
 			var me = this;
 			if (me["@context"] == null && me["@schema"] != null)
 				me["@context"] = me["@schema"];
 			this.setContextAndType(Ebac.context_0_2, EbacCredentials.TYPE_0_2);
 		}
-		if (EbacCredentials.TYPE_0_2.equals(this.getFullType())) {
+		if (EbacCredentials.TYPE_0_2 == (this.getFullType())) {
 			this.setContextAndType(Ebac.context_0_3, EbacCredentials.TYPE_0_3);
 		}
-		if (EbacCredentials.TYPE_0_3.equals(this.getFullType())) {
+		if (EbacCredentials.TYPE_0_3 == (this.getFullType())) {
 			this.setContextAndType(Ebac.context_0_4, EbacCredentials.TYPE_0_4);
 		}
 	}

package/src/com/eduworks/schema/ebac/EbacEncryptedSecret.js

@@ -86,7 +86,7 @@ module.exports = class EbacEncryptedSecret extends EcLinkedData {
 	}
 	upgrade() {
 		super.upgrade();
-		if (EbacEncryptedSecret.TYPE_0_1.equals(this.type)) {
+		if (EbacEncryptedSecret.TYPE_0_1 == this.type) {
 			var me = this;
 			if (me["@context"] == null && me["@schema"] != null)
 				me["@context"] = me["@schema"];
@@ -95,13 +95,13 @@ module.exports = class EbacEncryptedSecret extends EcLinkedData {
 				EbacEncryptedSecret.TYPE_0_2
 			);
 		}
-		if (EbacEncryptedSecret.TYPE_0_2.equals(this.getFullType())) {
+		if (EbacEncryptedSecret.TYPE_0_2 == this.getFullType()) {
 			this.setContextAndType(
 				Ebac.context_0_3,
 				EbacEncryptedSecret.TYPE_0_3
 			);
 		}
-		if (EbacEncryptedSecret.TYPE_0_3.equals(this.getFullType())) {
+		if (EbacEncryptedSecret.TYPE_0_3 == this.getFullType()) {
 			this.setContextAndType(
 				Ebac.context_0_4,
 				EbacEncryptedSecret.TYPE_0_4

package/src/org/cass/importer/ASNImport.js

@@ -1,3 +1,5 @@
+const EcRemoteLinkedData = require("../../cassproject/schema/general/EcRemoteLinkedData");
+
 /**
  *  Import methods to handle an ASN JSON file containing a framework,
  *  competencies and relationships, and store them in a CASS instance
@@ -53,7 +55,7 @@ module.exports = class ASNImport extends Importer {
 					if (children != null)
 						for (var j = 0; j < children.length; j++) {
 							ASNImport.relationCount++;
-							ASNImport.asnJsonPrime(obj, children[j]["value"]);
+							ASNImport.asnJsonPrime(obj, EcRemoteLinkedData.trimVersionFromUrl(children[j]["value"]));
 						}
 				}
 			}
@@ -98,7 +100,7 @@ module.exports = class ASNImport extends Importer {
 							for (var j = 0; j < children.length; j++) {
 								ASNImport.asnJsonPrime(
 									obj,
-									children[j]["value"]
+									EcRemoteLinkedData.trimVersionFromUrl(children[j]["value"])
 								);
 							}
 					}
@@ -141,6 +143,13 @@ module.exports = class ASNImport extends Importer {
 			ASNImport.jsonCompetencies = {};
 			ASNImport.jsonFramework = null;
 			ASNImport.frameworkUrl = "";
+			for (let each in jsonObj) {
+				if (each !== EcRemoteLinkedData.trimVersionFromUrl(each)) {
+					let trimmed = EcRemoteLinkedData.trimVersionFromUrl(each);
+					jsonObj[trimmed] = jsonObj[each];
+					delete jsonObj[each];
+				}
+			}
 			ASNImport.lookThroughSource(jsonObj);
 			if (ASNImport.jsonFramework == null) {
 				failure("Could not find StandardDocument.");
@@ -178,9 +187,13 @@ module.exports = class ASNImport extends Importer {
 		success,
 		failure,
 		incremental,
-		repo
+		repo,
+		eim
 	) {
 		ASNImport.competencies = {};
+		if (eim === undefined || eim == null) {
+			eim = EcIdentityManager.default;
+		}
 		if (createFramework) {
 			ASNImport.importedFramework = new EcFramework();
 			ASNImport.importedFramework.competency = [];
@@ -205,7 +218,8 @@ module.exports = class ASNImport extends Importer {
 								owner,
 								success,
 								failure,
-								repo
+								repo,
+								eim
 							);
 						} else {
 							var compList = [];
@@ -217,12 +231,14 @@ module.exports = class ASNImport extends Importer {
 					},
 					failure,
 					incremental,
-					repo
+					repo,
+					eim
 				);
 			},
 			failure,
 			incremental,
-			repo
+			repo,
+			eim
 		);
 	}
 	/**
@@ -250,7 +266,8 @@ module.exports = class ASNImport extends Importer {
 		success,
 		failure,
 		incremental,
-		repo
+		repo,
+		eim
 	) {
 		ASNImport.savedCompetencies = 0;
 		for (var key in ASNImport.jsonCompetencies) {
@@ -284,7 +301,7 @@ module.exports = class ASNImport extends Importer {
 			if (ASNImport.importedFramework != null)
 				ASNImport.importedFramework.addCompetency(comp.shortId());
 			ASNImport.competencies[key] = comp;
-			ASNImport.saveCompetency(success, failure, incremental, comp, repo);
+			ASNImport.saveCompetency(success, failure, incremental, comp, repo, eim);
 		}
 	}
 	static saveCompetency(success, failure, incremental, comp, repo, eim) {
@@ -354,7 +371,8 @@ module.exports = class ASNImport extends Importer {
 		success,
 		failure,
 		incremental,
-		repo
+		repo,
+		eim
 	) {
 		ASNImport.savedRelations = 0;
 		if (ASNImport.relationCount == 0) {
@@ -363,11 +381,12 @@ module.exports = class ASNImport extends Importer {
 		var children = node["http://purl.org/gem/qualifiers/hasChild"];
 		if (children != null)
 			for (var j = 0; j < children.length; j++) {
+				let sourceId = EcRemoteLinkedData.trimVersionFromUrl(children[j]["value"]);
 				if (nodeId != null) {
 					var relation = new EcAlignment();
-					relation.target = ASNImport.competencies[nodeId].id;
+					relation.target = EcRemoteLinkedData.trimVersionFromUrl(ASNImport.competencies[nodeId].id);
 					relation.source =
-						ASNImport.competencies[children[j]["value"]].id;
+						EcRemoteLinkedData.trimVersionFromUrl(ASNImport.competencies[sourceId].id);
 					relation.relationType = "narrows";
 					relation.name = "";
 					relation.description = "";
@@ -387,18 +406,20 @@ module.exports = class ASNImport extends Importer {
 						failure,
 						incremental,
 						relation,
-						repo
+						repo,
+						eim
 					);
 				}
 				ASNImport.createRelationships(
 					serverUrl,
 					owner,
-					ASNImport.jsonCompetencies[children[j]["value"]],
-					children[j]["value"],
+					ASNImport.jsonCompetencies[sourceId],
+					sourceId,
 					success,
 					failure,
 					incremental,
-					repo
+					repo,
+					eim
 				);
 			}
 	}
@@ -447,15 +468,17 @@ module.exports = class ASNImport extends Importer {
 	 *  @private
 	 *  @static
 	 */
-	static createFramework(serverUrl, owner, success, failure, repo) {
+	static createFramework(serverUrl, owner, success, failure, repo, eim) {
 		ASNImport.importedFramework.name =
 			ASNImport.jsonFramework["http://purl.org/dc/elements/1.1/title"][
 				"0"
 			]["value"];
-		ASNImport.importedFramework.description =
-			ASNImport.jsonFramework["http://purl.org/dc/terms/description"][
-				"0"
-			]["value"];
+		if (ASNImport.jsonFramework["http://purl.org/dc/terms/description"]) {
+			ASNImport.importedFramework.description =
+				ASNImport.jsonFramework["http://purl.org/dc/terms/description"][
+					"0"
+				]["value"];
+		}
 		ASNImport.importedFramework.id = ASNImport.frameworkUrl;
 		if (ASNImport.importedFramework.id == null) {
 			if (repo == null || repo.selectedServer.indexOf(serverUrl) != -1)