@sap/cds 7.4.2 → 7.5.0

package/lib/log/format/kibana.js

@@ -1,92 +0,0 @@
-const cds = require ('../../')
-const util = require('util')
-
-const _l2l = { 1: 'error', 2: 'warn', 3: 'info', 4: 'debug', 5: 'trace' }
-
-/*
- * log formatter for kibana
- */
-module.exports = exports = (module, level, ...args) => {
-  const toLog = exports.addFields(module, level, ...args)
-  return exports.format(toLog)
-}
-
-exports.addFields = (module, level, ...args) => {
-  // config
-  const { user: log_user , kibana_custom_fields } = cds.env.log
-
-  // build the object to log
-  const toLog = {
-    level: _l2l[level] || 'info',
-    logger: module,
-    component_type: 'application'
-  }
-
-  // add correlation
-  if (cds.context) {
-    const { id, tenant, user } = cds.context
-    toLog.correlation_id = id
-    if (tenant) toLog.tenant_id = tenant
-    // log user id, if configured (data privacy)
-    if (user && log_user) toLog.remote_user = user.id
-    // add headers, if available, with _ instead of -
-    const req = cds.context._ && cds.context._.req
-    if (req && req.headers)
-      for (const k in req.headers)
-        toLog[k.replace(/-/g, '_')] = (() => {
-          if (k.match(/authorization/i)) return `${req.headers[k].split(' ')[0]} ***`
-          if (k.match(/cookie/i)) return '***'
-          return req.headers[k]
-        })()
-  }
-  toLog.timestamp = new Date()
-
-  // merge toLog with passed Error (or error-like object)
-  if (args.length && typeof args[0] === 'object' && args[0].message) {
-    const err = args.shift()
-    toLog.msg = err.message
-    if (typeof err.stack === 'string') toLog.stacktrace = err.stack.split(/\s*\r?\n\s*/)
-    Object.assign(toLog, err, { level: toLog.level })
-  }
-
-  // append remaining args via util.format()
-  if (args.length) toLog.msg = toLog.msg ? util.format(toLog.msg, ...args) : util.format(...args)
-
-  // 4xx: remove stack and lower to warning (if error)
-  if (toLog.code >= 400 && toLog.code < 500) {
-    delete toLog.stacktrace
-    if (toLog.level && toLog.level.match(/error/i)) toLog.level = 'warn'
-  }
-
-  // kibana custom fields
-  if (kibana_custom_fields) {
-    const cf = []
-    for (const k in kibana_custom_fields) if (toLog[k]) cf.push({ k, v: toLog[k], i: kibana_custom_fields[k] })
-    if (cf.length) toLog['#cf'] = { string: cf }
-  }
-
-  return toLog
-}
-
-exports.format = toLog => {
-  const getCircularReplacer = () => {
-    const seen = new WeakSet()
-    return (key, value) => {
-      if (typeof value === "object" && value !== null) {
-        if (seen.has(value)) {
-          return 'cyclic'
-        }
-        seen.add(value)
-      }
-      return value
-    }
-  }
-  
-  // return array with the stringified toLog (to avoid multiple log lines) as the sole element
-  try {
-    return [JSON.stringify(toLog)]
-  } catch (e) {
-    // try again with removed circular references
-    return [JSON.stringify(toLog, getCircularReplacer())]
-  }
-}

package/lib/srv/middlewares/ctx-auth.js

@@ -1,11 +0,0 @@
-const cds = require ('../../index')
-
-/**
- * Propagates auth results to cds.context
- */
-module.exports = ()=> function cds_context_auth (req, res, next) {
-  const ctx = cds.context
-  ctx.user = req.user
-  ctx.tenant = req.tenant || ctx.user?.tenant
-  next()
-}

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

