cassproject 1.5.23 → 1.5.27

package/README.md

@@ -21,7 +21,7 @@ Running `npm test` requires Docker.
 
 ## Release testing
 
- * `npm test` - Runs unit tests in docker images against the CaSS 1.5, 1.2, 1.3, and 1.4 repositories using Node versions 12-16 and Cypress against Edge, Chrome, Firefox and Electron. Takes some time.
+ * `npm test` - Runs unit tests in docker images against the CaSS 1.5 repositories using Node versions 12-16 and Cypress against Edge, Chrome, Firefox and Electron. Takes some time.
 
 ## Development unit testing
 Development unit tests presume you have a CaSS Repository running on `localhost:80`. You may get one by running `docker run -d --name cass-test -p80:80 cassproject/cass:1.5.0`
@@ -39,6 +39,7 @@ Development unit tests presume you have a CaSS Repository running on `localhost:
  * Increment version number in package.json and yuidoc.json.
  * Update changelog.
  * `npm install`
+ * `npm audit` and fix any audit issues.
  * `npm test` - Must not fail any tests.
  * Document code coverage output by the previous step.
  * Commit changes to GitHub.
@@ -47,6 +48,13 @@ Development unit tests presume you have a CaSS Repository running on `localhost:
 
 # Changelog
 
