@cocreate/api 1.2.29 → 1.2.32

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [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)
+
+
+### Bug Fixes
+
+* CoCreate.config replace CoCreate.app with * ([62ecf98](https://github.com/CoCreate-app/CoCreate-api/commit/62ecf980e1e0efdc237d0015fd041ebaceb954eb))
+* removed name param from getOrg crud function ([4d868b5](https://github.com/CoCreate-app/CoCreate-api/commit/4d868b58982d4fb635f6d040073fad23dc225533))
+* update param type to action ([3ee6cd7](https://github.com/CoCreate-app/CoCreate-api/commit/3ee6cd7c6f2f67b0d26c49c0b202554e828633b4))
+
 ## [1.2.29](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.28...v1.2.29) (2022-02-16)
 
 

package/CoCreate.config.js

@@ -14,7 +14,7 @@ module.exports = {
                 "name": "index.html",
                 "path": "/docs/api/index.html",
                 "domains": [
-                    "cocreate.app",
+                    "*",
                     "general.cocreate.app"
                 ],
                 "directory": "/docs/api",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/api",
-  "version": "1.2.29",
+  "version": "1.2.32",
   "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);
 					},
 				});
 			}
@@ -46,16 +46,16 @@ const CoCreateApi = {
 	},
 
 	__response: function(id, data) {
-		const {type, response} = data;
-		const m_instance = this.modules[id];
-		const functions = m_instance.actions[type]
+		const {action, response} = data;
+		const component = this.components[id];
+		const functions = component.actions[action]
 		if (typeof functions.response === 'function') {
 			functions.response(response);
 		}
 		else
-			this.render(type, response);
+			this.render(action, response);
 		
-		document.dispatchEvent(new CustomEvent(type, {
+		document.dispatchEvent(new CustomEvent(action, {
 			detail: {
 				data: response
 			}
@@ -138,11 +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, type: action, data};
-		socketApi.send(module, data);
-		console.log('data', data)
+		data = {...request_data, action, data};
+		socketApi.send(component, data);
 	},
 	
 	render: function(action, data) {

package/src/server.js

@@ -7,19 +7,18 @@ crud.setSocket(socket);
 var api = ( ()=> {
   return {
   	send_response: (wsManager, socket, obj, send_response) => {
-    	console.log(send_response, " Response Sent")
 	    wsManager.send(socket, send_response, obj)
 	},
 	  
-	handleError: (wsManager, socket, type, 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, { type, response })
+		wsManager.send(socket, component, { action, response })
 	},
 
-	getOrg: async (config, module) =>{
+	getOrg: async (config, component) => {
 
 		socket.create({
 			namespace: config["organization_id"],
@@ -29,7 +28,6 @@ var api = ( ()=> {
 
 		let org = await crud.readDocument({
 	        collection: "organizations",
-	        name:"name",
 	        document_id: config["organization_id"],
 	        apiKey: config["apiKey"],
 		    organization_id: config["organization_id"]
@@ -38,13 +36,13 @@ 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;
 	},
 
-	getOrgInRoutesbyHostname : async (config, hostname) =>{
+	getOrgInRoutesbyHostname : async (config, hostname) => {
  		var socket_config = {
   		    "config": {
   		        "apiKey": config["config"]["apiKey"],
@@ -75,7 +73,7 @@ var api = ( ()=> {
 		});
 
 		//let data2 = await crud.listenAsync(eventGetOrg);
-		console.log("data2 ===",data2)
+		// console.log("data2 ===", data2)
 	
 		var org = data2["data"][0]
 
@@ -95,22 +93,11 @@ var api = ( ()=> {
 			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;