@cocreate/users 1.26.0 → 1.27.0

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [1.27.0](https://github.com/CoCreate-app/CoCreate-users/compare/v1.26.0...v1.27.0) (2023-10-09)
+
+
+### Bug Fixes
+
+* socket.config items moved to socket ([2e09599](https://github.com/CoCreate-app/CoCreate-users/commit/2e0959976f83dae168d88533a71628a0d1edea76))
+* update wsManager.broadcast to wsManager.send() ([1f0132b](https://github.com/CoCreate-app/CoCreate-users/commit/1f0132b9ef0710831bd354332f35334fe4fbf29a))
+
+
+### Features
+
+* sawait ocket.organization_id() ([177a173](https://github.com/CoCreate-app/CoCreate-users/commit/177a173f27e8e4bf09c1c1aa72c015b73622b733))
+
 # [1.26.0](https://github.com/CoCreate-app/CoCreate-users/compare/v1.25.3...v1.26.0) (2023-09-19)
 
 

package/CoCreate.config.js

@@ -1,24 +1,24 @@
-module.exports = {
-    "organization_id": "",
-    "key": "",
-    "host": "",
-    "sources": [
-        {
-            "array": "files",
-            "object": {
-                "_id": "6012f7af86c0ba24512cca2e",
-                "name": "index.html",
-                "path": "/docs/users",
-                "pathname": "/docs/users/index.html",
-                "src": "{{./docs/index.html}}",
-                "host": [
-                    "*",
-                    "general.cocreate.app"
-                ],
-                "directory": "users",
-                "content-type": "{{content-type}}",
-                "public": "true"
-            }
-        }
-    ]
-}
+module.exports = {
+    "organization_id": "",
+    "key": "",
+    "host": "",
+    "sources": [
+        {
+            "array": "files",
+            "object": {
+                "_id": "6012f7af86c0ba24512cca2e",
+                "name": "index.html",
+                "path": "/docs/users",
+                "pathname": "/docs/users/index.html",
+                "src": "{{./docs/index.html}}",
+                "host": [
+                    "*",
+                    "general.cocreate.app"
+                ],
+                "directory": "users",
+                "content-type": "{{content-type}}",
+                "public": "true"
+            }
+        }
+    ]
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/users",
-  "version": "1.26.0",
+  "version": "1.27.0",
   "description": "A simple users component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "users",
@@ -59,10 +59,10 @@
   },
   "dependencies": {
     "@cocreate/actions": "^1.11.2",
-    "@cocreate/crud-client": "^1.26.0",
+    "@cocreate/crud-client": "^1.27.0",
     "@cocreate/element-prototype": "^1.11.2",
-    "@cocreate/elements": "^1.21.1",
+    "@cocreate/elements": "^1.22.0",
     "@cocreate/local-storage": "^1.10.2",
-    "@cocreate/render": "^1.27.3"
+    "@cocreate/render": "^1.28.0"
   }
 }

package/src/client.js

@@ -8,6 +8,10 @@ import './index.css';
 import localStorage from '@cocreate/local-storage';
 
 const CoCreateUser = {
+    organization_id: async () => {
+        return await Crud.socket.organization_id()
+    },
+
     init: function () {
         this.initSocket();
         this.initSession();
@@ -22,7 +26,6 @@ const CoCreateUser = {
         let formEl = btn.closest("form");
         if (!formEl) return;
 
-        let organization_id = Crud.socket.config.organization_id;
         let array = formEl.getAttribute('array')
         if (!array) {
             for (let el of formEl) {
@@ -128,11 +131,10 @@ const CoCreateUser = {
 
     signInResponse: function (data) {
         let { success, status, message, user_id, token } = data;
-
         if (success) {
-            localStorage.setItem('organization_id', Crud.socket.config.organization_id);
-            localStorage.setItem("key", Crud.socket.config.key);
-            localStorage.setItem("host", Crud.socket.config.host);
+            localStorage.setItem('organization_id', organization_id);
+            localStorage.setItem("key", Crud.socket.key);
+            localStorage.setItem("host", Crud.socket.host);
             localStorage.setItem('user_id', user_id);
             localStorage.setItem("token", token);
             // document.cookie = `token=${token};path=/`;
@@ -192,7 +194,7 @@ const CoCreateUser = {
     },
 
     redirect: (data) => {
-        if (data.user_id && data.user_id !== Crud.socket.config.user_id)
+        if (data.user_id && data.user_id !== Crud.socket.user_id)
             return
         if (!data.user_id && data.clientId !== Crud.socket.clientId)
             return

package/src/server.js

@@ -20,13 +20,13 @@ class CoCreateUser {
             if (data.user) {
                 data.user.method = 'create.object'
                 const response = await this.crud.send(data.user)
-                this.wsManager.broadcast(response);
+                this.wsManager.send(response);
             }
 
             if (data.userKey) {
                 data.userKey.method = 'create.object'
                 const response = await this.crud.send(data.userKey)
-                this.wsManager.broadcast(response);
+                this.wsManager.send(response);
             }
 
             self.wsManager.send(data);
@@ -86,7 +86,7 @@ class CoCreateUser {
                     }
                 }
                 self.wsManager.send(response)
-                self.wsManager.broadcast({
+                self.wsManager.send({
                     method: 'updateUserStatus',
                     user_id: response.user_id,
                     userStatus: response.userStatus,
@@ -116,11 +116,11 @@ class CoCreateUser {
 
             data.method = 'update.object'
             this.crud.send(data).then((data) => {
-                self.wsManager.broadcast({
+                self.wsManager.send({
                     method: 'updateUserStatus',
                     user_id: data.user_id,
                     userStatus: data.userStatus,
-                    organization_id: data.organization_id || socket.config.organization_id
+                    organization_id: data.organization_id || socket.organization_id
                 })
 
             })