Skip to content

Commit 113b290

Browse files
aman19Kaman19K
authored
Merge pull request #1029 from contentstack/staging
Merge staging to main
2 parents 8794517 + aed52f2 commit 113b290

44 files changed

Lines changed: 442 additions & 294 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package-lock.json‎

Lines changed: 137 additions & 118 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/contentstack-auth/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth
1818
$ csdx COMMAND
1919
running command...
2020
$ csdx (--version)
21-
@contentstack/cli-auth/1.3.12 darwin-arm64 node-v20.3.1
21+
@contentstack/cli-auth/1.3.13 darwin-arm64 node-v20.3.1
2222
$ csdx --help [COMMAND]
2323
USAGE
2424
$ csdx COMMAND

‎packages/contentstack-auth/messages/index.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"CLI_AUTH_LOGOUT_FAILED": "Error in logout, please login again",
1818
"CLI_AUTH_LOGOUT_DESCRIPTION": "User session logout",
1919
"CLI_AUTH_LOGOUT_FLAG_FORCE": "Force logging out for skipping the confirmation",
20+
"CLI_AUTH_LOGOUT_ALREADY": "You're already logged out",
2021
"CLI_AUTH_WHOAMI_LOGGED_IN_AS": "You are currently logged in with email",
2122
"CLI_AUTH_WHOAMI_FAILED": "Failed to get the current user details",
2223
"CLI_AUTH_WHOAMI_DESCRIPTION": "Display current users email address",

