@cocreate/users 1.12.3 → 1.13.0

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+# [1.13.0](https://github.com/CoCreate-app/CoCreate-users/compare/v1.12.4...v1.13.0) (2022-12-29)
+
+
+### Bug Fixes
+
+* bump dependencies ([df8da39](https://github.com/CoCreate-app/CoCreate-users/commit/df8da39598a9f0339b2d56f02e45c16a61b2448b))
+
+
+### Features
+
+* if userStatus is off trigger redirect ([afe3a67](https://github.com/CoCreate-app/CoCreate-users/commit/afe3a67890d9328dfdf106a81f9eb427aacf92d4))
+
+## [1.12.4](https://github.com/CoCreate-app/CoCreate-users/compare/v1.12.3...v1.12.4) (2022-12-27)
+
+
+### Bug Fixes
+
+* bump dependecies ([9062616](https://github.com/CoCreate-app/CoCreate-users/commit/90626161128ec491198d11fbf684f1585ae1c33c))
+* bump dependencies ([e38cb03](https://github.com/CoCreate-app/CoCreate-users/commit/e38cb034ddd56b5b336476a017d5aecc2846ebac))
+
 ## [1.12.3](https://github.com/CoCreate-app/CoCreate-users/compare/v1.12.2...v1.12.3) (2022-12-25)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/users",
-  "version": "1.12.3",
+  "version": "1.13.0",
   "description": "A simple users component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "users",
@@ -60,10 +60,10 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/actions": "^1.5.43",
-    "@cocreate/crud-client": "^1.17.0",
-    "@cocreate/docs": "^1.4.25",
-    "@cocreate/element-prototype": "^1.2.12",
-    "@cocreate/render": "^1.17.9"
+    "@cocreate/actions": "^1.5.45",
+    "@cocreate/crud-client": "^1.17.5",
+    "@cocreate/docs": "^1.4.27",
+    "@cocreate/element-prototype": "^1.2.17",
+    "@cocreate/render": "^1.17.11"
   }
 }

package/src/client.js

@@ -6,14 +6,10 @@ import '@cocreate/element-prototype';
 import './index.css';
 
 
-const CONST_PERMISSION_CLASS = 'checkPermission';
-
 const CoCreateUser = {
 	init: function() {
-		// this.updatedCurrentOrg = false;
 		this.initSocket();
 		this.initChangeOrg();
-		this.checkSession();
 	},
 
 	initSocket: function() {
@@ -34,9 +30,9 @@ const CoCreateUser = {
 				detail: data
 			}));
 		});
-		crud.listen('fetchedUser', this.checkPermissions);
-		crud.listen('signIn', (instance) => self.signInResponse(instance));
-		crud.listen('updateUserStatus', this.updateUserStatus);
+
+		crud.listen('signIn', (data) => self.signInResponse(data));
+		crud.listen('updateUserStatus', (data) => self.updateUserStatus(data));
 	},
 
 	signInRequest: function(btn) {
@@ -141,131 +137,6 @@ const CoCreateUser = {
 		document.dispatchEvent(new CustomEvent('signOut'));
 	},
 
-	initChangeOrg: () => {
-		const user_id = window.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) => {
-						window.localStorage.setItem('apiKey', data['apiKey']);
-						window.localStorage.setItem('organization_id', data.document[0]['current_org']);
-						window.localStorage.setItem('host', crud.socket.config.host);
-						
-						document.dispatchEvent(new CustomEvent('signIn'));
-						window.location.reload();
-
-					})
-			
-				});
-			}
-		}
-	},
-
-	checkSession: () => {
-		let user_id = window.localStorage.getItem('user_id');
-		let token = window.localStorage.getItem('token');
-		if (user_id && token) {
-			let redirectTag = document.querySelector('[session="true"]');
-
-			if (redirectTag) {
-				let redirectLink = redirectTag.getAttribute('href');
-				if (redirectLink) {
-					document.location.href = redirectLink;
-				}
-			}
-		}
-		else {
-			let redirectTag = document.querySelector('[session="false"]');
-
-			if (redirectTag) {
-				let redirectLink = redirectTag.getAttribute('href');
-				if (redirectLink) {
-					window.localStorage.removeItem("user_id");
-					window.localStorage.removeItem("token");
-			
-					// this.deleteCookie();
-					document.location.href = redirectLink;
-				}
-			}
-		}
-	},
-
-	checkPermissions: (data) => {
-		const tags = document.querySelectorAll('.' + CONST_PERMISSION_CLASS);
-		tags.forEach((tag) => {
-			let module_id = tag.getAttribute('document_id') ? tag.getAttribute('document_id') : tag.getAttribute('pass-document_id');
-			let data_permission = tag.getAttribute('data-permission');
-			let userPermission = data['permission-' + module_id];
-
-			if (userPermission.indexOf(data_permission) == -1) {
-				switch (data_permission) {
-					case 'create':
-						tag.style.display = 'none';
-						break;
-					case 'read':
-						tag.style.display = 'none';
-						break;
-					case 'update':
-						tag.style.display = 'none';
-						break;
-					case 'delete':
-						tag.readOnly = true;
-						break;
-					default:
-						// code
-				}
-			}
-			else {
-				switch (data_permission) {
-
-					// code
-				}
-			}
-		});
-	},
-
-	updateUserStatus: (data) => {
-		if (!data.user_id) {
-			return;
-		}
-		let statusEls = document.querySelectorAll(`[user-status][document_id='${data['user_id']}']`);
-
-		statusEls.forEach((el) => {
-			el.setAttribute('user-status', data['userStatus']);
-		});
-	},
-
-	// ToDo: variations exist in a few components 
-	setDocumentId: function(collection, id) {
-		let orgIdElements = document.querySelectorAll(`[collection='${collection}']`);
-		if (orgIdElements && orgIdElements.length > 0) {
-			orgIdElements.forEach((el) => {
-				if (!el.getAttribute('document_id')) {
-					el.setAttribute('document_id', id);
-				}
-				if (el.getAttribute('name') == "_id") {
-					el.value = id;
-				}
-			});
-		}
-	},
-
 	signUp: function(btn) {
 		let form = btn.closest("form");
 		if (!form) return;
@@ -328,7 +199,98 @@ const CoCreateUser = {
 				broadcastBrowser: false
 			});
 		}
