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

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.2 linux-x64 node-v22.22.0
+@contentstack/cli-auth/2.0.0-beta.4 linux-x64 node-v22.22.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/utils/auth-handler.d.ts

@@ -37,12 +37,6 @@ declare class AuthHandler {
      * @returns {Promise} Promise object returns response object from Contentstack
      */
     logout(authtoken: string): Promise<object>;
-    /**
-     * Validate token
-     * @param {string} authtoken
-     * @returns {Promise} Promise object returns response object from Contentstack
-     */
-    validateAuthtoken(authtoken: string): Promise<object>;
 }
 declare const _default: AuthHandler;
 export default _default;

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 {
@@ -169,33 +171,5 @@ class AuthHandler {
             }
         });
     }
-    /**
-     * Validate token
-     * @param {string} authtoken
-     * @returns {Promise} Promise object returns response object from Contentstack
-     */
-    async validateAuthtoken(authtoken) {
-        cli_utilities_1.log.debug('Starting token validation.', { module: 'auth-handler', hasAuthToken: !!authtoken });
-        return new Promise((resolve, reject) => {
-            if (authtoken) {
-                cli_utilities_1.log.debug('Making token validation API call.', { module: 'auth-handler' });
-                this._client
-                    .getUser()
-                    .then((user) => {
-                    cli_utilities_1.log.debug('Token validation successful.', { module: 'auth-handler', user });
-                    resolve(user);
-                })
-                    .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' });
-                });
-            }
-            else {
-                cli_utilities_1.log.debug('Token validation failed: no auth token provided.', { module: 'auth-handler' });
-                reject(new Error(cli_utilities_1.messageHandler.parse('CLI_AUTH_TOKEN_VALIDATION_NO_TOKEN')));
-            }
-        });
-    }
 }
 exports.default = new AuthHandler();

package/lib/utils/index.d.ts

@@ -1,4 +1,3 @@
 export { default as authHandler } from './auth-handler';
 export { default as mfaHandler } from './mfa-handler';
 export * as interactive from './interactive';
-export * as tokenValidation from './tokens-validation';

package/lib/utils/index.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tokenValidation = exports.interactive = exports.mfaHandler = exports.authHandler = void 0;
+exports.interactive = exports.mfaHandler = exports.authHandler = void 0;
 var auth_handler_1 = require("./auth-handler");
 Object.defineProperty(exports, "authHandler", { enumerable: true, get: function () { return auth_handler_1.default; } });
 var mfa_handler_1 = require("./mfa-handler");
 Object.defineProperty(exports, "mfaHandler", { enumerable: true, get: function () { return mfa_handler_1.default; } });
 exports.interactive = require("./interactive");
-exports.tokenValidation = require("./tokens-validation");

package/lib/utils/mfa-handler.d.ts

@@ -24,18 +24,6 @@ declare class MFAHandler {
      * @throws Error if MFA code generation fails
      */
     getMFACode(): Promise<string>;
-    /**
-     * Gets MFA code through manual user input
-     * @returns Promise<string> The MFA code
-     * @throws Error if code format is invalid
-     */
-    getManualMFACode(): Promise<string>;
-    /**
-     * Validates an MFA code format
-     * @param code The MFA code to validate
-     * @returns boolean True if valid, false otherwise
-     */
-    isValidMFACode(code: string): boolean;
 }
 declare const _default: MFAHandler;
 export default _default;

package/lib/utils/mfa-handler.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const otplib_1 = require("otplib");
-const interactive_1 = require("./interactive");
 /**
  * @class
  * MFA handler for managing multi-factor authentication
@@ -75,20 +74,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);
@@ -103,31 +88,5 @@ class MFAHandler {
             }
         }
     }
-    /**
-     * Gets MFA code through manual user input
-     * @returns Promise<string> The MFA code
-     * @throws Error if code format is invalid
-     */
-    async getManualMFACode() {
-        try {
-            const code = await (0, interactive_1.askOTP)();
-            if (!/^\d{6}$/.test(code)) {
-                throw new Error(cli_utilities_1.messageHandler.parse('CLI_AUTH_MFA_INVALID_CODE'));
-            }
-            return code;
-        }
-        catch (error) {
-            cli_utilities_1.log.debug('Failed to get MFA code', { module: 'mfa-handler', error });
-            throw error;
-        }
-    }
-    /**
-     * Validates an MFA code format
-     * @param code The MFA code to validate
-     * @returns boolean True if valid, false otherwise
-     */
-    isValidMFACode(code) {
-        return /^\d{6}$/.test(code);
-    }
 }
 exports.default = new MFAHandler();

package/oclif.manifest.json

@@ -359,5 +359,5 @@
       ]
     }
   },
