cassproject 1.5.3 → 1.5.6

package/README.md

@@ -38,6 +38,7 @@ Development unit tests presume you have a CaSS Repository running on `localhost:
  * Review dependencies, autocomplete version numbers
  * Increment version number in package.json and yuidoc.json
  * Update documentation, `npm run docs`
+ * Delete yuidocs from package.json, delete package-lock.json
  * `npm install`
  * `npm test` - Must not fail any tests.
  * Commit changes to GitHub.

package/index.js

@@ -1,3 +1,7 @@
+if (typeof window !== "undefined" && window) {
+    window.global = window;
+    window.module = {};
+}
 global.generateUUID = function () {
     var d = new Date().getTime();
     if (typeof window !== "undefined" && window && window.performance && typeof window.performance.now === "function") {
@@ -51,8 +55,8 @@ global.cassReturnNullAsPromise = function (success, failure) {
     return p;
 };
 
-global.crypto = null;
 try {
+    global.crypto = null;
     global.crypto = require('crypto').webcrypto;
 } catch (err) {
     console.log("Webcrypto not available. Tests will fail. Please upgrade, if possible, to Node 16. Non-test mode will fallback to slower cryptograpy methods.: " + err);
@@ -63,8 +67,7 @@ if (global.forge === undefined)
 else
     var forge = global.forge;
 
-
-JavalikeEquals = function (value) {
+let JavalikeEquals = function (value) {
     if (value == null)
         return false;
     if (value.valueOf)
@@ -72,7 +75,7 @@ JavalikeEquals = function (value) {
     return this === value;
 };
 
-JavalikeGetClass = function () {
+let JavalikeGetClass = function () {
     return this.constructor;
 };
 

package/package.json

@@ -1,39 +1,55 @@
 {
 	"name": "cassproject",
-	"version": "1.5.3",
+	"version": "1.5.6",
 	"description": "Competency and Skills Service",
 	"main": "index.js",
 	"scripts": {
 		"test": "npm run test15 && npm run test14 && npm run test13 && npm run test12",
 		"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",
-		"test15": "npm run testkill && docker run -d --name cass-test -p80:80 cassproject/cass:1.5.1 && 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",
+		"testDevHttps": "npm run testkill && docker run -d --name cass-test -p443:80 -e HTTPS=true cassproject/cass:dev && wait-on https://localhost/api/ping && npm run testCypressEdgeHttps && npm run testCypressHttps && npm run testNode16Https && npm run testNode15Https && npm run testNode14Https && npm run testNode13Https && npm run testNode12Https",
+		"test15Https": "npm run testkill && docker run -d --name cass-test -p443:80 -e HTTPS=true cassproject/cass:1.5.4 && wait-on https://localhost/api/ping && npm run testCypressEdgeHttps && npm run testCypressHttps && npm run testNode16Https && npm run testkill",
+		"test15": "npm run testkill && docker run -d --name cass-test -p80:80 cassproject/cass:1.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.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",
+		"testNode16Https": "docker kill npm-cass & docker rm -f npm-cass & docker build --progress plain -f docker/node16https -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",
+		"testNode15Https": "docker kill npm-cass & docker rm -f npm-cass & docker build --progress plain -f docker/node15https -t npm-cass . & docker run --network=\"host\" --name npm-cass npm-cass",
 		"testNode14": "docker kill npm-cass & docker rm -f npm-cass & docker build --progress plain -f docker/node14 -t npm-cass . & docker run --network=\"host\" --name npm-cass npm-cass",
+		"testNode14Https": "docker kill npm-cass & docker rm -f npm-cass & docker build --progress plain -f docker/node14https -t npm-cass . & docker run --network=\"host\" --name npm-cass npm-cass",
 		"testNode13": "docker kill npm-cass & docker rm -f npm-cass & docker build --progress plain -f docker/node13 -t npm-cass . & docker run --network=\"host\" --name npm-cass npm-cass",
+		"testNode13Https": "docker kill npm-cass & docker rm -f npm-cass & docker build --progress plain -f docker/node13https -t npm-cass . & docker run --network=\"host\" --name npm-cass npm-cass",
 		"testNode12": "docker kill npm-cass & docker rm -f npm-cass & docker build --progress plain -f docker/node12 -t npm-cass . & docker run --network=\"host\" --name npm-cass npm-cass",
+		"testNode12Https": "docker kill npm-cass & docker rm -f npm-cass & docker build --progress plain -f docker/node12https -t npm-cass . & docker run --network=\"host\" --name npm-cass npm-cass",
 		"testCypress": "docker kill npm-cass & docker rm -f npm-cass & docker build --progress plain -f docker/cypress -t npm-cass . & docker run --network=\"host\" --name npm-cass npm-cass",
 		"testCypressEdge": "docker kill npm-cass & docker rm -f npm-cass & docker build --progress plain -f docker/cypressEdge -t npm-cass . & docker run --network=\"host\" --name npm-cass npm-cass",
+		"testCypressHttps": "docker kill npm-cass & docker rm -f npm-cass & docker build --progress plain -f docker/cypressHttps -t npm-cass . & docker run --network=\"host\" --name npm-cass npm-cass",
+		"testCypressEdgeHttps": "docker kill npm-cass & docker rm -f npm-cass & docker build --progress plain -f docker/cypressEdgeHttps -t npm-cass . & docker run --network=\"host\" --name npm-cass npm-cass",
 		"autotest": "nodemon test.js",
 		"autoindex": "nodemon index.js",
 		"mocha": "mocha -b src/**/*.test.js",
+		"mocha:clientSideCertificates": "set CASS_LOOPBACK=https://localhost/api/&& mocha -b src/**/*.test.js",
 		"mochaGraph": "mocha -b src/com/eduworks/ec/graph/**/*.test.js",
 		"automocha": "nodemon --exec \"npm run mocha\"",
 		"automochaGraph": "nodemon --exec \"npm run mochaGraph\"",
-		"automocha:clientSideCertificates": "set CASS_LOOPBACK=https://localhost/api/&& nodemon --exec \"npm run mocha\"",
+		"automocha:clientSideCertificates": "nodemon --exec \"npm run mocha:clientSideCertificates\"",
 		"lint": "eslint src -c .eslintrc.js --ext .js --fix",
 		"docs": "npm install yuidocjs yuidoc-ember-cli-theme && yuidoc -c yuidoc.json -o docs -e .js src && npm remove yuidocjs yuidoc-ember-cli-theme",
 		"doclint": "npm install yuidocjs yuidoc-ember-cli-theme && yuidoc --lint -c yuidoc.json -o docs -e .js src",
 		"browserify:cypress:open": "cypress open --config-file cypressBrowserify.json",
+		"browserify:cypress:open:https": "cypress open -e CASS_LOOPBACK=https://localhost/api/ --config-file cypressBrowserify.json",
 		"webpack:cypress:open": "cypress open --config-file cypressWebpack.json",
+		"webpack:cypress:open:https": "cypress open -e CASS_LOOPBACK=https://localhost/api/ --config-file cypressWebpack.json",
 		"browserify:cypress": "cypress run --config-file cypressBrowserify.json --headless --browser chrome",
+		"browserify:cypressHttps": "cypress run -e CASS_LOOPBACK=https://localhost/api/ --config-file cypressBrowserify.json --headless --browser chrome",
 		"browserify:cypressEdge": "cypress run --config-file cypressBrowserify.json --headless --browser edge",
+		"browserify:cypressEdgeHttps": "cypress run -e CASS_LOOPBACK=https://localhost/api/ --config-file cypressBrowserify.json --headless --browser edge",
 		"webpack:cypress": "cypress run --config-file cypressWebpack.json --headless --browser chrome",
-		"webpack:cypressEdge": "cypress run --config-file cypressWebpack.json --headless --browser edge"
+		"webpack:cypressHttps": "cypress run -e CASS_LOOPBACK=https://localhost/api/ --config-file cypressWebpack.json --headless --browser chrome",
+		"webpack:cypressEdge": "cypress run --config-file cypressWebpack.json --headless --browser edge",
+		"webpack:cypressEdgeHttps": "cypress run -e CASS_LOOPBACK=https://localhost/api/ --config-file cypressWebpack.json --headless --browser edge"
 	},
 	"contributors": [
 		{
@@ -54,13 +70,14 @@
 		}
 	],
 	"dependencies": {
-		"axios": "^0.26.0",
+		"axios": "^0.26.1",
 		"base64-arraybuffer": "^1.0.2",
 		"forge": "^2.3.0",
 		"form-data": "^4.0.0",
+		"http2-wrapper": "^2.1.10",
 		"jsonld": "^5.2.0",
-		"node-forge": "^1.2.1",
-		"papaparse": "^5.3.1",
+		"node-forge": "^1.3.1",
+		"papaparse": "^5.3.2",
 		"pem-jwk": "^2.0.0",
 		"promise-worker": "^2.0.1",
 		"rdf-canonize": "^3.0.0",
@@ -88,22 +105,22 @@
 	},
 	"homepage": "https://github.com/cassproject/cass-npm#readme",
 	"devDependencies": {
-		"@babel/core": "^7.17.0",
+		"@babel/core": "^7.17.9",
 		"@babel/preset-env": "^7.16.11",
 		"@cypress/browserify-preprocessor": "^3.0.2",
-		"@cypress/webpack-preprocessor": "^5.11.0",
+		"@cypress/webpack-preprocessor": "^5.11.1",
 		"babel-eslint": "^10.1.0",
-		"babel-loader": "^8.2.3",
+		"babel-loader": "^8.2.4",
 		"babel-plugin-transform-remove-strict-mode": "^0.0.2",
 		"chai": "^4.3.6",
 		"convert-hrtime": "^5.0.0",
-		"cypress": "^9.4.1",
-		"eslint": "^8.8.0",
-		"mocha": "^9.2.0",
+		"cypress": "^9.5.3",
+		"eslint": "^8.12.0",
+		"mocha": "^9.2.2",
 		"node-polyfill-webpack-plugin": "^1.1.4",
 		"nodemon": "^2.0.15",
-		"wait-on": "^6.0.0",
-		"webpack": "^5.68.0",
+		"wait-on": "^6.0.1",
+		"webpack": "^5.71.0",
 		"webpack-cli": "^4.9.2"
 	}
 }

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

@@ -127,6 +127,9 @@ describe("EcFrameworkGraph", () => {
     it('init', async () => {
         let newId1;
         EcIdentityManager.default.clearIdentities();
+        if ((typeof Cypress !== 'undefined') && Cypress != null && Cypress.env != null)
+            process.env.CASS_LOOPBACK = Cypress.env('CASS_LOOPBACK');
+        console.log(process.env.CASS_LOOPBACK);
         await repo.init(process.env.CASS_LOOPBACK || "http://localhost/api/", null, null, console.log);
         newId1 = null;
         if (EcIdentityManager.default.ids.length > 0)

package/src/com/eduworks/ec/remote/EcRemote.js

@@ -1,5 +1,46 @@
-if (global.axios == null)
+global.axiosOptions = {};
+var isNode = false;    
+if (typeof process === 'object') {
+  if (typeof process.versions === 'object') {
+    if (typeof process.versions.node !== 'undefined') {
+      isNode = true;
+    }
+  }
+}if (global.axios == null)
+{
 	global.axios = require("axios");
+	if (isNode)
+	{
+		let http2;
+		try {
+			http2 = require("http2-wrapper");
+		} catch(e) {
+			console.log(e);
+		}
+		function http2AdapterEnhancer(adapter) {
+			return async (config) => {
+				if (config.http2 && config.url.startsWith("https")) {
+					let req;
+					config.transport = {
+						request: function request(options, handleResponse) {
+						req = http2.request(options, handleResponse);
+						return req;
+						},
+					};
+					const ret = adapter(config);
+					// Remove the axios action `socket.setKeepAlive` because the HTTP/2 sockets should not be directly manipulated
+					const listeners = req.listeners("socket");
+					if (listeners.length) req.removeListener("socket", listeners[0]);
+					return ret;
+				} else {
+					return adapter(config);
+				}
+			};
+		}
+		axiosOptions.http2 = true;
+		axiosOptions.adapter = http2AdapterEnhancer(axios.defaults.adapter);
+	}
+}
 const { cassPromisify } = require("../promises/helpers");
 
 /**
@@ -121,10 +162,13 @@ module.exports = class EcRemote {
 			postHeaders = {
 				'content-type': 'multipart/form-data'
 			}
+		if (fd.getLengthSync != null)
+			postHeaders["content-length"] = fd.getLengthSync();
 		if (headers !== undefined && headers != null)
 			for (let header in headers) postHeaders[header] = headers[header];
 		let p = axios
 			.post(url, fd, {
+				...axiosOptions,
 				headers: postHeaders,
 				maxContentLength: Infinity,
 				maxBodyLength: Infinity
@@ -178,7 +222,7 @@ module.exports = class EcRemote {
 		var url = EcRemote.urlAppend(server, service);
 		url = EcRemote.upgradeHttpToHttps(url);
 		let p = axios
-			.get(url)
+			.get(url,axiosOptions)
 			.then((response) => {
 				return response.data;
 			})
@@ -221,6 +265,7 @@ module.exports = class EcRemote {
 		url = EcRemote.upgradeHttpToHttps(url);
 		let p = axios
 			.delete(url, {
+				...axiosOptions,
 				headers: { signatureSheet: signatureSheet }
 			})
 			.then((response) => {

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

@@ -31,6 +31,7 @@ module.exports = class EcRepository {
 	static cache = {};
 	static fetching = {};
 	static repos = [];
+	static defaultPlugins = [];
 	adminKeys = null;
 	selectedServer = null;
 	selectedServerProxy = null;
@@ -52,6 +53,9 @@ module.exports = class EcRepository {
 					identity.ppk = new EcPpkFacade(EcPk.fromPem(p1.ssoPublicKey));
 					EcIdentityManager.default.addIdentity(identity);
 				}
+				if (p1["plugins"]) {
+					EcRepository.defaultPlugins = JSON.parse(p1["plugins"]);
+				}
 				if (p1["ping"] == "pong") {
 					if (loginObjectCallback != null)
 						loginObjectCallback(p1);

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

@@ -55,6 +55,11 @@ 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');
+    // global.axiosOptions.key =  fs.readFileSync('client.key');
+    // global.axiosOptions.cert = fs.readFileSync('client.crt');
+    // global.axiosOptions.ca = fs.readFileSync('ca.crt');
+    //When http2 supports client side self-signed certificates, don't use this.
+    process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = 0;
 }
 
 let changeNameAndSaveAndCheck = async (rld) => {
@@ -86,6 +91,9 @@ describe("EcRepository", () => {
     let rld = null;
     it('create', async () => {
         EcIdentityManager.default.clearIdentities();
+        if ((typeof Cypress !== 'undefined') && Cypress != null && Cypress.env != null)
+            process.env.CASS_LOOPBACK = Cypress.env('CASS_LOOPBACK');
+        console.log(process.env.CASS_LOOPBACK);
         await repo.init(process.env.CASS_LOOPBACK || "http://localhost/api/", null, null, console.log);
         if (EcIdentityManager.default.ids.length > 0)
             newId1 = EcIdentityManager.default.ids[0];