@onehat/data 1.19.21 → 1.19.24

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/data",
-	"version": "1.19.21",
+	"version": "1.19.24",
 	"description": "JS data modeling package with adapters for many storage mediums.",
 	"main": "src/index.js",
 	"type": "module",

package/src/Integration/Browser/Repository/SecureLocalStorage.js

@@ -1,6 +1,7 @@
 /** @module Repository */
 
 import LocalStorageRepository from '@onehat/data/src/Integration/Browser/Repository/LocalStorage';
+import CryptoJS from 'crypto-js';
 import AES from 'crypto-js/aes';
 import _ from 'lodash';
 
@@ -31,7 +32,7 @@ class SecureLocalStorageRepository extends LocalStorageRepository {
 			// BEGIN MOD
 			let result = this._store(name);
 			if (!_.isEmpty(result)) {
-				result = AES.decrypt(result, this.passphrase);
+				result = AES.decrypt(result, this.passphrase).toString(CryptoJS.enc.Utf8);
 			}
 			// END MOD
 			
@@ -66,7 +67,7 @@ class SecureLocalStorageRepository extends LocalStorageRepository {
 				value = JSON.stringify(value);
 			}
 
-			value = AES.encrypt(value, this.passphrase); // MOD
+			value = AES.encrypt(value, this.passphrase).toString(); // MOD
 
 			return this._store(name, value);
 

package/src/Integration/Browser/Repository/SecureSessionStorage.js

@@ -1,6 +1,7 @@
 /** @module Repository */
 
 import SessionStorageRepository from '@onehat/data/src/Integration/Browser/Repository/SessionStorage';
+import CryptoJS from 'crypto-js';
 import AES from 'crypto-js/aes';
 import _ from 'lodash';
 
@@ -26,7 +27,7 @@ class SecureSessionStorageRepository extends SessionStorageRepository {
 		// BEGIN MOD
 		let result = this._store.session(name);
 		if (!_.isEmpty(result)) {
-			result = AES.decrypt(result, this.passphrase);
+			result = AES.decrypt(result, this.passphrase).toString(CryptoJS.enc.Utf8);
 		}
 		// END MOD
 
@@ -45,7 +46,7 @@ class SecureSessionStorageRepository extends SessionStorageRepository {
 			value = JSON.stringify(value);
 		}
 
-		value = AES.encrypt(value, this.passphrase); // MOD
+		value = AES.encrypt(value, this.passphrase).toString(); // MOD
 		
 		return this._store.session(name, value);
 	}

package/src/Repository/LocalFromRemote/LocalFromRemote.js

@@ -277,20 +277,24 @@ class LocalFromRemoteRepository extends EventEmitter {
 		// NORMAL PROCESS, basically call super()
 		// This adds to the local repository, so we can sync later,
 		// if needed.
-		const normalAdd = this._getActiveRepository().add(data);
+		const normalAdd = await this._getActiveRepository().add(data);
 		if (this.mode !== MODE_COMMAND_QUEUE || !this.isOnline) {
 			return normalAdd;
 		}
 		
 		// MODE_COMMAND_QUEUE -- try to sync now!
-		const entity = await normalAdd;
-		return await this.sync(entity);
+		return await this.sync(normalAdd);
 	}
 
 	/**
 	 * Syncs local and remote repositories, based on operation mode.
 	 */
 	sync = async (entity, callback = null) => {
+
+		if (this.debugMode) {
+			console.log('sync');
+		}
+
 		try {
 			if (!this.isOnline) {
 				this._doAutoSync(true);

package/src/Repository/OneBuild.js

@@ -317,6 +317,10 @@ class OneBuildRepository extends AjaxRepository {
 			return;
 		}
 
+		if (!id) {
+			return null;
+		}
+
 		const idPropertyName = this.getSchema().model.idProperty;
 		const params = {};
 		params['conditions[' + idPropertyName + ']'] = id;
@@ -324,7 +328,7 @@ class OneBuildRepository extends AjaxRepository {
 		const data = _.merge(params, this._baseParams);
 
 		if (this.debugMode) {
-			console.log('Sending ' + url, options);
+			console.log('getSingleEntityFromServer', data);
 		}
 
 		return this._send(this.methods.get, this.api.get, data)
@@ -347,7 +351,7 @@ class OneBuildRepository extends AjaxRepository {
 						} = this._processServerResponse(result);
 
 						if (!root[0]) {
-							throw Error('Record does not exist!')
+							return null;
 						}
 
 						return this.createStandaloneEntity(root[0]);