@cocreate/organizations 1.14.2 → 1.15.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.15.0](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.14.3...v1.15.0) (2023-05-21)
+
+
+### Features
+
+* socket event broadcasting and added user key creation ([cdfe4df](https://github.com/CoCreate-app/CoCreate-organizations/commit/cdfe4df8f217823cfbaff8e5187813cb3a8a4827))
+
+## [1.14.3](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.14.2...v1.14.3) (2023-05-20)
+
+
+### Bug Fixes
+
+* updated dependencies to their latest versions ([5c742a5](https://github.com/CoCreate-app/CoCreate-organizations/commit/5c742a5942052095d7c1553982d27de877184ece))
+
 ## [1.14.2](https://github.com/CoCreate-app/CoCreate-organizations/compare/v1.14.1...v1.14.2) (2023-05-20)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/organizations",
-  "version": "1.14.2",
+  "version": "1.15.0",
   "description": "A simple organizations component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "organizations",
@@ -60,7 +60,7 @@
   },
   "dependencies": {
     "@cocreate/actions": "^1.8.11",
-    "@cocreate/crud-client": "^1.21.2",
+    "@cocreate/crud-client": "^1.21.3",
     "@cocreate/docs": "^1.7.11",
     "@cocreate/form": "^1.14.11",
     "@cocreate/indexeddb": "^1.9.4"

package/src/client.js

@@ -30,19 +30,17 @@ const CoCreateOrganization = {
         user = user.document[0]
 
         let organization_id = organization._id
-        let key = organization.key
 
         if (crud.socket.organization !== true) {
             crud.socket.organization = true
-            crud.socket.create({ organization_id, key })
+            crud.socket.create({ organization_id })
         }
 
         let response = await crud.socket.send('createOrganization', {
             organization,
             user,
             broadcastBrowser: false,
-            organization_id,
-            key
+            organization_id
         });
 
         document.dispatchEvent(new CustomEvent('createdOrganization', {

package/src/server.js

@@ -30,14 +30,22 @@ class CoCreateOrganization {
                 owner: data.user._id
             }
 
-            // TODO: check if user exist and check if credentials match
+            // TODO: check if user exist and confirm credentials
             const user = {
                 _id: data.user._id,
-                name: data.user.name || 'Admin',
-                email: data.user.email,
-                password: data.user.password,
-                currentOrg: data.organization._id,
-                connectedOrgs: [data.organization._id]
+                firstname: data.user.firtname || 'Admin',
+                lastname: data.user.lastname || ''
+            }
+
+            const userKey = {
+                type: "user",
+                key: user._id,
+                roles: ['user'],
+                email: user.document.email,
+                password: user.document.password || btoa('0000'),
+                user: {
+                    collection: 'users'
+                }
             }
 
             const Data = {}
@@ -53,6 +61,11 @@ class CoCreateOrganization {
                 this.wsManager.broadcast(this.platformSocket, 'createDocument', response);
             }
 
+            if (userKey) {
+                const response = await this.crud.createDocument({ ...Data, collection: 'keys', document: userKey })
+                this.wsManager.broadcast(this.platformSocket, 'createDocument', response);
+            }
+
             this.wsManager.send(socket, 'createOrganization', data);
         } catch (error) {
             console.log('createDocument error', error);