@sap/cds-dk 7.1.1 → 7.3.0

package/lib/build/provider/mtx/index.js

@@ -2,15 +2,15 @@
 const fs = require('fs')
 const path = require('path')
 const cds = require('../../../cds')
-const BuildTaskHandlerEdmx = require('../buildTaskHandlerEdmx')
+const EdmxBuildPlugin = require('../edmxBuildPlugin')
 const ResourcesTarProvider = require('./resourcesTarBuilder')
 const { FOLDER_GEN } = require('../../constants')
 const { BuildError } = require('../../util')
 
-class MtxModuleBuilder extends BuildTaskHandlerEdmx {
+class MtxBuildPlugin extends EdmxBuildPlugin {
     get priority() {
         // should be scheduled after 'hana' build tasks are finished
-        return BuildTaskHandlerEdmx.PRIORITY_MIN_VALUE
+        return EdmxBuildPlugin.PRIORITY_MIN_VALUE
     }
     init() {
         super.init()
@@ -40,4 +40,4 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
         }
     }
 }
-module.exports = MtxModuleBuilder
+module.exports = MtxBuildPlugin

package/lib/build/provider/mtx/resourcesTarBuilder.js

@@ -1,24 +1,24 @@
 const path = require('path')
 const cds = require('../../../cds')
-const BuildTaskHandlerInternal = require('../buildTaskHandlerInternal')
+const InternalBuildPlugin = require('../internalBuildPlugin')
 
 const { BUILD_TASK_HANA } = require('../../constants')
 const fs = require('fs')
-const { WARNING } = BuildTaskHandlerInternal
+const { WARNING } = InternalBuildPlugin
 const DEFAULT_TAR_NAME = "resources.tgz"
 
 class ResourcesTarBuilder {
-    constructor(handler) {
-        this._handler = handler
+    constructor(plugin) {
+        this._plugin = plugin
     }
 
-    get handler() { return this._handler }
+    get plugin() { return this._plugin }
 
     async createTar(dest, model) {
         const { root, resources } = await this._getResources(model)
         if (resources.length === 0) {
             // packTarArchive fails otherwise
-            this.handler.pushMessage("No deployment resources found - skip resources.tgz", WARNING)
+            this.plugin.pushMessage("No deployment resources found - skip resources.tgz", WARNING)
             return
         }
         await this.writeTarFile(path.join(dest, DEFAULT_TAR_NAME), root, resources)
@@ -36,7 +36,7 @@ class ResourcesTarBuilder {
     async writeTarFile(tarFile, root, resources) {
         const { tar } = require('../../../../lib').utils
         await tar.czfd(tarFile, root, resources)
-        this.handler.pushFile(tarFile)
+        this.plugin.pushFile(tarFile)
     }
 
     async _getResources(model) {
@@ -83,7 +83,7 @@ class ResourcesTarBuilder {
     }
 
     async _getHanaTenantDbDest() {
-        const hanaTask = this.handler.context.tasks.find(task => task.for === BUILD_TASK_HANA)
+        const hanaTask = this.plugin.context.tasks.find(task => task.for === BUILD_TASK_HANA)
         return hanaTask?.dest
     }
 }

package/lib/build/provider/mtx-extension/index.js

@@ -2,12 +2,12 @@ const path = require('path')
 const fs = require('fs')
 const cds = require('../../../cds')
 
-const BuildTaskHandlerInternal = require('../buildTaskHandlerInternal')
+const InternalBuildPlugin = require('../internalBuildPlugin')
 const { FOLDER_GEN, EXTENSION_POINT_VALIDATION } = require('../../constants')
 const ResourcesTarBuilder = require('../mtx/resourcesTarBuilder')
 const { BuildError, BuildMessage } = require('../../util')
 
-class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
+class MtxExtensionBuildPlugin extends InternalBuildPlugin {
     init() {
         super.init()
         if (cds.env.build.target === '.') {
@@ -37,12 +37,10 @@ class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
                 extModel.requires.length = 0
             }
 
-            if (!this.hasBuildOption(EXTENSION_POINT_VALIDATION, false)) {
-                this._lintExtModel(extModel, model) // throws error in case of linting errors
-            }
-
+            // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+            // perform all model operations before the linter is called as the linter 
+            // will modify the model causing the creation of 'unresolved' associations
             await this.compileToJson(extModel, path.join(destExt, 'extension.csn'))
-
             await this.collectLanguageBundles(extModel, path.join(destExt, 'i18n'))
 
             const files = Object.keys(await cds.deploy.resources(model))
@@ -56,6 +54,16 @@ class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
                         })
                 )
             }
+            if (!this.hasBuildOption(EXTENSION_POINT_VALIDATION, false)) {
+                try {
+                    // throws error in case of linting errors
+                    this._lintExtModel(extModel, model)
+                } catch(error) {
+                    // cleanup existing files in case of an error
+                    await fs.promises.rm(this.task.dest, { recursive: true })
+                    throw error
+                }
+            }
         }
 
         const packageJson = path.join(src, 'package.json')
@@ -90,7 +98,7 @@ class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
 
         return paths
     }
