@sap/cds 5.9.8 → 6.0.3

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/expandToCQN.js

@@ -76,9 +76,7 @@ const _getColumnsFromTargetType = (targetType, relatedEntity, all = false) => {
       }))
   }
 
-  const columnNames = Object.values(relatedEntity.elements)
-    .filter(element => element['@odata.etag'])
-    .map(element => element.name)
+  const columnNames = []
 
   const keyNames = Object.keys(relatedEntity.keys).filter(keyName => {
     const key = relatedEntity.keys[keyName]
@@ -94,6 +92,17 @@ const _getInnerSelect = expandItem => {
   return expandItem.getOption(QueryOptions.SELECT) || []
 }
 
+const _isProxy = (service, targetType, relatedEntity) => {
+  // REVISIT still not perfect solution
+  if (!cds.env.effective.odata.proxies && !cds.env.effective.odata.xrefs) return
+  // proxy => target entity not exposed in service (model.namespace)
+  if (targetType.getName() in service.entities()) return
+  for (const key of targetType.getProperties().keys()) {
+    if (!relatedEntity.keys[key]) return
+  }
+  return true
+}
+
 /**
  * Get the selected columns and navigation paths.
  *
@@ -103,17 +112,14 @@ const _getInnerSelect = expandItem => {
  * @returns {Array}
  * @private
  */
-const _getSelectedElements = (expandItem, targetType, relatedEntity, options) => {
-  if (cds.env.effective.odata.proxies || cds.env.effective.odata.xrefs) {
-    // proxy target?
-    let proxy = true
-    targetType.getProperties().forEach((value, key) => {
-      if (!relatedEntity.keys[key]) proxy = false
-    })
-
-    if (proxy) {
-      return _getColumnsFromTargetType(targetType, relatedEntity)
-    }
+const _getSelectedElements = (expandItem, targetType, service, options) => {
+  const { name: entityName, namespace } = targetType.getFullQualifiedName()
+
+  // autoexposed entities now used . in csn and _ in edm
+  const relatedEntity = findCsnTargetFor(entityName, service.model, namespace)
+  // proxy target?
+  if (_isProxy(service, targetType, relatedEntity)) {
+    return _getColumnsFromTargetType(targetType, relatedEntity)
   }
 
   let innerSelectItems = _getInnerSelect(expandItem)
@@ -151,50 +157,30 @@ const _getSelectedElements = (expandItem, targetType, relatedEntity, options) =>
   return selectedPaths
 }
 
-/**
- * Nested expands are inner expand items.
- *
- * @param model
- * @param expandItem
- * @param targetType
- * @returns {Array}
- * @private
- */
-const _getInnerExpandItems = (model, expandItem, targetType) => {
-  if (!expandItem || !expandItem.getOption(QueryOptions.EXPAND)) {
-    return []
-  }
-
-  return expandToCQN(model, expandItem.getOption(QueryOptions.EXPAND), targetType)
-}
-
 const _filter = (item, expression) => {
   if (!expression) return
   const expressionToCQN = new ExpressionToCQN()
   item.where = SELECT.from('a').where(expressionToCQN.parse(expression)).SELECT.where
 }
 
-const _getItemCQN = (model, name, navigationProperty, expandItem, options) => {
+const _getItemCQN = (service, name, navigationProperty, expandItem, options) => {
   _notSupported(expandItem)
 
   const targetType = navigationProperty.getEntityType()
-  const { name: entityName, namespace } = navigationProperty.getEntityType().getFullQualifiedName()
 
-  // autoexposed entities now used . in csn and _ in edm
-  const relatedEntity = findCsnTargetFor(entityName, model, namespace)
-  const expand = _getSelectedElements(expandItem, targetType, relatedEntity, options)
+  const expand = _getSelectedElements(expandItem, targetType, service, options)
   const item = {
     ref: name, // ['structured', 'nested_', nestedAssocToOne] if expand on structured
     expand
   }
 
-  item.expand.push(..._getInnerExpandItems(model, expandItem, targetType))
-
   if (!expandItem) {
     // $expand=* can't have own query options -> no limit, orderBy, etc. needed
     return item
   }
 
+  item.expand.push(...expandToCQN(expandItem.getOption(QueryOptions.EXPAND), targetType, service, options))
+
   const orderBy = expandItem.getOption(QueryOptions.ORDERBY)
   if (orderBy) {
     orderByToCQN(item, orderBy)
@@ -230,7 +216,9 @@ const _name = expandItem =>
  * @param type
  * @returns {Array}
  */
-const expandToCQN = (model, expandItems, type, options) => {
+const expandToCQN = (expandItems, type, service, options) => {
+  if (!expandItems || !expandItems.length) return []
+
   const allElements = []
   const isAll = expandItems.some(item => item.isAll())
 
@@ -238,7 +226,7 @@ const expandToCQN = (model, expandItems, type, options) => {
     const expandItem = _getExpandItem(isAll, expandItems, name)
 
     if (isAll || expandItem) {
-      const itemCQN = _getItemCQN(model, [name], navigationProperty, expandItem, options)
+      const itemCQN = _getItemCQN(service, [name], navigationProperty, expandItem, options)
       allElements.push(itemCQN)
     }
   }
@@ -251,7 +239,7 @@ const expandToCQN = (model, expandItems, type, options) => {
       const navigationProperty = _getNavigationProperty(pathSegments)
 
       if (isAll || expandItem) {
-        allElements.push(_getItemCQN(model, _name(expandItem), navigationProperty, expandItem))
+        allElements.push(_getItemCQN(service, _name(expandItem), navigationProperty, expandItem))
       }
     }
   }

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/index.js

@@ -23,10 +23,7 @@ const parseToCqn = require('../../../../../odata/parseToCqn')
  * @returns {object} - The CQN object
  */
 module.exports = (component, service, target, data, odataReq, upsert) => {
-  if (
-    cds.env.features.odata_new_parser &&
-    !(component in { 'BOUND.ACTION': 1, 'BOUND.FUNCTION': 1, 'FUNCTION.IMPORT': 1, 'ACTION.IMPORT': 1 })
-  ) {
+  if (cds.env.features.odata_new_parser) {
     return parseToCqn(component, service, target, data, odataReq, upsert)
   }
 

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/readToCQN.js

@@ -6,7 +6,7 @@ const orderByToCQN = require('./orderByToCQN')
 const selectToCQN = require('./selectToCQN')
 const searchToCQN = require('./searchToCQN')
 const applyToCQN = require('./applyToCQN')
-const { convertUrlPathToCqn, getAllKeys, isPathSupported } = require('./utils')
+const { convertUrlPathToCqn, getAllKeys, isPathSupported, getSegmentKeyValue } = require('./utils')
 
 const QueryOptions = require('../okra/odata-server').QueryOptions
 const {
@@ -32,7 +32,7 @@ const SUPPORTED_SEGMENT_KINDS = {
   [SINGLETON]: 1
 }
 
-const { _expand } = require('../utils/handlerUtils')
+const expandToCQN = require('./expandToCQN')
 const { resolveStructuredName } = require('../utils/handlerUtils')
 const { isStreaming } = require('../utils/stream')
 
@@ -249,7 +249,8 @@ const _addKeysToSelectIfNoStreaming = (entity, select, streaming) => {
 
 const _convertUrlPathToViewCqn = segments => {
   const args = segments[0].getKeyPredicates().reduce((prev, curr) => {
-    prev[curr.getEdmRef().getName()] = { val: curr.getText() }
+    const { keyName, val } = getSegmentKeyValue(curr)
+    prev[keyName.replace(/\//g, '_')] = { val }
     return prev
   }, {})
 
@@ -342,7 +343,7 @@ const readToCQN = (service, target, odataReq) => {
   const propertyParam = _getPropertyParam(segments)
   const apply = _apply(uriInfo, queryOptions, entity, service.model)
   const select = _select(queryOptions, entity)
-  const expand = _expand(service.model, uriInfo)
+  const expand = expandToCQN(uriInfo.getQueryOption(QueryOptions.EXPAND), uriInfo.getFinalEdmType(), service)
 
   if (Object.keys(apply).length) {
     _handleApply(apply, select)
@@ -351,14 +352,6 @@ const readToCQN = (service, target, odataReq) => {
   if (propertyParam) {
     select.push(propertyParam)
 
-    // add etag property if necessary
-    if (
-      entity._etag &&
-      !(propertyParam.ref && propertyParam.ref.length === 1 && propertyParam.ref[0] === entity._etag)
-    ) {
-      select.push({ ref: [entity._etag] })
-    }
-
     // add keys if no streaming, TODO: what if streaming via to-one
     _addKeysToSelectIfNoStreaming(entity, select, isStreaming(segments))
   }
@@ -381,7 +374,14 @@ const readToCQN = (service, target, odataReq) => {
   // keep target as input because of localized view
   const cqn = SELECT.from(isView ? _convertUrlPathToViewCqn(segments) : convertUrlPathToCqn(segments, service), select)
 
-  if (isCollectionOrToMany && queryOptions && queryOptions[QueryOptions.COUNT]) cqn.SELECT.count = true
+  const isCount =
+    isCollectionOrToMany &&
+    queryOptions &&
+    queryOptions[QueryOptions.COUNT] &&
+    queryOptions[QueryOptions.COUNT].toUpperCase() === 'TRUE'
+  if (isCount) {
+    cqn.SELECT.count = true
+  }
 
   if (Object.keys(apply).length) _extendCqnWithApply(cqn, apply, entity)
 

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/selectToCQN.js

@@ -29,13 +29,6 @@ const selectToCQN = (select, keys, entity) => {
     }
   }
 
-  for (const col in entity.elements) {
-    const newRef = { ref: [col] }
-    if (entity.elements[col]['@odata.etag'] && !elements.some(ref => isSameArray(ref.ref, newRef.ref))) {
-      elements.push(newRef)
-    }
-  }
-
   return Array.from(elements)
 }
 

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/utils.js

@@ -118,10 +118,33 @@ const isPathSupported = (supported, pathSegments) => {
   }
 }
 
+const _parsePrimitiveValue = (edmRef, value) => {
+  const typeName = edmRef.getProperty ? edmRef.getProperty().getType().getName() : edmRef.getType().getName()
+  return typeName.startsWith('Int') ? Number(value) : typeName === 'Boolean' ? value === 'true' : value
+}
+
+const getSegmentKeyValue = segmentParam => {
+  const edmRef = segmentParam.getEdmRef()
+  const keyName = edmRef.getName()
+  if (segmentParam.getAliasValue()) {
+    const value = segmentParam.getAliasValue()
+    // must be JSON  or a string according to
+    // https://docs.oasis-open.org/odata/odata/v4.01/os/part2-url-conventions/odata-v4.01-os-part2-url-conventions.html#sec_ComplexandCollectionLiterals
+    try {
+      return { keyName, val: JSON.parse(value) }
+    } catch (e) {
+      // plain string
+    }
+    return { keyName, val: _parsePrimitiveValue(edmRef, value) }
+  }
+  return { keyName, val: _parsePrimitiveValue(edmRef, segmentParam.getText()) }
+}
+
 module.exports = {
   addLimit,
   convertUrlPathToCqn,
   isSameArray,
   getAllKeys,
-  isPathSupported
+  isPathSupported,
+  getSegmentKeyValue
 }

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/edm/EdmEntityContainer.js

@@ -343,7 +343,7 @@ class EdmEntityContainer {
       for (const csdlEntitySet of providerEntitySets) {
         const config = this._getArtifactConfiguration(this.getNamespace(), csdlEntitySet.name)
         const entitySet = new EdmEntitySet(this._edm, this, csdlEntitySet, config)
-        this._entitySetCache[entitySet.getName()] = entitySet
+        this._entitySetCache.set(entitySet.getName(), entitySet)
         this._entitySets.push(entitySet)
       }
     }

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/uri/UriHelper.js

@@ -2,6 +2,7 @@
 
 const EdmTypeKind = require('../edm/EdmType').TypeKind
 const EdmPrimitiveTypeKind = require('../edm/EdmPrimitiveTypeKind')
+const { toBase64url } = require('../../../../../../common/utils/binary')
 
 const REGEXP_SINGLE_QUOTE = new RegExp("'", 'g')
 const REGEXP_TWO_SINGLE_QUOTES = new RegExp("''", 'g')
@@ -24,8 +25,8 @@ class UriHelper {
 
     if (edmType === EdmPrimitiveTypeKind.Binary) {
       // convert the URL-safe base64 encoding to the standard variant (with padding, if necessary)
-      let val = uriLiteral.substring(uriLiteral.indexOf("'") + 1, uriLiteral.length - 1).replace(/_/g, '/').replace(/-/g, '+')
-      return val.padEnd(val.length + val.length % 4, '=')
+      const val = uriLiteral.substring(uriLiteral.indexOf("'") + 1, uriLiteral.length - 1)
+      return Buffer.from(val, 'base64').toString('base64')
     }
 
     if (edmType === EdmPrimitiveTypeKind.Duration || edmType.getKind() === EdmTypeKind.ENUM || edmType.getName().startsWith('Geo')) {
@@ -50,7 +51,7 @@ class UriHelper {
     if (value === null) return 'null'
     if (edmType === EdmPrimitiveTypeKind.String) return "'" + value.replace(REGEXP_SINGLE_QUOTE, "''") + "'"
     if (edmType === EdmPrimitiveTypeKind.Duration) return "duration'" + value + "'"
-    if (edmType === EdmPrimitiveTypeKind.Binary) return "binary'" + value.replace(/\//g, '_').replace(/\+/g, '-') + "'"
+    if (edmType === EdmPrimitiveTypeKind.Binary) return "binary'" + toBase64url(value) + "'"
     if (edmType.getKind() === EdmTypeKind.DEFINITION) {
       return UriHelper.toUriLiteral(value, edmType.getUnderlyingType())
     }

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/utils/PrimitiveValueDecoder.js

@@ -8,6 +8,7 @@ const ValueConverter = require('./ValueConverter')
 const ValueValidator = require('../validator/ValueValidator')
 const JsonContentTypeInfo = require('../format/JsonContentTypeInfo')
 const IllegalArgumentError = require('../errors/IllegalArgumentError')
+const { isInvalidBase64string } = require('../../../../../../common/utils/binary')
 
 const V2_DATE_TIME_OFFSET_REGEXP = new RegExp('^/Date\\((-?\\d{1,15})(?:(\\+|-)(\\d{4}))?\\)/$')
 const V2_TIME_OF_DAY_REGEXP = new RegExp('^PT(?:(\\d{1,2})H)?(?:(\\d{1,4})M)?(?:(\\d{1,5})(\\.\\d+)?S)?$')
@@ -70,11 +71,9 @@ const COLLECTION_VALIDATION = new RegExp('^' + SRID + 'Collection\\((' + MULTI_G
 const BASE64 = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{4}|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}={2})$/
 
 function _getBase64(val) {
-  // convert url-safe to standard base64 (with padding, if necessary)
-  val = val.replace(/_/g, '/').replace(/-/g, '+')
-  val = val.padEnd(val.length + val.length % 4, '=')
-  if (!val.match(BASE64)) return
-  return val
+  if (isInvalidBase64string(val)) return
+  // convert url-safe to standard base64
+  return Buffer.from(val, 'base64').toString('base64')
 }
 
 /**

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/utils/ValueConverter.js

@@ -6,6 +6,7 @@ const EdmTypeKind = require('../edm/EdmType').TypeKind
 const EdmPrimitiveTypeKind = require('../edm/EdmPrimitiveTypeKind')
 const JsonContentTypeInfo = require('../format/JsonContentTypeInfo')
 const IllegalArgumentError = require('../errors/IllegalArgumentError')
+const { toBase64url } = require('../../../../../../common/utils/binary')
 
 const PLUS_REGEXP = new RegExp('\\+', 'g')
 const SLASH_REGEXP = new RegExp('/', 'g')
@@ -189,9 +190,9 @@ class ValueConverter {
    * @param {Buffer|string} value - value, which should be converted
    * @returns {string} Base64 string
    */
-  convertBinary (value) {
-    // convert the standard base64 encoding to the URL-safe variant
-    return (Buffer.isBuffer(value) ? value.toString('base64') : value).replace(/\+/g, '-').replace(/\//g, '_')
+  convertBinary (value, maxLength) {
+    this._valueValidator.validateBinary(value, maxLength)
+    return toBase64url(value)
   }
 
   /**

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/validator/ValueValidator.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const { big } = require('@sap/cds-foss')
+const { isInvalidBase64string } = require('../../../../../../common/utils/binary')
 const IllegalArgumentError = require('../errors/IllegalArgumentError')
 
 const YEAR_RE = '(?:-?(?:(?:(?:0\\d{3})|(?:[1-9]\\d{3,}))))'
@@ -86,12 +87,13 @@ class ValueValidator {
 
   /**
    * Validates value of Edm.Binary type.
-   * @param {Buffer} value - Edm.Binary value
+   * @param {Buffer} value - Edm.Binary value as base64 or base64url string
    * @param {number} maxLength - value of MaxLength facet
    */
   validateBinary (value, maxLength) {
-    if (!Buffer.isBuffer(value)) throw this._valueError(value, 'Edm.Binary', 'Buffer instance')
-    this._checkMaxLength(value, maxLength, 'Edm.Binary')
+    // if it's a Buffer instance, just let it go. Otherwise MUST be base64 or base64url string as per OData spec for edm.Binary
+    if (isInvalidBase64string(value)) throw this._valueError(value, 'Edm.Binary', 'Buffer instance or base64/base64url string')
+    this._checkMaxLength(Buffer.isBuffer(value) ? value : Buffer.from(value, 'base64'), maxLength, 'Edm.Binary')
   }
 
   /**

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

@@ -89,6 +89,8 @@ class ResponseHeaderSetter {
    * @returns {ResponseHeaderSetter} this instance of ResponseHeaderSetter
    */
   setLocationHeader (overwrite = false) {
+    // to prevent reading empty body in case of e.g. no auth by readAfterWrite
+    if (this._response.getHeader(HeaderNames.LOCATION)) return this
     const uriInfo = this._request.getUriInfo()
     const data = this._response.getBody()
     const primitiveValueEncoder = this._request

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

@@ -29,7 +29,7 @@ class DebugSerializingCommand extends Command {
     const response = this.getContext().getResponse()
 
     if (response.isHeadersSent()) {
-      logger.warning('Headers already sent')
+      logger.debug('Headers already sent')
       next()
     } else {
       // The runtime measurement must be stopped before serializing its output,

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

@@ -35,7 +35,7 @@ class PresetResponseHeadersCommand extends Command {
    */
   execute (next) {
     if (this._response.isHeadersSent()) {
-      this._logger.warning('Headers already sent')
+      this._logger.debug('Headers already sent')
     } else {
       new ResponseHeaderSetter(this._request, this._response, this._version, this._logger).setHeaders(true)
     }

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

@@ -34,7 +34,7 @@ class SerializingCommand extends Command {
     const response = context.getResponse()
 
     if (response.isHeadersSent()) {
-      logger.warning('Headers already sent')
+      logger.debug('Headers already sent')
       return next()
     }
 

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

@@ -35,7 +35,7 @@ class SetResponseHeadersCommand extends Command {
    */
   execute (next) {
     if (this._response.isHeadersSent()) {
-      this._logger.warning('Headers already sent')
+      this._logger.debug('Headers already sent')
     } else {
       const responseHeaderSetter = new ResponseHeaderSetter(this._request, this._response, null, this._logger)
       const responseContract = this._response.getContract()

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/serializer/ContextURLFactory.js

@@ -8,6 +8,7 @@ const RepresentationKind = commons.format.RepresentationKind.Kinds
 const UriHelper = require('../utils/UriHelper')
 const SerializationError = require('../errors/SerializationError')
 const { appURL } = require('../../../../../../common/utils/vcap')
+const cds = require('../../../../../../../../lib')
 
 /**
  * Context URL construction.
@@ -30,10 +31,10 @@ class ContextURLFactory {
     const lastSegment = pathSegments[pathSegments.length - 1]
     const contextUrlInfo = this._parseSegments(pathSegments, providedKeyMap, edm)
     const contextUrlPrefix = this._buildContextUrlPrefix(contextUrlInfo, pathSegments, request, logger)
-
+    
     if (lastSegment.getKind() === ResourceKind.SERVICE) return `${contextUrlPrefix}$metadata`
     if (lastSegment.getKind() === ResourceKind.METADATA) return ''
-
+    
     const finalEdmType = uriInfo.getFinalEdmType()
     const structuredType =
       finalEdmType && (finalEdmType.getKind() === EdmTypeKind.ENTITY || finalEdmType.getKind() === EdmTypeKind.COMPLEX)

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/serializer/ErrorJsonSerializer.js

@@ -19,8 +19,10 @@ class ErrorJsonSerializer extends ErrorSerializer {
     let result = {
       code: this._error.code || 'null',
       message: this._error.message,
-      target: this._error.target
+      target: this._error.target,
     }
+    // REVISIT: We should also pass stack traces in development
+    // if (!cds.env.production) result.stack = this._error.stack
 
     if (this._error.details) {
       result.details = this._error.details.map(d => {

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/serializer/SerializerFactory.js

@@ -446,6 +446,7 @@ class SerializerFactory {
       if (!propertyOrReturnType.isNullable()) throw new SerializationError('Not nullable value must not be null')
     } else if (type === EdmPrimitiveTypeKind.Binary) {
       new ValueValidator().validateBinary(value, propertyOrReturnType.getMaxLength())
+      value = Buffer.isBuffer(value) ? value : Buffer.from(value, 'base64')
       response.setHeader(HeaderNames.CONTENT_TYPE, data[MetaProperties.MEDIA_CONTENT_TYPE] || ContentTypes.BINARY)
     } else if (type === EdmPrimitiveTypeKind.Stream) {
       if (!value.pipe || typeof value.pipe !== 'function') {

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/serializer/TrustedResourceJsonSerializer.js

@@ -12,6 +12,7 @@ const QueryOptions = commons.uri.UriInfo.QueryOptions
 const UriHelper = require('../utils/UriHelper')
 const NextLinkSerializer = require('./NextLinkSerializer')
 const SerializationError = require('../errors/SerializationError')
+const { toBase64url } = require('../../../../../../common/utils/binary')
 
 /**
  * JSON serializer for trusted OData resources, i.e., there is no validation.
@@ -209,7 +210,7 @@ class TrustedResourceJsonSerializer {
    * @private
    */
   _serializeEntity (result, entityType, data, expandItems, odataPath, structurePath) {
-    this._serializeAnnotations(result, data, MetaProperties.ETAG)
+    this._serializeAnnotations(result, data, MetaProperties.ETAG, MetaProperties.CONTEXT)
 
     this._serializeStructure(result, entityType, data, expandItems, odataPath, structurePath || [])
 
@@ -472,8 +473,7 @@ class TrustedResourceJsonSerializer {
         if (type === EdmPrimitiveTypeKind.Decimal || type === EdmPrimitiveTypeKind.Int64) {
           result = this._formatParams.getIEEE754Setting() ? String(propertyValue) : Number(propertyValue)
         } else if (type === EdmPrimitiveTypeKind.Binary) {
-          // convert the standard base64 encoding to the URL-safe variant
-          result = (Buffer.isBuffer(propertyValue) ? propertyValue.toString('base64') : propertyValue).replace(/\+/g, '-').replace(/\//g, '_')
+          result = toBase64url(propertyValue)
         }
         break
       case EdmTypeKind.COMPLEX:

package/libx/_runtime/cds-services/adapter/odata-v4/utils/data.js

@@ -6,13 +6,11 @@ const { findCsnTargetFor } = require('../../../../common/utils/csn')
 const { isStreaming } = require('./stream')
 const { convertStructured } = require('../../../../../common/utils/ucsn')
 const { deepCopy } = require('../../../../common/utils/copy')
+const { getSegmentKeyValue } = require('../odata-to-cqn/utils')
 
 const _isFunctionInvocation = req =>
   req.getUriInfo().getLastSegment().getFunction || req.getUriInfo().getLastSegment().getFunctionImport
 
-const _getTypeName = edmRef =>
-  edmRef.getProperty ? edmRef.getProperty().getType().getName() : edmRef.getType().getName()
-
 const _addStructuredProperties = ([structName, property, ...nestedProperties], paramData, value) => {
   paramData[structName] = paramData[structName] || {}
   if (nestedProperties.length) {
@@ -23,25 +21,6 @@ const _addStructuredProperties = ([structName, property, ...nestedProperties], p
   paramData[structName][property] = value
 }
 
-const _getParamKeyValue = segmentParam => {
-  const edmRef = segmentParam.getEdmRef()
-  const typeName = _getTypeName(edmRef)
-  if (segmentParam.getAliasValue())
-    // must be JSON  or a string according to
-    // https://docs.oasis-open.org/odata/odata/v4.01/os/part2-url-conventions/odata-v4.01-os-part2-url-conventions.html#sec_ComplexandCollectionLiterals
-    try {
-      return { keyName: edmRef.getName(), value: JSON.parse(segmentParam.getAliasValue()) }
-    } catch (e) {
-      return { keyName: edmRef.getName(), value: segmentParam.getAliasValue() }
-    }
-
-  return {
-    keyName: edmRef.getName(),
-    // Convert any integer type into numeric values.
-    value: typeName.startsWith('Int') ? Number(segmentParam.getText()) : segmentParam.getText()
-  }
-}
-
 /**
  * The key predicates or function parameters will contain the keys and values for this request.
  * Combine all key value pairs into one object.
@@ -54,14 +33,14 @@ const _getParamData = parameters => {
   const paramData = {}
 
   for (const segmentParam of parameters) {
-    const { keyName, value } = _getParamKeyValue(segmentParam)
+    const { keyName, val } = getSegmentKeyValue(segmentParam)
 
     if (keyName.includes('/')) {
-      _addStructuredProperties(keyName.split('/'), paramData, value)
+      _addStructuredProperties(keyName.split('/'), paramData, val)
       continue
     }
 
-    paramData[keyName] = value
+    paramData[keyName] = val
   }
 
   return paramData
@@ -83,6 +62,11 @@ const _flattenStructureKeys = structureData => {
 // works only for custom on condition working on keys with '=' operator
 // and combination of multiple conditions connected with 'and'
 const _addKeysToData = (navSourceKeyValues, onCondition, data) => {
+  if (onCondition[0].xpr) {
+    // REVISIT support for nested xpr?
+    return _addKeysToData(navSourceKeyValues, onCondition[0].xpr, data)
+  }
+
   const flattenKeys = _flattenStructureKeys(navSourceKeyValues)
   for (const key in flattenKeys) {
     // find index of source column
@@ -100,6 +84,33 @@ const _addKeysToData = (navSourceKeyValues, onCondition, data) => {
       data[target] = flattenKeys[key]
     }
   }
+
+  // get static values from onCond
+  for (let i = 0; i < onCondition.length; i++) {
+    const first = onCondition[i]
+    const compare = onCondition[i + 1]
+    const second = onCondition[i + 2]
+
+    if (compare !== '=') continue
+
+    if (first && first.ref && second && 'val' in second) {
+      // ref = val
+      _staticOnCond(data, first, second)
+      i += 2
+    } else if (second && second.ref && first && 'val' in first) {
+      // val = ref
+      _staticOnCond(data, second, first)
+      i += 2
+    }
+  }
+}
+
+const _staticOnCond = (data, ref, val) => {
+  const {
+    ref: [alias, target]
+  } = ref
+  if (alias != 'target') return
+  data[target] = val.val
 }
 
 function _entityOrTypeName(navSourceSegment) {