@cocreate/organizations 1.3.0 → 1.4.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [1.4.0](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.3.2...v1.4.0) (2022-05-28)
+
+
+### Features
+
+* deleteOrg will delete db and org from from platformDB ([0fcb1bc](https://github.com/CoCreate-app/CoCreate-organizations/commit/0fcb1bc2ecdbb1948733c240ce7adfaceaa2b5e6))
+
+## [1.3.2](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.3.1...v1.3.2) (2022-05-23)
+
+
+### Bug Fixes
+
+* bump all dependencies ([fdebb81](https://github.com/CoCreate-app/CoCreate-organizations/commit/fdebb813950687c404bfc70e0139f94e2a6c90e5))
+
+## [1.3.1](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.3.0...v1.3.1) (2022-05-17)
+
+
+### Bug Fixes
+
+* get orgId from socketInfo ([77348c3](https://github.com/CoCreate-app/CoCreate-organizations/commit/77348c30afa285c152754545b549464a7202eb94))
+
 # [1.3.0](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.2.5...v1.3.0) (2022-05-14)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/organizations",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "A simple organizations component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "organizations",
@@ -61,10 +61,10 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/actions": "^1.3.33",
-    "@cocreate/crud-client": "^1.4.47",
-    "@cocreate/docs": "^1.2.69",
-    "@cocreate/elements": "^1.6.11",
+    "@cocreate/actions": "^1.4.1",
+    "@cocreate/crud-client": "^1.6.2",
+    "@cocreate/docs": "^1.3.1",
+    "@cocreate/elements": "^1.7.3",
     "mongodb": "^4.4.0"
   }
 }

package/src/server.js

@@ -9,12 +9,12 @@ class CoCreateOrganization {
 	
 	init() {
 		if (this.wsManager) {
-			this.wsManager.on('createOrg',		(socket, data, socketInfo) => this.createOrg(socket, data));
-			this.wsManager.on('deleteOrg',		(socket, data, socketInfo) => this.deleteOrg(socket, data));
+			this.wsManager.on('createOrg',		(socket, data, socketInfo) => this.createOrg(socket, data, socketInfo));
+			this.wsManager.on('deleteOrg',		(socket, data, socketInfo) => this.deleteOrg(socket, data, socketInfo));
 		}
 	}
 
-	async createOrg(socket, data) {
+	async createOrg(socket, data, socketInfo) {
 		const self = this;
 		if(!data.data) return;
 		
@@ -33,7 +33,7 @@ class CoCreateOrganization {
 					
 					const response  = { ...data, document_id: orgId }
 
-					self.wsManager.send(socket, 'createOrg', response );
+					self.wsManager.send(socket, 'createOrg', response, socketInfo);
 					self.wsManager.broadcast(socket, data.namespace || data['organization_id'] , data.room, 'createDocument', response);
 
 					// add new org to platformDB
@@ -49,11 +49,36 @@ class CoCreateOrganization {
 	}
 	
 	
-	async deleteOrg(socket, data) {
+	async deleteOrg(socket, data, socketInfo) {
 		const self = this;
 		if(!data.data) return;
+		const organization_id = data.data.organization_id
+		if(!organization_id || organization_id == process.env.organization_id) return;
+
 		try{
-			// ToDo: Delete DB and delete org and user from masterDB
+			const db = this.dbClient.db(organization_id);
+			db.dropDatabase().then(response => {
+				if (response === true){
+					console.log('deleteOrg response', response)
+				}
+
+				// delete org from platformDB
+				// if (organization_id != process.env.organization_id) {	
+					const platformDB = self.dbClient.db(process.env.organization_id).collection(data['collection']);
+					const query = {
+						"_id": new ObjectId(organization_id)
+					};
+		
+					platformDB.deleteOne(query, function(error, result) {
+						if (!error) {
+							let response = { ...data }
+							self.broadcast(socket, 'deleteDocument', response, socketInfo)
+						} else {
+							self.wsManager.send(socket, 'ServerError', error, socketInfo);
+						}
+					})
+				// }	
+			})
 		}catch(error){
 			console.log('deleteOrg error', error);
 		}