@sap/cds 5.8.4 → 5.9.2

package/server.js

@@ -1,5 +1,5 @@
+const cds = require('./lib'), { features } = cds.env
 const express = require('express')
-const cds = require('./lib'), { unfold_csn: cds_localized } = cds.compile._localized
 
 /**
  * Standard express.js bootstrapping, constructing an express `application`
@@ -23,9 +23,10 @@ const cds = require('./lib'), { unfold_csn: cds_localized } = cds.compile._local
  * @param {express.Handler} options.logger - custom request logger middleware
  * @returns Promise resolving to a Node.js http server as returned by express' `app.listen()`.
  */
-module.exports = async function cds_server (options, o = { ...options, __proto__:defaults }) {
+module.exports = async function cds_server (options) {
 
   const _in_prod = process.env.NODE_ENV === 'production'
+  const o = cds.options = { ...options, __proto__:defaults }
 
   const app = cds.app = o.app || express()
   app.serve = _app_serve                          //> app.serve allows delegating to sub modules
@@ -33,39 +34,49 @@ module.exports = async function cds_server (options, o = { ...options, __proto__
 
   // mount static resources and logger middleware
   if (o.cors)      !_in_prod && app.use (o.cors)        //> CORS
-  if (o.static)    app.use (express.static (o.static))  //> defaults to ./app
+  if (o.static)    app.use (express_static (o.static))  //> defaults to ./app
   if (o.favicon)   app.use ('/favicon.ico', o.favicon)  //> if none in ./app
   if (o.index)     app.get ('/',o.index)                //> if none in ./app
   if (o.correlate) app.use (o.correlate)                //> request correlation
   if (o.logger)    app.use (o.logger)                   //> basic request logging
   if (o.toggler)   app.use (o.toggler)                  //> feature toggler
 
-  // give uiflex a chance to plug into everything
-  if (cds.requires.extensibility) await require('./libx/_runtime/fiori/uiflex')() // REVISIT: later this should be a ext umbrella service
-
   // load specified models or all in project
-  const csn = await cds.load(o.from||'*',o) .then (cds.minify)
-  cds.model = o.from = cds_localized(cds.linked(cds.compile.for.odata(csn)))
+  const csn = await cds.load(o.from||'*',o) .then (cds.minify) //> separate csn for _init_db
+  cds.model = cds.compile.for.nodejs(csn)
 
   // connect to essential framework services if required
-  const _init = o.in_memory && (db => cds.deploy(csn).to(db,o))
-  if (cds.requires.db) cds.db =  await cds.connect.to ('db') .then (_init)
-  if (cds.requires.messaging)    await cds.connect.to ('messaging')
-  if (cds.requires.multitenancy) await cds.mtx.in (app)
-
-  // serve graphql
-  if (cds.env.features.graphql) serve_graphql(app)
+  if (cds.requires.extensibility)  await _extensibility() //> has to go first
+  if (cds.requires.db)    cds.db = await cds.connect.to ('db') .then (_init)
+  if (cds.requires.messaging)      await cds.connect.to ('messaging')
+  if (cds.requires.multitenancy)   await _multitenancy()
+  if (cds.requires.toggles)        await _model_provider()
 
   // serve all services declared in models
-  await cds.serve (o.service,o).in (app)
-  await cds.emit ('served', cds.services)               //> hook for listeners
+  if (features.graphql) serve_graphql(app)
+  await cds.serve (o.service,o) .in (app)
+  await cds.emit ('served', cds.services) //> hook for listeners
 
   // start http server
   const port = (o.port !== undefined) ? o.port : (process.env.PORT || 4004)
   return app.listen (port)
 
+  // bootstrap in-memory db
+  async function _init (db) {
+    if (!o.in_memory || cds.requires.multitenancy) return db
+    const fts = cds.requires.toggles && cds.resolve (features.folders)
+    const m = !fts ? csn : await cds.load([o.from||'*',...fts],o) .then (cds.minify)
+    return cds.deploy(m).to(db,o)
+  }
+
 }
 
+// REVISIT: Move these out of here...
+const _model_provider = () => require('./libx/_runtime/extensibility/mps')
+const _extensibility = () => require('./libx/_runtime/extensibility/uiflex')
+const _multitenancy = () => features.streamlined_mtx ? _model_provider() : cds.mtx.in (cds.app)
+
+
 
 // -------------------------------------------------------------------------
 // Default handlers, which can be overidden by options passed to the server
@@ -103,8 +114,8 @@ const defaults = {
 
   // feature toggler
   get toggler() {
-    return require('./libx/_runtime/common/toggles/alpha')(cds)
-  },
+    return require('./libx/_runtime/common/toggles/handler')(cds)
+  }
 }
 
 
@@ -153,6 +164,10 @@ function correlate (req, res, next) {
   next()
 }
 
+function express_static (dir) {
+  return express.static (path.resolve (cds.root,dir))
+}
+
 
 // -------------------------------------------------------------------------
 if (!module.parent)  module.exports ({from:process.argv[2]})

package/srv/audit-log.cds

@@ -1,12 +1,12 @@
 service AuditLogService {
 
-  // SEC-254: Log read access to sensitive personal data
+  // Log read access to sensitive personal data
   event dataAccessLog {
     accesses         : array of Access;
     // accessFilters : array of KeyValuePair;
   };
 
-  // SEC-265: Log changes to personal data
+  // Log changes to personal data
   event dataModificationLog : {
     modifications : array of DataModification;
   };

package/srv/flex.cds

@@ -1,12 +1,18 @@
 namespace cds_r; //> cds system tables
 
+type JSON: String;
+
+@protocol: 'rest' 
 service ExtensibilityService @(path:'/-/cds/extensibility') {
   action addExtension(extensions : array of String); // TODO: change to array of CSN extensions
+  action activate(tenant: String);
+  action activateProject(tenant: String, extension: array of { filename: String; model: JSON }, undeployExtension: Boolean);
 }
 
 entity Extensions {
-  key ID : UUID;
-  csn    : String;
+  key ID    : UUID;
+  csn       : String;
+  activated : Boolean; // <-- status / enum ?
 }
 
 // @open type Extension {

package/srv/flex.js

@@ -1 +1 @@
-module.exports = require('../libx/_runtime/fiori/uiflex/service')
+module.exports = require('../libx/_runtime/extensibility/uiflex/service')

package/srv/mps.cds

@@ -0,0 +1,23 @@
+namespace cds_r; //> cds system tables
+
+type TenantID : String;
+@open type CSN {};
+type XML : String;
+type Locale : String;
+type TAR : LargeBinary;
+
+/**
+ * Used by CAP runtimes to retrieve tenant-specific variants of
+ * deployed models used to serve requests.
+ */
+@(requires : [
+   'mtcallback'
+])
+@protocol: 'rest'
+service ModelProviderService @(path:'/-/cds/model-provider') {
+  action isExtended(tenant : TenantID) returns Boolean;
+  action getCsn(tenant : TenantID, toggles : array of String, flavor: String enum { nodejs; java; }) returns CSN;
+  action getOdataCsn(tenant : TenantID, toggles : array of String) returns CSN; // REVISIT: Replace by getCsn(..., flavor=node/java)
+  action getEdmx(tenant : TenantID, toggles : array of String, serviceName : String, locale : Locale, odataFlavor : String) returns XML;
+  action getResources(flat : Boolean) returns TAR;
+}

package/srv/mps.js

@@ -0,0 +1 @@
+module.exports = require('../libx/_runtime/extensibility/mps/service')

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

@@ -1,21 +0,0 @@
-const cds = require('../../../cds')
-
-const getCredentials = 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)
-    throw Object.assign(new Error('No or malformed uaa credentials'), { credentials: uaa.credentials })
-
-  return uaa.credentials
-}
-
-module.exports = {
-  getCredentials
-}