Auth improvements

Author: oklemenz2

src/socket/base.js

@@ -4,6 +4,7 @@
 const cds = require("@sap/cds");
 const crypto = require("crypto");
 const path = require("path");
+const { inspect } = require("util");
 
 /**
  * Base class for a websocket server
@@ -229,14 +230,15 @@ class SocketServer {
    * @returns {[function]} Returns a list of middleware functions
    */
   middlewares() {
+    const base = this;
     function wrapMiddleware(middleware) {
       return (socket, next) => {
         let nextCalled = false;
         const wrapNext = (err) => {
           delete socket.request._next;
           if (!nextCalled) {
             nextCalled = true;
-            next(err);
+            next(base.toError(err));
           }
         };
         socket.request._next = wrapNext;
@@ -526,6 +528,31 @@ class SocketServer {
       }
     }
   }
+
+  /**
+   * Check if error is an instance of Error
+   * @param err Error
+   * @returns {boolean} True if error is an instance of Error
+   */
+  isError(err) {
+    try {
+      return err instanceof Error || Object.prototype.toString.call(err) === "[object Error]";
+    } catch {
+      return false;
+    }
+  }
+
+  /**
+   * Convert error to instance of Error
+   * @param err Error
+   * @returns {Error} Error instance
+   */
+  toError(err) {
+    if ([undefined, null].includes(err)) {
+      return err;
+    }
+    return this.isError(err) ? err : new Error(inspect(err));
+  }
 }
 
 module.exports = SocketServer;

test/_env/approuter/default-env.json

@@ -5,5 +5,6 @@
       "url": "http://localhost:4004",
       "forwardAuthToken": true
     }
-  ]
+  ],
+  "COOKIE_BACKWARD_COMPATIBILITY": true
 }