-  "version": "2.0.0-beta.2"
+  "version": "2.0.0-beta.4"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-auth",
   "description": "Contentstack CLI plugin for authentication activities",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@contentstack/cli-command": "~1.7.2",
-    "@contentstack/cli-utilities": "~1.17.0",
+    "@contentstack/cli-utilities": "~1.17.1",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.28",
     "otplib": "^12.0.1"
@@ -81,4 +81,4 @@
     }
   },
   "repository": "contentstack/cli"
-}
+}

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

@@ -1,15 +0,0 @@
-/**
- * Validate environment
- * @param contentStackClient
- * @param apiKey
- * @param environment
- * @returns
- */
-export declare const validateEnvironment: (contentStackClient: any, apiKey: string, environment: string) => Promise<any>;
-/**
- * Validate API key
- * @param contentStackClient
- * @param apiKey
- * @returns
- */
-export declare const validateAPIKey: (contentStackClient: any, apiKey: string) => Promise<any>;

package/lib/utils/tokens-validation.js

@@ -1,67 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateAPIKey = exports.validateEnvironment = void 0;
-const cli_utilities_1 = require("@contentstack/cli-utilities");
-/**
- * Validate environment
- * @param contentStackClient
- * @param apiKey
- * @param environment
- * @returns
- */
-const validateEnvironment = async (contentStackClient, apiKey, environment) => {
-    cli_utilities_1.log.debug('Starting environment validation.', { module: 'tokens-validation', apiKeyStatus: apiKey ? 'provided' : 'not-provided', environment });
-    let result;
-    try {
-        cli_utilities_1.log.debug('Making environment validation API call.', { module: 'tokens-validation', environment });
-        const validationResult = await contentStackClient.Stack({ api_key: apiKey }).environment(environment).fetch();
-        cli_utilities_1.log.debug('Environment validation API response received.', { module: 'tokens-validation', validationResult });
-        if (validationResult.name === environment) {
-            cli_utilities_1.log.debug('Environment validation successful.', { module: 'tokens-validation', environment, validationResult });
-            result = { valid: true, message: validationResult };
-        }
-        else {
-            cli_utilities_1.log.debug('Environment validation failed: name mismatch.', { module: 'tokens-validation', expected: environment, actual: validationResult.name });
-            result = { valid: false, message: cli_utilities_1.messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_ENVIRONMENT_NAME') };
-        }
-    }
-    catch (error) {
-        cli_utilities_1.log.debug('Environment validation API call failed.', { module: 'tokens-validation', error: error.message, environment });
-        (0, cli_utilities_1.handleAndLogError)(error, { apiKey, environment });
-        result = { valid: false, message: 'CLI_AUTH_TOKENS_VALIDATION_INVALID_ENVIRONMENT_NAME' };
-    }
-    cli_utilities_1.log.debug('Environment validation completed.', { module: 'tokens-validation', result });
-    return result;
-};
-exports.validateEnvironment = validateEnvironment;
-/**
- * Validate API key
- * @param contentStackClient
- * @param apiKey
- * @returns
- */
-const validateAPIKey = async (contentStackClient, apiKey) => {
-    cli_utilities_1.log.debug('Starting API key validation.', { module: 'tokens-validation', apiKeyStatus: apiKey ? 'provided' : 'not-provided' });
-    let result;
-    try {
-        cli_utilities_1.log.debug('Making API key validation API call.', { module: 'tokens-validation' });
-        const validateAPIKeyResult = await contentStackClient.stack({ api_key: apiKey }).fetch();
-        cli_utilities_1.log.debug('API key validation API response received.', { module: 'tokens-validation', validateAPIKeyResult });
-        if (validateAPIKeyResult.api_key === apiKey) {
-            cli_utilities_1.log.debug('API key validation successful.', { module: 'tokens-validation', apiKey: validateAPIKeyResult.api_key });
-            result = { valid: true, message: validateAPIKeyResult };
-        }
-        else {
-            cli_utilities_1.log.debug('API key validation failed: key mismatch.', { module: 'tokens-validation', expected: apiKey, actual: validateAPIKeyResult.api_key });
-            result = { valid: false, message: cli_utilities_1.messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_API_KEY') };
-        }
-    }
-    catch (error) {
-        cli_utilities_1.log.debug('API key validation API call failed.', { module: 'tokens-validation', error: error.message });
-        (0, cli_utilities_1.handleAndLogError)(error, { apiKey });
-        result = { valid: false, message: cli_utilities_1.messageHandler.parse('CLI_AUTH_TOKENS_VALIDATION_INVALID_API_KEY') };
-    }
-    cli_utilities_1.log.debug('API key validation completed.', { module: 'tokens-validation', result });
-    return result;
-};
-exports.validateAPIKey = validateAPIKey;