@contentstack/cli-cm-export 1.4.0 → 1.5.1

package/README.md

@@ -38,7 +38,7 @@ $ npm install -g @contentstack/cli-cm-export
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-export/1.4.0 linux-x64 node-v16.19.1
+@contentstack/cli-cm-export/1.5.1 linux-x64 node-v16.20.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.4.0",
+  "version": "1.5.1",
   "commands": {
     "cm:stacks:export": {
       "id": "cm:stacks:export",

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-export",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "^1.2.0",
-    "@contentstack/cli-utilities": "^1.2.0",
+    "@contentstack/cli-command": "^1.2.2",
+    "@contentstack/cli-utilities": "^1.3.1",
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.18.3",
     "async": "^3.2.4",
@@ -23,8 +23,8 @@
     "winston": "^3.7.2"
   },
   "devDependencies": {
-    "@contentstack/cli-auth": "^1.2.0",
-    "@contentstack/cli-config": "^1.2.0",
+    "@contentstack/cli-auth": "^1.3.1",
+    "@contentstack/cli-config": "^1.3.1",
     "@contentstack/cli-dev-dependencies": "^1.2.0",
     "@oclif/plugin-help": "^5.1.19",
     "@oclif/test": "^1.2.6",
@@ -62,17 +62,24 @@
     "test": "nyc mocha --forbid-only \"test/**/*.test.js\"",
     "version": "oclif readme && git add README.md",
     "clean": "rm -rf ./node_modules tsconfig.build.tsbuildinfo",
-    "test:integration": "mocha --forbid-only \"test/run.test.js\" --integration-test",
+    "test:integration": "INTEGRATION_TEST=true mocha --config ./test/.mocharc.js --forbid-only \"test/run.test.js\"",
     "test:unit": "mocha --forbid-only \"test/unit/*.test.js\" --unit-test"
   },
   "oclif": {
     "commands": "./src/commands",
     "bin": "csdx",
+    "devPlugins": [
+      "@oclif/plugin-help"
+    ],
     "repositoryPrefix": "<%- repo %>/blob/main/packages/contentstack-export/<%- commandPath %>"
   },
   "csdxConfig": {
     "expiredCommands": {
       "cm:export": "csdx cm:stacks:export"
+    },
+    "shortCommandName": {
+      "cm:stacks:export": "EXPRT",
+      "cm:export": "O-EXPRT"
     }
   },
   "main": "./src/commands/cm/stacks/export.js",

package/src/app.js

@@ -6,7 +6,7 @@ const util = require('./lib/util');
 const login = require('./lib/util/login');
 const setupBranches = require('./lib/util/setup-branches');
 const { addlogs, unlinkFileLogger } = require('./lib/util/log');
-const { managementSDKClient } = require('@contentstack/cli-utilities');
+const { managementSDKClient, isAuthenticated } = require('@contentstack/cli-utilities');
 
 exports.initial = async (config) => {
   return new Promise(async (resolve, reject) => {
@@ -52,15 +52,21 @@ exports.initial = async (config) => {
       }
     };
 
-    // try {
-    if (
+    if (config.management_token || config.isAuthenticated) {
+      try {
+        await fetchBranchAndExport(APIClient, stackAPIClient);
+      } catch (error) {
+        addlogs(config, `${util.formatError(error)}`, 'error');
+      }
+      resolve();
+    } else if (
       (config.email && config.password) ||
       (!config.email && !config.password && config.source_stack && config.access_token) ||
-      (config.auth_token && !config.management_token)
+      (isAuthenticated() && !config.management_token)
     ) {
       login
-        .login(config)
-        .then(async () => {
+        .login(config, APIClient, stackAPIClient)
+        .then(async function () {
           // setup branches
           try {
             await fetchBranchAndExport(APIClient, stackAPIClient);
@@ -79,13 +85,8 @@ exports.initial = async (config) => {
             addlogs(config, `${util.formatError(error)}`, 'error');
           }
         });
-    } else if (config.management_token) {
-      try {
-        await fetchBranchAndExport(APIClient, stackAPIClient);
-      } catch (error) {
-        addlogs(config, util.formatError(error), 'error');
-      }
-      resolve();
+    } else {
+      reject('Kindly login or provide management_token');
     }
   });
 };
@@ -148,7 +149,11 @@ const allExport = async (APIClient, stackAPIClient, config, types, branchName) =
     addlogs(config, util.formatError(error), 'error');
     addlogs(
       config,
-      chalk.red('Failed to migrate stack: ' + config.source_stack + '. Please check error logs for more info'),
+      chalk.red(
+        'Failed to migrate stack: ' +
+          (config.sourceStackName || config.source_stack) +
+          '. Please check error logs for more info',
+      ),
       'error',
     );
     addlogs(config, 'The log for this is stored at ' + path.join(config.data, 'logs', 'export'), 'error');

package/src/commands/cm/stacks/export.js

@@ -1,5 +1,6 @@
 /* eslint-disable complexity */
 const { Command } = require('@contentstack/cli-command');
+const { printFlagDeprecation, configHandler, flags, isAuthenticated } = require('@contentstack/cli-utilities');
 const {
   configWithMToken,
   parameterWithMToken,
@@ -9,35 +10,31 @@ const {
   withoutParametersWithAuthToken,
 } = require('../../../lib/util/export-flags');
 const config = require('../../../config/default');
-const { configHandler, printFlagDeprecation, flags } = require('@contentstack/cli-utilities');
 
 class ExportCommand extends Command {
   async run() {
     const { flags: exportCommandFlags } = await this.parse(ExportCommand);
     const extConfig = exportCommandFlags.config;
-    let sourceStack = exportCommandFlags['stack-uid'] || exportCommandFlags['stack-api-key'];
+    const sourceStack = exportCommandFlags['stack-uid'] || exportCommandFlags['stack-api-key'];
     const alias = exportCommandFlags['alias'] || exportCommandFlags['management-token-alias'];
     const securedAssets = exportCommandFlags['secured-assets'];
     const data = exportCommandFlags.data || exportCommandFlags['data-dir'];
     const moduleName = exportCommandFlags.module;
     const contentTypes = exportCommandFlags['content-types'];
     const branchName = exportCommandFlags.branch;
-    let _authToken = configHandler.get('authtoken');
     let host = this.region;
     let cmaHost = host.cma.split('//');
     let cdaHost = host.cda.split('//');
     host.cma = cmaHost[1];
     host.cda = cdaHost[1];
+    exportCommandFlags['isAuthenticated'] = isAuthenticated();
 
     config.forceStopMarketplaceAppsPrompt = exportCommandFlags.yes;
 
     if (alias) {
-      let managementTokens = this.getToken(alias);
-
-      if (alias) {
-        const listOfTokens = configHandler.get('tokens');
-        config.management_token_data = listOfTokens[alias];
-      }
+      const managementTokens = this.getToken(alias);
+      const listOfTokens = configHandler.get('tokens');
+      config.management_token_data = listOfTokens[alias];
 
       if (managementTokens) {
         if (extConfig) {
@@ -49,6 +46,8 @@ class ExportCommand extends Command {
             branchName,
             securedAssets,
             moduleName,
+            data,
+            exportCommandFlags,
           );
         } else if (data) {
           await parameterWithMToken(
@@ -56,20 +55,20 @@ class ExportCommand extends Command {
             data,
             moduleName,
             host,
-            _authToken,
             contentTypes,
             branchName,
             securedAssets,
+            exportCommandFlags,
           );
         } else if (data === undefined && sourceStack === undefined) {
           await withoutParameterMToken(
             managementTokens,
             moduleName,
             host,
-            _authToken,
             contentTypes,
             branchName,
             securedAssets,
+            exportCommandFlags,
           );
         } else {
           this.log('Please provide a valid command. Run "csdx cm:export --help" command to view the command usage');
@@ -77,12 +76,19 @@ class ExportCommand extends Command {
       } else {
         this.log(alias + ' management token is not present, please add managment token first');
       }
-    } else if (_authToken) {
+    } else if (isAuthenticated()) {
       if (extConfig) {
-        await configWithAuthToken(extConfig, _authToken, moduleName, host, contentTypes, branchName, securedAssets);
+        await configWithAuthToken(
+          extConfig,
+          moduleName,
+          host,
+          contentTypes,
+          branchName,
+          securedAssets,
+          exportCommandFlags,
+        );
       } else if (sourceStack && data) {
         return await parametersWithAuthToken(
-          _authToken,
           sourceStack,
           data,
           moduleName,
@@ -90,16 +96,23 @@ class ExportCommand extends Command {
           contentTypes,
           branchName,
           securedAssets,
+          exportCommandFlags,
         );
       } else if (data === undefined && sourceStack === undefined) {
-        await withoutParametersWithAuthToken(_authToken, moduleName, host, contentTypes, branchName, securedAssets);
+        await withoutParametersWithAuthToken(
+          moduleName,
+          host,
+          contentTypes,
+          branchName,
+          securedAssets,
+          exportCommandFlags,
+        );
       } else {
         this.log('Please provide a valid command. Run "csdx cm:export --help" command to view the command usage');
       }
     } else {
       this.log('Login or provide the alias for management token');
     }
-    // return
   }
 }
 

package/src/lib/export/assets.js

@@ -11,7 +11,7 @@ const Promise = require('bluebird');
 const _ = require('lodash');
 const chalk = require('chalk');
 const progress = require('progress-stream');
-const { HttpClient } = require('@contentstack/cli-utilities');
+const { HttpClient, configHandler } = require('@contentstack/cli-utilities');
 
 const helper = require('../util/helper');
 const { addlogs } = require('../util/log');
@@ -53,11 +53,11 @@ module.exports = class ExportAssets {
     // Create asset folder
     mkdirp.sync(this.assetsFolderPath);
 
-    return new Promise(function (resolve, reject) {
+    return new Promise((resolve, reject) => {
       // TBD: getting all the assets should have optimized
       return self
         .getAssetCount()
-        .then(function (count) {
+        .then((count) => {
           const assetBatches = [];
 
           if (typeof count !== 'number' || count === 0) {
@@ -70,20 +70,20 @@ module.exports = class ExportAssets {
 
           return Promise.map(
             assetBatches,
-            function (batch) {
+            (batch) => {
               return self
                 .getAssetJSON(batch)
-                .then(function (assetsJSON) {
+                .then((assetsJSON) => {
                   return Promise.map(
                     assetsJSON,
-                    function (assetJSON) {
+                    (assetJSON) => {
                       if (self.assetConfig.downloadVersionAssets) {
                         return self
                           .getVersionedAssetJSON(assetJSON.uid, assetJSON._version)
-                          .then(function () {
+                          .then(() => {
                             self.assetContents[assetJSON.uid] = assetJSON;
                           })
-                          .catch(function (error) {
+                          .catch((error) => {
                             addlogs(
                               self.config,
                               chalk.red('The following asset failed to download\n' + JSON.stringify(assetJSON)),
@@ -93,7 +93,7 @@ module.exports = class ExportAssets {
                       } else {
                         return self
                           .downloadAsset(assetJSON)
-                          .then(function () {
+                          .then(() => {
                             self.assetContents[assetJSON.uid] = assetJSON;
                           })
                           .catch((err) => {
@@ -108,38 +108,38 @@ module.exports = class ExportAssets {
                     },
                     { concurrency: self.vLimit },
                   )
-                    .then(function () {
+                    .then(() => {
                       addlogs(self.config, 'Batch no ' + (batch + 1) + ' of assets is complete', 'success');
                       // helper.writeFileSync(this.assetContentsFile, self.assetContents)
                     })
-                    .catch(function (error) {
+                    .catch((error) => {
                       console.log('Error fetch/download the asset', error && error.message);
                       addlogs(self.config, 'Asset batch ' + (batch + 1) + ' failed to download', 'error');
                       addlogs(self.config, error, 'error');
                     });
                 })
-                .catch(function (error) {
+                .catch((error) => {
                   addlogs(self.config, error, 'error');
                   reject(error);
                 });
             },
             { concurrency: self.assetConfig.concurrencyLimit || 1 },
           )
-            .then(function () {
+            .then(() => {
               helper.writeFileSync(self.assetContentsFile, self.assetContents);
 
               return self
                 .exportFolders()
-                .then(function () {
+                .then(() => {
                   addlogs(self.config, chalk.green('Asset export completed successfully'), 'success');
                   return resolve();
                 })
-                .catch(function (error) {
+                .catch((error) => {
                   addlogs(self.config, error, 'success');
                   reject(error);
                 });
             })
-            .catch(function (error) {
+            .catch((error) => {
               helper.writeFileSync(self.assetContentsFile, self.assetContents);
               addlogs(
                 self.config,
@@ -149,7 +149,7 @@ module.exports = class ExportAssets {
               reject(error);
             });
         })
-        .catch(function (error) {
+        .catch((error) => {
           addlogs(self.config, error, 'success');
           reject(error);
         });
@@ -158,10 +158,10 @@ module.exports = class ExportAssets {
 
   exportFolders() {
     const self = this;
-    return new Promise(function (resolve, reject) {
+    return new Promise((resolve, reject) => {
       return self
         .getAssetCount(true)
-        .then(function (fCount) {
+        .then((fCount) => {
           if (fCount === 0) {
             addlogs(self.config, 'No folders were found in the stack!', 'success');
             return resolve();
@@ -169,17 +169,17 @@ module.exports = class ExportAssets {
 
           return self
             .getFolderJSON(0, fCount)
-            .then(function () {
+            .then(() => {
               // asset folders have been successfully exported
               addlogs(self.config, 'Asset-folders have been successfully exported!', 'success');
               return resolve();
             })
-            .catch(function (error) {
+            .catch((error) => {
               addlogs(self.config, chalk.red('Error while exporting asset-folders!'), 'error');
               return reject(error);
             });
         })
-        .catch(function (error) {
+        .catch((error) => {
           addlogs(self.config, error, 'error');
           // error while fetching asset folder count
           return reject(error);
@@ -189,7 +189,7 @@ module.exports = class ExportAssets {
 
   getFolderJSON(skip, fCount) {
     const self = this;
-    return new Promise(function (resolve, reject) {
+    return new Promise((resolve, reject) => {
       if (typeof skip !== 'number') {
         skip = 0;
       }
@@ -213,13 +213,14 @@ module.exports = class ExportAssets {
           skip += 100;
           self.folderData.push(...response.items);
           return self.getFolderJSON(skip, fCount).then(resolve).catch(reject);
-        });
+        })
+        .catch((error) => reject(error));
     });
   }
 
   getAssetCount(folder) {
     const self = this;
-    return new Promise(function (resolve, reject) {
+    return new Promise((resolve, reject) => {
       if (folder && typeof folder === 'boolean') {
         const queryOptions = {
           skip: 99999990,
@@ -254,7 +255,7 @@ module.exports = class ExportAssets {
 
   getAssetJSON(skip) {
     const self = this;
-    return new Promise(function (resolve, reject) {
+    return new Promise((resolve, reject) => {
       if (typeof skip !== 'number') {
         skip = 0;
       }
@@ -283,7 +284,7 @@ module.exports = class ExportAssets {
     const self = this;
     const assetVersionInfo = bucket || [];
 
-    return new Promise(function (resolve, reject) {
+    return new Promise((resolve, reject) => {
       if (self.assetDownloadRetry[uid + version] > self.assetDownloadRetryLimit) {
         console.log('Reached max', self.assetDownloadRetry[uid + version]);
         return reject(new Error('Asset Max download retry limit exceeded! ' + uid));
@@ -308,7 +309,7 @@ module.exports = class ExportAssets {
         .then((versionedAssetJSONResponse) => {
           self
             .downloadAsset(versionedAssetJSONResponse)
-            .then(function () {
+            .then(() => {
               assetVersionInfo.splice(0, 0, versionedAssetJSONResponse);
               // Remove duplicates
               assetVersionInfo = _.uniqWith(assetVersionInfo, _.isEqual);
@@ -328,7 +329,6 @@ module.exports = class ExportAssets {
               : (self.assetDownloadRetry[uid + version] = 1);
             return self.getVersionedAssetJSON(uid, version, assetVersionInfo).then(resolve).catch(reject);
           }
-
           reject(error);
         });
     });
@@ -336,7 +336,7 @@ module.exports = class ExportAssets {
 
   downloadAsset(asset) {
     const self = this;
-    return new Promise(async function (resolve, reject) {
+    return new Promise(async (resolve, reject) => {
       const assetFolderPath = path.resolve(self.assetsFolderPath, asset.uid);
       const assetFilePath = path.resolve(assetFolderPath, asset.filename);
 
@@ -350,7 +350,7 @@ module.exports = class ExportAssets {
       }
       self.assetStream = {
         url: self.config.securedAssets
-          ? `${asset.url}?authtoken=${self.config.authtoken || self.config.auth_token}`
+          ? `${asset.url}?authtoken=${configHandler.get('authtoken')}`
           : asset.url,
       };
 
@@ -366,7 +366,7 @@ module.exports = class ExportAssets {
               time: 5000,
               length: assetStreamRequest.headers['content-length'],
             });
-            str.on('progress', function (progressData) {
+            str.on('progress', (progressData) => {
               console.log(`${asset.filename}: ${Math.round(progressData.percentage)}%`);
             });
             assetStreamRequest.pipe(str).pipe(assetFileStream);
@@ -378,7 +378,7 @@ module.exports = class ExportAssets {
           reject(error);
         });
       assetFileStream
-        .on('close', function () {
+        .on('close', () => {
           addlogs(self.config, 'Downloaded ' + asset.filename + ': ' + asset.uid + ' successfully!', 'success');
           return resolve();
         })
@@ -391,26 +391,26 @@ module.exports = class ExportAssets {
 
   getFolders() {
     const self = this;
-    return new Promise(function (resolve, reject) {
+    return new Promise((resolve, reject) => {
       return self
         .getAssetCount(true)
-        .then(function (count) {
+        .then((count) => {
           if (count === 0) {
             addlogs(self.config, 'No folders were found in the stack', 'success');
             return resolve();
           }
           return self
             .getFolderDetails(0, count)
-            .then(function () {
+            .then(() => {
               addlogs(self.config, chalk.green('Exported asset-folders successfully!'), 'success');
               return resolve();
             })
-            .catch(function (error) {
+            .catch((error) => {
               addlogs(self.config, error, 'error');
               reject(error);
             });
         })
-        .catch(function (error) {
+        .catch((error) => {
           addlogs(self.config, error, 'error');
           reject(error);
         });
@@ -419,7 +419,7 @@ module.exports = class ExportAssets {
 
   getFolderDetails(skip, tCount) {
     const self = this;
-    return new Promise(function (resolve, reject) {
+    return new Promise((resolve, reject) => {
       if (typeof skip !== 'number') {
         skip = 0;
       }

package/src/lib/export/custom-roles.js

@@ -4,7 +4,6 @@ const path = require('path');
 const chalk = require('chalk');
 const mkdirp = require('mkdirp');
 const { merge } = require('lodash');
-
 const helper = require('../util/helper');
 const { addlogs } = require('../util/log');
 const { formatError } = require('../util');
@@ -21,31 +20,27 @@ module.exports = class ExportCustomRoles {
   rolesConfig = config.modules.customRoles;
 
   constructor(exportConfig, stackAPIClient) {
-    this.stackAPIClient = stackAPIClient;
     this.config = merge(config, exportConfig);
+    this.stackAPIClient = stackAPIClient;
   }
 
   async start() {
     const self = this;
+
     try {
       addlogs(this.config, 'Starting roles export', 'success');
-
       const rolesFolderPath = path.resolve(this.config.data, this.config.branchName || '', this.rolesConfig.dirName);
       mkdirp.sync(rolesFolderPath);
-
-      const roles = await this.stackAPIClient.role().fetchAll({ include_rules: true, include_permissions: true });
-
+      const roles = await self.stackAPIClient.role().fetchAll({ include_rules: true, include_permissions: true });
       const customRoles = roles.items.filter((role) => !self.EXISTING_ROLES[role.name]);
-
       if (!customRoles.length) {
         addlogs(self.config, 'No custom roles were found in the Stack', 'success');
         return;
       }
-
       await self.getCustomRolesLocales(
         customRoles,
         path.join(rolesFolderPath, self.rolesConfig.customRolesLocalesFileName),
-        this.stackAPIClient,
+        self.stackAPIClient,
         self.config,
       );
       self.customRoles = {};
@@ -80,7 +75,6 @@ module.exports = class ExportCustomRoles {
         });
       }
     }
-
     if (Object.keys(localesMap).length) {
       const locales = await stackAPIClient.locale().query({}).find();
       const sourceLocalesMap = {};

package/src/lib/export/environments.js

@@ -25,8 +25,8 @@ module.exports = class ExportEnvironments {
   };
 
   constructor(exportConfig, stackAPIClient) {
-    this.stackAPIClient = stackAPIClient;
     this.config = merge(this.config, exportConfig);
+    this.stackAPIClient = stackAPIClient;
   }
 
   start() {
@@ -42,7 +42,7 @@ module.exports = class ExportEnvironments {
     mkdirp.sync(environmentsFolderPath);
     addlogs(self.config, 'Starting environment export', 'success');
 
-    return new Promise(function (resolve, reject) {
+    return new Promise((resolve, reject) => {
       self.stackAPIClient
         .environment()
         .query(self.requestOptions.qs)

package/src/lib/export/extensions.js

@@ -24,8 +24,8 @@ module.exports = class ExportExtensions {
   };
 
   constructor(exportConfig, stackAPIClient) {
-    this.stackAPIClient = stackAPIClient;
     this.config = merge(config, exportConfig);
+    this.stackAPIClient = stackAPIClient;
   }
 
   start() {

package/src/lib/export/global-fields.js

@@ -34,8 +34,8 @@ module.exports = class ExportGlobalFields {
         include_count: true,
       },
     };
-    this.stackAPIClient = stackAPIClient;
     this.config = merge(config, exportConfig);
+    this.stackAPIClient = stackAPIClient;
     this.globalfieldsFolderPath = path.resolve(
       this.config.data,
       this.config.branchName || '',
@@ -89,22 +89,17 @@ module.exports = class ExportGlobalFields {
               }
               self.global_fields.push(globalField);
             });
-
             skip += self.limit;
-
             if (skip > globalFieldResponse.count) {
               return resolve();
             }
-
             return self.getGlobalFields(skip, globalFieldConfig).then(resolve).catch(reject);
           } catch (error) {
             addlogs(globalFieldConfig, chalk.red(`Failed to export global-fields ${formatError(error)}`), 'error');
             reject(error);
           }
         })
-        .catch((error) => {
-          reject(error);
-        });
+        .catch(reject);
     });
   }
 
@@ -117,7 +112,6 @@ module.exports = class ExportGlobalFields {
           self.global_fields,
         );
         addlogs(self.config, chalk.green('Global Fields export completed successfully'), 'success');
-
         resolve();
       } catch (error) {
         addlogs(self.config, error, 'error');

package/src/lib/export/labels.js

@@ -19,8 +19,8 @@ module.exports = class ExportLabels {
   labelConfig = config.modules.labels;
 
   constructor(exportConfig, stackAPIClient) {
-    this.stackAPIClient = stackAPIClient;
     this.config = merge(config, exportConfig);
+    this.stackAPIClient = stackAPIClient;
   }
 
   start() {

package/src/lib/export/locales.js

@@ -2,6 +2,7 @@ const path = require('path');
 const chalk = require('chalk');
 const fileHelper = require('../util/helper');
 const { addlogs } = require('../util/log');
+const { formatError } = require('../util');
 class LocaleExport {
   constructor(exportConfig, stackAPIClient) {
     this.stackAPIClient = stackAPIClient;

package/src/lib/export/marketplace-apps.js

@@ -7,7 +7,15 @@ const _ = require('lodash');
 const path = require('path');
 const chalk = require('chalk');
 const mkdirp = require('mkdirp');
-const { cliux, HttpClient, NodeCrypto, managementSDKClient } = require('@contentstack/cli-utilities');
+const {
+  cliux,
+  HttpClient,
+  NodeCrypto,
+  managementSDKClient,
+  HttpClientDecorator,
+  OauthDecorator,
+  isAuthenticated,
+} = require('@contentstack/cli-utilities');
 
 const { formatError } = require('../util');
 const config = require('../../config/default');
@@ -29,7 +37,7 @@ module.exports = class ExportMarketplaceApps {
   }
 
   async start() {
-    if (!this.config.auth_token) {
+    if (!isAuthenticated()) {
       cliux.print(
         'WARNING!!! To export Marketplace apps, you must be logged in. Please check csdx auth:login --help to log in',
         { color: 'yellow' },
@@ -41,10 +49,15 @@ module.exports = class ExportMarketplaceApps {
 
     await this.getOrgUid();
 
-    this.httpClient = new HttpClient().headers({
-      authtoken: this.config.auth_token,
-      organization_uid: this.config.org_uid,
-    });
+    const httpClient = new HttpClient();
+    if (!this.config.auth_token) {
+      this.httpClient = new OauthDecorator(httpClient);
+      const headers = await this.httpClient.preHeadersCheck(this.config);
+      this.httpClient = this.httpClient.headers(headers);
+    } else {
+      this.httpClient = new HttpClientDecorator(httpClient);
+      this.httpClient.headers(this.config);
+    }
 
     log(this.config, 'Starting marketplace app export', 'success');
     this.marketplaceAppPath = path.resolve(
@@ -58,18 +71,16 @@ module.exports = class ExportMarketplaceApps {
   }
 
   async getOrgUid() {
-    if (this.config.auth_token) {
-      const tempAPIClient = await managementSDKClient({ host: this.config.host });
-      const tempStackData = await tempAPIClient
-        .stack({ api_key: this.config.source_stack })
-        .fetch()
-        .catch((error) => {
-          console.log(error);
-        });
-
-      if (tempStackData && tempStackData.org_uid) {
-        this.config.org_uid = tempStackData.org_uid;
-      }
+    const tempAPIClient = await managementSDKClient({ host: this.config.host });
+    const tempStackData = await tempAPIClient
+      .stack({ api_key: this.config.source_stack })
+      .fetch()
+      .catch((error) => {
+        console.log(error);
+      });
+
+    if (tempStackData && tempStackData.org_uid) {
+      this.config.org_uid = tempStackData.org_uid;
     }
   }
 
@@ -138,7 +149,7 @@ module.exports = class ExportMarketplaceApps {
         return listOfApps;
       })
       .catch((error) => {
-        log(self.config, `Failed to export marketplace-apps ${formatError(error)}`, 'error');
+        log(this.config, `Failed to export marketplace-apps ${formatError(error)}`, 'error');
       });
   }
 

package/src/lib/export/stack.js

@@ -10,7 +10,7 @@ const { merge } = require('lodash');
 const helper = require('../util/helper');
 const { addlogs } = require('../util/log');
 const config = require('../../config/default');
-const { managementSDKClient } = require('@contentstack/cli-utilities');
+const { managementSDKClient, isAuthenticated } = require('@contentstack/cli-utilities');
 module.exports = class ExportStack {
   stackConfig = config.modules.stack;
 
@@ -27,7 +27,7 @@ module.exports = class ExportStack {
 
   async start() {
     const self = this;
-    if (self.config.auth_token) {
+    if (isAuthenticated()) {
       const tempAPIClient = await managementSDKClient({ host: config.host });
       const tempStackData = await tempAPIClient
         .stack({ api_key: self.config.source_stack })

package/src/lib/export/webhooks.js

@@ -14,6 +14,7 @@ const { formatError } = require('../util');
 const { addlogs } = require('../util/log');
 const config = require('../../config/default');
 
+// Create folder for environments
 module.exports = class ExportWebhooks {
   config;
   master = {};
@@ -25,8 +26,8 @@ module.exports = class ExportWebhooks {
   webhooksConfig = config.modules.webhooks;
 
   constructor(exportConfig, stackAPIClient) {
-    this.stackAPIClient = stackAPIClient;
     this.config = merge(config, exportConfig);
+    this.stackAPIClient = stackAPIClient;
   }
 
   start() {

package/src/lib/export/workflows.js

@@ -20,8 +20,8 @@ module.exports = class ExportWorkFlows {
   workFlowConfig = config.modules.workflows;
 
   constructor(exportConfig, stackAPIClient) {
-    this.stackAPIClient = stackAPIClient;
     this.config = merge(config, exportConfig);
+    this.stackAPIClient = stackAPIClient;
   }
 
   start() {
@@ -33,7 +33,6 @@ module.exports = class ExportWorkFlows {
       this.config.branchName || '',
       this.workFlowConfig.dirName,
     );
-
     mkdirp.sync(workflowsFolderPath);
 
     return new Promise(function (resolve, reject) {
@@ -103,6 +102,8 @@ module.exports = class ExportWorkFlows {
         deleteItems.forEach((e) => delete workflow[e]);
       }
     } catch (error) {
+      console.log('Error getting workflow data', error && error.message);
+      addlogs(self.config, 'Error fetching workflow data in export workflows task.', 'error');
       throw error;
     }
   }

package/src/lib/util/export-flags.js

@@ -11,14 +11,27 @@ const helper = require('../util/helper');
 let _ = require('lodash');
 const { cliux } = require('@contentstack/cli-utilities');
 
-exports.configWithMToken = async function (config, managementTokens, host, contentTypes, branchName, securedAssets, moduleName) {
+exports.configWithMToken = async (
+  config,
+  managementTokens,
+  host,
+  contentTypes,
+  branchName,
+  securedAssets,
+  moduleName,
+  data,
+  exportCommandFlags,
+) => {
   let externalConfig = require(config);
+  const modules = externalConfig.filteredModules;
+
   defaultConfig.securedAssets = securedAssets;
   defaultConfig.management_token = managementTokens.token;
   defaultConfig.host = host.cma;
   defaultConfig.cdn = host.cda;
   defaultConfig.branchName = branchName;
   defaultConfig.source_stack = managementTokens.apiKey;
+  defaultConfig.isAuthenticated = exportCommandFlags.isAuthenticated;
   if (moduleName) {
     defaultConfig.moduleName = moduleName;
     // Specfic content type setting is only for entries module
@@ -27,25 +40,34 @@ exports.configWithMToken = async function (config, managementTokens, host, conte
     }
   }
   defaultConfig = _.merge(defaultConfig, externalConfig);
+
+  if(!defaultConfig.data) {
+    defaultConfig.data = data
+  }
+
+  if (_.isArray(modules)) {
+    defaultConfig.modules.types = _.filter(defaultConfig.modules.types, (module) => _.includes(modules, module));
+  }
+
   await initial(defaultConfig);
 };
 
-exports.parameterWithMToken = async function (
+exports.parameterWithMToken = async (
   managementTokens,
   data,
   moduleName,
   host,
-  _authToken,
   contentTypes,
   branchName,
   securedAssets,
-) {
+  exportCommandFlags,
+) => {
   defaultConfig.management_token = managementTokens.token;
-  defaultConfig.auth_token = _authToken;
   defaultConfig.host = host.cma;
   defaultConfig.cdn = host.cda;
   defaultConfig.branchName = branchName;
   defaultConfig.securedAssets = securedAssets;
+  defaultConfig.isAuthenticated = exportCommandFlags.isAuthenticated;
   if (!moduleName) {
     defaultConfig.contentTypes = contentTypes;
   } else {
@@ -65,10 +87,10 @@ exports.withoutParameterMToken = async (
   managementTokens,
   moduleName,
   host,
-  _authToken,
   contentTypes,
   branchName,
   securedAssets,
+  exportCommandFlags,
 ) => {
   const stackUid = managementTokens.apiKey;
   const pathOfExport = await cliux.prompt(message.promptMessageList.promptPathStoredData);
@@ -76,8 +98,8 @@ exports.withoutParameterMToken = async (
   defaultConfig.host = host.cma;
   defaultConfig.cdn = host.cda;
   defaultConfig.branchName = branchName;
-  defaultConfig.auth_token = _authToken;
   defaultConfig.securedAssets = securedAssets;
+  defaultConfig.isAuthenticated = exportCommandFlags.isAuthenticated;
   if (moduleName) {
     defaultConfig.moduleName = moduleName;
     // Specfic content type setting is only for entries module
@@ -90,13 +112,21 @@ exports.withoutParameterMToken = async (
   await initial(defaultConfig);
 };
 
-exports.configWithAuthToken = async function (config, _authToken, moduleName, host, contentTypes, branchName, securedAssets) {
-  let externalConfig = helper.readFile(path.resolve(config));
-  defaultConfig.auth_token = _authToken;
+exports.configWithAuthToken = async function (
+  config,
+  moduleName,
+  host,
+  contentTypes,
+  branchName,
+  securedAssets,
+  exportCommandFlags,
+) {
+  let externalConfig = helper.readFileSync(path.resolve(config));
   defaultConfig.host = host.cma;
   defaultConfig.cdn = host.cda;
   defaultConfig.branchName = branchName;
   defaultConfig.securedAssets = securedAssets;
+  defaultConfig.isAuthenticated = exportCommandFlags.isAuthenticated;
   if (moduleName) {
     defaultConfig.moduleName = moduleName;
     // Specfic content type setting is only for entries module
@@ -108,8 +138,7 @@ exports.configWithAuthToken = async function (config, _authToken, moduleName, ho
   await initial(defaultConfig);
 };
 
-exports.parametersWithAuthToken = function (
-  _authToken,
+exports.parametersWithAuthToken = async (
   sourceStack,
   data,
   moduleName,
@@ -117,45 +146,38 @@ exports.parametersWithAuthToken = function (
   contentTypes,
   branchName,
   securedAssets,
-) {
-  return new Promise(async (resolve, reject) => {
-    defaultConfig.auth_token = _authToken;
-    defaultConfig.source_stack = sourceStack;
-    if (moduleName) {
-      defaultConfig.moduleName = moduleName;
-      // Specfic content type setting is only for entries module
-      if (moduleName === 'entries' && Array.isArray(contentTypes) && contentTypes.length > 0) {
-        defaultConfig.contentTypes = contentTypes;
-      }
+  exportCommandFlags,
+) => {
+  defaultConfig.source_stack = sourceStack;
+  defaultConfig.isAuthenticated = exportCommandFlags.isAuthenticated;
+  if (moduleName) {
+    defaultConfig.moduleName = moduleName;
+    // Specfic content type setting is only for entries module
+    if (moduleName === 'entries' && Array.isArray(contentTypes) && contentTypes.length > 0) {
+      defaultConfig.contentTypes = contentTypes;
     }
-    defaultConfig.branchName = branchName;
-    defaultConfig.host = host.cma;
-    defaultConfig.cdn = host.cda;
-    defaultConfig.data = data;
-    defaultConfig.securedAssets = securedAssets;
-    await initial(defaultConfig)
-      .then(() => {
-        return resolve();
-      })
-      .catch((error) => {
-        return reject(error);
-      });
-  });
+  }
+  defaultConfig.branchName = branchName;
+  defaultConfig.host = host.cma;
+  defaultConfig.cdn = host.cda;
+  defaultConfig.data = data;
+  defaultConfig.securedAssets = securedAssets;
+  await initial(defaultConfig);
 };
 
 exports.withoutParametersWithAuthToken = async (
-  _authToken,
   moduleName,
   host,
   contentTypes,
   branchName,
   securedAssets,
+  exportCommandFlags,
 ) => {
   const stackUid = await cliux.prompt(message.promptMessageList.promptSourceStack);
   const pathOfExport = await cliux.prompt(message.promptMessageList.promptPathStoredData);
-  defaultConfig.auth_token = _authToken;
   defaultConfig.source_stack = stackUid;
   defaultConfig.securedAssets = securedAssets;
+  defaultConfig.isAuthenticated = exportCommandFlags.isAuthenticated;
   if (moduleName) {
     defaultConfig.moduleName = moduleName;
     // Specfic content type setting is only for entries module

package/src/lib/util/index.js

@@ -4,12 +4,12 @@
  * MIT Licensed
  */
 
-var _ = require('lodash');
-var defaultConfig = require('../../config/default');
-const chalk = require('chalk');
+const _ = require('lodash');
+const defaultConfig = require('../../config/default');
 const promiseLimit = require('promise-limit');
+const { isAuthenticated } = require('@contentstack/cli-utilities');
 
-exports.validateConfig = function (config) {
+exports.validateConfig = (config) => {
   if (!config.host || !config.cdn) {
     throw new Error('Host/CDN end point is missing from config');
   }
@@ -22,7 +22,7 @@ exports.validateConfig = function (config) {
     !config.management_token &&
     config.source_stack &&
     !config.access_token &&
-    !config.auth_token
+    !isAuthenticated()
   ) {
     throw new Error('Kindly provide management_token or email and password');
   } else if (
@@ -31,7 +31,7 @@ exports.validateConfig = function (config) {
     !config.access_token &&
     config.source_stack &&
     !config.management_token &&
-    !config.auth_token
+    !isAuthenticated()
   ) {
     throw new Error('Kindly provide access_token or management_token');
   } else if (!config.email && !config.password && config.preserveStackVersion) {

package/src/lib/util/login.js

@@ -9,7 +9,7 @@
 
 const chalk = require('chalk');
 const { addlogs } = require('../util/log');
-const { managementSDKClient } = require('@contentstack/cli-utilities');
+const { managementSDKClient, isAuthenticated } = require('@contentstack/cli-utilities');
 
 module.exports.login = (config) => {
   return new Promise((resolve, reject) => {
@@ -22,11 +22,10 @@ module.exports.login = (config) => {
             .then((response) => {
               // eslint-disable-next-line no-console
               console.log(chalk.green('Contentstack account authenticated successfully!'));
-              config.authtoken = response.user.authtoken;
               config.headers = {
                 api_key: config.source_stack,
                 access_token: config.access_token,
-                authtoken: config.authtoken,
+                authtoken: response.user.authtoken,
                 'X-User-Agent': 'contentstack-export/v',
               };
               resolve(config);
@@ -34,7 +33,7 @@ module.exports.login = (config) => {
             .catch((error) => {
               reject(error);
             });
-        } else if (config.auth_token && !config.management_token) {
+        } else if (isAuthenticated() && !config.management_token) {
           const stackAPIClient = APIClient.stack({
             api_key: config.source_stack,
             management_token: config.management_token,

package/src/lib/util/setup-branches.js

@@ -1,16 +1,19 @@
 const mkdirp = require('mkdirp');
 const path = require('path');
 const helper = require('./helper');
+const {isAuthenticated, configHandler} = require('@contentstack/cli-utilities')
 
 const setupBranches = async (config, branch, stackAPIClient) => {
   if (typeof config !== 'object') {
     throw new Error('Invalid config to setup the branch');
   }
+
   let branches = [];
+
   const headers = { api_key: config.source_stack };
 
-  if (config.auth_token) {
-    headers['authtoken'] = config.auth_token;
+  if (isAuthenticated()) {
+    headers['authtoken'] = configHandler.get('authtoken');
   } else if (config.management_token) {
     headers['authorization'] = config.management_token;
   }