@sap/cds 5.6.0 → 5.6.1

package/CHANGELOG.md

@@ -4,12 +4,21 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 5.6.1 - 2021-11-02
+
+### Fixed
+
+- UAA credentials lookup
+- Revert return type validation for `cds.String` for compatibility with older `@sap/cds-mtx` versions
+- Messaging: Ill-defined incoming AMQP messages will not crash the app
+- `cds compile -l` does no longer crash if called without `--to` option
+
 ## Version 5.6.0 - 2021-10-29
 
 ### Added
 
 - New REST protocol adapter (beta)
-  + Makes use of the beta OData URL to CQN parser. Hence, almost all OData requests are supported (see limitations below). 
+  + Makes use of the beta OData URL to CQN parser. Hence, almost all OData requests are supported (see limitations below).
   + Activate via `cds.env.features.rest_new_adapter = true`
   + Out of scope (compared to OData protocol adapter):
     + OData query option `$apply`

package/lib/i18n/localize.js

@@ -35,7 +35,8 @@ function localize (model, /*with:*/ locale, aString) {
 const TEXT_KEY_MARKER = 'i18n>'
 const TEXT_KEYS = /"([^"{]+)?{b?i18n>([^"}]+)}([^"]+)?"/g
 function localizeString (aString, bundle) {
-  if (!bundle)  return aString
+  if (!bundle || !aString)  return aString
+  if (typeof aString === 'object')  aString = JSON.stringify(aString, null, 2)
   // quick check for presence of any text key, to avoid expensive operation below
   if (aString.indexOf(TEXT_KEY_MARKER) < 0)  return aString
   const isXml = aString.startsWith('<?xml')

package/libx/_runtime/cds-services/adapter/rest/utils/validation-checks.js

@@ -106,10 +106,14 @@ const validateReturnType = (operation, data) => {
     // Determine entity from bound or unbound action/function
     const returnTypeCsnDefinition = returnType._type || returnType
 
-    checkResult = checkStatic(returnTypeCsnDefinition, data, true)
+    // REVISIT: remove exception with cds^6
+    // mtx returns object instead of string (as in modell) -> skip validation
+    if (returnTypeCsnDefinition.type !== 'cds.String') {
+      checkResult = checkStatic(returnTypeCsnDefinition, data, true)
+    }
   }
 
-  if (checkResult.length !== 0) {
+  if (checkResult && checkResult.length !== 0) {
     throw _getTypeError(operation, returnType.type, checkResult)
   }
 

package/libx/_runtime/common/auth/strategies/utils/uaa.js

@@ -1,11 +1,18 @@
 const cds = require('../../../../cds')
 
 const getCredentials = uaa => {
-  uaa = uaa || cds.env.requires.uaa || {}
+  uaa =
+    uaa && uaa.credentials
+      ? uaa
+      : cds.env.requires.uaa && cds.env.requires.uaa.credentials
+      ? cds.env.requires.uaa
+      : cds.env.requires.xsuaa && cds.env.requires.xsuaa.credentials
+      ? cds.env.requires.xsuaa
+      : {}
 
-  if (!uaa.credentials) {
+  if (!uaa.credentials)
     throw Object.assign(new Error('No or malformed uaa credentials'), { credentials: uaa.credentials })
-  }
+
   return uaa.credentials
 }
 

package/libx/_runtime/messaging/common-utils/AMQPClient.js

@@ -18,9 +18,14 @@ const addDataListener = (client, queue, prefix, cb) =>
       .receiver(queue)
       .attach(source)
       .on('data', async raw => {
-        const buffer = Buffer.concat(raw.payload.chunks)
-        const payload = _JSONorString(buffer.toString())
-        const topic = raw.source.properties.to.replace(/^topic:\/*/, '')
+        const buffer = raw.payload && Buffer.concat(raw.payload.chunks)
+        const payload = buffer && _JSONorString(buffer.toString())
+        const topic =
+          raw.source &&
+          raw.source.properties &&
+          raw.source.properties.to &&
+          raw.source.properties.to.replace(/^topic:\/*/, '')
+        if (!topic) return raw.done()
         await cb(topic, payload, null, { done: raw.done, failed: raw.failed })
       })
       .on('subscribed', () => {

package/package.json

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