@cocreate/organizations 1.28.4 → 1.28.5

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.28.5](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.28.4...v1.28.5) (2025-09-03)
+
+
+### Bug Fixes
+
+* improve organization creation logic and error handling ([bfed09d](https://github.com/CoCreate-app/CoCreate-organizations/commit/bfed09df186993dccef4164674ac430fe4aec17b))
+* streamline organization creation validation and error handling ([4e94111](https://github.com/CoCreate-app/CoCreate-organizations/commit/4e94111529c50be01f96424e5428c14b0d0e4b36))
+
 ## [1.28.4](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.28.3...v1.28.4) (2025-05-01)
 
 

package/package.json

@@ -1,18 +1,10 @@
 {
   "name": "@cocreate/organizations",
-  "version": "1.28.4",
+  "version": "1.28.5",
   "description": "A simple organizations component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "organizations",
-    "cocreate",
-    "low-code-framework",
-    "no-code-framework",
-    "cocreatejs",
-    "cocreatejs-component",
-    "cocreate-framework",
-    "no-code",
     "low-code",
-    "collaborative-framework",
     "realtime",
     "realtime-framework",
     "collaboration",

package/src/server.js

@@ -1,80 +1,114 @@
 class CoCreateOrganization {
-    constructor(crud) {
-        this.wsManager = crud.wsManager
-        this.crud = crud
-        this.platformSocket = {
-            config: {
-                organization_id: process.env.organization_id,
-            }
-        }
-        this.init()
-    }
+	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', (data) =>
-                this.createOrganization(data)
-            );
-        }
-    }
+	init() {
+		if (this.wsManager) {
+			this.wsManager.on("createOrganization", (data) =>
+				this.createOrganization(data)
+			);
+		}
+	}
 
-    async createOrganization(data) {
-        try {
-            if (!data.organization || !data.organization._id) return
-            if (!data.user || !data.user._id || !data.user.email || !data.user.password) return
+	async createOrganization(data) {
+		try {
+			const { organization, user, key } = data;
 
-            const organization = {
-                _id: data.organization._id,
-                name: data.organization.name || 'untitled',
-                host: data.organization.host || [],
-                owner: data.user._id,
-                balance: 10, // TODO: set balance to 0 and create a transcation with type credit to add the $10
-                dataTransfered: 0
-            }
+			if (
+				!organization ||
+				!organization._id ||
+				!organization.host ||
+				!organization.host[0] ||
+				!organization.host[0].name
+			) {
+				this.errorHandler(
+					data,
+					"invalid_organization: missing required organization fields"
+				);
+			}
 
-            // TODO: check if user exist and confirm credentials
-            const user = {
-                _id: data.user._id,
-                firstname: data.user.firtname || 'Admin',
-                lastname: data.user.lastname || ''
-            }
+			if (!user || !user._id || !user.email || !user.password) {
+				this.errorHandler(
+					data,
+					"invalid_user: missing required user fields"
+				);
+			}
 
-            const userKey = {
-                type: "user",
-                key: user._id,
-                roles: ['user'],
-                email: user.object.email,
-                password: user.object.password || btoa('0000'),
-                user: {
-                    array: 'users'
-                }
-            }
+			if (!key || !Array.isArray(key) || key.length !== 3) {
+				this.errorHandler(
+					data,
+					"invalid_key: An array of 3 keys is required with type key, user and role."
+				);
+			}
 
-            const Data = {}
-            Data.method = 'object.create'
-            Data.host = data.host
-            Data.database = process.env.organization_id
-            Data.organization_id = process.env.organization_id
+			// If there are validation errors, include them in the response and send immediately
+			if (data.success === false) {
+				return this.wsManager.send(data);
+			}
 
-            if (organization) {
-                const response = await this.crud.send({ ...Data, array: 'organizations', object: organization })
-                this.wsManager.send(this.platformSocket, response);
-            }
-            if (user) {
-                const response = await this.crud.send({ ...Data, array: 'users', object: user })
-                this.wsManager.send(this.platformSocket, response);
-            }
+			const Data = {};
+			Data.method = "object.create";
+			Data.host = organization.host[0].name;
+			Data.database = organization._id;
+			Data.organization_id = organization._id;
 
-            if (userKey) {
-                const response = await this.crud.send({ ...Data, array: 'keys', object: userKey })
-                this.wsManager.send(this.platformSocket, response);
-            }
+			if (organization) {
+				const response = await this.crud.send({
+					...Data,
+					array: "organizations",
+					object: organization
+				});
+				if (response.error) {
+					this.errorHandler(data, response.error);
+				}
+			}
+			if (user) {
+				const response = await this.crud.send({
+					...Data,
+					array: "users",
+					object: user
+				});
+				if (response.error) {
+					this.errorHandler(data, response.error);
+				}
+			}
 
-            this.wsManager.send(data);
-        } catch (error) {
-            console.log('createObject error', error);
-        }
-    }
+			if (key) {
+				const response = await this.crud.send({
+					...Data,
+					array: "keys",
+					object: key
+				});
+				if (response.error) {
+					this.errorHandler(data, response.error);
+				}
+			}
+
+			if (data.success !== false) {
+				data.success = true;
+			}
+
+			this.wsManager.send(data);
+		} catch (error) {
+			if (data.socket) {
+				this.errorHandler(data, error);
+				this.wsManager.send(data);
+			}
+		}
+	}
+
+    errorHandler(data, error) {
+        data.success = false;
+        this.crud.errorHandler(data, error);
+	}
 }
 
-module.exports = CoCreateOrganization;
+module.exports = CoCreateOrganization;