@contentstack/cli-auth 1.7.2 → 2.0.0-beta.2

package/README.md

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-auth/1.7.2 linux-x64 node-v22.22.0
+@contentstack/cli-auth/2.0.0-beta.2 linux-x64 node-v22.22.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -141,12 +141,12 @@ USAGE
 
 FLAGS
   -a, --alias=<value>          Alias (name) you want to assign to the token
-  -d, --delivery               Set this flag to save delivery token
   -e, --environment=<value>    Environment name for delivery token
   -k, --stack-api-key=<value>  Stack API Key
-  -m, --management             Set this flag to save management token
-  -t, --token=<value>          [env: TOKEN] Add the token name
   -y, --yes                    Use this flag to skip confirmation
+      --delivery               Set this flag to save delivery token
+      --management             Set this flag to save management token
+      --token=<value>          [env: TOKEN] Add the token name
 
 DESCRIPTION
   Adds management/delivery tokens to your session to use it with other CLI commands

package/lib/base-command.js

@@ -45,7 +45,6 @@ class BaseCommand extends cli_command_1.Command {
             command: ((_b = (_a = this.context) === null || _a === void 0 ? void 0 : _a.info) === null || _b === void 0 ? void 0 : _b.command) || 'auth',
             module: '',
             userId: cli_utilities_1.configHandler.get('userUid') || '',
-            email: cli_utilities_1.configHandler.get('email') || '',
             sessionId: (_c = this.context) === null || _c === void 0 ? void 0 : _c.sessionId,
             apiKey: apiKey || '',
             orgId: cli_utilities_1.configHandler.get('oauthOrgUid') || '',

package/lib/commands/auth/logout.js

@@ -73,13 +73,5 @@ LogoutCommand.flags = {
         required: false,
         default: false,
     }),
-    force: cli_utilities_1.flags.boolean({
-        char: 'f',
-        description: 'Force log out by skipping the confirmation.',
-        required: false,
-        hidden: true,
-        default: false,
-        parse: (0, cli_utilities_1.printFlagDeprecation)(['-f', '--force'], ['-y', '--yes']),
-    }),
 };
 LogoutCommand.aliases = ['logout'];

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

