@cocreate/users 1.34.1 → 1.35.0

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+# [1.35.0](https://github.com/CoCreate-app/CoCreate-users/compare/v1.34.2...v1.35.0) (2024-02-13)
+
+
+### Features
+
+* acceptInvite ([4b3db33](https://github.com/CoCreate-app/CoCreate-users/commit/4b3db33c2057968f8b37b9f618de7120a4b6f36d))
+* acceptUser ([45c6869](https://github.com/CoCreate-app/CoCreate-users/commit/45c68699f5d978f02b6f9d550a04b853da2d64f5))
+* inviteUser function ([593d9ad](https://github.com/CoCreate-app/CoCreate-users/commit/593d9add42568a0fa87060595daffdbee662212f))
+
+## [1.34.2](https://github.com/CoCreate-app/CoCreate-users/compare/v1.34.1...v1.34.2) (2024-02-05)
+
+
+### Bug Fixes
+
+* hostname selector ([3b6d38d](https://github.com/CoCreate-app/CoCreate-users/commit/3b6d38d74a09cf72ff5440e2dc1647c5bc078675))
+* Removed https://cdn.cocreate.app/latest/CoCreate.min.css ([aaa7944](https://github.com/CoCreate-app/CoCreate-users/commit/aaa79444b46077144b81f84c524dd49d9744622f))
+
 ## [1.34.1](https://github.com/CoCreate-app/CoCreate-users/compare/v1.34.0...v1.34.1) (2024-01-30)
 
 

package/docs/index.html

@@ -21,11 +21,6 @@
             property="og:image"
             content="https://cdn.cocreate.app/docs/users.png" />
 
-        <!-- CoCreate CSS -->
-        <link
-            rel="stylesheet"
-            href="https://cdn.cocreate.app/latest/CoCreate.min.css"
-            type="text/css" />
         <link
             rel="stylesheet"
             href="../index.css"

package/package.json

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

package/src/client.js

@@ -168,8 +168,12 @@ const CoCreateUser = {
 
     updateUserStatus: function (data) {
         this.redirect(data)
+        let statusEls
         if (data.user_id) {
-            let statusEls = document.querySelectorAll(`[user-status][object='${data['user_id']}']`);
+            if (data.user_id === Crud.socket.user_id)
+                statusEls = document.querySelectorAll(`[user-status][object='${data['user_id']}'], [user-status][object='$user_id']`);
+            else
+                statusEls = document.querySelectorAll(`[user-status][object='${data['user_id']}']`);
 
             statusEls.forEach((el) => {
                 el.setAttribute('user-status', data['userStatus']);
@@ -226,7 +230,92 @@ const CoCreateUser = {
 
     },
 
-    // TODO: updatePassword()
+    inviteUser: async function (action) {
+        let email = action.form.querySelector('input[key="email"]');
+        if (!email)
+            return
+        else
+            email = await email.getValue()
+
+        let name = action.form.querySelector('input[key="name"]');
+        if (name)
+            name = await name.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="hostname"]');
+        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: 'inviteUser',
+            name,
+            email,
+            from,
+            origin,
+            hostname,
+            path
+        }
+
+        Crud.socket.send(request).then((response) => {
+            render({
+                selector: "[template*='inviteUser']",
+                data: [{
+                    type: 'inviteUser',
+                    message: response.message,
+                    success: response.success
+                }]
+            });
+
+        })
+    },
+
+    acceptInvite: async function (action) {
+        let data = {
+            method: 'acceptInvite',
+            success: false
+        }
+
+        let token = action.form.querySelector('input[key="token"]');
+        if (token)
+            data.token = await token.getValue()
+        let user_id = action.form.querySelector('input[key="_id"]');
+        if (user_id)
+            data.user_id = await user_id.getValue()
+        let email = action.form.querySelector('input[key="email"]');
+        if (email)
+            data.email = await email.getValue()
+
+        if (data.token && data.user_id) {
+            data = await Crud.socket.send(data)
+        } else {
+            data.message = 'Invitation failed'
+        }
+
+        if (data.success)
+            document.dispatchEvent(new CustomEvent('acceptInvite'));
+        else
+            render({
+                selector: "[template*='acceptInvite']",
+                data: [{
+                    type: 'acceptInvite',
+                    message: data.message,
+                    success: data.success,
+                }]
+            });
+    },
+
+
     forgotPassword: async function (action) {
         let email = action.form.querySelector('input[key="email"]');
         if (!email)
@@ -242,7 +331,7 @@ const CoCreateUser = {
         if (origin)
             origin = await origin.getValue() || window.location.origin
 
-        let hostname = action.form.querySelector('input[key="origin"]');
+        let hostname = action.form.querySelector('input[key="hostname"]');
         if (hostname)
             hostname = await hostname.getValue() || window.location.hostname
 
@@ -330,6 +419,20 @@ Actions.init([
             CoCreateUser.signOut(action);
         }
     },
+    {
+        name: "inviteUser",
+        endEvent: "inviteUser",
+        callback: (action) => {
+            CoCreateUser.inviteUser(action);
+        }
+    },
+    {
+        name: "acceptInvite",
+        endEvent: "acceptInvite",
+        callback: (action) => {
+            CoCreateUser.acceptInvite(action);
+        }
+    },
     {
         name: "forgotPassword",
         endEvent: "forgotPassword",

package/src/server.js

@@ -11,6 +11,8 @@ class CoCreateUser {
             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('inviteUser', (data) => this.inviteUser(data))
+            this.wsManager.on('acceptInvite', (data) => this.acceptInvite(data))
             this.wsManager.on('forgotPassword', (data) => this.forgotPassword(data))
             this.wsManager.on('resetPassword', (data) => this.resetPassword(data))
         }
@@ -153,6 +155,128 @@ class CoCreateUser {
         }
     }
 
+    async inviteUser(data) {
+        try {
+            const inviteId = this.crud.ObjectId().toString()
+            let socket = data.socket
+            delete data.socket
+
+            data.method = 'object.update'
+            data.array = "users"
+            data.object = { _id: data.user_id, '$addToSet.invitations': inviteId, '$addToSet.members': data.email }
+
+            data = await this.crud.send(data)
+
+            let htmlBody = `
+<html>
+<head>
+  <title>Welcome to Yellow Oracle!</title>
+</head>
+<body>
+  <p>Hello,</p>
+
+  <p>You have been invited to join ${data.name} on Yellow Oracle.</p>
+
+  <p><a href="${data.origin}${data.path}?email=${data.email}&token=${inviteId}&user_id=${data.user_id}&name=${data.name}" style="color: #ffffff; background-color: #FFD700; padding: 10px 20px; text-decoration: none; border-radius: 5px;">Accept Your Invitation</a></p>
+
+  <p>Please note, this invitation link will expire in 48 hours. We encourage you to accept it soon to begin your journey with ${data.name} on Yellow Oracle.</p>
+
+  <p>If the button above doesn't work, you can copy and paste the following URL into your web browser:</p>
+  <p><a href="${data.origin}${data.path}?email=${data.email}&token=${inviteId}&user_id=${data.user_id}&name=${data.name}">${data.origin}${data.path}?email=${data.email}&token=${inviteId}&user_id=${data.user_id}&name=${data.name}</a></p>
+
+  <p>If you received this invitation by mistake or have any questions, please don't hesitate to get in touch with our support team at <a href="mailto:support@${data.hostname}">support@${data.hostname}</a>.</p>
+
+  <p>We look forward to welcoming you to ${data.name}'s Yellow Oracle account!</p>
+
+</body>
+</html>                                                                             
+`;
+
+            let email = {
+                method: 'postmark.sendEmail',
+                host: data.host,
+                postmark: {
+                    "From": data.from,
+                    "To": data.email,
+                    "Subject": `${data.name} has invited you to join them on Yellow Oracle`,
+                    "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
+            }
+
+            // TODO: wsManager.emit('postmark', email) needs to await response
+            this.wsManager.emit('postmark', email);
+
+            let response = {
+                socket,
+                host: data.host,
+                method: 'inviteUser',
+                success: true,
+                message: "Succesfully sent invite",
+                organization_id: data.organization_id,
+                uid: data.uid
+            }
+
+            this.wsManager.send(response)
+
+        } catch (error) {
+            data.error = error
+            this.wsManager.send(data)
+
+            console.log('Invite User failed', error);
+        }
+    }
+
+    async acceptInvite(data) {
+        const self = this;
+        try {
+            if (!data.token || !data.user_id) {
+                // TODO: handle error
+                return
+            }
+
+            data.method = 'object.update'
+            data.array = "users"
+            data.object = { '$pull.invitations': data.token, '$pull.members': data.email }
+            data.$filter = {
+                query: { invitations: { $in: [data.token] }, members: { $in: [data.email] } },
+                limit: 1
+            }
+
+            data = await this.crud.send(data)
+
+            let response = {
+                socket: data.socket,
+                host: data.host,
+                method: 'acceptInvite',
+                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) {
+                    delete data.$filter
+                    data.object = { _id: object._id, '$addToSet.members': data.user_id }
+                    data = await this.crud.send(data)
+
+                    response.success = true
+                    response.message = "Invite Accepted"
+                    break
+                }
+            }
+
+            self.wsManager.send(response)
+
+        } catch (error) {
+            console.log("Password reset failed", error);
+        }
+    }
+
+
     async forgotPassword(data) {
         const self = this;
         try {
@@ -222,6 +346,7 @@ class CoCreateUser {
                             organization_id: data.organization_id
                         }
 
+                        // TODO: wsManager.emit('postmark', email) needs to await response
                         self.wsManager.emit('postmark', email);
 
                         break
@@ -232,7 +357,7 @@ class CoCreateUser {
             })
 
         } catch (error) {
-            console.log('signIn failed', error);
+            console.log('Forgot Password failed', error);
         }
     }