+	},
+
+	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.userStatus == 'on') {
+			let redirectTag = document.querySelector('[session="true"]');
+
+			if (redirectTag) {
+				let redirectLink = redirectTag.getAttribute('href');
+				if (redirectLink) {
+					document.location.href = redirectLink;
+				}
+			}
+		} else {
+			let redirectTag = document.querySelector('[session="false"]');
+
+			if (redirectTag) {
+				let redirectLink = redirectTag.getAttribute('href');
+				if (redirectLink) {
+					window.localStorage.removeItem("user_id");
+					window.localStorage.removeItem("token");
+			
+					// this.deleteCookie();
+					document.location.href = redirectLink;
+				}
+			}
+		}
+
+	},
+
+	initChangeOrg: () => {
+		const user_id = window.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) => {
+						window.localStorage.setItem('apiKey', data['apiKey']);
+						window.localStorage.setItem('organization_id', data.document[0]['current_org']);
+						window.localStorage.setItem('host', crud.socket.config.host);
+						
+						document.dispatchEvent(new CustomEvent('signIn'));
+						window.location.reload();
+
+					})
+			
+				});
+			}
+		}
+	},
+
+	// ToDo: variations of setDocumentId exists in a few components 
+	setDocumentId: function(collection, id) {
+		let orgIdElements = document.querySelectorAll(`[collection='${collection}']`);
+		if (orgIdElements && orgIdElements.length > 0) {
+			orgIdElements.forEach((el) => {
+				if (!el.getAttribute('document_id')) {
+					el.setAttribute('document_id', id);
+				}
+				if (el.getAttribute('name') == "_id") {
+					el.value = id;
+				}
+			});
+		}
 	}
+	
 };