-    
+
     _lintExtModel(extModel, model) {
         const linter = this._linter()
         if (!linter) {
@@ -128,4 +136,4 @@ class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
     }
 }
 
-module.exports = MtxExtensionModuleBuilder
+module.exports = MtxExtensionBuildPlugin

package/lib/build/provider/mtx-sidecar/index.js

@@ -1,18 +1,18 @@
 const path = require('path')
 const cds = require('../../../cds')
 const fs = require('fs')
-const { FOLDER_GEN, DEFAULT_CSN_FILE_NAME, MTX_SIDECAR_DB_VALIDATION } = require('../../constants')
-const NodeCfModuleBuilder = require('../nodejs')
+const { FOLDER_GEN, DEFAULT_CSN_FILE_NAME, MTX_SIDECAR_DB_VALIDATION, CONTENT_EDMX, FLAVOR_LOCALIZED_EDMX } = require('../../constants')
+const NodejsBuildPlugin = require('../nodejs')
 const ResourcesTarProvider = require('../mtx/resourcesTarBuilder')
-const { ERROR } = NodeCfModuleBuilder
+const { ERROR } = NodejsBuildPlugin
 const { relativePaths, BuildError, resolveRequiredSapModels, getI18nDefaultFolder } = require('../../util')
 
 const DEFAULT_MAIN_FOLDER = "_main"
 
-class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
+class MtxSidecarBuildPlugin extends NodejsBuildPlugin {
     get priority() {
         // should be scheduled after 'hana' build tasks are finished
-        return NodeCfModuleBuilder.PRIORITY_MIN_VALUE
+        return NodejsBuildPlugin.PRIORITY_MIN_VALUE
     }
     init() {
         super.init()
@@ -47,7 +47,6 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
         const destSidecarSrc = path.join(destSidecar, cds.env.folders.srv)
         const model = this._compileSidecarSync(sidecarEnv)
         await this.compileToJson(model, path.join(destSidecarSrc, DEFAULT_CSN_FILE_NAME))
-
         await this.collectLanguageBundles(model, path.join(destSidecarSrc, getI18nDefaultFolder()))
         await this.copySrvContent(this.task.src, destSidecar, destSidecar)
     }
@@ -76,16 +75,23 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
         const destRoot = this.task.dest
         const destMain = path.join(destRoot, main)
         const destMainSrv = path.join(destMain, cds.env.folders.srv)
-        const csn = await this.model()
-        if (!csn) {
+        const model = await this.model()
+        if (!model) {
             return
         }
-        const { dictionary, sources } = await this.compileAll(csn, destMainSrv, destMain)
+        const { dictionary, sources } = await this.compileAll(model, destMainSrv, destMain)
         await this.collectAllLanguageBundles(dictionary, sources, destMainSrv, destMain)
 
+        if (!this.hasBuildOption(CONTENT_EDMX, false)) {
+            //inferred model expected by cds.compile.to.edmx()
+            const compileOptions = { [FLAVOR_LOCALIZED_EDMX]: this.hasBuildOption(FLAVOR_LOCALIZED_EDMX, true) } // disabled by default
+            const baseModel = cds.compiler.compileSources({ 'base.json': dictionary.base }, { messages: this.messages })
+            await this.compileToEdmx(baseModel, path.join(destMainSrv, 'odata', cds.env.odata.version), compileOptions)
+        }
+
         // create resources TAR
         // resources are determined based on available database build task, SQLite as fallback
-        await new ResourcesTarProvider(this).createTar(destMain, csn)
+        await new ResourcesTarProvider(this).createTar(destMain, model)
 
         // copy package.json and .cdsrc.json from project root
         await this._copyMainConfigFiles(cds.root, destMain)
@@ -139,4 +145,4 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
         return promises
     }
 }
