cassproject 5.0.15 → 5.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cassproject",
-	"version": "5.0.15",
+	"version": "5.0.16",
 	"description": "Competency and Skills Service",
 	"main": "index.js",
 	"scripts": {
@@ -143,7 +143,7 @@
 		"base64-arraybuffer": "^1.0.2",
 		"jsonld": "^9.0.0",
 		"node-forge": "^1.4.0",
-		"papaparse": "^5.5.3",
+		"papaparse": "^5.5.4",
 		"promise-worker": "^2.0.1",
 		"web-worker": "1.3.0"
 	},
@@ -169,12 +169,12 @@
 	},
 	"homepage": "https://github.com/cassproject/cass-npm#readme",
 	"devDependencies": {
-		"@cypress/webpack-preprocessor": "^7.1.0",
+		"@cypress/webpack-preprocessor": "^7.1.1",
 		"chai": "^4.5.0",
-		"concurrently": "^10.0.0",
-		"cypress": "^15.16.0",
+		"concurrently": "^10.0.3",
+		"cypress": "^15.18.0",
 		"cypress-fail-fast": "^8.1.0",
-		"eslint": "^10.4.1",
+		"eslint": "^10.5.0",
 		"fake-indexeddb": "^6.2.5",
 		"mocha": "^11.7.6",
 		"node-polyfill-webpack-plugin": "^4.1.0",

package/src/com/eduworks/ec/crypto/EcCrypto.js

@@ -1,4 +1,3 @@
-const { v4: uuidv4 } = require('uuid');
 let forge = require("node-forge");
 /**
  *  @author Fritz
@@ -71,9 +70,19 @@ module.exports = class EcCrypto {
 		return new TextEncoder("utf-8").encode(str).buffer;
 	}
 	static generateUUID()
-	{  
-		let uuid = uuidv4();
-		uuid = uuid.substr(0,9)+'c455'+uuid.substr(13);
-		return uuid;
+	{
+		var d = new Date().getTime(); //Timestamp
+		var d2 = ((typeof performance !== 'undefined') && performance.now && (performance.now() * 1000)) || 0;//Time in microseconds since page-load or 0 if unsupported
+		return 'xxxxxxxx-c455-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+			var r = Math.random() * 16;//random number between 0 and 16
+			if (d > 0) {//Use timestamp until depleted
+				r = (d + r) % 16 | 0;
+				d = Math.floor(d / 16);
+			} else {//Use microseconds since page-load if supported
+				r = (d2 + r) % 16 | 0;
+				d2 = Math.floor(d2 / 16);
+			}
+			return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+		});
 	}
 };

package/src/index/env.js

@@ -4,16 +4,19 @@ if (typeof window !== "undefined" && window) {
 }
 
 global.generateUUID = function () {
-    let d = new Date().getTime();
-    if (typeof window !== "undefined" && window && window.performance && typeof window.performance.now === "function") {
-        d += performance.now(); // use high-precision timer if available
-    }
-    let uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-        let r = (d + Math.random() * 16) % 16 | 0;
-        d = Math.floor(d / 16);
-        return (c == 'x' ? r : r & 0x3 | 0x8).toString(16);
+    var d = new Date().getTime(); //Timestamp
+    var d2 = ((typeof performance !== 'undefined') && performance.now && (performance.now() * 1000)) || 0;//Time in microseconds since page-load or 0 if unsupported
+    return 'xxxxxxxx-c455-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = Math.random() * 16;//random number between 0 and 16
+        if (d > 0) {//Use timestamp until depleted
+            r = (d + r) % 16 | 0;
+            d = Math.floor(d / 16);
+        } else {//Use microseconds since page-load if supported
+            r = (d2 + r) % 16 | 0;
+            d2 = Math.floor(d2 / 16);
+        }
+        return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
     });
-    return uuid;
 };
 
 try {

package/src/org/cass/competency/EcLevel.js

@@ -122,13 +122,12 @@ module.exports = class EcLevel extends Level {
 		repo, eim
 	) {
 		let a = new EcAlignment();
-		a.source = this.id;
-		a.target = targetLevel.id;
+		a.source = this.shortId();
+		a.target = targetLevel.shortId();
 		a.relationType = alignmentType;
 		a.addOwner(identity.toPk());
 		if (repo?.selectedServer != null)
 			a.generateId(repo.selectedServer);
-		await a.signWith(identity);
 		await a.save(success, failure, repo, eim);
 		return a;
 	}

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

@@ -146,7 +146,9 @@ module.exports = class EcRepository {
 	postMaxSize = null;
 	init(selectedServer, success, failure, loginObjectCallback) {
 		this.selectedServer = selectedServer;
-		return this.negotiateTimeOffset(success, failure, loginObjectCallback);
+		return this.negotiateTimeOffset(success, failure, loginObjectCallback).then(()=>{
+			return this.fetchServerAdminKeys()
+		});
 	}
 	negotiateTimeOffset = function (success, failure, loginObjectCallback) {
 		let oldTimeout = EcRemote.timeout;
@@ -781,16 +783,7 @@ module.exports = class EcRepository {
 		} else {
 			offset = repo.timeOffset;
 		}
-		if (data.owner != null && data.owner.length > 0) {
-			p = eim.signatureSheetFor(
-				data.owner,
-				300000 + offset,
-				data.id,
-				null, null, repo != null ? repo.signatureSheetHashAlgorithm : null
-			);
-		} else {
-			p = eim.signatureSheet(300000 + offset, data.id, null, null, repo != null ? repo.signatureSheetHashAlgorithm : null);
-		}
+		p = eim.signatureSheet(300000 + offset, data.id, null, null, repo != null ? repo.signatureSheetHashAlgorithm : null);
 		p = p.then((signatureSheet) => {
 			let fd = new FormData();
 			fd.append("data", data.toJson());
@@ -895,23 +888,18 @@ module.exports = class EcRepository {
 		let targetUrl;
 		targetUrl = data.shortId();
 		let offset = this.setOffset(data.id);
-		if (data.owner != null && data.owner.length > 0) {
-			return eim.signatureSheetFor(
-				data.owner,
-				300000 + offset,
-				data.id,
-				null, null, repo != null ? repo.signatureSheetHashAlgorithm : null
-			).then((signatureSheet) => {
-				return EcRemote._delete(
-					targetUrl,
-					signatureSheet,
-					success,
-					failure
-				);
-			});
-		} else {
-			return EcRemote._delete(targetUrl, [], success, failure);
-		}
+		return eim.signatureSheet(
+			300000 + offset,
+			data.id,
+			null, null, repo != null ? repo.signatureSheetHashAlgorithm : null
+		).then((signatureSheet) => {
+			return EcRemote._delete(
+				targetUrl,
+				signatureSheet,
+				success,
+				failure
+			);
+		});
 	};
 	/**
 	 *  Attempts to delete a piece of data.
@@ -965,23 +953,18 @@ module.exports = class EcRepository {
 				EcCrypto.md5(data.shortId())
 			);
 		let offset = EcRepository.setOffset(data.id);
-		if (data.owner != null && data.owner.length > 0) {
-			return eim.signatureSheetFor(
-				data.owner,
-				300000 + offset,
-				data.id,
-				null, null, this != null ? this.signatureSheetHashAlgorithm : null
-			).then((signatureSheet) => {
-				return EcRemote._delete(
-					targetUrl,
-					signatureSheet,
-					success,
-					failure
-				);
-			});
-		} else {
-			return EcRemote._delete(targetUrl, [], success, failure);
-		}
+		return eim.signatureSheet(
+			300000 + offset,
+			data.id,
+			null, null, this != null ? this.signatureSheetHashAlgorithm : null
+		).then((signatureSheet) => {
+			return EcRemote._delete(
+				targetUrl,
+				signatureSheet,
+				success,
+				failure
+			);
+		});
 	};
 	/**
 	 *  Attempts to save many pieces of data. Does some checks before saving to
@@ -1001,7 +984,6 @@ module.exports = class EcRepository {
 	multiput = function (data, success, failure, eim) {
 		if (eim === undefined || eim == null)
 			eim = EcIdentityManager.default;
-		let allOwners = [];
 		for (let d of data) {
 			if (d.invalid())
 				throw new Error("Cannot save data. It is missing a vital component.");
@@ -1034,9 +1016,6 @@ module.exports = class EcRepository {
 					)
 				];
 			}
-			if (d.owner != null)
-				for (let j = 0; j < d.owner.length; j++)
-					EcArray.setAdd(allOwners, d.owner[j]);
 		}
 		let encryptionAndSigningPromises = data.map((d) => {
 			return cassReturnAsPromise(d)
@@ -1064,19 +1043,10 @@ module.exports = class EcRepository {
 		return Promise.all(encryptionAndSigningPromises)
 			.then((readyToSendData) => {
 				preparedData = readyToSendData;
-				if (allOwners != null && allOwners.length > 0) {
-					return eim.signatureSheetFor(
-						allOwners,
-						300000 + this.timeOffset,
-						this.selectedServer,
-						null, null, this.signatureSheetHashAlgorithm
-					);
-				} else {
-					return eim.signatureSheet(
-						300000 + this.timeOffset,
-						this.selectedServer, null, null, this.signatureSheetHashAlgorithm
-					);
-				}
+				return eim.signatureSheet(
+					300000 + this.timeOffset,
+					this.selectedServer, null, null, this.signatureSheetHashAlgorithm
+				);
 			})
 			.then((signatureSheet) => {
 				let fd = new FormData();
@@ -1950,7 +1920,7 @@ module.exports = class EcRepository {
 			service = "/sky/admin";
 		}
 		let me = this;
-		EcRemote.getExpectingObject(
+		return EcRemote.getExpectingObject(
 			this.selectedServer,
 			service,
 			function (p1) {
@@ -1959,10 +1929,16 @@ module.exports = class EcRepository {
 				for (let i = 0; i < ary.length; i++) {
 					me.adminKeys.push(ary[i]);
 				}
-				success(ary);
+				if (success != null)
+					success(ary);
+				else 
+					return ary;
 			},
 			function (p1) {
-				failure("");
+				if (failure != null)
+					failure(p1);
+				else 
+					throw new Error(p1);
 			}
 		);
 	};
@@ -1981,9 +1957,7 @@ module.exports = class EcRepository {
 				} else
 					return p1;
 			}
-			p1 = await EcEncryptedValue.fromEncryptedValue(
-				p1, null, null, eim
-			);
+			p1 = await EcEncryptedValue.fromEncryptedValue(p1, null, null, eim);
 			if (p1.isAny(result.getTypes())) {
 				result.copyFrom(p1, eim);
 				if (this.caching) {

package/src/test/2.EcLevel.test.js

@@ -9,128 +9,6 @@ const EcIdentityManager = require('../org/cassproject/ebac/identity/EcIdentityMa
 const { expect } = chai;
 
 describe('EcLevel', () => {
-    let sandbox;
-
-    beforeEach(() => {
-        sandbox = sinon.createSandbox();
-    });
-
-    afterEach(() => {
-        sandbox.restore();
-    });
-
-    describe('get', () => {
-        it('should retrieve a level by ID', (done) => {
-            const id = 'testId';
-            const success = sinon.spy();
-            const failure = sinon.spy();
-            const repo = {};
-            const eim = {};
-
-            sandbox.stub(EcRepository, 'getAs').callsFake((id, level, successCallback, failureCallback, repo, eim) => {
-                successCallback(level);
-            });
-
-            EcLevel.get(id, success, failure, repo, eim);
-
-            expect(success.calledOnce).to.be.true;
-            expect(failure.called).to.be.false;
-            done();
-        });
-    });
-
-    describe('getBlocking', () => {
-        it('should retrieve a level by ID synchronously', () => {
-            const id = 'testId';
-            const repo = {};
-            const eim = {};
-
-            sandbox.stub(EcRepository, 'getAs').returns(new EcLevel());
-
-            const result = EcLevel.getBlocking(id, repo, eim);
-
-            expect(result).to.be.instanceOf(EcLevel);
-        });
-    });
-
-    describe('search', () => {
-        it('should search for levels with a query', (done) => {
-            const repo = {};
-            const query = 'testQuery';
-            const success = sinon.spy();
-            const failure = sinon.spy();
-            const paramObj = {};
-            const eim = {};
-
-            sandbox.stub(EcRepository, 'searchAs').callsFake((repo, query, levelFactory, successCallback, failureCallback, paramObj, eim) => {
-                successCallback([new EcLevel()]);
-            });
-
-            EcLevel.search(repo, query, success, failure, paramObj, eim);
-
-            expect(success.calledOnce).to.be.true;
-            expect(failure.called).to.be.false;
-            done();
-        });
-    });
-
-    describe('searchByCompetency', () => {
-        it('should search for levels by competency ID', (done) => {
-            const repo = {};
-            const competencyId = 'testCompetencyId';
-            const success = sinon.spy();
-            const failure = sinon.spy();
-            const paramObj = {};
-            const eim = {};
-
-            sandbox.stub(EcLevel, 'search').callsFake((repo, query, successCallback, failureCallback, paramObj, eim) => {
-                successCallback([new EcLevel()]);
-            });
-
-            EcLevel.searchByCompetency(repo, competencyId, success, failure, paramObj, eim);
-
-            expect(success.calledOnce).to.be.true;
-            expect(failure.called).to.be.false;
-            done();
-        });
-
-        it('should call failure callback if no competency ID is provided', () => {
-            const repo = {};
-            const competencyId = '';
-            const success = sinon.spy();
-            const failure = sinon.spy();
-            const paramObj = {};
-            const eim = {};
-
-            EcLevel.searchByCompetency(repo, competencyId, success, failure, paramObj, eim);
-
-            expect(failure.calledOnce).to.be.true;
-            expect(success.called).to.be.false;
-        });
-    });
-
-    describe('addRelationship', () => {
-        it('should add a relationship between levels', async () => {
-            const level = new EcLevel();
-            level.id = 'sourceId';
-            const targetLevel = new EcLevel();
-            targetLevel.id = 'targetId';
-            const alignmentType = 'testType';
-            const identity = EcPpk.generateKey();
-            const success = sinon.spy();
-            const failure = sinon.spy();
-            const repo = new EcRepository();
-            await repo.init(process.env.CASS_LOOPBACK || 'http://localhost/api/');
-            const eim = EcIdentityManager.default;
-
-            let a = await level.addRelationship(targetLevel, alignmentType, identity, success, failure, repo, eim);
-
-            expect(a.source).to.equal(level.id);
-            expect(a.target).to.equal(targetLevel.id);
-            expect(a.relationType).to.equal(alignmentType);
-        });
-    });
-
     describe('setName', () => {
         it('should set the name of the level', () => {
             const level = new EcLevel();