@cocreate/users 1.33.1 → 1.34.1

package/CHANGELOG.md

@@ -1,3 +1,34 @@
+## [1.34.1](https://github.com/CoCreate-app/CoCreate-users/compare/v1.34.0...v1.34.1) (2024-01-30)
+
+
+### Bug Fixes
+
+* render response ([33054b5](https://github.com/CoCreate-app/CoCreate-users/commit/33054b5164c370c50692a053d4bc789031208828))
+
+# [1.34.0](https://github.com/CoCreate-app/CoCreate-users/compare/v1.33.1...v1.34.0) (2024-01-30)
+
+
+### Bug Fixes
+
+* add host when sending email to access environments ([8681adc](https://github.com/CoCreate-app/CoCreate-users/commit/8681adc38970838d0e958d40bc07951ce6edb67c))
+* checkSession ([53bb1a9](https://github.com/CoCreate-app/CoCreate-users/commit/53bb1a9b96da627f52446d7273f3af53f7640e2f))
+* checkSession response ([a254266](https://github.com/CoCreate-app/CoCreate-users/commit/a254266a8ef7cdb97d41a635c971f0330d913ac9))
+* forgotPassword email links ([20fc214](https://github.com/CoCreate-app/CoCreate-users/commit/20fc214db4635a9aaece1169fb1364efb8d0ff73))
+* handling of host, origin and path ([78c8e42](https://github.com/CoCreate-app/CoCreate-users/commit/78c8e42285fb2536e003cd7ba98380055f4152b5))
+* if signin success add user_id to socket ([bc64c10](https://github.com/CoCreate-app/CoCreate-users/commit/bc64c10adabb6ac39157eeb40e98786ca594f70f))
+* remove recoveryId once used ([09e5f66](https://github.com/CoCreate-app/CoCreate-users/commit/09e5f66c1e33f884d84960f199f1f7a47995ef53))
+* removed company name ([a3b97c0](https://github.com/CoCreate-app/CoCreate-users/commit/a3b97c0c7aaf9cc205f9aee160c606b5ddbc660f))
+* render forgotPassword response ([77d6482](https://github.com/CoCreate-app/CoCreate-users/commit/77d64821a0a3ce6684db350c9e9c2a2432d4f00a))
+* typo ([d091f69](https://github.com/CoCreate-app/CoCreate-users/commit/d091f69a4f936919741dc070aa438e7ba5471830))
+* update render data to array ([b78dd53](https://github.com/CoCreate-app/CoCreate-users/commit/b78dd53481ccd0827e03e0af2de1c1e28c9316d1))
+
+
+### Features
+
+* checkSession ([a7b000a](https://github.com/CoCreate-app/CoCreate-users/commit/a7b000a0422cd2980cc9f44eb366103ce346b64c))
+* forgotPassword and resetPasword handling ([d5fcca6](https://github.com/CoCreate-app/CoCreate-users/commit/d5fcca62fa2f0588a8b0799f59362719e230b1d2))
+* handle session attribute ([65bde0e](https://github.com/CoCreate-app/CoCreate-users/commit/65bde0e6fe7a41563b30b4fcd86b60b7fc0acfea))
+
 ## [1.33.1](https://github.com/CoCreate-app/CoCreate-users/compare/v1.33.0...v1.33.1) (2024-01-17)
 
 

package/package.json

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

package/src/client.js

@@ -4,6 +4,7 @@ import Actions from '@cocreate/actions';
 import Elements from '@cocreate/elements';
 import { render } from '@cocreate/render';
 import '@cocreate/element-prototype';
+import Observer from '@cocreate/observer'
 import './index.css';
 
 // TODO: Replace with @cocreate/config
@@ -63,11 +64,11 @@ const CoCreateUser = {
 
             render({
                 selector: "[template*='signUp']",
-                data: {
+                data: [{
                     type: 'signUp',
                     message: 'Succesfully Signed Up',
                     success: true
-                }
+                }]
             });
 
             document.dispatchEvent(new CustomEvent('signUp', {
@@ -127,6 +128,8 @@ const CoCreateUser = {
             localStorage.setItem('user_id', user_id);
             localStorage.setItem("token", token);
             message = "Successful signIn";
+            Crud.socket.user_id = user_id
+
             document.dispatchEvent(new CustomEvent('signIn', {
                 detail: {}
             }));
@@ -136,12 +139,12 @@ const CoCreateUser = {
 
         render({
             selector: "[template*='signIn']",
-            data: {
+            data: [{
                 type: 'signIn',
                 status,
                 message,
                 success
-            }
+            }]
         });
     },
 
@@ -152,11 +155,11 @@ const CoCreateUser = {
 
         render({
             selector: "[template*='signOut']",
-            data: {
+            data: [{
                 type: 'signOut',
                 message: 'Succesfully logged out',
                 success: true
-            }
+            }]
         });
 
         // TODO: replace with Custom event system
@@ -176,12 +179,9 @@ const CoCreateUser = {
     },
 
     redirect: (data) => {
-        if (data.user_id !== Crud.socket.user_id || data.clientId !== Crud.socket.clientId)
+        if (data.user_id && data.user_id !== Crud.socket.user_id || data.clientId && data.clientId !== Crud.socket.clientId)
             return
-        // if (data.user_id && data.user_id !== Crud.socket.user_id)
-        //     return
-        // if (!data.user_id && data.clientId !== Crud.socket.clientId)
-        //     return
+
         if (data.userStatus == 'on' || data.userStatus == 'idle') {
             let redirectTag = document.querySelector('[session="true"]');
 
@@ -191,6 +191,7 @@ const CoCreateUser = {
                     document.location.href = redirectLink;
                 }
             }
+
         } else if (data.userStatus == 'off') {
             let redirectTag = document.querySelector('[session="false"]');
 
@@ -204,6 +205,11 @@ const CoCreateUser = {
             }
         }
 
+        if (data.userStatus) {
+            let sessionElements = document.querySelectorAll('[session]:not([href])');
+            for (let i = 0; i < sessionElements.length; i++)
+                sessionElements[i].setAttribute('session', data.userStatus)
+        }
     },
 
     initSession: () => {
@@ -221,8 +227,84 @@ const CoCreateUser = {
     },
 
     // TODO: updatePassword()
-    updatePassword: function (btn) {
-        this.signIn(btn);
+    forgotPassword: async function (action) {
+        let email = action.form.querySelector('input[key="email"]');
+        if (!email)
+            return
+        else
+            email = await email.getValue()
+
+        let from = action.form.querySelector('input[key="from"]');
+        if (from)
+            from = await from.getValue()
+
+        let origin = action.form.querySelector('input[key="origin"]');
+        if (origin)
+            origin = await origin.getValue() || window.location.origin
+
+        let hostname = action.form.querySelector('input[key="origin"]');
+        if (hostname)
+            hostname = await hostname.getValue() || window.location.hostname
+
+        let path = action.form.querySelector('input[key="path"]');
+        if (path)
+            path = await path.getValue()
+
+        let request = {
+            method: 'forgotPassword',
+            email,
+            from,
+            origin,
+            hostname,
+            path
+        }
+
+        Crud.socket.send(request).then((response) => {
+            console.log('forgot password', response)
+            render({
+                selector: "[template*='forgotPassword']",
+                data: [{
+                    type: 'forgotPassword',
+                    message: response.message,
+                    success: response.success
+                }]
+            });
+
+        })
+    },
+
+    resetPassword: async function (action) {
+        let data = {
+            method: 'resetPassword'
+        }
+        let email = action.form.querySelector('input[key="email"]');
+        if (email)
+            data.email = await email.getValue()
+        else return
+
+        let password = action.form.querySelector('input[key="password"]');
+        if (password)
+            data.password = await password.getValue()
+        else return
+
+        let token = action.form.querySelector('input[key="token"]');
+        if (token)
+            data.token = await token.getValue()
+        else return
+
+        Crud.socket.send(data).then((data) => {
+            if (data.success)
+                document.dispatchEvent(new CustomEvent('resetPassword'));
+            else
+                render({
+                    selector: "[template*='resetPassword']",
+                    data: [{
+                        type: 'resetPassword',
+                        message: data.message,
+                        success: data.success,
+                    }]
+                });
+        })
     }
 };
 
@@ -247,9 +329,36 @@ Actions.init([
         callback: (action) => {
             CoCreateUser.signOut(action);
         }
+    },
+    {
+        name: "forgotPassword",
+        endEvent: "forgotPassword",
+        callback: (action) => {
+            CoCreateUser.forgotPassword(action);
+        }
+    },
+    {
+        name: "resetPassword",
+        endEvent: "resetPassword",
+        callback: (action) => {
+            CoCreateUser.resetPassword(action);
+        }
     }
 ]);
 
+Observer.init({
+    name: 'CoCreateElementsRemovedNodes',
+    observe: ['addedNodes'],
+    target: '[session]',
+    callback: () => {
+        Crud.socket.send({
+            method: 'checkSession',
+            broadcast: false,
+            broadcastBrowser: false
+        });
+    }
+});
+
 CoCreateUser.init();
 
 export default CoCreateUser;

package/src/server.js

@@ -10,6 +10,9 @@ class CoCreateUser {
             this.wsManager.on('signUp', (data) => this.signUp(data));
             this.wsManager.on('signIn', (data) => this.signIn(data))
             this.wsManager.on('userStatus', (data) => this.userStatus(data))
+            this.wsManager.on('checkSession', (data) => this.checkSession(data))
+            this.wsManager.on('forgotPassword', (data) => this.forgotPassword(data))
+            this.wsManager.on('resetPassword', (data) => this.resetPassword(data))
         }
     }
 
@@ -136,6 +139,142 @@ class CoCreateUser {
             console.log('userStatus error')
         }
     }
+
+    async checkSession(data) {
+        try {
+            if (!data.socket.user_id) {
+                data.method = 'updateUserStatus'
+                data.userStatus = 'off'
+
+                this.wsManager.send(data)
+            }
+        } catch (error) {
+            console.log('checkSession error')
+        }
+    }
+
+    async forgotPassword(data) {
+        const self = this;
+        try {
+            const recoveryId = this.crud.ObjectId().toString()
+            let socket = data.socket
+            delete data.socket
+
+            data.method = 'object.update'
+            data.array = "keys"
+            data.object = { recoveryId }
+            data.$filter = {
+                query: { email: data.email },
+                limit: 1
+            }
+
+            this.crud.send(data).then(async (data) => {
+                let response = {
+                    socket,
+                    host: data.host,
+                    method: 'forgotPassword',
+                    success: false,
+                    message: "Email does not exist",
+                    organization_id: data.organization_id,
+                    uid: data.uid
+                }
+
+                for (let object of data.object) {
+                    if (object._id) {
+                        // TODO: sendEmail
+                        response.success = true
+                        response.message = "Email Sent"
+                        let htmlBody = `
+<html>
+<head>
+  <title>Reset Your Password</title>
+</head>
+<body>
+  <p>Hello,</p>
+
+  <p>We received a request to reset the password for your account. If you did not make this request, please ignore this email. Otherwise, you can reset your password using the link below.</p>
+
+  <p><a href="${data.origin}${data.path}?email=${data.email}&token=${recoveryId}&recoveyId=${recoveryId}" style="color: #ffffff; background-color: #007bff; padding: 10px 20px; text-decoration: none; border-radius: 5px;">Reset My Password</a></p>
+
+  <p>This link will expire in 24 hours for your security.</p>
+
+  <p>If you're having trouble with the button above, copy and paste the URL below into your web browser:</p>
+  <p><a href="${data.origin}${data.path}?email=${data.email}&token=${recoveryId}&recoveyId=${recoveryId}"">${data.origin}${data.path}?email=${data.email}&token=${recoveryId}&recoveyId=${recoveryId}"</a></p>
+
+  <p>Need more help? Our support team is here for you. Contact us at <a href="mailto:support@${data.hostname}">support@${data.hostname}</a>.</p>
+
+  <p>Thank you for using our services!</p>
+
+</body>
+</html>
+`
+                        let email = {
+                            method: 'postmark.sendEmail',
+                            host: data.host,
+                            postmark: {
+                                "From": data.from,
+                                "To": data.email,
+                                "Subject": "Reset Your Password Easily",
+                                "HtmlBody": htmlBody,
+                                "TextBody": "Hello, \n\nWe received a request to reset the password for your account.If you did not make this request, please ignore this email.Otherwise, you can reset your password by copying and pasting the following link into your browser: https://example.com/reset-password\n\nThis link will expire in 24 hours for your security.\n\nNeed more help? Our support team is here for you at support@example.com.\n\nThank you for using our services!\n\nBest regards,\nThe [Your Company] Team",
+                                "MessageStream": "outbound"
+                            },
+                            organization_id: data.organization_id
+                        }
+
+                        self.wsManager.emit('postmark', email);
+
+                        break
+                    }
+                }
+
+                self.wsManager.send(response)
+            })
+
+        } catch (error) {
+            console.log('signIn failed', error);
+        }
+    }
+
+    async resetPassword(data) {
+        const self = this;
+        try {
+            if (!data.email || !data.password || !data.token)
+                return
+
+            data.method = 'object.update'
+            data.array = "keys"
+            data.object = { password: data.password, recoveryId: "" }
+            data.$filter = {
+                query: { email: data.email, recoveryId: data.token },
+                limit: 1
+            }
+
+            this.crud.send(data).then(async (data) => {
+                let response = {
+                    socket: data.socket,
+                    host: data.host,
+                    method: 'resetPassword',
+                    success: false,
+                    message: "Token is invalid or has expired",
+                    organization_id: data.organization_id,
+                    uid: data.uid
+                }
+
+                for (let object of data.object) {
+                    if (object._id) {
+                        response.success = true
+                        response.message = "Password reset succesfull"
+                        break
+                    }
+                }
+
+                self.wsManager.send(response)
+            })
+        } catch (error) {
+            console.log("Password reset failed", error);
+        }
+    }
 }
 
 module.exports = CoCreateUser;