@sap/cds-dk 7.9.4 → 8.0.2

package/lib/init/template/toggles/index.js

@@ -3,6 +3,10 @@ const { merge, sort } = require('../../merge')
 
 module.exports = class TogglesTemplate extends require('../../plugin') {
 
+  static help() {
+    return 'allow dynamically toggled features'
+  }
+
   static hasInProduction(env) {
     return !!env.requires?.toggles
   }

package/lib/init/template/typer/index.js

@@ -6,6 +6,10 @@ const { TYPER } = require('../../constants').OPTIONS
 const { exists, read } = require('../../../cds').utils
 
 module.exports = class TyperTemplate extends require('../../plugin') {
+  static help() {
+    return 'type generation for CDS models'
+  }
+
   async canRun() {
     const { isJava } = readProject()
     if (isJava) {

package/lib/init/template/typescript/files/package.json

@@ -0,0 +1,12 @@
+{
+  "devDependencies": {
+    "typescript": "^5",
+    "@cap-js/cds-types": "<1",
+    "@types/node": "^20"
+  },
+  "scripts": {
+    "watch": "cds-ts w",
+    "build:ts": "tsc",
+    "build": "cds build && npm run build:ts"
+  }
+}

package/lib/init/template/typescript/files/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "allowJs": true
+  }
+}

package/lib/init/template/typescript/index.js

@@ -0,0 +1,39 @@
+const { join } = require('path')
+const { readProject } = require('../../projectReader')
+const { merge } = require('../../merge')
+const { warn } = require('../../../util/term')
+const { TYPESCRIPT } = require('../../constants').OPTIONS
+const { exists } = require('../../../cds').utils
+const TyperTemplate = require('../typer')
+
+module.exports = class TypescriptTemplate extends require('../../plugin') {
+  static help() {
+    return 'add minimum configuration for a bare TypeScript project'
+  }
+
+  async canRun() {
+    const { isJava } = readProject()
+    if (isJava) {
+      console.warn(warn(`This appears to be a Java project. 'cds add ${TYPESCRIPT}' is intended to be used in Node.js projects. Proceeding anyway.\n`))
+    }
+    return true
+  }
+
+  static hasInProduction() {
+    return exists('tsconfig.ts')
+  }
+
+  async run() {
+    const tsconfig = join(__dirname, 'files', 'tsconfig.json')
+
+    try {
+      await merge(tsconfig).into('tsconfig.json')
+    } catch (e) {
+      throw e instanceof SyntaxError
+        ? `SyntaxError in existing tsconfig.json. This could indicate a JSON file with comments, which is not supported at this time. Remove all comments from your tsconfig.json and rerun`
+        : e
+    }
+    await merge(join(__dirname, 'files', 'package.json')).into('package.json')
+    await new TyperTemplate().run() // REVISIT: we should avoid referencing other plugins
+  }
+}

package/lib/init/template/workzone/index.js

@@ -0,0 +1,5 @@
+module.exports = class extends require('../../plugin') {
+    requires() {
+      return ['workzone-standard']
+    }
+}

package/lib/init/template/workzone-standard/files/manifest.json.hbs

@@ -0,0 +1,6 @@
+{
+  "sap.cloud": {
+    "public": true,
+    "service": "{{appName}}.service"
+  }
+}

package/lib/init/template/workzone-standard/index.js

@@ -0,0 +1,30 @@
+const cds = require('../../../cds')
+const { readProject } = require('../../projectReader')
+const { merge } = require('../../merge')
+const { join } = require('path')
+
+module.exports = class extends require('../../plugin') {
+
+    canRun() {
+      if (cds.requires.multitenancy) {
+        throw `SAP BTP Work Zone, Standard Edition does not support multitenancy yet.`
+      }
+      return true
+    }
+
+    requires() {
+      return ['html5-repo']
+    }
+
+    static help() {
+      return 'SAP BTP Work Zone, Standard Edition'
+    }
+
+    async run() {
+      const project = readProject()
+      const { appUIPaths, appPath } = project
+      await Promise.all(appUIPaths.map(p =>
+        merge(__dirname, 'files/manifest.json.hbs').into(join(appPath, p, 'webapp/manifest.json'), { project })
+      ))
+    }
+}

package/lib/init/template/xsuaa/files/package.json.hbs

@@ -1,7 +1,7 @@
 {
   {{#isNodejs}}
   "dependencies": {
-    "@sap/xssec": "^3"
+    "@sap/xssec": "^4"
   },
   "cds": {
   {{/isNodejs}}

package/lib/init/template/xsuaa/files/values.yaml.hbs

@@ -19,10 +19,11 @@ xsuaa:
   serviceOfferingName: xsuaa
   servicePlanName: application
   parameters:
-    xsappname: {{appName}}
     tenant-mode: {{#hasMultitenancy}}shared{{/hasMultitenancy}}{{^hasMultitenancy}}dedicated{{/hasMultitenancy}}
 {{#hasApprouter}}
     oauth2-configuration:
       redirect-uris:
-      - https://*.<your-cluster-domain>/**
+{{=<% %>=}}
+      - https://*.{{ tpl .Values.global.domain . }}/**
+<%={{ }}=%>
 {{/hasApprouter}}

package/lib/init/template/xsuaa/index.js

@@ -1,12 +1,15 @@
 const cds = require('../../../cds')
 const { read } = cds.utils
-const term = require('../../../util/term')
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, xsuaa, mtxSidecar4 } = require('../../registries/mta')
 
 module.exports = class XsuaaTemplate extends require('../../plugin') {
 
+    static help() {
+        return 'authentication via XSUAA'
+    }
+
     static hasInProduction(env) {
         return env.requires?.auth?.kind === 'xsuaa'
     }
@@ -50,13 +53,14 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
 
         if (hasHelm || hasHelmUnifiedRuntime) {
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
-        }
-    }
 
-    finalize() {
-        const { hasUI, hasApprouter } = readProject()
-        if (hasUI && !hasApprouter) {
-            console.log(`\nAlso run ${term.bold('cds add approuter --for production')} to route and authenticate the paths accessed via the UI.`)
+            await merge({
+                xsuaa: {
+                    parameters: {
+                        xsappname: `${project.appName}-{{ .Release.Namespace }}`
+                    }
+                }
+            }).into('chart/values.yaml')
         }
     }
 }

package/lib/init/validate.js

@@ -0,0 +1,27 @@
+const { PROJECT_FILES } = require('./constants')
+const REGEX_PROJECT_NAME = /[^0-9a-zA-Z_-]+/g
+const cds = require('../../lib/cds')
+const { exists } = cds.utils
+const { bold } = require('../../lib/util/term')
+
+module.exports.projectName = projectName => {
+  if (!projectName) throw 'Specify a project name.'
+  const invalidChars = new Set(projectName.match(REGEX_PROJECT_NAME)) // remove duplicates
+  if (invalidChars.size > 0) {
+    throw `Project name '${projectName}' contains at least one character ('${[...invalidChars]}') which is not supported in npm package names.
+Specify a different project name by replacing characters with '_' or '-', for example '${projectName.replace(REGEX_PROJECT_NAME, '_')}' or '${projectName.replace(REGEX_PROJECT_NAME, '-')}'.`
+  }
+}
+
+module.exports.projectFolder = cwd => {
+  const existingProjectFile = PROJECT_FILES.find(exists)
+  if (existingProjectFile) {
+    let message
+    if (cwd === cds.root) {
+      message = `You seem to be working in a project which is already initialized. Use ${bold('cds add')} to add more features.`
+    } else {
+      message = `You seem to be trying to initialize an existing project. Use a different project name instead.`
+    }
+    throw `${message}\nDetails: File '${existingProjectFile}' exists in the project folder which indicates an existing project. Use ${bold('cds add')} to add more features.`
+  }
+}

package/lib/lint/generators.js

@@ -34,7 +34,7 @@ module.exports = {
     eslintOpts[0] = `
         # SYNOPSIS
 
-            ${cdslintCmd} [beta]
+            ${cdslintCmd}
 
             Runs environment checks and/or checks the specified models
             based on the ESLint framework

package/lib/lint/io.js

@@ -1,8 +1,7 @@
+const { read, write, exists, yaml } = require('../cds').utils;
+const { readJSONC } = require("../util/fs");
 const path = require("path");
-const yaml = require("@sap/cds-foss")("yaml");
 const term = require("../util/term");
-const { read, write, exists } = require('../cds').utils;
-const { readJSONC } = require("../util/fs");
 const JSONC = require('../util/jsonc');
 
 module.exports = {
@@ -226,7 +225,6 @@ module.exports = {
     switch (configFile) {
       case "eslint.config.js":
       case "eslint.config.cjs":
-      case "eslint.config.mjs":
         if (exists(configPath)) {
           logger.log(
             `${term.warn(
@@ -245,16 +243,36 @@ module.exports = [
   cds.configs.recommended,
   {
     plugins: {
-      "@sap/cds": cds
+      '@sap/cds': cds
     },
-    "files": [
+    files: [
       ...cds.configs.recommended.files
     ],
-    "rules": {
+    rules: {
       ...cds.configs.recommended.rules
     }
   }
 ]
+`)
+        }
+        break;
+      case "eslint.config.mjs":
+        if (exists(configPath)) {
+          logger.log(
+            `${term.warn(
+              `\n\nPlease add the following to your "${configFile}":` +
+              '\n\n  1. At the top of your file, import the following:')}` +
+              `\n\n     ${term.bold('import cdsPlugin from \'@sap/eslint-plugin-cds\'')}` +
+            `${term.warn(
+              '\n\n  2. In your export, add the following to the front of the array:')}` +
+            `\n\n     ${term.bold('cdsPlugin.configs.recommended')}`
+          );
+        } else {
+          await write(configPath, `
+import cds from '@sap/cds/eslint.config.mjs'
+import cdsPlugin from '@sap/eslint-plugin-cds'
+
+export default [...cds.recommended, cdsPlugin.configs.recommended]
 `)
         }
         break;

package/lib/mtx/auth_manager.js

@@ -12,9 +12,13 @@ const REASONS = { invalid_scope: /\binvalid_scope\b/ };
 
 function assign(params, authData) {
     if (authData?.access_token) {
+        let message = 'Retrieved access token';
         params.set('token', authData.access_token);
         if (authData.expires_in) {
             params.set('tokenExpirationDate', Date.now() + authData.expires_in * 1000);
+            if (params.get('saveData')) {
+                message += ` (expires on ${(new Date(params.get('tokenExpirationDate'))).toLocaleString()})`;
+            }
         } else {
             params.delete('tokenExpirationDate');
         }
@@ -23,6 +27,7 @@ function assign(params, authData) {
         } else {
             params.delete('refreshToken');
         }
+        console.log(message + '.');
     }
     if (authData?.passcode_url) {
         params.set('passcodeUrl', authData.passcode_url);
@@ -31,15 +36,19 @@ function assign(params, authData) {
 function reqParams(method, params) {
     const url = params.get('tokenUrl');
     const d = {};
+    const ignored = {};
     if (params.has('subdomain')) {
         d.subdomain = params.get('subdomain');
     }
     if (params.has('refreshToken')) {
         d.refresh_token = params.get('refreshToken');
+        const param = ['passcode', 'clientid'].find(param => params.has(param));
+        if (param) {
+            ignored[param] = 'refresh token is present';
+        }
     } else if (params.has('passcode')) {
         d.passcode = params.get('passcode');
-    }
-    if (params.has('clientsecret')) {
+    } else if (params.has('clientsecret')) {
         d.clientid = params.get('clientid');
         d.clientsecret = params.get('clientsecret');
     } else if (params.has('key')) {
@@ -48,43 +57,60 @@ function reqParams(method, params) {
     }
     const data = new URLSearchParams(d).toString();
     return method === 'post'
-        ? { url, data }
-        : { url: `${url}?${data}`, data: undefined };
+        ? { url, data, ignored }
+        : { url: `${url}?${data}`, data: undefined, ignored };
 }
 
-async function retrieveTokenOrPasscodeUrl(params) {
-    if (params.has('token') || !params.has('refreshToken') && !params.has('passcode') && params.has('passcodeUrl')) {
+async function fetchToken(params) {
+    if (params.has('token') || !(params.has('refreshToken') || params.has('passcode') || !params.has('passcodeUrl'))) {
         return;
     }
 
     let response, error;
-    reqParams: for (const method of ['post', 'get']) {
-        do {
-            const { url, data } = reqParams(method, params);
-            try {
-                DEBUG?.(`Getting authentication token or passcode URL from ${method.toUpperCase()} ${params.obfuscateQueryParams(url)}`);
-                response = await axios[method](url, data);
-            } catch (e) {
-                if (e.status === 404) { // may represent 405 in case of wrong method
-                    continue reqParams;
-                } else if (params.has('refreshToken')) {
-                    DEBUG?.('Discarding invalid refresh token');
-                    params.delete('refreshToken');
-                } else {
-                    error = e;
-                    break reqParams;
-                }
+    const method = 'post';
+    do {
+        const { url, data, ignored } = reqParams(method, params);
+        if (Object.keys(ignored).length) {
+            console.log(`Ignoring parameters for fetching token: ${Object.entries(ignored).map(([param, reason]) => `${param} (${reason})`).join(', ')}.`);
+        }
+        DEBUG?.(`Getting authentication token from ${method.toUpperCase()} ${params.obfuscateQueryParams(url)}`);
+        error = undefined;
+        try {
+            response = await axios[method](url, data);
+            break;
+        } catch (e) {
+            error = e;
+            DEBUG?.(`HTTP status ${e.status}`);
+            if (params.has('refreshToken')) {
+                DEBUG?.('Discarding invalid refresh token');
+                params.delete('refreshToken');
+            } else {
+                break;
             }
-        } while (!response);
-    }
+        }
+    } while (!response);
     const data = response?.data ?? error?.auth;
     assign(params, data);
     if (error) {
-        throw new Error(REASONS.invalid_scope.test(error.message)
-            ? 'Token has invalid scope. Check if your user has the required roles'
-            : `No valid passcode or token provided. Get a passcode${
-                params.get('passcodeUrl') ? ' from ' + params.get('passcodeUrl') : ''
-            } and re-run the command with '-p <passcode>'`, { cause: error });
+        let message;
+        if (REASONS.invalid_scope.test(error.message)) {
+            message = 'token has invalid scope. Check if your user has the required roles';
+        } else if (error.status === 404) {
+            message = 'token endpoint not found. Check if MTX is running with extensibility enabled';
+        } else if (error.message.includes('<html')) { // should already be caught when fetching passcode URL
+            message = 'HTML response received. Check if route to MTX is configured correctly in App Router';
+        } else if (error.status === 401) {
+            message = `invalid credentials`;
+            if (params.has('passcode')) {
+                message += `. Check if passcode is correct`;
+                if (params.has('passcodeUrl')) {
+                    message += `. Passcode URL: ${params.get('passcodeUrl')}`;
+                }
+            }
+        } else {
+            message = 'error on token request';
+        }
+        throw new Error(message + '.', { cause: error });
     }
 }
 
@@ -98,7 +124,7 @@ module.exports = class AuthManager {
             params.set('reqAuth', { auth: { username: params.get('username'), password: params.get('password') } });
         } else if (!params.get('skipToken')) {
             try {
-                await retrieveTokenOrPasscodeUrl(params);
+                await fetchToken(params);
             } catch (error) {
                 if (params.get('saveData')) {
                     await SettingsManager.saveSettings(params);
@@ -106,6 +132,14 @@ module.exports = class AuthManager {
                 throw getMessage('Failed to login', { error });
             }
             params.set('reqAuth', { headers: { Authorization: 'Bearer ' + params.get('token') } });
+            if (params.has('refreshToken') && params.get('saveData')) {
+                if (params.get('saveRefreshToken')) {
+                    console.log('Refresh Token saved. Token will be refreshed automatically.');
+                } else {
+                    console.log(`Note: Refresh Token is not saved by default for security reasons. Use '--save-refresh-token' to override.`);
+                    params.delete('refreshToken');
+                }
+            }
         }
 
         if (params.get('saveData')) {

package/lib/mtx/download_legacy.js

@@ -23,13 +23,13 @@ module.exports = class Download {
         }
 
         console.log(`Downloading migrated @sap/mtx extension project(s)`);
-        const downloadedTgz = await this.getTgz(params);
+        const downloadedTgz = await this.pullTgz(params);
         await fs.promises.writeFile(downloadPath, downloadedTgz);
 
         console.log(`Finished.`);
     }
 
-    static async getTgz(params) {
+    static async pullTgz(params) {
         const tagRule = params.get('tagRule');
         const defaultTag = params.get('defaultTag');
         const downloadUrl = `${(params.get('appUrl'))}/-/cds/extensibility/getMigratedProjects`;

package/lib/mtx/index.js

@@ -1,12 +1,8 @@
-const Activate = require('./activate');
 const AuthManager = require('./auth_manager');
-const Extend = require('./extend');
 const { SettingsManager } = require('./settings_manager');
 const Question = require('./util/question');
 
 module.exports = {
-    extend: Extend.run,
-    activate: Activate.run,
     login: AuthManager.login,
     logout: AuthManager.logout,
     question: Question,

package/lib/mtx/params.js

@@ -36,7 +36,7 @@ class Param {
      * @param options constructor options
      */
     constructor(name,
-                val,
+                val = undefined,
                 options = {}) {
 
         this.persist = Persistence.none;
@@ -44,6 +44,11 @@ class Param {
         this.abbreviate = false;
         this.internal = false;
         this.allowedValues = null;
+        this.type = val === undefined
+            ? this.allowedValues
+                ? typeof this.allowedValues[0]
+                : 'string'  // default
+            : typeof val;
 
         this.name = name;
         this._val = val;
@@ -102,12 +107,8 @@ class Param {
         if (val === undefined) {
             return; // Allow `undefined` always.
         }
-        let expectedType = typeof this.val;
-        if (expectedType === 'undefined' && this.allowedValues) {
-            expectedType = typeof this.allowedValues[0];
-        }
-        if (typeof val !== expectedType) {
-            throw `Failed to set '${(this.name)}' = ${JSON.stringify(val)}: expected value of type ${expectedType}`;
+        if (typeof val !== this.type) {
+            throw `Failed to set '${(this.name)}' = ${JSON.stringify(val)}: expected value of type ${this.type}`;
         }
         if (this.allowedValues && !(this.allowedValues).includes(val)) {
             throw `Failed to set '${(this.name)}' = ${JSON.stringify(val)}: expected one of ${JSON.stringify(this.allowedValues)}`;
@@ -125,7 +126,7 @@ class Param {
             ? undefined
             : this.obfuscate === ObfuscationLevel.none && (!this.abbreviate || process.env.DEBUG)
                 ? this.val
-                : this.obfuscate === ObfuscationLevel.partial && process.env.DEBUG && typeof this.val === 'string'
+                : this.obfuscate === ObfuscationLevel.partial && process.env.DEBUG && this.type === 'string'
                     ? this.val.slice(0, DISCLOSURE_LENGTH) + '...' + this.val.slice(-DISCLOSURE_LENGTH)
                     : '...';
     }
@@ -161,48 +162,44 @@ class BasicParams {
     constructor() {
         // GENERAL PARAMS
         // - non-persisted
-        this.projectFolder          = new Param('projectFolder',          '');
+        this.projectFolder          = new Param('projectFolder');
         this.directory              = this.projectFolder.newAlias('directory');
 
-        this.tagRule                = new Param('tagRule', '');
-        this.defaultTag             = new Param('defaultTag', '');
-
-        // - non-persisted, internal
-        this.reqAuth                = new Param('reqAuth',                null, { obfuscate: ObfuscationLevel.full, internal: true });
-        this.clearOtherTokenStorage = new Param('clearOtherTokenStorage', false, { internal: true });
-
         // - persisted
-        this.appUrl                 = new Param('appUrl',                 '', { persist: Persistence.setting }); // any trailing slash (/) is removed
+        this.appUrl                 = new Param('appUrl',                 undefined, { persist: Persistence.setting }); // any trailing slash (/) is removed
         this.url                    = this.appUrl.newAlias('url');
         this.from                   = this.appUrl.newAlias('from');
         this.to                     = this.appUrl.newAlias('to');
         this.at                     = this.appUrl.newAlias('at');
-        this.subdomain              = new Param('subdomain',              '', { persist: Persistence.setting }); // only needed to fetch token
-        this.passcodeUrl            = new Param('passcodeUrl',            '', { persist: Persistence.setting, abbreviate: true });
+        this.subdomain              = new Param('subdomain',              undefined, { persist: Persistence.setting }); // only needed to fetch token
+        this.passcodeUrl            = new Param('passcodeUrl',            undefined, { persist: Persistence.setting, abbreviate: true });
         this.passcode_url           = this.passcodeUrl.newAlias('passcode_url');
-        this.tokenUrl               = new Param('tokenUrl',               '', { persist: Persistence.setting, abbreviate: true })
+        this.tokenUrl               = new Param('tokenUrl',               undefined, { persist: Persistence.setting, abbreviate: true })
 
         // AUTH PARAMS
         // - non-persisted
-        this.passcode               = new Param('passcode',               '', { obfuscate: ObfuscationLevel.partial });
+        this.passcode               = new Param('passcode',               undefined, { obfuscate: ObfuscationLevel.partial });
+        this.password               = new Param('password',               undefined, { obfuscate: ObfuscationLevel.full });
+        this.clientid               = new Param('clientid',               undefined);
+        this.clientsecret           = new Param('clientsecret',           undefined, { obfuscate: ObfuscationLevel.partial });
+        this.key                    = new Param('key',                    undefined, { obfuscate: ObfuscationLevel.partial }); // private key of client certificate
         this.tokenStorage           = new Param('tokenStorage',           undefined, { allowedValues: ['plain', 'keyring'] });
+        this.clearOtherTokenStorage = new Param('clearOtherTokenStorage', false, { internal: true });
         this.plain                  = new Param('plain',                  false, { internal: true }); // for backward compatibility - superseded by tokenStorage
         this.saveData               = new Param('saveData',               false, { internal: true });
-        this.renewLogin             = new Param('renewLogin',             false);
-        this.password               = new Param('password',               '', { obfuscate: ObfuscationLevel.full });
-        this.clientid               = new Param('clientid',               '');
-        this.clientsecret           = new Param('clientsecret',           '', { obfuscate: ObfuscationLevel.partial });
-        this.key                    = new Param('key',                    '', { obfuscate: ObfuscationLevel.partial }); // private key of client certificate
+        this.renewLogin             = new Param('renewLogin',             false, { internal: true });
+        this.reqAuth                = new Param('reqAuth',                undefined, { internal: true, type: 'object', obfuscate: ObfuscationLevel.full });
 
         // - persisted
-        this.username               = new Param('username',               '', { persist: Persistence.setting }); // only saved against localhost (non-productive); as setting due to ambiguous app URL
+        this.username               = new Param('username',               undefined, { persist: Persistence.setting }); // only saved against localhost (non-productive); as setting due to ambiguous app URL
         this.isEmptyPassword        = new Param('isEmptyPassword',        false, { internal: true, persist: Persistence.setting }); // extra param so we can ensure we never save a password
-        this.token                  = new Param('token',                  '', { persist: Persistence.auth, obfuscate: ObfuscationLevel.partial });
+        this.token                  = new Param('token',                  undefined, { persist: Persistence.auth, obfuscate: ObfuscationLevel.partial });
         this.tokenExpirationDate    = new Param('tokenExpirationDate',    Number.MAX_SAFE_INTEGER, { persist: Persistence.auth });
-        this.refreshToken           = new Param('refreshToken',           '', { persist: Persistence.auth, obfuscate: ObfuscationLevel.partial });
+        this.refreshToken           = new Param('refreshToken',           undefined, { persist: Persistence.auth, obfuscate: ObfuscationLevel.partial });
     }
 }
 
+// TODO pass these as extra arguments to lib functions
 /**
  * All known params including those needed for specific commands.
  */
@@ -211,28 +208,25 @@ class AllParams extends BasicParams {
         super();
 
         // `extend` PARAMS
-        this.force                  = new Param('force',                  false);
-        this.templates              = new Param('templates',              false);
-        this["download-migrated-projects"]   = new Param('download-migrated-projects', false)
+        this.defaultTag             = new Param('defaultTag',             undefined);
+        this.tagRule                = new Param('tagRule',                undefined);
 
-        // `activate` PARAMS
-        this.undeploy               = new Param('undeploy',               false);
-        this.wsdl                   = new Param('wsdl',                   false);
+        // `push` PARAMS
         this.sync                   = new Param('sync',                   false);
         this.async                   = new Param('async',                 false);
 
         // `subscribe` PARAMS
-        this.body                   = new Param('body',                   '', { persist: Persistence.none });
+        this.body                   = new Param('body',                   undefined, { internal: true, persist: Persistence.none });
 
         // `login` PARAMS
         this.skipToken              = new Param('skipToken',              false, { internal: true });
+        this.saveRefreshToken       = new Param('saveRefreshToken',       false, { internal: true });
 
         // `logout` PARAMS
         this.deleteSettings         = new Param('deleteSettings',         false);
         this["delete-settings"]     = this.deleteSettings.newAlias('delete-settings');
         this.clearInvalid           = new Param('clearInvalid',           false);
         this["clear-invalid"]       = this.clearInvalid.newAlias('clear-invalid');
-
     }
 }
 
@@ -411,7 +405,7 @@ class ParamCollection {
     }
 
     /**
-     * Return an object mapping each of the contained params' names to its corresponding value.
+     * Return an object mapping the names of each of the contained params to their corresponding values.
      * @param persistence the type of persistence to filter for (omit to disable filtering)
      */
     toEntries(persistence) {