cassproject 5.0.18 → 5.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cassproject",
-	"version": "5.0.18",
+	"version": "5.0.20",
 	"description": "Competency and Skills Service",
 	"main": "index.js",
 	"scripts": {
@@ -158,7 +158,7 @@
 		"base64-arraybuffer": "^1.0.2",
 		"jsonld": "^9.0.0",
 		"node-forge": "^1.4.0",
-		"papaparse": "^5.5.4",
+		"papaparse": "^5.7.0",
 		"promise-worker": "^2.0.1",
 		"web-worker": "1.3.0"
 	},
@@ -184,20 +184,23 @@
 	},
 	"homepage": "https://github.com/cassproject/cass-npm#readme",
 	"devDependencies": {
-		"@cypress/webpack-preprocessor": "^7.1.1",
+		"@cypress/webpack-preprocessor": "^7.1.2",
 		"chai": "^4.5.0",
-		"concurrently": "^10.0.4",
+		"concurrently": "^10.0.5",
 		"cypress": "15.19.0",
-		"cypress-fail-fast": "^8.1.0",
-		"eslint": "^10.8.0",
+		"cypress-fail-fast": "^8.2.0",
+		"eslint": "^10.12.0",
 		"fake-indexeddb": "^6.2.5",
 		"mocha": "^11.8.0",
 		"node-polyfill-webpack-plugin": "^4.1.0",
 		"nodemon": "^3.1.14",
 		"nyc": "^18.0.0",
 		"sinon": "^21.1.2",
-		"wait-on": "^9.1.0",
-		"webpack": "^5.109.2"
+		"wait-on": "^9.5.1",
+		"webpack": "^5.111.1"
 	},
-	"packageManager": "npm@11.3.0+sha512.96eb611483f49c55f7fa74df61b588de9e213f80a256728e6798ddc67176c7b07e4a1cfc7de8922422cbce02543714367037536955221fa451b0c4fefaf20c66"
+	"packageManager": "npm@11.3.0+sha512.96eb611483f49c55f7fa74df61b588de9e213f80a256728e6798ddc67176c7b07e4a1cfc7de8922422cbce02543714367037536955221fa451b0c4fefaf20c66",
+	"allowScripts": {
+		"cypress@15.19.0": true
+	}
 }

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

@@ -10,16 +10,27 @@ if (typeof process === 'object') {
     }
   }
 }
+let httpFormData = typeof FormData !== 'undefined' ? FormData : undefined;
 if (isNode)
-{	
-	let undici = eval("require('undici');");
+{
+	let undici = null;
+	try {
+		undici = eval("require('undici');");
+	} catch (ex) {
+		//undici is optional. Fall back to the platform's fetch and FormData.
+	}
 	if (undici != null)
 	{
 		var {setGlobalDispatcher,Agent,fetch} = undici; //NOSONAR - Intentional use of var to allow for global scope.
+		//fetch and FormData must come from the same implementation. undici's fetch
+		//does not recognize the platform's FormData and serializes it as text/plain.
+		httpFormData = undici.FormData;
 		setGlobalDispatcher(new Agent({
 			allowH2: process.env.HTTP2 != null ? process.env.HTTP2.trim() == 'true' : true
 		}))
 	}
+	else if (typeof globalThis.fetch === 'function')
+		var fetch = globalThis.fetch; //NOSONAR - Intentional use of var; the destructuring above hoists `fetch` to module scope, which would otherwise shadow the global with undefined.
 }
 if (typeof window !== 'undefined' && window.fetch != null)
 	var fetch = window.fetch;  //NOSONAR - Intentional use of var to allow for global scope.
@@ -50,6 +61,15 @@ const { cassPromisify } = require("../promises/helpers");
  *  @module com.eduworks.ec
  */
 module.exports = class EcRemote {
+	/**
+	 *  The FormData implementation paired with the fetch implementation EcRemote uses.
+	 *  Always construct multi-part bodies destined for EcRemote.post* with this,
+	 *  not the platform global, or bodies will be serialized as text/plain.
+	 *
+	 *  @property FormData
+	 *  @static
+	 */
+	static FormData = httpFormData;
 	//See https://github.com/nodejs/node/issues/47130 -- This is a workaround for a bug that causes http 1.1 keep-alive from throwing an error.
 	static leTired() {
 		if (isNode)

package/src/org/cassproject/ebac/identity/remote/EcRemoteIdentityManager.js

@@ -1,6 +1,7 @@
 
 const {cassPromisify} = require("../../../../../com/eduworks/ec/promises/helpers");
 const EcRemote = require("../../../../../com/eduworks/ec/remote/EcRemote");
+const FormData = EcRemote.FormData;
 const EbacCredentialCommit = require("../../../../../com/eduworks/schema/ebac/EbacCredentialCommit");
 const EbacCredentialRequest = require("../../../../../com/eduworks/schema/ebac/EbacCredentialRequest");
 const EcContact = require("../EcContact");

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

@@ -1,13 +1,10 @@
-if (typeof process !== 'undefined' && process.version && process.version.startsWith("v16")) {
-	console.log("Loading polyfill for FormData.");
-	FormData = eval("require('undici').FormData");
-}
 const EcObject = require("../../../../com/eduworks/ec/array/EcObject");
 const EcEncryptedValue = require("./EcEncryptedValue");
 const EcIdentityManager = require("../identity/EcIdentityManager");
 const EcRekeyRequest = require("../identity/EcRekeyRequest");
 const EcArray = require("../../../../com/eduworks/ec/array/EcArray");
 const EcRemote = require("../../../../com/eduworks/ec/remote/EcRemote");
+const FormData = EcRemote.FormData;
 const { cassPromisify, cassReturnAsPromise, cassReturnNullAsPromise } = require("../../../../com/eduworks/ec/promises/helpers");
 const EcRemoteLinkedData = require("../../schema/general/EcRemoteLinkedData");
 const EcCrypto = require("../../../../com/eduworks/ec/crypto/EcCrypto");

package/src/org/cassproject/schema/general/EcRemoteLinkedData.js

@@ -6,6 +6,7 @@ const EcPpkFacade = require("../../../../com/eduworks/ec/crypto/EcPpkFacade.js")
 const EcRsaOaepAsyncWorker = require("../../../../com/eduworks/ec/crypto/EcRsaOaepAsyncWorker.js");
 const EcLinkedData = require("../../../json/ld/EcLinkedData.js");
 const Ebac = require("./Ebac.js");
+const FormData = require("../../../../com/eduworks/ec/remote/EcRemote.js").FormData;
 require("../../general/AuditLogger.js")
 
 /**
@@ -540,6 +541,19 @@ module.exports = class EcRemoteLinkedData extends EcLinkedData {
 				types[i].substring(lastSlash + 1) +
 				'")';
 		}
+		//Replace http with https in schema or visa versa and then do it again
+		for (let i = 0; i < types.length; i++) {
+			if (result != "") result += " OR ";
+			let lastSlash = types[i].lastIndexOf("/");
+			let context = types[i].substring(0, lastSlash + 1);
+			if (context.startsWith("http://")) {
+				let httpsContext = context.replace("http://", "https://");
+				result += '(@context:"' + httpsContext + '" AND @type:"' + types[i].substring(lastSlash + 1) + '")';
+			} else if (context.startsWith("https://")) {
+				let httpContext = context.replace("https://", "http://");
+				result += '(@context:"' + httpContext + '" AND @type:"' + types[i].substring(lastSlash + 1) + '")';
+			}
+		}
 		return "(" + result + ")";
 	}
 	asRdfXml(success, failure, signatureSheet) {