cassproject 5.0.20 → 5.0.23

package/src/org/cassproject/general/repository/GeneralFile.js

@@ -11,8 +11,8 @@ module.exports = class GeneralFile extends EcRemoteLinkedData {
 	constructor() {
 		super(General.context, GeneralFile.myType);
 	}
-	static TYPE_0_1 = "http://schema.eduworks.com/general/0.1/file";
-	static TYPE_0_2 = "http://schema.eduworks.com/general/0.2/file";
+	static TYPE_0_1 = "http://schema.eduworks.com/general/0.1/file"; // NOSONAR - JSON-LD identifier, never fetched
+	static TYPE_0_2 = "http://schema.eduworks.com/general/0.2/file"; // NOSONAR - JSON-LD identifier, never fetched
 	static myType = this.TYPE_0_2;
 	/**
 	 *  Optional checksum of the file, used to verify if the file has been
@@ -56,16 +56,15 @@ module.exports = class GeneralFile extends EcRemoteLinkedData {
 	upgrade() {
 		super.upgrade();
 		if (GeneralFile.TYPE_0_1 == (this.type)) {
-			let me = this;
-			if (me["@context"] == null && me["@schema"] != null)
-				me["@context"] = me["@schema"];
+			if (this["@context"] == null && this["@schema"] != null)
+				this["@context"] = this["@schema"];
 			this.setContextAndType(General.context_0_2, GeneralFile.TYPE_0_2);
 		}
 	}
 	getTypes() {
-		let a = [];
-		a.push(GeneralFile.TYPE_0_2);
-		a.push(GeneralFile.TYPE_0_1);
-		return a;
+		return [
+			GeneralFile.TYPE_0_2,
+			GeneralFile.TYPE_0_1,
+		];
 	}
 };

package/src/org/cassproject/schema/cass/competency/Competency.js

@@ -37,9 +37,8 @@ module.exports = class Competency extends schema.CreativeWork {
 				this.sameAs = this.url;
 				this.url = null;
 			}
-			let me = this;
-			if (me["@context"] == null && me["@schema"] != null)
-				me["@context"] = me["@schema"];
+			if (this["@context"] == null && this["@schema"] != null)
+				this["@context"] = this["@schema"];
 			this.setContextAndType(Cass.context_0_2, Competency.TYPE_0_2);
 		}
 		if (Competency.TYPE_0_2 == this.getFullType()) {
@@ -56,13 +55,13 @@ module.exports = class Competency extends schema.CreativeWork {
 		}
 	}
 	getTypes() {
-		let a = [];
-		a.push(Competency.TYPE_0_6);
-		a.push(Competency.TYPE_0_5);
-		a.push(Competency.TYPE_0_4);
-		a.push(Competency.TYPE_0_3);
-		a.push(Competency.TYPE_0_2);
-		a.push(Competency.TYPE_0_1);
-		return a;
+		return [
+			Competency.TYPE_0_6,
+			Competency.TYPE_0_5,
+			Competency.TYPE_0_4,
+			Competency.TYPE_0_3,
+			Competency.TYPE_0_2,
+			Competency.TYPE_0_1,
+		];
 	}
 };

package/src/org/cassproject/schema/cass/competency/Framework.js

@@ -61,9 +61,8 @@ module.exports = class Framework extends schema.CreativeWork {
 	upgrade() {
 		super.upgrade();
 		if (Framework.TYPE_0_1 == (this.type)) {
-			let me = this;
-			if (me["@context"] == null && me["@schema"] != null)
-				me["@context"] = me["@schema"];
+			if (this["@context"] == null && this["@schema"] != null)
+				this["@context"] = this["@schema"];
 			this.setContextAndType(Cass.context_0_2, Framework.TYPE_0_2);
 		}
 		if (Framework.TYPE_0_2 == (this.getFullType())) {
@@ -80,13 +79,13 @@ module.exports = class Framework extends schema.CreativeWork {
 		}
 	}
 	getTypes() {
-		let a = [];
-		a.push(Framework.TYPE_0_6);
-		a.push(Framework.TYPE_0_5);
-		a.push(Framework.TYPE_0_4);
-		a.push(Framework.TYPE_0_3);
-		a.push(Framework.TYPE_0_2);
-		a.push(Framework.TYPE_0_1);
-		return a;
+		return [
+			Framework.TYPE_0_6,
+			Framework.TYPE_0_5,
+			Framework.TYPE_0_4,
+			Framework.TYPE_0_3,
+			Framework.TYPE_0_2,
+			Framework.TYPE_0_1,
+		];
 	}
 };

package/src/org/cassproject/schema/cass/competency/Level.js

@@ -48,9 +48,8 @@ module.exports = class Level extends schema.CreativeWork {
 	upgrade() {
 		super.upgrade();
 		if (Level.TYPE_0_1 == (this.type)) {
-			let me = this;
-			if (me["@context"] == null && me["@schema"] != null)
-				me["@context"] = me["@schema"];
+			if (this["@context"] == null && this["@schema"] != null)
+				this["@context"] = this["@schema"];
 			this.setContextAndType(Cass.context_0_2, Level.TYPE_0_2);
 		}
 		if (Level.TYPE_0_2 == (this.getFullType())) {
@@ -67,13 +66,13 @@ module.exports = class Level extends schema.CreativeWork {
 		}
 	}
 	getTypes() {
-		let a = [];
-		a.push(Level.TYPE_0_6);
-		a.push(Level.TYPE_0_5);
-		a.push(Level.TYPE_0_4);
-		a.push(Level.TYPE_0_3);
-		a.push(Level.TYPE_0_2);
-		a.push(Level.TYPE_0_1);
-		return a;
+		return [
+			Level.TYPE_0_6,
+			Level.TYPE_0_5,
+			Level.TYPE_0_4,
+			Level.TYPE_0_3,
+			Level.TYPE_0_2,
+			Level.TYPE_0_1,
+		];
 	}
 };

package/src/org/cassproject/schema/cass/competency/Relation.js

@@ -130,9 +130,8 @@ module.exports = class Relation extends schema.CreativeWork {
 		if ("isEquivalenTo" == this.relationType)
 			this.relationType = Relation.IS_EQUIVALENT_TO;
 		if (Relation.TYPE_0_1 == this.type) {
-			let me = this;
-			if (me["@context"] == null && me["@schema"] != null)
-				me["@context"] = me["@schema"];
+			if (this["@context"] == null && this["@schema"] != null)
+				this["@context"] = this["@schema"];
 			this.setContextAndType(Cass.context_0_2, Relation.TYPE_0_2);
 		}
 		if (Relation.TYPE_0_2 == this.getFullType()) {
@@ -149,13 +148,13 @@ module.exports = class Relation extends schema.CreativeWork {
 		}
 	}
 	getTypes() {
-		let a = [];
-		a.push(Relation.TYPE_0_6);
-		a.push(Relation.TYPE_0_5);
-		a.push(Relation.TYPE_0_4);
-		a.push(Relation.TYPE_0_3);
-		a.push(Relation.TYPE_0_2);
-		a.push(Relation.TYPE_0_1);
-		return a;
+		return [
+			Relation.TYPE_0_6,
+			Relation.TYPE_0_5,
+			Relation.TYPE_0_4,
+			Relation.TYPE_0_3,
+			Relation.TYPE_0_2,
+			Relation.TYPE_0_1,
+		];
 	}
 };

package/src/org/cassproject/schema/cass/competency/RollupRule.js

@@ -52,12 +52,12 @@ module.exports = class RollupRule extends schema.CreativeWork {
 		}
 	}
 	getTypes() {
-		let a = [];
-		a.push(RollupRule.TYPE_0_6);
-		a.push(RollupRule.TYPE_0_5);
-		a.push(RollupRule.TYPE_0_4);
-		a.push(RollupRule.TYPE_0_3);
-		a.push(RollupRule.TYPE_0_2);
-		return a;
+		return [
+			RollupRule.TYPE_0_6,
+			RollupRule.TYPE_0_5,
+			RollupRule.TYPE_0_4,
+			RollupRule.TYPE_0_3,
+			RollupRule.TYPE_0_2,
+		];
 	}
 };

package/src/org/cassproject/schema/cass/profile/Assertion.js

@@ -115,16 +115,10 @@ module.exports = class Assertion extends schema.CreativeWork {
 	 *  @param pk
 	 */
 	setSubject(pk) {
-		let owners = [];
 		let readers = this.reader;
 		if (readers == null) readers = [];
-		if (this.subject != null) {
-			if (this.subject.owner != null) 
-				owners = owners.concat(this.subject.owner);
-			if (this.subject.reader != null)
-				readers = readers.concat(this.subject.reader);
-		}
-		if (this.owner != null) owners = owners.concat(this.owner);
+		if (this.subject?.reader != null)
+			readers = readers.concat(this.subject.reader);
 		readers.push(pk.toPem());
 		this.subject = pk.toPem();
 	}
@@ -146,10 +140,10 @@ module.exports = class Assertion extends schema.CreativeWork {
 		if (this.subject == null) return "Nobody";
 		let subjectPk = this.getSubject();
 		let identity = eim.getIdentity(subjectPk);
-		if (identity != null && identity.displayName != null)
+		if (identity?.displayName != null)
 			return identity.displayName + " (You)";
 		let contact = eim.getContact(subjectPk);
-		if (contact == null || contact.displayName == null)
+		if (contact?.displayName == null)
 			return "Unknown Subject";
 		return contact.displayName;
 	}
@@ -162,12 +156,12 @@ module.exports = class Assertion extends schema.CreativeWork {
 		}
 		this.getSubjectAsync(function(subjectPk) {
 			let identity = eim.getIdentity(subjectPk);
-			if (identity != null && identity.displayName != null) {
+			if (identity?.displayName != null) {
 				success(identity.displayName + " (You)");
 				return;
 			}
 			let contact = eim.getContact(subjectPk);
-			if (contact == null || contact.displayName == null) {
+			if (contact?.displayName == null) {
 				success("Unknown Subject");
 				return;
 			}
@@ -180,10 +174,10 @@ module.exports = class Assertion extends schema.CreativeWork {
 		if (this.agent == null) return "Nobody";
 		let agentPk = this.getAgent();
 		let identity = eim.getIdentity(agentPk);
-		if (identity != null && identity.displayName != null)
+		if (identity?.displayName != null)
 			return identity.displayName + " (You)";
 		let contact = eim.getContact(agentPk);
-		if (contact == null || contact.displayName == null)
+		if (contact?.displayName == null)
 			return "Unknown Agent";
 		return contact.displayName;
 	}
@@ -196,12 +190,12 @@ module.exports = class Assertion extends schema.CreativeWork {
 		}
 		this.getAgentAsync(function(subjectPk) {
 			let identity = eim.getIdentity(subjectPk);
-			if (identity != null && identity.displayName != null) {
+			if (identity?.displayName != null) {
 				success(identity.displayName + " (You)");
 				return;
 			}
 			let contact = eim.getContact(subjectPk);
-			if (contact == null || contact.displayName == null) {
+			if (contact?.displayName == null) {
 				success("Unknown Agent");
 				return;
 			}
@@ -269,9 +263,8 @@ module.exports = class Assertion extends schema.CreativeWork {
 	upgrade() {
 		super.upgrade();
 		if (Assertion.TYPE_0_1 == (this.type)) {
-			let me = this;
-			if (me["@context"] == null && me["@schema"] != null)
-				me["@context"] = me["@schema"];
+			if (this["@context"] == null && this["@schema"] != null)
+				this["@context"] = this["@schema"];
 			this.setContextAndType(Cass.context_0_2, Assertion.TYPE_0_2);
 		}
 		if (Assertion.TYPE_0_2 == (this.getFullType())) {
@@ -298,14 +291,14 @@ module.exports = class Assertion extends schema.CreativeWork {
 			}
 	}
 	getTypes() {
-		let a = [];
-		a.push(Assertion.TYPE_0_6);
-		a.push(Assertion.TYPE_0_5);
-		a.push(Assertion.TYPE_0_4);
-		a.push(Assertion.TYPE_0_3);
-		a.push(Assertion.TYPE_0_2);
-		a.push(Assertion.TYPE_0_1);
-		return a;
+		return [
+			Assertion.TYPE_0_6,
+			Assertion.TYPE_0_5,
+			Assertion.TYPE_0_4,
+			Assertion.TYPE_0_3,
+			Assertion.TYPE_0_2,
+			Assertion.TYPE_0_1,
+		];
 	}
 	static getCodebook(assertion) {
 		if (Assertion.codebooks == null) Assertion.codebooks = {};

package/src/org/cassproject/schema/cass/profile/AssertionEnvelope.js

@@ -88,7 +88,6 @@ module.exports = class AssertionEnvelope extends schema.CreativeWork {
 	 *  @method addAssertion
 	 */
 	async addAssertion(a, eim) {
-		let me = this;
 		let ac = new AssertionCodebook();
 		if (this.assertion == null) this.assertion = [];
 		this.assertion.push(a);
@@ -105,9 +104,8 @@ module.exports = class AssertionEnvelope extends schema.CreativeWork {
 			ac.decayFunction = await a.decayFunction.decryptSecret(eim);
 		if (a.negative != null) ac.negative = await a.negative.decryptSecret(eim);
 		if (a.evidence != null)
-			for (let i = 0; i < a.evidence.length; i++) {
+			for (let ecEncryptedValue of a.evidence) {
 				if (ac.evidence == null) ac.evidence = [];
-				let ecEncryptedValue = a.evidence[i];
 				ac.evidence.push(await ecEncryptedValue.decryptSecret(eim));
 			}
 	}
@@ -119,8 +117,8 @@ module.exports = class AssertionEnvelope extends schema.CreativeWork {
 	 */
 	validate() {
 		if (this.assertion != null)
-			for (let i = 0; i < this.assertion.length; i++)
-				if (this.assertion[i].invalid()) return false;
+			for (let assertion of this.assertion)
+				if (assertion.invalid()) return false;
 		return true;
 	}
 };

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

@@ -87,14 +87,14 @@ module.exports = class EcRemoteLinkedData extends EcLinkedData {
 		if (EcRemoteLinkedData.caching && EcRemoteLinkedData.tvfuCache[id] != null)
 			return EcRemoteLinkedData.tvfuCache[id];
 		if (
-			id.indexOf("/api/data/") == -1 &&
-			id.indexOf("/api/custom/data/") == -1
+			!id.includes("/api/data/") &&
+			!id.includes("/api/custom/data/")
 		) {
 			if (EcRemoteLinkedData.caching)
 				EcRemoteLinkedData.tvfuCache[id] = id;
 			return id;
 		}
-		if (!id.substring(id.lastIndexOf("/")).match("^\\/[0-9]+$")) {
+		if (!id.substring(id.lastIndexOf("/")).match(String.raw`^\/[0-9]+$`)) {
 			if (EcRemoteLinkedData.caching)
 				EcRemoteLinkedData.tvfuCache[id] = id;
 			return id;
@@ -120,7 +120,7 @@ module.exports = class EcRemoteLinkedData extends EcLinkedData {
 		this.id += "/";
 		this.id += EcCrypto.generateUUID();
 		this.id += "/";
-		this.id += new Date().getTime();
+		this.id += Date.now();
 	}
 	/**
 	 *  Will generate an short (non-versioned) identifier using the server URL provided (usually from
@@ -138,7 +138,7 @@ module.exports = class EcRemoteLinkedData extends EcLinkedData {
 		return this.getFullType()
 			.replace("http://", "")
 			.replace("https://", "")
-			.replace(/\//g, ".");
+			.replaceAll("/", ".");
 	}
 	/**
 	 *  Will generate an identifier using the server URL provided (usually from
@@ -156,7 +156,7 @@ module.exports = class EcRemoteLinkedData extends EcLinkedData {
 		this.id += "/";
 		this.id += uniqueIdentifier;
 		this.id += "/";
-		this.id += new Date().getTime();
+		this.id += Date.now();
 	}
 	/**
 	 *  Will generate an identifier using the server URL provided (usually from
@@ -298,8 +298,7 @@ module.exports = class EcRemoteLinkedData extends EcLinkedData {
 				works = false;
 				let sig = this.signature[i];
 				if (this.owner != null) {
-					for (let j = 0; j < this.owner.length; j++) {
-						let own = this.owner[j];
+					for (let own of this.owner) {
 						let pk = EcPk.fromPem(own);
 						let verify = false;
 						try {
@@ -309,10 +308,10 @@ module.exports = class EcRemoteLinkedData extends EcLinkedData {
 								sig
 							);
 							global.auditLogger.report(global.auditLogger.LogCategory.SYSTEM, global.auditLogger.Severity.INFO, "EcRemoteLDVerify", verify);
-						} catch (ex) {
+						} catch (ex) { // NOSONAR - A signature that cannot be checked counts as unverified; the next owner is tried.
 							verify = false;
 						}
-						if (verify == true) {
+						if (verify == true) { // NOSONAR - The worker result is not guaranteed to be a boolean; == true also accepts 1.
 							works = true;
 							break;
 						}
@@ -328,8 +327,7 @@ module.exports = class EcRemoteLinkedData extends EcLinkedData {
 				works256 = false;
 				let sig = this.signatureSha256[i];
 				if (this.owner != null) {
-					for (let j = 0; j < this.owner.length; j++) {
-						let own = this.owner[j];
+					for (let own of this.owner) {
 						let pk = EcPk.fromPem(own);
 						let verify = false;
 						try {
@@ -339,10 +337,10 @@ module.exports = class EcRemoteLinkedData extends EcLinkedData {
 								sig
 							);
 							global.auditLogger.report(global.auditLogger.LogCategory.SYSTEM, global.auditLogger.Severity.INFO, "EcRemoteLDVer256", verify);
-						} catch (ex) {
+						} catch (ex) { // NOSONAR - A signature that cannot be checked counts as unverified; the next owner is tried.
 							verify = false;
 						}
-						if (verify == true) {
+						if (verify == true) { // NOSONAR - The worker result is not guaranteed to be a boolean; == true also accepts 1.
 							works256 = true;
 							break;
 						}
@@ -367,8 +365,8 @@ module.exports = class EcRemoteLinkedData extends EcLinkedData {
 	addOwner(newOwner) {
 		let pem = newOwner.toPem();
 		if (this.owner == null) this.owner = [];
-		for (let i = 0; i < this.owner.length; i++)
-			if (this.owner[i] == pem) return;
+		for (let owner of this.owner)
+			if (owner == pem) return;
 		this.owner.push(pem);
 		this.signature = null;
 	}
@@ -423,8 +421,8 @@ module.exports = class EcRemoteLinkedData extends EcLinkedData {
 		if (this.context == null) return true;
 		if (this.getFullType() == null) return true;
 		if (
-			this.getFullType().indexOf("http://") == -1 &&
-			this.getFullType().indexOf("https://") == -1
+			!this.getFullType().includes("http://") &&
+			!this.getFullType().includes("https://")
 		)
 			return true;
 		return false;
@@ -437,8 +435,8 @@ module.exports = class EcRemoteLinkedData extends EcLinkedData {
 	updateTimestamp() {
 		if (this.getTimestamp() == null) return;
 		let rawId = this.id.substring(0, this.id.lastIndexOf("/"));
-		if (rawId.endsWith("/") == false) rawId += "/";
-		rawId += new Date().getTime();
+		if (!rawId.endsWith("/")) rawId += "/";
+		rawId += Date.now();
 		this.id = rawId;
 	}
 	/**
@@ -459,7 +457,7 @@ module.exports = class EcRemoteLinkedData extends EcLinkedData {
 		if (!id) return null;
 		let timestamp = id.substring(id.lastIndexOf("/") + 1);
 		if (timestamp.match("^[0-9]+$")) {
-			return parseInt(timestamp);
+			return Number.parseInt(timestamp);
 		} else {
 			return null;
 		}
@@ -530,28 +528,28 @@ module.exports = class EcRemoteLinkedData extends EcLinkedData {
 				types[i].substring(lastSlash + 1) +
 				'")';
 		}
-		for (let i = 0; i < types.length; i++) {
+		for (let type of types) {
 			if (result != "") result += " OR ";
-			result += '\\*encryptedType:"' + types[i] + '"';
-			let lastSlash = types[i].lastIndexOf("/");
+			result += String.raw`\*encryptedType:"` + type + '"';
+			let lastSlash = type.lastIndexOf("/");
 			result +=
 				' OR (@context:"' +
 				Ebac.context +
-				'" AND \\*encryptedType:"' +
-				types[i].substring(lastSlash + 1) +
+				String.raw`" AND \*encryptedType:"` +
+				type.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++) {
+		for (let type of types) {
 			if (result != "") result += " OR ";
-			let lastSlash = types[i].lastIndexOf("/");
-			let context = types[i].substring(0, lastSlash + 1);
+			let lastSlash = type.lastIndexOf("/");
+			let context = type.substring(0, lastSlash + 1);
 			if (context.startsWith("http://")) {
 				let httpsContext = context.replace("http://", "https://");
-				result += '(@context:"' + httpsContext + '" AND @type:"' + types[i].substring(lastSlash + 1) + '")';
+				result += '(@context:"' + httpsContext + '" AND @type:"' + type.substring(lastSlash + 1) + '")';
 			} else if (context.startsWith("https://")) {
 				let httpContext = context.replace("https://", "http://");
-				result += '(@context:"' + httpContext + '" AND @type:"' + types[i].substring(lastSlash + 1) + '")';
+				result += '(@context:"' + httpContext + '" AND @type:"' + type.substring(lastSlash + 1) + '")';
 			}
 		}
 		return "(" + result + ")";
@@ -610,24 +608,23 @@ module.exports = class EcRemoteLinkedData extends EcLinkedData {
 	 *  @method upgrade
 	 */
 	upgrade() {
-		let me = this;
-		if (me["@owner"] != null) {
-			me["owner"] = me["@owner"];
+		if (this["@owner"] != null) {
+			this["owner"] = this["@owner"];
 		}
-		if (me["@reader"] != null) {
-			me["reader"] = me["@reader"];
+		if (this["@reader"] != null) {
+			this["reader"] = this["@reader"];
 		}
-		if (me["@signature"] != null) {
-			me["signature"] = me["@signature"];
+		if (this["@signature"] != null) {
+			this["signature"] = this["@signature"];
 		}
-		if (me["@signatureSha256"] != null) {
-			me["signatureSha256"] = me["@signatureSha256"];
+		if (this["@signatureSha256"] != null) {
+			this["signatureSha256"] = this["@signatureSha256"];
 		}
-		if (me["@encryptedType"] != null) {
-			me["encryptedType"] = me["@encryptedType"];
+		if (this["@encryptedType"] != null) {
+			this["encryptedType"] = this["@encryptedType"];
 		}
-		if (me["@encryptedContext"] != null) {
-			me["encryptedContext"] = me["@encryptedContext"];
+		if (this["@encryptedContext"] != null) {
+			this["encryptedContext"] = this["@encryptedContext"];
 		}
 		this.handleForwarding();
 	}

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

@@ -181,7 +181,7 @@ global.jsonld = require("jsonld");
 	 */
 	getFullType() {
 		if (this.context == null) return this.type;
-		if (this.type.indexOf("http") != -1) return this.type;
+		if (this.type.includes("http")) return this.type;
 		let computedType = this.context;
 		if (EcObject.isObject(this.context)) {
 			let typeParts = this.type.split(":");
@@ -266,7 +266,6 @@ global.jsonld = require("jsonld");
 		}
 	}
 	async recast(translationContext, targetContext, documentLoader) {
-		let me = this;
 		let json = JSON.parse(this.toJson());
 		if (targetContext == null) targetContext = json["@context"];
 		json["@context"] = translationContext;
@@ -286,15 +285,15 @@ global.jsonld = require("jsonld");
 		let o;
 		try {
 			o = await jsonld.compact(actual, finalTargetContext, docLoader);
-		} catch(s) {
-			if (s != null) {
-				global.auditLogger.report(global.auditLogger.LogCategory.SYSTEM, global.auditLogger.Severity.ERROR, "EcLinkedDataRecast", s);
+		} catch(error_) {
+			if (error_ != null) {
+				global.auditLogger.report(global.auditLogger.LogCategory.SYSTEM, global.auditLogger.Severity.ERROR, "EcLinkedDataRecast", error_);
 				return;
 			}
 		}
-		me.copyFrom(o);
-		me["@context"] = finalTargetContext;
-		return me;
+		this.copyFrom(o);
+		this["@context"] = finalTargetContext;
+		return this;
 	}
 	/**
 	 *  Encodes the object in a form where it is ready to be signed.
@@ -306,8 +305,8 @@ global.jsonld = require("jsonld");
 	toSignableJson() {
 		let d = JSON.parse(this.toJson());
 		if (
-			this.type.indexOf("http://schema.eduworks.com/") == 0 &&
-			this.type.indexOf("/0.1/") != -1
+			this.type.indexOf("http://schema.eduworks.com/") == 0 && // NOSONAR - JSON-LD identifier, never fetched
+			this.type.includes("/0.1/")
 		) {
 			delete d["signature"];
 			delete d["owner"];
@@ -377,10 +376,9 @@ global.jsonld = require("jsonld");
 		return a;
 	}
 	async compact(remoteContextUrl, success, failure) {
-		let me = this;
 		try {
 			let compacted = await jsonld.compact(this.toJson(),	remoteContextUrl);
-			me.copyFrom(compacted);
+			this.copyFrom(compacted);
 			success(this);
 		} catch(err) {
 			if (err != null) {