@@ -1,119 +0,0 @@
-const { processDeep } = require('../../../util/dataProcessUtils')
-const { checkKeys, checkStatic, CDS_TYPE_CHECKS } = require('../../../util/assert')
-const getError = require('../../../../common/error')
-const { MULTIPLE_ERRORS } = require('../../../../common/error/constants')
-const cds = require('../../../../cds')
-
-const validationChecks = (event, data, target) => {
-  const checkResult = []
-
-  let validateFn
-
-  if (event === 'UPDATE' && Array.isArray(data)) {
-    validateFn = (entry, entity) => {
-      checkResult.push(...checkKeys(entity, entry))
-      checkResult.push(...checkStatic(entity, entry, true))
-    }
-  } else {
-    validateFn = (entry, entity) => {
-      checkResult.push(...checkStatic(entity, entry, true))
-    }
-  }
-
-  // REVISIT: adopt template mechanism?
-  processDeep(validateFn, data, target, false, true)
-
-  if (checkResult.length === 0) {
-    // > all good
-    return
-  }
-
-  if (checkResult.length === 1) {
-    return checkResult[0]
-  } else {
-    return Object.assign(new Error(MULTIPLE_ERRORS), { details: checkResult })
-  }
-}
-
-// REVISIT: use i18n
-const _enrichErrorDetails = (isPrimitive, error) => {
-  const element = error.target ? ` '${error.target}' ` : ' '
-  const typeDetails = isPrimitive ? '.' : ` according to type definition '${error.type}'.`
-  const value = typeof error.value === 'string' ? `'${error.value}'` : error.value
-  if (element && element.match(/\w/)) return `Value ${value} of element${element}is invalid${typeDetails}`
-  return `Value ${value} is invalid${typeDetails}`
-}
-
-// REVISIT: use i18n
-const _getTypeError = (operation, type, errorDetails) => {
-  const typeErrors = errorDetails.map(error => _enrichErrorDetails(cds.builtin.types[type], error))
-  const msg = `Failed to validate return value ${type ? `of type '${type}' ` : ''}for custom ${operation.kind} '${
-    operation.name
-  }': ${typeErrors.join(' ')}`
-  return getError(msg)
-}
-
-const _buildTypeErrorObject = (type, value) => {
-  return { type, value }
-}
-
-/**
- * Validate the return type values of custom operations (actions and functions) for primitive or complex values as
- * single values or arrays.
- *
- * @param {Operation} operation
- * @param {object} data
- * @throws Will throw an error with error code 500 if the validation fails. Contains a detailed error message of the
- * type and name of the custom operation, the invalid values, their names and their expected types.
- * @returns {boolean} Returns true if return type validation has passed.
- */
-const validateReturnType = (operation, data) => {
-  // array of or single return type
-  // in case of modeled return type: { type: 'bookModel.Books', _type: csnDefinition }
-  // in case of inline return type: { elements: ... } and no explicit name of return type
-  const returnType = operation.returns.items ? operation.returns.items : operation.returns
-
-  if (typeof data === 'undefined') return true
-  if (returnType['@open']) return true
-
-  let checkResult
-
-  // .type of action/function behaves different to .type of other csn elements
-  // Return type contains primitives
-  // eslint-disable-next-line no-proto
-  const _type = typeof returnType._type === 'object' ? returnType.__proto__._type : returnType._type // REVISIT: super dirty hack for compiler's to.edmx polluting the csn definitions with ._type -> please use Symbols instead
-  const check = CDS_TYPE_CHECKS[_type] // IMPORTANT: use ._type
-  if (check) {
-    const array = Array.isArray(data) ? data : [data]
-    checkResult = array.filter(value => !check(value)).map(value => _buildTypeErrorObject(_type, value))
-  } else {
-    if (typeof data !== 'object') {
-      throw new Error(
-        `Invalid scalar value ${typeof data === 'string' ? `"${data}"` : data} for return type "${returnType.type}"`
-      )
-    }
-
-    // Only check complex objects, ignore non-modelled data
-    data = (Array.isArray(data) ? data : [data]).filter(entry => typeof entry === 'object' && !Array.isArray(entry))
-
-    // Determine entity from bound or unbound action/function
-    const returnTypeCsnDefinition = returnType._type || returnType
-
-    // 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 && checkResult.length !== 0) {
-    throw _getTypeError(operation, returnType.type, checkResult)
-  }
-
-  return true
-}
-
-module.exports = {
-  validationChecks,
-  validateReturnType
-}