@cocreate/api 1.2.30 → 1.2.33

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.2.33](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.32...v1.2.33) (2022-05-06)
+
+
+### Bug Fixes
+
+* update config organization_Id to organization_id ([da12a15](https://github.com/CoCreate-app/CoCreate-api/commit/da12a15f26ec015d1bfdd45ff3ff43cd8433427a))
+
+## [1.2.32](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.31...v1.2.32) (2022-03-06)
+
+
+### Bug Fixes
+
+* use redocument ot get org if org_id is known ([7ef0d5c](https://github.com/CoCreate-app/CoCreate-api/commit/7ef0d5c3dd1ced316c83173bd3e8a0f02e6949b7))
+
+## [1.2.31](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.30...v1.2.31) (2022-02-27)
+
+
+### Bug Fixes
+
+* update param  module to component ([45edeb7](https://github.com/CoCreate-app/CoCreate-api/commit/45edeb7e4701d0510b1875f8a63dd7156338618c))
+
 ## [1.2.30](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.29...v1.2.30) (2022-02-24)
 
 

package/CoCreate.config.js

@@ -1,7 +1,7 @@
 module.exports = {
     "config": {
         "apiKey": "2061acef-0451-4545-f754-60cf8160",
-        "organization_Id": "5ff747727005da1c272740ab",
+        "organization_id": "5ff747727005da1c272740ab",
         "host": "general.cocreate.app"
     },
     

package/demo/index.html

@@ -46,7 +46,7 @@
         <script>
         var config = {
               apiKey: 'c2b08663-06e3-440c-ef6f-13978b42883a',
-                            organization_Id: '5de0387b12e200ea63204d6c'
+                            organization_id: '5de0387b12e200ea63204d6c'
         }
         
         </script>

package/docs/index.html

@@ -102,7 +102,7 @@
 							<pre><code class="language-javascript">
 		var config = {
 	        apiKey: 'c2b08663-06e3-440c-ef6f-13978b42883a',
-	        organization_Id: '5de0387b12e200ea63204d6c',
+	        organization_id: '5de0387b12e200ea63204d6c',
 	        host: 'localhost:8081'
 	    }
 					    </code></pre>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/api",
-  "version": "1.2.30",
+  "version": "1.2.33",
   "description": "A simple api helper component in vanilla javascript used by JavaScript developers to create thirdparty api intergrations. CoCreate-api includes the client component and server side for api processing. Thirdparty apis can be accessible using HTML5 attributes and/or JavaScript API. ",
   "keywords": [
     "thirdparty-api-intergration",

package/src/client.js

@@ -7,24 +7,24 @@ import CoCreateElements from '@cocreate/elements';
 let socketApi = new CoCreateSocket('api');
 
 const CoCreateApi = { 
-	modules: { },
+	components: { },
 	
-	init: function({name, module}) {
-		this.register(name, module);
+	init: function({name, component}) {
+		this.register(name || component.name, component);
 		if (!socketApi.sockets.size)
 			socketApi.create(window.config);
 	},
 	
-	register: function(name, m_instance) {
+	register: function(name, component) {
 		const self = this;
-		if (typeof this.modules[name] === 'undefined') {
-			this.modules[name] = m_instance;
-			
+		if (typeof this.components[name] === 'undefined') {
+			this.components[name] = component;
+
 			socketApi.listen(name, (data) => {
 				self.__response(name, data);
 			});
 			
-			for (const [action, functions] of Object.entries(m_instance['actions'])){
+			for (const [action, functions] of Object.entries(component['actions'])){
 				if (typeof functions.request !== 'function') {
 					functions.request = self.__request;
 				} 
@@ -32,7 +32,7 @@ const CoCreateApi = {
 					name: action,
 					endEvent: action,
 					callback: (element) => {
-						functions.request(m_instance.name, action, element);
+						functions.request(component.name, action, element);
 					},
 				});
 			}
@@ -47,8 +47,8 @@ const CoCreateApi = {
 
 	__response: function(id, data) {
 		const {action, response} = data;
-		const m_instance = this.modules[id];
-		const functions = m_instance.actions[action]
+		const component = this.components[id];
+		const functions = component.actions[action]
 		if (typeof functions.response === 'function') {
 			functions.response(response);
 		}
@@ -138,10 +138,10 @@ const CoCreateApi = {
 		return newObject;
 	},
 	
-	send : function(module, action, data){ 
+	send : function(component, action, data){ 
 		let request_data = this.getCommonParams(data || {});
 		data = {...request_data, action, data};
-		socketApi.send(module, data);
+		socketApi.send(component, data);
 	},
 	
 	render: function(action, data) {
@@ -154,7 +154,7 @@ const CoCreateApi = {
 	getCommonParams: function(info) {
 		return {
 			"apiKey": info.apiKey || config.apiKey,
-			"organization_id": info.organization_id || config.organization_Id,
+			"organization_id": info.organization_id || config.organization_id,
 			"host": info.host || config.host
 		};
 	}

package/src/server.js

@@ -10,15 +10,15 @@ var api = ( ()=> {
 	    wsManager.send(socket, send_response, obj)
 	},
 	  
-	handleError: (wsManager, socket, action, error, module_id) => {
+	handleError: (wsManager, socket, action, error, component) => {
 		const response = {
 			'object': 'error',
 			'data':error || error.response || error.response.data || error.response.body || error.message || error,
 		};
-		wsManager.send(socket, module_id, { action, response })
+		wsManager.send(socket, component, { action, response })
 	},
 
-	getOrg: async (config, module) => {
+	getOrg: async (config, component) => {
 
 		socket.create({
 			namespace: config["organization_id"],
@@ -36,7 +36,7 @@ var api = ( ()=> {
 	    try{
 			org = org["data"];
 		}catch(e){
-			console.log(module," Error GET ORG  in : ",e);
+			console.log(component," Error GET ORG  in : ",e);
 			return false;
 		}
 		return org;
@@ -46,14 +46,14 @@ var api = ( ()=> {
  		var socket_config = {
   		    "config": {
   		        "apiKey": config["config"]["apiKey"],
-  		        "organization_Id": config["config"]["organization_id"],
+  		        "organization_id": config["config"]["organization_id"],
   		    },
   		    "prefix": "ws",
   		    "host": "server.cocreate.app:8088"
   		};
   		
 		socket.create({
-			namespace: socket_config.config.organization_Id,
+			namespace: socket_config.config.organization_id,
 			room: null,
 			host: socket_config.host
 		})
@@ -80,7 +80,7 @@ var api = ( ()=> {
 		var socket_config = {
 			"config": {
 				"apiKey": org["apiKey"],
-				"organization_Id": org["_id"].toString(),
+				"organization_id": org["_id"].toString(),
 			},
 			"prefix": "ws",
 			"host": "server.cocreate.app:8088"
@@ -88,27 +88,16 @@ var api = ( ()=> {
 
 		//other connection
 		socket.create({
-		  	namespace: socket_config.config.organization_Id,
+		  	namespace: socket_config.config.organization_id,
 			room: null,
 			host: socket_config.host
 		})
 
-	    // socket.setGlobalScope(socket_config.config.organization_id)
-		let myOrg = await crud.readDocumentList({
+		let myOrg = await crud.readDocument({
 			collection: "organizations",
-			operator: {
-				filters: [{
-					name: '_id',
-					operator: "$eq",
-					value: [org["_id"].toString()]
-				}],
-				orders: [],
-				startIndex: 0,
-				search: { type: 'or', value: []}
-			},
-	         is_collection: false,
-	         apiKey: org["apiKey"],
-		     organization_id: org["_id"]
+			document_id: org["_id"],
+			apiKey: org["apiKey"],
+			organization_id: org["_id"]
 		});
 	    let result = {'row':myOrg,'socket_config':socket_config};
 	    return result;