+## 1.5.26
+* CORS Origins and CORS requests are now sent with credentials to enable cross origin credentialing. 
+* Extra lines in CSV import are ignored.
+
+## 1.5.25
+* Repo init now fetches max length of posts. Multiput now uses multiple requests if the POST length is too long.
+
 ## 1.5.23
 * Fixed issue that was preventing use of webcrypto module.
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cassproject",
-	"version": "1.5.23",
+	"version": "1.5.27",
 	"description": "Competency and Skills Service",
 	"main": "index.js",
 	"scripts": {
@@ -9,9 +9,9 @@
 		"multitest": "concurrently --kill-others --kill-others-on-fail \"npm run test15\" \"npm run test14\" \"npm run test13\" \"npm run test12\"",
 		"testCassTest": "npm run testkill && docker run -d --name cass-test -p80:80 -e CASS_LOOPBACK cass-test && wait-on http://localhost/api/ping && npm run testNode18 && npm run testNode18Fips && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testCypressEdge && npm run testCypress && npm run testkill",
 		"testDevHttps": "npm run testkill && docker run -d --name cass-test -p443:80 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:dev && wait-on https://localhost/api/ping && npm run testNode18HttpsFips && npm run testNode18Https && npm run testNode16Https && npm run testNode15Https && npm run testNode14Https && npm run testNode13Https && npm run testNode12Https && npm run testCypressEdgeHttps && npm run testCypressHttps",
-		"test15Https": "npm run testkill && docker run -d --name cass-test -p443:443 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:1.5.22 && wait-on https://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode18HttpsFips\" \"npm run testNode18Https\" \"npm run testNode16Https\" && npm run testkill",
-		"test15Https11": "npm run testkill && docker run -d --name cass-test -p443:443 -e CASS_LOOPBACK -e HTTPS=true -e HTTP2=false cassproject/cass:1.5.22 && wait-on https://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode18HttpsFips\" \"npm run testNode18Https\" \"npm run testNode16Https\" && npm run testkill",
-		"test15": "export CASS_LOOPBACK=http://localhost/api/|| set CASS_LOOPBACK=http://localhost/api/&& npm run testkill15 && docker run -d -e CASS_LOOPBACK --name cass-test15 -p80:80 cassproject/cass:1.5.22 && wait-on http://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode18\" \"npm run testNode18Fips\" \"npm run testNode16\" && npm run testkill15",
+		"test15Https": "npm run testkill && docker run -d --name cass-test -p443:443 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:1.5.26 && wait-on https://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode18HttpsFips\" \"npm run testNode18Https\" \"npm run testNode16Https\" && npm run testkill",
+		"test15Https11": "npm run testkill && docker run -d --name cass-test -p443:443 -e CASS_LOOPBACK -e HTTPS=true -e HTTP2=false cassproject/cass:1.5.26 && wait-on https://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode18HttpsFips\" \"npm run testNode18Https\" \"npm run testNode16Https\" && npm run testkill",
+		"test15": "export CASS_LOOPBACK=http://localhost/api/|| set CASS_LOOPBACK=http://localhost/api/&& npm run testkill15 && docker run -d -e CASS_LOOPBACK --name cass-test15 -p80:80 cassproject/cass:1.5.26 && wait-on http://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode18\" \"npm run testNode18Fips\" \"npm run testNode16\" && npm run testkill15",
 		"test14": "npm run testkill14 && docker run -d -e CASS_LOOPBACK --name cass-test14 -p80:80 cassproject/cass:1.4.4 && wait-on http://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode16\" && npm run testkill14",
 		"test13": "npm run testkill13 && docker run -d -e CASS_LOOPBACK --name cass-test13 -p80:80 cassproject/cass:1.3.18 && wait-on http://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode16\" && npm run testkill13",
 		"test12": "npm run testkill12 && docker run -d -e CASS_LOOPBACK --name cass-test12 -p80:80 cassproject/cass:1.2.44 && wait-on http://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode16\" && npm run testkill12",
@@ -68,6 +68,10 @@
 		"webpack:cypressEdgeHttps": "cypress run -e CASS_LOOPBACK=https://localhost/api/ --config-file cypressWebpack.config.js --headless --browser edge"
 	},
 	"contributors": [
+		{
+			"name": "Kari Glover",
+			"email": "kari.glover@eduworks.com"
+		},
 		{
 			"name": "Devlin Junker (Retired)",
 			"email": "devlin.junker@eduworks.com"
@@ -95,9 +99,9 @@
 		"forge": "^2.3.0",
 		"form-data": "^4.0.0",
 		"http2-wrapper": "^2.2.0",
-		"jsonld": "^8.1.0",
+		"jsonld": "^8.1.1",
 		"node-forge": "^1.3.1",
-		"papaparse": "^5.3.2",
+		"papaparse": "^5.4.1",
 		"pem-jwk": "^2.0.0",
 		"promise-worker": "^2.0.1",
 		"rdf-canonize": "^3.3.0",
@@ -118,31 +122,31 @@
 		"cassproject",
 		"competency"
 	],
-	"author": "Fritz Ray <fritz.ray@eduworks.com> (http://docs.cassproject.org)",
+	"author": "Fritz Ray <fritz.ray@eduworks.com> (http://devs.cassproject.org)",
 	"license": "Apache-2.0",
 	"bugs": {
 		"url": "https://github.com/cassproject/cass-npm/issues"
 	},
 	"homepage": "https://github.com/cassproject/cass-npm#readme",
 	"devDependencies": {
-		"@babel/core": "^7.20.12",
+		"@babel/core": "^7.21.3",
 		"@babel/preset-env": "^7.20.2",
 		"@cypress/browserify-preprocessor": "^3.0.2",
-		"@cypress/vite-dev-server": "^5.0.2",
-		"@cypress/webpack-preprocessor": "^5.16.1",
+		"@cypress/vite-dev-server": "^5.0.5",
+		"@cypress/webpack-preprocessor": "^5.17.0",
 		"babel-eslint": "^10.1.0",
 		"babel-plugin-transform-remove-strict-mode": "^0.0.2",
 		"chai": "^4.3.7",
 		"concurrently": "^7.6.0",
 		"convert-hrtime": "^5.0.0",
-		"cypress": "^12.5.0",
-		"eslint": "^8.33.0",
+		"cypress": "^12.8.1",
+		"eslint": "^8.36.0",
 		"mocha": "^10.2.0",
 		"node-polyfill-webpack-plugin": "^2.0.1",
-		"nodemon": "^2.0.20",
+		"nodemon": "^2.0.22",
 		"nyc": "^15.1.0",
 		"wait-on": "^7.0.1",
-		"webpack": "^5.75.0",
+		"webpack": "^5.76.3",
 		"webpack-cli": "^5.0.1"
 	}
 }

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

@@ -1,6 +1,7 @@
 require("../../../../org/cassproject/general/AuditLogger.js");
 
 global.axiosOptions = {};
