@cocreate/users 1.7.29 → 1.9.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [1.9.0](https://github.com/CoCreate-app/CoCreate-users/compare/v1.8.0...v1.9.0) (2022-09-28)
+
+
+### Bug Fixes
+
+* broadcast params reduced to socket, message, data ([9192a90](https://github.com/CoCreate-app/CoCreate-users/commit/9192a90024ed97a91061bf3af987d5427b64c7e7))
+* remove createUserSocket ([6c6d7a2](https://github.com/CoCreate-app/CoCreate-users/commit/6c6d7a2818ec00fd29fdd8561c915758565c1003))
+
+
+### Features
+
+* config is now accessible from socket.config ([14157aa](https://github.com/CoCreate-app/CoCreate-users/commit/14157aae133a17561e624862dd3024a8ed1d0d68))
+* create new user while offline ([4456e39](https://github.com/CoCreate-app/CoCreate-users/commit/4456e39d810e49a9479431b77b5e9b61445269c0))
+
+# [1.8.0](https://github.com/CoCreate-app/CoCreate-users/compare/v1.7.29...v1.8.0) (2022-09-22)
+
+
+### Features
+
+* login works offline ([cd6a36b](https://github.com/CoCreate-app/CoCreate-users/commit/cd6a36ba14b8dd8e7ecc28c48cedfb9d23880653))
+
 ## [1.7.29](https://github.com/CoCreate-app/CoCreate-users/compare/v1.7.28...v1.7.29) (2022-09-01)
 
 

package/package.json

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

package/src/client.js

@@ -1,6 +1,5 @@
 /*globals CustomEvent, btoa*/
 import crud from '@cocreate/crud-client';
-// import input from '@cocreate/elements';
 import action from '@cocreate/actions';
 import render from '@cocreate/render';
 
@@ -8,22 +7,10 @@ const CONST_PERMISSION_CLASS = 'checkPermission';
 
 const CoCreateUser = {
 	init: function() {
-		this.updatedCurrentOrg = false;
+		// this.updatedCurrentOrg = false;
 		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() {
@@ -37,15 +24,13 @@ const CoCreateUser = {
 		crud.listen('fetchedUser', this.checkPermissions);
 		crud.listen('login', (instance) => self.loginResponse(instance));
 		crud.listen('updateUserStatus', this.updateUserStatus);
-		crud.listen('userCurrentOrg', (instance) => self.setCurrentOrg(instance));
 	},
 
 	loginRequest: function(btn) {
 		let form = btn.closest('form');
 		let collection = form.getAttribute('collection');
-		let loginData = {};
+		let query = [];
 
-		// const inputs = form.querySelectorAll('input, textarea');
 		const inputs = form.querySelectorAll('input[name="email"], input[name="password"], input[name="username"]');
 
 		inputs.forEach((input) => {
@@ -56,30 +41,55 @@ const CoCreateUser = {
 			}
 			collection = input.getAttribute('collection') || collection;
 
-			if (name) {
-				loginData[name] = value;
-			}
+			query.push({name, value, operator: '$eq'})
 		});
 
-		crud.send('login', {
-			"apiKey": window.config.apiKey,
-			"organization_id": window.config.organization_id,
-			"collection": collection,
-			"loginData": loginData
-		});
+		let request = {
+			collection,
+			filter: {
+				query
+			}
+		}
+		
+		const socket = crud.socket.getSocket()
+		if (!socket || !socket.connected || window && !window.navigator.onLine) {
+			
+			// ToDo: can use updateDocument with filter query
+			crud.readDocuments(request).then((data) => {
+				data.data = data.data[0]
+				data.data['lastLogin'] = new Date().toISOString()
+				data.data['current_org'] = data.organization_id
+				crud.updateDocument(data).then((response) => {
+					response['success'] = false
+					response['status'] = "Login failed"
+					if (response.data)  {
+						response['success'] = true
+						response['status'] = "success"
+						this.loginResponse(response)
+					} else {
+						this.loginResponse(response)
+					}
+				})
+			})
+		} else {
+			// ToDo: can be depreciated if we have another means of token generation
+			crud.send('login', {
+				"collection": collection,
+				"loginData": query
+			});
+		}
 	},
 
 	loginResponse: function(data) {
 		let { success, status, message, token } = data;
 
 		if (success) {
-			window.localStorage.setItem('organization_id', window.config.organization_id);
-			window.localStorage.setItem("apiKey", window.config.apiKey);
-			window.localStorage.setItem("host", window.config.host);
-			window.localStorage.setItem('user_id', data['document_id']);
+			window.localStorage.setItem('organization_id', crud.socket.config.organization_id);
+			window.localStorage.setItem("apiKey", crud.socket.config.apiKey);
+			window.localStorage.setItem("host", crud.socket.config.host);
+			window.localStorage.setItem('user_id', data.data['_id']);
 			window.localStorage.setItem("token", token);
 			document.cookie = `token=${token};path=/`;
-			this.getCurrentOrg(data['document_id'], data['collection']);
 			message = "Succesful Login";
 			document.dispatchEvent(new CustomEvent('login', {
 				detail: {}
@@ -99,27 +109,10 @@ const CoCreateUser = {
 		});
 	},
 
-	getCurrentOrg: function(user_id, collection) {
-		crud.send('userCurrentOrg', {
-			"apiKey": window.config.apiKey,
-			"organization_id": window.config.organization_id,
-			"collection": collection || 'users',
-			"user_id": user_id,
-		});
-	},
-
-	setCurrentOrg: function(data) {
-		this.updatedCurrentOrg = true;
-		window.localStorage.setItem('apiKey', data['apiKey']);
-		window.localStorage.setItem('organization_id', data['current_org']);
-		window.localStorage.setItem('host', window.config.host);
-
-		document.dispatchEvent(new CustomEvent('logIn'));
-	},
-
 	logout: (btn) => {
 		self = this;
-		window.localStorage.clear();
+		window.localStorage.removeItem("user_id");
+		window.localStorage.removeItem("token");
 
 		let allCookies = document.cookie.split(';');
 
@@ -141,23 +134,28 @@ const CoCreateUser = {
 		for (let i = 0; i < orgChangers.length; i++) {
 			let orgChanger = orgChangers[i];
 
-			const collection = orgChanger.getAttribute('collection') ? orgChanger.getAttribute('collection') : 'module_activity';
+			const collection = orgChanger.getAttribute('collection');
 			const id = orgChanger.getAttribute('document_id');
 
 			if (collection == 'users' && id == user_id) {
-				orgChanger.addEventListener('selectedValue', function(e) {
-
-					setTimeout(function() {
-						getCurrentOrg(user_id);
-
-						var timer = setInterval(function() {
-							if (updatedCurrentOrg) {
-								window.location.reload();
-
-								clearInterval(timer);
-							}
-						}, 100);
-					}, 300);
+				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,
+						data: {
+							_id: user_id
+						},
+					}).then((data) => {
+						window.localStorage.setItem('apiKey', data['apiKey']);
+						window.localStorage.setItem('organization_id', data.data['current_org']);
+						window.localStorage.setItem('host', crud.socket.config.host);
+						
+						document.dispatchEvent(new CustomEvent('logIn'));
+						window.location.reload();
+
+					})
+			
 				});
 			}
 		}
@@ -182,7 +180,9 @@ const CoCreateUser = {
 			if (redirectTag) {
 				let redirectLink = redirectTag.getAttribute('href');
 				if (redirectLink) {
-					window.localStorage.clear();
+					window.localStorage.removeItem("user_id");
+					window.localStorage.removeItem("token");
+			
 					// this.deleteCookie();
 					document.location.href = redirectLink;
 				}
@@ -235,6 +235,7 @@ const CoCreateUser = {
 		});
 	},
 
+	// ToDo: variations exist in a few components 
 	setDocumentId: function(collection, id) {
 		let orgIdElements = document.querySelectorAll(`[collection='${collection}']`);
 		if (orgIdElements && orgIdElements.length > 0) {
@@ -259,9 +260,9 @@ const CoCreateUser = {
 		if (orgIdElement)
 			org_id = orgIdElement.value;
 		else
-			org_id = config.organization_id;
+			org_id = crud.socket.config.organization_id;
 
-		let data = {};
+		let data = {data: {}};
 		//. get form data
 		elements.forEach(el => {
 			let name = el.getAttribute('name');
@@ -271,21 +272,37 @@ const CoCreateUser = {
 			if (el.getAttribute('data-type') == 'array') {
 				value = [value];
 			}
-			data[name] = value;
+			data.data[name] = value;
 		});
-		data['current_org'] = org_id;
-		data['connected_orgs'] = [org_id];
-		data['organization_id'] = config.organization_id;
-
-		const room = config.organization_id;
-
-		crud.send('createUser', {
-			apiKey: config.apiKey,
-			organization_id: config.organization_id,
-			collection: 'users',
-			data: data,
-			orgDB: org_id
-		}, room);
+		data['collection'] = 'users'
+		data.data['current_org'] = org_id;
+		data.data['connected_orgs'] = [org_id];
+
+		const socket = crud.socket.getSocket()
+		if (!socket || !socket.connected || window && !window.navigator.onLine) {
+			// ToDo: can use updateDocument with filter query
+			crud.createDocument(data).then((response) => {
+				self.setDocumentId('users', response.document_id);
+				data.database = org_id
+				data.document_id = response.document_id
+				data.data['_id'] = response.document_id
+				data.organization_id = org_id
+				crud.createDocument(request).then((response) => {
+					
+					document.dispatchEvent(new CustomEvent('createUser', {
+						detail: response
+					}));
+		
+				})
+			})
+		} else {
+			// ToDo: creates user in platformdb
+			crud.send('createUser', {
+				collection: 'users',
+				data: data,
+				orgDB: org_id
+			});
+		}
 	},
 };
 

package/src/server.js

@@ -9,14 +9,13 @@ class CoCreateUser {
 	
 	init() {
 		if (this.wsManager) {
-			this.wsManager.on('createUser',				(socket, data, socketInfo) => this.createUser(socket, data, socketInfo));
-			this.wsManager.on('login',					(socket, data, socketInfo) => this.login(socket, data, socketInfo))
-			this.wsManager.on('userCurrentOrg',		(socket, data, socketInfo) => this.userCurrentOrg(socket, data, socketInfo))
-			this.wsManager.on('userStatus',				(socket, data, socketInfo) => this.userStatus(socket, data, socketInfo))
+			this.wsManager.on('createUser',		(socket, data) => this.createUser(socket, data));
+			this.wsManager.on('login',			(socket, data) => this.login(socket, data))
+			this.wsManager.on('userStatus',		(socket, data) => this.userStatus(socket, data))
 		}
 	}
 
-	async createUser(socket, data, socketInfo) {
+	async createUser(socket, data) {
 		const self = this;
 		if(!data.data) return;
 		
@@ -33,7 +32,7 @@ class CoCreateUser {
 						anotherCollection.insertOne({...data.data, organization_id : orgDB});
 					}
 					const response  = { ...data, document_id: `${result.insertedId}`}
-					self.wsManager.send(socket, 'createUser', response, socketInfo);
+					self.wsManager.send(socket, 'createUser', response);
 
 					// add new user to platformDB
 					if (data.organization_id != process.env.organization_id) {	
@@ -59,7 +58,7 @@ class CoCreateUser {
 			organization_id: string
 		}
 	**/	
-	async login(socket, data, socketInfo) {
+	async login(socket, data) {
 		const self = this;
 		try {
 			const {organization_id} = data
@@ -67,8 +66,8 @@ class CoCreateUser {
 			const collection = self.dbClient.db(selectedDB).collection(data["collection"]);
 			const query = new Object();
 			
-			for (var key in data['loginData']) {
-				query[key] = data['loginData'][key];
+			for (let item of data['loginData']) {
+				query[item.name] = item.value;
 			}
 			
 			collection.findOneAndUpdate(query, {$set: {lastLogin: new Date()}}, async function(error, result) {
@@ -89,6 +88,9 @@ class CoCreateUser {
 							success: true,
 							collection: data["collection"],
 							document_id: result.value['_id'],
+							data: {
+								_id: result.value['_id']
+							},
 							current_org: result.value['current_org'],
 							message: "Login successful",
 							status: "success",
@@ -105,7 +107,7 @@ class CoCreateUser {
 						platformDB.updateOne(query, {$set: {lastLogin: new Date()}})
 					}	
 				} 
-				self.wsManager.send(socket, 'login', response, socketInfo)
+				self.wsManager.send(socket, 'login', response)
 				console.log(`${response.message} user_id: ${result.value['_id']}`)
 			});
 		} catch (error) {
@@ -113,92 +115,27 @@ class CoCreateUser {
 		}
 	}
 	
-	/**
-		data = {
-			namespace:				string,	
-			collection:	string,
-			user_id:					string,
-			href: string
-		}
-	**/		
-	async userCurrentOrg(socket, data, socketInfo) {
-		try {
-			const self = this;
-			const {organization_id, db} = data
-			const selectedDB = db || organization_id;
-			const collection = this.dbClient.db(selectedDB).collection(data["collection"]);
-			
-			let query = new Object();
-			
-			query['_id'] = new ObjectId(data['user_id']);
-
-			collection.find(query).toArray(function(error, result) {
-			
-				if (!error && result && result.length > 0) {
-					
-					if (result.length > 0) {
-						let org_id = result[0]['current_org'];
-						const orgCollection = self.dbClient.db(selectedDB).collection('organizations');
-						
-						orgCollection.find({"_id": new ObjectId(org_id),}).toArray(function(err, res) {
-							if (!err && res && res.length > 0) {
-								self.wsManager.send(socket, 'userCurrentOrg', {
-									success:			true,
-									user_id:			result[0]['_id'],
-									current_org:		result[0]['current_org'],
-									apiKey: 			res[0]['apiKey'],
-									href: 				data['href'],
-									uid:				data['uid']
-								}, socketInfo)
-							}
-						});
-
-					}
-				} else {
-					// socket.emit('loginResult', {
-					//   success: false
-					// });
-				}
-			});
-		} catch (error) {
-			
-		}
-	}
-
 	
 	/**
 	 * status: 'on/off/idle'
 	 */
-	async userStatus(socket, data, socketInfo) {
+	async userStatus(socket, data) {
 		const self = this;
-		const {info, status} = data;
-
-		const items = info.split('/');
-
-		if (items[0] !== 'users') {
-			return;
-		}
-		
-		if (!items[1]) return;
 
 		try {
 			const {organization_id, db} = data
 			const selectedDB = db || organization_id;
 			const collection = self.dbClient.db(selectedDB).collection('users');
-			const user_id = items[1];
+			// const user_id = items[2];
 			const query = {
-				"_id": new ObjectId(user_id),
+				"_id": new ObjectId(data.user_id),
 			}
-			collection.updateOne(query, {$set: {status: status}}, function(err, res) {
+			collection.updateOne(query, {$set: {status: data.status}}, function(err, res) {
 				if (!err) {
-					self.wsManager.broadcast(socket, '', null, 'updateUserStatus', 
-					{
-						user_id,
-						status
-					}, socketInfo)
-				}
-				else
+					self.wsManager.broadcast(socket, 'updateUserStatus', data)
+				} else {
 					console.log('err', err)
+				}
 			})
 		} catch (error) {
 			console.log('userStatus error')