@cocreate/crud-server 1.28.7 → 1.28.9

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.28.9](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.28.8...v1.28.9) (2023-10-19)
+
+
+### Bug Fixes
+
+* handling of data.socket and no data.socket ([421ff57](https://github.com/CoCreate-app/CoCreate-crud-server/commit/421ff57d99c69b89808d35051bc45af5b4d473ca))
+
+## [1.28.8](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.28.7...v1.28.8) (2023-10-16)
+
+
+### Bug Fixes
+
+* improved error handling ([aa57afd](https://github.com/CoCreate-app/CoCreate-crud-server/commit/aa57afd5e20b8512ec9db7948fda35948b9d109b))
+
 ## [1.28.7](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.28.6...v1.28.7) (2023-10-14)
 
 

package/package.json

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

package/src/index.js

@@ -78,7 +78,7 @@ class CoCreateCrudServer {
 
                 let storages = this.storages.get(data.organization_id)
                 if (storages === false)
-                    return resolve({ storage: false, error: 'A storage or database could not be found' })
+                    return resolve({ serverStorage: false, error: 'A storage or database could not be found' })
 
                 if (!storages) {
                     if (data.organization_id === this.config.organization_id) {
@@ -93,17 +93,15 @@ class CoCreateCrudServer {
                             object: [{ _id: data.organization_id }],
                             organization_id: this.config.organization_id
                         })
-                        if (organization && organization.object && organization.object[0])
-                            organization = organization.object[0]
-                        if (organization && organization.storage) {
-                            storages = organization.storage
-                            this.storages.set(data.organization_id, storages)
-                        } else {
-                            this.storages.set(data.organization_id, false)
-                            if (organization)
-                                return resolve({ storage: false, error: 'database url could not be found' })
+                        if (organization
+                            && organization.object
+                            && organization.object[0]) {
+                            if (organization.object[0].storage)
+                                this.storages.set(data.organization_id, organization.object[0].storage)
                             else
-                                return resolve({ organization: false, error: 'organization could not be found' })
+                                return resolve({ serverStorage: false, error: 'A storage url could not be found' })
+                        } else {
+                            return resolve({ serverOrganization: false, error: 'An organization could not be found' })
                         }
                     }
                 }
@@ -201,18 +199,15 @@ class CoCreateCrudServer {
 
                     this.wsManager.send(data);
                     process.emit('changed-object', data)
-                    resolve()
-                } else {
-                    resolve(data)
                 }
+                resolve(data)
             } catch (error) {
                 if (data.socket) {
                     this.errorHandler(data, error)
                     this.wsManager.send(data);
-                    resolve()
-                } else {
-                    resolve(data)
                 }
+
+                resolve(data)
             }
         });
     }