@cocreate/users 1.21.2 → 1.21.4

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.21.4](https://github.com/CoCreate-app/CoCreate-users/compare/v1.21.3...v1.21.4) (2023-05-19)
+
+
+### Bug Fixes
+
+* update packages to latest version. This commit updates various packages in the dependencies section of the package.json file to their latest published versions, thereby fixing multiple bugs and improving overall performance. ([57377f1](https://github.com/CoCreate-app/CoCreate-users/commit/57377f19ca386d3d1db4fd22b4a4d7a5ec4eb710))
+
+## [1.21.3](https://github.com/CoCreate-app/CoCreate-users/compare/v1.21.2...v1.21.3) (2023-05-18)
+
+
+### Bug Fixes
+
+* Refactored initialization of client and socket, signIn, signUp, signOut and updateUserStatus methods. ([cd98a9a](https://github.com/CoCreate-app/CoCreate-users/commit/cd98a9a30982ee61b31802c0879528d2d86c195d))
+
 ## [1.21.2](https://github.com/CoCreate-app/CoCreate-users/compare/v1.21.1...v1.21.2) (2023-05-12)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/users",
-  "version": "1.21.2",
+  "version": "1.21.4",
   "description": "A simple users component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "users",
@@ -59,12 +59,12 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/actions": "^1.8.8",
-    "@cocreate/crud-client": "^1.20.4",
-    "@cocreate/docs": "^1.7.8",
-    "@cocreate/element-prototype": "^1.8.7",
-    "@cocreate/form": "^1.14.6",
-    "@cocreate/local-storage": "^1.6.8",
-    "@cocreate/render": "^1.24.8"
+    "@cocreate/actions": "^1.8.10",
+    "@cocreate/crud-client": "^1.21.1",
+    "@cocreate/docs": "^1.7.10",
+    "@cocreate/element-prototype": "^1.8.10",
+    "@cocreate/form": "^1.14.10",
+    "@cocreate/local-storage": "^1.7.1",
+    "@cocreate/render": "^1.24.10"
   }
 }

package/src/client.js

@@ -8,266 +8,266 @@ import './index.css';
 import localStorage from '@cocreate/local-storage';
 
 const CoCreateUser = {
-	init: function() {
-		this.initSocket();
-		this.initSession();
-		this.initChangeOrg();
-	},
-
-	initSocket: function() {
-		const self = this;
-		crud.listen('updateUserStatus', (data) => self.updateUserStatus(data));
-	},
-
-	signIn: function(btn) {
-		let form = btn.closest('form');
-		let collection = form.getAttribute('collection');
-		let query = [];
-
-		const inputs = form.querySelectorAll('input[name="email"], input[name="password"], input[name="username"]');
-
-		inputs.forEach((input) => {
-			const name = input.getAttribute('name');
-			const value = input.getValue();
-			collection = input.getAttribute('collection') || collection;
-			query.push({name, value, operator: '$eq'})
-		});
-
-		let request = {
-			collection,
-			document: {
-				lastSignIn: new Date().toISOString(),
-				current_org: crud.socket.config.organization_id
-			},
-			filter: {
-				query
-			}
-		}
-		
-		const socket = crud.socket.getSockets()
-		if (!socket[0] || !socket[0].connected || window && !window.navigator.onLine || crud.socket.serverOrganization == false) {
-			crud.updateDocument(request).then((response) => {
-				response['success'] = false
-				response['status'] = "signIn failed"
-				if (response.document && response.document[0])  {
-					response['success'] = true
-					response['status'] = "success"
-					this.signInResponse(response)
-				} else {
-					this.signInResponse(response)
-				}
-			})
-		} else {
-			request.broadcastBrowser = false
-			crud.socket.send('signIn', request).then((response) => {
-				this.signInResponse(response)
-			})
-		}
-	},
-
-	signInResponse: function(data) {
-		let { success, status, message, token } = data;
-
-		if (success) {
-			localStorage.setItem('organization_id', crud.socket.config.organization_id);
-			localStorage.setItem("key", crud.socket.config.key);
-			localStorage.setItem("host", crud.socket.config.host);
-			localStorage.setItem('user_id', data.document[0]['_id']);
-			localStorage.setItem("token", token);
-			// document.cookie = `token=${token};path=/`;
-			message = "Succesful signIn";
-			document.dispatchEvent(new CustomEvent('signIn', {
-				detail: {}
-			}));
-		}
-		else
-			message = "The email or password you entered is incorrect";
-
-		render.data({
-			selector: "[template='signIn']",
-			data: {
-				type: 'signIn',
-				status,
-				message,
-				success
-			}
-		});
-	},
-
-	signOut: (btn) => {
-		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({
-			selector: "[template='signOut']",
-			data: {
-				type: 'signOut',
-				message: 'Succesfully logged out',
-				success: true
-			}
-		});
-	
-		// Todo: replace with Custom event system
-		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) {
-			let statusEls = document.querySelectorAll(`[user-status][document_id='${data['user_id']}']`);
-
-			statusEls.forEach((el) => {
-				el.setAttribute('user-status', data['userStatus']);
-			});
-		}
-
-	},
-
-	redirect: (data) => {
-		if (data.user_id && data.user_id !== crud.socket.config.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"]');
-
-			if (redirectTag) {
-				let redirectLink = redirectTag.getAttribute('href');
-				if (redirectLink) {
-					document.location.href = redirectLink;
-				}
-			}
-		} else if (data.userStatus == 'off') {
-			let redirectTag = document.querySelector('[session="false"]');
-
-			if (redirectTag) {
-				let redirectLink = redirectTag.getAttribute('href');
-				if (redirectLink) {
-					localStorage.removeItem("user_id");
-					localStorage.removeItem("token");
-			
-					// this.deleteCookie();
-					document.location.href = redirectLink;
-				}
-			}
-		}
-
-	},
-
-	initSession: () => {
-		let redirectTag = document.querySelector('[session]');
-
-		if (redirectTag) {
-			crud.socket.send('sendMessage', {
-				message: 'checkSession',
-				broadcast: false,
-				broadcastSender: false,
-				broadcastBrowser: false
-			});
-		}
-
-	},
-
-	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();
-
-					})
-			
-				});
-			}
-		}
-	}	
+    init: function () {
+        this.initSocket();
+        this.initSession();
+        this.initChangeOrg();
+    },
+
+    initSocket: function () {
+        const self = this;
+        crud.listen('updateUserStatus', (data) => self.updateUserStatus(data));
+    },
+
+    signIn: function (btn) {
+        let form = btn.closest('form');
+        let collection = form.getAttribute('collection');
+        let query = [];
+
+        const inputs = form.querySelectorAll('input[name="email"], input[name="password"], input[name="username"]');
+
+        inputs.forEach((input) => {
+            const name = input.getAttribute('name');
+            const value = input.getValue();
+            collection = input.getAttribute('collection') || collection;
+            query.push({ name, value, operator: '$eq' })
+        });
+
+        let request = {
+            collection,
+            document: {
+                lastSignIn: new Date().toISOString(),
+                current_org: crud.socket.config.organization_id
+            },
+            filter: {
+                query
+            }
+        }
+
+        const socket = crud.socket.getSockets()
+        if (!socket[0] || !socket[0].connected || window && !window.navigator.onLine || crud.socket.serverOrganization == false) {
+            crud.updateDocument(request).then((response) => {
+                response['success'] = false
+                response['status'] = "signIn failed"
+                if (response.document && response.document[0]) {
+                    response['success'] = true
+                    response['status'] = "success"
+                    this.signInResponse(response)
+                } else {
+                    this.signInResponse(response)
+                }
+            })
+        } else {
+            request.broadcastBrowser = false
+            crud.socket.send('signIn', request).then((response) => {
+                this.signInResponse(response)
+            })
+        }
+    },
+
+    signInResponse: function (data) {
+        let { success, status, message, token } = data;
+
+        if (success) {
+            localStorage.setItem('organization_id', crud.socket.config.organization_id);
+            localStorage.setItem("key", crud.socket.config.key);
+            localStorage.setItem("host", crud.socket.config.host);
+            localStorage.setItem('user_id', data.document[0]['_id']);
+            localStorage.setItem("token", token);
+            // document.cookie = `token=${token};path=/`;
+            message = "Succesful signIn";
+            document.dispatchEvent(new CustomEvent('signIn', {
+                detail: {}
+            }));
+        }
+        else
+            message = "The email or password you entered is incorrect";
+
+        render.data({
+            selector: "[template='signIn']",
+            data: {
+                type: 'signIn',
+                status,
+                message,
+                success
+            }
+        });
+    },
+
+    signOut: (btn) => {
+        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({
+            selector: "[template='signOut']",
+            data: {
+                type: 'signOut',
+                message: 'Succesfully logged out',
+                success: true
+            }
+        });
+
+        // TODO: replace with Custom event system
+        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) {
+            let statusEls = document.querySelectorAll(`[user-status][document_id='${data['user_id']}']`);
+
+            statusEls.forEach((el) => {
+                el.setAttribute('user-status', data['userStatus']);
+            });
+        }
+
+    },
+
+    redirect: (data) => {
+        if (data.user_id && data.user_id !== crud.socket.config.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"]');
+
+            if (redirectTag) {
+                let redirectLink = redirectTag.getAttribute('href');
+                if (redirectLink) {
+                    document.location.href = redirectLink;
+                }
+            }
+        } else if (data.userStatus == 'off') {
+            let redirectTag = document.querySelector('[session="false"]');
+
+            if (redirectTag) {
+                let redirectLink = redirectTag.getAttribute('href');
+                if (redirectLink) {
+                    localStorage.removeItem("user_id");
+                    localStorage.removeItem("token");
+
+                    // this.deleteCookie();
+                    document.location.href = redirectLink;
+                }
+            }
+        }
+
+    },
+
+    initSession: () => {
+        let redirectTag = document.querySelector('[session]');
+
+        if (redirectTag) {
+            crud.socket.send('sendMessage', {
+                message: 'checkSession',
+                broadcast: false,
+                broadcastSender: false,
+                broadcastBrowser: false
+            });
+        }
+
+    },
+
+    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();
+
+                    })
+
+                });
+            }
+        }
+    }
 };
 
 
 action.init({
-	name: "signUp",
-	endEvent: "signUp",
-	callback: (btn, data) => {
-		CoCreateUser.signUp(btn);
-	},
+    name: "signUp",
+    endEvent: "signUp",
+    callback: (btn, data) => {
+        CoCreateUser.signUp(btn);
+    },
 });
 
 action.init({
-	name: "signIn",
-	endEvent: "signIn",
-	callback: (btn, data) => {
-		CoCreateUser.signIn(btn, data);
-	},
+    name: "signIn",
+    endEvent: "signIn",
+    callback: (btn, data) => {
+        CoCreateUser.signIn(btn, data);
+    },
 });
 
 action.init({
-	name: "signOut",
-	endEvent: "signOut",
-	callback: (btn, data) => {
-		CoCreateUser.signOut(btn, data);
-	},
+    name: "signOut",
+    endEvent: "signOut",
+    callback: (btn, data) => {
+        CoCreateUser.signOut(btn, data);
+    },
 });
 
 CoCreateUser.init();