@cocreate/crud-server 1.2.10 → 1.3.2

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## [1.3.2](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.3.1...v1.3.2) (2022-03-04)
+
+
+### Bug Fixes
+
+* add self.wsManager ([537375e](https://github.com/CoCreate-app/CoCreate-crud-server/commit/537375ec182242ff012f0ed11a6d3fe5f905ff26))
+
+## [1.3.1](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.3.0...v1.3.1) (2022-03-04)
+
+
+### Bug Fixes
+
+* bump version ([3b7adce](https://github.com/CoCreate-app/CoCreate-crud-server/commit/3b7adcef74cf426dc34d723478c44360a6f28219))
+
+# [1.3.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.2.10...v1.3.0) (2022-03-03)
+
+
+### Bug Fixes
+
+* moved files to there relative components ([a2b2f8c](https://github.com/CoCreate-app/CoCreate-crud-server/commit/a2b2f8c52a923cb4fad86331ff7121b19db3d527))
+* remove securityCheck function, it has be replaced by permissions ([818b8d2](https://github.com/CoCreate-app/CoCreate-crud-server/commit/818b8d2e8631027242930633090510b579ecc914))
+
+
+### Features
+
+* deleteIndustry function ([ee85ff2](https://github.com/CoCreate-app/CoCreate-crud-server/commit/ee85ff2c09781159c4aa4950f209d785c32fcbab))
+
 ## [1.2.10](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.2.9...v1.2.10) (2022-02-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/crud-server",
-  "version": "1.2.10",
+  "version": "1.3.2",
   "description": "CoCreate-crud-server",
   "keywords": [
     "cocreate-crud",
@@ -43,7 +43,7 @@
     "@cocreate/docs": "^1.2.70",
     "csvtojson": "^2.0.10",
     "json-2-csv": "^3.10.3",
-    "mongodb": "^4.1.4"
+    "mongodb": "^4.4.0"
   },
   "devDependencies": {
     "express": "^4.17.1"

package/src/backup.js

@@ -1,17 +1,14 @@
-
-const CoCreateBase = require("./base");
-
 const json2csv = require("json-2-csv")
 const csvtojson = require("csvtojson");
 
-class CoCreateBackup extends CoCreateBase {
-	constructor(wsManager, db) {
-		super(wsManager, db);
-		this.init();
-		
+class CoCreateBackup {
+	constructor(wsManager, dbClient) {
+		this.wsManager = wsManager
+		this.dbClient = dbClient
 		this.importCollection = '';
 		this.importType = '';
 		this.importDB = '';
+		this.init();
 	}
 	
 	init() {
@@ -64,24 +61,16 @@ class CoCreateBackup extends CoCreateBase {
 	})
 	**/
 	// async exportData(socket, data, roomInfo) {
-	// 	const securityRes = await this.checkSecurity(data);
-	// 	if (!securityRes.result) {
-	// 		this.wsManager.send(socket, 'securityError', 'error');
-	// 		return;   
-	// 	}
 	// 	const self = this;
 		
 	// 	const export_type = data.export_type || "json";
 
 	// 	try {
 			
-	// 		var collection = this.getDb(data['namespace']).collection(data["collection"]);
+	// 		var collection = this.dbClient.db(data['namespace']).collection(data["collection"]);
 	// 		const orgId = roomInfo ? roomInfo.orgId : "";
 			
 	// 		var query = {};
-	// 		if (securityRes['organization_id']) {
-	// 			query['organization_id'] = securityRes['organization_id'];
-	// 		}
 			
 	// 		collection.find(query).toArray(async function(error, result) {
 	// 			if (!error) {
@@ -104,24 +93,12 @@ class CoCreateBackup extends CoCreateBase {
 	// }
 	
 	// async setImportData(socket, data, roomInfo) {
-	// 	const securityRes = await this.checkSecurity(data);
-	// 	const orgId = roomInfo ? roomInfo.orgId : "";
-	// 	if (!securityRes.result) {
-	// 		this.wsManager.send(socket, 'securityError', 'error', orgId);
-	// 		return;   
-	// 	}
 	// 	this.importCollection = data['collection']
 	// 	this.importType = data['import_type'];
 	// 	this.importDB = data['namespace'];
 	// }
 
 	// async importData(socket, data, roomInfo) {
-	// 	const securityRes = await this.checkSecurity(data);
-	// 	const orgId = roomInfo ? roomInfo.orgId : "";
-	// 	if (!securityRes.result) {
-	// 		this.wsManager.send(socket, 'securityError', 'error', orgId);
-	// 		return;   
-	// 	}
 	// 	const importCollection = data['collection']
 	// 	const importType = data['import_type'];
 	// 	const importFile = data['file'];
@@ -146,7 +123,7 @@ class CoCreateBackup extends CoCreateBase {
 	// 		// todo: validate json / if json is object error happens
 	// 		jsonData.map((item) => delete item._id);
 	// 		console.log('json: ', jsonData)
-	// 		var collection = this.getDb(orgId).collection(importCollection);
+	// 		var collection = this.dbClient.db(orgId).collection(importCollection);
 	// 		// console.log(this.importCollection)
 	// 		collection.insertMany(jsonData, function(err, result) {
 	// 			if (!err) {

package/src/crud.js

@@ -1,66 +1,32 @@
+const {ObjectID} = require("mongodb");
+const {encodeObject, replaceArray} = require("./utils.crud.js")
 
-const {ObjectID, Binary} = require("mongodb");
-const CoCreateBase = require("./base");
-const {encodeObject, decodeObject, replaceArray} = require("./utils.crud.js")
 
-
-class CoCreateCrud extends CoCreateBase {
-	constructor(wsManager, db) {
-		super(wsManager, db);
+class CoCreateCrud {
+	constructor(wsManager, dbClient) {
+		this.wsManager = wsManager
+		this.dbClient = dbClient
 		this.init();
 	}
 	
 	init() {
 		if (this.wsManager) {
-			this.wsManager.on('createDocument', 	(socket, data, roomInfo) => this.createDocument(socket, data, roomInfo));
-			this.wsManager.on('readDocument',		(socket, data, roomInfo) => this.readDocument(socket, data, roomInfo))
-			this.wsManager.on('updateDocument', 	(socket, data, roomInfo) => this.updateDocument(socket, data, roomInfo))
-			this.wsManager.on('deleteDocument', 	(socket, data, roomInfo) => this.deleteDocument(socket, data, roomInfo))
+			this.wsManager.on('createDocument', (socket, data, roomInfo) => this.createDocument(socket, data, roomInfo));
+			this.wsManager.on('readDocument',	(socket, data, roomInfo) => this.readDocument(socket, data, roomInfo))
+			this.wsManager.on('updateDocument', (socket, data, roomInfo) => this.updateDocument(socket, data, roomInfo))
+			this.wsManager.on('deleteDocument', (socket, data, roomInfo) => this.deleteDocument(socket, data, roomInfo))
 		}
 	}
 
-/** Create Document **/ 
-	/*
-	that.wsManager.onMessage(socket, "createDocument", data, roomInfo)
-	
-	that.wsManager.onMessage(socket, "readDocument", data, roomInfo)
-	
-	that.wsManager.onMessage(socket, "updateDocument", data, roomInfo)
-		Example:
-		that.wsManager.onMessage(socket, "updateDocument", {
-			namespace: '',
-			room: '',
-			broadcast: true/false,
-			broadcast_sender: true/false,
-			
-			collection: "test123",
-			document_id: "document_id",
-			data:{
-			
-				name1:“hello”,
-				name2: “hello1”
-			},
-			delete_fields:["name3", "name4"],
-			element: “xxxx”,
-			metaData: "xxxx"
-			}, roomInfo)
-			
-	that.wsManager.onMessage(socket, "deleteDocument", data, roomInfo)
-	*/
-
 	/** Create Document **/
-	// data param needs organization_id field added to pass security check
 	async createDocument(socket, req_data, roomInfo){
-		
 		const self = this;
 		if(!req_data.data) return;
 		
 		try{
-			const collection = this.db.collection(req_data['collection']);
+			const db = this.dbClient.db(req_data['organization_id']);
+			const collection = db.collection(req_data["collection"]);
 			let insertData = replaceArray(req_data.data);
-			// if (!insertData.organization_id) {
-			// 	insertData.organization_id = req_data.organization_id;
-			// }
 
 			collection.insertOne(insertData, function(error, result) {
 				if(!error && result){
@@ -68,34 +34,14 @@ class CoCreateCrud extends CoCreateBase {
 					// let isFlat = req_data.isFlat == false ? false : true;
 					// const response_data = isFlat ? encodeObject(response) : response;
 					const response_data = response;
-					// console.log('createDocument response:', response)
-	
-					
-					if (req_data.broadcast_sender != false) {
-						self.wsManager.send(socket, 'createDocument', response, req_data['organization_id'], roomInfo);
-						// console.log('broadcast1' , response)
-					}
-
-					if (req_data.broadcast != false) {
-						if (req_data.room) {
-							self.wsManager.broadcast(socket, req_data.namespace || req_data['organization_id'] , req_data.room, 'createDocument', response_data, true, roomInfo);
-						// console.log('broadcast2' ,response)
-							
-						} else {
-							self.wsManager.broadcast(socket, req_data.namespace || req_data['organization_id'], null, 'createDocument', response_data, true, roomInfo)	
-							// console.log('broadcast3' ,response)
-						}
-					}
-					
-					self.processCRUDEvent('createDocument', response);
-					
+					self.broadcast('createDocument', socket, req_data, reponse, roomInfo)	
 				} else {
 					self.wsManager.send(socket, 'ServerError', error, null, roomInfo);
 				}
 			});
 		}catch(error){
 			console.log('createDocument error', error);
-			this.wsManager.send(socket, 'ServerError', 'error', null, roomInfo);
+			self.wsManager.send(socket, 'ServerError', 'error', null, roomInfo);
 		}
 	}
 	
@@ -108,8 +54,8 @@ class CoCreateCrud extends CoCreateBase {
 		const self = this;
 
 		try {
-			
-			const collection = this.db.collection(req_data["collection"]);
+			const db = this.dbClient.db(req_data['organization_id']);
+			const collection = db.collection(req_data["collection"]);
 			
 			const query = {
 				"_id": new ObjectID(req_data["document_id"])
@@ -127,7 +73,6 @@ class CoCreateCrud extends CoCreateBase {
 						})
 					}
 					
-					
 					if (req_data.data) {
 						let resp = {};
 						resp['_id'] = tmp['_id']
@@ -143,17 +88,16 @@ class CoCreateCrud extends CoCreateBase {
 			});
 		} catch (error) {
 			console.log('readDocument error', error); 
-			this.wsManager.send(socket, 'ServerError', 'error', null, roomInfo);
+			self.wsManager.send(socket, 'ServerError', 'error', null, roomInfo);
 		}
 	}
 
 	/** Update Document **/
 	async updateDocument(socket, req_data, roomInfo) {
 		const self = this;
-
 		try {
-
-			const collection = this.db.collection(req_data["collection"]);
+			const db = this.dbClient.db(req_data['organization_id']);
+			const collection = db.collection(req_data["collection"]);
 			let objId = new ObjectID();
 			try {
 				if (req_data["document_id"]) {
@@ -163,7 +107,6 @@ class CoCreateCrud extends CoCreateBase {
 				console.log(err);
 			}
 			const query = {"_id": objId };
-			
 			const update = {};
 			
 			
@@ -176,16 +119,12 @@ class CoCreateCrud extends CoCreateBase {
 				projection[x] = 1
 			})
 
-			collection.findOneAndUpdate(
-				query,
-				update,
-				{
+			collection.findOneAndUpdate( query, update, {
 					returnOriginal : false,
 					upsert: req_data.upsert || false,
 					projection: projection,
 				}
 			).then((result) => {
-	
 				let isFlat = req_data.isFlat == true ? true : false;
 				let response_data = result.value || {};
 				
@@ -193,20 +132,9 @@ class CoCreateCrud extends CoCreateBase {
 
 				if(req_data['unset']) response['delete_fields'] = req_data['unset'];
 				
-				if (req_data.broadcast_sender != false) {
-					self.wsManager.send(socket, 'updateDocument', { ...response, element: req_data['element']}, req_data['organization_id'], roomInfo);
-				}
-					
-				if (req_data.broadcast !== false) {
-					if (req_data.room) {
-						self.wsManager.broadcast(socket, req_data.namespace || req_data['organization_id'] , req_data.room, 'updateDocument', response, true, roomInfo);
-					} else {
-						self.wsManager.broadcast(socket, req_data.namespace || req_data['organization_id'], null, 'updateDocument', response, true, roomInfo)	
-					}
-				}
-				
-				self.processCRUDEvent('updateDocument', response);
+				self.broadcast('updateDocument', socket, req_data, response, roomInfo)
 			}).catch((error) => {
+				console.log('error', error)
 				self.wsManager.send(socket, 'ServerError', error, null, roomInfo);
 			});
 			
@@ -221,7 +149,8 @@ class CoCreateCrud extends CoCreateBase {
 		const self = this;
 
 		try {
-			const collection = this.db.collection(req_data["collection"]);
+			const db = this.dbClient.db(req_data['organization_id']);
+			const collection = db.collection(req_data["collection"]);
 			const query = {
 				"_id": new ObjectID(req_data["document_id"])
 			};
@@ -229,36 +158,31 @@ class CoCreateCrud extends CoCreateBase {
 			collection.deleteOne(query, function(error, result) {
 				if (!error) {
 					let response = { ...req_data }
-					if (req_data.broadcast_sender != false) {
-						self.wsManager.send(socket, 'deleteDocument', { ...response, element: req_data['element']}, req_data['organization_id'], roomInfo);
-					}
-					if (req_data.broadcast !== false) {
-						if (req_data.room) {
-							self.wsManager.broadcast(socket, req_data.namespace || req_data['organization_id'] , req_data.room, 'deleteDocument', response, true, roomInfo);
-						} else {
-							self.wsManager.broadcast(socket, req_data.namespace || req_data['organization_id'], null, 'deleteDocument', response, true, roomInfo)	
-						}
-					}
-					self.processCRUDEvent('deleteDocument', response);
+					self.broadcast('deleteDocument', socket, req_data, response, roomInfo)
 				} else {
 					self.wsManager.send(socket, 'ServerError', error, null, roomInfo);
 				}
 			})
 		} catch (error) {
 			console.log(error);
-			this.wsManager.send(socket, 'ServerError', 'error', null, roomInfo);
+			self.wsManager.send(socket, 'ServerError', 'error', null, roomInfo);
 		}
 	}
 	
-	processCRUDEvent(action, data) {
-		process.emit('changed-document', data)
-		// if (data.collection == 'permissions') {
-		// 	process.emit('refresh-permission', data)
-		// }
+	broadcast(component, socket, req_data, response, roomInfo) {
+		if (req_data.broadcast_sender != false) {
+			this.wsManager.send(socket, component, { ...response, element: req_data['element']}, req_data['organization_id'], roomInfo);
+		}
+			
+		if (req_data.broadcast !== false) {
+			if (req_data.room) {
+				this.wsManager.broadcast(socket, req_data.namespace || req_data['organization_id'] , req_data.room, component, response, true, roomInfo);
+			} else {
+				this.wsManager.broadcast(socket, req_data.namespace || req_data['organization_id'], null, component, response, true, roomInfo)	
+			}
+		}
+		process.emit('changed-document', response)
 	}
 }
 
 module.exports = CoCreateCrud;
-
-
-

package/src/index.js

@@ -2,18 +2,10 @@
 
 const crud = require('./crud');
 const list = require('./list');
-const user = require('./user');
-const unique = require('./unique');
-const organization = require('./organization');
-const industry = require('./industry');
 const backup = require('./backup');
 
-module.exports.init = function(socket_server, db_client) {
-    new crud(socket_server, db_client);
-    new list(socket_server, db_client);
-    new user(socket_server, db_client);
-    new unique(socket_server, db_client);
-    new organization(socket_server, db_client);
-    new industry(socket_server, db_client);
-    new backup(socket_server, db_client);
+module.exports.init = function(wsManager, dbClient) {
+    new crud(wsManager, dbClient);
+    new list(wsManager, dbClient);
+    new backup(wsManager, dbClient);
 }

package/src/list.js

@@ -1,17 +1,15 @@
+const {ObjectID} = require("mongodb");
 
-const CoCreateBase = require("./base");
-const {ObjectID, Binary} = require("mongodb");
-
-class CoCreateList extends CoCreateBase {
-	constructor(wsManager, db) {
-		super(wsManager, db);
+class CoCreateList {
+	constructor(wsManager, dbClient) {
+		this.wsManager = wsManager
+		this.dbClient = dbClient
 		this.init()
 	}
 	
 	init() {
 		this.wsManager.on('readDocumentList', (socket, data, roomInfo) => this.readDocumentList(socket, data, roomInfo));
 		this.wsManager.on('readCollectionList', (socket, data, roomInfo) => this.readCollectionList(socket, data, roomInfo));
-	
 	}
 	
 	/**
@@ -49,9 +47,7 @@ class CoCreateList extends CoCreateBase {
 			data: [] // array
 	 }
 	 **/
-	async readDocumentList(socket, req_data, roomInfo) {
-		// const securityRes = await this.checkSecurity(req_data);
-		
+	async readDocumentList(socket, req_data, roomInfo) {		
 		function sleep(ms) {
 			return new Promise((resolve) => {
 				setTimeout(resolve, ms);
@@ -61,10 +57,6 @@ class CoCreateList extends CoCreateBase {
 		// await sleep(3000)
 
 		const self = this;
-		// if (!securityRes.result) {
-		// 	this.wsManager.send(socket, 'securityError', 'error', req_data['organization_id'], roomInfo);
-		// 	return;   
-		// }
 		
 		if (req_data['is_collection']) {
 			var result = await this.readCollectionList(socket, req_data, roomInfo);
@@ -72,7 +64,8 @@ class CoCreateList extends CoCreateBase {
 		}
 		
 		try {
-			var collection = this.db.collection(req_data['collection']);
+			const db = this.dbClient.db(req_data['organization_id']);
+			const collection = db.collection(req_data["collection"]);
 			const operator = {
 				filters: [],
 				orders: [],
@@ -87,10 +80,6 @@ class CoCreateList extends CoCreateBase {
 			var query = {};
 			query = this.readQuery(operator);
 
-			// if (securityRes['organization_id']) {
-			// 	query['organization_id'] = securityRes['organization_id'];
-			// }
-			
 			var sort = {};
 			operator.orders.forEach((order) => {
 				sort[order.name] = order.type
@@ -140,14 +129,10 @@ class CoCreateList extends CoCreateBase {
 	}
 	
 	async readCollectionList(socket, data, roomInfo) {
-		const securityRes = await this.checkSecurity(data);
-		if (!securityRes.result) {
-			this.wsManager.send(socket, 'securityError', 'error', data['organization_id'], roomInfo);
-			return;   
-		}
 		try {
-			var result_collections = [];
-			result_collections = await this.db.listCollections().toArray().then(infos => {
+			var collections = [];
+			const db = this.dbClient.db(req_data['organization_id']);
+			collections = await db.listCollections().toArray().then(infos => {
 				var result = [];
 				infos.forEach(function(item) {
 					let __uuid = item.info.uuid.toString('hex')
@@ -160,92 +145,12 @@ class CoCreateList extends CoCreateBase {
 				return result;
 			})
 			
-			this.wsManager.send(socket, 'readCollectionList', {...data, data: result_collections }, data['organization_id'], roomInfo);
+			this.wsManager.send(socket, 'readCollectionList', {...data, data: collections }, data['organization_id'], roomInfo);
 		} catch(error) {
 			this.wsManager.send(socket, 'ServerError', 'error', null, roomInfo);
 		}
 	}
 	
-	/**
-	 * fetch document by ids
-	 */
-	
-	// async function fetchDocumentList(socket, data) {
-	//   var securityRes = await checkSecurity(data);
-	//   if (!securityRes.result) {
-	//     socket.emit('securityError', 'error');
-	//     return;   
-	//   }
-		
-	//   try {
-			
-	//     var collection = db.collection(data['collection']);
-	//     var query = {};
-	//     query = readQuery(data);
-			
-	//     if (data['fetch'] && data.fetch.name) {
-	//       query[data.fetch.name] = data.fetch.value;
-	//     }
-			
-	//     if (securityRes['organization_id']) {
-	//       query['organization_id'] = securityRes['organization_id'];
-	//     }
-			
-	//     var sort = {};
-	//     data.orders.forEach((order) => {
-	//       sort[order.name] = order.type
-	//     });
-	
-	//     collection.find(query).sort(sort).toArray(function(error, result) {
-	//       if (result) {
-	//         if (data['search']['type'] == 'and') {
-	//           result = readAndSearch(result, data['search']['value']);
-	//         } else {
-	//           result = readOrSearch(result, data['search']['value']);
-	//         }
-	
-	//         var total = result.length;
-	//         var f_ids = data['fetch_ids'];
-					
-	//         var _nn = result.length;
-	//         if (data['count']) {
-	//           _nn = data['startIndex'];
-	//         }
-	//         console.log(f_ids);
-	//         var ret_data = [];
-	//         for (let ii = 0; ii < _nn; ii++) {
-						
-	//           for (let j = 0; j < f_ids.length; j++) {
-							
-	//             console.log(f_ids[j], result[ii]['_id']);
-	//             if (f_ids[j] == result[ii]['_id']) {
-								
-	//               ret_data.push({item: result[ii], position: ii});
-								
-	//             }
-	//           }
-	//         }
-					
-	//         console.log(ret_data);
-				
-	//         socket.emit('fetchDocumentList', {
-	//           'collection': data['collection'],
-	//           'eId': data['eId'],
-	//           'result': ret_data,
-	//           'startIndex': data['startIndex'],
-	//           'per_count': data['count'],
-	//           'total': total,
-	//           'options': data['options']
-	//         })
-	//       }
-				
-	//       //console.log(error);
-	//     })
-	//   } catch (error) {
-			
-	//   }
-		
-	// }
 	
 	/**
 	 * function that make query from data

package/src/base.js

@@ -1,86 +0,0 @@
-
-const {ObjectID} = require("mongodb");
-
-class CoCreateBase {
-	constructor(wsManager, client) {
-		this.wsManager = wsManager;
-		this.db = client.db('mydb');
-		this.dbClient = client;
-		
-		this.initBase()
-
-	}
-	
-	initBase() {
-		if (this.wsManager) {
-			this.wsManager.on('changeDB', 	(socket, data, roomInfo) => this.changeDB(socket, data, roomInfo));
-		}	
-	}
-	
-	/** Request available check **/
-	async checkSecurity(data) {
-
-		var apiKey = data['apiKey'];
-		var organization_id = data['organization_id'];
-		
-		if (!apiKey || !organization_id) return {result: false};
-		
-		var collection = this.db.collection('organizations');
-		
-		try {
-			var query = {
-				"_id": new ObjectID(organization_id),
-				"apiKey": data['apiKey'],
-			}
-		
-			const result = await collection.find(query).toArray();
-
-			if (result && result.length > 0) {
-				
-				if (data['collection'] == 'users' || data['collection'] == 'organizations') {
-					return { result: true	}  
-				} else {
-					return { result: true, organization_id: data['organization_id']	}  
-				}
-			}
-			return {result: false};
-		} catch (error) {
-			console.log(error)
-		}
-		return {result: false};
-	}
-	
-	changeDB(socket, data) {
-		const dbName = data.db;
-		if (!dbName) return;
-		this.db = this.dbClient.db(dbName);
-		return
-	}
-	
-	getDB(namespace) {
-		var dbConn;
-		try {
-			if (namespace && namespace != '') {
-				dbConn = this.dbClient.db(namespace)
-			} else {
-				dbConn = this.dbClient.db('mydb');
-			}
-		} catch (error) {
-			console.log(error)
-			dbConn = this.dbClient.db('mydb');
-		}
-		return dbConn;
-	}    
-	
-	getCollection(data) {
-		const collectionName = data['collection'];
-		try {
-			const dbName = data['db'] || data['organization_id'];
-			return this.getDB(dbName).collection(collectionName);
-		} catch (error) {
-			return this.db.collection(collectionName);		
-		}
-	}
-}
-
-module.exports = CoCreateBase;