@sap/cds 7.5.0 → 7.5.2

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 7.5.2 - 2024-01-05
+
+### Fixed
+
+- Service-level ETag handling in legacy OData server
+- Only provide model to ModelProvider if extensibility or feature toggles are active
+- OData server driven paging when using feature flags `cds.env.features.odata_new_parser` and `cds.env.features.okra_skip_query_options`
+
+## Version 7.5.1 - 2023-12-21
+
+### Fixed
+
+- Resolving custom authentication implementation pointer
+
 ## Version 7.5.0 - 2023-12-14
 
 ### Added

package/lib/auth/index.js

@@ -30,7 +30,8 @@ module.exports = function auth_factory (o) {
 
   // try resolving the impl, throw if not found
   const config = { kind, impl: cds.utils.local(impl) }
-  try { impl = require.resolve (impl, {paths:[cds.root]}) } catch {
+  // use cds.resolve() to allow './srv/auth.js' and 'srv/auth.js'
+  try { impl = require.resolve (cds.resolve (impl)?.[0], {paths:[cds.root]}) } catch {
     throw cds.error `Didn't find auth implementation for ${config}`
   }
 

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

@@ -31,7 +31,11 @@ const metadata = service => {
       if (mps) {
         // REVISIT: remove check later
         if (mpSupportsEmptyLocale()) {
-          edmx = await mps.getEdmx({ tenant, model: service.model, service: service.definition.name })
+          // If no extensibility nor fts, do not provide model to mtxs
+          const modelNeeded =
+            cds.env.requires.extensibility ||
+            (cds.env.requires.toggles && Object.keys(cds.context.features || {}).length)
+          edmx = await mps.getEdmx({ tenant, model: modelNeeded && service.model, service: service.definition.name })
           const extBundle = cds.env.requires.extensibility && (await mps.getI18n({ tenant, locale }))
           edmx = cds.localize(service.model, locale, edmx, extBundle)
         } else {

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

@@ -273,9 +273,9 @@ const _readCollection = async (tx, req, odataReq) => {
   const limit = Array.isArray(req.query)
     ? getPageSize(req.query[0]._target).max
     : req.query.SELECT.limit && req.query.SELECT.limit.rows && req.query.SELECT.limit.rows.val
-  const top = odataReq.getUriInfo().getQueryOption(QueryOptions.TOP)
+  const top = odataReq.getUriInfo().getQueryOption(QueryOptions.TOP) || parseInt(odataReq._queryOptions?.$top)
   if (limit && limit === result.length && limit !== top && !('$nextLink' in result)) {
-    const token = odataReq.getUriInfo().getQueryOption(QueryOptions.SKIPTOKEN)
+    const token = odataReq.getUriInfo().getQueryOption(QueryOptions.SKIPTOKEN) || odataReq._queryOptions?.$skiptoken
     if (cds.env.query.limit.reliablePaging && _reliablePagingPossible(req)) {
       const decoded = token && JSON.parse(Buffer.from(token, 'base64').toString())
       const skipToken = {

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/core/OdataRequest.js

@@ -283,7 +283,10 @@ class OdataRequest {
    * @throws {PreconditionFailedError} if the validations failed
    */
   validateEtag (etag) {
-    throw new Error("etag validation not supported via okra")
+    const url = this.getIncomingRequest().url
+    if (!url.match(/\/(\$metadata)?(\?.*)?$/) && !process.env.TEST_OKRA) //> keep etag handling for okra tests
+      throw new Error(`etag validation not supported for url "${url}"`)
+
     this._logger.debug('Provided etag:', etag)
 
     this._validateEtagHasBeenCalled = true

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/handler/MetadataHandler.js

@@ -12,7 +12,7 @@ class MetadataHandler {
    */
   static read (request, response, next) {
     const metadataETag = request.getService().getMetadataEtag()
-    // if (metadataETag) request.validateEtag(metadataETag)
+    if (metadataETag) request.validateEtag(metadataETag)
 
     next(null, { [MetaProperties.ETAG]: metadataETag })
   }

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/handler/ServiceHandler.js

@@ -16,7 +16,7 @@ class ServiceHandler {
    */
   static read (request, response, next) {
     const metadataETag = request.getService().getMetadataEtag()
-    // if (metadataETag) request.validateEtag(metadataETag)
+    if (metadataETag) request.validateEtag(metadataETag)
     next(null, { [MetaProperties.ETAG]: metadataETag })
     // TODO this method may be replaced by a custom service handler, so we need a scenario test that ensures that this method is called...
   }

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/invocation/DispatcherCommand.js

@@ -56,7 +56,7 @@ class DispatcherCommand extends Command {
 
     if (cachedMetadata) {
       this._response.setBody({ value: cachedMetadata.metadata, [MetaProperties.ETAG]: cachedMetadata.etag })
-      // this._request.validateEtag(cachedMetadata.etag)
+      this._request.validateEtag(cachedMetadata.etag)
       next()
     } else {
       this._dispatcher
@@ -79,7 +79,7 @@ class DispatcherCommand extends Command {
                 'Metadata size exceeds cache boundary. Use cds option odata.metadataCacheLimit to increase the cache size.'
               )
             }
-            // this._request.validateEtag(metadataEtag)
+            this._request.validateEtag(metadataEtag)
             let data = result.data
             data[MetaProperties.ETAG] = metadataEtag
           }

package/libx/_runtime/messaging/enterprise-messaging-utils/registerEndpoints.js

@@ -94,6 +94,7 @@ class EndpointRegistry {
           }
         })
       } catch (error) {
+        LOG.error(error)
         return res.sendStatus(500)
       }
     })

package/libx/odata/metadata.js

@@ -92,7 +92,11 @@ module.exports = srv =>
         let edmx
         // REVISIT: remove check later
         if (mpSupportsEmptyLocale()) {
-          edmx = metadataCache.edm || (await mps.getEdmx({ tenant, model: srv.model, service: srv.definition.name }))
+          // If no extensibility nor fts, do not provide model to mtxs
+          const modelNeeded =
+            cds.env.requires.extensibility ||
+            (cds.env.requires.toggles && Object.keys(cds.context.features || {}).length)
+          edmx = metadataCache.edm || (await mps.getEdmx({ tenant, model: modelNeeded && srv.model, service: srv.definition.name }))
           metadataCache.edm = edmx
           const extBundle = cds.env.requires.extensibility && (await mps.getI18n({ tenant, locale }))
           edmx = cds.localize(srv.model, locale, edmx, extBundle)

package/libx/odata/read.js

@@ -27,9 +27,9 @@ const _calculateSkiptoken = (req, result) => {
   const limit = Array.isArray(req.query)
     ? getPageSize(req.query[0]._target).max
     : req.query.SELECT.limit?.rows?.val
-  const top = parseInt(req.http.req.query['$top'])
+  const top = parseInt(req.http.req.query.$top)
   if (limit === result.length && limit !== top) {
-    const token = req.http.req.query['$skiptoken']
+    const token = req.http.req.query.$skiptoken
     if (cds.env.query.limit.reliablePaging && _reliablePagingPossible(req)) {
       const decoded = token && JSON.parse(Buffer.from(token, 'base64').toString())
       const skipToken = {

package/package.json

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