From 585fe65f2f08a31341457fcd8415f73267ba9083 Mon Sep 17 00:00:00 2001 From: naman-contentstack Date: Mon, 19 May 2025 14:08:35 +0530 Subject: [PATCH 1/3] [DX-2996], added logs to debug the variant export issue --- .../src/export/modules/entries.ts | 6 ++++++ .../src/authentication-handler.ts | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/contentstack-export/src/export/modules/entries.ts b/packages/contentstack-export/src/export/modules/entries.ts index 11e0a8ac5d..0e11d89099 100644 --- a/packages/contentstack-export/src/export/modules/entries.ts +++ b/packages/contentstack-export/src/export/modules/entries.ts @@ -75,7 +75,9 @@ export default class EntriesExport extends BaseClass { this.exportVariantEntry = true; } + console.log('🚀 ~ EntriesExport ~ start ~ this.exportVariantEntry:', this.exportVariantEntry); this.variantEntries = new Export.VariantEntries(Object.assign(this.exportConfig, { project_id })); + console.log('🚀 ~ EntriesExport ~ start ~ this.variantEntries:', this.variantEntries); } catch (error) { log(this.exportConfig, `Failed to export variant entries ${error}`, 'error'); } @@ -190,6 +192,10 @@ export default class EntriesExport extends BaseClass { options.skip += this.entriesConfig.limit || 100; if (options.skip >= entriesSearchResponse.count) { + console.log( + '🚀 ~ EntriesExport ~ getEntries ~ options.skip >= entriesSearchResponse.count:', + options.skip >= entriesSearchResponse.count, + ); return Promise.resolve(true); } return await this.getEntries(options); diff --git a/packages/contentstack-utilities/src/authentication-handler.ts b/packages/contentstack-utilities/src/authentication-handler.ts index a0ca6ee1a6..02e6013afa 100644 --- a/packages/contentstack-utilities/src/authentication-handler.ts +++ b/packages/contentstack-utilities/src/authentication-handler.ts @@ -52,6 +52,9 @@ class AuthenticationHandler { } async refreshAccessToken(error: any, maxRetryCount = 1): Promise { + console.log('🚀 ~ Refresh attempt:', maxRetryCount); + console.log('🚀 ~ Error status:', error.response?.status); + console.log('🚀 ~ Error details:', error.response?.data); if (error.response && error.response.status) { if (maxRetryCount >= 3) { ux.print('Max retry count reached, please login to proceed', { @@ -73,6 +76,8 @@ class AuthenticationHandler { if (u.host) hostName = u.host; } hostName = hostName || region.cma; + console.log('🚀 ~ Region config:', configHandler.get('region')); + console.log('🚀 ~ Current OAuth token:', configHandler.get('oauthAccessToken')); await this.refreshToken(hostName); return this.refreshAccessToken(error, maxRetryCount); // Retry after refreshing the token } @@ -90,6 +95,9 @@ class AuthenticationHandler { } refreshToken(hostName: string): Promise { + console.log('🚀 ~ Attempting to refresh token for host:', hostName); + console.log('🚀 ~ Auth type:', this.authType); + return new Promise((resolve) => { if (this.authType === 'BASIC') { // NOTE Handle basic auth 401 here @@ -99,16 +107,18 @@ class AuthenticationHandler { }); process.exit(); } else if (this.authType === 'OAUTH') { + console.log('🚀 ~ Starting OAuth refresh...'); authHandler.host = hostName; // NOTE Handle OAuth refresh token authHandler .compareOAuthExpiry(true) .then(() => { + console.log('🚀 ~ Token refreshed successfully'); this.token = `Bearer ${configHandler.get('oauthAccessToken')}`; resolve(true); }) .catch((error: any) => { - console.log(error); + console.log('🚀 ~ Token refresh failed:', error); resolve(false); }); } else { From 608b3d14c53220de04a8b2900f0329b3c806ff55 Mon Sep 17 00:00:00 2001 From: naman-contentstack Date: Wed, 21 May 2025 12:36:26 +0530 Subject: [PATCH 2/3] removed consoles from entries file --- packages/contentstack-export/src/export/modules/entries.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/contentstack-export/src/export/modules/entries.ts b/packages/contentstack-export/src/export/modules/entries.ts index 0e11d89099..11e0a8ac5d 100644 --- a/packages/contentstack-export/src/export/modules/entries.ts +++ b/packages/contentstack-export/src/export/modules/entries.ts @@ -75,9 +75,7 @@ export default class EntriesExport extends BaseClass { this.exportVariantEntry = true; } - console.log('🚀 ~ EntriesExport ~ start ~ this.exportVariantEntry:', this.exportVariantEntry); this.variantEntries = new Export.VariantEntries(Object.assign(this.exportConfig, { project_id })); - console.log('🚀 ~ EntriesExport ~ start ~ this.variantEntries:', this.variantEntries); } catch (error) { log(this.exportConfig, `Failed to export variant entries ${error}`, 'error'); } @@ -192,10 +190,6 @@ export default class EntriesExport extends BaseClass { options.skip += this.entriesConfig.limit || 100; if (options.skip >= entriesSearchResponse.count) { - console.log( - '🚀 ~ EntriesExport ~ getEntries ~ options.skip >= entriesSearchResponse.count:', - options.skip >= entriesSearchResponse.count, - ); return Promise.resolve(true); } return await this.getEntries(options); From c5b3c21242bf0ff889fcd0d808ad3590ec0f434d Mon Sep 17 00:00:00 2001 From: naman-contentstack Date: Wed, 21 May 2025 16:17:20 +0530 Subject: [PATCH 3/3] removed some consoles to debug the issue --- .../contentstack-utilities/src/authentication-handler.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/contentstack-utilities/src/authentication-handler.ts b/packages/contentstack-utilities/src/authentication-handler.ts index 02e6013afa..61b8c8e81c 100644 --- a/packages/contentstack-utilities/src/authentication-handler.ts +++ b/packages/contentstack-utilities/src/authentication-handler.ts @@ -76,8 +76,6 @@ class AuthenticationHandler { if (u.host) hostName = u.host; } hostName = hostName || region.cma; - console.log('🚀 ~ Region config:', configHandler.get('region')); - console.log('🚀 ~ Current OAuth token:', configHandler.get('oauthAccessToken')); await this.refreshToken(hostName); return this.refreshAccessToken(error, maxRetryCount); // Retry after refreshing the token } @@ -95,9 +93,6 @@ class AuthenticationHandler { } refreshToken(hostName: string): Promise { - console.log('🚀 ~ Attempting to refresh token for host:', hostName); - console.log('🚀 ~ Auth type:', this.authType); - return new Promise((resolve) => { if (this.authType === 'BASIC') { // NOTE Handle basic auth 401 here @@ -107,18 +102,15 @@ class AuthenticationHandler { }); process.exit(); } else if (this.authType === 'OAUTH') { - console.log('🚀 ~ Starting OAuth refresh...'); authHandler.host = hostName; // NOTE Handle OAuth refresh token authHandler .compareOAuthExpiry(true) .then(() => { - console.log('🚀 ~ Token refreshed successfully'); this.token = `Bearer ${configHandler.get('oauthAccessToken')}`; resolve(true); }) .catch((error: any) => { - console.log('🚀 ~ Token refresh failed:', error); resolve(false); }); } else {