‎packages/contentstack-auth/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@contentstack/cli-auth",
33
"description": "Contentstack CLI plugin for authentication activities",
4-
"version": "1.3.12",
4+
"version": "1.3.13",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"scripts": {
@@ -22,8 +22,8 @@
2222
"test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
2323
},
2424
"dependencies": {
25-
"@contentstack/cli-command": "~1.2.11",
26-
"@contentstack/cli-utilities": "~1.5.1",
25+
"@contentstack/cli-command": "~1.2.12",
26+
"@contentstack/cli-utilities": "~1.5.2",
2727
"chalk": "^4.0.0",
2828
"debug": "^4.1.1",
2929
"inquirer": "8.2.4",

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,18 @@ export default class LogoutCommand extends Command {
5050
try {
5151
const managementAPIClient = await managementSDKClient({ host: this.cmaHost, skipTokenValidity: true });
5252
authHandler.client = managementAPIClient;
53-
if ((await oauthHandler.isAuthenticated()) && (await oauthHandler.isAuthorisationTypeBasic())) {
54-
if (confirm === true) {
55-
cliux.loader('CLI_AUTH_LOGOUT_LOADER_START');
53+
if (confirm === true && (await oauthHandler.isAuthenticated())) {
54+
cliux.loader('CLI_AUTH_LOGOUT_LOADER_START');
55+
if (await oauthHandler.isAuthorisationTypeBasic()) {
5656
await authHandler.logout(configHandler.get('authtoken'));
57-
cliux.loader('');
58-
logger.info('successfully logged out');
59-
cliux.success('CLI_AUTH_LOGOUT_SUCCESS');
57+
} else if (await oauthHandler.isAuthorisationTypeOAuth()) {
58+
await oauthHandler.oauthLogout()
6059
}
61-
} else {
62-
cliux.loader('CLI_AUTH_LOGOUT_LOADER_START');
6360
cliux.loader('');
6461
logger.info('successfully logged out');
6562
cliux.success('CLI_AUTH_LOGOUT_SUCCESS');
63+
} else {
64+
cliux.success('CLI_AUTH_LOGOUT_ALREADY');
6665
}
6766
} catch (error) {
6867
let errorMessage = '';

‎packages/contentstack-bootstrap/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap
1515
$ csdx COMMAND
1616
running command...
1717
$ csdx (--version)
18-
@contentstack/cli-cm-bootstrap/1.4.14 darwin-arm64 node-v20.3.1
18+
@contentstack/cli-cm-bootstrap/1.4.15 darwin-arm64 node-v20.3.1
1919
$ csdx --help [COMMAND]
2020
USAGE
2121
$ csdx COMMAND

‎packages/contentstack-bootstrap/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@contentstack/cli-cm-bootstrap",
33
"description": "Bootstrap contentstack apps",
4-
"version": "1.4.14",
4+
"version": "1.4.15",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"scripts": {
@@ -17,9 +17,9 @@
1717
"test:report": "nyc --reporter=lcov mocha \"test/**/*.test.js\""
1818
},
1919
"dependencies": {
20-
"@contentstack/cli-cm-seed": "~1.4.14",
21-
"@contentstack/cli-command": "~1.2.11",
22-
"@contentstack/cli-utilities": "~1.5.1",
20+
"@contentstack/cli-cm-seed": "~1.4.15",
21+
"@contentstack/cli-command": "~1.2.12",
22+
"@contentstack/cli-utilities": "~1.5.2",
2323
"inquirer": "8.2.4",
2424
"mkdirp": "^1.0.4",
2525
"tar": "^6.1.13"

‎packages/contentstack-branches/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
3737
$ csdx COMMAND
3838
running command...
3939
$ csdx (--version)
40-
@contentstack/cli-cm-branches/1.0.11 darwin-arm64 node-v20.3.1
40+
@contentstack/cli-cm-branches/1.0.12 darwin-arm64 node-v20.3.1
4141
$ csdx --help [COMMAND]
4242
USAGE
4343
$ csdx COMMAND

‎packages/contentstack-branches/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "@contentstack/cli-cm-branches",
33
"description": "Contentstack CLI plugin to do branches operations",
4-
"version": "1.0.11",
4+
"version": "1.0.12",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {
8-
"@contentstack/cli-command": "~1.2.11",
9-
"@contentstack/cli-utilities": "~1.5.1",
8+
"@contentstack/cli-command": "~1.2.12",
9+
"@contentstack/cli-utilities": "~1.5.2",
1010
"@oclif/command": "^1.8.16",
1111
"@oclif/config": "^1.18.3",
1212
"@oclif/core": "^2.9.3",
@@ -27,8 +27,8 @@
2727
"winston": "^3.7.2"
2828
},
2929
"devDependencies": {
30-
"@contentstack/cli-auth": "~1.3.11",
31-
"@contentstack/cli-config": "~1.4.9",
30+
"@contentstack/cli-auth": "~1.3.13",
31+
"@contentstack/cli-config": "~1.4.11",
3232
"@contentstack/cli-dev-dependencies": "~1.2.3",
3333
"@oclif/plugin-help": "^5.1.19",
3434
"@oclif/test": "^1.2.6",

‎packages/contentstack-branches/src/utils/merge-helper.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,6 @@ export const setupMergeInputs = async (mergeFlags) => {
6060
if (!mergeFlags['stack-api-key']) {
6161
mergeFlags['stack-api-key'] = await askStackAPIKey();
6262
}
63-
if (!mergeFlags['compare-branch']) {
64-
if (!compare_branch) {
65-
mergeFlags['compare-branch'] = await askCompareBranch();
66-
} else {
67-
mergeFlags['compare-branch'] = compare_branch;
68-
}
69-
}
7063
if (!mergeFlags['base-branch']) {
7164
if (!base_branch) {
7265
mergeFlags['base-branch'] = getbranchConfig(mergeFlags['stack-api-key']);
@@ -79,6 +72,13 @@ export const setupMergeInputs = async (mergeFlags) => {
7972
mergeFlags['base-branch'] = base_branch;
8073
}
8174
}
75+
if (!mergeFlags['compare-branch']) {
76+
if (!compare_branch) {
77+
mergeFlags['compare-branch'] = await askCompareBranch();
78+
} else {
79+
mergeFlags['compare-branch'] = compare_branch;
80+
}
81+
}
8282

8383
return mergeFlags;
8484
};

0 commit comments

Comments
 (0)