Merge staging to main

packages/contentstack-auth/README.md

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-auth/1.3.11 darwin-x64 node-v18.12.1
+@contentstack/cli-auth/1.3.12 darwin-arm64 node-v18.16.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-auth/messages/index.json

@@ -1,4 +1,5 @@
 {
+  "CLI_AUTH_LOGIN_ASK_CHANNEL_FOR_OTP": "Please select OTP channel",
   "CLI_AUTH_LOGIN_ENTER_EMAIL_ADDRESS": "Enter your email address",
   "CLI_AUTH_LOGIN_ENTER_PASSWORD": "Enter your password",
   "CLI_AUTH_LOGIN_SUCCESS": "Successfully logged in!!",

packages/contentstack-auth/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-auth",
   "description": "Contentstack CLI plugin for authentication activities",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -22,8 +22,8 @@
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
   },
   "dependencies": {
-    "@contentstack/cli-command": "^1.2.10",
-    "@contentstack/cli-utilities": "^1.5.0",
+    "@contentstack/cli-command": "^1.2.11",
+    "@contentstack/cli-utilities": "^1.5.1",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",
     "inquirer": "8.2.4",

packages/contentstack-auth/src/commands/auth/tokens/add.ts

@@ -2,16 +2,14 @@ import { Command } from '@contentstack/cli-command';
 import {
   logger,
   cliux,
-  CLIError,
   configHandler,
   printFlagDeprecation,
   flags,
-  managementSDKClient,
   FlagInput,
+  HttpClient,
+  messageHandler,
 } from '@contentstack/cli-utilities';
 import { askTokenType } from '../../../utils/interactive';
-import { tokenValidation } from '../../../utils';
-
 export default class TokensAddCommand extends Command {
   static description = 'Adds management/delivery tokens to your session to use it with other CLI commands';
 
@@ -130,39 +128,6 @@ export default class TokensAddCommand extends Command {
         token = await cliux.inquire({ type: 'input', message: 'CLI_AUTH_TOKENS_ADD_ENTER_TOKEN', name: 'token' });
       }
 
-      const managementAPIClient = await managementSDKClient({ host: this.cmaHost });
-
-      let doBranchesExistInPlan: boolean = false;
-
-      if (isManagement && apiKey && token) {
-        await managementAPIClient
-          .stack({ api_key: apiKey, management_token: token })
-          .branch()
-          .query()
-          .find()
-          .then(() => (doBranchesExistInPlan = true))
-          .catch((err) => {
-            if (err.errorCode && err.errorMessage && branch) {
-              throw new Error(err.errorMessage);
-            }
-          });
-      } else {
-        if (!apiKey) {
-          throw new Error('Api key is required');
-        }
-        if (!token) {
-          throw new Error('Token is required');
-        }
-      }
-
-      if (doBranchesExistInPlan && !branch) {
-        branch = await cliux.inquire({
-          type: 'input',
-          message: 'CLI_AUTH_ENTER_BRANCH',
-          name: 'branch',
-        });
-      }
-
       if (isDelivery && !environment) {
         environment = await cliux.inquire({
           type: 'input',
@@ -171,31 +136,18 @@ export default class TokensAddCommand extends Command {
         });
       }
 
-      let tokenValidationResult;
-
-      if (type === 'delivery') {
-        branch = branch || 'main';
-        tokenValidationResult = await tokenValidation.validateDeliveryToken(
-          this.deliveryAPIClient,
-          apiKey,
-          token,
-          environment,
-          this.region.name,
-          this.cdaHost,
-          branch,
-        );
-      } else if (type === 'management') {
-        tokenValidationResult = await tokenValidation.validateManagementToken(
-          managementAPIClient,
-          apiKey,
-          token,
-          doBranchesExistInPlan ? branch : null,
-        );
-      }
-      if (!tokenValidationResult.valid) {
-        throw new CLIError(tokenValidationResult.message);
-      }
+      if (type === 'management') {
+        // FIXME - Once the SDK refresh token issue is resolved, need to revert this back to SDK call
+        const httpClient = new HttpClient({ headers: { api_key: apiKey, authorization: token } });
 
+        const response = (await httpClient.get(`https://${this.cmaHost}/v3/environments?limit=1`)).data;
+
+        if (response?.error_code === 105) {
+          throw new Error(messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_MANAGEMENT_TOKEN'));
+        } else if (response?.error_message) {
+          throw new Error(response.error_message);
+        }
+      }
       if (isManagement) {
         configHandler.set(`${configKeyTokens}.${alias}`, { token, apiKey, type });
       } else {
@@ -210,7 +162,7 @@ export default class TokensAddCommand extends Command {
     } catch (error) {
       logger.error('token add error', error.message);
       cliux.print('CLI_AUTH_TOKENS_ADD_FAILED', { color: 'yellow' });
-      cliux.print(error.message.message ? error.message.message : error.message, { color: 'red' });
+      cliux.error(error.message.message ? error.message.message : error.message);
     }
   }
 }

packages/contentstack-auth/src/utils/tokens-validation.ts

@@ -1,66 +1,5 @@
 import { messageHandler, logger } from '@contentstack/cli-utilities';
 
-/**
- * Validate delivery token
- * @param contentStackClient
- * @param apiKey
- * @param deliveryToken
- * @param environment
- * @param region
- * @returns
- */
-export const validateDeliveryToken = async (
-  contentStackClient: any,
-  apiKey: string,
-  deliveryToken: string,
-  environment: string,
-  region: string,
-  host: string,
-  branch: string,
-): Promise<any> => {
-  let result: { valid: boolean; message: string };
-  try {
-    const regionMap = {
-      EU: 'eu',
-      NA: 'us',
-      AZURE_NA: 'azure-na',
-      AZURE_EU: 'azure-eu',
-    };
-
-    const stack = contentStackClient.Stack({
-      api_key: apiKey,
-      delivery_token: deliveryToken,
-      environment,
-      region: regionMap[region],
-      host,
-      branch,
-    });
-
-    const parsedHost = host.replace(/^https?:\/\//, '');
-    stack.setHost(parsedHost);
-    const deliveryTokenResult = await stack.getContentTypes({ limit: 1 });
-
-    logger.debug('delivery token validation result', deliveryTokenResult);
-    if (deliveryTokenResult?.content_types) {
-      result = { valid: true, message: deliveryTokenResult };
-    } else {
-      result = { valid: false, message: messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_DELIVERY_TOKEN') };
-    }
-  } catch (error) {
-    logger.debug('validate delivery token error', error);
-    if (error.error_code === 109) {
-      result = { valid: false, message: messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_API_KEY') };
-    } else if (error.error_code === 141) {
-      result = { valid: false, message: messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_ENVIRONMENT_NAME') };
-    } else if (error?.error_code) {
-      throw new Error(error?.error_message);
-    } else {
-      result = { valid: false, message: messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_DELIVERY_TOKEN') };
-    }
-  }
-  return result;
-};
-
 /**
  * Validate environment
  * @param contentStackClient
@@ -75,7 +14,7 @@ export const validateEnvironment = async (
 ): Promise<any> => {
   let result: { valid: boolean; message: string };
   try {
-    const validationResult = await contentStackClient.stack({ api_key: apiKey }).environment(environment).fetch();
+    const validationResult = await contentStackClient.Stack({ api_key: apiKey }).environment(environment).fetch();
     logger.debug('environment validation result', validationResult);
     if (validationResult.name === environment) {
       result = { valid: true, message: validationResult };
@@ -89,46 +28,6 @@ export const validateEnvironment = async (
   return result;
 };
 
-/**
- * Validate management token
- * @param contentStackClient
- * @param apiKey
- * @param managementToken
- * @returns { valid: boolean; message: any }
- * Note: Fetching one content type using the management token to check whether it is valid or not
- */
-export const validateManagementToken = async (
-  contentStackClient: any,
-  apiKey: string,
-  managementToken: string,
-  branch: string,
-): Promise<any> => {
-  let result: { valid: boolean; message: string };
-  try {
-    const validationResuslt = await contentStackClient.axiosInstance.get('/content_types?limit=1&include_branch=true', {
-      headers: { api_key: apiKey, authorization: managementToken, branch },
-    });
-
-    logger.debug('Management validation result', validationResuslt);
-    if (validationResuslt.status === 200) {
-      result = { valid: true, message: validationResuslt };
-    } else {
-      result = { valid: false, message: messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_MANAGEMENT_TOKEN') };
-    }
-  } catch (error) {
-    logger.error('Failed to validate management token', error);
-    if (error.response && error.response.status === 401) {
-      result = { valid: false, message: messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_MANAGEMENT_TOKEN') };
-    }
-    if (error?.response?.data) {
-      throw new Error(error.response.data?.error_message);
-    } else {
-      result = { valid: false, message: messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_API_KEY') };
-    }
-  }
-  return result;
-};
-
 /**
  * Validate API key
  * @param contentStackClient

packages/contentstack-bootstrap/README.md

@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-bootstrap/1.4.12 darwin-x64 node-v18.12.1
+@contentstack/cli-cm-bootstrap/1.4.13 darwin-arm64 node-v18.16.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -45,9 +45,10 @@ Bootstrap contentstack apps
 ```
 USAGE
   $ csdx cm:bootstrap [--app-name <value>] [--project-dir <value>] [-k <value> | --org <value> | -n <value>] [-y
-    <value>]
+    <value>] [-a <value>]
 
 FLAGS
+  -a, --alias=<value>          Alias of the management token
   -k, --stack-api-key=<value>  Provide stack API key to seed content
   -n, --stack-name=<value>     Name of a new stack that will be created.
   -y, --yes=<value>            [Optional] Skip stack confirmation

packages/contentstack-bootstrap/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-bootstrap",
   "description": "Bootstrap contentstack apps",
-  "version": "1.4.12",
+  "version": "1.4.13",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -17,9 +17,9 @@
     "test:report": "nyc --reporter=lcov mocha \"test/**/*.test.js\""
   },
   "dependencies": {
-    "@contentstack/cli-cm-seed": "^1.4.12",
-    "@contentstack/cli-command": "^1.2.10",
-    "@contentstack/cli-utilities": "^1.5.0",
+    "@contentstack/cli-cm-seed": "^1.4.13",
+    "@contentstack/cli-command": "^1.2.11",
+    "@contentstack/cli-utilities": "^1.5.1",
     "inquirer": "8.2.4",
     "mkdirp": "^1.0.4",
     "tar": "^6.1.13"
@@ -73,4 +73,4 @@
     }
   },
   "repository": "contentstack/cli"
-}
+}

packages/contentstack-bootstrap/src/bootstrap/index.ts

@@ -26,6 +26,8 @@ export interface SeedParams {
   org?: string;
   stackName?: string;
   yes?: string;
+  managementTokenAlias?: string | undefined;
+  managementToken?: string | undefined;
 }
 
 /**
@@ -62,7 +64,7 @@ export default class Bootstrap {
   }
 
   async run(): Promise<any> {
-    cliux.loader(messageHandler.parse('CLI_BOOTSTRAP_START_CLONE_APP'))
+    cliux.loader(messageHandler.parse('CLI_BOOTSTRAP_START_CLONE_APP'));
 
     try {
       await this.ghClient.getLatest(this.cloneDirectory);
@@ -79,35 +81,40 @@ export default class Bootstrap {
 
     // seed plugin start
     try {
-      const cmd = ['--repo', this.appConfig.stack]
+      const cmd = ['--repo', this.appConfig.stack];
       if (this.options.seedParams.stackAPIKey) {
-        cmd.push('--stack-api-key', this.options.seedParams.stackAPIKey)
+        cmd.push('--stack-api-key', this.options.seedParams.stackAPIKey);
       }
       if (this.options.seedParams.org) {
-        cmd.push('--org', this.options.seedParams.org)
+        cmd.push('--org', this.options.seedParams.org);
       }
       if (this.options.seedParams.stackName) {
-        cmd.push('-n', this.options.seedParams.stackName)
+        cmd.push('-n', this.options.seedParams.stackName);
       }
       if (this.options.seedParams.yes) {
         cmd.push('-y', this.options.seedParams.yes);
       }
+      if (this.options.seedParams.managementTokenAlias) {
+        cmd.push('--alias', this.options.seedParams.managementTokenAlias);
+      }
+
       const result = await ContentStackSeed.run(cmd);
-      if ( result && result.api_key) {
+      if (result && result.api_key) {
         await setupEnvironments(
           this.managementAPIClient,
           result.api_key,
           this.appConfig,
           this.cloneDirectory,
           this.region,
           this.options.livePreviewEnabled as boolean,
+          this.options.seedParams.managementToken as string,
         );
       } else {
         throw new Error(messageHandler.parse('CLI_BOOTSTRAP_NO_API_KEY_FOUND'));
       }
-      cliux.print(messageHandler.parse('CLI_BOOTSTRAP_SUCCESS'))
+      cliux.print(messageHandler.parse('CLI_BOOTSTRAP_SUCCESS'));
     } catch (error) {
-      cliux.error(messageHandler.parse('CLI_BOOTSTRAP_STACK_CREATION_FAILED', this.appConfig.stack))
+      cliux.error(messageHandler.parse('CLI_BOOTSTRAP_STACK_CREATION_FAILED', this.appConfig.stack));
     }
   }
 }