Merge pull request #2445 from contentstack/fix/dx-4439-v1-dev-interactive-mode-messages

Fix/dx 4439 v1 dev interactive mode messages

Author: harshithad0703

.github/workflows/sca-scan.yml

@@ -13,3 +13,6 @@ jobs:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
         with:
           args: --all-projects --fail-on=all
+          json: true
+        continue-on-error: true
+      - uses: contentstack/sca-policy@main

packages/contentstack-auth/messages/index.json

@@ -18,6 +18,7 @@
   "CLI_AUTH_LOGOUT_DESCRIPTION": "User session logout",
   "CLI_AUTH_LOGOUT_FLAG_FORCE": "Force logging out for skipping the confirmation",
   "CLI_AUTH_LOGOUT_ALREADY": "You're already logged out",
+  "CLI_AUTH_LOGOUT_CANCELLED": "Log out cancelled",
   "CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS": "No authorizations found",
   "CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS_USER": "No authorizations found for current user",
   "CLI_AUTH_WHOAMI_LOGGED_IN_AS": "You are currently logged in with email:",

packages/contentstack-auth/src/commands/auth/logout.ts

@@ -93,7 +93,10 @@ export default class LogoutCommand extends BaseCommand<typeof LogoutCommand> {
           confirm,
           isAuthenticated: oauthHandler.isAuthenticated(),
         });
-        log.success(messageHandler.parse('CLI_AUTH_LOGOUT_ALREADY'), this.contextDetails);
+        const messageKey = confirm === false && oauthHandler.isAuthenticated()
+          ? 'CLI_AUTH_LOGOUT_CANCELLED'
+          : 'CLI_AUTH_LOGOUT_ALREADY';
+        log.success(messageHandler.parse(messageKey), this.contextDetails);
       }
     } catch (error) {
       log.debug('Logout failed.', { ...this.contextDetails, error: error.message });

packages/contentstack/package.json

@@ -156,6 +156,7 @@
     ],
     "hooks": {
       "prerun": [
+        "./lib/hooks/prerun/init-context-for-command",
         "./lib/hooks/prerun/command-deprecation-check",
         "./lib/hooks/prerun/default-rate-limit-check",
         "./lib/hooks/prerun/latest-version-warning"

packages/contentstack/src/hooks/prerun/init-context-for-command.ts

@@ -0,0 +1,27 @@
+import {
+  cliux,
+  messageHandler,
+  managementSDKInitiator,
+  marketplaceSDKInitiator,
+} from '@contentstack/cli-utilities';
+import { CsdxContext } from '../../utils';
+
+/**
+ * When an invalid command is corrected (e.g. loginasda → login), init ran with the invalid
+ * command so context.messageFilePath was never set. Re-build context and re-init utilities
+ * for the actual command so i18n prompts show human-readable text.
+ */
+export default async function (opts: {
+  Command?: { id?: string };
+  config?: any;
+}): Promise<void> {
+  const config = opts?.config ?? this.config;
+  const commandId = opts?.Command?.id;
+  if (!config?.context?.messageFilePath && commandId) {
+    config.context = new CsdxContext({ id: commandId }, config);
+    messageHandler.init(config.context);
+    cliux.init(config.context);
+    managementSDKInitiator.init(config.context);
+    marketplaceSDKInitiator.init(config.context);
+  }
+}