@sap/cds 6.1.0 → 6.1.3

package/libx/_runtime/common/utils/propagateForeignKeys.js

@@ -0,0 +1,122 @@
+const cds = require('../../cds')
+
+const { prefixForStruct } = require('../../common/utils/csn')
+
+const _autoGenerate = e => e && e.isUUID && e.key
+
+const _set = (row, value, element, enumerable) => {
+  if (!element.parent.elements[element.name]) return // only when in model
+  if (!enumerable && element.foreignKeySource) {
+    // only for foreign keys
+    Object.defineProperty(row, element.name, {
+      get() {
+        return value
+      },
+      set(v) {
+        // Make sure that it becomes enumerable again if set manually afterwards
+        Object.defineProperty(row, element.name, { value: v, configurable: true, enumerable: true })
+      },
+      enumerable: false,
+      configurable: true
+    })
+  } else {
+    row[element.name] = value
+  }
+}
+
+const _generateParentField = ({ parentElement }, row, enumerable) => {
+  if (_autoGenerate(parentElement) && !row[parentElement.name]) {
+    _set(row, cds.utils.uuid(), parentElement, enumerable)
+  }
+}
+
+const _generateChildField = ({ deep, childElement }, childRow, enumerable) => {
+  if (deep) {
+    _generateChildField(deep.propagation, childRow[deep.targetName], enumerable)
+  } else if (_autoGenerate(childElement) && childRow && !childRow[childElement.name]) {
+    _set(childRow, cds.utils.uuid(), childElement, enumerable)
+  }
+}
+
+const _getNestedVal = (row, prefix) => {
+  let val = row
+  const splitted = prefix.split('_')
+  splitted.pop() // remove last `_`
+  let k = ''
+
+  while (splitted.length > 0) {
+    k += splitted.shift()
+    if (k in val) {
+      val = val[k]
+      k = ''
+    } else {
+      k += '_'
+    }
+  }
+
+  return val
+}
+
+const _propagateToChild = ({ parentElement, childElement, parentFieldValue }, row, childRow, enumerable) => {
+  if (!childElement || !childElement.parent.elements[childElement.name]) return
+  if (parentElement) {
+    const prefix = prefixForStruct(parentElement)
+    if (prefix) {
+      const nested = _getNestedVal(row, prefix)
+      _set(childRow, nested[parentElement.name], childElement, enumerable)
+    } else {
+      _set(childRow, row[parentElement.name], childElement, enumerable)
+    }
+  } else if (parentFieldValue !== undefined) {
+    _set(childRow, parentFieldValue, childElement, enumerable)
+  }
+}
+
+const _propagateToParent = ({ parentElement, childElement, deep }, childRow, row, enumerable) => {
+  if (deep) {
+    _propagateToParent(deep.propagation, childRow[deep.targetName], childRow, enumerable)
+  }
+  if (parentElement && childElement && childRow && childElement.name in childRow) {
+    _set(row, childRow[childElement.name], parentElement, enumerable)
+  }
+}
+
+module.exports = (
+  tKey,
+  row,
+  foreignKeyPropagations,
+  isCompositionEffective,
+  { deleteAssocs = false, enumerable = true } = {}
+) => {
+  if (!row || !(tKey in row)) return
+  if (row[tKey] === null) {
+    for (const foreignKeyPropagation of foreignKeyPropagations) {
+      if (!foreignKeyPropagation.fillChild) {
+        _set(row, null, foreignKeyPropagation.parentElement, enumerable)
+      }
+    }
+    if (deleteAssocs && !isCompositionEffective) delete row[tKey]
+    return
+  }
+
+  const childRows = Array.isArray(row[tKey]) ? row[tKey] : [row[tKey]]
+
+  for (const childRow of childRows) {
+    if (!childRow) return
+
+    for (const foreignKeyPropagation of foreignKeyPropagations) {
+      if (foreignKeyPropagation.fillChild) {
+        // propagate or generate in parent
+        const pk = foreignKeyPropagation.parentElement && foreignKeyPropagation.parentElement.name
+        if (pk && !(pk in row)) _propagateToParent(foreignKeyPropagation, childRow, row, enumerable)
+        if (!(pk in row)) _generateParentField(foreignKeyPropagation, row, enumerable)
+
+        if (isCompositionEffective) _propagateToChild(foreignKeyPropagation, row, childRow, enumerable)
+      } else {
+        _generateChildField(foreignKeyPropagation, childRow, enumerable)
+        _propagateToParent(foreignKeyPropagation, childRow, row, enumerable)
+      }
+    }
+  }
+  if (deleteAssocs && !isCompositionEffective) delete row[tKey]
+}

