@journeyapps-solutions/cc-util-sync-collective 1.0.1 → 1.0.2

package/lib/index.js

@@ -30,14 +30,22 @@ class SyncCollective {
   */
 	constructor(options) {
 
-		//
 		if (typeof options === 'object') {
-			assert(options, `${NAME} - options not provided`);
 			assert(options.collective, `${NAME} -  options.collective not provided.`);
 			assert(options.url, `${NAME} -  options.url not provided.`);
-			assert(options.api_user, `${NAME} -  options.api_user not provided.`);
-			assert(options.api_pass, `${NAME} -  options.api_pass not provided.`);
-			assert(options.endpoint_api_user, `${NAME} -  options.endpoint_api_user not provided.`);
+
+			//Local variables used in getting the record via fetch
+			assert(options.credentials, `${NAME} -  options.credentials not provided.`);
+			assert(options.credentials.local, `${NAME} -  options.credentials.local not provided.`);
+			assert(options.credentials.local.api_user, `${NAME} -  options.credentials.local.api_user not provided.`);
+			assert(options.credentials.local.api_pass, `${NAME} -  options.credentials.local.api_pass not provided.`);
+
+			//Remove Variables for sending the update
+			assert(options.credentials.remote, `${NAME} -  options.credentials.remote not provided.`);
+			assert(options.credentials.remote.api_user, `${NAME} -  options.credentials.remote.api_user not provided.`);
+			assert(options.credentials.remote.api_pass, `${NAME} -  options.credentials.remote.api_pass not provided.`);
+
+			assert(options.endpoint.api_user, `${NAME} -  options.endpoint.api_user not provided.`);
 		}
 
 		this.config = options;
@@ -87,7 +95,6 @@ class SyncCollective {
 			_object.synced = true;
 
 			let _collective = yield options.endpoint.collective();
-			console.log("Collective", _collective);
 
 			let _url = SyncUtilMaster.buildUrl(_object, options.endpoint.url, _collective.name);
 			let _header = SyncUtilMaster.buildHeader(options.endpoint.api_user, options.endpoint.api_pass);
@@ -95,7 +102,6 @@ class SyncCollective {
 
 			console.log(`${NAME} - Syncing Object [id:${options.objectToSync.id}]`);
 			console.log(`${NAME} - URL    - ` + _url);
-			console.log(`${NAME} - HEADER - ` + JSON.stringify(_header));
 			console.log(`${NAME} - METHOD - ` + options.operation);
 			console.log(`${NAME} - BODY   - ` + JSON.stringify(_body));
 
@@ -131,17 +137,20 @@ class SyncCollective {
 			assert(typeof options === 'object', `${NAME} - options not provided`);
 			assert(options.objectToSync, `${NAME} -  options.objectToSync not provided.`);
 
-			let _url = SyncUtilSlave.buildUrl(options.objectToSync, _this2.config.url, _this2.config.collective);
-			let _header = SyncUtilSlave.buildHeader(_this2.config.api_user, _this2.config.api_pass);
-			let _body = SyncUtilSlave.buildJsonBody(options.objectToSync, _this2.config.collective);
+			//We do a fetch due to have enumerable ID's
+			let _fetchUrl = SyncUtilSlave.buildFetchUrl(_data, _this2.config.url, options.objectToSync.type.name);
+			let _data = yield _this2._fetchRecord(_fetchUrl);
+
+			let _url = SyncUtilSlave.buildUrl(_data, _this2.config.url, _this2.config.collective);
+			let _header = SyncUtilSlave.buildHeader(_this2.config.credentials.remote.api_user, _this2.config.credentials.remote.api_pass);
+			let _body = SyncUtilSlave.buildJsonBody(_data, _this2.config.collective);
 
 			//We need to set the api_user
-			let _tableName = SyncUtilSlave.buildTableName(options.objectToSync, _this2.config.collective);
-			_body[_tableName].api_user = _this2.config.endpoint_api_user;
+			let _tableName = SyncUtilSlave.buildTableName(_data, _this2.config.collective);
+			_body[_tableName].api_user = _this2.config.endpoint.api_user;
 
-			console.log(`${NAME} - Syncing Object [id:${options.objectToSync.id}]`);
+			console.log(`${NAME} - Syncing Object [id:${_data.id}]`);
 			console.log(`${NAME} - URL    - ` + _url);
-			console.log(`${NAME} - HEADER - ` + JSON.stringify(_header));
 			console.log(`${NAME} - BODY   - ` + JSON.stringify(_body));
 
 			let _response = yield _this2._sync(_url, _this2.operations.create, _header, _body);
@@ -188,7 +197,45 @@ class SyncCollective {
 
 				//Check the response, and throw the appriopate error if required.
 				if (_response.status === 401 || _response.status == 403) {
-					throw new Error("User not authenticated");
+					throw new Error("Remote User not authenticated");
+				} else if (!_response.ok) {
+					throw _response;
+				}
+
+				return _response;
+			} catch (error) {
+				console.error(`${NAME} - ${error}`);
+				throw error;
+			}
+		})();
+	}
+
+	/**
+  * Fetch the local object to use for sending.
+  * Currently there is a an shotcomming on CC DB Module which stop us from enumerating through the ID's. Thus we need to do a normal JSON fetch.
+  *
+  * @param  {[type]}  data Object used
+  */
+	_fetchRecord(url) {
+		var _this4 = this;
+
+		return _asyncToGenerator(function* () {
+			try {
+
+				let _header = SyncUtilSlave.buildHeader(_this4.config.credentials.local.api_user, _this4.config.credentials.local.api_pass);
+
+				console.log(`GET ${url}`);
+
+				let _response = yield fetch(`${url}`, {
+					headers: header,
+					method: "GET"
+				});
+
+				console.log(`${NAME} - RESPONSE [ok=${_response.ok};status=${_response.status}]`);
+
+				//Check the response, and throw the appriopate error if required.
+				if (_response.status === 401 || _response.status == 403) {
+					throw new Error("Local User not authenticated");
 				} else if (!_response.ok) {
 					throw _response;
 				}

package/lib/sync-util.js

@@ -7,14 +7,20 @@ class SyncUtil {
 	/**
   * Build the url of the endpoint
   *
-  * @param object The Object that should be synced
-  * @param endpoint The Endpoint that the data is being synced to
   * @return String of the url for the endpoint
   */
 	buildUrl(object, url, collective) {
 		return `${url}/objects/` + this.buildTableName(object, collective) + `/${object.id}.json`;
 	}
 
+	/**
+  * Builds a fetch URL based on the model
+  * @return String of the url for the endpoint
+  */
+	buildFetchUrl(object, url, model) {
+		return `${url}/objects/${model}/${object.id}.json`;
+	}
+
 	/**
   * Build the object to be sent to the endpoint in the correct format for
   * the JSON to appear correct according to the V4 API
@@ -80,7 +86,8 @@ class SyncUtil {
   */
 	buildHeader(api_user, api_pass) {
 		let _header = {};
-		_header['Authorization'] = 'Basic ' + base64.encode(api_user + ":" + api_pass), _header['Content-Type'] = 'application/json';
+		_header['Authorization'] = 'Basic ' + base64.encode(api_user + ":" + api_pass);
+		_header['Content-Type'] = 'application/json';
 		return _header;
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@journeyapps-solutions/cc-util-sync-collective",
-	"version": "1.0.1",
+	"version": "1.0.2",
 	"description": "Sync Data between projects. Either Directly, or via Slave & Master Configuration",
 	"main": "./index.js",
 	"scripts": {