-module.exports = MtxSidecarModuleBuilder
+module.exports = MtxSidecarBuildPlugin

package/lib/build/provider/nodejs/index.js

@@ -1,13 +1,13 @@
 const fs = require('fs')
 const path = require('path')
 const cds = require('../../../cds')
-const BuildTaskHandlerEdmx = require('../buildTaskHandlerEdmx')
+const EdmxBuildPlugin = require('../edmxBuildPlugin')
 const { BuildError } = require('../../util')
-const { OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM, ODATA_VERSION_V2, FOLDER_GEN, CONTENT_EDMX,
-    CONTENT_PACKAGELOCK_JSON, CONTENT_NPMRC, CONTENT_CDSRC_JSON, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON } = require('../../constants')
-const { WARNING } = BuildTaskHandlerEdmx
+const { OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM, ODATA_VERSION_V2, FOLDER_GEN, CONTENT_EDMX, CONTENT_PACKAGELOCK_JSON,
+    CONTENT_NPMRC, CONTENT_CDSRC_JSON, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, FLAVOR_LOCALIZED_EDMX } = require('../../constants')
+const { WARNING } = EdmxBuildPlugin
 
-class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
+class NodejsBuildPlugin extends EdmxBuildPlugin {
     init() {
         super.init()
         if (this.task.options.compileDest) {
@@ -28,8 +28,7 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
     async build() {
         const destSrv = this.isStagingBuild() ? this.destSrv : path.resolve(this.destSrv, cds.env.folders.srv)
         const destRoot = this.isStagingBuild() ? this.task.dest : this.destSrv
-
-        if (cds.env.odata?.version === ODATA_VERSION_V2) {
+        if (cds.env.odata.version === ODATA_VERSION_V2) {
             // log warning as nodejs is only supporting odata version V4
             this.pushMessage("OData v2 is not supported by node runtime. Make sure to define OData v2 in cds configuration.", WARNING)
         }
@@ -44,39 +43,74 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
         // collect and write language bundles into single i18n.json file
         await this.collectAllLanguageBundles(dictionary, sources, destSrv, destRoot)
 
-        if (this.hasBuildOption(CONTENT_EDMX, true)) {
-            const m = await cds.load(sources.base, super.options()) // REVISIT: Quick hack to get inferred model as expected by cds.compile.to.edmx()
-            await this.compileToEdmx(m, this.destSrv)
+        if (!this.hasBuildOption(CONTENT_EDMX, false)) {
+            //REVISIT: inferred model expected by cds.compile.to.edmx()
+            const compileOptions = { [FLAVOR_LOCALIZED_EDMX]: this.hasBuildOption(FLAVOR_LOCALIZED_EDMX, true) }
+            const baseModel = cds.compiler.compileSources({ 'base.json': dictionary.base }, { messages: this.messages })
+            await this.compileToEdmx(baseModel, path.join(this.destSrv, 'odata', cds.env.odata.version), compileOptions)
         }
 
         if (this.isStagingBuild() && this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM)) {
             const srcSrv = this.task.src === cds.root ? path.resolve(this.task.src, cds.env.folders.srv) : this.task.src
             await this._copyNativeContent(cds.root, srcSrv, destRoot, destSrv)
-            await this._fixCapireSamplesDeps(destRoot)
+            if (this.context.options.ws) {
+                await this._addWorkspaceDependencies(destRoot)
+            }
         }
         return this._result
     }
 
-    // REVISIT: fix for capire samples - needs to be reworked
-    // Instead of adding relative paths we may better delete the entire entry as relative paths
-    // cannot be resolved in cloud deployments anyway.
+    // REVISIT: fix for simple mono repos using npm workspaces
     // Support for HANA native artifacts defined in sub-modules required
-    async _fixCapireSamplesDeps(dest) {
-        const packageJson = path.join(dest, 'package.json')
+    async _addWorkspaceDependencies(dest) {
         try {
-            const content = require(packageJson)
-            const { dependencies } = content
-            let changed
-            for (let dependency in dependencies) {
-                if (dependency.startsWith('@capire/')) {
-                    dependencies[dependency] = path.relative(dest, path.dirname(require.resolve(dependency + '/package.json')))
-                    changed = true
-                }
+            const workspaceRoot = path.resolve(cds.root, this.getBuildOption("workspaceRoot") ?? '.')
+            if (workspaceRoot !== cds.root && !fs.existsSync(workspaceRoot)) {
+                throw new BuildError(`The given workspaceRoot path ${workspaceRoot} does not exist`)
             }
-            if (changed) {
-                return this.write(JSON.stringify(content, null, '  ')).to(packageJson)
+            const packageJson = require(path.join(dest, 'package.json'))
+            const workspaces = workspaceRoot === cds.root ? packageJson.workspaces : require(path.join(workspaceRoot, 'package.json')).workspaces
+            if (workspaces?.length) {
+                this.logger._debug && this.logger.debug(`Existing npm workspace configuration '${JSON.stringify(workspaces, ' ')}'`)
+                const { tar } = require('../../../../lib').utils
+                const { dependencies } = packageJson
+                const folders = fs.readdirSync(workspaceRoot).filter(res => {
+                    try {
+                        return fs.lstatSync(path.join(workspaceRoot, res)).isDirectory()
+                    } catch (e) {
+                        return false
+                    }
+                })
+                this.logger._debug && this.logger.debug(`Existing workspace subfolders '${JSON.stringify(folders, ' ')}'`)
+
+                const workspaceNames = new Set()
+                let changed
+                for (const workspace of workspaces) {
+                    //REVISIT: workspaces must only use simple glob like 'foo*', nested folders are not supported
+                    const regex = new RegExp('^' + workspace.split('/').pop().replace(/\*/g, '.*') + '$')
+                    for (const folder of folders) {
+                        if (!workspaceNames.has(folder) && folder.match(regex)) {
+                            workspaceNames.add(folder)
+                            const plugin = require(require.resolve(path.join(workspaceRoot, folder, 'package.json')))
+                            const tarFile = `${plugin.name.replace(/\//g, '-').replace(/@/, '')}-${plugin.version}.tgz`
+                            if (dependencies[plugin.name] === '*') {
+                                const tarFilePath = path.join(dest, tarFile)
+                                dependencies[plugin.name] = `file:${tarFile}`
+                                await tar.czfd(tarFilePath, path.join(workspaceRoot, folder))
+                                this.pushFile(tarFilePath)
+                                changed = true
+                            }
+                        }
+                    }
+                }
+                if (changed) {
+                    return this.write(JSON.stringify(packageJson, null, '  ')).to(path.join(dest, 'package.json'))
+                }
             }
-        } catch (e) {/*ignore*/ }
+        } catch (e) {
+            this.pushMessage(`Failed to add npm workspace dependencies: ${e.message}`)
+            this.logger.debug(e)
+        }
     }
 
     async clean() {
@@ -91,7 +125,7 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
 
     async _copyNativeContent(srcRoot, srcSrv, destRoot, destSrv) {
         // project/srv/** -> 'gen/srv/srv/**'
-        const filesFilter = await this.copySrvContent(srcSrv, destRoot, this.hasBuildOption('flatDeployLayout', true)? destRoot : destSrv)
+        const filesFilter = await this.copySrvContent(srcSrv, destRoot, this.hasBuildOption('flatDeployLayout', true) ? destRoot : destSrv)
 
         // project/* -> 'gen/srv/*'
         await this.copyProjectRootContent(srcRoot, destRoot, (entry) => !filesFilter.includes(path.basename(entry)))
@@ -176,4 +210,4 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
     }
 }
 
-module.exports = NodejsModuleBuilder
+module.exports = NodejsBuildPlugin

package/lib/build/util.js

@@ -119,6 +119,14 @@ function getDefaultModelOptions() {
     return _pushModelPaths(modelPaths)
 }
 
+/**
+ * For valid paths replace '\\' with '/' and remove trailing '/'. Otherwise return as is
+ * @param {*} dir
+ */
+function normalizePath(dir) {
+    return typeof dir === "string" ? dir.replace(/\\/g, '/').replace(/\/$/, '') : dir
+}
+
 function _pushModelPaths(...modelPaths) {
     const model = new Set()
     // may contain nested arrays
@@ -131,7 +139,7 @@ function _pushModelPaths(...modelPaths) {
             if (roots.includes(m)) {
                 const dir = path.resolve(cds.root, m)
                 if (fs.existsSync(dir)) {
-                    model.add(m.replace(/\/$/, ''))
+                    model.add(m)
                 } else if (fs.existsSync(dir + FILE_EXT_CDS)) { //might be cds file name, compatibility to old build configs
                     model.add(m)
                 }
@@ -140,7 +148,7 @@ function _pushModelPaths(...modelPaths) {
             }
         }
     })
-    return [...model]
+    return [...model].map(m => normalizePath(m))
 }
 
 function flatten(modelPaths) {
@@ -154,22 +162,6 @@ function flatten(modelPaths) {
     }, [])
 }
 
-/**
- * Copy a file or directory. The directory can have contents.
- * REVISIT: 'fs.promises.cp' replacement for nodejs 14
- * @param src <String> Note that if src is a directory it will copy everything inside of this directory, not the entire directory itself.
- * @param dest <String> Note that if src is a file, dest cannot be a directory.
- */
-async function copy(src, dest) {
-    if ((await fs.promises.stat(src)).isDirectory()) {
-        const entries = await fs.promises.readdir(src)
-        return Promise.all(entries.map(async each => copy(path.join(src, each), path.join(dest, each))))
-    } else {
-        await fs.promises.mkdir(path.dirname(dest), { recursive: true })
-        return fs.promises.copyFile(src, dest)
-    }
-}
-
 function getI18nDefaultFolder() {
     // keep '_i18n' as preferred folder for compatibility reasons
     if (cds.env.i18n.folders.includes('_i18n')) return '_i18n'
@@ -276,9 +268,9 @@ module.exports = {
     resolveRequiredSapModels,
     getDefaultModelOptions,
     flatten,
-    copy,
     getI18nDefaultFolder,
     isClassicMtx,
+    normalizePath,
     BuildMessage,
     BuildError
 }

package/lib/client/auth_manager.js

@@ -1,5 +1,7 @@
 const axios = require('axios');
 
+require('../util/pruneAxiosErrors');
+
 const cds = require('../cds');
 const DEBUG = cds.debug('cli');
 const { SettingsManager } = require('./settings_manager');
@@ -54,16 +56,7 @@ function* reqParams(params) {
 }
 
 async function retrieveTokenOrPasscodeUrl(params) {
-    if (params.has('token')) {
-        if (params.get('renewLogin') || params.get('tokenExpirationDate') <= Date.now()) {
-            DEBUG?.((params.get('renewLogin') ? 'Renewing' : 'Refreshing expired') + ' authentication token');
-            params.delete('token');
-            params.delete('tokenExpirationDate');
-        } else {
-            return;
-        }
-    }
-    if (!params.has('passcode') && !params.has('refreshToken') && params.has('passcodeUrl')) {
+    if (params.has('token') || !params.has('refreshToken') && !params.has('passcode') && params.has('passcodeUrl')) {
         return;
     }
 
@@ -76,7 +69,7 @@ async function retrieveTokenOrPasscodeUrl(params) {
                 DEBUG?.(`Getting authentication token or passcode URL from ${method.toUpperCase()} ${(params.obfuscateQueryParams(url))}`);
                 response = await axios[method](url, data);
             } catch (error) {
-                if (error.response?.status === 404) { // may represent 405 in case of wrong method
+                if (error.status === 404) { // may represent 405 in case of wrong method
                     continue;
                 }
                 throw getMessage('Failed to get authentication token', { error });
@@ -95,7 +88,8 @@ async function retrieveTokenOrPasscodeUrl(params) {
 
     if (authData.access_token) {
         addTokenInfo(params, authData);
-    } else {
+    }
+    if (authData.passcode_url) {
         addUrlInfo(params, authData);
     }
 }

package/lib/client/base_command.js

@@ -20,7 +20,7 @@ module.exports = class BaseCommand {
     static handleHttpError(error, params, { url, command } = {}) {
         url = url ?? params.get('appUrl');
         const prefix = `Request to ${url} failed`;
-        switch (error.response?.status) {
+        switch (error.status) {
             case 401:
                 throw getMessage(`${prefix}: invalid authentication.\nRetry with valid passcode${
                     params.has('passcodeUrl') ? ` from ${params.get('passcodeUrl')}` : ''

package/lib/client/download_legacy.js

@@ -0,0 +1,48 @@
+const cds = require ('../cds')
+const { tar } = cds.utils;
+
+const fs = require('fs');
+const { join } = require('path');
+const axios = require('axios');
+
+const { login } = require('./auth_manager');
+const BaseCommand = require('./base_command');
+
+const DOWNLOAD_FILE_NAME = 'migrated_projects.tgz'; // TODO try to add tenant later, if possible
+
+module.exports = class Download extends BaseCommand {
+
+    static async run(paramValues) {
+        if (!tar) {
+            throw `cds pull requires @sap/cds version >= 6.2. Current version is ${cds.version}\n`;
+        }
+
+        const params = await login(paramValues);
+
+        const projectFolder = params.get('projectFolder');
+        const downloadPath = join(projectFolder, DOWNLOAD_FILE_NAME);
+
+        if (fs.existsSync(downloadPath) && !(await require('./helper/question').askBooleanQuestion(`File ${DOWNLOAD_FILE_NAME} already exists. Continue (yN)? `, false, false))) {
+            console.log('Download cancelled');
+            return;
+        }
+
+        console.log(`Downloading migrated @sap/mtx extension project(s)`);
+        const downloadedTgz = await this.getTgz(params);
+        await fs.promises.writeFile(downloadPath, downloadedTgz);
+
+        //await tar.xz(baseModelTgz).to(target); // expand if feature is requested later
+
+        console.log(`Finished.`);
+    }
+
+    static async getTgz(params) {
+        const tagRule = params.get('tagRule');
+        const downloadUrl = `${(params.get('appUrl'))}/-/cds/extensibility/getMigratedProjects`;
+        const options = { ...params.get('reqAuth'), responseType: 'arraybuffer' };
+
+        return axios.post(downloadUrl, { tagRule }, options)
+            .then(response => Buffer.from(response.data))
+            .catch(error => this.handleHttpError(error, params, { url: downloadUrl }));
+    }
+}

package/lib/client/params.js

@@ -162,6 +162,8 @@ class BasicParams {
         this.projectFolder          = new Param('projectFolder',          '');
         this.directory              = this.projectFolder.newAlias('directory');
 
+        this.tagRule                = new Param('tagRule', '');
+
         // - non-persisted, internal
         this.reqAuth                = new Param('reqAuth',                null, { obfuscate: ObfuscationLevel.full, internal: true });
         this.clearOtherTokenStorage = new Param('clearOtherTokenStorage', false, { internal: true });
@@ -222,6 +224,9 @@ class AllParams extends BasicParams {
         this["delete-settings"]     = this.deleteSettings.newAlias('delete-settings');
         this.clearInvalid           = new Param('clearInvalid',           false);
         this["clear-invalid"]       = this.clearInvalid.newAlias('clear-invalid');
+
+        // download for mxts
+        this["download-migrated-projects"]   = new Param('download-migrated-projects', false)
     }
 }
 

package/lib/client/push.js

@@ -9,6 +9,13 @@ const { getMessage } = require('./helper/logging');
 const { schemaRegex } = require('./helper/url_helper');
 const buildSystem = require('../build')
 
+const JOB_STATUS = {
+    QUEUED: 'QUEUED',
+    RUNNING: 'RUNNING',
+    FINISHED: 'FINISHED',
+    FAILED: 'FAILED'
+};
+
 module.exports = class Push extends BaseCommand {
 
     static async run(paramValues, pushOptions = {}) {
@@ -27,7 +34,11 @@ module.exports = class Push extends BaseCommand {
         const target = Object.assign({ url }, subdomain && { subdomain });
 
         console.log(`\nPushing extension '${extensionName}' from`, { src }, 'to', target);
-        await this.pushTgz(params, content, extensionName);
+        const push = await this.pushTgz(params, content, extensionName);
+        const async = !params.get('sync');
+        if (async) {
+            await this.pollUntilFinished(push.headers.location, params)
+        }
         console.log ('Activation succeeded.\n')
     }
 
@@ -61,6 +72,10 @@ module.exports = class Push extends BaseCommand {
     static async pushTgz(params, tgz, extensionName) {
         const pushUrl = `${params.get('appUrl')}/-/cds/extensibility/push`;
         const options = { ...params.get('reqAuth') };
+        const async = !params.get('sync');
+        if (async) {
+            options.headers = { prefer: 'respond-async', ...options.headers }
+        }
 
         return axios.post(pushUrl, {
             extension: tgz,
@@ -68,4 +83,29 @@ module.exports = class Push extends BaseCommand {
         }, options)
             .catch(error => this.handleHttpError(error, params, { url: pushUrl }));
     }
+
+    static async pollUntilFinished(jobUrl, params) {
+        return new Promise((resolve, reject) => {
+          const options = { ...params.get('reqAuth') };
+
+          const timeout = setTimeout(() => {
+            clearInterval(interval);
+            reject(new Error('cds push timed out after 5 minutes'));
+          }, 5 * 60 * 1000);
+
+          const interval = setInterval(async () => {
+            const { status, error } = (await axios.get(jobUrl, options)).data;
+            if (status === JOB_STATUS.FINISHED || status === JOB_STATUS.FAILED) {
+              clearInterval(interval);
+              clearTimeout(timeout);
+
+              if (status === JOB_STATUS.FINISHED) {
+                resolve();
+              } else if (status === JOB_STATUS.FAILED) {
+                reject(new Error(error));
+              }
+            }
+          }, 1000);
+        });
+    }
 }

package/lib/client/settings_manager.js

@@ -112,7 +112,7 @@ async function getTokenBaseUrl(params, renewUrl) {
             existingPath = path;
             break;
         } catch (error) {
-            if ([401, 404].includes(error.response?.status)) {
+            if ([401, 404].includes(error.status)) {
                 continue;
             }
             throw error;
@@ -344,6 +344,13 @@ class SettingsManager {
                 params.merge(auth[storage]);
             }
         }
+        function removeObsoleteToken() {
+            if (params.get('renewLogin') || params.get('tokenExpirationDate') <= Date.now()) {
+                DEBUG?.((params.get('renewLogin') ? 'Renewing' : 'Refreshing expired') + ' authentication token');
+                params.delete('token');
+                params.delete('tokenExpirationDate');
+            }
+        }
 
         if (params.has('username')) {
             if (!params.has('password') && !logout) {
@@ -381,8 +388,10 @@ class SettingsManager {
         };
 
         setRelevantAuth(auth);
-
-        if (!logout && !params.has('token') && !params.has('passcode') && !params.has('clientsecret') && !params.has('key')) {
+        if (params.has('token')) {
+            removeObsoleteToken();
+        }
+        if (!logout && !params.has('token') && !params.has('refreshToken') && !params.has('passcode') && !params.has('clientsecret') && !params.has('key')) {
             await addPasscode();
         }
     }