Skip to content
Open
3 changes: 3 additions & 0 deletions .github/workflows/sca-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions packages/contentstack-auth/messages/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -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:",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-auth/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@contentstack/cli-auth",
"description": "Contentstack CLI plugin for authentication activities",
"version": "1.7.3",
"version": "1.7.4",
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"scripts": {
Expand Down
5 changes: 4 additions & 1 deletion packages/contentstack-auth/src/commands/auth/logout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
Expand Down
3 changes: 2 additions & 1 deletion packages/contentstack/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@contentstack/cli",
"description": "Command-line tool (CLI) to interact with Contentstack",
"version": "1.58.1",
"version": "1.59.0",
"author": "Contentstack",
"bin": {
"csdx": "./bin/run.js"
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}
}
Loading
Loading