@sap/cds 6.3.2 → 6.4.1

package/libx/rest/RestAdapter.js

@@ -22,17 +22,6 @@ const RestAdapter = function (srv) {
 
   const router = express.Router()
 
-  // -----------------------------------------------------------------------------------------
-  // service root
-  router.head('/', (_, res) => res.json({}))
-  router.get('/', (_, res) =>
-    res.json({
-      entities: Object.keys(srv.entities).map(e => ({ name: e, url: e }))
-    })
-  )
-
-  // -----------------------------------------------------------------------------------------
-
   // pass srv-related stuff to middlewares via req
   router.use((req, res, next) => {
     req._srv = srv // FIXME: That's only because of how we organized our rest adapater code into fragmented files -> don't do that
@@ -93,6 +82,15 @@ const RestAdapter = function (srv) {
     // REVISIT: security log?
   })
 
+  // -----------------------------------------------------------------------------------------
+  // service root
+  router.head('/', (_, res) => res.json({}))
+  router.get('/', (_, res) =>
+    res.json({
+      entities: Object.keys(srv.entities).map(e => ({ name: e, url: e }))
+    })
+  )
+
   // -----------------------------------------------------------------------------------------
   // parse / validate
 
@@ -132,8 +130,9 @@ const RestAdapter = function (srv) {
   // begin tx
   router.use((req, res, next) => {
     // REVISIT: -> move to actual handler(s)
+    const tenant = req.tenant || req.user?.tenant
     // create tx and set as cds.context
-    cds.context = srv.tx(new cds.EventContext({ user: req.user, req, res }))
+    cds.context = srv.tx(new cds.EventContext({ user: req.user, req, res, tenant }))
     next()
   })
 
@@ -197,7 +196,10 @@ const RestAdapter = function (srv) {
 
     next(err)
   })
-  router.use(error) // FIXME: nope -> call next()
+
+  if (!cds.env.features.rest_error_handler) {
+    router.use(error) // FIXME: nope -> call next()
+  }
 
   return router
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "6.3.2",
+  "version": "6.4.1",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [

package/server.js

@@ -47,7 +47,6 @@ module.exports = async function cds_server (options) {
   if (cds.requires.messaging)   await cds.connect.to ('messaging')
 
   // serve all services declared in models
-  if (cds.requires.middlewares) cds.middlewares.bootstrap(); else if (o.correlate) app.use (o.correlate)
   await cds.serve (o.service,o) .in (app)
   await cds.emit ('served', cds.services) //> hook for listeners
 
@@ -71,7 +70,7 @@ module.exports = async function cds_server (options) {
 //
 const defaults = {
 
-  cors, correlate,
+  cors,
 
   get static() { return cds.env.folders.app },  //> defaults to ./app
 
@@ -100,7 +99,7 @@ const _app_serve = function (endpoint) { return {
 }}
 
 
-function cors (req, res, next) {
+function cors (req, res, next) { // REVISIT: should that move into middlewares?
   const { origin } = req.headers
   if (origin) res.set('access-control-allow-origin', origin)
   if (origin && req.method === 'OPTIONS')
@@ -108,22 +107,6 @@ function cors (req, res, next) {
   next()
 }
 
-function correlate (req, res, next) {
-  // derive correlation id from req
-  const id = req.headers['x-correlation-id'] || req.headers['x-correlationid']
-    || req.headers['x-request-id'] || req.headers['x-vcap-request-id']
-    || cds.utils.uuid()
-  // new intermediate cds.context, if necessary
-  if (!cds.context) cds.context = { id }
-  // guarantee x-correlation-id going forward and set on res
-  req.headers['x-correlation-id'] = id
-  res.set('X-Correlation-ID', id)
-  // guaranteed access to cds.context._.req -> REVISIT
-  if (!cds.context._) cds.context._ = {}
-  if (!cds.context._.req) cds.context._.req = req
-  next()
-}
-
 function express_static (dir) {
   return express.static (path.resolve (cds.root,dir))
 }