cassproject 0.5.27 → 0.5.28

package/README.md

@@ -44,6 +44,9 @@ 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.
 

package/package.json

@@ -1,14 +1,15 @@
 {
 	"name": "cassproject",
-	"version": "0.5.27",
+	"version": "0.5.28",
 	"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.5 && 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",
@@ -34,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"
 		},
 		{
@@ -55,14 +56,12 @@
 		"base64-arraybuffer": "^1.0.1",
 		"forge": "^2.3.0",
 		"form-data": "^4.0.0",
-		"jsonld": "1.8.1",
+		"jsonld": "^5.2.0",
 		"node-forge": "^0.10.0",
 		"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/",
@@ -86,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": "^9.1.1",
-		"eslint": "^8.4.1",
+		"cypress": "^9.2.0",
+		"eslint": "^8.5.0",
 		"mocha": "^9.1.2",
 		"node-polyfill-webpack-plugin": "^1.1.3",
 		"nodemon": "^2.0.7",
@@ -104,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

@@ -49,7 +49,7 @@ var failure = function (p1) {
     assert.fail();
 };
 
-if (typeof window === "undefined") {
+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');
@@ -128,6 +128,7 @@ describe("EcFrameworkGraph", () => {
         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 {

package/src/org/cass/profile/EcAssertion.js

@@ -31,10 +31,10 @@ module.exports = class EcAssertion extends Assertion {
 		);
 	}
 	async getSubject(eim) {
+		if (this.subject == null) return null;
 		if (!eim) {
 			eim = EcIdentityManager.default;
 		}
-		if (this.subject == null) return null;
 		var v = new EcEncryptedValue();
 		v.copyFrom(this.subject);
 		var codebook = Assertion.getCodebook(this);

package/src/org/cassproject/ebac/repository/EcRepository.test.js

@@ -51,7 +51,7 @@ var failure = function (p1) {
     assert.fail();
 };
 
-if (typeof window === "undefined") {
+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');

package/src/org/json/ld/EcLinkedData.js

@@ -263,27 +263,33 @@ global.jsonld = require("jsonld");
 			throw "Incompatible type: " + this.getFullType() + that;
 		return this;
 	}
-	recast(translationContext, targetContext, success, failure) {
+	async recast(translationContext, targetContext, success, failure) {
 		var me = this;
 		var json = JSON.parse(this.toJson());
 		if (targetContext == null) targetContext = json["@context"];
 		json["@context"] = translationContext;
 		var finalTargetContext = targetContext;
-		jsonld.expand(json, {}, function (error, actual) {
+		let actual;
+		try {
+			actual = await jsonld.expand(json);
+		} catch(error) {
 			if (error != null) {
 				failure(error["message"]);
 				return;
 			}
-			jsonld.compact(actual, finalTargetContext, {}, function (s, o, o2) {
-				if (s != null) {
-					failure(s);
-					return;
-				}
-				me.copyFrom(o);
-				me["@context"] = finalTargetContext;
-				success(me);
-			});
-		});
+		}
+		let o;
+		try {
+			o = await jsonld.compact(actual, finalTargetContext);
+		} catch(s) {
+			if (s != null) {
+				failure(s);
+				return;
+			}
+		}
+		me.copyFrom(o);
+		me["@context"] = finalTargetContext;
+		success(me);
 	}
 	/**
 	 *  Encodes the object in a form where it is ready to be signed.
@@ -370,20 +376,17 @@ global.jsonld = require("jsonld");
 		}
 		return a;
 	}
-	compact(remoteContextUrl, success, failure) {
+	async compact(remoteContextUrl, success, failure) {
 		var me = this;
-		jsonld.compact(
-			this.toJson(),
-			remoteContextUrl,
-			{},
-			function (err, compacted, context) {
-				if (err != null) {
-					failure(err);
-					return;
-				}
-				me.copyFrom(compacted);
-				success(this);
+		try {
+			let compacted = await jsonld.compact(this.toJson(),	remoteContextUrl);
+			me.copyFrom(compacted);
+			success(this);
+		} catch(err) {
+			if (err != null) {
+				failure(err);
+				return;
 			}
-		);
+		}
 	}
 };

package/src/org/schema/EcPerson.js

@@ -1,13 +1,29 @@
+const {cassReturnAsPromise} = require("../../com/eduworks/ec/promises/helpers");
 const EcRepository = require("../cassproject/ebac/repository/EcRepository");
 
 module.exports = class EcPerson extends schema.Person {
-	static getByPk(repo, pk, success, failure, eim) {
-		return EcPerson.get(
+	static async getByPk(repo, pk, success, failure, eim) {
+		let p = await EcPerson.get(
 			repo.selectedServer +
 			(repo.selectedServer.endsWith("/") ? "" : "/") +
 			"data/" +
 			pk.fingerprint(),
-			success,
+			null,
+			null, repo, eim
+		);
+		if (p != null)
+			return cassReturnAsPromise(p, success, failure);
+		return EcPerson.search(repo, pk.fingerprint(),
+			(persons)=>{
+                if (persons.length === 0) {
+					if (failure != null)
+						failure("Person not found.");
+					return null;
+				}
+				if (EcRepository.caching)
+					EcRepository.cache[repo.selectedServer +(repo.selectedServer.endsWith("/") ? "" : "/") +"data/" +pk.fingerprint()] = persons[0];
+				return cassReturnAsPromise(persons[0], success, failure);
+			},
 			failure, repo, eim
 		);
 	}