@cocreate/organizations 1.13.4 → 1.14.1

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [1.14.1](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.14.0...v1.14.1) (2023-05-20)
+
+
+### Bug Fixes
+
+* update packages to latest version. This commit updates various packages in the dependencies section of the package.json file to their latest published versions, thereby fixing multiple bugs and improving overall performance. ([0350a07](https://github.com/CoCreate-app/CoCreate-organizations/commit/0350a07f26027496324961c70da3350f42315b5a))
+
+# [1.14.0](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.13.4...v1.14.0) (2023-05-18)
+
+
+### Bug Fixes
+
+*  websocket event listener for organizational creation ([bdbec1f](https://github.com/CoCreate-app/CoCreate-organizations/commit/bdbec1f4cf3e536607765561b4a74159d1d1c353))
+* createOrganization method to correctly save data to the serverDB ([c0f574f](https://github.com/CoCreate-app/CoCreate-organizations/commit/c0f574f662c777e1b663cc35bec5a0de8438a33f))
+
+
+### Features
+
+* Create or add an exisitng organization using createOrganization() function. ([311efee](https://github.com/CoCreate-app/CoCreate-organizations/commit/311efee025bcdb4323466e38f211f746faf252bb))
+
 ## [1.13.4](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.13.3...v1.13.4) (2023-05-12)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/organizations",
-  "version": "1.13.4",
+  "version": "1.14.1",
   "description": "A simple organizations component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "organizations",
@@ -59,10 +59,10 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/actions": "^1.8.8",
-    "@cocreate/crud-client": "^1.20.4",
-    "@cocreate/docs": "^1.7.8",
-    "@cocreate/form": "^1.14.6",
-    "@cocreate/indexeddb": "^1.8.6"
+    "@cocreate/actions": "^1.8.11",
+    "@cocreate/crud-client": "^1.21.2",
+    "@cocreate/docs": "^1.7.11",
+    "@cocreate/form": "^1.14.11",
+    "@cocreate/indexeddb": "^1.9.3"
   }
 }

package/src/client.js

@@ -4,51 +4,59 @@ import action from '@cocreate/actions';
 import form from '@cocreate/form';
 
 const CoCreateOrganization = {
-		
-	createOrg: async function(btn) {
-		let formEl = btn.closest("form");
-		if (!formEl) return;
-
-		let organization = form.getData(formEl, 'organizations')
-		let user = form.getData(formEl, 'users')
-
-		let response
-		let documents = await indexeddb.generateDB(organization, user)
-		
-		if (documents) {
-			if(!organization || !organization.document || !organization.document[0]) return
-			let org = organization.document[0]
-			let organization_id = org._id	
-			let key = org.key
-
-			if (crud.socket.organization !== true) {
-				crud.socket.organization = true
-				crud.socket.create({organization_id, key})
-			}
-
-			form.setDocumentId(formEl, organization)
-			form.setDocumentId(formEl, user)
-
-			response = await crud.socket.send('createOrg', {
-				documents,
-				broadcastBrowser: false,
-				organization_id,
-				key
-			});
-		}
-
-		document.dispatchEvent(new CustomEvent('createdOrg', {
-			detail: response
-		}));
-	}
+
+    createOrganization: async function (btn) {
+        let formEl = btn.closest("form");
+        if (!formEl) return;
+
+        let organization = form.getData(formEl, 'organizations')
+        let user = form.getData(formEl, 'users')
+
+        if (!organization || !organization.document)
+            return
+        if (!user || !user.document)
+            return
+
+        if (!organization.document._id && !user.document._id) {
+            let documents = await indexeddb.generateDB(organization, user)
+            if (!documents)
+                return
+        }
+
+        form.setDocumentId(formEl, organization)
+        form.setDocumentId(formEl, user)
+
+        organization = organization.document[0]
+        user = user.document[0]
+
+        let organization_id = organization._id
+        let key = organization.key
+
+        if (crud.socket.organization !== true) {
+            crud.socket.organization = true
+            crud.socket.create({ organization_id, key })
+        }
+
+        let response = await crud.socket.send('createOrganization', {
+            organization,
+            user,
+            broadcastBrowser: false,
+            organization_id,
+            key
+        });
+
+        document.dispatchEvent(new CustomEvent('createdOrganization', {
+            detail: response
+        }));
+    }
 };
 
 action.init({
-	name: "createOrg",
-	endEvent: "createdOrg",
-	callback: (btn, data) => {
-		CoCreateOrganization.createOrg(btn);
-	},
+    name: "createOrganization",
+    endEvent: "createdOrganization",
+    callback: (btn) => {
+        CoCreateOrganization.createOrganization(btn);
+    }
 });
 
 export default CoCreateOrganization;

package/src/server.js

@@ -1,38 +1,63 @@
 class CoCreateOrganization {
-	constructor(crud) {
-		this.wsManager = crud.wsManager
-		this.crud = crud
-		this.init()
-	}
-	
-	init() {
-		if (this.wsManager) {
-			this.wsManager.on('createOrg', (socket, data) => 
-				this.createOrg(socket, data)
-			);
-		}
-	}
-
-	async createOrg(socket, data) {
-		try {
-			const platformSocket = {
-				config: {
-					organization_id: process.env.organization_id,
-				}
-			}
-
-			for(let document of data.documents) {
-				document.database = process.env.organization_id
-				document.organization_id = process.env.organization_id
-				let response = await this.crud.createDocument(document)
-				this.wsManager.broadcast(platformSocket, 'createDocument', response);
-			}
-			this.wsManager.send(socket, 'createOrg', data);
-		} catch(error) {
-			console.log('createDocument error', error);
-		}
-	}
-	
+    constructor(crud) {
+        this.wsManager = crud.wsManager
+        this.crud = crud
+        this.platformSocket = {
+            config: {
+                organization_id: process.env.organization_id,
+            }
+        }
+        this.init()
+    }
+
+    init() {
+        if (this.wsManager) {
+            this.wsManager.on('createOrganization', (socket, data) =>
+                this.createOrganization(socket, data)
+            );
+        }
+    }
+
+    async createOrganization(socket, data) {
+        try {
+            if (!data.organization || !data.organization._id) return
+            if (!data.user || !data.user._id || !data.user.email || !data.user.password) return
+
+            const organization = {
+                _id: data.organization._id,
+                name: data.organization.name || 'untitled',
+                hosts: data.organization.hosts || [],
+                owner: data.user._id
+            }
+
+            // TODO: check if user exist and check if credentials match
+            const user = {
+                _id: data.user._id,
+                name: data.user.name || 'Admin',
+                email: data.user.email,
+                password: data.user.password,
+                currentOrg: data.organization._id,
+                connectedOrgs: [data.organization._id]
+            }
+
+            const Data = {}
+            Data.database = process.env.organization_id
+            Data.organization_id = process.env.organization_id
+
+            if (organization) {
+                const response = await this.crud.createDocument({ ...Data, collection: 'organizations', document: organization })
+                this.wsManager.broadcast(this.platformSocket, 'createDocument', response);
+            }
+            if (user) {
+                const response = await this.crud.createDocument({ ...Data, collection: 'users', document: user })
+                this.wsManager.broadcast(this.platformSocket, 'createDocument', response);
+            }
+
+            this.wsManager.send(socket, 'createOrganization', data);
+        } catch (error) {
+            console.log('createDocument error', error);
+        }
+    }
 }
 
 module.exports = CoCreateOrganization;