@cocreate/organizations 1.28.5 → 1.30.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.30.0](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.29.0...v1.30.0) (2025-09-20)
+
+
+### Features
+
+* add createEnvironment function and enhance createEnvironments handling ([d8e28f9](https://github.com/CoCreate-app/CoCreate-organizations/commit/d8e28f9ef032783f73e31a1a811643cb49a3c32e))
+
+# [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/organizations",
-  "version": "1.28.5",
+  "version": "1.30.0",
   "description": "A simple organizations component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "organizations",

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");
-
-	if (!organization || !organization.object) return;
-	if (!user || !user.object) return;
+	let data = await Elements.getData(form);
 
-	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(
@@ -268,6 +285,35 @@ async function create(action) {
 	);
 }
 
+async function createEnvironment(action) {
+	let form = action.form;
+	if (!form) return;
+
+	let organization = form.querySelector("#organization");
+	if (organization) {
+		organization = organization.value;
+	}
+
+	let hostname = form.querySelector("#hostname");
+	if (hostname) {
+		hostname = hostname.value;
+		hostname = ["dev." + hostname, "test." + hostname];
+	}
+
+	let response = await Crud.socket.send({
+		method: "createEnvironments",
+		organization,
+		hostname,
+		broadcastBrowser: false
+	});
+
+	action.element.dispatchEvent(
+		new CustomEvent("createdEnvironments", {
+			detail: response
+		})
+	);
+}
+
 Action.init({
 	name: "createOrganization",
 	endEvent: "createdOrganization",
@@ -275,5 +321,12 @@ Action.init({
 		create(action);
 	}
 });
+Action.init({
+	name: "createEnvironments",
+	endEvent: "createdEnvironments",
+	callback: (action) => {
+		createEnvironment(action);
+	}
+});
 
 export default { generateDB, create, get };

package/src/server.js

@@ -15,6 +15,9 @@ class CoCreateOrganization {
 			this.wsManager.on("createOrganization", (data) =>
 				this.createOrganization(data)
 			);
+			this.wsManager.on("createEnvironments", (data) =>
+				this.createEnvironments(data)
+			);
 		}
 	}
 
@@ -42,10 +45,10 @@ class CoCreateOrganization {
 				);
 			}
 
-			if (!key || !Array.isArray(key) || key.length !== 3) {
+			if (!key || !Array.isArray(key) || key.length < 4) {
 				this.errorHandler(
 					data,
-					"invalid_key: An array of 3 keys is required with type key, user and role."
+					"invalid_key: An array of 4 keys is required with type key, user and role."
 				);
 			}
 
@@ -55,12 +58,13 @@ class CoCreateOrganization {
 			}
 
 			const Data = {};
-			Data.method = "object.create";
+			Data.method = "object.update";
 			Data.host = organization.host[0].name;
-			Data.database = organization._id;
+			Data.database = [organization._id];
 			Data.organization_id = organization._id;
-
+			Data.upsert = true;
 			if (organization) {
+				organization.organization_id = organization._id;
 				const response = await this.crud.send({
 					...Data,
 					array: "organizations",
@@ -71,6 +75,7 @@ class CoCreateOrganization {
 				}
 			}
 			if (user) {
+				user.organization_id = organization._id;
 				const response = await this.crud.send({
 					...Data,
 					array: "users",
@@ -82,6 +87,9 @@ class CoCreateOrganization {
 			}
 
 			if (key) {
+				key.forEach(k => {
+					k.organization_id = organization._id;
+				});
 				const response = await this.crud.send({
 					...Data,
 					array: "keys",
@@ -105,6 +113,91 @@ class CoCreateOrganization {
 		}
 	}
 
+	async createEnvironments(data) {
+		try {
+			let { organization, hostname } = data;
+
+			if (!organization) {
+				this.errorHandler(
+					data,
+					"Missing required field: 'organization'. Please provide the organization object to create an organization."
+				);
+			}
+			if (!hostname) {
+				this.errorHandler(
+					data,
+					"Missing required field: 'hostname'. Please provide the hostname to create an organization."
+				);
+			}
+
+			// If there are validation errors, include them in the response and send immediately
+			if (data.success === false) {
+				return this.wsManager.send(data);
+			}
+
+			const Data = {};
+			Data.method = "object.read";
+			Data.host = hostname;
+			Data.organization_id = organization;
+			Data.$filter = { limit: 0 };
+
+			let organizations = await this.crud.send({
+				...Data,
+				array: "organizations",
+				object: []
+			});
+
+			if (organizations.error) {
+				this.errorHandler(data, organizations.error);
+			}
+
+			let users = await this.crud.send({
+				...Data,
+				array: "users",
+				object: []
+			});
+
+			if (users.error) {
+				this.errorHandler(data, users.error);
+			}
+
+			let keys = await this.crud.send({
+				...Data,
+				array: "keys",
+				object: []
+			});
+
+			if (keys.error) {
+				this.errorHandler(data, keys.error);
+			}
+
+			for (let host of hostname) {
+				organizations.method = "object.create";
+				organizations.host = host;
+				organizations = await this.crud.send(organizations);
+
+				users.method = "object.create";
+				users.host = host;
+				users = await this.crud.send(users);
+
+				keys.method = "object.create";
+				keys.host = host;
+				keys = await this.crud.send(keys);
+			}
+
+			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);