@journeyapps-solutions/cc-util-sync-collective 1.0.7 → 2.0.0

package/README.md

@@ -53,11 +53,22 @@ Open the Data Model view of the **Master** Journey App and add the following xml
 2. Create an config file with the credentials required.
 ```js
 module.exports = {
-    "collective": "testing",
-    "url": "https://run-testing-us.journeyapps.com/api/v4/577ec96be1a2ef691feaf19a",
-    "api_user": "<api_user>",
-    "api_pass": "<api_pass>",
-    "endpoint_api_user": "<endpoint_api_user>"
+    "collective": "aviat",
+    "credentials" : {
+      local: {
+        "url" : "<url>",
+        "api_user": "<api_user>",
+        "api_pass": "<api_pass>",
+      },
+      remote: {
+        "url" : "<url>",
+        "api_user": "<api_user>",
+        "api_pass": "<api_pass>",
+      }
+    },
+    "endpoint" : {
+      "api_user": "<api_user>",
+    }
 }
 ```
 
@@ -66,13 +77,19 @@ Review the following fields and change as described:
 1. **collective**: The name that you have given the organization, only use alpha characters. The naming convention of a collective is built from the app url as follows, https://build.journeyapps.com/kaufmann/accrete-solutions-grupo-kaufmann-service-advisor
 In the above example the collective will be called "kaufmann". In the case where the url might contain "-" as follow, "kauf-mann", then remove the "-" and the collective name becomes "kaufmann".
 
-2. **endpoint_api_user** : This must match Options.username
+2. **endpoint.api_user** : This must match Options.username
 
 The following fields point to the Data Broker and correspond to the Testing Environment for the Data Broker and will not need changing.
 
-3. **url**: The url to the Data Broker
-4. **api_user**: The api_user of the Data Broker
-5. **api_pass**: The api_pass of the Data Broker
+Local:
+1. **url**: The url to the Instance DB
+2. **api_user**: The api_user to the Instance DB
+3. **api_pass**: The api_pass to the Instance DB
+
+Remote:
+1. **url**: The url to the Data Broker
+2. **api_user**: The api_user of the Data Broker
+3. **api_pass**: The api_pass of the Data Broker
 
 Ensure that you have checked "JourneyApps Webhooks" and named the task sync_collective.
 
@@ -172,11 +189,22 @@ https://us-be-js.journeyapps.com/admin/testing_usa/577eccd7ecc8cf1d48849d9c/577e
 2. Copy and paste from below section to your json config in the cloudcode that you are creating.
 ```js
 module.exports = {
-    "collective": "testing",
-    "url": "https://run-testing-us.journeyapps.com/api/v4/577ec96be1a2ef691feaf19a",
-    "api_user": "<api_user>",
-    "api_pass": "<api_pass>",
-    "endpoint_api_user": "<endpoint_api_user>"
+    "collective": "aviat",
+    "credentials" : {
+      local: {
+        "url" : "<url>",
+        "api_user": "<api_user>",
+        "api_pass": "<api_pass>",
+      },
+      remote: {
+        "url" : "<url>",
+        "api_user": "<api_user>",
+        "api_pass": "<api_pass>",
+      }
+    },
+    "endpoint" : {
+      "api_user": "<api_user>",
+    }
 }
 ```
 
@@ -191,9 +219,15 @@ Review the following fields and change as described:
 
 The following fields point to the Data Broker and correspond to the Testing Environment for the Data Broker and will not need changing.
 
-3. **url**: The url to the Data Broker
-4. **api_user**: The api_user of the Data Broker
-5. **api_pass**: The api_pass of the Data Broker
+Local:
+1. **url**: The url to the Instance DB
+2. **api_user**: The api_user to the Instance DB
+3. **api_pass**: The api_pass to the Instance DB
+
+Remote:
+1. **url**: The url to the Data Broker
+2. **api_user**: The api_user of the Data Broker
+3. **api_pass**: The api_pass of the Data Broker
 
 Ensure that you have checked "Webhook triggering" and named the Cloud Code Task sync_collective before saving.
 
@@ -454,10 +488,8 @@ export async function run() {
   const SyncCollective = new SyncCollective({/*..Options..*/});
 
   let _object = webhook.object;
-  let _operation = webhook.operation;
 
   SyncCollective.syncToMaster({
-  	operation : SyncCollective.operation[_operation],
   	objectToSync : _object
   });
 

package/lib/index.js

@@ -56,8 +56,6 @@ class SyncCollective {
 			assert(options.credentials.remote.url, `${NAME} -  options.credentials.remote.url 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;
@@ -155,9 +153,10 @@ class SyncCollective {
 			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(_data, _this2.config.collective);
-			_body[_tableName].api_user = _this2.config.endpoint.api_user;
+
+			//We need to set the api_user to local, he is the origin user. 
+			_body[_tableName].api_user = _this2.config.credentials.local.api_user;
 
 			console.log(`${NAME} - Syncing Object [id:${_data.id}]`);
 			console.log(`${NAME} - URL    - ` + _url);
@@ -250,7 +249,8 @@ class SyncCollective {
 					throw _response;
 				}
 
-				return _response;
+				let _json = yield _response.json();
+				return _json;
 			} catch (error) {
 				console.error(`${NAME} - ${error}`);
 				throw error;

package/package.json

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