@contentstack/cli-cm-import 1.4.0 → 1.5.1

package/README.md

@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/1.4.0 linux-x64 node-v16.19.1
+@contentstack/cli-cm-import/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:import": {
       "id": "cm:stacks:import",

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into 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/config": "^1.18.3",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
@@ -50,13 +50,9 @@
     "prepack": "oclif manifest && oclif readme",
     "test": "nyc mocha --forbid-only \"test/**/*.test.js\"",
     "version": "oclif readme && git add README.md",
+    "test:integration": "mocha --forbid-only \"test/run.test.js\" --integration-test --timeout 60000",
     "clean": "rm -rf ./node_modules tsconfig.build.tsbuildinfo"
   },
-  "csdxConfig": {
-    "expiredCommands": {
-      "cm:import": "csdx cm:stacks:import"
-    }
-  },
   "main": "./src/commands/cm/stacks/import.js",
   "license": "MIT",
   "oclif": {
@@ -64,5 +60,14 @@
     "bin": "csdx",
     "repositoryPrefix": "<%- repo %>/blob/main/packages/contentstack-import/<%- commandPath %>"
   },
+  "csdxConfig": {
+    "expiredCommands": {
+      "cm:import": "csdx cm:stacks:import"
+    },
+    "shortCommandName": {
+      "cm:stacks:import": "IMPRT",
+      "cm:import": "O-IMPRT"
+    }
+  },
   "repository": "https://github.com/contentstack/cli"
 }

package/src/app.js

@@ -11,7 +11,7 @@ const chalk = require('chalk');
 const util = require('./lib/util/index');
 const login = require('./lib/util/login');
 const { addlogs } = require('./lib/util/log');
