@cocreate/users 1.20.0 → 1.21.1

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.21.1](https://github.com/CoCreate-app/CoCreate-users/compare/v1.21.0...v1.21.1) (2023-05-10)
+
+
+### Bug Fixes
+
+* apikey renamed to key ([392ec35](https://github.com/CoCreate-app/CoCreate-users/commit/392ec35a1d5b0234a30cd5342ea6b6dfd0d59b05))
+* apikey renamed to key ([f195cc7](https://github.com/CoCreate-app/CoCreate-users/commit/f195cc726e448b45e3e94ec8ee15af105840c9ba))
+
+# [1.21.0](https://github.com/CoCreate-app/CoCreate-users/compare/v1.20.0...v1.21.0) (2023-05-10)
+
+
+### Features
+
+* added @cocreate/form ([2fb6c2b](https://github.com/CoCreate-app/CoCreate-users/commit/2fb6c2b635f7bb6cc7d527f0d6c439eaa95cf19d))
+
 # [1.20.0](https://github.com/CoCreate-app/CoCreate-users/compare/v1.19.9...v1.20.0) (2023-05-10)
 
 

package/CoCreate.config.js

@@ -1,7 +1,7 @@
 module.exports = {
     "config": {
         "organization_id": "5ff747727005da1c272740ab",
-        "apiKey": "2061acef-0451-4545-f754-60cf8160",
+        "key": "2061acef-0451-4545-f754-60cf8160",
         "host": "general.cocreate.app"
     },
     "sources": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/users",
-  "version": "1.20.0",
+  "version": "1.21.1",
   "description": "A simple users component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "users",
@@ -63,6 +63,7 @@
     "@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"
   }

package/src/client.js

@@ -1,6 +1,7 @@
 /*globals CustomEvent, btoa*/
 import crud from '@cocreate/crud-client';
 import action from '@cocreate/actions';
+import form from '@cocreate/form';
 import render from '@cocreate/render';
 import '@cocreate/element-prototype';
 import './index.css';
@@ -15,24 +16,6 @@ const CoCreateUser = {
 
 	initSocket: function() {
 		const self = this;
-		// crud.listen('signUp', function(data) {
-		// 	self.setDocumentId('users', data.document[0]._id);
-			
-		// 	render.data({
-		// 		selector: "[template='signUp']",
-		// 		data: {
-		// 			type: 'signUp',
-		// 			message: 'Succesfully Signed Up',
-		// 			success: true
-		// 		}
-		// 	});
-
-		// 	document.dispatchEvent(new CustomEvent('signUp', {
-		// 		detail: data
-		// 	}));
-		// });
-
-		crud.listen('signIn', (data) => self.signInResponse(data));
 		crud.listen('updateUserStatus', (data) => self.updateUserStatus(data));
 	},
 
@@ -45,12 +28,8 @@ const CoCreateUser = {
 
 		inputs.forEach((input) => {
 			const name = input.getAttribute('name');
-			let value = input.value;
-			if (input.type == 'password') {
-				value = btoa(value);
-			}
+			const value = input.getValue();
 			collection = input.getAttribute('collection') || collection;
-
 			query.push({name, value, operator: '$eq'})
 		});
 
@@ -79,9 +58,10 @@ const CoCreateUser = {
 				}
 			})
 		} else {
-			// ToDo: can be depreciated if we have another means of token generation
 			request.broadcastBrowser = false
-			crud.socket.send('signIn', request);
+			crud.socket.send('signIn', request).then((response) => {
+				this.signInResponse(data)
+			})
 		}
 	},
 
@@ -90,7 +70,7 @@ const CoCreateUser = {
 
 		if (success) {
 			localStorage.setItem('organization_id', crud.socket.config.organization_id);
-			localStorage.setItem("apiKey", crud.socket.config.apiKey);
+			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);
@@ -139,61 +119,36 @@ const CoCreateUser = {
 	},
 
 	signUp: function(btn) {
-		let form = btn.closest("form");
-		if (!form) return;
-		let org_id = "";
-		let elements = form.querySelectorAll("[collection='users'][name]");
-		let orgIdElement = form.querySelector("input[collection='organizations'][name='_id']");
-
-		if (orgIdElement)
-			org_id = orgIdElement.value;
-		else
-			org_id = crud.socket.config.organization_id;
-
-		let data = {document: {}};
-		elements.forEach(el => {
-			let name = el.getAttribute('name');
-			let value = el.getValue();
-			if (!name || !value) return;
-			data.document[name] = value;
-		});
+		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'] = org_id;
-		data.document['connected_orgs'] = [org_id];
+		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) => {
-				self.setDocumentId('users', response.document_id);
-				data.database = org_id
-				data.document['_id'] = response.document_id
-				data.organization_id = org_id
-				crud.createDocument(request).then((response) => {
-					render.data({
-						selector: "[template='signUp']",
-						data: {
-							type: 'signUp',
-							message: 'Succesfully Signed Up',
-							success: true
-						}
-					});
+		// 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
+			}));
 			
-					document.dispatchEvent(new CustomEvent('signUp', {
-						detail: response
-					}));
-		
-				})
-			})
-		// } else {
-		// 	// ToDo: creates user in platformdb
-		// 	crud.socket.send('signUp', {
-		// 		collection: 'users',
-		// 		...data,
-		// 		orgDB: org_id,
-		// 		broadcastBrowser: false
-		// 	});
-		// }
+		})
 	},
 
 	updateUserStatus: function(data) {
@@ -275,7 +230,7 @@ const CoCreateUser = {
 							_id: user_id
 						},
 					}).then((data) => {
-						localStorage.setItem('apiKey', data['apiKey']);
+						localStorage.setItem('key', data['key']);
 						localStorage.setItem('organization_id', data.document[0]['current_org']);
 						localStorage.setItem('host', crud.socket.config.host);
 						
@@ -287,23 +242,7 @@ const CoCreateUser = {
 				});
 			}
 		}
-	},
-
-	// 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;
-				}
-			});
-		}
-	}
-	
+	}	
 };
 
 

package/src/server.js

@@ -54,7 +54,7 @@ class CoCreateUser {
 			collection:	string,
 			data: object,
 			eId: string,
-			apiKey: string,
+			key: string,
 			organization_id: string
 		}
 	**/