Tenant, user

Author: oklemenz2

src/socket/socket.io.js

@@ -34,8 +34,8 @@ class SocketIOServer extends SocketServer {
       try {
         this.enforceAuth(socket);
         socket.contextId = cds.context.id;
-        socket.user = cds.context.user;
         socket.tenant = cds.context.tenant;
+        socket.user = cds.context.user;
         socket.join(room({ tenant: socket.tenant }));
         socket.join(room({ tenant: socket.tenant, user: socket.user?.id }));
         if (socket.request._query?.id) {
@@ -51,8 +51,8 @@ class SocketIOServer extends SocketServer {
           get context() {
             return {
               id: socket.contextId,
-              user: socket.user,
               tenant: socket.tenant,
+              user: socket.user,
               http: { req: socket.request, res: socket.request.res },
               ws: { service: facade, socket, io },
             };

src/socket/ws.js

@@ -66,16 +66,16 @@ class SocketWSServer extends SocketServer {
         try {
           this.enforceAuth(ws);
           ws.contextId = cds.context.id;
-          ws.user = cds.context.user;
           ws.tenant = cds.context.tenant;
+          ws.user = cds.context.user;
           const facade = {
             service,
             socket: ws,
             get context() {
               return {
                 id: ws.contextId,
-                user: ws.user,
                 tenant: ws.tenant,
+                user: ws.user,
                 http: { req: ws.request, res: ws.request.res },
                 ws: { service: facade, socket: ws },
               };