@cocreate/crud-server 1.23.1 → 1.23.2

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.23.2](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.23.1...v1.23.2) (2023-06-11)
+
+
+### Bug Fixes
+
+* renamed db to storage ([9b1df98](https://github.com/CoCreate-app/CoCreate-crud-server/commit/9b1df98ecae81f2c861757f51d04bf773dd77f2b))
+* renamed hosts to host. the value can be a string or an array of strings ([1cfaade](https://github.com/CoCreate-app/CoCreate-crud-server/commit/1cfaadeeeccd8b899a83ed1a0c1b2d0811829b77))
+
 ## [1.23.1](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.23.0...v1.23.1) (2023-06-10)
 
 

package/CoCreate.config.js

@@ -10,7 +10,7 @@ module.exports = {
                 "name": "index.html",
                 "path": "/docs/crud-server/index.html",
                 "src": "{{./docs/index.html}}",
-                "hosts": [
+                "host": [
                     "*",
                     "general.cocreate.app"
                 ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/crud-server",
-  "version": "1.23.1",
+  "version": "1.23.2",
   "description": "CoCreate-crud-server",
   "keywords": [
     "cocreate-crud",

package/src/index.js

@@ -8,14 +8,14 @@ class CoCreateCrudServer {
         this.wsManager = wsManager
         this.databases = databases
         this.ObjectId = ObjectId
-        this.dbUrls = new Map();
+        this.storages = new Map();
         config([
             {
                 key: 'organization_id',
                 prompt: 'Enter your organization_id: ',
             },
             {
-                key: 'db',
+                key: 'storage',
                 prompt: 'Enter your db object as json.string: ',
             }
         ])//
@@ -110,14 +110,15 @@ class CoCreateCrudServer {
                 if (!data.organization_id)
                     return resolve()
 
-                let dbUrl = this.dbUrls.get(data.organization_id)
-                if (dbUrl === false)
-                    return resolve({ dbUrl: false, error: 'database url could not be found' })
+                let storage = this.storages.get(data.organization_id)
+                if (storage === false)
+                    return resolve({ storage: false, error: 'A storage or database could not be found' })
 
-                if (!dbUrl) {
+                if (!storage) {
                     if (data.organization_id === process.env.organization_id) {
-                        dbUrl = process.env.db
-                        this.dbUrls.set(data.organization_id, dbUrl)
+                        storage = process.env.storage
+                        if (storage)
+                            this.storages.set(data.organization_id, JSON.parse(storage))
                     } else {
                         let organization = await this.readDocument({
                             database: process.env.organization_id,
@@ -127,13 +128,13 @@ class CoCreateCrudServer {
                         })
                         if (organization && organization.document && organization.document[0])
                             organization = organization.document[0]
-                        if (organization && organization.databases) {
-                            dbUrl = organization.databases
-                            this.dbUrls.set(data.organization_id, dbUrl)
+                        if (organization && organization.storage) {
+                            storage = organization.storage
+                            this.storages.set(data.organization_id, storage)
                         } else {
-                            this.dbUrls.set(data.organization_id, false)
+                            this.storages.set(data.organization_id, false)
                             if (organization)
-                                return resolve({ dbUrl: false, error: 'database url could not be found' })
+                                return resolve({ storage: false, error: 'database url could not be found' })
                             else
                                 return resolve({ organization: false, error: 'organization could not be found' })
                         }
@@ -154,7 +155,7 @@ class CoCreateCrudServer {
                     if (action === 'updateDocument' && data.organization_id !== process.env.organization_id) {
                         let syncKeys
                         if (data.collection === 'organizations')
-                            syncKeys = ['name', 'logo', 'databases', 'hosts', 'apis']
+                            syncKeys = ['name', 'logo', 'databases', 'host', 'apis']
                         else if (data.collection === 'users')
                             syncKeys = ['name', 'email', 'password', 'avatar']
 
@@ -181,14 +182,14 @@ class CoCreateCrudServer {
 
                 }
 
-                if (!data.db || !data.db.length) {
-                    data.db = [Object.keys(dbUrl)[0]]
-                } else if (!Array.isArray(data.db))
-                    data.db = [data.db]
+                if (!data.storage || !data.storage.length) {
+                    data.storage = [Object.keys(storage)[0]]
+                } else if (!Array.isArray(data.storage))
+                    data.storage = [data.storage]
 
-                for (let i = 0; i < data.db.length; i++) {
-                    if (dbUrl && dbUrl[data.db[i]]) {
-                        let db = dbUrl[data.db[i]]
+                for (let i = 0; i < data.storage.length; i++) {
+                    if (storage && storage[data.storage[i]]) {
+                        let db = storage[data.storage[i]]
 
                         if (db.provider && this.databases[db.provider]) {
                             if (!Array.isArray(db.url))
@@ -234,7 +235,7 @@ class CoCreateCrudServer {
 
     errorHandler(data, error, database, collection) {
         if (typeof error == 'object')
-            error['db'] = 'mongodb'
+            error['storage'] = 'mongodb'
         else
             error = { location: 'crudServer', message: error }