@cocreate/api 1.2.26 → 1.2.27

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.2.27](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.26...v1.2.27) (2022-02-11)
+
+
+### Bug Fixes
+
+* define host will be used when creating socket ([e7c4a88](https://github.com/CoCreate-app/CoCreate-api/commit/e7c4a8846b1131c98150f923e76ab42ec8bfe821))
+
 ## [1.2.26](https://github.com/CoCreate-app/CoCreate-api/compare/v1.2.25...v1.2.26) (2022-02-10)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/api",
-  "version": "1.2.26",
+  "version": "1.2.27",
   "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

@@ -165,6 +165,7 @@ const CoCreateApi = {
 		return {
 			"apiKey":           info.apiKey || config.apiKey,
 			"organization_id":  info.organization_id || config.organization_Id,
+			"host":  info.host || config.host
 		};
 	}
 };

package/src/server.js

@@ -1,54 +1,49 @@
 const crud = require('@cocreate/crud-client')
-const CoCreateSocketClient = require('@cocreate/socket-client')
-let socket = new CoCreateSocketClient("ws");
+const socketClient = require('@cocreate/socket-client')
+let socket = new socketClient("ws");
 
 crud.setSocket(socket);
 
 var api = ( ()=> {
   return {
-  	send_response : (wsManager,socket,obj,send_response) => {
-    	console.log("Response   TO-> "+send_response)
+  	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)=>{
-	      const response = {
-	        'object': 'error',
-	        'data':error || error.response || error.response.data || error.response.body || error.message || error,
-	      };
-	      wsManager.send(socket, module_id, { type, response })
-	      //send_response(wsManager, socket, { type, response }, module_id);
+	 handleError: (wsManager,socket, type, error,module_id)=>{
+		const response = {
+			'object': 'error',
+			'data':error || error.response || error.response.data || error.response.body || error.message || error,
+		};
+		wsManager.send(socket, module_id, { type, response })
 	},
-	getOrg : async (config, module) =>{
-	 	console.log("config WS utils==== ",config)
+
+	getOrg: async (config, module) =>{
 
 		socket.create({
 			namespace: config["organization_id"],
 			room: null,
-			host: "server.cocreate.app:8088"
+			host: config["host"]
 		})
-	    const event = "getOrg";
-	    
-	    
-	    console.log("Org_id => ",config["organization_id"])
-	    
-	    let org_row = await crud.readDocument({
+
+		let org = await crud.readDocument({
 	        collection: "organizations",
 	        name:"name",
 	        document_id: config["organization_id"],
-	        event,
 	        apiKey: config["apiKey"],
-		    organization_id: '5de0387b12e200ea63204d6c'
+		    organization_id: config["organization_id"]
 	    });
 
 	    try{
-			org_row = org_row["data"];
-		  }catch(e){
-			  console.log(module," Error GET ORG  in : ",e);
+			org = org["data"];
+		}catch(e){
+			console.log(module," Error GET ORG  in : ",e);
 			return false;
-		  }
-		 return org_row;
+		}
+		return org;
 	},
+
 	getOrgInRoutesbyHostname : async (config, hostname) =>{
  		var socket_config = {
   		    "config": {
@@ -59,29 +54,25 @@ var api = ( ()=> {
   		    "host": "server.cocreate.app:8088"
   		};
   		
-	  		socket.create({
-				namespace: socket_config.config.organization_Id,
-				room: null,
-				host: socket_config.host
-			})
+		socket.create({
+			namespace: socket_config.config.organization_Id,
+			room: null,
+			host: socket_config.host
+		})
 	
-
-	  		 let data2 = await crud.readDocumentList({
-		        collection: "organizations",
-		        operator: {
-		  				filters: [{
-		  					name: 'domains',
-		  					operator: "$in",
-		  					value: [hostname]
-		  				}],
-		  				// orders: [],
-		  				// startIndex: 0,
-		  				// search: { type: 'or', value: []}
-		        },
-		        is_collection: false,
-		        apiKey: config["config"]["apiKey"],
-			    organization_id: config["config"]["organization_id"]
-		    });
+		let data2 = await crud.readDocumentList({
+			collection: "organizations",
+			operator: {
+				filters: [{
+					name: 'domains',
+					operator: "$in",
+					value: [hostname]
+				}],
+			},
+			is_collection: false,
+			apiKey: config["config"]["apiKey"],
+			organization_id: config["config"]["organization_id"]
+		});
 
 	     //let data2 = await crud.listenAsync(eventGetOrg);
 	     console.log("data2 ===",data2)
@@ -91,7 +82,6 @@ var api = ( ()=> {
 		 var socket_config = {
 			    "config": {
 			        "apiKey": org["apiKey"],
-			        // "securityKey": org["securityKey"],
 			        "organization_Id": org["_id"].toString(),
 			    },
 			    "prefix": "ws",
@@ -99,23 +89,24 @@ 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({
-		      collection: "organizations",
-		      operator: {
-					filters: [{
-						name: '_id',
-						operator: "$eq",
-						value: [org["_id"].toString()]
-					}],
-					orders: [],
-	  				startIndex: 0,
-	  				search: { type: 'or', value: []}
-		      },
+		let myOrg = await crud.readDocumentList({
+			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"]
@@ -124,7 +115,7 @@ var api = ( ()=> {
 	    return result;
 	 }  
 	
-  } // 
+  }
 })();
 
 module.exports = api;