@cocreate/socket-server 1.9.0 → 1.10.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.10.1](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.10.0...v1.10.1) (2023-05-25)
+
+
+### Bug Fixes
+
+* Update dependencies versions ([d3cad89](https://github.com/CoCreate-app/CoCreate-socket-server/commit/d3cad89ad28f8b90c89b9fd3f30acab59496a623))
+
+# [1.10.0](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.9.0...v1.10.0) (2023-05-25)
+
+
+### Features
+
+* Simplify WebSocketServer Class, Replace Permission and Auth Instance with Single functions. ([4ec6eb3](https://github.com/CoCreate-app/CoCreate-socket-server/commit/4ec6eb35e034a119c3f4e24a054a7708f04e8ac4))
+
 # [1.9.0](https://github.com/CoCreate-app/CoCreate-socket-server/compare/v1.8.2...v1.9.0) (2023-05-24)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/socket-server",
-  "version": "1.9.0",
+  "version": "1.10.1",
   "description": "CoCreate-socket-server",
   "keywords": [
     "cocreate-socket",
@@ -40,8 +40,8 @@
   },
   "homepage": "https://cocreate.app/docs/CoCreate-socket-server",
   "dependencies": {
-    "@cocreate/docs": "^1.7.11",
-    "@cocreate/uuid": "^1.4.10"
+    "@cocreate/docs": "^1.7.13",
+    "@cocreate/uuid": "^1.4.11"
   },
   "devDependencies": {
     "express": "^4.17.1",

package/src/index.js

@@ -15,16 +15,6 @@ class SocketServer extends EventEmitter {
 
         //. websocket server
         this.wss = new WebSocket.Server({ noServer: true });
-        this.permissionInstance = null;
-        this.authInstance = null;
-    }
-
-    setPermission(instance) {
-        this.permissionInstance = instance;
-    }
-
-    setAuth(instance) {
-        this.authInstance = instance
     }
 
     handleUpgrade(req, socket, head) {
@@ -138,17 +128,17 @@ class SocketServer extends EventEmitter {
                     organization_id
                 });
                 let user_id = null;
-                if (this.authInstance)
-                    user_id = await this.authInstance.getUserId(req);
+                if (this.authenticate)
+                    user_id = await this.authenticate.getUserId(req);
 
-                if (this.permissionInstance) {
+                if (this.authorize) {
                     data.host = this.getHost(req)
-                    const permission = await this.permissionInstance.check(action, data, user_id)
+                    const permission = await this.authorize.check(action, data, user_id)
                     if (permission.dbUrl === false) {
                         data.database = process.env.organization_id
                         data.organization_id = process.env.organization_id
 
-                        const permission2 = await this.permissionInstance.check(action, data, req, user_id)
+                        const permission2 = await this.authorize.check(action, data, req, user_id)
                         if (!permission2 || permission2.error) {
                             return this.send(socket, 'Access Denied', { action, permission2, ...data })
                         }
@@ -258,7 +248,7 @@ class SocketServer extends EventEmitter {
                         if (isAsync) {
                             asyncData.push({ socket, message: JSON.stringify({ action, data }) })
                         } else {
-                            const permission = await this.permissionInstance.check(action, data, socket.config.user_id)
+                            const permission = await this.authorize.check(action, data, socket.config.user_id)
                             if (permission && permission.authorized)
                                 data = permission.authorized