@contentstack/cli-auth 1.3.10 → 1.3.12

package/README.md

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-auth/1.3.10 linux-x64 node-v16.20.1
+@contentstack/cli-auth/1.3.12 linux-x64 node-v18.17.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/commands/auth/tokens/add.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const cli_command_1 = require("@contentstack/cli-command");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const interactive_1 = require("../../../utils/interactive");
-const utils_1 = require("../../../utils");
 class TokensAddCommand extends cli_command_1.Command {
     async run() {
         // @ts-ignore
@@ -48,36 +47,6 @@ class TokensAddCommand extends cli_command_1.Command {
             if (!token) {
                 token = await cli_utilities_1.cliux.inquire({ type: 'input', message: 'CLI_AUTH_TOKENS_ADD_ENTER_TOKEN', name: 'token' });
             }
-            const managementAPIClient = await (0, cli_utilities_1.managementSDKClient)({ host: this.cmaHost });
-            let doBranchesExistInPlan = 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 cli_utilities_1.cliux.inquire({
-                    type: 'input',
-                    message: 'CLI_AUTH_ENTER_BRANCH',
-                    name: 'branch',
-                });
-            }
             if (isDelivery && !environment) {
                 environment = await cli_utilities_1.cliux.inquire({
                     type: 'input',
@@ -85,16 +54,16 @@ class TokensAddCommand extends cli_command_1.Command {
                     name: 'env',
                 });
             }
-            let tokenValidationResult;
-            if (type === 'delivery') {
-                branch = branch || 'main';
-                tokenValidationResult = await utils_1.tokenValidation.validateDeliveryToken(this.deliveryAPIClient, apiKey, token, environment, this.region.name, this.cdaHost, branch);
-            }
-            else if (type === 'management') {
-                tokenValidationResult = await utils_1.tokenValidation.validateManagementToken(managementAPIClient, apiKey, token, doBranchesExistInPlan ? branch : null);
-            }
-            if (!tokenValidationResult.valid) {
-                throw new cli_utilities_1.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 cli_utilities_1.HttpClient({ headers: { api_key: apiKey, authorization: token } });
+                const response = (await httpClient.get(`https://${this.cmaHost}/v3/environments?limit=1`)).data;
+                if ((response === null || response === void 0 ? void 0 : response.error_code) === 105) {
+                    throw new Error(cli_utilities_1.messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_MANAGEMENT_TOKEN'));
+                }
+                else if (response === null || response === void 0 ? void 0 : response.error_message) {
+                    throw new Error(response.error_message);
+                }
             }
             if (isManagement) {
                 cli_utilities_1.configHandler.set(`${configKeyTokens}.${alias}`, { token, apiKey, type });
@@ -112,7 +81,7 @@ class TokensAddCommand extends cli_command_1.Command {
         catch (error) {
             cli_utilities_1.logger.error('token add error', error.message);
             cli_utilities_1.cliux.print('CLI_AUTH_TOKENS_ADD_FAILED', { color: 'yellow' });
-            cli_utilities_1.cliux.print(error.message.message ? error.message.message : error.message, { color: 'red' });
+            cli_utilities_1.cliux.error(error.message.message ? error.message.message : error.message);
         }
     }
 }

package/lib/utils/tokens-validation.d.ts

@@ -1,13 +1,3 @@
-/**
- * Validate delivery token
- * @param contentStackClient
- * @param apiKey
- * @param deliveryToken
- * @param environment
- * @param region
- * @returns
- */
-export declare const validateDeliveryToken: (contentStackClient: any, apiKey: string, deliveryToken: string, environment: string, region: string, host: string, branch: string) => Promise<any>;
 /**
  * Validate environment
  * @param contentStackClient
@@ -16,15 +6,6 @@ export declare const validateDeliveryToken: (contentStackClient: any, apiKey: st
  * @returns
  */
 export declare const validateEnvironment: (contentStackClient: any, apiKey: string, environment: string) => Promise<any>;
-/**
- * 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 declare const validateManagementToken: (contentStackClient: any, apiKey: string, managementToken: string, branch: string) => Promise<any>;
 /**
  * Validate API key
  * @param contentStackClient

package/lib/utils/tokens-validation.js

@@ -1,62 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateAPIKey = exports.validateManagementToken = exports.validateEnvironment = exports.validateDeliveryToken = void 0;
+exports.validateAPIKey = exports.validateEnvironment = void 0;
 const cli_utilities_1 = require("@contentstack/cli-utilities");
-/**
- * Validate delivery token
- * @param contentStackClient
- * @param apiKey
- * @param deliveryToken
- * @param environment
- * @param region
- * @returns
- */
-const validateDeliveryToken = async (contentStackClient, apiKey, deliveryToken, environment, region, host, branch) => {
-    let result;
-    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 });
-        cli_utilities_1.logger.debug('delivery token validation result', deliveryTokenResult);
-        if (deliveryTokenResult === null || deliveryTokenResult === void 0 ? void 0 : deliveryTokenResult.content_types) {
-            result = { valid: true, message: deliveryTokenResult };
-        }
-        else {
-            result = { valid: false, message: cli_utilities_1.messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_DELIVERY_TOKEN') };
-        }
-    }
-    catch (error) {
-        cli_utilities_1.logger.debug('validate delivery token error', error);
-        if (error.error_code === 109) {
-            result = { valid: false, message: cli_utilities_1.messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_API_KEY') };
-        }
-        else if (error.error_code === 141) {
-            result = { valid: false, message: cli_utilities_1.messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_ENVIRONMENT_NAME') };
-        }
-        else if (error === null || error === void 0 ? void 0 : error.error_code) {
-            throw new Error(error === null || error === void 0 ? void 0 : error.error_message);
-        }
-        else {
-            result = { valid: false, message: cli_utilities_1.messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_DELIVERY_TOKEN') };
-        }
-    }
-    return result;
-};
-exports.validateDeliveryToken = validateDeliveryToken;
 /**
  * Validate environment
  * @param contentStackClient
@@ -67,7 +12,7 @@ exports.validateDeliveryToken = validateDeliveryToken;
 const validateEnvironment = async (contentStackClient, apiKey, environment) => {
     let result;
     try {
-        const validationResult = await contentStackClient.stack({ api_key: apiKey }).environment(environment).fetch();
+        const validationResult = await contentStackClient.Stack({ api_key: apiKey }).environment(environment).fetch();
         cli_utilities_1.logger.debug('environment validation result', validationResult);
         if (validationResult.name === environment) {
             result = { valid: true, message: validationResult };
@@ -83,44 +28,6 @@ const validateEnvironment = async (contentStackClient, apiKey, environment) => {
     return result;
 };
 exports.validateEnvironment = validateEnvironment;
-/**
- * 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
- */
-const validateManagementToken = async (contentStackClient, apiKey, managementToken, branch) => {
-    var _a, _b;
-    let result;
-    try {
-        const validationResuslt = await contentStackClient.axiosInstance.get('/content_types?limit=1&include_branch=true', {
-            headers: { api_key: apiKey, authorization: managementToken, branch },
-        });
-        cli_utilities_1.logger.debug('Management validation result', validationResuslt);
-        if (validationResuslt.status === 200) {
-            result = { valid: true, message: validationResuslt };
-        }
-        else {
-            result = { valid: false, message: cli_utilities_1.messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_MANAGEMENT_TOKEN') };
-        }
-    }
-    catch (error) {
-        cli_utilities_1.logger.error('Failed to validate management token', error);
-        if (error.response && error.response.status === 401) {
-            result = { valid: false, message: cli_utilities_1.messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_MANAGEMENT_TOKEN') };
-        }
-        if ((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) {
-            throw new Error((_b = error.response.data) === null || _b === void 0 ? void 0 : _b.error_message);
-        }
-        else {
-            result = { valid: false, message: cli_utilities_1.messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_API_KEY') };
-        }
-    }
-    return result;
-};
-exports.validateManagementToken = validateManagementToken;
 /**
  * Validate API key
  * @param contentStackClient

package/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!!",

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.10",
+  "version": "1.3.12",
   "commands": {
     "auth:login": {
       "id": "auth:login",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-auth",
   "description": "Contentstack CLI plugin for authentication activities",
-  "version": "1.3.10",
+  "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.9",
-    "@contentstack/cli-utilities": "^1.4.5",
+    "@contentstack/cli-command": "^1.2.11",
+    "@contentstack/cli-utilities": "^1.5.1",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",
     "inquirer": "8.2.4",
@@ -85,5 +85,15 @@
       "auth:tokens:remove": "RMTKN"
     }
   },
+  "csdxConfig": {
+    "shortCommandName": {
+      "auth:login": "LOGIN",
+      "auth:logout": "LOGOUT",
+      "auth:whoami": "WHOMAI",
+      "auth:tokens": "LSTTKN",
+      "auth:tokens:add": "ADDTKN",
+      "auth:tokens:remove": "RMVTKN"
+    }
+  },
   "repository": "contentstack/cli"
-}
+}