package/libx/_runtime/common/utils/resolveView.js

@@ -612,7 +612,7 @@ const _newQuery = (query, event, model, service) => {
   }[event]
   const newQuery = Object.create(query)
   const transitions = _entityTransitionsForTarget(query[event][_prop], model, service)
-  newQuery[event] = (transitions[0] && _func(newQuery, transitions, service)) || { ...query[event] }
+  newQuery[event] = (transitions?.[0] && _func(newQuery, transitions, service)) || { ...query[event] }
   return newQuery
 }
 

package/libx/_runtime/common/utils/template.js

@@ -67,7 +67,7 @@ const _getNextTarget = (model, element, currentPath = []) => {
  * @param {object} targetEntity The target entity which needs to be traversed
  * @param {object} callbacks
  * @param {function} callbacks.pick Callback function to pick elements. If it returns a truthy value, the element will be picked. The returned value is part of the template.
- * @param {function} callbacks.ignore Callback function to ignore elements. If it returns a truthy value, the element will be ignored.
+ * @param {function} callbacks.ignore Callback function to ignore the target of an element. If it returns a truthy value, the element's target will be ignored.
  * @param {object} [parent=null] The parent entity
  * @param {Map} [_entityMap] This parameter is an implementation side-effect — don't use it
  * @param {array} [targetPath=[]]
@@ -92,8 +92,6 @@ function _getTemplate(model, cache, targetEntity, callbacks, parent = null, _ent
 
   for (const elementName in elements) {
     const element = elements[elementName]
-    if (ignore && ignore(element, targetEntity, parent)) continue
-
     _pick(pick, element, targetEntity, parent, templateElements, elementName)
 
     if (element.items) {
@@ -101,6 +99,7 @@ function _getTemplate(model, cache, targetEntity, callbacks, parent = null, _ent
     }
 
     const { nextTargetName, nextTarget } = _getNextTarget(model, element, currentPath)
+    if (ignore && ignore(element)) continue
     const nextTargetCached = _entityMap.get(nextTargetName)
 
     if (nextTargetCached) {

package/libx/_runtime/db/expand/expandCQNToJoin.js

@@ -696,7 +696,7 @@ class JoinCQNFromExpanded {
 
       const assoc = entity.associations[column.ref[0]]
       if (assoc.is2one && assoc.on) {
-        const onCond = expandedEntity._relations[assoc.name].join('target', 'source')
+        const onCond = entity._relations[assoc.name].join('target', 'source')
         const xpr = onCond[0].xpr
         const fks = (xpr && xpr.filter(e => e.ref && e.ref[0] === 'target').map(e => e.ref[1])) || []
         for (const k of fks) {

package/libx/_runtime/db/expand/rawToExpanded.js

@@ -30,9 +30,13 @@ class RawToExpanded {
       if (each._conversionMapper) for (const [k, v] of [...each._conversionMapper]) conversionMapper.set(k, v)
     }
 
-    for (let i = 0, length = this._queries.length; i < length; i++) {
+    const queryResults = await Promise.all(this._queries)
+    // NOTE: this doesn't work:
+    // for (let each of this._queries) await each
+
+    for (let i = 0, length = queryResults.length; i < length; i++) {
       const { _toManyTree: toManyTree = [] } = queries[i]
-      const result = await this._queries[i]
+      const result = queryResults[i]
       if (toManyTree.length === 0) {
         this._parseMainResult(result, mappings, conversionMapper, toManyTree)
       } else {
@@ -249,10 +253,7 @@ class RawToExpanded {
  * @returns {Promise<Array>} The complete expanded result set.
  */
 const rawToExpanded = (configs, queries, one, rootEntity) => {
-  return new RawToExpanded(configs, queries, one, rootEntity).toExpanded().catch(err => {
-    Promise.all(queries).catch(() => {})
-    throw err
-  })
+  return new RawToExpanded(configs, queries, one, rootEntity).toExpanded()
 }
 
 module.exports = rawToExpanded

package/libx/_runtime/db/generic/input.js

@@ -14,7 +14,7 @@ const cds = require('../../cds')
 const normalizeTimeData = require('../utils/normalizeTimeData')
 
 const { enrichDataWithKeysFromWhere } = require('../../common/utils/keys')
-const propagateForeignKeys = require('../utils/propagateForeignKeys')
+const propagateForeignKeys = require('../../common/utils/propagateForeignKeys')
 const getTemplate = require('../../common/utils/template')
 const templateProcessor = require('../../common/utils/templateProcessor')
 
@@ -32,8 +32,8 @@ const _processComplexCategory = ({ row, key, val, category, req, element }) => {
   category = category.category
 
   // propagate keys
-  if (category === 'propagateForeignKeys' && key in row) {
-    propagateForeignKeys(key, row, element._foreignKeys, element.isComposition)
+  if (category === 'propagateForeignKeys') {
+    propagateForeignKeys(key, row, element._foreignKeys, element.isComposition, { deleteAssocs: true })
     return
   }
 
@@ -176,7 +176,10 @@ const _pickDraft = element => {
   // collect actions to apply
   const categories = []
 
-  if (element.virtual) categories.push('virtual')
+  if (_isVirtualOrCalculated(element)) {
+    categories.push('virtual')
+    return { categories } // > no need to continue
+  }
 
   if (element.default && !DRAFT_COLUMNS_MAP[element.name]) {
     categories.push({ category: 'default', args: element })

package/libx/_runtime/db/sql-builder/InsertBuilder.js

@@ -306,7 +306,7 @@ class InsertBuilder extends BaseBuilder {
     const purelyManagedColumnValues = this._getAnnotatedInsertColumnValues(annotatedColumns, purelyManagedColumns)
 
     this._addUuidToColumns(columns, flattenColumnMap)
-    columns.push(...flattenColumnMap.keys())
+    columns.push(...Array.from(flattenColumnMap.keys()).filter(k => !columns.includes(k)))
 
     this._addEntries(valuesArray, { columns, flattenColumnMap, purelyManagedColumnValues, insertAnnotatedColumns })
 

package/libx/_runtime/extensibility/add.js

@@ -1,4 +1,5 @@
 const cds = require('../cds')
+const LOG = cds.log('mtx')
 
 const { validateExtension } = require('./validation')
 const handleDefaults = require('./defaults')
@@ -16,6 +17,7 @@ const add = async function (req) {
   const extCsn = _isCSN(extension) ? JSON.parse(extension) : cds.parse.cdl(extension)
   if (extCsn.requires) delete extCsn.requires
 
+  LOG.info(`validating extension '${tag}' ...`)
   const { 'cds.xt.ModelProviderService': mps } = cds.services
   const csn = await mps.getCsn(tenant, ['*'])
   validateExtension(extCsn, csn, req)
@@ -26,6 +28,7 @@ const add = async function (req) {
     INSERT.into('cds.xt.Extensions').entries([{ ID, tag, csn: JSON.stringify(extCsn), activated: activate }])
   )
   const njCsn = cds.compile.for.nodejs(csn)
+  LOG.info(`activating extension to '${activate}' ...`)
   if (activate === 'propertyBag' && extCsn.extensions)
     extCsn.extensions.forEach(async ext => await handleDefaults(ext, njCsn))
   if (activate === 'database') await activateExt(ID, tag, tenant, njCsn)

package/libx/_runtime/extensibility/handler/transformREAD.js

@@ -42,23 +42,25 @@ const _removeExtendedFields = (columns, extFields, alias) => {
 
 const _transformUnion = (req, model) => {
   // second element is active entity
-  const name = req.target.name.SET ? req.target.name.SET.args[1]._target.name : req.target.name
-  const extFields = getExtendedFields(name, model)
-  _addBackPack(req.query.SELECT.columns, extFields)
-  _removeExtendedFields(req.query.SELECT.columns, extFields)
-
-  _addBackPack(
-    req.query.SELECT.from.SET.args[0].SELECT.columns,
-    extFields,
-    req.query.SELECT.from.SET.args[0].SELECT.from.args[0].as
-  )
-  _addBackPack(req.query.SELECT.from.SET.args[1].SELECT.columns, extFields)
-  _removeExtendedFields(
-    req.query.SELECT.from.SET.args[0].SELECT.columns,
-    extFields,
-    req.query.SELECT.from.SET.args[0].SELECT.from.args[0].as
-  )
-  _removeExtendedFields(req.query.SELECT.from.SET.args[1].SELECT.columns, extFields)
+  if (req.target) {
+    const name = req.target.name.SET ? req.target.name.SET.args[1]._target.name : req.target.name
+    const extFields = getExtendedFields(name, model)
+    _addBackPack(req.query.SELECT.columns, extFields)
+    _removeExtendedFields(req.query.SELECT.columns, extFields)
+
+    _addBackPack(
+      req.query.SELECT.from.SET.args[0].SELECT.columns,
+      extFields,
+      req.query.SELECT.from.SET.args[0].SELECT.from.args[0].as
+    )
+    _addBackPack(req.query.SELECT.from.SET.args[1].SELECT.columns, extFields)
+    _removeExtendedFields(
+      req.query.SELECT.from.SET.args[0].SELECT.columns,
+      extFields,
+      req.query.SELECT.from.SET.args[0].SELECT.from.args[0].as
+    )
+    _removeExtendedFields(req.query.SELECT.from.SET.args[1].SELECT.columns, extFields)
+  }
 }
 
 const _getAliasedEntitiesForJoin = (args, model) => {
@@ -111,7 +113,7 @@ function transformExtendedFieldsREAD(req) {
   _transformColumns(req.query.SELECT.columns, target.name, this.model)
 
   if (req.query.SELECT.from.SET) return _transformUnion(req, this.model) // union
-  if (req.query.SELECT.from.join) return _transformJoin(req, this.model) // join
+  if (req.query.SELECT.from.join && req.query.SELECT.from.args) return _transformJoin(req, this.model) // join
 }
 
 module.exports = {

package/libx/_runtime/extensibility/push.js

@@ -22,7 +22,7 @@ const _compileProject = async function (extension, req) {
     if (err.messages) req.reject(400, getCompilerError(err.messages))
     else throw err
   } finally {
-    ;(fs.promises.rm || fs.promises.rmdir)(root, { recursive: true, force: true }).catch(() => {})
+    fs.promises.rm(root, { recursive: true, force: true }).catch(() => {})
   }
 
   return { csn, files }
@@ -68,7 +68,7 @@ const pull = async function (req) {
     // for (const file of i18nFiles) await _copyFile(file, temp)
     tgz = await packTarArchive(temp)
   } finally {
-    ;(fs.promises.rm || fs.promises.rmdir)(temp, { recursive: true, force: true }).catch(() => {})
+    fs.promises.rm(temp, { recursive: true, force: true }).catch(() => {})
   }
 
   return tgz
@@ -85,31 +85,31 @@ const push = async function (req) {
   if (tenant) cds.context = { tenant }
 
   // remove current extension with tag
-  let currentExt
   if (tag) {
-    currentExt = await cds.db.run(SELECT.from('cds.xt.Extensions').where({ tag }))
-    if (currentExt.length) await cds.db.run(DELETE.from('cds.xt.Extensions').where({ tag }))
+    await DELETE.from('cds.xt.Extensions').where({ tag })
   }
 
   LOG.info(`validating extension '${tag}' ...`)
   // validation
   const { 'cds.xt.ModelProviderService': mps } = cds.services
+  // REVISIT: Isn't that also done during activate?
   const csn = await mps.getCsn(tenant, Object.keys(cds.context.features || {}))
   try {
     cds.extend(csn).with(extCsn)
   } catch (err) {
-    if (currentExt && currentExt.length) {
-      await cds.db.run(INSERT.into('cds.xt.Extensions').entries(currentExt)) // REVISIT: why did we eagerly delete that at all above?
-    }
     return req.reject(400, getCompilerError(err.messages))
   }
   await linter(extCsn, csn, files, req)
 
   // insert and activate extension
   const ID = cds.utils.uuid()
-  await cds.db.run(
-    INSERT.into('cds.xt.Extensions').entries([{ ID, csn: JSON.stringify(extCsn), sources, activated: 'database', tag }])
-  )
+  await INSERT.into('cds.xt.Extensions').entries({
+    ID,
+    csn: JSON.stringify(extCsn),
+    sources,
+    activated: 'database',
+    tag
+  })
 
   LOG.info(`activating extension '${tag}' ...`)
   await activate(ID, null, tenant)

package/libx/_runtime/extensibility/token.js

@@ -43,7 +43,8 @@ module.exports = {
       )
       response.send(data)
     } catch (error) {
-      error.message = `Authentication failed with root cause '${error.message}'. Passcode URL: https://${parsedUrl.hostname}/passcode`
+      const rootCause = error.response?.data ? JSON.stringify(error.response?.data) : error.message
+      error.message = `Authentication failed with root cause '${rootCause}'. Passcode URL: https://${parsedUrl.hostname}/passcode`
       const {
         constructor: { name },
         message

package/libx/_runtime/extensibility/utils.js

@@ -8,7 +8,7 @@ const EXT_BACK_PACK = 'extensions__'
 
 const getTargetRead = req => {
   let name = ''
-  if (req.query.SELECT.from.join) {
+  if (req.query.SELECT.from.join && req.query.SELECT.from.args) {
     // join
     name = req.query.SELECT.from.args.find(arg => arg.ref && arg.ref[0] !== 'DRAFT.DraftAdministativeData').ref[0]
   } else if (req.target.name.SET) {
@@ -63,15 +63,17 @@ const hasExtendedEntity = (req, model) => {
     return true
   }
 
-  if (req.query.SELECT.from.join) {
+  if (req.query.SELECT.from.join && req.query.SELECT.from.args) {
     return _hasExtendedEntityArgs(req.query.SELECT.from.args, model)
   }
 
-  if (req.target.name.SET) {
-    return isExtendedEntity(req.target.name.SET.args[0]._target.name, model)
-  }
+  if (req.target) {
+    if (req.target.name.SET) {
+      return isExtendedEntity(req.target.name.SET.args[0]._target.name, model)
+    }
 
-  return isExtendedEntity(req.target.name, model)
+    return isExtendedEntity(req.target.name, model)
+  }
 }
 
 const getExtendedFields = (entityName, model) => {

package/libx/_runtime/fiori/generic/new.js

@@ -1,11 +1,9 @@
 const cds = require('../../cds')
-const { INSERT, SELECT, UPDATE } = cds.ql
+const { INSERT, UPDATE } = cds.ql
 
 const onDraftActivate = require('./activate')._handler
 const { isNavigationToMany } = require('../utils/req')
-const { getKeysCondition } = require('../utils/where')
 const { ensureDraftsSuffix } = require('../utils/handler')
-const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 
 const _getUpdateDraftAdminCQN = ({ user, timestamp }, draftUUID) => {
   return UPDATE('DRAFT.DraftAdministrativeData')

package/libx/_runtime/fiori/generic/patch.js

@@ -1,13 +1,7 @@
 const cds = require('../../cds')
 const { UPDATE, SELECT } = cds.ql
 
-const {
-  getUpdateDraftAdminCQN,
-  removeDraftUUIDIfNecessary,
-  ensureDraftsSuffix,
-  ensureNoDraftsSuffix,
-  addColumnAlias
-} = require('../utils/handler')
+const { getUpdateDraftAdminCQN, ensureDraftsSuffix, ensureNoDraftsSuffix, addColumnAlias } = require('../utils/handler')
 const { getKeysCondition } = require('../utils/where')
 const { getColumns } = require('../../cds-services/services/utils/columns')
 const { DRAFT_COLUMNS_CQN } = require('../../common/constants/draft')

package/libx/_runtime/fiori/utils/where.js

@@ -160,7 +160,7 @@ const isActiveEntityRequested = where => {
 
   while (where[i]) {
     if (where[i].xpr) {
-      const isRequested = isActiveEntityRequested(where.xpr)
+      const isRequested = isActiveEntityRequested(where[i].xpr)
       if (isRequested) return true
     }
     if (

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

@@ -19,7 +19,7 @@ const authorizedRequest = ({ method, uri, path, oa2, tenant, dataObj, headers, t
         if (dataObj) {
           data = JSON.stringify(dataObj)
           httpOptions.headers['Content-Type'] = 'application/json'
-          httpOptions.headers['Content-Length'] = data.length
+          httpOptions.headers['Content-Length'] = Buffer.byteLength(data)
         }
 
         if (headers) {

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

@@ -34,7 +34,6 @@ class EMManagement {
     this.namespace = namespace
     this.LOG = LOG
   }
-
   async getQueue(queueName = this.queueName) {
     this.LOG._info &&
       this.LOG.info(
@@ -303,7 +302,7 @@ class EMManagement {
         grantType: 'client_credentials',
         clientId: this.optionsMessagingREST.oa2.client,
         clientSecret: this.optionsMessagingREST.oa2.secret,
-        tokenUrl: this.optionsMessagingREST.oa2.endpoint
+        tokenUrl: this.optionsMessagingREST.oa2.endpoint // this is the changed tokenUrl
       }
     }
 

package/libx/_runtime/remote/utils/client.js

@@ -24,8 +24,8 @@ const _sanitizeHeaders = headers => {
 
 const _executeHttpRequest = async ({ requestConfig, destination, destinationOptions, jwt }) => {
   const { executeHttpRequestWithOrigin } = cloudSdk()
-
   const destinationName = typeof destination === 'string' && destination
+
   if (destinationName) {
     destination = { destinationName, ...(resolveDestinationOptions(destinationOptions, jwt) || {}) }
   } else if (destination.forwardAuthToken) {
@@ -59,7 +59,13 @@ const _executeHttpRequest = async ({ requestConfig, destination, destinationOpti
 
   // cloud sdk requires a new mechanism to differentiate the priority of headers
   // "custom" keeps the highest priority as before
-  requestConfig = { ...requestConfig, headers: { custom: { ...requestConfig.headers } } }
+  requestConfig = {
+    ...(cds.env?.remote?.max_body_length && { maxBodyLength: cds.env.remote.max_body_length }),
+    ...requestConfig,
+    headers: {
+      custom: { ...requestConfig.headers }
+    }
+  }
 
   return executeHttpRequestWithOrigin(destination, requestConfig, requestOptions)
 }
@@ -145,10 +151,12 @@ function _defineProperty(obj, property, value) {
     const map = (..._) => _defineProperty(_map.call(obj, ..._), property, value)
     props.map = { value: map, enumerable: false, configurable: true, writable: true }
   }
+
   props[property] = { value: value, enumerable: false, configurable: true, writable: true }
   for (const prop in props) {
     Object.defineProperty(obj, prop, props[prop])
   }
+
   return obj
 }
 
@@ -156,14 +164,17 @@ function _normalizeMetadata(prefix, data, results) {
   const target = results !== undefined ? results : data
   if (typeof target !== 'object' || target === null) return target
   const metadataKeys = Object.keys(data).filter(k => prefix.test(k))
+
   for (const k of metadataKeys) {
     const $ = k.replace(prefix, '$')
     _defineProperty(target, $, data[k])
     delete target[k]
   }
+
   if (Array.isArray(target)) {
     return target.map(row => _normalizeMetadata(prefix, row))
   }
+
   // check properties for all and prop.results for odata v2
   for (const [key, value] of Object.entries(target)) {
     if (value && typeof value === 'object') {
@@ -171,6 +182,7 @@ function _normalizeMetadata(prefix, data, results) {
       target[key] = _normalizeMetadata(prefix, value, nestedResults)
     }
   }
+
   return target
 }
 const _getPurgedRespActionFunc = (data, returnType) => {
@@ -181,6 +193,7 @@ const _getPurgedRespActionFunc = (data, returnType) => {
       return data[key]
     }
   }
+
   return data
 }
 
@@ -198,6 +211,7 @@ const _purgeODataV2 = (data, target, returnType, reqHeaders) => {
     ieee754Compatible,
     exponentialDecimals
   )
+
   return _normalizeMetadata(/^__/, data, convertedResponse)
 }
 
@@ -217,6 +231,7 @@ const _getSanitizedError = (e, reqOptions, options = { suppressRemoteResponseBod
     url: e.config ? e.config.baseURL + e.config.url : reqOptions.url,
     headers: e.config ? e.config.headers : reqOptions.headers
   }
+
   if (options.batchRequest) {
     e.request.body = reqOptions.data
   }
@@ -227,9 +242,11 @@ const _getSanitizedError = (e, reqOptions, options = { suppressRemoteResponseBod
       statusText: e.response.statusText,
       headers: e.response.headers
     }
+
     if (e.response.data && !options.suppressRemoteResponseBody) {
       response.body = e.response.data
     }
+
     e.response = response
   }
 
@@ -270,12 +287,7 @@ const run = async (
     response = await _executeHttpRequest({ requestConfig, destination, destinationOptions, jwt })
   } catch (e) {
     // > axios received status >= 400 -> gateway error
-    const msg =
-      (e.response &&
-        e.response.data &&
-        e.response.data.error &&
-        ((e.response.data.error.message && e.response.data.error.message.value) || e.response.data.error.message)) ||
-      e.message
+    const msg = e?.response?.data?.error?.message?.value ?? e?.response?.data?.error?.message ?? e.message
     e.message = msg ? 'Error during request to remote service: \n' + msg : 'Request to remote service failed.'
 
     const sanitizedError = _getSanitizedError(e, requestConfig, {
@@ -284,7 +296,6 @@ const run = async (
 
     const err = Object.assign(new Error(e.message), { statusCode: 502, reason: sanitizedError })
     LOG._warn && LOG.warn(err)
-
     throw err
   }
 
@@ -312,7 +323,6 @@ const run = async (
     })
 
     LOG._warn && LOG.warn(err)
-
     throw err
   }
 
@@ -331,6 +341,7 @@ const run = async (
     if (responseDataSplitted[1].startsWith('HTTP/1.1 2')) {
       response.data = contentJSON
     }
+
     if (responseDataSplitted[1].startsWith('HTTP/1.1 4') || responseDataSplitted[1].startsWith('HTTP/1.1 5')) {
       const innerError = contentJSON.error || contentJSON
       innerError.status = Number(responseDataSplitted[1].match(/HTTP.*(\d{3})/m)[1])
@@ -357,6 +368,7 @@ const run = async (
     }
     return _purgeODataV4(response.data)
   }
+
   return response.data
 }
 
@@ -368,6 +380,7 @@ const getJwt = req => {
       return token[1]
     }
   }
+
   return null
 }
 
@@ -382,9 +395,11 @@ const _cqnToReqOptions = (query, service, req) => {
       .replace(/\( /g, '(')
       .replace(/ \)/g, ')')
   }
+
   if (queryObject.method !== 'GET' && queryObject.method !== 'HEAD') {
     reqOptions.data = kind === 'odata-v2' ? convertV2PayloadData(queryObject.body, req.target) : queryObject.body
   }
+
   return reqOptions
 }
 
@@ -395,9 +410,11 @@ const _stringToReqOptions = (query, data, target) => {
     method: cleanQuery.substring(0, blankIndex).toUpperCase(),
     url: encodeURI(formatPath(cleanQuery.substring(blankIndex, cleanQuery.length).trim()))
   }
+
   if (data && reqOptions.method !== 'GET' && reqOptions.method !== 'HEAD') {
     reqOptions.data = this.kind === 'odata-v2' ? Object.assign({}, convertV2PayloadData(data, target)) : data
   }
+
   return reqOptions
 }
 
@@ -412,10 +429,12 @@ const _pathToReqOptions = (method, path, data, target) => {
     // normalize in case parts[2] already starts with /
     url = url.replace(/^\/\//, '/')
   }
+
   const reqOptions = { method, url }
   if (data && reqOptions.method !== 'GET' && reqOptions.method !== 'HEAD') {
     reqOptions.data = this.kind === 'odata-v2' ? Object.assign({}, convertV2PayloadData(data, target)) : data
   }
+
   return reqOptions
 }