Skip to content

fix: logout error in Oauth flow #1777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aman19K merged 3 commits into from
Feb 26, 2025
Merged

fix: logout error in Oauth flow #1777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
784dec0
fix: logout error in Oauth flow
aman19K Feb 24, 2025
bec1c72
version bump
aman19K Feb 25, 2025
3acc21c
reverted import version bump
aman19K Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/contentstack-audit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
],
"dependencies": {
"@contentstack/cli-command": "~1.3.3",
"@contentstack/cli-utilities": "~1.8.1",
"@contentstack/cli-utilities": "~1.8.2",
"@oclif/plugin-help": "^5.2.20",
"@oclif/plugin-plugins": "^5.4.24",
"chalk": "^4.1.2",
Expand Down
2 changes: 2 additions & 0 deletions packages/contentstack-auth/messages/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"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_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",
"CLI_AUTH_WHOAMI_FAILED": "Failed to get the current user details",
"CLI_AUTH_WHOAMI_DESCRIPTION": "Display current users email address",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-bootstrap/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dependencies": {
"@contentstack/cli-cm-seed": "~1.10.1",
"@contentstack/cli-command": "~1.3.3",
"@contentstack/cli-utilities": "~1.8.1",
"@contentstack/cli-utilities": "~1.8.2",
"inquirer": "8.2.6",
"mkdirp": "^1.0.4",
"tar": "^6.2.1 "
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-branches/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-command": "~1.3.3",
"@contentstack/cli-utilities": "~1.8.1",
"@contentstack/cli-utilities": "~1.8.2",
"@oclif/core": "^3.27.0",
"chalk": "^4.1.2",
"just-diff": "^6.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-bulk-publish/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-command": "~1.3.3",
"@contentstack/cli-utilities": "~1.8.1",
"@contentstack/cli-utilities": "~1.8.2",
"chalk": "^4.1.2",
"dotenv": "^16.4.7",
"inquirer": "8.2.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-clone/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@contentstack/cli-cm-export": "~1.14.2",
"@contentstack/cli-cm-import": "~1.19.5",
"@contentstack/cli-command": "~1.3.3",
"@contentstack/cli-utilities": "~1.8.1",
"@contentstack/cli-utilities": "~1.8.2",
"chalk": "^4.1.2",
"inquirer": "8.2.6",
"lodash": "^4.17.21",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-command/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"format": "eslint src/**/*.ts --fix"
},
"dependencies": {
"@contentstack/cli-utilities": "~1.8.1",
"@contentstack/cli-utilities": "~1.8.2",
"contentstack": "^3.22.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"dependencies": {
"@contentstack/cli-command": "~1.3.3",
"@contentstack/cli-utilities": "~1.8.1",
"@contentstack/cli-utilities": "~1.8.2",
"lodash": "^4.17.21"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-export-to-csv/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-command": "~1.3.3",
"@contentstack/cli-utilities": "~1.8.1",
"@contentstack/cli-utilities": "~1.8.2",
"fast-csv": "^4.3.6",
"inquirer": "8.2.6",
"inquirer-checkbox-plus-prompt": "1.4.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-export/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"@contentstack/cli-command": "~1.3.3",
"@contentstack/cli-variants": "~1.1.5",
"@contentstack/cli-utilities": "~1.8.1",
"@contentstack/cli-utilities": "~1.8.2",
"@oclif/core": "^3.27.0",
"async": "^3.2.6",
"big-json": "^3.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-import-setup/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-command": "~1.3.3",
"@contentstack/cli-utilities": "~1.8.1",
"@contentstack/cli-utilities": "~1.8.2",
"@oclif/core": "^3.27.0",
"big-json": "^3.2.0",
"chalk": "^4.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-import/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"@contentstack/cli-audit": "~1.7.5",
"@contentstack/cli-command": "~1.3.3",
"@contentstack/cli-utilities": "~1.8.1",
"@contentstack/cli-utilities": "~1.8.2",
"@contentstack/management": "~1.18.4",
"@contentstack/cli-variants": "~1.1.5",
"@oclif/core": "^3.27.0",
Expand Down
57 changes: 32 additions & 25 deletions packages/contentstack-import/src/import/modules/entries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,31 +950,38 @@ export default class EntriesImport extends BaseClass {
if (chunk) {
let apiContent = values(chunk as Record<string, any>[]);
let apiContentDuplicate: any = [];
apiContentDuplicate = apiContent.flatMap((content: Record<string, any>) =>
content?.publish_details?.map((publish: Record<string, any>) => ({
...content,
locale: publish.locale,
publish_details: [publish],
}))
);
apiContent = apiContentDuplicate;
await this.makeConcurrentCall({
apiContent,
processName,
indexerCount,
currentIndexer: +index,
apiParams: {
reject: onReject,
resolve: onSuccess,
entity: 'publish-entries',
includeParamOnCompletion: true,
serializeData: this.serializePublishEntries.bind(this),
additionalInfo: { contentType, locale, cTUid },
},
concurrencyLimit: this.importConcurrency,
}).then(() => {
log(this.importConfig, `Published entries for content type ${cTUid} in locale ${locale}`, 'success');
apiContentDuplicate = apiContent.flatMap((content: Record<string, any>) => {
if (content?.publish_details?.length > 0) {
return content.publish_details.map((publish: Record<string, any>) => ({
...content,
locale: publish.locale,
publish_details: [publish],
}));
}
return []; // Return an empty array if publish_details is empty
});
apiContent = apiContentDuplicate;
if (apiContent?.length === 0) {
continue;
} else {
await this.makeConcurrentCall({
apiContent,
processName,
indexerCount,
currentIndexer: +index,
apiParams: {
reject: onReject,
resolve: onSuccess,
entity: 'publish-entries',
includeParamOnCompletion: true,
serializeData: this.serializePublishEntries.bind(this),
additionalInfo: { contentType, locale, cTUid },
},
concurrencyLimit: this.importConcurrency,
}).then(() => {
log(this.importConfig, `Published entries for content type ${cTUid} in locale ${locale}`, 'success');
});
}
}
}
}
Expand Down Expand Up @@ -1011,7 +1018,7 @@ export default class EntriesImport extends BaseClass {
apiOptions.apiData = null;
return apiOptions;
}
if(requestObject.environments.length === 0 || requestObject.locales.length === 0 ){
if (requestObject.environments.length === 0 || requestObject.locales.length === 0) {
apiOptions.apiData = null;
return apiOptions;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-migrate-rte/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-command": "~1.3.3",
"@contentstack/cli-utilities": "~1.8.1",
"@contentstack/cli-utilities": "~1.8.2",
"@contentstack/json-rte-serializer": "~2.0.11",
"collapse-whitespace": "^1.1.7",
"chalk": "^4.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-migration/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-command": "~1.3.3",
"@contentstack/cli-utilities": "~1.8.1",
"@contentstack/cli-utilities": "~1.8.2",
"async": "^3.2.6",
"callsites": "^3.1.0",
"cardinal": "^2.1.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/contentstack-seed/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-cm-import": "~1.19.4",
"@contentstack/cli-cm-import": "~1.19.5",
"@contentstack/cli-command": "~1.3.3",
"@contentstack/cli-utilities": "~1.8.1",
"@contentstack/cli-utilities": "~1.8.2",
"@contentstack/management": "~1.18.4",
"inquirer": "8.2.6",
"mkdirp": "^1.0.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-utilities/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentstack/cli-utilities",
"version": "1.8.1",
"version": "1.8.2",
"description": "Utilities for contentstack projects",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
Loading
Loading