@cocreate/organizations 1.28.4 → 1.29.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [1.29.0](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.28.5...v1.29.0) (2025-09-07)
+
+
+### Features
+
+* enhance generateDB to include file key and update createOrganization logic ([143e1b2](https://github.com/CoCreate-app/CoCreate-organizations/commit/143e1b2be97ad2d519041d6cc6fedb401bbb42ec))
+
+## [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.29.0",
   "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/client.js

@@ -5,105 +5,107 @@ import Config from "@cocreate/config";
 import Indexeddb from "@cocreate/indexeddb";
 import uuid from "@cocreate/uuid";
 
-async function generateDB(
-	organization = { object: {} },
-	user = { object: {} }
-) {
-	const organization_id =
-		organization.object._id || Crud.ObjectId().toString();
-	const apikey = organization.object.key || uuid.generate();
-	const user_id = user.object._id || Crud.ObjectId().toString();
-
+async function generateDB(organization = {}, user = {}, key = []) {
 	try {
 		// Create organization
-		organization.method = "object.create";
-		organization.storage = "indexeddb";
-		organization.database = organization_id;
-		organization.array = "organizations";
-		organization.object._id = organization_id;
-		organization.object.name = organization.object.name || "untitiled";
-		organization.organization_id = organization_id;
-		Indexeddb.send(organization);
+		organization._id = organization._id || Crud.ObjectId().toString();
+		organization.name = organization.name || "untitiled";
 
 		// Create user
-		user.method = "object.create";
-		user.storage = "indexeddb";
-		user.database = organization_id;
-		user.array = "users";
-		user.object._id = user_id;
-		user.object.firstname = user.object.firstname || "untitiled";
-		user.object.lastname = user.object.lastname || "untitiled";
-		user.organization_id = organization_id;
-		Indexeddb.send(user);
+		user._id = user._id || Crud.ObjectId().toString();
+		user.firstname = user.firstname || "untitiled";
+		user.lastname = user.lastname || "untitiled";
 
 		// Create default key
-		let key = {
-			method: "object.create",
-			storage: "indexeddb",
-			database: organization_id,
-			array: "keys",
-			object: {
-				_id: Crud.ObjectId().toString(),
-				type: "key",
-				key: apikey,
-				actions: {
-					signIn: true,
-					signUp: true
+		let defaultKey = {
+			_id: Crud.ObjectId().toString(),
+			type: "key",
+			key: uuid.generate(),
+			actions: {
+				object: {
+					"*": {
+						users: {
+							"_id.$eq": "$user_id"
+						}
+					},
+					read: {
+						$array: ["ai", "blog-posts"]
+					}
 				},
-				default: true
+				checkSession: "true",
+				signIn: "true",
+				signUp: "true",
+				acceptInvite: "true",
+				forgotPassword: "true",
+				resetPassword: "true",
+				updateUserStatus: "true",
+				isUnique: "true",
+				inviteUser: "true"
 			},
-			organization_id
+			default: true
+		};
+
+		// Create File key
+		let fileKey = {
+			_id: Crud.ObjectId().toString(),
+			type: "key",
+			key: uuid.generate(),
+			actions: {
+				object: {
+					"*": {
+						$array: {
+							files: true
+						}
+					}
+				}
+			}
 		};
-		Indexeddb.send(key);
 
 		// Create role
 		let role_id = Crud.ObjectId().toString();
 		let role = {
-			method: "object.create",
-			storage: "indexeddb",
-			database: organization_id,
-			array: "keys",
-			object: {
-				_id: role_id,
-				type: "role",
-				name: "admin",
-				admin: "true"
-			},
-			organization_id
+			_id: role_id,
+			type: "role",
+			name: "admin",
+			admin: "true"
 		};
-		Indexeddb.send(role);
 
 		// Create user key
 		let userKey = {
-			method: "object.create",
-			storage: "indexeddb",
-			database: organization_id,
-			array: "keys",
-			object: {
-				_id: Crud.ObjectId().toString(),
-				type: "user",
-				key: user_id,
-				array: "users", // could be any array
-				roles: [role_id],
-				email: user.object.email,
-				password: user.object.password || btoa("0000")
-			},
-			organization_id
+			_id: Crud.ObjectId().toString(),
+			type: "user",
+			key: user._id,
+			array: "users", // could be any array
+			roles: [role_id],
+			email: user.email,
+			password: user.password || btoa("0000")
 		};
-		Indexeddb.send(userKey);
 
 		return {
-			organization: organization.object,
-			apikey,
-			user: user.object,
-			role: role.object,
-			userKey: userKey.object
+			organization,
+			user,
+			key: [defaultKey, fileKey, userKey, role]
 		};
 	} catch (error) {
 		return false;
 	}
 }
 
+function saveLocally(objects) {
+	const organization_id = objects.organization._id;
+	for (let key of Object.keys(objects)) {
+		let data = {
+			method: "object.create",
+			storage: "indexeddb",
+			database: organization_id,
+			array: key + "s",
+			object: objects[key],
+			organization_id
+		};
+		Indexeddb.send(data);
+	}
+}
+
 async function get() {
 	let organization_id = await getOrganizationFromServiceWorker();
 	if (!organization_id) {
@@ -202,14 +204,16 @@ async function createOrganizationPromise() {
 		try {
 			let org = { object: {} };
 			if (organization_id) org.object._id = organization_id;
-			let { organization, apikey, user } = await generateDB(org);
-			if (organization && apikey && user) {
-				Crud.socket.apikey = apikey;
+			let { organization, fileKey, user, key } = await generateDB(org);
+			if (organization && key && user) {
+				Crud.socket.apikey = key[0].key;
 				Crud.socket.user_id = user._id;
 				Config.set("organization_id", organization._id);
-				Config.set("apikey", apikey);
+				Config.set("apikey", key[0].key);
 				Config.set("user_id", user._id);
 				Crud.socket.organization = true;
+				saveLocally;
+				({ organization, user, key, fileKey });
 				return organization._id;
 			}
 		} catch (error) {
@@ -229,24 +233,39 @@ async function create(action) {
 	let form = action.form;
 	if (!form) return;
 
-	let organization = Elements.getData(form, "organizations");
-	let user = Elements.getData(form, "users");
+	let data = await Elements.getData(form);
 
-	if (!organization || !organization.object) return;
-	if (!user || !user.object) return;
-
-	if (!organization.object._id && !user.object._id) {
-		let objects = await generateDB(organization, user);
-		if (!objects) return;
+	let organization, user;
+	if (Array.isArray(data)) {
+		for (const item of data) {
+			if (item.array === "organizations") {
+				organization = item;
+			}
+			if (item.array === "users") {
+				user = item;
+			}
+			if (organization && user) {
+				break;
+			}
+		}
 	}
 
-	Elements.setTypeValue(form, organization);
-	Elements.setTypeValue(form, user);
+	organization.method = "object.read";
+	organization = await Crud.send(organization);
+
+	user.method = "object.read";
+	user = await Crud.send(user);
+
+	if (organization && organization.object && organization.object[0]) {
+		organization = organization.object[0];
+	}
+	if (user && user.object && user.object[0]) {
+		user = user.object[0];
+	}
 
-	organization = organization.object[0];
-	user = user.object[0];
+	let objects = await generateDB(organization, user);
 
-	let organization_id = organization._id;
+	let organization_id = organization._id || objects.organization._id;
 
 	if (Crud.socket.organization !== true) {
 		Crud.socket.organization = true;
@@ -255,10 +274,8 @@ async function create(action) {
 
 	let response = await Crud.socket.send({
 		method: "createOrganization",
-		organization,
-		user,
-		broadcastBrowser: false,
-		organization_id
+		...objects,
+		broadcastBrowser: false
 	});
 
 	action.element.dispatchEvent(

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, "dev", "test"];
+			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;