@contentstack/cli-auth 1.1.0 → 1.3.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Contentstack
+Copyright (c) 2023 Contentstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-auth/1.1.0 linux-x64 node-v16.19.0
+@contentstack/cli-auth/1.3.0 linux-x64 node-v16.20.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/commands/auth/login.js

@@ -5,8 +5,9 @@ const cli_utilities_1 = require("@contentstack/cli-utilities");
 const utils_1 = require("../../utils");
 class LoginCommand extends cli_command_1.Command {
     async run() {
+        const managementAPIClient = await (0, cli_utilities_1.managementSDKClient)({ host: this.cmaHost });
         const { flags: loginFlags } = await this.parse(LoginCommand);
-        utils_1.authHandler.client = this.managementAPIClient;
+        utils_1.authHandler.client = managementAPIClient;
         try {
             const username = (loginFlags === null || loginFlags === void 0 ? void 0 : loginFlags.username) || (await utils_1.interactive.askUsername());
             const password = (loginFlags === null || loginFlags === void 0 ? void 0 : loginFlags.password) || (await utils_1.interactive.askPassword());
@@ -40,13 +41,13 @@ LoginCommand.examples = [
     '$ csdx auth:login --username <username> --password <password>',
 ];
 LoginCommand.flags = {
-    username: cli_command_1.flags.string({
+    username: cli_utilities_1.flags.string({
         char: 'u',
         description: 'User name',
         multiple: false,
         required: false,
     }),
-    password: cli_command_1.flags.string({
+    password: cli_utilities_1.flags.string({
         char: 'p',
         description: 'Password',
         multiple: false,

package/lib/commands/auth/logout.js

@@ -6,7 +6,8 @@ const utils_1 = require("../../utils");
 class LogoutCommand extends cli_command_1.Command {
     async run() {
         const { flags: logoutFlags } = await this.parse(LogoutCommand);
-        utils_1.authHandler.client = this.managementAPIClient;
+        const managementAPIClient = await (0, cli_utilities_1.managementSDKClient)({ host: this.cmaHost });
+        utils_1.authHandler.client = managementAPIClient;
         let confirm = logoutFlags.force === true || logoutFlags.yes === true;
         if (!confirm) {
             confirm = await cli_utilities_1.cliux.inquire({
@@ -44,13 +45,13 @@ exports.default = LogoutCommand;
 LogoutCommand.description = 'User session logout';
 LogoutCommand.examples = ['$ csdx auth:logout', '$ csdx auth:logout -y', '$ csdx auth:logout --yes'];
 LogoutCommand.flags = {
-    yes: cli_command_1.flags.boolean({
+    yes: cli_utilities_1.flags.boolean({
         char: 'y',
         description: 'Force log out by skipping the confirmation',
         required: false,
         default: false,
     }),
-    force: cli_command_1.flags.boolean({
+    force: cli_utilities_1.flags.boolean({
         char: 'f',
         description: 'Force log out by skipping the confirmation',
         required: false,

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

@@ -59,8 +59,8 @@ class TokensAddCommand extends cli_command_1.Command {
                 tokenValidationResult = await utils_1.tokenValidation.validateDeliveryToken(this.deliveryAPIClient, apiKey, token, environment, this.region.name, this.cdaHost);
             }
             else if (type === 'management') {
-                this.managementAPIClient = { host: this.cmaHost, authorization: token, api_key: apiKey };
-                tokenValidationResult = await utils_1.tokenValidation.validateManagementToken(this.managementAPIClient, apiKey, token);
+                const managementAPIClient = await (0, cli_utilities_1.managementSDKClient)({ host: this.cmaHost });
+                tokenValidationResult = await utils_1.tokenValidation.validateManagementToken(managementAPIClient, apiKey, token);
             }
             if (!tokenValidationResult.valid) {
                 throw new cli_utilities_1.CLIError(tokenValidationResult.message);
@@ -101,39 +101,39 @@ TokensAddCommand.examples = [
     '$ csdx auth:tokens:add --alias <alias> --stack-api-key <stack api key> --delivery -e <environment> --token <delivery token>',
 ];
 TokensAddCommand.flags = {
-    alias: cli_command_1.flags.string({ char: 'a', description: 'Name of the token alias' }),
-    delivery: cli_command_1.flags.boolean({
+    alias: cli_utilities_1.flags.string({ char: 'a', description: 'Name of the token alias' }),
+    delivery: cli_utilities_1.flags.boolean({
         char: 'd',
         description: 'Set this flag to save delivery token',
         exclusive: ['management'],
         parse: (0, cli_utilities_1.printFlagDeprecation)(['-d'], ['--delivery']),
     }),
-    management: cli_command_1.flags.boolean({
+    management: cli_utilities_1.flags.boolean({
         char: 'm',
         description: 'Set this flag to save management token',
         exclusive: ['delivery', 'environment'],
         parse: (0, cli_utilities_1.printFlagDeprecation)(['-m'], ['--management']),
     }),
-    environment: cli_command_1.flags.string({
+    environment: cli_utilities_1.flags.string({
         char: 'e',
         description: 'Environment name for delivery token',
         exclusive: ['management'],
     }),
-    'stack-api-key': cli_command_1.flags.string({ char: 'k', description: 'Stack API Key' }),
-    yes: cli_command_1.flags.boolean({ char: 'y', description: 'Use this flag to skip confirmation' }),
-    token: cli_command_1.flags.string({
+    'stack-api-key': cli_utilities_1.flags.string({ char: 'k', description: 'Stack API Key' }),
+    yes: cli_utilities_1.flags.boolean({ char: 'y', description: 'Use this flag to skip confirmation' }),
+    token: cli_utilities_1.flags.string({
         char: 't',
         description: 'Add the token name',
         env: 'TOKEN',
         parse: (0, cli_utilities_1.printFlagDeprecation)(['-t'], ['--token']),
     }),
     //To be deprecated
-    'api-key': cli_command_1.flags.string({
+    'api-key': cli_utilities_1.flags.string({
         description: 'API Key',
         hidden: true,
         parse: (0, cli_utilities_1.printFlagDeprecation)(['api-key'], ['-k', 'stack-api-key']),
     }),
-    force: cli_command_1.flags.boolean({
+    force: cli_utilities_1.flags.boolean({
         char: 'f',
         hidden: true,
         description: 'Force adding',

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

@@ -50,6 +50,6 @@ exports.default = TokensRemoveCommand;
 TokensRemoveCommand.description = 'Removes selected tokens';
 TokensRemoveCommand.examples = ['$ csdx auth:tokens:remove', '$ csdx auth:tokens:remove -a <alias>'];
 TokensRemoveCommand.flags = {
-    alias: cli_command_1.flags.string({ char: 'a', description: 'Token alias' }),
-    ignore: cli_command_1.flags.boolean({ char: 'i', description: 'Ignore' }),
+    alias: cli_utilities_1.flags.string({ char: 'a', description: 'Token alias' }),
+    ignore: cli_utilities_1.flags.boolean({ char: 'i', description: 'Ignore' }),
 };

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0",
+  "version": "1.3.0",
   "commands": {
     "auth:login": {
       "id": "auth:login",

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@contentstack/cli-auth",
   "description": "Contentstack CLI plugin for authentication activities",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
     "build": "npm run clean && npm run compile",
-    "clean": "rm -rf ./lib && rm -rf tsconfig.build.tsbuildinfo",
+    "clean": "rm -rf ./lib ./node_modules tsconfig.build.tsbuildinfo",
     "compile": "tsc -b tsconfig.json",
     "postpack": "rm -f oclif.manifest.json",
-    "prepack": "npm run build && oclif manifest && oclif readme",
+    "prepack": "pnpm compile && oclif manifest && oclif readme",
     "version": "oclif readme && git add README.md",
     "test:report": "tsc -p test && nyc --reporter=lcov --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
     "pretest": "tsc -p test",
@@ -21,17 +21,15 @@
     "test:unit": "mocha --forbid-only \"test/unit/*.test.ts\""
   },
   "dependencies": {
-    "@contentstack/cli-command": "^1.1.0",
-    "@contentstack/cli-utilities": "^1.1.0",
+    "@contentstack/cli-command": "^1.2.1",
+    "@contentstack/cli-utilities": "^1.2.1",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",
     "inquirer": "8.2.4",
     "winston": "^3.7.2"
   },
   "devDependencies": {
-    "oclif": "^3.1.2",
     "@fancy-test/nock": "^0.1.1",
-    "@oclif/dev-cli": "^1.26.10",
     "@oclif/plugin-help": "^5.1.19",
     "@oclif/test": "^2.2.10",
     "@types/chai": "^4.2.18",
@@ -40,15 +38,15 @@
     "@types/mocha": "^8.2.2",
     "@types/node": "^14.14.32",
     "@types/sinon": "^10.0.2",
-    "@types/tar": "^4.0.3",
     "chai": "^4.3.4",
-    "dotenv": "^16.0.1",
+    "dotenv": "^16.0.3",
     "eslint": "^8.18.0",
-    "eslint-config-oclif": "^3.1.0",
+    "eslint-config-oclif": "^4.0.0",
     "eslint-config-oclif-typescript": "^0.1.0",
     "globby": "^10.0.2",
     "mocha": "10.1.0",
     "nyc": "^15.1.0",
+    "oclif": "^3.1.2",
     "rimraf": "^2.7.1",
     "sinon": "^15.0.1",
     "tmp": "^0.2.1",
@@ -56,7 +54,7 @@
     "typescript": "^4.9.3"
   },
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=14.0.0"
   },
   "files": [
     "/lib",
@@ -76,9 +74,14 @@
     "bin": "csdx",
     "repositoryPrefix": "<%- repo %>/blob/main/packages/contentstack-auth/<%- commandPath %>"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "npm run lint"
+  "csdxConfig": {
+    "shortCommandName": {
+      "auth:login": "LIN",
+      "auth:logout": "LOT",
+      "auth:whoami": "WHO",
+      "auth:tokens": "LSTKN",
+      "auth:tokens:add": "ADTKN",
+      "auth:tokens:remove": "RMTKN"
     }
   },
   "repository": "contentstack/cli"