Merge pull request #1480 from contentstack/staging

DX | 31-07-2024 | Release

Author: cs-raj

package-lock.json

@@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli-audit/1.6.3 darwin-arm64 node-v22.2.0
+@contentstack/cli-audit/1.6.4 darwin-arm64 node-v22.2.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -267,7 +267,7 @@ EXAMPLES
   $ csdx plugins
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.3/src/commands/plugins/index.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.9/src/commands/plugins/index.ts)_
 
 ## `csdx plugins:add PLUGIN`
 
@@ -341,7 +341,7 @@ EXAMPLES
   $ csdx plugins:inspect myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.3/src/commands/plugins/inspect.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.9/src/commands/plugins/inspect.ts)_
 
 ## `csdx plugins:install PLUGIN`
 
@@ -390,7 +390,7 @@ EXAMPLES
     $ csdx plugins:install someuser/someplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.3/src/commands/plugins/install.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.9/src/commands/plugins/install.ts)_
 
 ## `csdx plugins:link PATH`
 
@@ -420,7 +420,7 @@ EXAMPLES
   $ csdx plugins:link myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.3/src/commands/plugins/link.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.9/src/commands/plugins/link.ts)_
 
 ## `csdx plugins:remove [PLUGIN]`
 
@@ -461,7 +461,7 @@ FLAGS
   --reinstall  Reinstall all plugins after uninstalling.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.3/src/commands/plugins/reset.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.9/src/commands/plugins/reset.ts)_
 
 ## `csdx plugins:uninstall [PLUGIN]`
 
@@ -489,7 +489,7 @@ EXAMPLES
   $ csdx plugins:uninstall myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.3/src/commands/plugins/uninstall.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.9/src/commands/plugins/uninstall.ts)_
 
 ## `csdx plugins:unlink [PLUGIN]`
 
@@ -533,5 +533,5 @@ DESCRIPTION
   Update installed plugins.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.3/src/commands/plugins/update.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.9/src/commands/plugins/update.ts)_
 <!-- commandsstop -->

packages/contentstack-audit/README.md

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "Contentstack audit plugin",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli",
@@ -18,8 +18,8 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.18",
-    "@contentstack/cli-utilities": "~1.6.3",
+    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-utilities": "~1.7.0",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-plugins": "^5.0.0",
     "chalk": "^4.1.2",

packages/contentstack-audit/package.json

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-auth/1.3.19 darwin-arm64 node-v22.2.0
+@contentstack/cli-auth/1.3.20 darwin-arm64 node-v22.2.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-auth/README.md

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-auth",
   "description": "Contentstack CLI plugin for authentication activities",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -22,8 +22,8 @@
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
   },
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.18",
-    "@contentstack/cli-utilities": "~1.6.3",
+    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-utilities": "~1.7.0",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",
     "inquirer": "8.2.4",

packages/contentstack-auth/package.json

@@ -5,7 +5,8 @@ import {
   authHandler as oauthHandler,
   flags,
   managementSDKClient,
-  FlagInput
+  FlagInput,
+  formatError
 } from '@contentstack/cli-utilities';
 import { User } from '../../interfaces';
 import { authHandler, interactive } from '../../utils';
