@sap/cds 6.8.2 → 6.8.4

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 6.8.4 - 2023-06-14
+
+### Fixed
+
+- `$metadata` requests for multitenant applications
+
+## Version 6.8.3 - 2023-06-13
+
+### Fixed
+
+- `cds build` no longer reports CAP Java Classic runtime usage by mistake.
+- `cds version` prints the local `@sap/cds` version, even if called from a different `@sap/cds` installation.
+- User challenges handling in case of `cds.env.auth.restrict_all_services: false`
+
 ## Version 6.8.2 - 2023-05-26
 
 ### Fixed

package/bin/build/util.js

@@ -88,7 +88,7 @@ async function isOldJavaStack(dirs) {
     if (files.length > 0) {
         return (await Promise.all(files.map(async file => {
             const content = await fs.promises.readFile(file, 'utf-8')
-            return content && /<groupId>\s*com\.sap\.cloud\.servicesdk/.test(content) && !(/<groupId>\s*com\.sap\.cds\s*<\/groupId>/.test(content) && /<artifactId>\s*cds-/.test(content))
+            return content && /<groupId>\s*com\.sap\.cloud\.servicesdk\.prov\s*<\/groupId>/.test(content)
         }))).some(result => result)
     }
     return false

package/bin/version.js

@@ -57,6 +57,7 @@ function list_versions(args, options) { //NOSONAR
 function info(o) {
   const { npmGlobalModules } = require('./utils/modules');
   const main = _findPackage (require.main.filename)
+  const sap_cds = require.resolve('@sap/cds/package.json', {paths:[process.cwd(), __dirname]})
   return {
     // REVISIT: Why do we need all these different hard-coded ways, including proliferation of arguments?
     ..._versions4(main, {}, true),  // usually sap/cds-dk or sap/cds
@@ -66,6 +67,7 @@ function info(o) {
     ..._versions4(process.cwd(), {}, null, o),
     ..._versions4('..', {}, null, o),
     ..._findMTX(),
+    '@sap/cds': require(sap_cds).version, // ensure effective sap/cds version is listed
     'Node.js': process.version,
     'home': __dirname.slice(0,-4)
   }
@@ -84,6 +86,7 @@ function _versions4 (pkg_name, info, parent, o={}) {
     }
     const pkg = require(path)
     info[o.label || pkg.name] = pkg.version
+    // console.log(o.label || pkg.name, pkg.version, path)
     if (!parent || o.all) for (let d in pkg.dependencies) { // recurse sap packages in dependencies...
       if (!(d in info) && (d.startsWith('@sap/') || d.startsWith('@cap-js/'))) _versions4(d, info, pkg.name, o)
     }

package/lib/req/request.js

@@ -127,7 +127,7 @@ class Request extends require('./event') {
   warn   (...args) { return this._messages.add (3, ...args) }
   error  (...args) { return this._errors.add (4, ...args) }
   reject (...args) {
-    if (args[0] === 401 && this._.req?.login) return this._.req.login()
+    if (args[0] === 401 && this._.req?.login && !this._.req?.logIn) return this._.req.login()
     let e = this.error(...args)
     if (!e.stack) Error.captureStackTrace (e = Object.assign(new Error,e), this.reject)
     throw e

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/metadata.js

@@ -22,7 +22,7 @@ const metadata = service => {
       const { 'cds.xt.ModelProviderService': mps } = cds.services
       let edmx = mps
         ? await mps.getEdmx({ tenant, model: service.model, service: service.definition.name, locale })
-        : cds.mtx && cds.mtx.isExtended(tenant)
+        : cds.mtx && (await cds.mtx.isExtended(tenant))
         ? await cds.mtx.getEdmx(tenant, service.definition.name, locale)
         : cds.localize(
             service.model,

package/package.json

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