@cocreate/users 1.27.5 → 1.27.6

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [1.27.6](https://github.com/CoCreate-app/CoCreate-users/compare/v1.27.5...v1.27.6) (2023-10-19)
+
+
+### Bug Fixes
+
+* data.socket not found ([0b0b1e3](https://github.com/CoCreate-app/CoCreate-users/commit/0b0b1e32546758ef0ec0782817b3d5c94c595ee5))
+* declartion of render functions using object spread ([30f9242](https://github.com/CoCreate-app/CoCreate-users/commit/30f924235a66ce2be22a9f53d92e6425db59708e))
+* missing await and organization_id ([df79036](https://github.com/CoCreate-app/CoCreate-users/commit/df79036e7ba786bf6698c2cad91c5bbd4f3e50b5))
+* replaced message with socket ([5036966](https://github.com/CoCreate-app/CoCreate-users/commit/503696642d5df6c8fba76862fc59db1d010b3dea))
+* signup ([bf716d8](https://github.com/CoCreate-app/CoCreate-users/commit/bf716d8d94cf16641e01cb3ca56f4ecbe41cebef))
+* update to support socket ([3fdd085](https://github.com/CoCreate-app/CoCreate-users/commit/3fdd0853d83ade29069977570dcb9ad67bf17318))
+
 ## [1.27.5](https://github.com/CoCreate-app/CoCreate-users/compare/v1.27.4...v1.27.5) (2023-10-17)
 
 

package/package.json

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

package/src/client.js

@@ -1,10 +1,12 @@
 /*globals CustomEvent, btoa*/
 import Crud from '@cocreate/crud-client';
-import Action from '@cocreate/actions';
+import Actions from '@cocreate/actions';
 import Elements from '@cocreate/elements';
-import Render from '@cocreate/render';
+import { render } from '@cocreate/render';
 import '@cocreate/element-prototype';
 import './index.css';
+
+// TODO: Replace with @cocreate/config
 import localStorage from '@cocreate/local-storage';
 
 const CoCreateUser = {
@@ -22,51 +24,43 @@ const CoCreateUser = {
         Crud.listen('updateUserStatus', (data) => self.updateUserStatus(data));
     },
 
-    signUp: async function (btn) {
-        let formEl = btn.closest("form");
-        if (!formEl) return;
+    signUp: async function (action) {
+        if (!action.form) return;
 
-        let array = formEl.getAttribute('array')
-        if (!array) {
-            for (let el of formEl) {
-                array = el.getAttribute('array');
-                if (array)
-                    break;
-            }
-        }
+        let data = await Elements.save(action.form)
+        let user = data[0]
+        // data.method = 'create.object'
+        // data['array'] = array
 
-        let data = Elements.getFormData(formEl, array)
-        data.method = 'create.object'
-        data['array'] = array
-        data.organization_id = organization_id;
+        // data.organization_id = organization_id;
 
-        if (!data.object[0]._id)
-            data.object[0]._id = Crud.ObjectId();
+        // if (!data.object[0]._id)
+        //     data.object[0]._id = Crud.ObjectId();
 
-        let user = await Crud.send(data)
-        Elements.setTypeValue(formEl, user)
+        // let user = await Crud.send(data)
+        // Elements.setTypeValue(formEl, user)
 
         // const socket = Crud.socket.getSockets()
         // if (!socket[0] || !socket[0].connected || window && !window.navigator.onLine) {
         let key = {
+            status: 'await',
             method: 'create.object',
             array: 'keys',
             object: {
                 type: "user",
                 key: user.object[0]._id,
                 roles: ['user'],
-                email: user.object.email,
-                password: user.object.password || btoa('0000'),
-                array
-            },
-            organization_id
+                email: user.object[0].email,
+                password: user.object[0].password || btoa('0000'),
+                array: data.array
+            }
         }
 
         let response = await Crud.send(key)
         if (response && response.object && response.object[0]) {
-            Crud.socket.send({ method: 'signUp', user, userKey })
+            // Crud.socket.send({ method: 'signUp', user, userKey })
 
-            Render.data({
+            render({
                 selector: "[template='signUp']",
                 data: {
                     type: 'signUp',
@@ -82,29 +76,26 @@ const CoCreateUser = {
         }
     },
 
-    signIn: async function (btn) {
-        let form = btn.closest('form');
-        let array = form.getAttribute('array');
+    signIn: async function (action) {
+        if (!action.form) return;
         let query = [];
 
-        const inputs = form.querySelectorAll('input[key="email"], input[key="password"], input[key="username"]');
+        const inputs = action.form.querySelectorAll('input[key="email"], input[key="password"], input[key="username"]');
         for (let i = 0; i < inputs.length; i++) {
             const key = inputs[i].getAttribute('key');
             const value = await inputs[i].getValue();
-            array = 'keys';
             query.push({ key, value, operator: '$eq' })
         }
 
         let request = {
             method: 'read.object',
-            db: 'indexeddb',
-            array,
+            array: 'keys',
             $filter: {
                 query
             }
         }
 
-        const socket = Crud.socket.getSockets()
+        const socket = await Crud.socket.getSockets()
         if (!socket[0] || !socket[0].connected || window && !window.navigator.onLine || Crud.socket.serverOrganization == false) {
             Crud.send(request).then((response) => {
                 response['success'] = false
@@ -129,14 +120,13 @@ const CoCreateUser = {
     },
 
     signInResponse: function (data) {
-        let { success, status, message, user_id, token } = data;
+        let { success, status, message, organization_id, user_id, token } = data;
         if (success) {
             localStorage.setItem('organization_id', organization_id);
             localStorage.setItem("key", Crud.socket.key);
             localStorage.setItem("host", Crud.socket.host);
             localStorage.setItem('user_id', user_id);
             localStorage.setItem("token", token);
-            // document.cookie = `token=${token};path=/`;
             message = "Succesful signIn";
             document.dispatchEvent(new CustomEvent('signIn', {
                 detail: {}
@@ -145,7 +135,7 @@ const CoCreateUser = {
         else
             message = "The email or password you entered is incorrect";
 
-        Render.data({
+        render({
             selector: "[template='signIn']",
             data: {
                 type: 'signIn',
@@ -156,18 +146,12 @@ const CoCreateUser = {
         });
     },
 
-    signOut: (btn) => {
+    signOut: () => {
         self = this;
         localStorage.removeItem("user_id");
         localStorage.removeItem("token");
 
-        // let allCookies = document.cookie.split(';');
-
-        // for (var i = 0; i < allCookies.length; i++)
-        // 	document.cookie = allCookies[i] + "=;expires=" +
-        // 	new Date(0).toUTCString();
-
-        Render.data({
+        render({
             selector: "[template='signOut']",
             data: {
                 type: 'signOut',
@@ -214,8 +198,6 @@ const CoCreateUser = {
                 if (redirectLink) {
                     localStorage.removeItem("user_id");
                     localStorage.removeItem("token");
-
-                    // this.deleteCookie();
                     document.location.href = redirectLink;
                 }
             }
@@ -228,8 +210,7 @@ const CoCreateUser = {
 
         if (redirectTag) {
             Crud.socket.send({
-                method: 'sendMessage',
-                message: 'checkSession',
+                method: 'checkSession',
                 broadcast: false,
                 broadcastSender: false,
                 broadcastBrowser: false
@@ -244,30 +225,29 @@ const CoCreateUser = {
     }
 };
 
-
-Action.init({
-    name: "signUp",
-    endEvent: "signUp",
-    callback: (data) => {
-        CoCreateUser.signUp(data.element);
-    },
-});
-
-Action.init({
-    name: "signIn",
-    endEvent: "signIn",
-    callback: (data) => {
-        CoCreateUser.signIn(data.element);
+Actions.init([
+    {
+        name: "signUp",
+        endEvent: "signUp",
+        callback: (action) => {
+            CoCreateUser.signUp(action);
+        }
     },
-});
-
-Action.init({
-    name: "signOut",
-    endEvent: "signOut",
-    callback: (data) => {
-        CoCreateUser.signOut(data.element);
+    {
+        name: "signIn",
+        endEvent: "signIn",
+        callback: (action) => {
+            CoCreateUser.signIn(action);
+        }
     },
-});
+    {
+        name: "signOut",
+        endEvent: "signOut",
+        callback: (action) => {
+            CoCreateUser.signOut(action);
+        }
+    }
+]);
 
 CoCreateUser.init();
 

package/src/server.js

@@ -14,9 +14,7 @@ class CoCreateUser {
     }
 
     async signUp(data) {
-        const self = this;
         try {
-
             if (data.user) {
                 data.user.method = 'create.object'
                 const response = await this.crud.send(data.user)
@@ -29,10 +27,10 @@ class CoCreateUser {
                 this.wsManager.send(response);
             }
 
-            self.wsManager.send(data);
+            this.wsManager.send(data);
 
         } catch (error) {
-            console.log('create.object error', error);
+            console.log('signup error', error);
         }
     }
 
@@ -51,42 +49,37 @@ class CoCreateUser {
         const self = this;
         try {
             data.method = 'read.object'
+            let socket = data.socket
+            delete data.socket
+
             this.crud.send(data).then(async (data) => {
                 let response = {
+                    socket,
                     method: 'signIn',
                     success: false,
                     message: "signIn failed",
-                    status: "failed",
                     userStatus: 'off',
+                    organization_id: data.organization_id,
                     uid: data.uid
                 }
 
                 if (data.object[0] && data.object[0]._id && self.wsManager.authenticate) {
                     const user_id = data.object[0].key
-                    const token = await self.wsManager.authenticate.generateToken({ user_id });
+                    const token = await self.wsManager.authenticate.encodeToken({ user_id });
 
                     if (token && token != 'null') {
-                        response = {
-                            success: true,
-                            message: "signIn successful",
-                            status: "success",
-                            userStatus: 'on',
-                            user_id,
-                            token,
-                            uid: data.uid
-                        };
-
-                        // if (data.organization_id != process.env.organization_id) {
-                        //     let Data = { organization_id: process.env.organization_id }
-                        //     Data.object['_id'] = data.object[0]._id
-                        //     Data.object['lastsignIn'] = data.object[0].lastsignIn
-                        //     Data.object['organization_id'] = process.env.organization_id
-                        //     crud.send(Data)
-                        // }
+                        socket.user_id = user_id
+                        response.success = true
+                        response.message = "signIn successful"
+                        response.userStatus = 'on'
+                        response.user_id = user_id
+                        response.token = token
+                        response.userStatus = 'on'
                     }
                 }
                 self.wsManager.send(response)
                 self.wsManager.send({
+                    socket,
                     method: 'updateUserStatus',
                     user_id: response.user_id,
                     userStatus: response.userStatus,
@@ -106,24 +99,34 @@ class CoCreateUser {
     async userStatus(data) {
         const self = this;
         try {
-            if (!data.user_id || !data.userStatus)
-                return
-            data.array = 'users'
-            data['object'] = {
-                _id: data.user_id,
-                userStatus: data.userStatus
-            }
+            if (data.user_id && data.userStatus) {
+                data.array = 'users'
+                data['object'] = {
+                    _id: data.user_id,
+                    userStatus: data.userStatus
+                }
 
-            data.method = 'update.object'
-            this.crud.send(data).then((data) => {
-                self.wsManager.send({
+                data.method = 'update.object'
+                data = await this.crud.send(data)
+
+                if (data.socket)
+                    self.wsManager.send({
+                        socket: data.socket,
+                        method: 'updateUserStatus',
+                        user_id: data.user_id,
+                        userStatus: data.userStatus,
+                        token: data.token,
+                        organization_id: data.organization_id || socket.organization_id
+                    })
+            } else if (data.socket)
+                data.socket.send(JSON.stringify({
                     method: 'updateUserStatus',
                     user_id: data.user_id,
                     userStatus: data.userStatus,
+                    token: data.token,
                     organization_id: data.organization_id || socket.organization_id
-                })
+                }))
 
-            })
 
         } catch (error) {
             console.log('userStatus error')