-const { managementSDKClient } = require('@contentstack/cli-utilities');
+const { managementSDKClient, isAuthenticated } = require('@contentstack/cli-utilities');
 
 exports.initial = (configData) => {
   return new Promise(async (resolve, reject) => {
@@ -58,10 +58,16 @@ exports.initial = (configData) => {
     };
 
     if (config) {
-      if ((config.email && config.password) || config.auth_token) {
-        login(config).then(backupAndImportData(APIClient, stackAPIClient)).catch(reject);
-      } else if (config.management_token) {
+      if (config.management_token || config.isAuthenticated) {
         await backupAndImportData(APIClient, stackAPIClient);
+      } else if ((config.email && config.password) || isAuthenticated()) {
+        login(config).then(backupAndImportData(APIClient, stackAPIClient)).catch(reject);
+      } else if (config.email && config.password) {
+        login(config)
+          .then(backupAndImportData.apply(null, [APIClient, stackAPIClient]))
+          .catch(reject);
+      } else {
+        reject('Kindly login or provide management_token');
       }
     }
   });

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

@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const defaultConfig = require('../../../config/default');
 const { Command } = require('@contentstack/cli-command');
-const { configHandler, flags, printFlagDeprecation } = require('@contentstack/cli-utilities');
+const { flags, printFlagDeprecation, isAuthenticated } = require('@contentstack/cli-utilities');
 const {
   configWithMToken,
   parameterWithMToken,
@@ -21,12 +21,12 @@ class ImportCommand extends Command {
     const moduleName = importCommandFlags.module;
     const backupdir = importCommandFlags['backup-dir'];
     const alias = importCommandFlags['alias'] || importCommandFlags['management-token-alias'];
-    let _authToken = configHandler.get('authtoken');
     importCommandFlags.branchName = importCommandFlags.branch;
     importCommandFlags.importWebhookStatus = importCommandFlags['import-webhook-status'];
     delete importCommandFlags.branch;
     delete importCommandFlags['import-webhook-status'];
     let host = self.cmaHost;
+    importCommandFlags['isAuthenticated'] = isAuthenticated();
 
     return new Promise((resolve, reject) => {
       if (data) {
@@ -41,58 +41,27 @@ class ImportCommand extends Command {
         if (managementTokens) {
           let result;
 
-          if ((extConfig && _authToken) || alias) {
-            result = configWithMToken(
-              extConfig,
-              managementTokens,
-              moduleName,
-              host,
-              _authToken,
-              backupdir,
-              importCommandFlags,
-            );
+          if ((extConfig && isAuthenticated()) || alias) {
+            result = configWithMToken(extConfig, managementTokens, moduleName, host, backupdir, importCommandFlags);
           } else if (data) {
-            result = parameterWithMToken(
-              managementTokens,
-              data,
-              moduleName,
-              host,
-              _authToken,
-              backupdir,
-              importCommandFlags,
-            );
+            result = parameterWithMToken(managementTokens, data, moduleName, host, backupdir, importCommandFlags);
           } else {
-            result = withoutParameterMToken(
-              managementTokens,
-              moduleName,
-              host,
-              _authToken,
-              backupdir,
-              importCommandFlags,
-            );
+            result = withoutParameterMToken(managementTokens, moduleName, host, backupdir, importCommandFlags);
           }
 
           result.then(resolve).catch(reject);
         } else {
           console.log('management Token is not present please add managment token first');
         }
-      } else if (_authToken) {
+      } else if (isAuthenticated()) {
         let result;
 
         if (extConfig) {
-          result = configWithAuthToken(extConfig, _authToken, moduleName, host, backupdir, importCommandFlags);
+          result = configWithAuthToken(extConfig, moduleName, host, backupdir, importCommandFlags);
         } else if (targetStack && data) {
-          result = parametersWithAuthToken(
-            _authToken,
-            targetStack,
-            data,
-            moduleName,
-            host,
-            backupdir,
-            importCommandFlags,
-          );
+          result = parametersWithAuthToken(targetStack, data, moduleName, host, backupdir, importCommandFlags);
         } else {
-          result = withoutParametersWithAuthToken(_authToken, moduleName, host, backupdir, importCommandFlags);
+          result = withoutParametersWithAuthToken(moduleName, host, backupdir, importCommandFlags);
         }
 
         result.then(resolve).catch(reject);

package/src/lib/import/content-types.js

@@ -127,7 +127,7 @@ class ContentTypesImport {
     try {
       await this.stackAPIClient.contentType().create(requestObject.json);
     } catch (error) {
-      if (error.error_code === 115 && (error.errors.uid || error.errors.title)) {
+      if (error.errorCode === 115 && (error.errors.uid || error.errors.title)) {
         // content type uid already exists
         // _.remove(self.contentTypes, { uid: uid });
         return true;

package/src/lib/import/entries.js

@@ -1007,7 +1007,7 @@ module.exports = class ImportEntries {
         addlogs(this.config, 'field_rules is not available', 'error');
       }
 
-      self.stackAPIClient
+      this.stackAPIClient
         .contentType(schema.uid)
         .fetch()
         .then((contentTypeResponse) => {

package/src/lib/import/locales.js

@@ -70,7 +70,7 @@ module.exports = class ImportLanguages {
       let langUids = Object.keys(self.languages);
       return Promise.map(
         langUids,
-        function (langUid) {
+        (langUid) => {
           let lang = self.languages[langUid];
           if (!self.langUidMapper.hasOwnProperty(langUid) && lang.code !== self.masterLanguage) {
             let requestOption = {

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

@@ -8,8 +8,15 @@ const _ = require('lodash');
 const path = require('path');
 const chalk = require('chalk');
 const mkdirp = require('mkdirp');
-const contentstack = require('@contentstack/management');
-const { cliux, HttpClient, NodeCrypto, managementSDKClient } = require('@contentstack/cli-utilities');
+const {
+  cliux,
+  HttpClient,
+  NodeCrypto,
+  managementSDKClient,
+  isAuthenticated,
+  HttpClientDecorator,
+  OauthDecorator,
+} = require('@contentstack/cli-utilities');
 
 const { formatError } = require('../util');
 let config = require('../../config/default');
@@ -44,7 +51,7 @@ module.exports = class ImportMarketplaceApps {
 
     if (_.isEmpty(this.marketplaceApps)) {
       return Promise.resolve();
-    } else if (!this.config.auth_token) {
+    } else if (!isAuthenticated()) {
       cliux.print(
         '\nWARNING!!! To import Marketplace apps, you must be logged in. Please check csdx auth:login --help to log in\n',
         { color: 'yellow' },
@@ -53,16 +60,19 @@ module.exports = class ImportMarketplaceApps {
     }
 
     this.developerHubBaseUrl = this.config.developerHubBaseUrl || (await getDeveloperHubUrl(this.config));
-    this.client = contentstack.client({ authtoken: this.config.auth_token, endpoint: this.developerHubBaseUrl });
+    this.client = await managementSDKClient({ endpoint: this.developerHubBaseUrl });
 
     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);
+    }
 
     if (!fs.existsSync(this.mapperDirPath)) {
       mkdirp.sync(this.mapperDirPath);
@@ -72,18 +82,16 @@ module.exports = class ImportMarketplaceApps {
   }
 
   async getOrgUid() {
-    if (this.config.auth_token) {
-      const tempAPIClient = await managementSDKClient({ host: this.config.host });
-      const tempStackData = await tempAPIClient
-        .stack({ api_key: this.config.target_stack })
-        .fetch()
-        .catch((error) => {
-          console.log(error);
-        });
+    const tempAPIClient = await managementSDKClient({ host: this.config.host });
+    const tempStackData = await tempAPIClient
+      .stack({ api_key: this.config.target_stack })
+      .fetch()
+      .catch((error) => {
+        console.log(error);
+      });
 
-      if (tempStackData && tempStackData.org_uid) {
-        this.config.org_uid = tempStackData.org_uid;
-      }
+    if (tempStackData && tempStackData.org_uid) {
+      this.config.org_uid = tempStackData.org_uid;
     }
   }
 
@@ -288,7 +296,7 @@ module.exports = class ImportMarketplaceApps {
       } else {
         log(this.config, formatError(message), 'error');
 
-        if (this.config.forceStopMarketplaceAppsPrompt) return resolve();
+        if (this.config.forceStopMarketplaceAppsPrompt) return Promise.resolve();
 
         if (
           await cliux.confirm(
@@ -297,7 +305,7 @@ module.exports = class ImportMarketplaceApps {
             ),
           )
         ) {
-          resolve();
+          Promise.resolve();
         } else {
           process.exit();
         }
@@ -386,9 +394,9 @@ module.exports = class ImportMarketplaceApps {
         .catch((error) => error);
 
       if (installation.installation_uid) {
-        let appName = (this.appNameMapping[app.manifest.name]) ? 
-          this.appNameMapping[app.manifest.name] : 
-        app.manifest.name ;
+        let appName = this.appNameMapping[app.manifest.name]
+          ? this.appNameMapping[app.manifest.name]
+          : app.manifest.name;
         log(this.config, `${appName} app installed successfully.!`, 'success');
         await this.makeRedirectUrlCall(installation, app.manifest.name);
         this.installationUidMapping[app.uid] = installation.installation_uid;

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

@@ -14,7 +14,6 @@ exports.configWithMToken = function (
   managementTokens,
   moduleName,
   host,
-  _authToken,
   backupdir,
   importCommandFlags,
 ) {
@@ -31,6 +30,7 @@ exports.configWithMToken = function (
     defaultConfig.target_stack = managementTokens.apiKey;
     defaultConfig.management_token = managementTokens.token;
     defaultConfig.importWebhookStatus = importCommandFlags.importWebhookStatus;
+    defaultConfig.isAuthenticated = importCommandFlags.isAuthenticated;
 
     if (moduleName && moduleName !== undefined) {
       defaultConfig.moduleName = moduleName;
@@ -40,12 +40,11 @@ exports.configWithMToken = function (
       defaultConfig.useBackedupDir = backupdir;
     }
 
-    defaultConfig.auth_token = _authToken;
     defaultConfig = _.merge(defaultConfig, externalConfig);
 
-    if(!defaultConfig.data) {
+    if (!defaultConfig.data) {
       const exporteddata = await cliux.prompt(message.promptMessageList.promptPathStoredData);
-      defaultConfig.data = exporteddata
+      defaultConfig.data = exporteddata;
     }
 
     if (_.isArray(modules)) {
@@ -61,16 +60,15 @@ exports.parameterWithMToken = function (
   data,
   moduleName,
   host,
-  _authToken,
   backupdir,
   importCommandFlags,
 ) {
   return new Promise(async function (resolve, reject) {
     defaultConfig.management_token = managementTokens.token;
     defaultConfig.target_stack = managementTokens.apiKey;
-    defaultConfig.auth_token = _authToken;
     defaultConfig.branchName = importCommandFlags.branchName;
     defaultConfig.importWebhookStatus = importCommandFlags.importWebhookStatus;
+    defaultConfig.isAuthenticated = importCommandFlags.isAuthenticated;
     if (moduleName && moduleName !== undefined) {
       defaultConfig.moduleName = moduleName;
     }
@@ -88,7 +86,6 @@ exports.withoutParameterMToken = async (
   managementTokens,
   moduleName,
   host,
-  _authToken,
   backupdir,
   importCommandFlags,
 ) => {
@@ -96,9 +93,9 @@ exports.withoutParameterMToken = async (
     const exporteddata = await cliux.prompt(message.promptMessageList.promptPathStoredData);
     defaultConfig.management_token = managementTokens.token;
     defaultConfig.target_stack = managementTokens.apiKey;
-    defaultConfig.auth_token = _authToken;
     defaultConfig.branchName = importCommandFlags.branchName;
     defaultConfig.importWebhookStatus = importCommandFlags.importWebhookStatus;
+    defaultConfig.isAuthenticated = importCommandFlags.isAuthenticated;
     if (moduleName && moduleName !== undefined) {
       defaultConfig.moduleName = moduleName;
     }
@@ -111,12 +108,12 @@ exports.withoutParameterMToken = async (
   });
 };
 
-exports.configWithAuthToken = function (config, _authToken, moduleName, host, backupdir, importCommandFlags) {
+exports.configWithAuthToken = function (config, moduleName, host, backupdir, importCommandFlags) {
   return new Promise(async function (resolve, reject) {
     let externalConfig = require(config);
-    defaultConfig.auth_token = _authToken;
     defaultConfig.branchName = importCommandFlags.branchName;
     defaultConfig.importWebhookStatus = importCommandFlags.importWebhookStatus;
+    defaultConfig.isAuthenticated = importCommandFlags.isAuthenticated;
     if (moduleName && moduleName !== undefined) {
       defaultConfig.moduleName = moduleName;
     }
@@ -133,14 +130,13 @@ exports.configWithAuthToken = function (config, _authToken, moduleName, host, ba
     defaultConfig = _.merge(defaultConfig, externalConfig);
     if (!defaultConfig.data) {
       const exporteddata = await cliux.prompt(message.promptMessageList.promptPathStoredData);
-      defaultConfig.data = exporteddata
+      defaultConfig.data = exporteddata;
     }
     initial(defaultConfig).then(resolve).catch(reject);
   });
 };
 
 exports.parametersWithAuthToken = function (
-  _authToken,
   targetStack,
   data,
   moduleName,
@@ -149,10 +145,10 @@ exports.parametersWithAuthToken = function (
   importCommandFlags,
 ) {
   return new Promise(async function (resolve, reject) {
-    defaultConfig.auth_token = _authToken;
     defaultConfig.target_stack = targetStack;
     defaultConfig.branchName = importCommandFlags.branchName;
     defaultConfig.importWebhookStatus = importCommandFlags.importWebhookStatus;
+    defaultConfig.isAuthenticated = importCommandFlags.isAuthenticated;
     if (moduleName && moduleName !== undefined && backupdir === undefined) {
       defaultConfig.moduleName = moduleName;
     } else if (moduleName && moduleName !== undefined && backupdir !== undefined) {
@@ -168,15 +164,15 @@ exports.parametersWithAuthToken = function (
   });
 };
 
-exports.withoutParametersWithAuthToken = async (_authToken, moduleName, host, backupdir, importCommandFlags) => {
+exports.withoutParametersWithAuthToken = async (moduleName, host, backupdir, importCommandFlags) => {
   return new Promise(async function (resolve, reject) {
     const stackUid = await cliux.prompt(message.promptMessageList.promptTargetStack);
     const exporteddata = await cliux.prompt(message.promptMessageList.promptPathStoredData);
-    defaultConfig.auth_token = _authToken;
     defaultConfig.target_stack = stackUid;
     defaultConfig.data = exporteddata;
     defaultConfig.branchName = importCommandFlags.branchName;
     defaultConfig.importWebhookStatus = importCommandFlags.importWebhookStatus;
+    defaultConfig.isAuthenticated = importCommandFlags.isAuthenticated;
     if (moduleName && moduleName !== undefined && backupdir === undefined) {
       defaultConfig.moduleName = moduleName;
     } else if (moduleName && moduleName !== undefined && backupdir !== undefined) {

package/src/lib/util/index.js

@@ -6,7 +6,7 @@
  */
 
 const _ = require('lodash');
-const { HttpClient, managementSDKClient } = require('@contentstack/cli-utilities');
+const { HttpClient, managementSDKClient, isAuthenticated } = require('@contentstack/cli-utilities');
 const fs = require('./fs');
 const path = require('path');
 const chalk = require('chalk');
@@ -33,7 +33,7 @@ exports.validateConfig = (importConfig) => {
     !importConfig.password &&
     !importConfig.management_token &&
     importConfig.target_stack &&
-    !importConfig.auth_token
+    !isAuthenticated()
   ) {
     addlogs(importConfig, chalk.red('Kindly provide management_token or email and password'), 'error');
     return 'error';

package/src/lib/util/login.js

@@ -8,7 +8,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 = (config) => {
   return new Promise((resolve, reject) => {
@@ -21,10 +21,9 @@ module.exports = (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.target_stack,
-                authtoken: config.authtoken,
+                authtoken: response.user.authtoken,
                 'X-User-Agent': 'contentstack-import/v',
               };
               return resolve(config);
@@ -32,7 +31,7 @@ module.exports = (config) => {
             .catch(reject);
         } else if (config.management_token) {
           return resolve();
-        } else if (config.auth_token) {
+        } else if (isAuthenticated()) {
           const stackAPIClient = APIClient.stack({
             api_key: config.target_stack,
             management_token: config.management_token,