@cocreate/users 1.9.13 → 1.10.1

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## [1.10.1](https://github.com/CoCreate-app/CoCreate-users/compare/v1.10.0...v1.10.1) (2022-11-21)
+
+
+### Bug Fixes
+
+* bump d@cocreate ependencies ([ee0e697](https://github.com/CoCreate-app/CoCreate-users/commit/ee0e6973ba07012fba07db4ba0d97e31df1be136))
+
+# [1.10.0](https://github.com/CoCreate-app/CoCreate-users/compare/v1.9.13...v1.10.0) (2022-11-21)
+
+
+### Bug Fixes
+
+* bump cdn to 1.28.7 ([a80ebcc](https://github.com/CoCreate-app/CoCreate-users/commit/a80ebcc52c8f82e878241f0dae933039163c5207))
+* bump cdn to 1.28.8 ([a66d8bd](https://github.com/CoCreate-app/CoCreate-users/commit/a66d8bd75045a968755362c05b323768ebee6e16))
+* renamed data.data to data.document ([6aa2257](https://github.com/CoCreate-app/CoCreate-users/commit/6aa2257f3c755fa8cf112f89fe43c8270aa6c729))
+* renamed getSocket to getSockets ([56fd7c9](https://github.com/CoCreate-app/CoCreate-users/commit/56fd7c90f68785e9f654e052bae9a7df5335e2f7))
+* typo data | request ([2ef1f2f](https://github.com/CoCreate-app/CoCreate-users/commit/2ef1f2fb485d3e42159479e5d517476ea3785689))
+* update crud functions to receive an array of objects as the response ([117db56](https://github.com/CoCreate-app/CoCreate-users/commit/117db56540891728946b183c561df56ad5aa23c0))
+* update status to userStatus ([febb7ac](https://github.com/CoCreate-app/CoCreate-users/commit/febb7acb7fa13db900896db069195796a25064b2))
+
+
+### Features
+
+* Add @cocreate/element-prototype ([9c2e8be](https://github.com/CoCreate-app/CoCreate-users/commit/9c2e8be1f7516877ee36074b0dcd1d9a03e3bd4a))
+* updated to use new crud which has the abilty to use multiple databases ([88db3d3](https://github.com/CoCreate-app/CoCreate-users/commit/88db3d328bdc82d97c8e265bfb2e39c10d7383a5))
+
 ## [1.9.13](https://github.com/CoCreate-app/CoCreate-users/compare/v1.9.12...v1.9.13) (2022-10-02)
 
 

package/demo/login.html

@@ -83,7 +83,7 @@
 			} 
 		</script>
 
-        <script src="https://cdn.cocreate.app/1.28.5/CoCreate.min.js"></script>
+        <script src="https://cdn.cocreate.app/1.28.8/CoCreate.min.js"></script>
         <!-- <script src="../../../CoCreateJS/dist/CoCreate.js"></script> -->
 
     </body>

package/demo/logout.html

@@ -32,7 +32,7 @@
 	        </div>
 		</div>
 		
-        <script src="https://cdn.cocreate.app/1.28.5/CoCreate.min.js"></script>
+        <script src="https://cdn.cocreate.app/1.28.8/CoCreate.min.js"></script>
         <!-- <script src="../../../CoCreateJS/dist/CoCreate.js"></script> -->
 
     </body>

package/demo/signup.html

@@ -103,7 +103,7 @@
 				host: 'server.cocreate.app' // Points to socket server. If not defined it will use the url in web browser by default
 			} 
 		</script>
-        <script src="https://cdn.cocreate.app/1.28.5/CoCreate.min.js"></script>
+        <script src="https://cdn.cocreate.app/1.28.8/CoCreate.min.js"></script>
         <!-- <script src="../../../CoCreateJS/dist/CoCreate.js"></script> -->
         
 	</body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/users",
-  "version": "1.9.13",
+  "version": "1.10.1",
   "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/actions": "^1.5.12",
-    "@cocreate/crud-client": "^1.12.12",
-    "@cocreate/docs": "^1.3.18",
-    "@cocreate/elements": "^1.12.11",
-    "@cocreate/render": "^1.15.10",
+    "@cocreate/actions": "^1.5.13",
+    "@cocreate/crud-client": "^1.13.0",
+    "@cocreate/docs": "^1.3.20",
+    "@cocreate/element-prototype": "^1.0.0",
+    "@cocreate/render": "^1.16.1",
     "mongodb": "^4.4.0"
   }
 }

package/src/client.js

@@ -1,7 +1,14 @@
 /*globals CustomEvent, btoa*/
-import crud from '@cocreate/crud-client';
+import CRUD from '@cocreate/crud-client';
 import action from '@cocreate/actions';
 import render from '@cocreate/render';
+import '@cocreate/element-prototype';
+
+let crud
+if(CRUD && CRUD.default)
+	crud = CRUD.default
+else
+	crud = CRUD
 
 const CONST_PERMISSION_CLASS = 'checkPermission';
 
@@ -16,7 +23,7 @@ const CoCreateUser = {
 	initSocket: function() {
 		const self = this;
 		crud.listen('createUser', function(data) {
-			self.setDocumentId('users', data.document_id);
+			self.setDocumentId('users', data.document[0]._id);
 			document.dispatchEvent(new CustomEvent('createUser', {
 				detail: data
 			}));
@@ -46,37 +53,31 @@ const CoCreateUser = {
 
 		let request = {
 			collection,
+			document: {
+				lastLogin: new Date().toISOString(),
+				current_org: crud.socket.config.organization_id
+			},
 			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)
-					}
-				})
+		const socket = crud.socket.getSockets()
+		if (!socket[0] || !socket[0].connected || window && !window.navigator.onLine) {
+			crud.updateDocument(request).then((response) => {
+				response['success'] = false
+				response['status'] = "Login failed"
+				if (response.document)  {
+					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
-			});
+			crud.socket.send('login', request);
 		}
 	},
 
@@ -87,7 +88,7 @@ const CoCreateUser = {
 			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('user_id', data.document[0]['_id']);
 			window.localStorage.setItem("token", token);
 			document.cookie = `token=${token};path=/`;
 			message = "Succesful Login";
@@ -142,13 +143,12 @@ const CoCreateUser = {
 					// ToDo: can get selected value from event/element, readDocument not required. 
 					crud.readDocument({
 						collection: collection || 'users',
-						document_id: user_id,
-						data: {
+						document: {
 							_id: user_id
 						},
 					}).then((data) => {
 						window.localStorage.setItem('apiKey', data['apiKey']);
-						window.localStorage.setItem('organization_id', data.data['current_org']);
+						window.localStorage.setItem('organization_id', data.document[0]['current_org']);
 						window.localStorage.setItem('host', crud.socket.config.host);
 						
 						document.dispatchEvent(new CustomEvent('logIn'));
@@ -231,7 +231,7 @@ const CoCreateUser = {
 		let statusEls = document.querySelectorAll(`[user-status][document_id='${data['user_id']}']`);
 
 		statusEls.forEach((el) => {
-			el.setAttribute('user-status', data['status']);
+			el.setAttribute('user-status', data['userStatus']);
 		});
 	},
 
@@ -262,7 +262,7 @@ const CoCreateUser = {
 		else
 			org_id = crud.socket.config.organization_id;
 
-		let data = {data: {}};
+		let data = {document: {}};
 		//. get form data
 		elements.forEach(el => {
 			let name = el.getAttribute('name');
@@ -272,20 +272,20 @@ const CoCreateUser = {
 			if (el.getAttribute('data-type') == 'array') {
 				value = [value];
 			}
-			data.data[name] = value;
+			data.document[name] = value;
 		});
 		data['collection'] = 'users'
-		data.data['current_org'] = org_id;
-		data.data['connected_orgs'] = [org_id];
+		data.document['current_org'] = org_id;
+		data.document['connected_orgs'] = [org_id];
 
-		const socket = crud.socket.getSocket()
-		if (!socket || !socket.connected || window && !window.navigator.onLine) {
+		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) => {
 				self.setDocumentId('users', response.document_id);
 				data.database = org_id
 				data.document_id = response.document_id
-				data.data['_id'] = response.document_id
+				data.document['_id'] = response.document_id
 				data.organization_id = org_id
 				crud.createDocument(request).then((response) => {
 					
@@ -297,9 +297,9 @@ const CoCreateUser = {
 			})
 		} else {
 			// ToDo: creates user in platformdb
-			crud.send('createUser', {
+			crud.socket.send('createUser', {
 				collection: 'users',
-				data: data,
+				...data,
 				orgDB: org_id
 			});
 		}

package/src/server.js

@@ -1,9 +1,7 @@
-const {ObjectId} = require("mongodb");
-
 class CoCreateUser {
-	constructor(wsManager, dbClient) {
+	constructor(wsManager, crud) {
 		this.wsManager = wsManager
-		this.dbClient = dbClient
+		this.crud = crud
 		this.init()
 	}
 	
@@ -17,31 +15,32 @@ class CoCreateUser {
 
 	async createUser(socket, data) {
 		const self = this;
-		if(!data.data) return;
+		if (!data.document) return;
 		
-		try{
-			const collection = this.dbClient.db(data['organization_id']).collection(data['collection']);
+		try {
 			// Create new user in config db users collection
-			collection.insertOne(data.data, function(error, result) {
-				if(!error && result){
+			this.crud.createDocument(data).then((data) => {
+				if (data.document[0] && data.document[0]._id) {
 					const orgDB = data.orgDB;
-					data.data['_id'] = result.insertedId;
+
 					// if new orgDb Create new user in new org db users collection
 					if (orgDB && orgDB != data.organization_id) {
-						const anotherCollection = self.dbClient.db(orgDB).collection(data['collection']);
-						anotherCollection.insertOne({...data.data, organization_id : orgDB});
+						let Data = {...data, organization_id: orgDB}
+						self.crud.createDocument(Data)
 					}
-					const response  = { ...data, document_id: `${result.insertedId}`}
-					self.wsManager.send(socket, 'createUser', response);
+					
+					self.wsManager.send(socket, 'createUser', data);
 
 					// add new user to platformDB
 					if (data.organization_id != process.env.organization_id) {	
-						const platformDB = self.dbClient.db(process.env.organization_id).collection(data['collection']);
-						platformDB.insertOne({...data.data, organization_id: process.env.organization_id});
+						let Data = {...data, organization_id: process.env.organization_id}
+						self.crud.createDocument(Data)
 					}	
 				}
-			});
-		}catch(error){
+
+				// self.wsManager.broadcast(socket, 'updateUserStatus', data)
+			})
+		} catch(error) {
 			console.log('createDocument error', error);
 		}
 	}
@@ -61,55 +60,43 @@ class CoCreateUser {
 	async login(socket, data) {
 		const self = this;
 		try {
-			const {organization_id} = data
-			const selectedDB = organization_id;
-			const collection = self.dbClient.db(selectedDB).collection(data["collection"]);
-			const query = new Object();
-			
-			for (let item of data['loginData']) {
-				query[item.name] = item.value;
-			}
-			
-			collection.findOneAndUpdate(query, {$set: {lastLogin: new Date()}}, async function(error, result) {
+			this.crud.updateDocument(data).then(async (data) => {
 				let response = {
+					...data,
 					success: false,
 					message: "Login failed",
-					status: "failed",
-					uid: data['uid']
+					status: "failed"
 				}
-				if (!error && result && result.value) {
+
+				if (data.document[0] && data.document[0]._id) {
 					let token = null;
 					if (self.wsManager.authInstance) {
-						token = await self.wsManager.authInstance.generateToken({user_id: `${result.value['_id']}`});
+						token = await self.wsManager.authInstance.generateToken({user_id: data.document[0]._id});
 					}
 					
 					if (token && token != 'null')
 						response = { ...response,  
 							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",
+							userStatus: 'on',
 							token
 						};
 
-					let user_id = response.document_id;
-					const query = {
-						"_id": new ObjectId(user_id),
-					}
 
 					if (data.organization_id != process.env.organization_id) {	
-						const platformDB = self.dbClient.db(process.env.organization_id).collection(data['collection']);
-						platformDB.updateOne(query, {$set: {lastLogin: new Date()}})
-					}	
+						let Data = {organization_id: process.env.organization_id}
+						Data.document['_id'] = data.document[0]._id
+						Data.document['lastLogin'] = data.document[0].lastLogin
+						Data.document['organization_id'] = process.env.organization_id
+						crud.updateDocument(Data)
+					}
+
 				} 
 				self.wsManager.send(socket, 'login', response)
-				console.log(`${response.message} user_id: ${result.value['_id']}`)
-			});
+				self.wsManager.broadcast(socket, 'updateUserStatus', data)
+			})
+
 		} catch (error) {
 			console.log('login failed', error);
 		}
@@ -121,22 +108,17 @@ class CoCreateUser {
 	 */
 	async userStatus(socket, data) {
 		const self = this;
-
 		try {
-			const {organization_id, db} = data
-			const selectedDB = db || organization_id;
-			const collection = self.dbClient.db(selectedDB).collection('users');
-			// const user_id = items[2];
-			const query = {
-				"_id": new ObjectId(data.user_id),
+			data.collection = 'users'
+			data['document'] = {
+				_id: data.user_id,
+				userStatus: data.userStatus
 			}
-			collection.updateOne(query, {$set: {status: data.status}}, function(err, res) {
-				if (!err) {
-					self.wsManager.broadcast(socket, 'updateUserStatus', data)
-				} else {
-					console.log('err', err)
-				}
+			
+			this.crud.updateDocument(data).then((data) => {
+				self.wsManager.broadcast(socket, 'updateUserStatus', data)
 			})
+
 		} catch (error) {
 			console.log('userStatus error')
 		}