@cocreate/users 1.5.0 → 1.5.3

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [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)
+
+
+### Bug Fixes
+
+* removed localstorage.setItem for admin_ui and builder_ui ([350f289](https://github.com/CoCreate-app/CoCreate-users/commit/350f289f731bf21f535d892b276708044eb662a3))
+* user permission typo contained duplicate delete switch case. renamed one to update ([66f6fc7](https://github.com/CoCreate-app/CoCreate-users/commit/66f6fc72ce3b60facaaa41112246de22358062dd))
+
+## [1.5.1](https://github.com/CoCreate-app/CoCreate-users/compare/v1.5.0...v1.5.1) (2022-03-06)
+
+
+### Bug Fixes
+
+* update param roomInfo to socketInfo ([6784138](https://github.com/CoCreate-app/CoCreate-users/commit/6784138e71feb00866cb8159b1d3c95136b5f00d))
+
 # [1.5.0](https://github.com/CoCreate-app/CoCreate-users/compare/v1.4.35...v1.5.0) (2022-03-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.0",
+  "version": "1.5.3",
   "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,8 +119,8 @@ 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']);
+		// window.localStorage.setItem('adminUI_id', data['adminUI_id']);
+		// window.localStorage.setItem('builderUI_id', data['builderUI_id']);
 
 		document.dispatchEvent(new CustomEvent('logIn'));
 	},
@@ -214,7 +213,7 @@ const CoCreateUser = {
 					case 'read':
 						tag.style.display = 'none';
 						break;
-					case 'delete':
+					case 'update':
 						tag.style.display = 'none';
 						break;
 					case 'delete':
@@ -264,11 +263,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 +299,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) {
@@ -9,12 +9,12 @@ class CoCreateUser {
 	
 	init() {
 		if (this.wsManager) {
-			this.wsManager.on('createUserNew',			(socket, data, roomInfo) => this.createUserNew(socket, data));
-			this.wsManager.on('createUser',				(socket, data, roomInfo) => this.createUser(socket, data));
-			this.wsManager.on('login',					(socket, data, roomInfo) => this.login(socket, data, roomInfo))
-			this.wsManager.on('usersCurrentOrg',		(socket, data, roomInfo) => this.usersCurrentOrg(socket, data, roomInfo))
-			this.wsManager.on('fetchUser',				(socket, data, roomInfo) => this.fetchUser(socket, data, roomInfo))
-			this.wsManager.on('userStatus',				(socket, data, roomInfo) => this.setUserStatus(socket, data, roomInfo))
+			this.wsManager.on('createUserNew',			(socket, data, socketInfo) => this.createUserNew(socket, data));
+			this.wsManager.on('createUser',				(socket, data, socketInfo) => this.createUser(socket, data));
+			this.wsManager.on('login',					(socket, data, socketInfo) => this.login(socket, data, socketInfo))
+			this.wsManager.on('usersCurrentOrg',		(socket, data, socketInfo) => this.usersCurrentOrg(socket, data, socketInfo))
+			this.wsManager.on('fetchUser',				(socket, data, socketInfo) => this.fetchUser(socket, data, socketInfo))
+			this.wsManager.on('userStatus',				(socket, data, socketInfo) => this.setUserStatus(socket, data, socketInfo))
 		}
 	}
 
@@ -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) {
@@ -154,7 +154,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 +164,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'],
@@ -211,7 +211,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) {
@@ -227,7 +227,7 @@ class CoCreateUser {
 	/**
 	 * status: 'on/off/idle'
 	 */
-	async setUserStatus(socket, req_data, roomInfo) {
+	async setUserStatus(socket, req_data, socketInfo) {
 		const self = this;
 		const {info, status} = req_data;
 
@@ -245,7 +245,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) {