@cocreate/users 1.5.2 → 1.5.5

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [1.5.5](https://github.com/CoCreate-app/CoCreate-users/compare/v1.5.4...v1.5.5) (2022-05-09)
+
+
+### Bug Fixes
+
+* client.js - remove adminUI_id and builderUI_id ([88da86d](https://github.com/CoCreate-app/CoCreate-users/commit/88da86d9ecc31a12d3eb5cef0a941c38697828ad))
+* insert returns insertedId instead of [0]._id ([36c83fc](https://github.com/CoCreate-app/CoCreate-users/commit/36c83fc08d0ba70a3a9993b4d06bf8ad3304b2f7))
+
+## [1.5.4](https://github.com/CoCreate-app/CoCreate-users/compare/v1.5.3...v1.5.4) (2022-05-08)
+
+
+### Bug Fixes
+
+* convert user_id  object_id to string ([bec7113](https://github.com/CoCreate-app/CoCreate-users/commit/bec711359b99594c0a6207ca478a73968dbc0a41))
+
+## [1.5.3](https://github.com/CoCreate-app/CoCreate-users/compare/v1.5.2...v1.5.3) (2022-05-06)
+
+
+### Bug Fixes
+
+* replace ObjectID with ObjectId due to mongodb depreciation ([0e7f5be](https://github.com/CoCreate-app/CoCreate-users/commit/0e7f5beba78bb71937a97fb3224d63b9c7c711db))
+* update config organization_Id to organization_id ([929f871](https://github.com/CoCreate-app/CoCreate-users/commit/929f871205441c86b4024f07f239338abd52995f))
+
 ## [1.5.2](https://github.com/CoCreate-app/CoCreate-users/compare/v1.5.1...v1.5.2) (2022-05-03)
 
 

package/CoCreate.config.js

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

package/demo/index.html

@@ -13,7 +13,7 @@
 	    <script>
 	      var config = {
 	        apiKey: 'c2b08663-06e3-440c-ef6f-13978b42883a',
-	        organization_Id: '5de0387b12e200ea63204d6c',
+	        organization_id: '5de0387b12e200ea63204d6c',
 	        host: 'ws.cocreate.app'
 	      }
 	    </script>

package/package.json

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

package/src/client.js

@@ -7,7 +7,6 @@ import render from '@cocreate/render';
 const CONST_PERMISSION_CLASS = 'checkPermission';
 
 const CoCreateUser = {
-	// masterDB: '5ae0cfac6fb8c4e656fdaf92', // '5ae0cfac6fb8c4e656fdaf92' /** masterDB **/,
 	init: function() {
 		this.updatedCurrentOrg = false;
 		this.initSocket();
@@ -69,7 +68,7 @@ const CoCreateUser = {
 
 		crud.send('login', {
 			"apiKey": window.config.apiKey,
-			"organization_id": window.config.organization_Id,
+			"organization_id": window.config.organization_id,
 			"collection": collection,
 			"loginData": loginData
 		});
@@ -79,7 +78,7 @@ const CoCreateUser = {
 		let { success, status, message, token } = data;
 
 		if (success) {
-			window.localStorage.setItem('organization_id', window.config.organization_Id);
+			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['id']);
@@ -108,7 +107,7 @@ const CoCreateUser = {
 	getCurrentOrg: function(user_id, collection) {
 		crud.send('usersCurrentOrg', {
 			"apiKey": window.config.apiKey,
-			"organization_id": window.config.organization_Id,
+			"organization_id": window.config.organization_id,
 			"collection": collection || 'users',
 			"user_id": user_id,
 		});
@@ -120,9 +119,6 @@ const CoCreateUser = {
 		window.localStorage.setItem('organization_id', data['current_org']);
 		window.localStorage.setItem('host', window.config.host);
 
-		// window.localStorage.setItem('adminUI_id', data['adminUI_id']);
-		// window.localStorage.setItem('builderUI_id', data['builderUI_id']);
-
 		document.dispatchEvent(new CustomEvent('logIn'));
 	},
 
@@ -264,11 +260,11 @@ const CoCreateUser = {
 		let newOrg_id = form.querySelector("input[collection='organizations'][name='_id']");
 		let user_id = form.querySelector("input[collection='users'][name='_id']");
 
-		const room = config.organization_Id;
+		const room = config.organization_id;
 
 		crud.send('createUserNew', {
 			apiKey: config.apiKey,
-			organization_id: config.organization_Id,
+			organization_id: config.organization_id,
 			collection: 'users',
 			newOrg_id: org_id,
 			user_id: user_id,
@@ -300,14 +296,13 @@ const CoCreateUser = {
 		});
 		data['current_org'] = org_id;
 		data['connected_orgs'] = [org_id];
-		data['organization_id'] = config.organization_Id;
+		data['organization_id'] = config.organization_id;
 
-		const room = config.organization_Id;
+		const room = config.organization_id;
 
 		crud.send('createUser', {
 			apiKey: config.apiKey,
-			organization_id: config.organization_Id,
-			// 	mdb: this.masterDB,
+			organization_id: config.organization_id,
 			collection: 'users',
 			data: data,
 			orgDB: org_id

package/src/server.js

@@ -1,4 +1,4 @@
-const {ObjectID} = require("mongodb");
+const {ObjectId} = require("mongodb");
 
 class CoCreateUser {
 	constructor(wsManager, dbClient) {
@@ -28,7 +28,7 @@ class CoCreateUser {
 				const db = this.dbClient.db(req_data['organization_id']);
 				const collection = db.collection(req_data["collection"]);
 					const query = {
-					"_id": new ObjectID(data["user_id"])
+					"_id": new ObjectId(data["user_id"])
 				};
 			
 				collection.find(query).toArray(function(error, result) {
@@ -37,7 +37,7 @@ class CoCreateUser {
 						// Create new user in config db users collection
 						newOrgDb.insertOne({...result.ops[0], organization_id : newOrg_id}, function(error, result) {
 							if(!error && result){
-								const response  = { ...data, document_id: result.ops[0]._id, data: result.ops[0]}
+								const response  = { ...data, document_id: `${result.insertedId}`, data: result.ops[0]}
 								self.wsManager.send(socket, 'createUserNew', response, data['organization_id']);
 							}
 						});
@@ -59,15 +59,22 @@ class CoCreateUser {
 			collection.insertOne(data.data, function(error, result) {
 				if(!error && result){
 					const orgDB = data.orgDB;
+					data.data['_id'] = result.insertedId;
 					// if new orgDb Create new user in new org db users collection
 					if (orgDB != data.organization_id) {
 						if (orgDB) {
 							const anotherCollection = self.dbClient.db(orgDB).collection(data['collection']);
-							anotherCollection.insertOne({...result.ops[0], organization_id : orgDB});
+							anotherCollection.insertOne({...data.data, organization_id : orgDB});
 						}
 					}
-					const response  = { ...data, document_id: result.ops[0]._id, data: result.ops[0]}
+					const response  = { ...data, document_id: `${result.insertedId}`}
 					self.wsManager.send(socket, 'createUser', response, data['organization_id']);
+
+					// 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});
+					}	
 				}
 			});
 		}catch(error){
@@ -114,7 +121,8 @@ class CoCreateUser {
 				if (!error && result && result.length > 0) {
 					let token = null;
 					if (self.wsManager.authInstance) {
-						token = await self.wsManager.authInstance.generateToken({user_id: result[0]['_id']});
+						console.log('login user_id: ', `${result[0]['_id']}`)
+						token = await self.wsManager.authInstance.generateToken({user_id: `${result[0]['_id']}`});
 					}
 
 					response = { ...response,  
@@ -128,7 +136,6 @@ class CoCreateUser {
 						token
 					};
 				} 
-				console.log('before socket', response);
 				self.wsManager.send(socket, 'login', response, req_data['organization_id'])
 				console.log('success socket', req_data['organization_id']);
 			});
@@ -154,7 +161,7 @@ class CoCreateUser {
 			
 			let query = new Object();
 			
-			query['_id'] = new ObjectID(req_data['user_id']);
+			query['_id'] = new ObjectId(req_data['user_id']);
 
 			collection.find(query).toArray(function(error, result) {
 			
@@ -164,7 +171,7 @@ class CoCreateUser {
 						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) {
+						orgCollection.find({"_id": new ObjectId(org_id),}).toArray(function(err, res) {
 							if (!err && res && res.length > 0) {
 								self.wsManager.send(socket, 'usersCurrentOrg', {
 									id: 				req_data['id'],
@@ -173,8 +180,6 @@ class CoCreateUser {
 									user_id:			result[0]['_id'],
 									current_org:		result[0]['current_org'],
 									apiKey: 			res[0]['apiKey'],
-									adminUI_id: 		res[0]['adminUI_id'],
-									builderUI_id:		res[0]['builderUI_id'],
 									href: req_data['href']
 								}, req_data['organization_id'])
 							}
@@ -211,7 +216,7 @@ class CoCreateUser {
 			const collection = self.dbClient.db(selectedDB).collection(req_data['collection']);
 			const user_id = req_data['user_id'];
 			const query = {
-				"_id": new ObjectID(user_id),
+				"_id": new ObjectId(user_id),
 			}
 			
 			collection.findOne(query, function(error, result) {
@@ -245,7 +250,7 @@ class CoCreateUser {
 			const collection = self.dbClient.db(selectedDB).collection('users');
 			const user_id = items[1];
 			const query = {
-				"_id": new ObjectID(user_id),
+				"_id": new ObjectId(user_id),
 			}
 			collection.update(query, {$set: {status: status}}, function(err, res) {
 				if (!err) {