@cocreate/crud-server 1.24.2 → 1.24.4

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.24.4](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.24.3...v1.24.4) (2023-06-15)
+
+
+### Bug Fixes
+
+* check if this.config ([151ab0d](https://github.com/CoCreate-app/CoCreate-crud-server/commit/151ab0d8b912c1c7b0369f596f4ae22e19831587))
+
+## [1.24.3](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.24.2...v1.24.3) (2023-06-15)
+
+
+### Bug Fixes
+
+* process.env.storage replaced with this.config.storage ([547d9db](https://github.com/CoCreate-app/CoCreate-crud-server/commit/547d9db0a41d0a77b6032245292b32e38b85ace0))
+
 ## [1.24.2](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.24.1...v1.24.2) (2023-06-15)
 
 

package/package.json

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

package/src/index.js

@@ -15,9 +15,9 @@ class CoCreateCrudServer {
     async init() {
         this.config = await Config({
             'organization_id': { prompt: 'Enter your organization_id: ' },
-            'name': {
+            'storage': {
                 prompt: 'Enter a friendly name for the new storage: ',
-                variable: true
+                variable: 'name'
             },
             'storage.{{name}}.provider': {
                 prompt: 'Enter the storage provider, ex mongodb: '
@@ -126,24 +126,40 @@ class CoCreateCrudServer {
     async crud(socket, action, data) {
         return new Promise(async (resolve) => {
             try {
-                if (!data.organization_id)
+                if (!data.organization_id || !this.config)
                     return resolve()
+                if (!this.config)
+                    this.config = await Config({
+                        'organization_id': { prompt: 'Enter your organization_id: ' },
+                        'storage': {
+                            prompt: 'Enter a friendly name for the new storage: ',
+                            variable: 'name'
+                        },
+                        'storage.{{name}}.provider': {
+                            prompt: 'Enter the storage provider, ex mongodb: '
+                        },
+                        'storage.{{name}}.url': {
+                            prompt: 'Enter the storage providers url: '
+                        }
+                    })
+
+
 
                 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 (!storage) {
-                    if (data.organization_id === process.env.organization_id) {
-                        storage = process.env.storage
+                    if (data.organization_id === this.config.organization_id) {
+                        storage = this.config.storage
                         if (storage)
-                            this.storages.set(data.organization_id, JSON.parse(storage))
+                            this.storages.set(data.organization_id, storage)
                     } else {
                         let organization = await this.readDocument({
-                            database: process.env.organization_id,
+                            database: this.config.organization_id,
                             collection: 'organizations',
                             document: [{ _id: data.organization_id }],
-                            organization_id: process.env.organization_id
+                            organization_id: this.config.organization_id
                         })
                         if (organization && organization.document && organization.document[0])
                             organization = organization.document[0]
@@ -171,7 +187,7 @@ class CoCreateCrudServer {
                     if (!data.database)
                         data['database'] = data.organization_id
 
-                    if (action === 'updateDocument' && data.organization_id !== process.env.organization_id) {
+                    if (action === 'updateDocument' && data.organization_id !== this.config.organization_id) {
                         let syncKeys
                         if (data.collection === 'organizations')
                             syncKeys = ['name', 'logo', 'databases', 'host', 'apis']
@@ -180,10 +196,10 @@ class CoCreateCrudServer {
 
                         if (syncKeys && syncKeys.length) {
                             let platformUpdate = {
-                                database: process.env.organization_id,
+                                database: this.config.organization_id,
                                 collection: data.collection,
                                 document: [{}],
-                                organization_id: process.env.organization_id
+                                organization_id: this.config.organization_id
                             }
 
                             let document = data.document[0] || data.document
@@ -225,10 +241,10 @@ class CoCreateCrudServer {
 
                 delete data.dbUrl
                 if (socket) {
-                    if (data.organization_id === process.env.organization_id && socket.config.organization_id !== data.organization_id) {
+                    if (data.organization_id === this.config.organization_id && socket.config.organization_id !== data.organization_id) {
                         this.wsManager.broadcast({
                             config: {
-                                organization_id: process.env.organization_id,
+                                organization_id: this.config.organization_id,
                             }
                         }, action, { ...data });
                         data.organization_id = socket.config.organization_id