@cocreate/organizations 1.19.1 → 1.19.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.19.2](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.19.1...v1.19.2) (2023-09-19)
+
+
+### Bug Fixes
+
+* conflict with config.key and apikey ([5f2c3d9](https://github.com/CoCreate-app/CoCreate-organizations/commit/5f2c3d9b553ff5ca7dac356ea96957396c5d081d))
+
 ## [1.19.1](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.19.0...v1.19.1) (2023-09-18)
 
 

package/CoCreate.config.js

@@ -1,24 +1,24 @@
-module.exports = {
-    "organization_id": "",
-    "key": "",
-    "host": "",
-    "sources": [
-        {
-            "array": "files",
-            "object": {
-                "_id": "60207e303c260207bf49cab8",
-                "name": "index.html",
-                "path": "/docs/organizations",
-                "pathname": "/docs/organizations/index.html",
-                "src": "{{./docs/index.html}}",
-                "host": [
-                    "*",
-                    "general.cocreate.app"
-                ],
-                "directory": "organizations",
-                "content-type": "{{content-type}}",
-                "public": "true"
-            }
-        }
-    ]
-}
+module.exports = {
+    "organization_id": "",
+    "key": "",
+    "host": "",
+    "sources": [
+        {
+            "array": "files",
+            "object": {
+                "_id": "60207e303c260207bf49cab8",
+                "name": "index.html",
+                "path": "/docs/organizations",
+                "pathname": "/docs/organizations/index.html",
+                "src": "{{./docs/index.html}}",
+                "host": [
+                    "*",
+                    "general.cocreate.app"
+                ],
+                "directory": "organizations",
+                "content-type": "{{content-type}}",
+                "public": "true"
+            }
+        }
+    ]
+};

package/docs/index.html

@@ -351,7 +351,6 @@
             </button>
         </main>
 
-        <script src="./apikey.js"></script>
         <script src="https://CoCreate.app/dist/CoCreate.js"></script>
     </body>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/organizations",
-  "version": "1.19.1",
+  "version": "1.19.2",
   "description": "A simple organizations component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "organizations",
@@ -58,8 +58,8 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/actions": "^1.11.1",
-    "@cocreate/crud-client": "^1.25.0",
-    "@cocreate/elements": "^1.21.0"
+    "@cocreate/actions": "^1.11.2",
+    "@cocreate/crud-client": "^1.25.1",
+    "@cocreate/elements": "^1.21.1"
   }
 }

package/src/client.js

@@ -5,11 +5,11 @@ import Elements from '@cocreate/elements';
 
 async function generateDB(organization = { object: {} }, user = { object: {} }) {
     const organization_id = organization.object._id || Crud.ObjectId();
-    const defaultKey = organization.object.key || uuid.generate();
+    const apikey = organization.object.key || uuid.generate();
     const user_id = user.object._id || Crud.ObjectId();
 
-    let apiKey = await Crud.send({ method: 'create.object', database: organization_id, array: 'keys', organization_id })
-    if (apiKey && apiKey.object && apiKey.object[0])
+    let hasApiKey = await Crud.send({ method: 'read.object', database: organization_id, array: 'keys', organization_id })
+    if (hasApiKey && hasApiKey.object && hasApiKey.object[0])
         return
 
     try {
@@ -43,7 +43,7 @@ async function generateDB(organization = { object: {} }, user = { object: {} })
             object: {
                 _id: Crud.ObjectId(),
                 type: "key",
-                key: defaultKey,
+                key: apikey,
                 actions: {
                     signIn: true,
                     signUp: true
@@ -90,7 +90,7 @@ async function generateDB(organization = { object: {} }, user = { object: {} })
         };
         Crud.send(userKey);
 
-        return { organization: organization.object, key: key.object, user: user.object, role: role.object, userKey: userKey.object }
+        return { organization: organization.object, apikey, user: user.object, role: role.object, userKey: userKey.object }
 
     } catch (error) {
         return false