@cocreate/indexeddb 1.8.7 → 1.9.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.9.1](https://github.com/CoCreate-app/CoCreate-indexeddb/compare/v1.9.0...v1.9.1) (2023-05-10)
+
+
+### Bug Fixes
+
+* duplicate keys ([e87668f](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/e87668f17412e08a1497a53acbf7ba8592b53756))
+
+# [1.9.0](https://github.com/CoCreate-app/CoCreate-indexeddb/compare/v1.8.7...v1.9.0) (2023-05-10)
+
+
+### Features
+
+* generateDB, added @cocreate/uuid ([28be996](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/28be9960f64cac3fc72afcf2b8025431be9e8640))
+
 ## [1.8.7](https://github.com/CoCreate-app/CoCreate-indexeddb/compare/v1.8.6...v1.8.7) (2023-05-06)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/indexeddb",
-  "version": "1.8.7",
+  "version": "1.9.1",
   "description": "A simple indexeddb component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "indexeddb",
@@ -61,6 +61,7 @@
   "dependencies": {
     "@cocreate/docs": "^1.7.8",
     "@cocreate/hosting": "^1.10.0",
-    "@cocreate/utils": "^1.20.6"
+    "@cocreate/utils": "^1.20.6",
+    "@cocreate/uuid": "^1.4.7"
   }
 }

package/src/index.js

@@ -5,6 +5,8 @@
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
 import {ObjectId, dotNotationToObject, searchData, sortData, queryData} from '@cocreate/utils'
+import uuid from '@cocreate/uuid'
+
 let status = true;
 
 function createDatabase(data){
@@ -1014,125 +1016,114 @@ async function readDocs(data, database, collection, objectStore, direction) {
     });
 }
 
-function generateDB(data) {
-	const organization_id = data.organization_id;
-	const apiKey = data.apiKey;
-	const user_id = data.user_id;
+async function generateDB(organization = {document: {}}, user = {document: {}}) {
+    const organization_id = organization.document._id || ObjectId();
+    const primaryKey = organization.document.key || uuid.generate();
+    const user_id = user.document._id || ObjectId();
+
+    let apiKey = await readDocument({database: organization_id, collection: 'keys', organization_id})
+    if (apiKey && apiKey.document && apiKey.document[0])
+        return
+
+    try {
+        // Create organization 
+        organization.database = organization_id
+        organization.collection = 'organizations'
+        organization.document._id = organization_id
+        organization.document.key = primaryKey
+        organization.document.name = organization.document.name || 'untitiled',
+        organization.organization_id = organization_id
+        createDocument(organization);
+
+        // Create primary key
+        let key = {
+            database: organization_id,
+            collection: 'keys',
+            document: {
+                _id: ObjectId(),
+                type: "apikey",
+                key: primaryKey,
+                hosts: [
+                    "*"
+                ],
+                collections: {
+                    "organizations": ["read"],
+                    "files": ["read"]
+                },
+                documents: {
+                    "someid": {
+                        "permissions": [""],
+                        "fieldNames": {
+                            "name": ["read"]
+                        }
+                    }
+                },
+                actions: {
+                    "signIn": "",
+                    "signUp": "",
+                    "createOrg": "",
+                    "runIndustry": "",
+                    "sendgrid": ["sendEmail"]
+                },
+                admin: "false",
+                primary: true,
+            },
+            organization_id
+        }
+        createDocument(key);
+
+        // Create user
+        user.database = organization_id
+        user.collection = 'users'
+        user.document._id = user_id
+        user.document.name = user.document.name || 'untitiled',
+        user.document.password = user.document.password || btoa('0000'),
+        user.document.connected_orgs = [organization_id],
+        user.document.current_org = organization_id,
+        user.organization_id = organization_id
+        createDocument(user);
+
+        // Create role permission
+        let role_id = ObjectId();
+        let role = {
+            database: organization_id,
+            collection: 'keys',
+            document: {
+                _id: role_id,
+                "type": "role",
+                "name": "admin",
+                "collections": {
+                    "*": ["*"]
+                },
+                "modules": {
+                    "*": ""
+                },
+                "admin": "true",
+                "hosts": ["*"],
+            },
+            organization_id
+        };
+        createDocument(role);	
 
-	try {
-		// Create organization 
-		let organization = {
+        // Create user permission
+        let userKey = {
             database: organization_id,
-			collection: 'organizatons',
-			document: {
-				_id: organization_id,
-				name: 'untitled',
-                organization_id
-			}
-		}
-		createDocument(organization);
-
-		// Create apiKey permission
-		if (organization_id && apiKey) {
-			let permissions = {	
-                database: organization_id,
-				collection: 'permissions',
-				document: {
-					_id: ObjectId(),
-					type: "apikey",
-					key: apiKey,
-					hosts: [
-						"*"
-					],
-					collections: {
-						"organizations": ["read"],
-						"files": ["read"]
-					},
-					documents: {
-						"someid": {
-							"permissions": [""],
-							"fieldNames": {
-								"name": ["read"]
-							}
-						}
-					},
-                    actions: {
-                        "signIn": "",
-                        "signUp": "",
-                        "createOrg": "",
-                        "runIndustry": "",
-                        "sendgrid": ["sendEmail"]
-                    },
-                    admin: "false",
-                    primary: true,
-                    organization_id
-				}
-			}
-
-			createDocument(permissions);
-		}
-
-		// Create user
-		if (organization_id) {
-			let user = {
-                database: organization_id,
-				collection: 'users',
-				document: {
-					_id: user_id,
-					password: btoa('0000'),
-					connected_orgs: [organization_id],
-					current_org: organization_id,
-					organization_id
-				}
-			}
-			createDocument(user);
-		}
-
-		// Create role permission
-		if (user_id) {
-			let role = {
-                database: organization_id,
-				collection: 'permissions',
-				document: {
-					_id: ObjectId(),
-					"type": "role",
-					"name": "admin",
-					"collections": {
-						"*": ["*"]
-					},
-					"modules": {
-						"*": ""
-					},
-					"admin": "true",
-					"hosts": ["*"],
-                    organization_id,
-				}
-			};
-
-			createDocument(role);
-			let role_id = role.document._id;
-			
-			// Create user permission
-			if (role_id) {
-				let userPermission = {
-                    database: organization_id,
-					collection: 'permissions',
-					document: {
-						_id: ObjectId(),
-						organization_id,
-						"type": "user_id",
-						"key": user_id,
-						"roles": [role_id]
-					}
-				};
-				createDocument(userPermission);
-			}
-		}
-        return true			
-		
-	} catch (error) {
-        errorHandler(data, error)
-	}
+            collection: 'keys',
+            document: {
+                _id: ObjectId(),
+                "type": "user_id",
+                "key": user_id,
+                "roles": [role_id]
+            },
+            organization_id
+        };
+        createDocument(userKey);
+
+        return [organization, key, user, role, userKey]	
+        
+    } catch (error) {
+        return false
+    }
 }
 
 function errorHandler(data, error, database, collection){