@@ -64,18 +65,7 @@ export default class LoginCommand extends BaseCommand<typeof LoginCommand> {
         await this.login(username, password);
       }
     } catch (error) {
-      let errorMessage = '';
-      if (error) {
-        if (error.message) {
-          if (error.message.message) {
-            errorMessage = error.message.message;
-          } else {
-            errorMessage = error.message;
-          }
-        } else {
-          errorMessage = error;
-        }
-      }
+      let errorMessage = formatError(error) || 'Something went wrong while logging. Please try again.';
       this.logger.error('login failed', errorMessage);
       cliux.error('CLI_AUTH_LOGIN_FAILED');
       cliux.error(errorMessage);

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

@@ -7,6 +7,7 @@ import {
   authHandler as oauthHandler,
   managementSDKClient,
   FlagInput,
+  formatError,
 } from '@contentstack/cli-utilities';
 
 import { authHandler } from '../../utils';
@@ -54,7 +55,7 @@ export default class LogoutCommand extends BaseCommand<typeof LogoutCommand> {
         if (await oauthHandler.isAuthorisationTypeBasic()) {
           await authHandler.logout(configHandler.get('authtoken'));
         } else if (await oauthHandler.isAuthorisationTypeOAuth()) {
-          await oauthHandler.oauthLogout()
+          await oauthHandler.oauthLogout();
         }
         cliux.loader('');
         this.logger.info('successfully logged out');
@@ -63,18 +64,7 @@ export default class LogoutCommand extends BaseCommand<typeof LogoutCommand> {
         cliux.success('CLI_AUTH_LOGOUT_ALREADY');
       }
     } catch (error) {
-      let errorMessage = '';
-      if (error) {
-        if (error.message) {
-          if (error.message.message) {
-            errorMessage = error.message.message;
-          } else {
-            errorMessage = error.message;
-          }
-        } else {
-          errorMessage = error;
-        }
-      }
+      let errorMessage = formatError(error) || 'Something went wrong while logging out. Please try again.';
 
       this.logger.error('Logout failed', errorMessage);
       cliux.print('CLI_AUTH_LOGOUT_FAILED', { color: 'yellow' });

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

@@ -8,6 +8,7 @@ import {
   HttpClient,
   messageHandler,
   Flags,
+  formatError,
 } from '@contentstack/cli-utilities';
 import { askTokenType } from '../../../utils/interactive';
 import { BaseCommand } from '../../../base-command';
@@ -159,9 +160,10 @@ export default class TokensAddCommand extends BaseCommand<typeof TokensAddComman
         cliux.success('CLI_AUTH_TOKENS_ADD_SUCCESS');
       }
     } catch (error) {
-      this.logger.error('token add error', error.message);
+      let errorMessage = formatError(error) || 'Something went wrong while adding token. Please try again.';
+      this.logger.error('token add error', errorMessage);
       cliux.print('CLI_AUTH_TOKENS_ADD_FAILED', { color: 'yellow' });
-      cliux.error(error.message.message ? error.message.message : error.message);
+      cliux.error(errorMessage);
     }
   }
 }

packages/contentstack-auth/src/commands/auth/tokens/add.ts

@@ -1,5 +1,5 @@
 import { Command } from '@contentstack/cli-command';
-import { cliux, configHandler } from '@contentstack/cli-utilities';
+import { cliux, configHandler, formatError } from '@contentstack/cli-utilities';
 import { BaseCommand } from '../../../base-command';
 export default class TokensListCommand extends BaseCommand<typeof TokensListCommand> {
   static aliases = ['tokens'];
@@ -52,9 +52,10 @@ export default class TokensListCommand extends BaseCommand<typeof TokensListComm
         cliux.print('CLI_AUTH_TOKENS_LIST_NO_TOKENS');
       }
     } catch (error) {
-      this.logger.error('Token list error', error.message);
+      let errorMessage = formatError(error) || 'Something went wrong while fetching tokens. Please try again.';
+      this.logger.error('Token list error', errorMessage);
       cliux.print('CLI_AUTH_TOKENS_LIST_FAILED', { color: 'yellow' });
-      cliux.print(error.message, { color: 'red' });
+      cliux.print(errorMessage, { color: 'red' });
     }
   }
 }

packages/contentstack-auth/src/commands/auth/tokens/index.ts

@@ -1,5 +1,5 @@
 import { Command } from '@contentstack/cli-command';
-import { cliux, configHandler, flags, FlagInput } from '@contentstack/cli-utilities';
+import { cliux, configHandler, flags, FlagInput, formatError } from '@contentstack/cli-utilities';
 import { BaseCommand } from '../../../base-command';
 
 export default class TokensRemoveCommand extends BaseCommand<typeof TokensRemoveCommand> {
@@ -58,9 +58,10 @@ export default class TokensRemoveCommand extends BaseCommand<typeof TokensRemove
         this.logger.info('Token removed successfully !!', element);
       });
     } catch (error) {
-      this.logger.error('Token remove error', error.message);
+      let errorMessage = formatError(error) || 'Something went wrong while removing token. Please try again.';
+      this.logger.error('Token remove error', errorMessage);
       cliux.print('CLI_AUTH_TOKENS_REMOVE_FAILED', { color: 'yellow' });
-      cliux.print(error.message, { color: 'red' });
+      cliux.print(errorMessage, { color: 'red' });
     }
   }
 }