Use cds.context instead of ws.request to derive user and tenant

Author: oklemenz2

CHANGELOG.md

@@ -5,10 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## Version 1.0.2 - 2024-07-xx
+## Version 1.0.2 - 2024-06-24
 
 ### Fixed
 
+- Use `cds.context` instead of `ws.request` to derive user and tenant
 - Add `cds.requires.kinds` for websockets and merge config
 - Pass all `cds.env.websocket` config to adapter and redis implementation
 - Streamline `cds.env` access in socket and redis implementation

package-lock.json

@@ -54,7 +54,7 @@
     "@eslint/js": "^9.5.0",
     "@sap/cds": "^7.9.2",
     "@sap/cds-dk": "^7.9.4",
-    "@sap/xssec": "^4.1.1",
+    "@sap/xssec": "^4.1.2",
     "@socket.io/redis-adapter": "^8.3.0",
     "@socket.io/redis-streams-adapter": "^0.2.2",
     "@types/express": "^4.17.21",

package.json

@@ -33,10 +33,11 @@ class SocketIOServer extends SocketServer {
     io.on("connection", async (socket) => {
       try {
         this.enforceAuth(socket);
-        socket.tenant = socket.request.tenant;
-        socket.user = socket.request.user?.id;
+        socket.contextId = cds.context.id;
+        socket.user = cds.context.user;
+        socket.tenant = cds.context.tenant;
         socket.join(room({ tenant: socket.tenant }));
-        socket.join(room({ tenant: socket.tenant, user: socket.user }));
+        socket.join(room({ tenant: socket.tenant, user: socket.user?.id }));
         if (socket.request._query?.id) {
           socket.join(room({ tenant: socket.tenant, identifier: socket.request._query?.id }));
         }
@@ -49,9 +50,9 @@ class SocketIOServer extends SocketServer {
           socket,
           get context() {
             return {
-              id: socket.request.correlationId,
-              user: socket.request.user,
-              tenant: socket.request.tenant,
+              id: socket.contextId,
+              user: socket.user,
+              tenant: socket.tenant,
               http: { req: socket.request, res: socket.request.res },
               ws: { service: facade, socket, io },
             };

src/socket/socket.io.js

@@ -65,16 +65,17 @@ class SocketWSServer extends SocketServer {
       this.applyMiddlewares(ws, async () => {
         try {
           this.enforceAuth(ws);
-          ws.tenant = ws.request.tenant;
-          ws.user = ws.request.user?.id;
+          ws.contextId = cds.context.id;
+          ws.user = cds.context.user;
+          ws.tenant = cds.context.tenant;
           const facade = {
             service,
             socket: ws,
             get context() {
               return {
-                id: ws.request.correlationId,
-                user: ws.request.user,
-                tenant: ws.request.tenant,
+                id: ws.contextId,
+                user: ws.user,
+                tenant: ws.tenant,
                 http: { req: ws.request, res: ws.request.res },
                 ws: { service: facade, socket: ws },
               };
@@ -159,7 +160,7 @@ class SocketWSServer extends SocketServer {
         client.readyState === WebSocket.OPEN &&
         client.request?.url === servicePath &&
         client.tenant === tenant &&
-        (!user || client.user !== user) &&
+        (!user || client.user?.id !== user) &&
         (!contexts ||
           contexts.find((context) => {
             return !!client.contexts[context];