@cocreate/organizations 1.21.5 → 1.22.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [1.22.0](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.21.6...v1.22.0) (2023-10-16)
+
+
+### Features
+
+* get() retuns promise to limit request to one ([67d59b3](https://github.com/CoCreate-app/CoCreate-organizations/commit/67d59b38bbaa6e80727a1f2327e0ef60896565d2))
+
+## [1.21.6](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.21.5...v1.21.6) (2023-10-14)
+
+
+### Bug Fixes
+
+*  typo ([c88342b](https://github.com/CoCreate-app/CoCreate-organizations/commit/c88342b5128fc472dbe0a39dc3d7ea98141c8236))
+* database.database.name ([88fde84](https://github.com/CoCreate-app/CoCreate-organizations/commit/88fde8463c1d6d5160528065b951da0c38664d2b))
+
 ## [1.21.5](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.21.4...v1.21.5) (2023-10-09)
 
 

package/package.json

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

package/src/client.js

@@ -2,16 +2,14 @@ import Crud from '@cocreate/crud-client';
 import Action from '@cocreate/actions';
 import Elements from '@cocreate/elements';
 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();
     const apikey = organization.object.key || uuid.generate();
     const user_id = user.object._id || Crud.ObjectId();
 
-    let hasApiKey = await Crud.send({ method: 'read.object', database: organization_id, array: 'keys', organization_id })
-    if (hasApiKey && hasApiKey.object && hasApiKey.object[0])
-        return
-
     try {
         // Create organization 
         organization.method = 'create.object'
@@ -21,7 +19,7 @@ async function generateDB(organization = { object: {} }, user = { object: {} })
         organization.object._id = organization_id
         organization.object.name = organization.object.name || 'untitiled'
         organization.organization_id = organization_id
-        Crud.send(organization);
+        Indexeddb.send(organization);
 
         // Create user
         user.method = 'create.object'
@@ -32,7 +30,7 @@ async function generateDB(organization = { object: {} }, user = { object: {} })
         user.object.firstname = user.object.firstname || 'untitiled'
         user.object.lastname = user.object.lastname || 'untitiled'
         user.organization_id = organization_id
-        Crud.send(user);
+        Indexeddb.send(user);
 
         // Create default key
         let key = {
@@ -52,7 +50,7 @@ async function generateDB(organization = { object: {} }, user = { object: {} })
             },
             organization_id
         }
-        Crud.send(key);
+        Indexeddb.send(key);
 
         // Create role
         let role_id = Crud.ObjectId();
@@ -69,7 +67,7 @@ async function generateDB(organization = { object: {} }, user = { object: {} })
             },
             organization_id
         };
-        Crud.send(role);
+        Indexeddb.send(role);
 
         // Create user key
         let userKey = {
@@ -88,7 +86,7 @@ async function generateDB(organization = { object: {} }, user = { object: {} })
             },
             organization_id
         };
-        Crud.send(userKey);
+        Indexeddb.send(userKey);
 
         return { organization: organization.object, apikey, user: user.object, role: role.object, userKey: userKey.object }
 
@@ -100,9 +98,9 @@ async function generateDB(organization = { object: {} }, user = { object: {} })
 async function get() {
     let organization_id = await getOrganizationFromServiceWorker()
     if (!organization_id) {
-        let data = await indexeddb.send({ method: 'read.database' })
+        let data = await Indexeddb.send({ method: 'read.database' })
         for (let database of data.database) {
-            let name = database.database.name
+            let name = database.name
             if (name.match(/^[0-9a-fA-F]{24}$/)) {
                 organization_id = name
             }
@@ -142,37 +140,44 @@ async function getOrganizationFromServiceWorker() {
     });
 }
 
-async function createOrganization() {
+let organizationPromise = null;
+async function createOrganizationPromise() {
     let createOrganization = document.querySelector('[actions*="createOrganization"]')
+    if (createOrganization)
+        return Crud.socket.organization = 'canceled'
 
     if (Crud.socket.organization == 'canceled' || Crud.socket.organization == 'pending') return
 
-    if (!createOrganization && confirm("An organization_id could not be found, if you already have an organization_id add it to this html and refresh the page.\n\nOr click 'OK' create a new organization") == true) {
-        Crud.socket.organization = 'pending'
-        if (indexeddb) {
-            try {
-                // const Organization = await import('@cocreate/organizations')
-
-                let org = { object: {} }
-                let { organization, apikey, user } = await generateDB(org)
-                if (organization && apikey && user) {
-                    Crud.socket.apikey = apikey
-                    Crud.socket.user_id = user._id
-                    Config.set('organization_id', organization._id)
-                    Config.set('apikey', apikey)
-                    Config.set('user_id', user._id)
-                    Crud.socket.organization = true
-                    return organization._id
-                }
-            } catch (error) {
-                console.error('Failed to load the script:', error);
+    const organization_id = prompt("An organization_id could not be found, if you already have an organization_id input it now.\n\nOr leave blank and click 'OK' to create a new organization");
+
+    if (organization_id === null)
+        return Crud.socket.organization = 'canceled'
+
+    Crud.socket.organization = 'pending'
+    if (Indexeddb) {
+        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
+                Crud.socket.user_id = user._id
+                Config.set('organization_id', organization._id)
+                Config.set('apikey', apikey)
+                Config.set('user_id', user._id)
+                Crud.socket.organization = true
+                return organization._id
             }
+        } catch (error) {
+            console.error('Failed to load the script:', error);
         }
-    } else {
-        Crud.socket.organization = 'canceled'
     }
 }
 
+async function createOrganization() {
+    return organizationPromise || (organizationPromise = createOrganizationPromise());
+}
 
 async function create(btn) {
     let formEl = btn.closest("form");
@@ -222,7 +227,7 @@ Action.init({
     name: "createOrganization",
     endEvent: "createdOrganization",
     callback: (action) => {
-        CoCreateOrganization.create(action.element);
+        create(action.element);
     }
 });