@@ -24,7 +24,7 @@ class TokensAddCommand extends base_command_1.BaseCommand {
             skipAliasReplaceConfirmation }));
         if (!isDelivery && !isManagement && !Boolean(environment)) {
             cli_utilities_1.log.debug('No token type specified, requesting user input', this.contextDetails);
-            let tokenType = await (0, interactive_1.askTokenType)();
+            const tokenType = await (0, interactive_1.askTokenType)();
             isDelivery = tokenType === 'delivery';
             isManagement = tokenType === 'management';
             cli_utilities_1.log.debug(`Token type selected: ${tokenType}`, this.contextDetails);
@@ -140,16 +140,12 @@ TokensAddCommand.examples = [
 TokensAddCommand.flags = {
     alias: cli_utilities_1.Flags.string({ char: 'a', description: 'Alias (name) you want to assign to the token' }),
     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_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_utilities_1.flags.string({
         char: 'e',
@@ -159,22 +155,8 @@ TokensAddCommand.flags = {
     '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_utilities_1.flags.string({
-        description: 'API Key',
-        hidden: true,
-        parse: (0, cli_utilities_1.printFlagDeprecation)(['api-key'], ['-k', 'stack-api-key']),
-    }),
-    force: cli_utilities_1.flags.boolean({
-        char: 'f',
-        hidden: true,
-        description: 'Force adding',
-        parse: (0, cli_utilities_1.printFlagDeprecation)(['-f', '--force'], ['-y', '--yes']),
     }),
     branch: cli_utilities_1.flags.string({
         required: false,

package/lib/interfaces/index.d.ts

@@ -22,7 +22,7 @@ export interface Context {
     command: string;
     module: string;
     userId: string | undefined;
-    email: string | undefined;
+    email?: string | undefined;
     sessionId: string | undefined;
     clientId?: string | undefined;
     apiKey: string;

package/lib/utils/auth-handler.js

@@ -106,15 +106,9 @@ class AuthHandler {
                         cli_utilities_1.log.debug('Login successful, user found', { module: 'auth-handler', userEmail: result.user.email });
                         resolve(result.user);
                     }
-                    else {
-                        cli_utilities_1.log.debug('Login failed: no user found.', { module: 'auth-handler', result });
-                        reject(new Error(cli_utilities_1.messageHandler.parse('CLI_AUTH_LOGIN_NO_USER')));
-                    }
-                })
-                    .catch(async (error) => {
-                    if (error.errorCode === 294) {
+                    else if (result.error_code === 294) {
+                        const tfToken = await this.handleOTPFlow(tfaToken, loginPayload);
                         try {
-                            const tfToken = await this.handleOTPFlow(tfaToken, loginPayload);
                             resolve(await this.login(email, password, tfToken));
                         }
                         catch (error) {
@@ -124,10 +118,14 @@ class AuthHandler {
                         }
                     }
                     else {
-                        cli_utilities_1.log.debug('Login API call failed.', { module: 'auth-handler', error: (error === null || error === void 0 ? void 0 : error.errorMessage) || error });
-                        cli_utilities_1.cliux.print('CLI_AUTH_LOGIN_FAILED', { color: 'yellow' });
-                        reject(error);
+                        cli_utilities_1.log.debug('Login failed: no user found.', { module: 'auth-handler', result });
+                        reject(new Error(cli_utilities_1.messageHandler.parse('CLI_AUTH_LOGIN_NO_USER')));
                     }
+                })
+                    .catch((error) => {
+                    cli_utilities_1.log.debug('Login API call failed.', { module: 'auth-handler', error: (error === null || error === void 0 ? void 0 : error.errorMessage) || error });
+                    cli_utilities_1.cliux.print('CLI_AUTH_LOGIN_FAILED', { color: 'yellow' });
+                    (0, cli_utilities_1.handleAndLogError)(error, { module: 'auth-handler' });
                 });
             }
             else {
@@ -190,7 +188,7 @@ class AuthHandler {
                     .catch((error) => {
                     cli_utilities_1.log.debug('Token validation failed.', { module: 'auth-handler', error: error.message });
                     cli_utilities_1.cliux.print('CLI_AUTH_TOKEN_VALIDATION_FAILED', { color: 'yellow' });
-                    reject(error);
+                    (0, cli_utilities_1.handleAndLogError)(error, { module: 'auth-handler' });
                 });
             }
             else {

package/lib/utils/mfa-handler.js

@@ -75,6 +75,20 @@ class MFAHandler {
                 source = 'environment variable';
             }
         }
+        if (!secret) {
+            cli_utilities_1.log.debug('Checking stored MFA secret', { module: 'mfa-handler' });
+            const mfaConfig = cli_utilities_1.configHandler.get('mfa');
+            if (mfaConfig === null || mfaConfig === void 0 ? void 0 : mfaConfig.secret) {
+                try {
+                    secret = this.encrypter.decrypt(mfaConfig.secret);
+                    source = 'stored configuration';
+                }
+                catch (error) {
+                    cli_utilities_1.log.debug('Failed to decrypt stored MFA secret', { module: 'mfa-handler', error });
+                    (0, cli_utilities_1.handleAndLogError)(error, { module: 'mfa-handler' }, cli_utilities_1.messageHandler.parse('CLI_AUTH_MFA_DECRYPT_FAILED'));
+                }
+            }
+        }
         if (secret) {
             try {
                 const code = this.generateMFACode(secret);

package/oclif.manifest.json

@@ -84,15 +84,6 @@
           "required": false,
           "allowNo": false,
           "type": "boolean"
-        },
-        "force": {
-          "char": "f",
-          "description": "Force log out by skipping the confirmation.",
-          "hidden": true,
-          "name": "force",
-          "required": false,
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -162,7 +153,6 @@
           "type": "option"
         },
         "delivery": {
-          "char": "d",
           "description": "Set this flag to save delivery token",
           "exclusive": [
             "management"
@@ -172,7 +162,6 @@
           "type": "boolean"
         },
         "management": {
-          "char": "m",
           "description": "Set this flag to save management token",
           "exclusive": [
             "delivery",
@@ -209,7 +198,6 @@
           "type": "boolean"
         },
         "token": {
-          "char": "t",
           "description": "Add the token name",
           "env": "TOKEN",
           "name": "token",
@@ -217,22 +205,6 @@
           "multiple": false,
           "type": "option"
         },
-        "api-key": {
-          "description": "API Key",
-          "hidden": true,
-          "name": "api-key",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "force": {
-          "char": "f",
-          "description": "Force adding",
-          "hidden": true,
-          "name": "force",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "branch": {
           "description": "Branch name",
           "hidden": true,
@@ -387,5 +359,5 @@
       ]
     }
   },
-  "version": "1.7.2"
+  "version": "2.0.0-beta.2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-auth",
   "description": "Contentstack CLI plugin for authentication activities",
-  "version": "1.7.2",
+  "version": "2.0.0-beta.2",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {