@cocreate/users 1.2.34 → 1.4.0

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+# [1.4.0](https://github.com/CoCreate-app/CoCreate-users/compare/v1.3.2...v1.4.0) (2021-10-14)
+
+
+### Features
+
+* opens socket chaner for user Status ([e875c8d](https://github.com/CoCreate-app/CoCreate-users/commit/e875c8d904df36e9136df9484ddac461ce560bb3))
+
+## [1.3.2](https://github.com/CoCreate-app/CoCreate-users/compare/v1.3.1...v1.3.2) (2021-10-14)
+
+
+### Bug Fixes
+
+* dispatch login endEvent if succesful ([ac4b37d](https://github.com/CoCreate-app/CoCreate-users/commit/ac4b37dc723d90db9cd9aa963fbd166da9331905))
+
+## [1.3.1](https://github.com/CoCreate-app/CoCreate-users/compare/v1.3.0...v1.3.1) (2021-10-14)
+
+
+### Bug Fixes
+
+* dispatch login endEvent ([5385212](https://github.com/CoCreate-app/CoCreate-users/commit/5385212be9eb2e31d9c4cbe48424231d111489ad))
+
+# [1.3.0](https://github.com/CoCreate-app/CoCreate-users/compare/v1.2.34...v1.3.0) (2021-10-14)
+
+
+### Features
+
+* render log for success ([24480a0](https://github.com/CoCreate-app/CoCreate-users/commit/24480a036390608b9ad1cf79dd68c995df1991ac))
+
 ## [1.2.34](https://github.com/CoCreate-app/CoCreate-users/compare/v1.2.33...v1.2.34) (2021-10-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/users",
-  "version": "1.2.34",
+  "version": "1.4.0",
   "description": "A simple users component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "users",
@@ -61,11 +61,11 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/action": "^1.2.27",
-    "@cocreate/crud-client": "^1.4.1",
-    "@cocreate/docs": "^1.2.30",
-    "@cocreate/form": "^1.2.28",
-    "@cocreate/input": "^1.2.33",
-    "@cocreate/render": "^1.2.0"
+    "@cocreate/action": "^1.2.29",
+    "@cocreate/crud-client": "^1.4.2",
+    "@cocreate/docs": "^1.2.32",
+    "@cocreate/form": "^1.2.30",
+    "@cocreate/input": "^1.2.35",
+    "@cocreate/render": "^1.3.0"
   }
 }

package/src/index.js

@@ -13,18 +13,30 @@ const CoCreateUser = {
 		this.initSocket();
 		this.initChangeOrg();
 		this.checkSession();
+		this.createUserSocket();
+	},
+
+	createUserSocket: function() {
+		var user_id = window.localStorage.getItem('user_id');
+		if (user_id) {
+			crud.socket.create({
+				namespace: 'users',
+				room: user_id,
+				host: window.config.host
+			})
+		}
 	},
 
 	initSocket: function() {
 		const self = this;
 		crud.listen('createUser', function(data) {
 			self.setDocumentId('users', data.document_id);
-			document.dispatchEvent(new CustomEvent('createdUser', {
+			document.dispatchEvent(new CustomEvent('createUser', {
 				detail: data
 			}));
 		});
 		crud.listen('createUserNew', function(data) {
-			document.dispatchEvent(new CustomEvent('createdUser', {
+			document.dispatchEvent(new CustomEvent('createUserNew', {
 				detail: data
 			}));
 		});
@@ -45,12 +57,12 @@ const CoCreateUser = {
 		inputs.forEach((input) => {
 			const name = input.getAttribute('name');
 			let value = input.value;
-			if(input.type == 'password') {
+			if (input.type == 'password') {
 				value = btoa(value);
 			}
 			collection = input.getAttribute('collection') || collection;
 
-			if(name) {
+			if (name) {
 				loginData[name] = value;
 			}
 		});
@@ -64,24 +76,30 @@ const CoCreateUser = {
 	},
 
 	loginResult: function(data) {
-		const { success, status, message, token } = data;
+		let { success, status, message, token } = data;
 
-		if(success) {
+		if (success) {
 			window.localStorage.setItem('user_id', data['id']);
 			window.localStorage.setItem("token", token);
 			document.cookie = `token=${token};path=/`;
 			this.getCurrentOrg(data['id'], data['collection']);
+			message = "Succesful Login";
+			document.dispatchEvent(new CustomEvent('login', {
+				detail: {}
+			}));
 		}
+		else
+			message = "The email or password you entered is incorrect";
 
 		render.data({
 			selector: "[template_id='login']",
-			data:  {
-		        type: 'login',
-		        status: 'failed',
-		        message: 'Email or password is incorrect'
-		    }
+			data: {
+				type: 'login',
+				status,
+				message,
+				success
+			}
 		});
-
 	},
 
 	getCurrentOrg: function(user_id, collection) {
@@ -102,7 +120,7 @@ const CoCreateUser = {
 		window.localStorage.setItem('adminUI_id', data['adminUI_id']);
 		window.localStorage.setItem('builderUI_id', data['builderUI_id']);
 
-		document.dispatchEvent(new CustomEvent('loggedIn'));
+		document.dispatchEvent(new CustomEvent('logIn'));
 	},
 
 	logout: (btn) => {
@@ -111,35 +129,35 @@ const CoCreateUser = {
 
 		let allCookies = document.cookie.split(';');
 
-		for(var i = 0; i < allCookies.length; i++)
+		for (var i = 0; i < allCookies.length; i++)
 			document.cookie = allCookies[i] + "=;expires=" +
 			new Date(0).toUTCString();
 
 		// Todo: replace with Custom event system
-		document.dispatchEvent(new CustomEvent('loggedOut'));
+		document.dispatchEvent(new CustomEvent('logout'));
 	},
 
 	initChangeOrg: () => {
 		const user_id = window.localStorage.getItem('user_id');
 
-		if(!user_id) return;
+		if (!user_id) return;
 
 		let orgChangers = document.querySelectorAll('.org-changer');
 
-		for(let i = 0; i < orgChangers.length; i++) {
+		for (let i = 0; i < orgChangers.length; i++) {
 			let orgChanger = orgChangers[i];
 
 			const collection = orgChanger.getAttribute('collection') ? orgChanger.getAttribute('collection') : 'module_activity';
 			const id = orgChanger.getAttribute('document_id');
 
-			if(collection == 'users' && id == user_id) {
+			if (collection == 'users' && id == user_id) {
 				orgChanger.addEventListener('selectedValue', function(e) {
 
 					setTimeout(function() {
 						getCurrentOrg(user_id);
 
 						var timer = setInterval(function() {
-							if(updatedCurrentOrg) {
+							if (updatedCurrentOrg) {
 								window.location.reload();
 
 								clearInterval(timer);
@@ -154,12 +172,12 @@ const CoCreateUser = {
 	checkSession: () => {
 		let user_id = window.localStorage.getItem('user_id');
 		let token = window.localStorage.getItem('token');
-		if(user_id && token) {
+		if (user_id && token) {
 			let redirectTag = document.querySelector('[session="true"]');
 
-			if(redirectTag) {
+			if (redirectTag) {
 				let redirectLink = redirectTag.getAttribute('href');
-				if(redirectLink) {
+				if (redirectLink) {
 					document.location.href = redirectLink;
 				}
 			}
@@ -167,9 +185,9 @@ const CoCreateUser = {
 		else {
 			let redirectTag = document.querySelector('[session="false"]');
 
-			if(redirectTag) {
+			if (redirectTag) {
 				let redirectLink = redirectTag.getAttribute('href');
-				if(redirectLink) {
+				if (redirectLink) {
 					window.localStorage.clear();
 					// this.deleteCookie();
 					document.location.href = redirectLink;
@@ -185,8 +203,8 @@ const CoCreateUser = {
 			let data_permission = tag.getAttribute('data-permission');
 			let userPermission = data['permission-' + module_id];
 
-			if(userPermission.indexOf(data_permission) == -1) {
-				switch(data_permission) {
+			if (userPermission.indexOf(data_permission) == -1) {
+				switch (data_permission) {
 					case 'create':
 						tag.style.display = 'none';
 						break;
@@ -204,7 +222,7 @@ const CoCreateUser = {
 				}
 			}
 			else {
-				switch(data_permission) {
+				switch (data_permission) {
 
 					// code
 				}
@@ -213,7 +231,7 @@ const CoCreateUser = {
 	},
 
 	changedUserStatus: (data) => {
-		if(!data.user_id) {
+		if (!data.user_id) {
 			return;
 		}
 		let statusEls = document.querySelectorAll(`[user-status][document_id='${data['user_id']}']`);
@@ -225,12 +243,12 @@ const CoCreateUser = {
 
 	setDocumentId: function(collection, id) {
 		let orgIdElements = document.querySelectorAll(`[collection='${collection}']`);
-		if(orgIdElements && orgIdElements.length > 0) {
+		if (orgIdElements && orgIdElements.length > 0) {
 			orgIdElements.forEach((el) => {
-				if(!el.getAttribute('document_id')) {
+				if (!el.getAttribute('document_id')) {
 					el.setAttribute('document_id', id);
 				}
-				if(el.getAttribute('name') == "_id") {
+				if (el.getAttribute('name') == "_id") {
 					el.value = id;
 				}
 			});
@@ -239,7 +257,7 @@ const CoCreateUser = {
 
 	createUserNew: function(btn) {
 		let form = btn.closest("form");
-		if(!form) return;
+		if (!form) return;
 		let newOrg_id = form.querySelector("input[collection='organizations'][name='_id']");
 		let user_id = form.querySelector("input[collection='users'][name='_id']");
 
@@ -257,12 +275,12 @@ const CoCreateUser = {
 
 	createUser: function(btn) {
 		let form = btn.closest("form");
-		if(!form) return;
+		if (!form) return;
 		let org_id = "";
 		let elements = form.querySelectorAll("[collection='users'][name]");
 		let orgIdElement = form.querySelector("input[collection='organizations'][name='_id']");
 
-		if(orgIdElement) {
+		if (orgIdElement) {
 			org_id = orgIdElement.value;
 		}
 		let data = {};
@@ -270,9 +288,9 @@ const CoCreateUser = {
 		elements.forEach(el => {
 			let name = el.getAttribute('name');
 			let value = input.getValue(el) || el.getAttribute('value');
-			if(!name || !value) return;
+			if (!name || !value) return;
 
-			if(el.getAttribute('data-type') == 'array') {
+			if (el.getAttribute('data-type') == 'array') {
 				value = [value];
 			}
 			data[name] = value;
@@ -300,7 +318,7 @@ export default CoCreateUser;
 
 action.init({
 	action: "createUserNew",
-	endEvent: "createdUser",
+	endEvent: "createUserNew",
 	callback: (btn, data) => {
 		CoCreateUser.createUser(btn);
 	},
@@ -308,7 +326,7 @@ action.init({
 
 action.init({
 	action: "createUser",
-	endEvent: "createdUser",
+	endEvent: "createUser",
 	callback: (btn, data) => {
 		CoCreateUser.createUser(btn);
 	},
@@ -316,7 +334,7 @@ action.init({
 
 action.init({
 	action: "login",
-	endEvent: "loggedIn",
+	endEvent: "login",
 	callback: (btn, data) => {
 		CoCreateUser.requestLogin(btn, data);
 	},
@@ -324,7 +342,7 @@ action.init({
 
 action.init({
 	action: "logout",
-	endEvent: "loggedOut",
+	endEvent: "logout",
 	callback: (btn, data) => {
 		CoCreateUser.logout(btn, data);
 	},