@contentstack/cli-auth 2.0.0-beta.1 → 2.0.0-beta.3

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Contentstack
+Copyright (c) 2026 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/2.0.0-beta.1 linux-x64 node-v22.21.1
+@contentstack/cli-auth/2.0.0-beta.3 linux-x64 node-v22.22.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/base-command.js

@@ -9,8 +9,10 @@ class BaseCommand extends cli_command_1.Command {
      * plugins, registering the configuration, and initializing the logger.
      */
     async init() {
+        var _a, _b;
         await super.init();
-        this.contextDetails = Object.assign({}, this.createExportContext());
+        // this.contextDetails = { ...this.createExportContext() };
+        this.contextDetails = Object.assign({}, (0, cli_utilities_1.createLogContext)(((_b = (_a = this.context) === null || _a === void 0 ? void 0 : _a.info) === null || _b === void 0 ? void 0 : _b.command) || 'auth', '', cli_utilities_1.configHandler.get('authenticationMethod')));
     }
     /**
      * The catch function is used to handle errors from a command, either by adding custom logic or

package/lib/utils/auth-handler.js

@@ -106,9 +106,15 @@ class AuthHandler {
                         cli_utilities_1.log.debug('Login successful, user found', { module: 'auth-handler', userEmail: result.user.email });
                         resolve(result.user);
                     }
-                    else if (result.error_code === 294) {
-                        const tfToken = await this.handleOTPFlow(tfaToken, loginPayload);
+                    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) {
                         try {
+                            const tfToken = await this.handleOTPFlow(tfaToken, loginPayload);
                             resolve(await this.login(email, password, tfToken));
                         }
                         catch (error) {
@@ -118,14 +124,10 @@ class AuthHandler {
                         }
                     }
                     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')));
+                        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);
                     }
-                })
-                    .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 {
@@ -188,7 +190,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' });
-                    (0, cli_utilities_1.handleAndLogError)(error, { module: 'auth-handler' });
+                    reject(error);
                 });
             }
             else {

package/lib/utils/mfa-handler.js

@@ -75,20 +75,6 @@ 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

@@ -359,5 +359,5 @@
       ]
     }
   },
-  "version": "2.0.0-beta.1"
+  "version": "2.0.0-beta.3"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-auth",
   "description": "Contentstack CLI plugin for authentication activities",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.3",
   "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.7.0",
-    "@contentstack/cli-utilities": "~1.15.0",
+    "@contentstack/cli-command": "~1.7.2",
+    "@contentstack/cli-utilities": "~1.17.0",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.28",
     "otplib": "^12.0.1"
@@ -36,7 +36,7 @@
     "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^8.2.3",
     "@types/node": "^14.18.63",
-    "@types/sinon": "^10.0.20",
+    "@types/sinon": "^21.0.0",
     "chai": "^4.5.0",
     "dotenv": "^16.4.7",
     "eslint": "^8.57.1",
@@ -45,7 +45,7 @@
     "mocha": "10.8.2",
     "nyc": "^15.1.0",
     "oclif": "^4.17.46",
-    "sinon": "^19.0.5",
+    "sinon": "^21.0.1",
     "ts-node": "^10.9.2",
     "typescript": "^4.9.5"
   },