@cocreate/users 1.21.7 → 1.22.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.22.1](https://github.com/CoCreate-app/CoCreate-users/compare/v1.22.0...v1.22.1) (2023-05-21)
+
+
+### Bug Fixes
+
+* Remove unused function from client.js ([11fb260](https://github.com/CoCreate-app/CoCreate-users/commit/11fb2601c31e60b56b9463462dd9a44f70a797d2))
+
+# [1.22.0](https://github.com/CoCreate-app/CoCreate-users/compare/v1.21.7...v1.22.0) (2023-05-21)
+
+
+### Features
+
+* signup create a user and userKey ([67da925](https://github.com/CoCreate-app/CoCreate-users/commit/67da925f23ebdbc4ae0e38452f6a00d020691a62))
+
 ## [1.21.7](https://github.com/CoCreate-app/CoCreate-users/compare/v1.21.6...v1.21.7) (2023-05-20)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/users",
-  "version": "1.21.7",
+  "version": "1.22.1",
   "description": "A simple users component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "users",

package/src/client.js

@@ -11,7 +11,6 @@ const CoCreateUser = {
     init: function () {
         this.initSocket();
         this.initSession();
-        this.initChangeOrg();
     },
 
     initSocket: function () {
@@ -19,6 +18,67 @@ const CoCreateUser = {
         crud.listen('updateUserStatus', (data) => self.updateUserStatus(data));
     },
 
+    signUp: async function (btn) {
+        let formEl = btn.closest("form");
+        if (!formEl) return;
+
+        let organization_id = crud.socket.config.organization_id;
+        let collection = form.getAttribute('collection')
+        if (!collection) {
+            for (let el of formEl) {
+                collection = el.getAttribute('collection');
+                if (collection)
+                    break;
+            }
+        }
+
+        let data = form.getData(formEl, collection)
+        data['collection'] = collection
+        data.organization_id = organization_id;
+
+        if (!data.document[0]._id)
+            data.document[0]._id = crud.ObjectId();
+
+        let user = await crud.createDocument(data)
+        form.setDocumentId(formEl, user)
+
+        // const socket = crud.socket.getSockets()
+        // if (!socket[0] || !socket[0].connected || window && !window.navigator.onLine) {
+        let key = {
+            collection: 'keys',
+            document: {
+                type: "user",
+                key: user.document[0]._id,
+                roles: ['user'],
+                email: user.document.email,
+                password: user.document.password || btoa('0000'),
+                user: {
+                    collection
+                }
+            },
+            organization_id
+        }
+
+        let response = await crud.createDocument(key)
+        if (response && response.document && response.document[0]) {
+            crud.socket.send('signUp', { user, userKey })
+
+            render.data({
+                selector: "[template='signUp']",
+                data: {
+                    type: 'signUp',
+                    message: 'Succesfully Signed Up',
+                    success: true
+                }
+            });
+
+            document.dispatchEvent(new CustomEvent('signUp', {
+                detail: response
+            }));
+
+        }
+    },
+
     signIn: function (btn) {
         let form = btn.closest('form');
         let collection = form.getAttribute('collection');
@@ -117,39 +177,6 @@ const CoCreateUser = {
         document.dispatchEvent(new CustomEvent('signOut'));
     },
 
-    signUp: function (btn) {
-        let formEl = btn.closest("form");
-        if (!formEl) return;
-
-        let organization_id = crud.socket.config.organization_id;
-        let data = form.getData(formEl, 'users')
-        data['collection'] = 'users'
-        // data.document['current_org'] = organization_id;
-        // data.document['connected_orgs'] = [organization_id];
-        data.organization_id = [organization_id];
-
-        // const socket = crud.socket.getSockets()
-        // if (!socket[0] || !socket[0].connected || window && !window.navigator.onLine) {
-        // TODO: can use updateDocument with filter query
-        crud.createDocument(data).then((response) => {
-            form.setDocumentId(formEl, response)
-
-            render.data({
-                selector: "[template='signUp']",
-                data: {
-                    type: 'signUp',
-                    message: 'Succesfully Signed Up',
-                    success: true
-                }
-            });
-
-            document.dispatchEvent(new CustomEvent('signUp', {
-                detail: response
-            }));
-
-        })
-    },
-
     updateUserStatus: function (data) {
         this.redirect(data)
         if (data.user_id) {
@@ -207,40 +234,9 @@ const CoCreateUser = {
 
     },
 
-    initChangeOrg: () => {
-        const user_id = localStorage.getItem('user_id');
-
-        if (!user_id) return;
-
-        let orgChangers = document.querySelectorAll('.org-changer');
-
-        for (let i = 0; i < orgChangers.length; i++) {
-            let orgChanger = orgChangers[i];
-
-            const collection = orgChanger.getAttribute('collection');
-            const id = orgChanger.getAttribute('document_id');
-
-            if (collection == 'users' && id == user_id) {
-                orgChanger.addEventListener('selected', function (e) {
-                    // TODO: can get selected value from event/element, readDocument not required. 
-                    crud.readDocument({
-                        collection: collection || 'users',
-                        document: {
-                            _id: user_id
-                        },
-                    }).then((data) => {
-                        localStorage.setItem('key', data['key']);
-                        localStorage.setItem('organization_id', data.document[0]['current_org']);
-                        localStorage.setItem('host', crud.socket.config.host);
-
-                        document.dispatchEvent(new CustomEvent('signIn'));
-                        window.location.reload();
-
-                    })
-
-                });
-            }
-        }
+    // TODO: updatePassword()
+    updatePassword: function (btn) {
+        this.signIn(btn);
     }
 };
 

package/src/server.js

@@ -15,33 +15,20 @@ class CoCreateUser {
 
     async signUp(socket, data) {
         const self = this;
-        if (!data.document) return;
-
         try {
-            // Create new user in config db users collection
-            this.crud.createDocument(data).then((data) => {
-                if (data.document[0] && data.document[0]._id) {
-                    // const orgDB = data.orgDB;
-
-                    // if new orgDb Create new user in new org db users collection
-                    // if (orgDB && orgDB != data.organization_id) {
-                    // 	let Data = {...data, organization_id: orgDB}
-                    // 	self.crud.createDocument(Data)
-                    // }
 
-                    self.wsManager.broadcast(socket, 'updateDocument', data);
-                    self.wsManager.send(socket, 'signUp', data);
+            if (data.user) {
+                const response = await this.crud.createDocument(data.user)
+                this.wsManager.broadcast(socket, 'createDocument', response);
+            }
 
+            if (data.userKey) {
+                const response = await this.crud.createDocument(data.userKey)
+                this.wsManager.broadcast(socket, 'createDocument', response);
+            }
 
-                    // add new user to platformDB
-                    if (data.organization_id != process.env.organization_id) {
-                        let Data = { ...data, organization_id: process.env.organization_id }
-                        self.crud.createDocument(Data)
-                    }
-                }
+            self.wsManager.send(socket, 'signUp', data);
 
-                // self.wsManager.broadcast(socket, 'updateUserStatus', data)
-            })
         } catch (error) {
             console.log('createDocument error', error);
         }