+global.corsOrigins = [];
 let isNode = false;    
 if (typeof process === 'object') {
   if (typeof process.versions === 'object') {
@@ -131,6 +132,13 @@ if (global.axios == null)
 
 const { cassPromisify } = require("../promises/helpers");
 
+getAxiosOptions = function(url) {
+	let newOptions = Object.assign({}, axiosOptions);
+	if (corsOrigins.findIndex((x) => url.startsWith(x)) > -1)
+		newOptions.withCredentials = true;
+	return newOptions;
+}
+
 /**
  *  Wrapper to handle all remote web service invocations.
  *
@@ -257,8 +265,9 @@ module.exports = class EcRemote {
 			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,
+				...getAxiosOptions(url),
 				headers: postHeaders,
 				maxContentLength: Infinity,
 				maxBodyLength: Infinity
@@ -313,7 +322,7 @@ module.exports = class EcRemote {
 		let url = EcRemote.urlAppend(server, service);
 		url = EcRemote.upgradeHttpToHttps(url);
 		let p = axios
-			.get(url,axiosOptions)
+			.get(url,getAxiosOptions(url))
 			.then((response) => {
 				global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.INFO, "EcRemoteGetExpectString", response.request.socket ? response.request.socket.remoteAddress : '', url);
 				return response.data;
@@ -358,7 +367,7 @@ module.exports = class EcRemote {
 		url = EcRemote.upgradeHttpToHttps(url);
 		let p = axios
 			.delete(url, {
-				...axiosOptions,
+				...getAxiosOptions(url),
 				headers: { signatureSheet: signatureSheet }
 			})
 			.then((response) => {

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

@@ -97,8 +97,12 @@ module.exports = class CTDLASNCSVImport {
 				let relationById = {};
 				for (let i = 0; i < tabularData.length; i++) {
 					let pretranslatedE = tabularData[i];
-					if (
-						pretranslatedE["@type"].toLowerCase().startsWith('sample') || pretranslatedE["@type"].toLowerCase().startsWith('instruction')
+					// Skip extra lines if found in file
+					if (!pretranslatedE || !pretranslatedE["@type"]) {
+						continue;
+					}
+					if (pretranslatedE["@type"].toLowerCase() && 
+						(pretranslatedE["@type"].toLowerCase().startsWith('sample') || pretranslatedE["@type"].toLowerCase().startsWith('instruction'))
 					) {
 						continue;
 					}
@@ -522,6 +526,10 @@ module.exports = class CTDLASNCSVImport {
 				let relationById = {};
 				for (let i = 0; i < tabularData.length; i++) {
 					let pretranslatedE = tabularData[i];
+					// Skip extra lines if found in file
+					if (!pretranslatedE || !pretranslatedE["@type"]) {
+						continue;
+					}
 					if (
 						pretranslatedE["@type"].toLowerCase().startsWith('sample') || pretranslatedE["@type"].toLowerCase().startsWith('instruction')
 					) {

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

@@ -43,6 +43,7 @@ module.exports = class EcRepository {
 	selectedServerProxy = null;
 	autoDetectFound = false;
 	timeOffset = 0;
+	postMaxSize = null;
 	init(selectedServer, success, failure, loginObjectCallback) {
 		this.selectedServer = selectedServer;
 		return this.negotiateTimeOffset(success, failure, loginObjectCallback);
@@ -62,6 +63,9 @@ module.exports = class EcRepository {
 				if (p1["plugins"]) {
 					EcRepository.defaultPlugins = JSON.parse(p1["plugins"]);
 				}
+				if (p1["postMaxSize"]) {
+					me.postMaxSize = p1["postMaxSize"];
+				}
 				if (p1["ping"] == "pong") {
 					if (loginObjectCallback != null)
 						loginObjectCallback(p1);
@@ -914,16 +918,28 @@ module.exports = class EcRepository {
 			})
 			.then((signatureSheet) => {
 				let fd = new FormData();
-				fd.append("data", JSON.stringify(preparedData));
-				fd.append("signatureSheet", signatureSheet);
-				let server = this.selectedServer;
-				return EcRemote.postExpectingString(
-					server,
-					"sky/repo/multiPut",
-					fd,
-					success,
-					failure
-				);
+				let stringifiedData = JSON.stringify(preparedData);
+				if (this.postMaxSize && (stringifiedData.length >= this.postMaxSize || signatureSheet.length >= this.postMaxSize) && data.length > 1) {
+					let arr1 = data.slice(0, Math.floor(data.length / 2));
+					let arr2 = data.slice(Math.floor(data.length / 2), data.length);
+
+					let promise1 = this.multiput(arr1, null, null, eim);
+					let promise2 = this.multiput(arr2, null, null, eim);
+
+					let promise = Promise.all([promise1, promise2]);
+					return cassPromisify(promise, success, failure);
+				} else {
+					fd.append("data", stringifiedData);
+					fd.append("signatureSheet", signatureSheet);
+					let server = this.selectedServer;
+					return EcRemote.postExpectingString(
+						server,
+						"sky/repo/multiPut",
+						fd,
+						success,
+						failure
+					);
+				}
 			});
 	};
 	/**